mirror of
https://github.com/e107inc/e107.git
synced 2025-09-01 18:32:44 +02:00
More work on theme-manager and menu-manager.
This commit is contained in:
@@ -726,12 +726,14 @@ ul.plugin-navigation ul.plugin-navigation-sub a.link-active {font-weight: bold;}
|
||||
/******** Block Elements */
|
||||
.block { border: 1px solid #DDDDDD; margin-bottom: 10px;}
|
||||
.block-text { padding: 10px 10px 10px; }
|
||||
.block h2.caption, .block h4.caption { padding: 5px 10px 5px; border-bottom: 1px solid #DDDDDD; }
|
||||
.block h2.caption, .block h4.caption { padding: 5px 10px 5px; border-bottom: 1px solid #DDDDDD; }
|
||||
.page-info { border: 1px solid #DDDDDD; margin-bottom: 10px; }
|
||||
.page-info p { padding: 10px; }
|
||||
|
||||
/***** Admin Info Panel Buttons **/
|
||||
|
||||
h2.caption { font-size: 200%; font-weight:bold; }
|
||||
|
||||
.core-mainpanel-block { text-align:center; width:100px; float:left; height:48px; display:block;margin:15px; }
|
||||
.core-mainpanel-link-text { font-weight:bold; text-decoration: none; padding:3px }
|
||||
|
||||
|
@@ -6,8 +6,8 @@
|
||||
| Released under the terms and conditions of the GNU General Public License (http://gnu.org).
|
||||
|
|
||||
| $Source: /cvs_backup/e107_0.8/e107_themes/templates/header_default.php,v $
|
||||
| $Revision: 1.32 $
|
||||
| $Date: 2009-07-07 16:04:51 $
|
||||
| $Revision: 1.33 $
|
||||
| $Date: 2009-07-09 08:31:38 $
|
||||
| $Author: e107coders $
|
||||
+-----------------------------------------------------------------------------------------------+
|
||||
*/
|
||||
@@ -448,17 +448,19 @@ if ($e107_popup != 1) {
|
||||
|
||||
// ---------- New in 0.8 -------------------------------------------------------
|
||||
|
||||
$def = THEME_LAYOUT;
|
||||
$def = THEME_LAYOUT; // The active layout based on custompage matches.
|
||||
|
||||
// echo "DEF = ".$def;
|
||||
// echo "DEF = ".$def."<br />";
|
||||
|
||||
if(($def == 'no_array') && (isset($CUSTOMHEADER) || isset($CUSTOMFOOTER)) ) // 0.6 themes.
|
||||
if(($def == 'legacyCustom' || $def=='legacyDefault') && (isset($CUSTOMHEADER) || isset($CUSTOMFOOTER)) ) // 0.6 themes.
|
||||
{
|
||||
// echo " MODE 0.6";
|
||||
$HEADER = ($CUSTOMHEADER) ? $CUSTOMHEADER : $HEADER;
|
||||
$FOOTER = ($CUSTOMFOOTER) ? $CUSTOMFOOTER : $FOOTER;
|
||||
if($def == 'legacyCustom')
|
||||
{
|
||||
$HEADER = ($CUSTOMHEADER) ? $CUSTOMHEADER : $HEADER;
|
||||
$FOOTER = ($CUSTOMFOOTER) ? $CUSTOMFOOTER : $FOOTER;
|
||||
}
|
||||
}
|
||||
elseif($def && $def != "no_array" && (isset($CUSTOMHEADER[$def]) || isset($CUSTOMHEADER[$def]))) // 0.7 themes
|
||||
elseif($def && $def != "legacyCustom" && (isset($CUSTOMHEADER[$def]) || isset($CUSTOMHEADER[$def]))) // 0.7 themes
|
||||
{
|
||||
// echo " MODE 0.7";
|
||||
$HEADER = ($CUSTOMHEADER[$def]) ? $CUSTOMHEADER[$def] : $HEADER;
|
||||
|
Reference in New Issue
Block a user