mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-09-01 18:32:44 +02:00
Code Issues Releases Wiki Activity

Fix for conflict between theme layouts called 'home' and menu-manager navigation.

Browse Source
This commit is contained in:
Cameron
2017-01-24 15:19:40 -08:00
parent eaebab16f5
commit 57c41f5ae9
7 changed files with 67 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_themes/bootstrap3/admin_style.css
View File

@@ -1305,7 +1305,7 @@ td.forumheader { background-image: linear-gradient(#303030,#212121 60%,#171717);
.navbar-nav > li > a.admin-icon-avatar { padding-top:9px; padding-bottom:5px}
.navbar-nav > li > a.admin-icon-avatar { padding-top: 11px; padding-bottom: 10px;}

12
e107_themes/bootstrap3/admin_template.php
View File

@@ -48,7 +48,7 @@ $E_ADMIN_NAVIGATION['button_active'] = '
// Leave Admin Area.
$E_ADMIN_NAVIGATION['button_home'] = '
$E_ADMIN_NAVIGATION['button_enav_home'] = '
<li class="dropdown">
<a class="dropdown-toggle" style="display:inline-block; margin-right:0;" title="'.ADLAN_53.'" href="'.e_HTTP.'" >
{LINK_IMAGE} {LINK_TEXT}
@@ -60,7 +60,7 @@ $E_ADMIN_NAVIGATION['button_home'] = '
';
// Change Language
$E_ADMIN_NAVIGATION['button_language'] = '
$E_ADMIN_NAVIGATION['button_enav_language'] = '
<li class="dropdown">
<a class="dropdown-toggle" title="'.LAN_CHANGE_LANGUAGE.'" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" >
{LINK_IMAGE} {LINK_TEXT}
@@ -83,7 +83,7 @@ $E_ADMIN_NAVIGATION['button_language'] = '
// Logout / Settings / Personalize
$E_ADMIN_NAVIGATION['button_logout'] = '
$E_ADMIN_NAVIGATION['button_enav_logout'] = '
<li class="dropdown">
<a class="dropdown-toggle admin-icon-avatar " title="'.$label.'" role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" >
{LINK_IMAGE} {LINK_TEXT}
@@ -244,9 +244,9 @@ $ADMIN_HEADER = $ADMIN_MODAL . '
<div class="navbar-collapse collapse">
{ADMIN_NAVIGATION=no-main}
<div>
{ADMIN_NAVIGATION=logout}
{ADMIN_NAVIGATION=language}
{ADMIN_NAVIGATION=home}
{ADMIN_NAVIGATION=enav_logout}
{ADMIN_NAVIGATION=enav_language}
{ADMIN_NAVIGATION=enav_home}
{ADMIN_PM}
{ADMIN_DEBUG}
{ADMIN_UPDATE}