From 8a121f22caca5ab97f099aaa82d20adcec5508fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=B3na=20Lore?= Date: Fri, 4 Nov 2016 10:40:45 +0100 Subject: [PATCH] Custom template and layout for admin dashboard. --- e107_admin/admin.php | 3 + e107_admin/footer.php | 12 +- e107_admin/header.php | 11 +- e107_admin/includes/infopanel.php | 19 +-- e107_themes/bootstrap3/admin_template.php | 178 +++++++++++----------- 5 files changed, 119 insertions(+), 104 deletions(-) diff --git a/e107_admin/admin.php b/e107_admin/admin.php index ecc47d0dd..36600d630 100644 --- a/e107_admin/admin.php +++ b/e107_admin/admin.php @@ -33,6 +33,9 @@ if (varset($pref['adminstyle'])=='cascade' || varset($pref['adminstyle'])=='begi if(strpos($pref['adminstyle'], 'infopanel') === 0) { + // Define constant for using custom template on the dashboard. + define('e_DASHBOARD', true); + require_once(e_ADMIN.'includes/'.$pref['adminstyle'].'.php'); $_class = 'adminstyle_'.$pref['adminstyle']; if(class_exists($_class, false)) diff --git a/e107_admin/footer.php b/e107_admin/footer.php index dacce49e9..431e489d4 100644 --- a/e107_admin/footer.php +++ b/e107_admin/footer.php @@ -19,7 +19,7 @@ if (!defined('e107_INIT')) } $In_e107_Footer = TRUE; // For registered shutdown function -global $error_handler,$db_time,$ADMIN_FOOTER; +global $error_handler,$db_time,$ADMIN_FOOTER,$ADMIN_FOOTER_DASHBOARD; // Legacy fix - call header if not already done, mainly fixing left side menus to work proper if(!deftrue('e_ADMIN_UI') && !deftrue('ADMIN_AREA')) @@ -98,7 +98,15 @@ if (varset($e107_popup) != 1) //NEW - Iframe mod if (!deftrue('e_IFRAME')) { - parse_admin($ADMIN_FOOTER); + // Dashboard uses its own template. + if (deftrue('e_DASHBOARD', false) === true) + { + parse_admin($ADMIN_FOOTER_DASHBOARD); + } + else + { + parse_admin($ADMIN_FOOTER); + } } $eTimingStop = microtime(); diff --git a/e107_admin/header.php b/e107_admin/header.php index f6fede866..d80195d45 100644 --- a/e107_admin/header.php +++ b/e107_admin/header.php @@ -588,7 +588,16 @@ if ($e107_popup != 1) if (!deftrue('e_IFRAME')) { //removed check strpos(e_SELF.'?'.e_QUERY, 'menus.php?configure') === FALSE - parse_admin($ADMIN_HEADER); + + // Dashboard uses its own template. + if (deftrue('e_DASHBOARD', false) === true) + { + parse_admin($ADMIN_HEADER_DASHBOARD); + } + else + { + parse_admin($ADMIN_HEADER); + } } elseif(!vartrue($_GET['configure'])) { diff --git a/e107_admin/includes/infopanel.php b/e107_admin/includes/infopanel.php index 3d8d26050..3736c2985 100644 --- a/e107_admin/includes/infopanel.php +++ b/e107_admin/includes/infopanel.php @@ -281,22 +281,9 @@ class adminstyle_infopanel if(vartrue($_GET['mode']) != 'customize') { // $ns->tablerender(ADLAN_47." ".ADMINNAME, $emessage->render().$text); - echo $mes->render().' - - -
-
- '.$text.' -
- -
- '.$text2.' -
-
- - - - '; + // echo $mes->render(); // TODO + echo $text; // Control Panel + echo $text2; // Latest e107 News + Website Status } else { diff --git a/e107_themes/bootstrap3/admin_template.php b/e107_themes/bootstrap3/admin_template.php index 88c5a6d99..93672aa77 100644 --- a/e107_themes/bootstrap3/admin_template.php +++ b/e107_themes/bootstrap3/admin_template.php @@ -208,121 +208,129 @@ $ADMIN_MODAL = ''; - - - - - - - -$ADMIN_HEADER .= '
-
-
- {SETSTYLE=admin_menu} - +$ADMIN_HEADER_DASHBOARD .= ' +
+
+
+ {SETSTYLE=admin_menu} {ADMIN_MENU} - - - {ADMIN_PWORD} {ADMIN_MENUMANAGER} -
- - {SETSTYLE=site_info} - {ADMINUI_HELP} {ADMIN_HELP} -
- {ADMIN_SITEINFO=creditsonly} {SETSTYLE=admin_menu} - {ADMIN_LATEST=infopanel} {ADMIN_STATUS=infopanel} - {ADMIN_LOG=request} {ADMIN_MSG=request} {ADMIN_PLUGINS} - - - {SETSTYLE=default} - -
-
-
 
-
- - '; +'; +$ADMIN_FOOTER_DASHBOARD = ' +
+
+
+ +
+ Copyright © 2008-2015 e107 Inc (e107.org)
+
+'; + + +$ADMIN_HEADER .= ' +
+
+
+ {SETSTYLE=admin_menu} + {ADMIN_MENU} + {ADMIN_PWORD} + {ADMIN_MENUMANAGER} +
+ {SETSTYLE=site_info} + {ADMINUI_HELP} + {ADMIN_HELP} +
+ {ADMIN_SITEINFO=creditsonly} + {SETSTYLE=admin_menu} + {ADMIN_LATEST=infopanel} + {ADMIN_STATUS=infopanel} + {ADMIN_LOG=request} + {ADMIN_MSG=request} + {ADMIN_PLUGINS} + {SETSTYLE=default} +
+
+
+   +
+
+'; $ADMIN_FOOTER = ' -
-
-
- - -
-
- Copyright © 2008-2015 e107 Inc (e107.org)
-
'; +
+
+
+
+ +'; //{FS_ADMIN_ALT_NAV}