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

Icon cleanup and will now try to guess the right icon based on mode/action. Styling fixes. Removed unused admin stylesheets from bootstrap3.

e107_admin/auth.php

@@ -40,7 +40,7 @@ if($adminTheme !== 'bootstrap3' && $adminTheme !== 'bootstrap5')
 $admincss = trim($core->get('admincss'));
 if(empty($admincss) || $admincss === 'style.css'|| $admincss === 'admin_dark.css' || $admincss === 'admin_light.css')
 {
-	$core->update('admincss','css/bootstrap-dark.min.css');
+	$core->update('admincss','css/modern-light.css');
 	$core->save(false,true);
 	e107::getRedirect()->redirect(e_SELF);
 }

e107_admin/eurl.php

@@ -35,9 +35,9 @@ class eurl_admin extends e_admin_dispatcher
 	);
 
 	protected $adminMenu = array(
-		'main/config'		=> array('caption'=> LAN_EURL_MENU_PROFILES, 'perm' => 'L'),
+		'main/config'		=> array('caption'=> LAN_EURL_MENU_PROFILES, 'perm' => 'L', 'icon'=>'fas-list'),
-		'main/alias' 		=> array('caption'=> LAN_EURL_MENU_ALIASES, 'perm' => 'L'),
+		'main/alias' 		=> array('caption'=> LAN_EURL_MENU_ALIASES, 'perm' => 'L', 'icon'=>'fas-edit'),
-		'main/simple' 		=> array('caption'=> LAN_EURL_MENU_CONFIG, 'perm' => 'L'),
+		'main/simple' 		=> array('caption'=> LAN_EURL_MENU_CONFIG, 'perm' => 'L', 'icon'=>'fas-sliders-h'),
 		'main/settings' 	=> array('caption'=> LAN_EURL_MENU_SETTINGS, 'perm' => 'L'),
 
 	//	'main/help' 		=> array('caption'=> LAN_EURL_MENU_HELP, 'perm' => 'L'),

e107_admin/frontpage.php

@@ -741,10 +741,5 @@ function frontpage_adminmenu()
 
 	return e107::getNav()->admin($caption, $action, $var);
 
-
-
-	// show_admin_menu($caption, $action, $var);
 }
 
-
-?>

e107_admin/language.php

@@ -49,7 +49,7 @@ if(!empty($_GET['iframe']))
 		protected $adminMenu = array(
 
 			'main/prefs'	=> array('caption'=> LAN_PREFS, 'perm' => '0'),
-			'main/tools'    => array('caption'=>LANG_LAN_21, 'perm'=>'L')
+			'main/tools'    => array('caption'=>LANG_LAN_21, 'perm'=>'L', 'icon'=>'fas-tools')
 
 		);
 
@@ -70,7 +70,7 @@ if(!empty($_GET['iframe']))
 			{
 				$this->adminMenu = array(
 					'main/prefs'    => $this->adminMenu['main/prefs'],
-					'main/db'       => 	array('caption'=> LANG_LAN_03, 'perm' => 'P'),
+					'main/db'       => 	array('caption'=> LANG_LAN_03, 'perm' => 'P', 'icon'=>'fas-database'),
 					'main/tools'    => $this->adminMenu['main/tools'],
 				);
 			}

e107_admin/meta.php

@@ -39,7 +39,7 @@ class meta_admin extends e_admin_dispatcher
 
 
 	protected $adminMenu = array(
-		'main/meta' => array('caption' => LAN_MANAGE, 'perm' => '0'),
+		'main/meta' => array('caption' => LAN_MANAGE, 'perm' => '0', 'icon'=>'fas-cogs'),
 	);
 
 	protected $adminMenuAliases = array(//	'main/edit'	=> 'main/list'

e107_admin/prefs.php

@@ -636,7 +636,10 @@ $text .= "
 		</fieldset>
 ";
 
-// Admin Display Areas
+
+/**
+ * @note Admin Display Options.
+ */
 $text .= "
 		<fieldset class='e-hideme' id='core-prefs-admindisp'>
 			<legend>".PRFLAN_77."</legend>
@@ -671,10 +674,25 @@ $text .= "
 					<tr>
 						<td><label for='admin-separate-plugins'>".PRFLAN_204."</label></td>
 						<td>
-							".$frm->radio_switch('admin_separate_plugins', $pref['admin_separate_plugins'])."
+							".$frm->radio_switch('admin_separate_plugins', varset($pref['admin_separate_plugins']))."
 							<div class='field-help'>".PRFLAN_205."</div>
 						</td>
 					</tr>
+					<tr>
+						<td><label for='admin-collapse-sidebar'>".PRFLAN_283."</label></td>
+						<td>
+							".$frm->radio_switch('admin_navbar_labels', varset($pref['admin_navbar_labels']))."
+						</td>
+					</tr>
+					<tr>
+						<td><label for='admin-collapse-sidebar'>".PRFLAN_284."</label></td>
+						<td>
+							".$frm->radio_switch('admin_collapse_sidebar', varset($pref['admin_collapse_sidebar']))."
+						</td>
+					</tr>
+					
+					
+					
 				</tbody>
 			</table>
 			".pref_submit('admindisp')."

e107_admin/search.php

@@ -551,4 +551,3 @@ function search_adminmenu()
 
 	e107::getNav()->admin($caption, $action, $var);
 }
-?>

e107_admin/theme.php

@@ -325,9 +325,12 @@ class theme_admin_ui extends e_admin_ui
 		private	function setAdminTheme($folder)
 		{
 
-			$adminCSS = file_exists(e_THEME.$pref['admintheme'].'/admin_dark.css') ? 'admin_dark.css' : 'admin_light.css';
+		//	$adminCSS = file_exists(e_THEME.$pref['admintheme'].'/admin_dark.css') ? 'admin_dark.css' : 'admin_light.css';
 
-			e107::getConfig()->set('admintheme',$folder)->set('admincss',$adminCSS)->save(true,true,true);
+			$cfg = e107::getConfig();
+			$cfg->set('admintheme',$folder);
+		//	$cfg->set('admincss',$adminCSS);  //todo get the default from theme.xml
+			$cfg->save(true,true,true);
 
 			e107::getCache()->clear_sys();
 

e107_core/shortcodes/batch/admin_shortcodes.php

@@ -62,24 +62,38 @@ 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((!isset($_COOKIE['e107_adminLeftPanel']) && $collapse) || varset($_COOKIE['e107_adminLeftPanel']) === 'closed')
-        if(varset($_COOKIE['e107_adminLeftPanel']) === 'closed')
         {
             return 'admin-left-panel-collapsed';
         }
 
-     //   return 'col-md-3 col-lg-2';
 
     }
    
@@ -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,10 +2111,9 @@ 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]['text']             = ($displayLabels) ? $admin_cat['title'][$i] : '';
-			$menu_vars[$id]['description'] = $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' />";

e107_core/templates/admin_template.php

@@ -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}">
+		<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>

e107_core/xml/default_install.xml

@@ -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>

e107_handlers/admin_ui.php

@@ -1635,7 +1635,7 @@ class e_admin_dispatcher
 			// guess an icon.
 			if(!isset($var[$key]['image_src']))
 			{
-				$var[$key]['image_src'] = $this->guessMenuIcon($key);
+				$var[$key]['image_src'] = e_navigation::guessMenuIcon($key);
 			}
 			
 			
@@ -1700,50 +1700,6 @@ class e_admin_dispatcher
 	}
 
 
-	/**
-	 * Guess the admin menu item icon based on the path
-	 * @param $key
-	 * @return string
-	 */
-	private function guessMenuIcon($key)
-	{
-		list($mode, $action) = explode('/',$key);
-
-		switch($action)
-		{
-			case 'list':
-				$ret = $ret = ($mode === 'cat') ? 'fa-folder.glyph' : 'fa-list.glyph';
-				break;
-
-			case 'options':
-			case 'prefs':
-				$ret = 'fa-cog.glyph';
-				break;
-
-			case 'create':
-				$ret = ($mode === 'cat') ? 'fa-folder-plus.glyph' : 'fa-plus.glyph';
-				break;
-
-			case 'tools':
-			case 'maint':
-				$ret = 'fas-toolbox.glyph';
-			break;
-
-			case 'import':
-			case 'upload':
-				$ret = 'fa-upload.glyph';
-			break;
-
-			default:
-				$ret = 'fa-question.glyph';
-				// code to be executed if n is different from all labels;
-		}
-
-
-		return $ret;
-
-	}
-
 	/**
 	 * Render Help Text in <ul> format. XXX TODO
 	 */

e107_handlers/sitelinks_class.php

@@ -663,6 +663,56 @@ class e_navigation
 		
 	}
 
+	/**
+	 * Guess the admin menu item icon based on the path
+	 * @param $key
+	 * @return string
+	 */
+	public static function guessMenuIcon($key)
+	{
+
+		list($mode, $action) = explode('/', $key);
+
+		switch($action)
+		{
+			case 'main':
+			case 'list':
+				$ret = $ret = ($mode === 'cat') ? 'fa-folder.glyph' : 'fa-list.glyph';
+				break;
+
+			case 'options':
+			case 'prefs':
+			case 'settings':
+			case 'config':
+			case 'configure':
+				$ret = 'fa-cog.glyph';
+				break;
+
+			case 'create':
+				$ret = ($mode === 'cat') ? 'fa-folder-plus.glyph' : 'fa-plus.glyph';
+				break;
+
+			case 'tools':
+			case 'maint':
+				$ret = 'fas-toolbox.glyph';
+				break;
+
+			case 'import':
+			case 'upload':
+				$ret = 'fa-upload.glyph';
+				break;
+
+			default:
+				$ret = 'fa-question.glyph';
+			// code to be executed if n is different from all labels;
+		}
+
+
+		return $ret;
+
+	}
+
+
 	function getIconArray()
 	{
 		return $this->iconArray;	
@@ -1327,6 +1377,7 @@ i.e-cat_users-32{ background-position: -555px 0; width: 32px; height: 32px; }
 	
 
 			$replace['LINK_TEXT'] = str_replace(" ", " ", varset($e107_vars[$act]['text']));
+			$replace['LINK_DESCRIPTION'] = varset($e107_vars[$act]['description']);
 
 			// valid URLs
 			$replace['LINK_URL'] = str_replace(array('&', '&'), array('&', '&'), vartrue($e107_vars[$act]['link'], "#{$act}"));
@@ -1346,6 +1397,12 @@ i.e-cat_users-32{ background-position: -555px 0; width: 32px; height: 32px; }
 			$replace['LINK_CLASS'] = varset($e107_vars[$act]['link_class']);
 			$replace['SUB_CLASS'] = '';
 
+			if(!isset($e107_vars[$act]['image_src']) && !isset($e107_vars[$act]['icon']))
+			{
+		//	 e107::getDebug()->log($e107_vars[$act]);
+				$e107_vars[$act]['image_src'] = self::guessMenuIcon($act.'/'.$act);
+			}
+			
 			if(!empty($e107_vars[$act]['image_src']) && strpos($e107_vars[$act]['image_src'], '.glyph') !== false)
 			{
 				$replace['LINK_IMAGE'] = $tp->toGlyph($e107_vars[$act]['image_src'], array('space'=>' '));

e107_handlers/user_model.php

@@ -392,6 +392,7 @@ class e_user_model extends e_admin_model
 				'PageBites',
 				'Peew',
 				'petalbot',
+				'Pinterestbot',
 				'polybot',
 				'Pompos',
 				'PostPost',

e107_handlers/userclass_class.php

@@ -1415,8 +1415,8 @@ class user_class_admin extends user_class
 		
 		$pref = e107::getPref();
 	
-		$style = ($pref['admincss'] == 'admin_dark.css') ? ' icon-white' : '';
+	//	$style = ($pref['admincss'] == 'admin_dark.css') ? ' icon-white' : '';
-		$this->top_icon = "<i class='fa fa-user{$style}'></i> ";
+		$this->top_icon = "<i class='fa fa-user'></i> ";
 	}
 
 

e107_languages/English/admin/lan_prefs.php

@@ -303,3 +303,6 @@ define("PRFLAN_280", "URL to the website terms and conditions");
 define("PRFLAN_281", "The 2 links above are used on various page on this site (e.g. signup and contact form/menu).\nPlease create 2 pages (if not already done) that contain your 'Privacy Policy' and the websites 'Terms and conditions'.\nThere are several websites that can generate those text for you.\nCopy the urls of this websites into the fields above (e.g. /page/privacy-policy or /page/terms-and-conditions).\nJust make sure, the pages and urls exist and are working!");
 
 define("PRFLAN_282", "Session Save Method");
+
+define("PRFLAN_283", "Display navigation-bar labels");
+define("PRFLAN_284", "Collapse navigation side-bar by default");

e107_plugins/forum/forum_admin.php

@@ -70,14 +70,14 @@ e107::css('inline',"
 			'main/opt1'         => array('divider' => true),
 
 			'main/rules'		=> array('caption' => WMGLAN_5, 'perm' => 'P'),
-			'mods/list'         => array('caption' => LAN_FORUM_2003, 'perm'=>'P'),
+			'mods/list'         => array('caption' => LAN_FORUM_2003, 'perm'=>'P', 'icon'=>'fas-user-tie'),
 			'main/prefs' 		=> array('caption' => LAN_PREFS, 'perm' => 'P'),
 
 			'main/opt2'         => array('divider' => true),
 
-			'report/list'       => array('caption' => FORLAN_116, 'perm'=>'P'),
+			'report/list'       => array('caption' => FORLAN_116, 'perm'=>'P', 'icon'=>'fas-flag'),
 			'post/list'         => array('caption' => LAN_PLUGIN_FORUM_LATESTPOSTS, 'perm'=>'P'),
-			'main/prune'		=> array('caption' => LAN_PRUNE, 'perm' => 'P'),
+			'main/prune'		=> array('caption' => LAN_PRUNE, 'perm' => 'P', 'icon'=>'fas-filter'),
 			'main/tools'        => array('caption' => FORLAN_153, 'perm'=>'p')
 		);
 

e107_plugins/tinymce4/plugins/e107/dialog.php

@@ -443,11 +443,11 @@ class e_bootstrap
 					
 		$text .= "<ul class='glyphicons well clearfix'>";
 		
-		$inverse = (e107::getPref('admincss') == "admin_dark.css") ? " icon-white" : "";
+	//	$inverse = (e107::getPref('admincss') == "admin_dark.css") ? " icon-white" : "";
 		
 		foreach($icons as $ic)
 		{
-			$text .= '<li><i class="'.$ic.$inverse.'"></i> '.$ic.'</li>';
+			$text .= '<li><i class="'.$ic.'"></i> '.$ic.'</li>';
 			$text .= "\n";
 		}
 					

e107_themes/bootstrap3/admin_dark.css

@@ -1,78 +0,0 @@
-/* info: Dark stylesheet */
-
-tr.first a, th a {
-    color: rgb(198, 198, 198);
-}
-
-thead tr {
-	
- background-color: rgb(54, 54, 54);
-    background-image: linear-gradient(to bottom, rgb(68, 68, 68), rgb(34, 34, 34));
-    border: 1px solid rgb(3, 3, 3);
-}
-
-
-
-.datetimepicker {
-	background-color: #191919;
-}
-
-.datetimepicker thead tr:first-child th:hover, .datetimepicker tfoot tr:first-child th:hover {
-   
-    background-color: #191919;
-}
-
-.nav-collapse .nav > li > a:hover, .nav-collapse .nav > li > a:focus, .nav-collapse .dropdown-menu a:hover, .nav-collapse .dropdown-menu a:focus {
-    background-color: rgb(54, 54, 54);
-}
-
-tr.highlight-odd, .table-striped > tbody > tr.highlight-odd			{ background-color: #212121; }
-tr.highlight-even, .table-striped > tbody > tr.highlight-even		{ background-color: #212121; }
-
-.datetimepicker table tr td.day:hover {
-
-    color: black;
-}
-
-.datetimepicker table tr td span:hover {
-    color: black;
-}
-
-tr.first a, th a							{ color: rgb(102, 102, 102); }
-
-
-.bootstrap-select.btn-group .dropdown-menu .optgroup-div {
-    color: #363636;
-}
-
-/* Fix for font-awesome / darkstrap overlay issue. */
-.icon-white, .nav-pills > .active > a > [class^="icon-"], .nav-pills > .active > a > [class*=" icon-"], .nav-list > .active > a > [class^="icon-"], .nav-list > .active > a > [class*=" icon-"], .navbar-inverse .nav > .active > a > [class^="icon-"], .navbar-inverse .nav > .active > a > [class*=" icon-"], .dropdown-menu > li > a:hover > [class^="icon-"], .dropdown-menu > li > a:hover > [class*=" icon-"], .dropdown-menu > .active > a > [class^="icon-"], .dropdown-menu > .active > a > [class*=" icon-"], .dropdown-submenu:hover > a > [class^="icon-"], .dropdown-submenu:hover > a > [class*=" icon-"], h1 > [class^="icon-"], h2 > [class^="icon-"], h3 > [class^="icon-"], h4 > [class^="icon-"], h5 > [class^="icon-"], .btn-primary > [class^="icon-"], .nav-tabs > li > a > [class^="icon-"] {
-	background-image: none;
-}
-
-#admin-ui-nav-menu a.link-active { color: #fff }
-
-#admin-ui-media-manager.nav-tabs   { background-color: #212121 }
-.tab-content { background-color: #373737 }
-
-
-input:invalid:focus,
-textarea:invalid:focus,
-select:invalid:focus {
-	border-color: red;
-	box-shadow:  0px 1px 1px 0px rgba(255, 0, 0, 0.75) inset;
-}
-
-
-
-td.forumheader { background-image: linear-gradient(#303030,#212121 60%,#171717); filter: none; text-shadow: 1px 1px 1px rgba(0,0,0,.3);   }
-
-
-
-/*
-.bootstrap-select, bootstrap-select button
-{
-	color: rgb(255, 255, 255);
-	background-color: rgb(34, 34, 34);
-}
-*/

e107_themes/bootstrap3/admin_light.css

@@ -1,53 +0,0 @@
-/* info: Light stylesheet */
-body 						{ background-color: #EEEEEE;  }
-
-
-.navbar .navbar-inner {
-    background-color: rgb(27, 27, 27);
-    background-image: linear-gradient(to bottom, rgb(34, 34, 34), rgb(17, 17, 17));
-    background-repeat: repeat-x;
-    border-color: rgb(37, 37, 37);
-}
-
-.popover,
-.popover-title {
-	background-image: -moz-linear-gradient(center top , rgb(253, 253, 253) 0%, rgb(234, 234, 234) 100%);
-	border-bottom: 0px;	
-}
-
-
-.adminlist, .adminform 		{  border:1px solid #ddd; background-color: #F6F6F6}
-
-.adminlist thead 			{ background-color:#f2f2f2; }
-.adminlist tr.even			{ background-color:#f6f6f6; }
-
-.plupload_header_text 		{ color: black; }
-
-.ui-tabs .ui-tabs-nav li a, .ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a
-{
-	background-color: rgb(230, 230, 230);
-	border-bottom: 1px solid rgb(221, 221, 221);
-	color: rgb(153, 153, 153);
-}
-
-.nav-tabs li a  				{  background-color: rgb(230, 230, 230); color: rgb(153, 153, 153); 
-    							   border-bottom: 1px solid rgb(221, 221, 221);
-								}
-.nav-tabs li a:hover 			{ background-color: rgb(255, 255, 255); color: rgb(0, 67, 138); }
-
-.nav-tabs > .active > a, .nav-tabs > .active > a:hover, .nav-tabs > .active > a:focus
-{
-	background-color: rgb(246, 246, 246);
-	
-}
-
-.modal-header	{ border-bottom:1px solid #DDDDDD;  background-image: -moz-linear-gradient(center top , rgb(253, 253, 253) 0%, rgb(234, 234, 234) 100%); }
-
-.tooltip-inner 				{ box-shadow: 0 2px 5px #808080; -webkit-box-shadow: 0 2px 5px #808080; -moz-box-shadow: 0 2px 5px #808080; }  
-
-.tab-pane table.adminform td 	{ border-top:0px}
-
-tr.highlight-even			{ background-color: silver; }
-tr.highlight-odd			{ background-color: silver; }
-
-th, .fcaption								{  color: rgb(102, 102, 102); background-image: -moz-linear-gradient(center top , rgb(253, 253, 253) 0%, rgb(234, 234, 234) 100%); }

e107_themes/bootstrap3/admin_style.css

@@ -98,7 +98,7 @@ right: 5px; }
 
 body#admin-menus #sc-admin-help { position: relative }
 
-.admin-menu .panel-title .e-help-icon a {
+.admin-ui-nav-menu .panel-title .e-help-icon a {
 display: inline-block;
 vertical-align: middle;
 cursor: help;
@@ -1678,10 +1678,9 @@ padding-top: 15px;
 margin-top: 0; }
 
 
-/*
+/** Optional: Display Admin Nav Button Labels. -- moved to a pref. Cleared to prevent possible conflict.  */
-Optional: Display Admin Nav Button Labels.
+ul.nav-admin a.navbar-admin-button:after { content: none !important; }
-ul.nav-admin a.navbar-admin-button:after { content: attr(title) }
+ul.nav-admin a.navbar-admin-button:before { content: none !important; }
- */
 
 /*
 
@@ -1892,7 +1891,7 @@ tr.highlight-even, .table-striped > tbody > tr.highlight-even		{ background-colo
    transition: width 0.5s;
 }
 
-.admin-left-panel-collapsed .admin-menu {
+.admin-left-panel-collapsed .admin-ui-nav-menu {
     width: 55px;
 }
 

e107_themes/bootstrap3/admin_theme.php

@@ -174,7 +174,7 @@ class bootstrap3_admintheme implements e_theme_render
 				break;
 
 				case 'admin_menu':
-				echo '<div class="admin-menu panel panel-default" >
+				echo '<div class="admin-menu admin-ui-nav-menu panel panel-default" >
 					  <div class="panel-heading">
 					    <h3 class="panel-title">' . $caption . '</h3>
 					  </div>

e107_themes/bootstrap3/css/bootstrap-dark.min.css

@@ -660,7 +660,7 @@ legend{display:block;width:100%;margin-bottom:20px;font-size:21px;line-height:in
 label{display:inline-block;max-width:100%;margin-bottom:5px}
 input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-appearance:none}
 input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px\9;line-height:normal}
-.form-control,output{display:block;font-size:16px;line-height:1.42857143;color:#eee}
+.form-control,output{display:block;font-size:14px;line-height:1.42857143;color:#eee}
 input[type=file]{display:block}
 input[type=range]{display:block;width:100%}
 select[multiple],select[size]{height:auto}
@@ -1466,7 +1466,7 @@ h1,h2,h3,h4,h5,h6{text-shadow:-1px -1px 0 rgba(0,0,0,.3)}
 .table-responsive>.table{background-color:#373737}
 label{font-weight:400}
 .well,input,select,textarea{color:#eee;background-color:#222}
-input[type=date],input[type=time],input[type=datetime-local],input[type=month],input[type=text],input[type=password],input[type=datetime],input[type=week],input[type=email],input[type=url],input[type=tel],input[type=color],input[type=number],input[type=search],select,textarea{line-height:1.42857;background-image:none;border:1px solid #171717;border-radius:4px;transition:border-color .15s ease-in-out 0s,box-shadow .15s ease-in-out 0s;padding:8px 12px;font-size:16px}
+input[type=date],input[type=time],input[type=datetime-local],input[type=month],input[type=text],input[type=password],input[type=datetime],input[type=week],input[type=email],input[type=url],input[type=tel],input[type=color],input[type=number],input[type=search],select,textarea{line-height:1.42857;background-image:none;border:1px solid #171717;border-radius:4px;transition:border-color .15s ease-in-out 0s,box-shadow .15s ease-in-out 0s;padding:8px 12px;font-size:14px}
 .has-warning .control-label,.has-warning .form-control-feedback,.has-warning .help-block{color:#f89406}
 .has-warning .form-control,.has-warning .form-control:focus{border-color:#f89406}
 .has-error .control-label,.has-error .form-control-feedback,.has-error .help-block{color:#ee5f5b}
@@ -1515,7 +1515,7 @@ td.forumheader{background-image:linear-gradient(#303030,#212121 60%,#171717);fil
 .admin-left-panel-collapsed .admin-left-panel { width: 70px }
 .admin-left-panel-collapsed .admin-right-panel { width: calc(100% - 70px) }
 .admin-left-panel-collapsed .nav-pills > li > a { border-radius:0}
-div.admin-left-panel .nav-pills > li > a > span > i { color: rgba(255,255,255,0.5); font-size:1.25em; opacity: 0; width:0;  }
+div.admin-left-panel .nav-pills > li > a > span > i { color: rgba(255,255,255,0.5); font-size:16px; opacity: 0; width:0;  }
 div.admin-left-panel-collapsed .nav-pills > li > a > span > i { opacity: 1; padding-left: 2px; }
 div.admin-left-panel-collapsed .nav-pills > li > a:hover > span > i,
 div.admin-left-panel-collapsed .nav-pills > li.active > a > span > i

e107_themes/bootstrap3/css/kadmin.css

@@ -14417,7 +14417,7 @@ padding-right: 0;
 padding-left: 0; }
 
 .admin-left-panel .panel { background: none; border:0 }
-.admin-menu.panel  { background: none; border:0}
+.admin-ui-nav-menu.panel  { background: none; border:0}
 .admin-left-panel .panel-heading { padding-top:40px; }
 .admin-left-panel .panel-heading {  background: none; border:0; color: white}
 .admin-left-panel .panel-default .panel-heading { color:white; background:none; border-bottom: 1px solid #484848; padding-top: 28px; }
@@ -14454,7 +14454,7 @@ i.searchquery { margin-top: 10px; }
 
 }
 
-.admin-menu.panel .panel-title {
+.admin-ui-nav-menu.panel .panel-title {
     padding-top: 0;
       padding-bottom: 10px;
     margin-top: -10px;

e107_themes/bootstrap3/css/modern-dark.css

@@ -674,7 +674,7 @@ legend{display:block;width:100%;margin-bottom:20px;font-size:21px;line-height:in
 label{display:inline-block;max-width:100%;margin-bottom:5px}
 input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-appearance:none}
 input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px\9;line-height:normal}
-.form-control,output{display:block;font-size:16px;line-height:1.42857143;color:#eee}
+.form-control,output{display:block;font-size:14px;line-height:1.42857143;color:#eee}
 input[type=file]{display:block}
 input[type=range]{display:block;width:100%}
 select[multiple],select[size]{height:auto}
@@ -1480,7 +1480,7 @@ td.visible-print,th.visible-print{display:table-cell!important}
 .table-responsive>.table{background-color:#373737}
 label{font-weight:400}
 .well,input,select,textarea{color:#eee;background-color:#222}
-input[type=date],input[type=time],input[type=datetime-local],input[type=month],input[type=text],input[type=password],input[type=datetime],input[type=week],input[type=email],input[type=url],input[type=tel],input[type=color],input[type=number],input[type=search],select,textarea{line-height:1.42857;background-image:none;border:1px solid #171717;border-radius:4px;transition:border-color .15s ease-in-out 0s,box-shadow .15s ease-in-out 0s;padding:8px 12px;font-size:16px}
+input[type=date],input[type=time],input[type=datetime-local],input[type=month],input[type=text],input[type=password],input[type=datetime],input[type=week],input[type=email],input[type=url],input[type=tel],input[type=color],input[type=number],input[type=search],select,textarea{line-height:1.42857;background-image:none;border:1px solid #171717;border-radius:4px;transition:border-color .15s ease-in-out 0s,box-shadow .15s ease-in-out 0s;padding:8px 12px;font-size:14px}
 .has-warning .control-label,.has-warning .form-control-feedback,.has-warning .help-block{color:#f89406}
 .has-warning .form-control,.has-warning .form-control:focus{border-color:#f89406}
 .has-error .control-label,.has-error .form-control-feedback,.has-error .help-block{color:#ee5f5b}
@@ -1578,7 +1578,7 @@ thead th, thead tr, .table > thead > tr > th { border-bottom: 0; border-left:0;
         }
 
 
-div.admin-left-panel .nav-pills > li > a > span > i { color: rgba(255,255,255,0.5); font-size:1.25em; opacity: 0; width:0;  }
+div.admin-left-panel .nav-pills > li > a > span > i { color: rgba(255,255,255,0.5); font-size:16px; opacity: 0; width:0;  }
 div.admin-left-panel-collapsed .nav-pills > li > a > span > i { opacity: 1; padding-left: 2px; }
 div.admin-left-panel-collapsed .nav-pills > li.active > a { background:none; }
 div.admin-left-panel-collapsed .nav-header.sidebar-toggle-panel { display: none; }

e107_themes/bootstrap3/css/modern-light.css

@@ -329,7 +329,7 @@
         .sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}
         [role=button]{cursor:pointer}
         .h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-weight:500;line-height:1.1;color:#eee}
-        .h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-weight:400;line-height:1;color:#c6c6c6}
+        .h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,.h4 .small,.h4 small,.h5 .small,.h5 small,.h6 .small,.h6 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small,h4 .small,h4 small,h5 .small,h5 small,h6 .small,h6 small{font-weight:400;line-height:1;color:rgba(0,0,0,0.75);}
         .h1,.h2,.h3,h1,h2,h3{margin-top:20px;margin-bottom:10px}
         .h1 .small,.h1 small,.h2 .small,.h2 small,.h3 .small,.h3 small,h1 .small,h1 small,h2 .small,h2 small,h3 .small,h3 small{font-size:65%}
         .h4,.h5,.h6,h4,h5,h6{margin-top:10px;margin-bottom:10px}
@@ -662,7 +662,7 @@
         label{display:inline-block;max-width:100%;margin-bottom:5px}
         input[type=search]{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;-webkit-appearance:none}
         input[type=checkbox],input[type=radio]{margin:4px 0 0;margin-top:1px\9;line-height:normal}
-        .form-control,output{display:block;font-size:16px;line-height:1.42857143;color:rgba(0,0,0,0.75)}
+        .form-control,output{display:block;font-size:14px;line-height:1.42857143;color:rgba(0,0,0,0.75)}
         input[type=file]{display:block}
         input[type=range]{display:block;width:100%}
         select[multiple],select[size]{height:auto}
@@ -1467,7 +1467,7 @@
         .table-responsive>.table{background-color:#373737}
         label{font-weight:400}
         .well,input,select,textarea{color:rgba(0,0,0,0.75);background-color:rgba(0,0,0,0.1)}
-        input[type=date],input[type=time],input[type=datetime-local],input[type=month],input[type=text],input[type=password],input[type=datetime],input[type=week],input[type=email],input[type=url],input[type=tel],input[type=color],input[type=number],input[type=search],select,textarea{line-height:1.42857;background-image:none;border:1px solid rgba(0,0,0,0.3);border-radius:4px;transition:border-color .15s ease-in-out 0s,box-shadow .15s ease-in-out 0s;padding:8px 12px;font-size:16px}
+        input[type=date],input[type=time],input[type=datetime-local],input[type=month],input[type=text],input[type=password],input[type=datetime],input[type=week],input[type=email],input[type=url],input[type=tel],input[type=color],input[type=number],input[type=search],select,textarea{line-height:1.42857;background-image:none;border:1px solid rgba(0,0,0,0.3);border-radius:4px;transition:border-color .15s ease-in-out 0s,box-shadow .15s ease-in-out 0s;padding:8px 12px;font-size:14px}
         .has-warning .control-label,.has-warning .form-control-feedback,.has-warning .help-block{color:#f89406}
         .has-warning .form-control,.has-warning .form-control:focus{border-color:#f89406}
         .has-error .control-label,.has-error .form-control-feedback,.has-error .help-block{color:#ee5f5b}
@@ -1496,13 +1496,13 @@
         .alert .alert-link,.alert a{color:#fff;text-decoration:underline}
         .alert .close,.alert a.btn{text-decoration:none}
         .alert .close{color:#000}
-        pre{background-color:rgba(0,0,0,.4);margin-top:10px;color:#fff}
+        pre{background-color: rgba(0,0,0,.1);margin-top: 10px;color: rgba(0,0,0,0.75);}
         a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#0f0f0f}
         .jumbotron{border:1px solid rgba(0,0,0,.6)}
         .panel-danger .panel-heading,.panel-info .panel-heading,.panel-primary .panel-heading,.panel-success .panel-heading,.panel-warning .panel-heading{border-color:#000}
         .btn:focus,.nav-pills>li>a,.nav-tabs>li>a,.navbar-default .navbar-nav>li>a,.navbar-inverse .navbar-nav>li>a,a,a:active,a:hover{outline:0}
         th a,tr.first a{ color:rgba(0,0,0,0.75) }
-        thead tr{background-color:rgba(0,0,0,0.05);border:1px solid #030303}
+        thead tr{background-color:rgba(0,0,0,0.05); border:1px solid rgba(0,0,0,0.3)}
         .datetimepicker,.datetimepicker tfoot tr:first-child th:hover,.datetimepicker thead tr:first-child th:hover{background-color:#191919}
         .nav-collapse .dropdown-menu a:focus,.nav-collapse .dropdown-menu a:hover,.nav-collapse .nav>li>a:focus,.nav-collapse .nav>li>a:hover{background-color:#363636}
         #admin-ui-media-manager.nav-tabs,.table-striped>tbody>tr.highlight-even,.table-striped>tbody>tr.highlight-odd,tr.highlight-even,tr.highlight-odd{background-color:#212121}
@@ -1571,7 +1571,7 @@
         }
 
 
-        div.admin-left-panel .nav-pills > li > a > span > i { color: rgba(255,255,255,0.5); font-size:1.25em; opacity: 0; width:0;  }
+        div.admin-left-panel .nav-pills > li > a > span > i { color: rgba(255,255,255,0.5); font-size:16px; opacity: 0; width:0;  }
         div.admin-left-panel-collapsed .nav-pills > li > a > span > i { opacity: 1; padding-left: 2px; }
         div.admin-left-panel-collapsed .nav-pills > li.active > a { background:none; }
         div.admin-left-panel-collapsed .nav-header.sidebar-toggle-panel { display: none; }

e107_web/js/core/admin.jquery.js

@@ -432,7 +432,7 @@ $(document).ready(function()
                var toggleStatus = 'open';
             }
 
-            document.cookie = 'e107_adminLeftPanel = ' + toggleStatus +'; expires = 1; samesite=strict';
+            document.cookie = 'e107_adminLeftPanel = ' + toggleStatus +'; path=/; expires = 1; samesite=strict';
 
 
         });