Issue #5473 New Admin Area Skin. (currently not functional with flexpanel)

e107_core/shortcodes/batch/admin_shortcodes.php

@@ -97,6 +97,27 @@ class admin_shortcodes extends e_shortcode
 
     }
 
+    public function sc_admin_container_legacy($parm=null)
+    {
+		  $exclude = array(
+            'admin.php',
+            'menus.php',
+            'phpinfo.php',
+            'credits.php',
+            'docs.php',
+            'cache.php',
+            'emoticon.php',
+            'updateadmin.php',
+            'administrator.php',
+
+        );
+
+        if(!deftrue('e_CURRENT_PLUGIN') && in_array(e_PAGE, $exclude))
+        {
+            return 'admin-container-legacy';
+        }
+    }
+   
     // {ADMIN_COREUPDATE}
     public function sc_admin_coreupdate($parm='')
 	{

e107_core/templates/admin_template.php

@@ -222,7 +222,7 @@ $ADMIN_TEMPLATE['header'] =  '
 		
 	</div>
 </div>
-<div class="admin-container container-fluid">
+<div class="admin-container container-fluid {ADMIN_CONTAINER_LEGACY}">
 	<div class="row is-table-row {ADMIN_LEFTPANEL_TOGGLE}">
 ';
 

e107_handlers/admin_ui.php

@@ -1687,11 +1687,17 @@ class e_admin_dispatcher
 				$var[$key]['link_class'] = ' e-modal';
 				if(!empty($val['modal-caption']))
 				{
-					$var[$key]['link_data'] = array('data-modal-caption' => $val['modal-caption']);
+					$var[$key]['link_data'] = ['data-modal-caption' => $val['modal-caption']];
 				}
 
 			}
 
+			if(!empty($val['class']))
+			{
+				$var[$key]['link_class'] ?? '';
+				$var[$key]['link_class'] .= ' '.$val['class'];
+			}
+
 		}
 
 
@@ -2065,7 +2071,7 @@ class e_admin_controller
 
 				}
 			}
-			$title = $res['caption'];
+			$title = defset($res['caption'],$res['caption']);
 
 
 		}

e107_handlers/sitelinks_class.php

@@ -1461,7 +1461,7 @@ i.e-cat_users-32{ background-position: -555px 0; width: 32px; height: 32px; }
 			
 			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'=>' '));
+				$replace['LINK_IMAGE'] = $tp->toGlyph($e107_vars[$act]['image_src'], array('fw'=>true, 'space'=>' '));
 			}
 			else
 			{

e107_themes/bootstrap3/css/modern-dark.css

@@ -1005,7 +1005,7 @@ select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.i
 .navbar-default .navbar-nav>li>a:focus,.navbar-default .navbar-nav>li>a:hover{color:#fff;background-color:#0d0d0d}
 .navbar-default .navbar-nav>.active>a,.navbar-default .navbar-nav>.active>a:focus,.navbar-default .navbar-nav>.active>a:hover{color:#5bc0de;background-color:#101010}
 .navbar-default .navbar-nav>.disabled>a,.navbar-default .navbar-nav>.disabled>a:focus,.navbar-default .navbar-nav>.disabled>a:hover{color:#ccc;background-color:transparent}
-.navbar-default .navbar-toggle{border-color:#0d0d0d}
+.navbar-default .navbar-toggle{ margin-right:30px }
 .navbar-default .navbar-toggle:focus,.navbar-default .navbar-toggle:hover{background-color:#0d0d0d}
 .navbar-default .navbar-toggle .icon-bar{background-color:#c6c6c6}
 .navbar-default .navbar-collapse,.navbar-default .navbar-form{border-color:#101010}
@@ -1532,7 +1532,7 @@ div.admin-left-panel {
 
 div.admin-right-panel { padding-top: 20px; border-top-left-radius: 5px; background: #2f2f2f  }
 
-.admin-container { padding:0 }
+
 
 div.admin-left-panel .panel  { background: none; border:0}
 .admin-left-panel .close { opacity: 1; }
@@ -1622,4 +1622,11 @@ ul.col-selection > li a {  border-bottom: 1px solid rgba(255,255,255,0.3); }
     }
 
     #admin-cron  .admin-left-panel {  max-width: 300px; }
+
+}
+
+@media (min-width: 768px){
+  .admin-container { padding:0; }
+
+
 }

e107_themes/bootstrap3/theme.xml

@@ -27,6 +27,7 @@
 		<css file="style.css" name="Default" scope="front" />
 		<css file="css/modern-light.css" name="Modern Light" description="A high-contrast light skin" thumbnail='images/admin_modern-light.webp' scope='admin' exclude='bootstrap'/>
         <css file="css/modern-dark.css" name="Modern Dark" description="A high-contrast dark skin" thumbnail='images/admin_modern-dark.webp' scope='admin' exclude='bootstrap'/>
+        <css file="css/modern-dark-2.css" name="Modern Dark 2" description="A high-contrast dark skin with dynamic sidebar" thumbnail='images/admin_modern-dark-2.webp' scope='admin' exclude='bootstrap'/>
         <css file="css/bootstrap-dark.min.css" name="Legacy Dark Admin" description="A dark admin area skin" thumbnail='images/admin_bootstrap-dark.webp' scope='admin' exclude='bootstrap'/>
         <css file="css/kadmin.css" name="K-Admin Inspired" scope='admin' description="A light admin area skin" thumbnail='images/admin_kadmin.webp' url='http://themifycloud.com/demos/templates/KAdmin/KAdmin-Dark/dashboard.html' />
 		<css file="css/corporate.css" name="Corporate" scope='admin' thumbnail='images/admin_corporate.webp' exclude='bootstrap' />