mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-02 20:57:26 +02:00
Code Issues Releases Wiki Activity

Use $ADMIN_HEADER for flexpanel too.

Browse Source
This commit is contained in:
lonalore
2016-11-15 09:28:59 +01:00
parent 106e186cb7
commit 678a16a3b1
2 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
e107_admin/header.php
View File

@@ -590,16 +590,7 @@ if ($e107_popup != 1)
if (!deftrue('e_IFRAME')) if (!deftrue('e_IFRAME'))
{ {
//removed check strpos(e_SELF.'?'.e_QUERY, 'menus.php?configure') === FALSE //removed check strpos(e_SELF.'?'.e_QUERY, 'menus.php?configure') === FALSE
parse_admin($ADMIN_HEADER);
// "flexpanel" style uses its own template!!!
if(defset('e_PAGE') == 'admin.php' && varset($pref['adminstyle']) == 'flexpanel' && varset($_GET['mode']) != 'customize')
{
parse_admin($ADMIN_HEADER_FLEXPANEL);
}
else
{
parse_admin($ADMIN_HEADER);
}
} }
elseif(!vartrue($_GET['configure'])) elseif(!vartrue($_GET['configure']))
{ {

20
e107_themes/bootstrap3/admin_template.php
View File

@@ -231,7 +231,7 @@ $ADMIN_MODAL = '
'; ';
// TODO - LANs // TODO - LANs
$ADMIN_HEADER_FLEXPANEL = $ADMIN_HEADER = $ADMIN_MODAL . ' $ADMIN_HEADER = $ADMIN_MODAL . '
<div class="navbar navbar-default navbar-fixed-top" role="navigation"> <div class="navbar navbar-default navbar-fixed-top" role="navigation">
<div class="container"> <div class="container">
<div class="navbar-header"> <div class="navbar-header">
@@ -261,13 +261,18 @@ $ADMIN_HEADER_FLEXPANEL = $ADMIN_HEADER = $ADMIN_MODAL . '
<div class="row"> <div class="row">
'; ';
$ADMIN_HEADER_FLEXPANEL .= ' $adminstyle = e107::getConfig()->get('adminstyle', 'infopanel');
if(defset('e_PAGE') == 'admin.php' && $adminstyle == 'flexpanel' && varset($_GET['mode']) != 'customize')
{
$ADMIN_HEADER .= '
<div class="col-sm-12"> <div class="col-sm-12">
<div class="admin-main-content"> <div class="admin-main-content">
'; ';
}
// TODO - LANs else
$ADMIN_HEADER .= ' {
// TODO - LANs
$ADMIN_HEADER .= '
<div class="col-md-3 col-lg-2 admin-left-panel"> <div class="col-md-3 col-lg-2 admin-left-panel">
{SETSTYLE=admin_menu} {SETSTYLE=admin_menu}
{ADMIN_MENU} {ADMIN_MENU}
@@ -298,7 +303,8 @@ $ADMIN_HEADER .= '
<a href="#" title="Toggle Sidebar" data-toggle-sidebar="true">&nbsp;</a> <a href="#" title="Toggle Sidebar" data-toggle-sidebar="true">&nbsp;</a>
</div> </div>
<div class="admin-main-content"> <div class="admin-main-content">
'; ';
}
// TODO - LANs // TODO - LANs
$ADMIN_FOOTER = ' $ADMIN_FOOTER = '