diff --git a/e107_admin/header.php b/e107_admin/header.php
index c0ca27c74..d0c54bdd4 100644
--- a/e107_admin/header.php
+++ b/e107_admin/header.php
@@ -12,9 +12,9 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_admin/header.php,v $
-| $Revision: 1.35 $
-| $Date: 2009-07-16 23:09:40 $
-| $Author: bugrain $
+| $Revision: 1.36 $
+| $Date: 2009-07-17 03:53:14 $
+| $Author: e107coders $
+---------------------------------------------------------------+
*/
@@ -88,49 +88,112 @@ if (file_exists(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_footer.php')) {
} else {
@include_once(e_LANGUAGEDIR.'English/admin/lan_footer.php');
}
+
+
+
+if (file_exists(THEME.'admin_template.php')) // load template before icon definitions.
+{
+ require_once(THEME.'admin_template.php');
+}
+ else {
+ require_once(e_BASE.$THEMES_DIRECTORY.'templates/admin_template.php');
+}
+
+
+
+
+
if (!defined('ADMIN_WIDTH')) {
define('ADMIN_WIDTH', "width: 95%");
}
if (!defined('ADMIN_TRUE_ICON'))
{
- define("ADMIN_TRUE_ICON", "
");
- define("ADMIN_TRUE_ICON_PATH", e_IMAGE."fileinspector/integrity_pass.png");
+ define("ADMIN_TRUE_ICON", "
");
+ define("ADMIN_TRUE_ICON_PATH", e_IMAGE."admin_images/true_16.png");
}
if (!defined('ADMIN_FALSE_ICON'))
{
- define("ADMIN_FALSE_ICON", "
");
- define("ADMIN_FALSE_ICON_PATH", e_IMAGE."fileinspector/integrity_fail.png");
+ define("ADMIN_FALSE_ICON", "
");
+ define("ADMIN_FALSE_ICON_PATH", e_IMAGE."admin_images/false_16.png");
}
-
if (!defined('ADMIN_EDIT_ICON'))
{
define("ADMIN_EDIT_ICON", "
");
define("ADMIN_EDIT_ICON_PATH", e_IMAGE."admin_images/edit_16.png");
}
-
-
if (!defined('ADMIN_DELETE_ICON'))
{
define("ADMIN_DELETE_ICON", "
");
define("ADMIN_DELETE_ICON_PATH", e_IMAGE."admin_images/delete_16.png");
}
+if (!defined('ADMIN_UP_ICON'))
+{
+ define("ADMIN_UP_ICON", "
");
+ define("ADMIN_UP_ICON_PATH", e_IMAGE."admin_images/up_16.png");
+}
+
+if (!defined('ADMIN_DOWN_ICON'))
+{
+ define("ADMIN_DOWN_ICON", "
");
+ define("ADMIN_DOWN_ICON_PATH", e_IMAGE."admin_images/down_16.png");
+}
+
if (!defined('ADMIN_WARNING_ICON'))
{
- define("ADMIN_WARNING_ICON", "
");
- define("ADMIN_WARNING_ICON_PATH", e_IMAGE."fileinspector/warning.png");
+ define("ADMIN_WARNING_ICON", "
");
+ define("ADMIN_WARNING_ICON_PATH", e_IMAGE."admin_images/warning_16.png");
}
if (!defined('ADMIN_INFO_ICON'))
{
- define("ADMIN_INFO_ICON", "
");
- define("ADMIN_INFO_ICON_PATH", e_IMAGE."fileinspector/info.png");
+ define("ADMIN_INFO_ICON", "
");
+ define("ADMIN_INFO_ICON_PATH", e_IMAGE."admin_images/info_16.png");
}
+if (!defined('ADMIN_CONFIGURE_ICON'))
+{
+ define("ADMIN_CONFIGURE_ICON", "
");
+ define("ADMIN_CONFIGURE_ICON_PATH", e_IMAGE."admin_images/cat_tools_16.png");
+}
+
+if (!defined('ADMIN_VIEW_ICON'))
+{
+ define("ADMIN_VIEW_ICON", "
");
+ define("ADMIN_VIEW_ICON_PATH", e_IMAGE."admin_images/admin_images/search_16.png");
+}
+
+if (!defined('ADMIN_URL_ICON'))
+{
+ define("ADMIN_URL_ICON", "
");
+ define("ADMIN_URL_ICON_PATH", e_IMAGE."admin_images/forums_16.png");
+}
+
+if (!defined('ADMIN_INSTALLPLUGIN_ICON'))
+{
+ define("ADMIN_INSTALLPLUGIN_ICON", "
");
+ define("ADMIN_INSTALLPLUGIN_ICON_PATH", e_IMAGE."admin_images/plugin_install_16.png");
+}
+
+if (!defined('ADMIN_UNINSTALLPLUGIN_ICON'))
+{
+ define("ADMIN_UNINSTALLPLUGIN_ICON", "
");
+ define("ADMIN_UNINSTALLPLUGIN_ICON_PATH", e_IMAGE."admin_images/plugin_unstall_16.png");
+}
+
+if (!defined('ADMIN_UPGRADEPLUGIN_ICON'))
+{
+ define("ADMIN_UPGRADEPLUGIN_ICON", "
");
+ define("ADMIN_UPGRADEPLUGIN_ICON_PATH", e_IMAGE."admin_images/up_16.png");
+}
+
+
+
+
//
// C: Send start of HTML
//
@@ -588,11 +651,6 @@ if (!function_exists('show_admin_menu')) {
}
}
-if (file_exists(THEME.'admin_template.php')) {
- require_once(THEME.'admin_template.php');
-} else {
- require_once(e_BASE.$THEMES_DIRECTORY.'templates/admin_template.php');
-}
if (!function_exists("parse_admin")) {
function parse_admin($ADMINLAYOUT) {
diff --git a/e107_admin/links.php b/e107_admin/links.php
index dc1cc3751..6424a230b 100644
--- a/e107_admin/links.php
+++ b/e107_admin/links.php
@@ -9,8 +9,8 @@
* Administration Area - Site Links
*
* $Source: /cvs_backup/e107_0.8/e107_admin/links.php,v $
- * $Revision: 1.23 $
- * $Date: 2009-07-07 06:50:55 $
+ * $Revision: 1.24 $
+ * $Date: 2009-07-17 03:53:14 $
* $Author: e107coders $
*
*/
@@ -463,8 +463,8 @@ class links
";
$name_suffix = URL_SEPARATOR.$link_id.URL_SEPARATOR.$link_order;
$text .= "
-
-
+
+
| ";
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index b71e639ec..287e8bf2f 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -9,8 +9,8 @@
* Form Handler
*
* $Source: /cvs_backup/e107_0.8/e107_handlers/form_handler.php,v $
- * $Revision: 1.34 $
- * $Date: 2009-07-16 08:15:35 $
+ * $Revision: 1.35 $
+ * $Date: 2009-07-17 03:53:14 $
* $Author: e107coders $
*
*/
@@ -333,12 +333,12 @@ class e_form
$options = $this->format_options('submit_image', $name, $options);
switch ($image) {
case 'edit':
- $image = e_IMAGE_ABS.'admin_images/edit_16.png';
+ $image = ADMIN_EDIT_ICON_PATH;
$options['class'] = 'action edit';
break;
case 'delete':
- $image = e_IMAGE_ABS.'admin_images/delete_16.png';
+ $image = ADMIN_DELETE_ICON_PATH;
$options['class'] = 'action delete';
break;
}
diff --git a/e107_handlers/menu_class.php b/e107_handlers/menu_class.php
index 3ab5da395..838bc98e0 100644
--- a/e107_handlers/menu_class.php
+++ b/e107_handlers/menu_class.php
@@ -10,8 +10,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_handlers/menu_class.php,v $
-| $Revision: 1.3 $
-| $Date: 2009-07-17 02:28:49 $
+| $Revision: 1.4 $
+| $Date: 2009-07-17 03:53:14 $
| $Author: e107coders $
+----------------------------------------------------------------------------+
*/
@@ -1016,19 +1016,19 @@ class menuManager{
$text .= $rs->form_select_close();
$text .= "";
diff --git a/e107_images/admin_images/down_16.png b/e107_images/admin_images/down_16.png
new file mode 100644
index 000000000..f3bc4cd09
Binary files /dev/null and b/e107_images/admin_images/down_16.png differ
diff --git a/e107_images/admin_images/down_32.png b/e107_images/admin_images/down_32.png
new file mode 100644
index 000000000..5cbe6bb69
Binary files /dev/null and b/e107_images/admin_images/down_32.png differ
diff --git a/e107_images/admin_images/false_16.png b/e107_images/admin_images/false_16.png
new file mode 100644
index 000000000..a432b492c
Binary files /dev/null and b/e107_images/admin_images/false_16.png differ
diff --git a/e107_images/admin_images/false_32.png b/e107_images/admin_images/false_32.png
new file mode 100644
index 000000000..2d5e260a5
Binary files /dev/null and b/e107_images/admin_images/false_32.png differ
diff --git a/e107_images/admin_images/plugin_install_16.png b/e107_images/admin_images/plugin_install_16.png
new file mode 100644
index 000000000..0f6b9f9f8
Binary files /dev/null and b/e107_images/admin_images/plugin_install_16.png differ
diff --git a/e107_images/admin_images/plugin_install_32.png b/e107_images/admin_images/plugin_install_32.png
new file mode 100644
index 000000000..6b77a056b
Binary files /dev/null and b/e107_images/admin_images/plugin_install_32.png differ
diff --git a/e107_images/admin_images/plugin_uninstall_16.png b/e107_images/admin_images/plugin_uninstall_16.png
new file mode 100644
index 000000000..ccac9f60e
Binary files /dev/null and b/e107_images/admin_images/plugin_uninstall_16.png differ
diff --git a/e107_images/admin_images/plugin_uninstall_32.png b/e107_images/admin_images/plugin_uninstall_32.png
new file mode 100644
index 000000000..25a59f316
Binary files /dev/null and b/e107_images/admin_images/plugin_uninstall_32.png differ
diff --git a/e107_images/admin_images/true_16.png b/e107_images/admin_images/true_16.png
new file mode 100644
index 000000000..5b0f6a617
Binary files /dev/null and b/e107_images/admin_images/true_16.png differ
diff --git a/e107_images/admin_images/true_32.png b/e107_images/admin_images/true_32.png
new file mode 100644
index 000000000..592ce6f4a
Binary files /dev/null and b/e107_images/admin_images/true_32.png differ
diff --git a/e107_images/admin_images/up_16.png b/e107_images/admin_images/up_16.png
index 67b85b1a7..184c118b6 100644
Binary files a/e107_images/admin_images/up_16.png and b/e107_images/admin_images/up_16.png differ
diff --git a/e107_images/admin_images/up_32.png b/e107_images/admin_images/up_32.png
index c8d95456d..899ad4fc9 100644
Binary files a/e107_images/admin_images/up_32.png and b/e107_images/admin_images/up_32.png differ
diff --git a/e107_images/admin_images/warning_16.png b/e107_images/admin_images/warning_16.png
new file mode 100644
index 000000000..474f63fc9
Binary files /dev/null and b/e107_images/admin_images/warning_16.png differ
diff --git a/e107_images/admin_images/warning_32.png b/e107_images/admin_images/warning_32.png
new file mode 100644
index 000000000..d5f6551d9
Binary files /dev/null and b/e107_images/admin_images/warning_32.png differ
diff --git a/e107_themes/_blank/admin_template.php b/e107_themes/_blank/admin_template.php
index 946696310..526a3a971 100644
--- a/e107_themes/_blank/admin_template.php
+++ b/e107_themes/_blank/admin_template.php
@@ -9,8 +9,8 @@
* Admin template - _blank theme
*
* $Source: /cvs_backup/e107_0.8/e107_themes/_blank/admin_template.php,v $
- * $Revision: 1.12 $
- * $Date: 2009-07-12 10:11:35 $
+ * $Revision: 1.13 $
+ * $Date: 2009-07-17 03:53:14 $
* $Author: e107coders $
*
*/
@@ -18,6 +18,95 @@
if (!defined('e107_INIT')) { exit; }
define("ADLINK_COLS",5);
+
+
+if (!defined('ADMIN_TRUE_ICON'))
+{
+ define("ADMIN_TRUE_ICON", "
");
+ define("ADMIN_TRUE_ICON_PATH", e_IMAGE."admin_images/true_32.png");
+}
+
+if (!defined('ADMIN_FALSE_ICON'))
+{
+ define("ADMIN_FALSE_ICON", "
");
+ define("ADMIN_FALSE_ICON_PATH", e_IMAGE."admin_images/false_32.png");
+}
+
+if (!defined('ADMIN_EDIT_ICON'))
+{
+ define("ADMIN_EDIT_ICON", "
");
+ define("ADMIN_EDIT_ICON_PATH", e_IMAGE."admin_images/edit_32.png");
+}
+
+if (!defined('ADMIN_DELETE_ICON'))
+{
+ define("ADMIN_DELETE_ICON", "
");
+ define("ADMIN_DELETE_ICON_PATH", e_IMAGE."admin_images/delete_32.png");
+}
+
+if (!defined('ADMIN_WARNING_ICON'))
+{
+ define("ADMIN_WARNING_ICON", "
");
+ define("ADMIN_WARNING_ICON_PATH", e_IMAGE."admin_images/warning_32.png");
+}
+
+if (!defined('ADMIN_INFO_ICON'))
+{
+ define("ADMIN_INFO_ICON", "
");
+ define("ADMIN_INFO_ICON_PATH", e_IMAGE."admin_images/info_32.png");
+}
+
+if (!defined('ADMIN_CONFIGURE_ICON'))
+{
+ define("ADMIN_CONFIGURE_ICON", "
");
+ define("ADMIN_CONFIGURE_ICON_PATH", e_IMAGE."admin_images/cat_tools_32.png");
+}
+
+if (!defined('ADMIN_VIEW_ICON'))
+{
+ define("ADMIN_VIEW_ICON", "
");
+ define("ADMIN_VIEW_ICON_PATH", e_IMAGE."admin_images/admin_images/search_32.png");
+}
+
+if (!defined('ADMIN_URL_ICON'))
+{
+ define("ADMIN_URL_ICON", "
");
+ define("ADMIN_URL_ICON_PATH", e_IMAGE."admin_images/forums_32.png");
+}
+
+if (!defined('ADMIN_INSTALLPLUGIN_ICON'))
+{
+ define("ADMIN_INSTALLPLUGIN_ICON", "
");
+ define("ADMIN_INSTALLPLUGIN_ICON_PATH", e_IMAGE."admin_images/plugin_install_32.png");
+}
+
+if (!defined('ADMIN_UNINSTALLPLUGIN_ICON'))
+{
+ define("ADMIN_UNINSTALLPLUGIN_ICON", "
");
+ define("ADMIN_UNINSTALLPLUGIN_ICON_PATH", e_IMAGE."admin_images/plugin_unstall_32.png");
+}
+
+if (!defined('ADMIN_UPGRADEPLUGIN_ICON'))
+{
+ define("ADMIN_UPGRADEPLUGIN_ICON", "
");
+ define("ADMIN_UPGRADEPLUGIN_ICON_PATH", e_IMAGE."admin_images/up_32.png");
+}
+
+if (!defined('ADMIN_UP_ICON'))
+{
+ define("ADMIN_UP_ICON", "
");
+ define("ADMIN_UP_ICON_PATH", e_IMAGE."admin_images/up_32.png");
+}
+
+if (!defined('ADMIN_DOWN_ICON'))
+{
+ define("ADMIN_DOWN_ICON", "
");
+ define("ADMIN_DOWN_ICON_PATH", e_IMAGE."admin_images/down_32.png");
+}
+
+
+
+
include_lan(THEME."languages/".e_LANGUAGE.".php");
//{FS_ADMIN_ALT_NAV}