mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-12 10:36:20 +02:00
Code Issues Releases Wiki Activity

Fixed the catch22 bugrain ;-) admin theme icons should be defined in admin_theme.php and not admin_template.php

Browse Source
This commit is contained in:
CaMer0n
2009-07-17 23:23:36 +00:00
parent fb02636ebf
commit ae1d9b14ba
4 changed files with 109 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
e107_admin/emoticon.php
View File

@ -9,9 +9,9 @@
* Administration Area - Emotions Settings & Packs * Administration Area - Emotions Settings & Packs
* *
* $Source: /cvs_backup/e107_0.8/e107_admin/emoticon.php,v $ * $Source: /cvs_backup/e107_0.8/e107_admin/emoticon.php,v $
* $Revision: 1.13 $ * $Revision: 1.14 $
* $Date: 2009-01-16 17:57:56 $ * $Date: 2009-07-17 23:23:36 $
* $Author: secretr $ * $Author: e107coders $
* *
*/ */
@ -142,7 +142,7 @@ class emotec
</ul> </ul>
<form method='post' action='".e_SELF."'> <form method='post' action='".e_SELF."'>
<fieldset id='emoticon-activate'> <fieldset id='emoticon-activate'>
<legend'>".EMOLAN_1."</legend> <legend>".EMOLAN_1."</legend>
<table cellpadding='0' cellspacing='0' class='adminlist'> <table cellpadding='0' cellspacing='0' class='adminlist'>
<colgroup span='2'> <colgroup span='2'>
<col style='width:30%' /> <col style='width:30%' />

19
e107_admin/header.php
View File

@ -12,8 +12,8 @@
| GNU General Public License (http://gnu.org). | GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_admin/header.php,v $ | $Source: /cvs_backup/e107_0.8/e107_admin/header.php,v $
| $Revision: 1.37 $ | $Revision: 1.38 $
| $Date: 2009-07-17 07:53:13 $ | $Date: 2009-07-17 23:23:36 $
| $Author: e107coders $ | $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')) { 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")) { if (!function_exists("parse_admin")) {
function parse_admin($ADMINLAYOUT) { function parse_admin($ADMINLAYOUT) {

94
e107_themes/_blank/admin_template.php
View File

@ -9,8 +9,8 @@
* Admin template - _blank theme * Admin template - _blank theme
* *
* $Source: /cvs_backup/e107_0.8/e107_themes/_blank/admin_template.php,v $ * $Source: /cvs_backup/e107_0.8/e107_themes/_blank/admin_template.php,v $
* $Revision: 1.14 $ * $Revision: 1.15 $
* $Date: 2009-07-17 07:53:13 $ * $Date: 2009-07-17 23:23:36 $
* $Author: e107coders $ * $Author: e107coders $
* *
*/ */
@ -20,96 +20,6 @@ if (!defined('e107_INIT')) { exit; }
define("ADLINK_COLS",5); define("ADLINK_COLS",5);
if (!defined('ADMIN_TRUE_ICON'))
{
define("ADMIN_TRUE_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/true_32.png' alt='' />");
define("ADMIN_TRUE_ICON_PATH", e_IMAGE."admin_images/true_32.png");
}
if (!defined('ADMIN_FALSE_ICON'))
{
define("ADMIN_FALSE_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/false_32.png' alt='' />");
define("ADMIN_FALSE_ICON_PATH", e_IMAGE."admin_images/false_32.png");
}
if (!defined('ADMIN_EDIT_ICON'))
{
define("ADMIN_EDIT_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/edit_32.png' alt='' title='".LAN_EDIT."' />");
define("ADMIN_EDIT_ICON_PATH", e_IMAGE."admin_images/edit_32.png");
}
if (!defined('ADMIN_DELETE_ICON'))
{
define("ADMIN_DELETE_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/delete_32.png' alt='' title='".LAN_DELETE."' />");
define("ADMIN_DELETE_ICON_PATH", e_IMAGE."admin_images/delete_32.png");
}
if (!defined('ADMIN_WARNING_ICON'))
{
define("ADMIN_WARNING_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/warning_32.png' alt='' />");
define("ADMIN_WARNING_ICON_PATH", e_IMAGE."admin_images/warning_32.png");
}
if (!defined('ADMIN_ADD_ICON'))
{
define("ADMIN_ADD_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/add_32.png' alt='' />");
define("ADMIN_ADD_ICON_PATH", e_IMAGE."admin_images/add_32.png");
}
if (!defined('ADMIN_INFO_ICON'))
{
define("ADMIN_INFO_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/info_32.png' alt='' />");
define("ADMIN_INFO_ICON_PATH", e_IMAGE."admin_images/info_32.png");
}
if (!defined('ADMIN_CONFIGURE_ICON'))
{
define("ADMIN_CONFIGURE_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/configure_32.png' alt='' />");
define("ADMIN_CONFIGURE_ICON_PATH", e_IMAGE."admin_images/configure_32.png");
}
if (!defined('ADMIN_VIEW_ICON'))
{
define("ADMIN_VIEW_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/search_32.png' alt='' />");
define("ADMIN_VIEW_ICON_PATH", e_IMAGE."admin_images/admin_images/search_32.png");
}
if (!defined('ADMIN_URL_ICON'))
{
define("ADMIN_URL_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/forums_32.png' alt='' />");
define("ADMIN_URL_ICON_PATH", e_IMAGE."admin_images/forums_32.png");
}
if (!defined('ADMIN_INSTALLPLUGIN_ICON'))
{
define("ADMIN_INSTALLPLUGIN_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/plugin_install_32.png' alt='' />");
define("ADMIN_INSTALLPLUGIN_ICON_PATH", e_IMAGE."admin_images/plugin_install_32.png");
}
if (!defined('ADMIN_UNINSTALLPLUGIN_ICON'))
{
define("ADMIN_UNINSTALLPLUGIN_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/plugin_uninstall_32.png' alt='' />");
define("ADMIN_UNINSTALLPLUGIN_ICON_PATH", e_IMAGE."admin_images/plugin_unstall_32.png");
}
if (!defined('ADMIN_UPGRADEPLUGIN_ICON'))
{
define("ADMIN_UPGRADEPLUGIN_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/up_32.png' alt='' />");
define("ADMIN_UPGRADEPLUGIN_ICON_PATH", e_IMAGE."admin_images/up_32.png");
}
if (!defined('ADMIN_UP_ICON'))
{
define("ADMIN_UP_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/up_32.png' alt='' title='".LAN_DELETE."' />");
define("ADMIN_UP_ICON_PATH", e_IMAGE."admin_images/up_32.png");
}
if (!defined('ADMIN_DOWN_ICON'))
{
define("ADMIN_DOWN_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/down_32.png' alt='' title='".LAN_DELETE."' />");
define("ADMIN_DOWN_ICON_PATH", e_IMAGE."admin_images/down_32.png");
}

96
e107_themes/_blank/admin_theme.php
View File

@ -9,6 +9,99 @@ $THEME_CORE_JSLIB = array(
$register_sc[]='FS_ADMIN_ALT_NAV'; $register_sc[]='FS_ADMIN_ALT_NAV';
$no_core_css = TRUE; $no_core_css = TRUE;
if (!defined('ADMIN_TRUE_ICON'))
{
define("ADMIN_TRUE_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/true_32.png' alt='' />");
define("ADMIN_TRUE_ICON_PATH", e_IMAGE."admin_images/true_32.png");
}
if (!defined('ADMIN_FALSE_ICON'))
{
define("ADMIN_FALSE_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/false_32.png' alt='' />");
define("ADMIN_FALSE_ICON_PATH", e_IMAGE."admin_images/false_32.png");
}
if (!defined('ADMIN_EDIT_ICON'))
{
define("ADMIN_EDIT_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/edit_32.png' alt='' title='".LAN_EDIT."' />");
define("ADMIN_EDIT_ICON_PATH", e_IMAGE."admin_images/edit_32.png");
}
if (!defined('ADMIN_DELETE_ICON'))
{
define("ADMIN_DELETE_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/delete_32.png' alt='' title='".LAN_DELETE."' />");
define("ADMIN_DELETE_ICON_PATH", e_IMAGE."admin_images/delete_32.png");
}
if (!defined('ADMIN_WARNING_ICON'))
{
define("ADMIN_WARNING_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/warning_32.png' alt='' />");
define("ADMIN_WARNING_ICON_PATH", e_IMAGE."admin_images/warning_32.png");
}
if (!defined('ADMIN_ADD_ICON'))
{
define("ADMIN_ADD_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/add_32.png' alt='' />");
define("ADMIN_ADD_ICON_PATH", e_IMAGE."admin_images/add_32.png");
}
if (!defined('ADMIN_INFO_ICON'))
{
define("ADMIN_INFO_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/info_32.png' alt='' />");
define("ADMIN_INFO_ICON_PATH", e_IMAGE."admin_images/info_32.png");
}
if (!defined('ADMIN_CONFIGURE_ICON'))
{
define("ADMIN_CONFIGURE_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/configure_32.png' alt='' />");
define("ADMIN_CONFIGURE_ICON_PATH", e_IMAGE."admin_images/configure_32.png");
}
if (!defined('ADMIN_VIEW_ICON'))
{
define("ADMIN_VIEW_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/search_32.png' alt='' />");
define("ADMIN_VIEW_ICON_PATH", e_IMAGE."admin_images/admin_images/search_32.png");
}
if (!defined('ADMIN_URL_ICON'))
{
define("ADMIN_URL_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/forums_32.png' alt='' />");
define("ADMIN_URL_ICON_PATH", e_IMAGE."admin_images/forums_32.png");
}
if (!defined('ADMIN_INSTALLPLUGIN_ICON'))
{
define("ADMIN_INSTALLPLUGIN_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/plugin_install_32.png' alt='' />");
define("ADMIN_INSTALLPLUGIN_ICON_PATH", e_IMAGE."admin_images/plugin_install_32.png");
}
if (!defined('ADMIN_UNINSTALLPLUGIN_ICON'))
{
define("ADMIN_UNINSTALLPLUGIN_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/plugin_uninstall_32.png' alt='' />");
define("ADMIN_UNINSTALLPLUGIN_ICON_PATH", e_IMAGE."admin_images/plugin_unstall_32.png");
}
if (!defined('ADMIN_UPGRADEPLUGIN_ICON'))
{
define("ADMIN_UPGRADEPLUGIN_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/up_32.png' alt='' />");
define("ADMIN_UPGRADEPLUGIN_ICON_PATH", e_IMAGE."admin_images/up_32.png");
}
if (!defined('ADMIN_UP_ICON'))
{
define("ADMIN_UP_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/up_32.png' alt='' title='".LAN_DELETE."' />");
define("ADMIN_UP_ICON_PATH", e_IMAGE."admin_images/up_32.png");
}
if (!defined('ADMIN_DOWN_ICON'))
{
define("ADMIN_DOWN_ICON", "<img class='icon action S32' src='".e_IMAGE_ABS."admin_images/down_32.png' alt='' title='".LAN_DELETE."' />");
define("ADMIN_DOWN_ICON_PATH", e_IMAGE."admin_images/down_32.png");
}
function theme_head() { function theme_head() {
$ret = ''; $ret = '';
$ret .= ' $ret .= '
@ -32,6 +125,9 @@ function theme_head() {
element.select('table.adminlist:not(.no-decorate)').each(function(element) { element.select('table.adminlist:not(.no-decorate)').each(function(element) {
e107Utils.Decorate.table(element, {tr_td: 'first last'}); 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) { element.select('div.admintabs').each(function(element) {
//show tab navaigation //show tab navaigation