mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-19 04:41:53 +02:00
Code Issues Releases Wiki Activity

Issue #4020 2 new prefs added. Allow default collapsing of side-bar and enable/disable labels on nav-bar.

Browse Source 
Icon cleanup and will now try to guess the right icon based on mode/action. Styling fixes. Removed unused admin stylesheets from bootstrap3.
This commit is contained in:
Cameron
2021-02-03 11:46:32 -08:00
parent df0f45609e
commit 49b8a9690d
27 changed files with 161 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,25 +62,39 @@ class admin_shortcodes extends e_shortcode
}
/**
* Controls the collapsing of the admin left panel sidebar
* @param null $parm
* @return string|null
*/
public function sc_admin_leftpanel_toggle($parm=null)
{
$exclude = array('menus.php', 'phpinfo.php', 'credits.php', 'docs.php');
$exclude = array(
'admin.php',
'menus.php',
'phpinfo.php',
'credits.php',
'docs.php',
'cache.php',
'emoticon.php',
'updateadmin.php',
'administrator.php',
if(in_array(e_PAGE, $exclude))
);
if(!deftrue('e_CURRENT_PLUGIN') && in_array(e_PAGE, $exclude))
{
return null;
}
$collapse = (bool) e107::getPref('admin_collapse_sidebar');
if(varset($_COOKIE['e107_adminLeftPanel']) === 'closed')
if((!isset($_COOKIE['e107_adminLeftPanel']) && $collapse) || varset($_COOKIE['e107_adminLeftPanel']) === 'closed')
{
return 'admin-left-panel-collapsed';
}
// return 'col-md-3 col-lg-2';
}
// {ADMIN_COREUPDATE}
@@ -2079,6 +2093,8 @@ Inverse 10 <span class="badge badge-inverse">10</span>
$array_plugins = e107::getNav()->adminLinks('plugin2');
$displayLabels = (bool) varset($pref['admin_navbar_labels'], false);
// MAIN LINK
/*
if($parm != 'no-main')
@@ -2095,15 +2111,14 @@ Inverse 10 <span class="badge badge-inverse">10</span>
foreach($admin_cat['id'] as $i => $cat)
{
$id = $admin_cat['id'][$i];
$menu_vars[$id]['text'] = $admin_cat['title'][$i];
$menu_vars[$id]['description'] = $admin_cat['title'][$i];
$menu_vars[$id]['link'] = '#';
$menu_vars[$id]['image'] = "<img src='".$admin_cat['img'][$i]."' alt='".$admin_cat['title'][$i]."' class='icon S16' />";
$menu_vars[$id]['image_large'] = "<img src='".$admin_cat['lrg_img'][$i]."' alt='".$admin_cat['title'][$i]."' class='icon S32' />";
$menu_vars[$id]['image_src'] = $admin_cat['img'][$i];
$menu_vars[$id]['image_large_src'] = $admin_cat['lrg_img'][$i];
$menu_vars[$id]['text'] = ($displayLabels) ? $admin_cat['title'][$i] : '';
$menu_vars[$id]['description'] = ($displayLabels === false) ? $admin_cat['title'][$i] : '' ;
$menu_vars[$id]['link'] = '#';
$menu_vars[$id]['image'] = "<img src='".$admin_cat['img'][$i]."' alt='".$admin_cat['title'][$i]."' class='icon S16' />";
$menu_vars[$id]['image_large'] = "<img src='".$admin_cat['lrg_img'][$i]."' alt='".$admin_cat['title'][$i]."' class='icon S32' />";
$menu_vars[$id]['image_src'] = $admin_cat['img'][$i];
$menu_vars[$id]['image_large_src'] = $admin_cat['lrg_img'][$i];
// FIX - 'perm' should not be set or navigation->admin() will be broken (bad permissions) for non main administrators
//$menu_vars[$id]['perm'] = '';
$menu_vars[$id]['sort'] = $admin_cat['sort'][$i];

10
e107_core/templates/admin_template.php
View File

@@ -25,9 +25,9 @@ $ADMIN_TEMPLATE['nav']['start_other'] = '<ul class="nav nav-admin navbar-nav nav
$ADMIN_TEMPLATE['nav']['button'] = '
<li class="dropdown">
<a class="dropdown-toggle navbar-admin-button" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" title="{LINK_TEXT}">
<a class="dropdown-toggle navbar-admin-button" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" title="{LINK_DESCRIPTION}">
{LINK_IMAGE}
{LINK_TEXT}
</a>
{SUB_MENU}
</li>
@@ -37,9 +37,9 @@ $ADMIN_TEMPLATE['nav']['button'] = '
$ADMIN_TEMPLATE['nav']['button_active'] = '
<li class="dropdown active">
<a class="dropdown-toggle navbar-admin-button" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" title="{LINK_TEXT}">
{LINK_IMAGE}
<a class="dropdown-toggle navbar-admin-button" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" title="{LINK_DESCRIPTION}">
{LINK_IMAGE}
{LINK_TEXT}
</a>
{SUB_MENU}
</li>

4
e107_core/xml/default_install.xml
View File

@@ -4,8 +4,10 @@
<core name="admin_alerts_ok">1</core>
<core name="admin_alerts_uniquemenu">0</core>
<core name="admin_separate_plugins">0</core>
<core name="admin_collapse_sidebar">0</core>
<core name="admin_navbar_labels">0</core>
<core name="admincode">0</core>
<core name="admincss">admin_dark.css</core>
<core name="admincss">css/modern-light.css</core>
<core name="adminlanguage"></core>
<core name="adminpwordchange">0</core>
<core name="adminstyle">flexpanel</core>