From ecce5b978cbf78003ebb8a41d99245f335bdbfac Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Thu, 5 Feb 2015 11:54:59 -0800
Subject: [PATCH] Admin-UI: Column-selector styling fixes.

---
 e107_handlers/form_handler.php        | 22 ++++++++++++++--------
 e107_themes/bootstrap/admin_dark.css  |  3 ++-
 e107_themes/bootstrap/admin_style.css | 12 +++++++++++-
 e107_web/js/core/admin.jquery.css     |  2 +-
 4 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 3517e7111..c06b673bb 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -2348,16 +2348,19 @@ class e_form
 		$columnsArray = array_filter($columnsArray);
 		
 	
-		$text = '<div class="dropdown e-tip pull-right" data-placement="left">
+		$text = '<div class="col-selection dropdown e-tip pull-right" data-placement="left">
     <a class="dropdown-toggle" title="Select columns to display" data-toggle="dropdown" href="#"><b class="caret"></b></a>
-    <ul class="dropdown-menu col-selection e-noclick" role="menu" aria-labelledby="dLabel">
-    <li class="nav-header">Display Columns</li>';
+    <ul class="dropdown-menu  col-selection e-noclick" role="menu" aria-labelledby="dLabel">
+   
+    <li class="navbar-header nav-header">Display Columns</li>
+    <li>
+     <ul class="nav scroll-menu" >';
 		
         unset($columnsArray['options'], $columnsArray['checkboxes']);
 
 		foreach($columnsArray as $key => $fld)
 		{
-			if (!varset($fld['forced']) && !vartrue($fld['nolist']) && vartrue($fld['type'])!='upload')
+			if (empty($fld['forced']) && empty($fld['nolist']) && vartrue($fld['type'])!='hidden' && vartrue($fld['type'])!='upload')
 			{
 				$checked = (in_array($key,$columnsDefault)) ?  TRUE : FALSE;
 				$ttl = isset($fld['title']) ? defset($fld['title'], $fld['title']) : $key;
@@ -2377,11 +2380,14 @@ class e_form
 		}
 
 		// has issues with the checkboxes.
-        $text .= "<li>
-				<div id='{$id}-button' class='right'>
-					".$this->admin_button('etrigger_ecolumns', LAN_SAVE, 'btn-small')."
-				</div>
+        $text .= "
+				</ul>
 				</li>
+				 <li class='navbar-header nav-header'>
+				<div id='{$id}-button' class='right'>
+					".$this->admin_button('etrigger_ecolumns', LAN_SAVE, 'btn btn-primary btn-small')."
+				</div>
+				 </li>
 				</ul>
 			</div>";
 			
diff --git a/e107_themes/bootstrap/admin_dark.css b/e107_themes/bootstrap/admin_dark.css
index 2ae5d0dba..5baddd8a1 100644
--- a/e107_themes/bootstrap/admin_dark.css
+++ b/e107_themes/bootstrap/admin_dark.css
@@ -69,7 +69,8 @@ tr.highlight-even			{ background-color: #212121; }
     background-color: #222;
 }
 
-
+div.col-selection .caret { border-top-color: #C6C6C6;
+border-bottom-color: #C6C6C6; }
 
 /* Uncomment if font-awesome/darkstrap overlay issue returns. 
 .btn-primary > [class^="icon-"] {
diff --git a/e107_themes/bootstrap/admin_style.css b/e107_themes/bootstrap/admin_style.css
index 3498ec44b..b5e6022b9 100644
--- a/e107_themes/bootstrap/admin_style.css
+++ b/e107_themes/bootstrap/admin_style.css
@@ -651,10 +651,20 @@ i.e-seamonkey-32{ background-position: -485px 0; width: 32px; height: 32px; }
 th, .fcaption								{ font: 12px HelveticaNeue,Helvetica,Arial;  }
 tr.first a, th a							{ color: rgb(102, 102, 102); }
 /* Dark Drop-Down Menus */
-ul.col-selection 							{ text-align:left;  overflow:visible; z-index:101; max-height:600px; overflow:auto; background-color: rgb(23, 23, 23); }
+
+
+ul.col-selection 				{ padding:5px; text-align:left; background-color: #FCFDFF; border: 1px outset black; width:200px; margin-right:0px;overflow:visible; position:absolute; z-index:101; right:0px;}
+
+
+ul.col-selection 							{ text-align:left;  overflow:visible; z-index:101;  background-color: rgb(23, 23, 23); }
 ul.col-selection > li a 					{ border-top: 1px solid rgb(51, 51, 51);  border-bottom: 1px solid rgb(32, 32, 32); }
 ul.col-selection > li a 					{ padding: 3px 0px 0px 25px; color: rgb(153, 153, 153); }
 ul.col-selection > li a label 				{ padding-left:0px; display:block; line-height:25px; }
+ul.col-selection > li a:hover 				{ color: #FFF; background-image: linear-gradient(to bottom, #08C, #0077B3);}
+
+
+ul.col-selection 							{ background-color: rgb(39, 39, 39);} 
+ul.scroll-menu 								{  max-height:350px; overflow:auto;    }
 
 
 .nav ul li ul.dropdown-menu 				{ border-left:1px solid rgb(51, 51, 51); background-color: rgb(39, 39, 39); }
diff --git a/e107_web/js/core/admin.jquery.css b/e107_web/js/core/admin.jquery.css
index 4201998f4..998768783 100644
--- a/e107_web/js/core/admin.jquery.css
+++ b/e107_web/js/core/admin.jquery.css
@@ -30,4 +30,4 @@ legend 						{ display: none; }
 
 input.helpbox				{ display:none; } /* legacy BBcode helper box - deprecated and hidden if found in v2.x */
 
-.col-selection 				{ padding:5px; text-align:left; background-color: #FCFDFF; border: 1px outset black; width:200px; margin-right:0px;overflow:visible; position:absolute; z-index:101; right:0px;}
+*/
\ No newline at end of file