From ae1d9b14baf8afbcd29095053c2911b58eb41e61 Mon Sep 17 00:00:00 2001 From: CaMer0n Date: Fri, 17 Jul 2009 23:23:36 +0000 Subject: [PATCH] Fixed the catch22 bugrain ;-) admin theme icons should be defined in admin_theme.php and not admin_template.php --- e107_admin/emoticon.php | 8 +-- e107_admin/header.php | 19 ++---- e107_themes/_blank/admin_template.php | 94 +------------------------- e107_themes/_blank/admin_theme.php | 96 +++++++++++++++++++++++++++ 4 files changed, 109 insertions(+), 108 deletions(-) diff --git a/e107_admin/emoticon.php b/e107_admin/emoticon.php index 0335d2de6..b3f562f03 100644 --- a/e107_admin/emoticon.php +++ b/e107_admin/emoticon.php @@ -9,9 +9,9 @@ * Administration Area - Emotions Settings & Packs * * $Source: /cvs_backup/e107_0.8/e107_admin/emoticon.php,v $ - * $Revision: 1.13 $ - * $Date: 2009-01-16 17:57:56 $ - * $Author: secretr $ + * $Revision: 1.14 $ + * $Date: 2009-07-17 23:23:36 $ + * $Author: e107coders $ * */ @@ -142,7 +142,7 @@ class emotec
- ".EMOLAN_1." + ".EMOLAN_1." diff --git a/e107_admin/header.php b/e107_admin/header.php index acce1d037..a76239969 100644 --- a/e107_admin/header.php +++ b/e107_admin/header.php @@ -12,8 +12,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_admin/header.php,v $ -| $Revision: 1.37 $ -| $Date: 2009-07-17 07:53:13 $ +| $Revision: 1.38 $ +| $Date: 2009-07-17 23:23:36 $ | $Author: e107coders $ +---------------------------------------------------------------+ */ @@ -91,16 +91,6 @@ if (file_exists(e_LANGUAGEDIR.e_LANGUAGE.'/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')) { @@ -657,6 +647,11 @@ 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_themes/_blank/admin_template.php b/e107_themes/_blank/admin_template.php index 42628ab79..c66c8d589 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.14 $ - * $Date: 2009-07-17 07:53:13 $ + * $Revision: 1.15 $ + * $Date: 2009-07-17 23:23:36 $ * $Author: e107coders $ * */ @@ -20,96 +20,6 @@ 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_ADD_ICON')) -{ - define("ADMIN_ADD_ICON", ""); - define("ADMIN_ADD_ICON_PATH", e_IMAGE."admin_images/add_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/configure_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"); -} - diff --git a/e107_themes/_blank/admin_theme.php b/e107_themes/_blank/admin_theme.php index 4fe023c6e..f8731c1aa 100644 --- a/e107_themes/_blank/admin_theme.php +++ b/e107_themes/_blank/admin_theme.php @@ -9,6 +9,99 @@ $THEME_CORE_JSLIB = array( $register_sc[]='FS_ADMIN_ALT_NAV'; $no_core_css = TRUE; + +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_ADD_ICON')) +{ + define("ADMIN_ADD_ICON", ""); + define("ADMIN_ADD_ICON_PATH", e_IMAGE."admin_images/add_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/configure_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"); +} + + + function theme_head() { $ret = ''; $ret .= ' @@ -32,6 +125,9 @@ function theme_head() { element.select('table.adminlist:not(.no-decorate)').each(function(element) { e107Utils.Decorate.table(element, {tr_td: 'first last'}); + }); + element.select('table.fborder:not(.no-decorate)').each(function(element) { + e107Utils.Decorate.table(element, {tr_td: 'first last'}); }); element.select('div.admintabs').each(function(element) { //show tab navaigation