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

Merge pull request #2116 from MikeyGMT/mikey20161205

Browse Source 
Missing Lans for Menus #6
This commit is contained in:
Cameron
2016-12-05 20:29:15 -08:00
committed by GitHub
parent e6be1b8a2c ae84a4508f
commit 9c15e293d0
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
e107_admin/menus.php
View File

@@ -2,7 +2,7 @@
/* /*
* e107 website system * e107 website system
* *
* Copyright (C) 2008-2013 e107 Inc (e107.org) * Copyright (C) 2008-2016 e107 Inc (e107.org)
* Released under the terms and conditions of the * Released under the terms and conditions of the
* GNU General Public License (http://www.gnu.org/licenses/gpl.txt) * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
* *
@@ -607,8 +607,8 @@ if($_SERVER['E_DEV_MENU'] == 'true')
$text = ' $text = '
<ul class="nav nav-tabs"> <ul class="nav nav-tabs">
<li class="active"><a href="#plugins" data-toggle="tab">Plugins</a></li> <li class="active"><a href="#plugins" data-toggle="tab">'.ADLAN_CL_7.'</a></li>
<li><a href="#custom" data-toggle="tab">Custom</a></li> <li><a href="#custom" data-toggle="tab">'.LAN_CUSTOM.'</a></li>
</ul> </ul>
<div class="tab-content">'; <div class="tab-content">';
@@ -912,7 +912,7 @@ class e_layout
// return print_a($this->menuData,true); // return print_a($this->menuData,true);
$text = "<div class='menu-panel'>"; $text = "<div class='menu-panel'>";
$text .= "<div class='menu-panel-header' title=\"".MENLAN_34."\">Area ".$area."</div>\n"; $text .= "<div class='menu-panel-header' title=\"".MENLAN_34."\">".MENLAN_14." ".$area."</div>\n";
$text .= $frm->open('form-area-'.$area,'post',e_SELF); $text .= $frm->open('form-area-'.$area,'post',e_SELF);
$text .= "<ul id='area-".$area."' class='sortable unstyled list-unstyled'> $text .= "<ul id='area-".$area."' class='sortable unstyled list-unstyled'>
<li>&nbsp;</li>"; <li>&nbsp;</li>";

2
e107_languages/English/admin/lan_admin.php
View File

@@ -337,7 +337,7 @@ define("LAN_USERCLASS", "Userclass");
define("LAN_HELP", "Help"); define("LAN_HELP", "Help");
define("LAN_CUSTOM", "Custom configuration"); define("LAN_CUSTOM", "Custom");
define("LAN_MENULAYOUT", "Menu Layout"); define("LAN_MENULAYOUT", "Menu Layout");
define("LAN_MEDIAMANAGER", "Media Manager"); define("LAN_MEDIAMANAGER", "Media Manager");