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

Fix for admin navigation active sublink.

Browse Source
This commit is contained in:
Cameron
2020-06-02 12:02:43 -07:00
parent 1c8e755edf
commit f375024147
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1955,6 +1955,7 @@ Inverse 10 <span class="badge badge-inverse">10</span>
// MAIN LINK // MAIN LINK
/*
if($parm != 'no-main') if($parm != 'no-main')
{ {
$menu_vars = array(); $menu_vars = array();
@@ -1963,7 +1964,7 @@ Inverse 10 <span class="badge badge-inverse">10</span>
$menu_vars['adminhome']['image'] = "<img src='".E_16_NAV_MAIN."' alt='".ADLAN_151."' class='icon S16' />"; $menu_vars['adminhome']['image'] = "<img src='".E_16_NAV_MAIN."' alt='".ADLAN_151."' class='icon S16' />";
$menu_vars['adminhome']['image_src'] = ADLAN_151; $menu_vars['adminhome']['image_src'] = ADLAN_151;
$menu_vars['adminhome']['perm'] = ''; $menu_vars['adminhome']['perm'] = '';
} }*/
//ALL OTHER ROOT LINKS - temporary data transformation - data structure will be changed in the future and this block will be removed //ALL OTHER ROOT LINKS - temporary data transformation - data structure will be changed in the future and this block will be removed

15
e107_handlers/sitelinks_class.php
View File

@@ -1392,7 +1392,7 @@ i.e-cat_users-32{ background-position: -555px 0; width: 32px; height: 32px; }
{ {
$text = $tmpl['start']; $text = $tmpl['start'];
} }
//FIXME - e_parse::array2sc() //FIXME - e_parse::array2sc()
/* $search = array(); /* $search = array();
$search[0] = '/\{LINK_TEXT\}(.*?)/si'; $search[0] = '/\{LINK_TEXT\}(.*?)/si';
@@ -1450,7 +1450,10 @@ i.e-cat_users-32{ background-position: -555px 0; width: 32px; height: 32px; }
$rid = str_replace(array(' ', '_'), '-', $act).($id ? "-{$id}" : ''); $rid = str_replace(array(' ', '_'), '-', $act).($id ? "-{$id}" : '');
//XXX && !is_numeric($act) ??? //XXX && !is_numeric($act) ???
if (($active_page == (string) $act)|| (str_replace("?", "", e_PAGE.e_QUERY) == str_replace("?", "", $act))) if (($active_page == (string) $act)
|| (str_replace("?", "", e_PAGE.e_QUERY) == str_replace("?", "", $act))
|| e_REQUEST_HTTP === $e107_vars[$act]['link']
)
{ {
$temp = $tmpl['button_active'.$kpost]; $temp = $tmpl['button_active'.$kpost];
} }
@@ -1458,7 +1461,9 @@ i.e-cat_users-32{ background-position: -555px 0; width: 32px; height: 32px; }
{ {
$temp = $tmpl['button'.$kpost]; $temp = $tmpl['button'.$kpost];
} }
// e107::getDebug()->log($e107_vars[$act]['link']);
// $temp = $tmpl['button'.$kpost]; // $temp = $tmpl['button'.$kpost];
// echo "ap = ".$active_page; // echo "ap = ".$active_page;
// echo " act = ".$act."<br /><br />"; // echo " act = ".$act."<br /><br />";
@@ -1883,7 +1888,8 @@ i.e-cat_users-32{ background-position: -555px 0; width: 32px; height: 32px; }
{ {
if($removeOnly) if($removeOnly)
{ {
$data['link_url'] = array_shift(explode('#?', $data['link_url'], 2)); $arr = explode('#?', $data['link_url'], 2);
$data['link_url'] = array_shift($arr);
return null; return null;
} }
@@ -2233,6 +2239,7 @@ class navigation_shortcodes extends e_shortcode
foreach($this->var['link_sub'] as $val) foreach($this->var['link_sub'] as $val)
{ {
$active = (e107::getNav()->isActive($val, $this->activeSubFound, true)) ? "_active" : ""; $active = (e107::getNav()->isActive($val, $this->activeSubFound, true)) ? "_active" : "";
$this->setVars($val); // isActive is allowed to alter data $this->setVars($val); // isActive is allowed to alter data
$tmpl = !empty($val['link_sub']) ? varset($this->template['submenu_loweritem'.$active]) : varset($this->template['submenu_item'.$active]); $tmpl = !empty($val['link_sub']) ? varset($this->template['submenu_loweritem'.$active]) : varset($this->template['submenu_item'.$active]);
$text .= e107::getParser()->parseTemplate($tmpl, TRUE, $this); $text .= e107::getParser()->parseTemplate($tmpl, TRUE, $this);

4
e107_themes/bootstrap3/admin_style.css
View File

@@ -457,8 +457,11 @@ ul#e-status i {
-o-filter: grayscale(100%); -o-filter: grayscale(100%);
filter: grayscale(100%); filter: grayscale(100%);
filter: gray; /* IE 6-9 */ filter: gray; /* IE 6-9 */
opacity: 0.6
} }
ul.navbar-nav li ul.dropdown-menu > li.active a img,
ul.navbar-nav li ul.dropdown-menu > li.active a i,
ul.navbar-nav li ul.dropdown-menu a:hover i, ul.navbar-nav li ul.dropdown-menu a:hover i,
ul.navbar-nav li ul.dropdown-menu a:hover img, ul.navbar-nav li ul.dropdown-menu a:hover img,
ul#e-latest a:hover img, ul#e-latest a:hover img,
@@ -471,6 +474,7 @@ ul#e-status a:hover i
-moz-filter: none; -moz-filter: none;
-ms-filter: none; -ms-filter: none;
-o-filter: none; -o-filter: none;
opacity: 1;
} }
td.options { } td.options { }