mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-06-03 17:34:59 +02:00
Code Issues Releases Wiki Activity

AdminUI: Menu icon added.

Browse Source
This commit is contained in:
Cameron 2016-11-01 16:42:47 -07:00
parent c911ded19b
commit a3312a24a6
6 changed files with 49 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/cpage.php
View File

@ -68,6 +68,8 @@ class page_admin extends e_admin_dispatcher
// 'menu/create' => array('caption'=> CUSLAN_31, 'perm' => 'J', 'tab' => 2),
'page/prefs' => array('caption'=> LAN_OPTIONS, 'perm' => '0')
);
protected $adminMenuIcon = 'e-custom-24';
protected $adminMenuAliases = array(

1
e107_admin/newspost.php
View File

@ -88,6 +88,7 @@ class news_admin extends e_admin_dispatcher
// 'main/maint' => array('caption'=> LAN_NEWS_55, 'perm' => '0') // Maintenance
);
protected $adminMenuIcon = 'e-news-24';
protected $adminMenuAliases = array(

6
e107_handlers/admin_ui.php
View File

@ -1001,6 +1001,7 @@ class e_admin_dispatcher
protected $adminMenu = array();
protected $adminMenuIcon = null;
/**
* Optional (set by child class).
* Page titles for pages not in adminMenu (e.g. main/edit)
@ -1573,7 +1574,10 @@ class e_admin_dispatcher
$request = $this->getRequest();
if(!$selected) $selected = $request->getMode().'/'.$request->getAction();
$selected = vartrue($this->adminMenuAliases[$selected], $selected);
return e107::getNav()->admin($this->menuTitle, $selected, $var);
$icon = (deftrue('e_CURRENT_PLUGIN')) ? e107::getPlugin()->getIcon(e_CURRENT_PLUGIN, 32, '') : e107::getParser()->toIcon($this->adminMenuIcon);
return e107::getNav()->admin($icon."<span>".$this->menuTitle."</span>", $selected, $var);
}

10
e107_handlers/e_parse_class.php
View File

@ -3497,8 +3497,14 @@ class e_parser
if(substr($text,0,2) == 'e-') // e107 admin icon.
{
$size = (substr($text,-3) == '-32') ? 'S32' : 'S16';
return "<i class='".$size." ".$text."'></i>";
$size = (substr($text,-3) == '-32') ? 'S32' : 'S16';
if(substr($text,-3) == '-24')
{
$size = 'S24';
}
return "<i class='".$size." ".$text."'></i>";
}
// Get Glyph names.

25
e107_handlers/plugin_class.php
View File

@ -3264,22 +3264,23 @@ class e107plugin
}
// return the Icon of the
function getIcon($plugName='',$size=32)
function getIcon($plugName='',$size=32, $defaultOverride=false)
{
if(!$plugName) return;
if(!$plugName) return false;
$tp = e107::getParser();
if(!isset($this->parsed_plugin[$plugName]))
{
$plug_vars = $this->parse_plugin($plugName);
}
else
{
$plug_vars = $this->parsed_plugin[$plugName];
$this->parse_plugin($plugName,true);
}
$plug_vars = $this->parsed_plugin[$plugName];
//return print_r($plug_vars,TRUE);
//return print_r($plug_vars,TRUE);
$sizeArray = array(32=>'icon', 16=>'iconSmall');
$default = ($size == 32) ? $tp->toGlyph('e-cat_plugins-32') : "<img class='icon S16' src='".E_16_CAT_PLUG."' alt='' />";
@ -3287,7 +3288,13 @@ class e107plugin
$icon_src = e_PLUGIN.$plugName."/".$plug_vars['administration'][$sz];
$plugin_icon = $plug_vars['administration'][$sz] ? "<img src='{$icon_src}' alt='' class='icon S".intval($size)."' />" : $default;
if($defaultOverride !== false && $default === $plugin_icon)
{
return $defaultOverride;
}
if(!$plugin_icon)
{
//

17
e107_themes/bootstrap3/admin_style.css
View File

@ -593,6 +593,8 @@ i.S16, li.plupload_done a {
line-height: 14px;
vertical-align: text-top;
}
i.e-add-16{ background-position: 0 0; width: 16px; height: 16px; }
i.e-adminlogs-16{ background-position: -21px 0; width: 16px; height: 16px; }
i.e-adminpass-16{ background-position: -42px 0; width: 16px; height: 16px; }
@ -686,6 +688,17 @@ i.S32 {
height:32px;
}
i.S24 {
background: url(images/adminicons_32.png) no-repeat top left;
display: inline-block;
background-size: 1522px;
width:24px;
height:24px;
}
i.e-news-24{ background-position: -1442px 0; }
i.e-custom-24{ background-position: -639px 0; }
i.e-add-32{ background-position: 0 0; width: 32px; height: 32px; }
i.e-adminlogs-32{ background-position: -37px 0; width: 32px; height: 32px; }
i.e-adminpass-32{ background-position: -74px 0; width: 32px; height: 32px; }
@ -1265,6 +1278,10 @@ li.after-submit:hover { background-color: #337AB7; color:white }
.plugin-manager .fa-refresh { padding-top: 4px }
#left-panel .panel-title span { display: inline-block; vertical-align: middle; color:white;text-shadow:0 1px 1px #000}
#left-panel .panel-title .S24, #left-panel .panel-title img { margin-right:6px; width:24px; height:24px; vertical-align:middle}
/*
body { background-color: rgb(68, 68, 68); }