From abcbf0656a4117118af087e4bbd69220211be660 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Sat, 14 Jan 2017 16:10:47 -0800
Subject: [PATCH] Admin-UI enhancements (i hope!)

---
 .../shortcodes/batch/admin_shortcodes.php      |  8 ++++----
 e107_handlers/sitelinks_class.php              | 18 +++++++++---------
 e107_themes/bootstrap3/admin_template.php      | 11 ++++++-----
 e107_themes/bootstrap3/admin_theme.php         | 11 +++++++++++
 4 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php
index dc566ab39..73915e214 100644
--- a/e107_core/shortcodes/batch/admin_shortcodes.php
+++ b/e107_core/shortcodes/batch/admin_shortcodes.php
@@ -491,14 +491,14 @@ class admin_shortcodes
 					
 					$allconfigs = multiarray_sort($allconfigs,'title'); //XXX FIXME - not sorting correctly. 
 		
-					$text = "<ul id='e-latest' class='unstyled list-unstyled'>";
+					$text = "<ul id='e-latest' class='list-group'>";
 					foreach($allconfigs as $k=>$v)
 					{
 						foreach($v as $val)
 						{
 							$class = admin_shortcodes::getBadge($val['total']); 
 							$link =  "<a  href='".$val['url']."'>".str_replace(":"," ",$val['title'])." <span class='".$class."'>".$val['total']."</span></a>";	
-							$text .= "<li class='clearfix'>".$val['icon']." ".$link."</li>\n";	
+							$text .= "<li class='list-group-item clearfix'>".$val['icon']." ".$link."</li>\n";
 						}	
 					}
 					$text .= "</ul>";
@@ -1199,7 +1199,7 @@ class admin_shortcodes
 					
 					$allconfigs = multiarray_sort($allconfigs,'title'); //XXX FIXME - not sorting correctly. 
 		
-					$text = "<ul id='e-status' class='unstyled list-unstyled'>";
+					$text = "<ul id='e-status' class='list-group'>";
 					foreach($allconfigs as $k=>$v)
 					{
 						foreach($v as $val)
@@ -1207,7 +1207,7 @@ class admin_shortcodes
 							$type = empty($val['invert']) ? 'latest' : 'invert';
 							$class = admin_shortcodes::getBadge($val['total'], $type);
 							$link =  "<a href='".$val['url']."'>".str_replace(":"," ",$val['title'])." <span class='".$class."'>".$val['total']."</span></a>";	
-							$text .= "<li>".$val['icon']." ".$link."</li>\n";	
+							$text .= "<li class='list-group-item'>".$val['icon']." ".$link."</li>\n";
 						}	
 					}
 					$text .= "</ul>";
diff --git a/e107_handlers/sitelinks_class.php b/e107_handlers/sitelinks_class.php
index aa68e8514..c5449c7a5 100644
--- a/e107_handlers/sitelinks_class.php
+++ b/e107_handlers/sitelinks_class.php
@@ -679,8 +679,8 @@ class e_navigation
 		
 		$this->admin_cat['title'][1] = LAN_SETTINGS;
 		$this->admin_cat['id'][1] = 'setMenu';
-		$this->admin_cat['img'][1] = $tp->toGlyph('e-settings-16');
-		$this->admin_cat['lrg_img'][1] = $tp->toGlyph('e-settings-32'); 
+		$this->admin_cat['img'][1] = 'fa-cogs.glyph';
+		$this->admin_cat['lrg_img'][1] = 'e-settings-32.glyph';
 		$this->admin_cat['sort'][1] = true;
 
 /*
@@ -697,26 +697,26 @@ i.e-cat_users-32{ background-position: -555px 0; width: 32px; height: 32px; }
 		
 		$this->admin_cat['title'][2] = ADLAN_CL_2;
 		$this->admin_cat['id'][2] = 'userMenu';
-		$this->admin_cat['img'][2] = $tp->toGlyph('e-cat_users-16');  
+		$this->admin_cat['img'][2] = 'fa-users.glyph'; // $tp->toGlyph('e-cat_users-16');
 		$this->admin_cat['lrg_img'][2] = $tp->toGlyph('e-cat_users-32'); 
 		$this->admin_cat['sort'][2] = true;
 		
 		$this->admin_cat['title'][3] = ADLAN_CL_3;
 		$this->admin_cat['id'][3] = 'contMenu';
-		$this->admin_cat['img'][3] = $tp->toGlyph('e-cat_content-16'); 
+		$this->admin_cat['img'][3] = 'file-text-o.glyph'; // $tp->toGlyph('e-cat_content-16');
 		$this->admin_cat['lrg_img'][3] = $tp->toGlyph('e-cat_content-32'); 
 		$this->admin_cat['sort'][3] = true;
 		
 		$this->admin_cat['title'][4] = ADLAN_CL_6;
 		$this->admin_cat['id'][4] = 'toolMenu';
-		$this->admin_cat['img'][4] = $tp->toGlyph('e-cat_tools-16'); 
+		$this->admin_cat['img'][4] = 'wrench.glyph'; // $tp->toGlyph('e-cat_tools-16');
 		$this->admin_cat['lrg_img'][4] = $tp->toGlyph('e-cat_tools-32'); 
 		$this->admin_cat['sort'][4] = true;
 		
 		// Manage
 		$this->admin_cat['title'][5] = LAN_MANAGE;
 		$this->admin_cat['id'][5] = 'managMenu';
-		$this->admin_cat['img'][5] = $tp->toGlyph('e-manage-16'); 
+		$this->admin_cat['img'][5] = 'fa-desktop.glyph' ; // $tp->toGlyph('e-manage-16');
 		$this->admin_cat['lrg_img'][5] = $tp->toGlyph('e-manage-32'); 
 		$this->admin_cat['sort'][5] = TRUE;
 		
@@ -724,7 +724,7 @@ i.e-cat_users-32{ background-position: -555px 0; width: 32px; height: 32px; }
 		{
 			$this->admin_cat['title'][6] = ADLAN_CL_7;
 			$this->admin_cat['id'][6] = 'plugMenu'; 
-			$this->admin_cat['img'][6] = $tp->toGlyph('e-cat_plugins-16'); 
+			$this->admin_cat['img'][6] = 'fa-puzzle-piece.glyph'; // $tp->toGlyph('e-cat_plugins-16');
 			$this->admin_cat['lrg_img'][6] = $tp->toGlyph('e-cat_plugins-32'); 
 			$this->admin_cat['sort'][6] = false;	
 		}
@@ -733,7 +733,7 @@ i.e-cat_users-32{ background-position: -555px 0; width: 32px; height: 32px; }
 			// Misc.
 			$this->admin_cat['title'][6] = ADLAN_CL_8;
 			$this->admin_cat['id'][6] = 'miscMenu';
-			$this->admin_cat['img'][6] = ''; // E_16_CAT_MISC;
+			$this->admin_cat['img'][6] = 'fa-puzzle-piece.glyph'; ; // E_16_CAT_MISC;
 			$this->admin_cat['lrg_img'][6] = ''; // E_32_CAT_MISC;
 			$this->admin_cat['sort'][6] = TRUE;
 		}
@@ -741,7 +741,7 @@ i.e-cat_users-32{ background-position: -555px 0; width: 32px; height: 32px; }
 		//About menu    - No 20 -  leave space for user-categories.
 		$this->admin_cat['title'][20] = LAN_ABOUT;
 		$this->admin_cat['id'][20] = 'aboutMenu';
-		$this->admin_cat['img'][20] = ''; // E_16_CAT_ABOUT;//E_16_NAV_DOCS
+		$this->admin_cat['img'][20] = 'fa-info-circle.glyph'; // E_16_CAT_ABOUT;//E_16_NAV_DOCS
 		$this->admin_cat['lrg_img'][20] = ''; // E_32_CAT_ABOUT;
 		$this->admin_cat['sort'][20] = false;	
 				
diff --git a/e107_themes/bootstrap3/admin_template.php b/e107_themes/bootstrap3/admin_template.php
index 594df8448..3406b2d5c 100644
--- a/e107_themes/bootstrap3/admin_template.php
+++ b/e107_themes/bootstrap3/admin_template.php
@@ -26,8 +26,8 @@ $E_ADMIN_NAVIGATION['start_other'] = '<ul class="nav navbar-nav navbar-right">';
 
 $E_ADMIN_NAVIGATION['button'] = '
 	<li class="dropdown">
-		<a class="dropdown-toggle"  role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" >
-		 {LINK_TEXT} 
+		<a class="dropdown-toggle"  role="button" data-toggle="dropdown" data-target="#" href="{LINK_URL}" title="{LINK_TEXT}">
+		 {LINK_IMAGE} {LINK_TEXT}
 		<b class="caret"></b>
 		</a> 
 		{SUB_MENU}
@@ -284,11 +284,12 @@ else
 			</div>
 	
 			{ADMIN_SITEINFO=creditsonly}
-			{SETSTYLE=admin_menu}
-	
+
+			{SETSTYLE=lists}
 			{ADMIN_LATEST=infopanel}
 			{ADMIN_STATUS=infopanel}
-	
+				{SETSTYLE=admin_menu}
+
 			{ADMIN_LOG=request}
 			{ADMIN_MSG=request}
 			{ADMIN_PLUGINS}
diff --git a/e107_themes/bootstrap3/admin_theme.php b/e107_themes/bootstrap3/admin_theme.php
index e68fe58f3..463a4d486 100644
--- a/e107_themes/bootstrap3/admin_theme.php
+++ b/e107_themes/bootstrap3/admin_theme.php
@@ -187,6 +187,17 @@ class bootstrap3_admintheme
 					</div>';
 				break;
 
+			case 'lists':
+				echo '<div class="panel panel-default">
+					  <div class="panel-heading">
+					    <h3 class="panel-title">' . $caption . '</h3>
+					  </div>
+
+					    ' . $text . '
+
+					</div>';
+				break;
+
 			case 'no_caption':
 				echo '<!-- Start Style: ' . $style . ' Mode: ' . $mode . ' -->
 					<div class="block">