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

Display Theme/Plugin update shortcode on dashboard only.

Browse Source
This commit is contained in:
Cameron
2017-02-02 11:59:14 -08:00
parent f7a14d29ae
commit 56b3cf7915
3 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/admin.php
View File

@@ -63,7 +63,7 @@ if(in_array($pref['adminstyle'], array('infopanel', 'flexpanel')))
} }
define('e_ADMIN_HOME', true); // used by some admin shortcodes.
require_once(e_ADMIN.'boot.php'); require_once(e_ADMIN.'boot.php');
require_once(e_ADMIN.'auth.php'); require_once(e_ADMIN.'auth.php');

9
e107_core/shortcodes/batch/admin_shortcodes.php
View File

@@ -415,9 +415,9 @@ class admin_shortcodes
function sc_admin_latest($parm) function sc_admin_latest($parm)
{ {
if(($parm == 'infopanel' || $parm == 'flexpanel') && e_PAGE != 'admin.php') if(($parm == 'infopanel' || $parm == 'flexpanel') && !deftrue('e_ADMIN_HOME'))
{ {
return; return null;
} }
if (ADMIN) { if (ADMIN) {
@@ -1110,7 +1110,7 @@ class admin_shortcodes
function sc_admin_status($parm) function sc_admin_status($parm)
{ {
if(($parm == 'infopanel' || $parm == 'flexpanel') && e_PAGE != 'admin.php') if(($parm == 'infopanel' || $parm == 'flexpanel') && !deftrue('e_ADMIN_HOME'))
{ {
return; return;
} }
@@ -1321,11 +1321,12 @@ Inverse 10 <span class="badge badge-inverse">10</span>
function sc_admin_addon_updates() function sc_admin_addon_updates()
{ {
if(!getperms('0')) if(!getperms('0') || !deftrue('e_ADMIN_HOME'))
{ {
return null; return null;
} }
$themes = $this->getUpdateable('theme'); $themes = $this->getUpdateable('theme');
$plugins = $this->getUpdateable('plugin'); $plugins = $this->getUpdateable('plugin');

12
e107_themes/bootstrap3/admin_theme.php
View File

@@ -24,19 +24,9 @@ e107::library('load', 'bootstrap');
e107::library('load', 'fontawesome'); e107::library('load', 'fontawesome');
e107::library('load', 'bootstrap.editable'); e107::library('load', 'bootstrap.editable');
$adminStyle = e107::pref('core', 'admincss', 'css/bootstrap-dark.min.css');
$adminStyle = e107::pref('core', 'admincss');
//e107::css('theme', 'css/bootstrap-dark.min.css');
e107::css('theme', $adminStyle); e107::css('theme', $adminStyle);
e107::css('theme', 'admin_style.css'); e107::css('theme', 'admin_style.css');
if(!deftrue('e_DEBUG'))
{
e107::css('theme', 'admin_dark.css');
}
e107::css('theme', 'ie_all.css', null, 'all', "<!--[if IE]>", "<![endif]-->"); e107::css('theme', 'ie_all.css', null, 'all', "<!--[if IE]>", "<![endif]-->");
e107::css('inline', " e107::css('inline', "