From 02aa8339f8eb77c2fc3cf9232bd797356b84c21b Mon Sep 17 00:00:00 2001
From: Denis Flaven <denis.flaven@combodo.com>
Date: Sat, 12 Sep 2015 18:46:39 +0000
Subject: [PATCH] Cosmetics on menus, details and the top bar...

SVN:trunk[3757]
---
 application/dashboard.class.inc.php    |   2 +-
 application/displayblock.class.inc.php |  15 +++---
 application/itopwebpage.class.inc.php  |  16 +++----
 css/light-grey.css                     |  63 +++++++++++++++++--------
 css/light-grey.scss                    |  53 ++++++++++++++-------
 images/help.png                        | Bin 1615 -> 433 bytes
 images/on-off-menu.png                 | Bin 0 -> 468 bytes
 images/pencil-menu.png                 | Bin 0 -> 350 bytes
 images/search.png                      | Bin 0 -> 527 bytes
 images/toolkit_menu.png                | Bin 430 -> 498 bytes
 pages/UI.php                           |   1 -
 11 files changed, 95 insertions(+), 55 deletions(-)
 create mode 100755 images/on-off-menu.png
 create mode 100755 images/pencil-menu.png
 create mode 100755 images/search.png

diff --git a/application/dashboard.class.inc.php b/application/dashboard.class.inc.php
index 3d98d38fc..c10c84c47 100644
--- a/application/dashboard.class.inc.php
+++ b/application/dashboard.class.inc.php
@@ -548,7 +548,7 @@ class RuntimeDashboard extends Dashboard
 	{
 		$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.iframe-transport.js');
 		$oPage->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.fileupload.js');
-		$sEditMenu = "<td><span id=\"DashboardMenu\"><ul><li><img src=\"../images/edit.png\"><ul>";
+		$sEditMenu = "<td><span id=\"DashboardMenu\"><ul><li><img src=\"../images/pencil-menu.png\"><ul>";
 	
 		$aActions = array();
 		$oEdit = new JSPopupMenuItem('UI:Dashboard:Edit', Dict::S('UI:Dashboard:Edit'), "return EditDashboard('{$this->sId}')");
diff --git a/application/displayblock.class.inc.php b/application/displayblock.class.inc.php
index 7d80763d3..9c8b6ad49 100644
--- a/application/displayblock.class.inc.php
+++ b/application/displayblock.class.inc.php
@@ -1402,13 +1402,16 @@ class MenuBlock extends DisplayBlock
 			else
 			{
 				$id = $oObj->GetKey();
-				if ($_SERVER['REQUEST_METHOD'] == 'GET')
+				if (utils::ReadParam('operation') == 'details')
 				{
-					$sRefreshAction = "window.location.reload();";
-				}
-				else
-				{
-					$sRefreshAction = "window.location.href='".ApplicationContext::MakeObjectUrl(get_class($oObj), $id)."';";
+					if ($_SERVER['REQUEST_METHOD'] == 'GET')
+					{
+						$sRefreshAction = "window.location.reload();";
+					}
+					else
+					{
+						$sRefreshAction = "window.location.href='".ApplicationContext::MakeObjectUrl(get_class($oObj), $id)."';";
+					}
 				}
 				
 				$bLocked = false;
diff --git a/application/itopwebpage.class.inc.php b/application/itopwebpage.class.inc.php
index 57ce510a0..f5a6481ab 100644
--- a/application/itopwebpage.class.inc.php
+++ b/application/itopwebpage.class.inc.php
@@ -798,14 +798,10 @@ EOF
 
 		// Render the text of the global search form
 		$sText = htmlentities(utils::ReadParam('text', '', false, 'raw_data'), ENT_QUOTES, 'UTF-8');
-		$sOnClick = "";
+		$sOnClick = " onclick=\"if ($('#global-search-input').val() != '') { $('#global-search form').submit();  } \"";
 		if (empty($sText))
 		{
-			// if no search text is supplied then
-			// 1) the search text is filled with "your search"
-			// 2) clicking on it will erase it
 			$sText = Dict::S("UI:YourSearch");
-			$sOnClick = " onclick=\"this.value='';this.onclick=null;\"";
 		}
 
 		if ($this->IsPrintableVersion())
@@ -828,7 +824,7 @@ EOF
 			{
 				$sLogonMessage = Dict::Format('UI:LoggedAsMessage', $sUserName);
 			}
-			$sLogOffMenu = "<span id=\"logOffBtn\"><ul><li><img src=\"../images/onOffBtn.png\"><ul>";
+			$sLogOffMenu = "<span id=\"logOffBtn\"><ul><li><img src=\"../images/on-off-menu.png\"><ul>";
 			$sLogOffMenu .= "<li><span>$sLogonMessage</span></li>\n";
 			$aActions = array();
 
@@ -938,10 +934,10 @@ EOF
 			$sHtml .= '<div class="ui-layout-center">';
 			$sHtml .= ' <div id="top-bar" style="width:100%">';
 			$sHtml .= self::FilterXSS($sApplicationBanner);
-			$sHtml .= '		<div id="global-search"><form action="'.utils::GetAbsoluteUrlAppRoot().'pages/UI.php"><table><tr><td></td><td id="g-search-input"><input type="text" name="text" value="'.$sText.'"'.$sOnClick.'/></td>';
-			$sHtml .= '<td><input type="image" src="../images/searchBtn.png"/></a></td>';
-			$sHtml .= '<td><a style="background:transparent;" href="'.$sOnlineHelpUrl.'" target="_blank"><img style="border:0;padding-left:20px;padding-right:10px;" title="'.Dict::S('UI:Help').'" src="../images/help.png"/></td>';
-			$sHtml .= '<td style="padding-right:20px;padding-left:10px;">'.self::FilterXSS($sLogOffMenu).'</td><td><input type="hidden" name="operation" value="full_text"/></td></tr></table></form></div>';
+			$sHtml .= '		<div id="global-search"><form action="'.utils::GetAbsoluteUrlAppRoot().'pages/UI.php"><table><tr><td></td><td><div id="global-search-area"><input id="global-search-input" type="text" name="text" placeholder="'.$sText.'"></input><div '.$sOnClick.' id="global-search-image"></div></div></td>';
+			//$sHtml .= '<td><input type="image" src="../images/searchBtn.png"/></a></td>';
+			$sHtml .= '<td><a id="help-link" href="'.$sOnlineHelpUrl.'" target="_blank"><img title="'.Dict::S('UI:Help').'" src="../images/help.png"/></td>';
+			$sHtml .= '<td>'.self::FilterXSS($sLogOffMenu).'</td><td><input type="hidden" name="operation" value="full_text"/></td></tr></table></form></div>';
 			//echo '<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="hidden" name="operation" value="full_text"/></td></tr></table></form></div>';
 			$sHtml .= ' </div>';
 			$sHtml .= ' <div class="ui-layout-content" style="overflow:auto;">';
diff --git a/css/light-grey.css b/css/light-grey.css
index b4e4e56af..12c172c26 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -619,7 +619,8 @@ div.actions_menu > ul > li {
   list-style: none;
   vertical-align: middle;
   margin: 0;
-  padding: 0;
+  padding-left: 10px;
+  padding-right: 10px;
   cursor: pointer;
 }
 
@@ -630,7 +631,6 @@ div.actions_menu > ul > li {
   margin: 0;
   padding: 0;
   height: 25px;
-  noline-height: 25px;
 }
 
 
@@ -844,6 +844,7 @@ input.dp-applied {
 .SearchDrawer label {
   background: #d6e8ef;
   color: black;
+  text-align: right;
 }
 
 
@@ -1147,18 +1148,11 @@ div#logo div {
 #global-search {
   height: 55px;
   float: right;
-  background: url(../images/banner-search.png) no-repeat;
-  nopadding-top: 15px;
   text-align: right;
   overflow-y: hidden;
 }
 
 
-#global-search > form div {
-  padding-left: 4px;
-}
-
-
 #global-search table, #global-search tr, #global-search tr td {
   padding: 0;
   border: 0;
@@ -1170,19 +1164,48 @@ div#logo div {
 }
 
 
-#global-search > form input[type="text"] {
-  border: 0;
-  height: 18px;
-  width: 180px;
-  padding-top: 4;
-  background: transparent;
+#global-search-area {
+  line-height: 55px;
 }
 
 
-#global-search > form tr td#g-search-input {
-  padding-top: 3px;
-  padding-left: 3px;
+#global-search-input {
+  vertical-align: middle;
+  -moz-border-radius: 6px;
+  -webkit-border-radius: 6px;
+  border-radius: 6px;
+  border: 1px #cccccc solid;
+  height: 18px;
+  width: 180px;
+  padding: 3px;
+  background: white;
+  display: inline-block;
+}
+
+
+#global-search-image {
+  vertical-align: middle;
+  background: url(../images/search.png) center center no-repeat;
+  display: inline-block;
+  width: 28px;
+  height: 30px;
+  margin-left: -8px;
+  cursor: pointer;
+}
+
+
+#help-link img {
+  padding: 0;
+  border: 0;
+}
+
+
+#help-link {
+  padding: 0;
+  border: 0;
   background: transparent;
+  margin-left: 15px;
+  margin-right: 10px;
 }
 
 
@@ -1414,7 +1437,7 @@ span.form_validation {
 table.details {
   border-collapse: collapse;
   noborder-bottom: 2px white solid;
-  width: 100%;
+  nowidth: 100%;
 }
 
 
@@ -1762,7 +1785,7 @@ a.summary, a.summary:hover {
 
 
 #DashboardMenu li ul li a:hover {
-  background: #d81515;
+  background: #e87c1e;
   color: white;
   font-weight: bold;
   list-style: none;
diff --git a/css/light-grey.scss b/css/light-grey.scss
index e35643f78..48e51dd4f 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -472,7 +472,8 @@ div.actions_menu > ul > li {
 	list-style: none;
 	vertical-align: middle;
 	margin: 0;
-	padding: 0;
+	padding-left: 10px;
+	padding-right: 10px;
 	cursor: pointer;
 }
 #logOffBtn > ul {
@@ -481,7 +482,6 @@ div.actions_menu > ul > li {
 	margin: 0;
 	padding: 0;
 	height: 25px;
-	noline-height: 25px;
 }
 	
 .itop_popup li a, #logOffBtn li a {
@@ -653,6 +653,7 @@ input.dp-applied {
 .SearchDrawer label {
 	background: $complement-light;
 	color: #000;
+	text-align: right;
 }
 .SearchDrawer h1 {
 	color: #000;
@@ -868,14 +869,9 @@ div#logo div {
 #global-search {
 	height: 55px;
 	float: right;
-	background: url(../images/banner-search.png) no-repeat;
-	nopadding-top: 15px;
 	text-align: right;
 	overflow-y: hidden;
 }
-#global-search > form div {
-	padding-left: 4px;
-}
 #global-search table, #global-search tr td,  #global-search tr {
 	padding: 0;
 	border: 0;
@@ -885,17 +881,40 @@ div#logo div {
 	overflow-y: hidden;
 	vertical-align: middle;
 }
-#global-search > form input[type="text"] {
-	border: 0;
+#global-search-area {
+	line-height: 55px;
+}
+#global-search-input {
+	vertical-align: middle;
+	-moz-border-radius: 6px;
+	-webkit-border-radius: 6px;
+	border-radius: 6px;
+	border: 1px #CCC solid;
 	height: 18px;
 	width: 180px;
-	padding-top: 4;
-	background: transparent;
+	padding: 3px;
+	background: #fff;
+	display: inline-block;
 }
-#global-search > form tr td#g-search-input {
-	padding-top: 3px;
-	padding-left: 3px;
+#global-search-image {
+	vertical-align: middle;
+	background: url(../images/search.png) center center no-repeat;
+	display:inline-block;
+	width: 28px;
+	height: 30px;
+	margin-left: -8px;
+	cursor: pointer;
+}
+#help-link img {
+	padding: 0;
+	border: 0;
+}
+#help-link {
+	padding: 0;
+	border: 0;
 	background: transparent;
+	margin-left: 15px;
+	margin-right: 10px;
 }
 div.icon {
 	width: 20px;
@@ -1055,7 +1074,7 @@ span.form_validation {
 table.details {
   border-collapse: collapse;
   noborder-bottom: 2px #fff solid;
-  width:100%;
+  nowidth:100%;
 }
 table.details>tbody>tr>td {
 	border-bottom: 2px #ddd solid;
@@ -1308,8 +1327,8 @@ a.summary,  a.summary:hover {
 	z-index: 999;
 }
 #DashboardMenu li ul li a:hover{
-	background: #D81515;
-	color: #fff;
+	background: $popup-menu-highlight-color;
+	color: $popup-menu-text-higlight-color;
 	font-weight: bold;
 	list-style: none;
 }
diff --git a/images/help.png b/images/help.png
index d6b320e25029cff3e7a773e53e242233dbda0f7f..f74099538fc9149779de073707d3e895ebf21d84 100644
GIT binary patch
literal 433
zcmV;i0Z#sjP)<h;3K|Lk000e1NJLTq000&M000#T1^@s6LLeTM0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzQ%OWYRCwB?Rl#wCFc4HUG=K}pLoPun
z0ZJexm=esx1=ua91XDsN0b1alm(@bfnH8hloP<2NnH@kQt#o^P;_dtLt}<~VGz7!O
zJz)YCX<?NhJcHC^Hf`{9gaMmvq1oh`@I|=pkn*f%f=v+z(k4T)B*qQaT8a3|ca6wC
z2?xRl;Yhgg)N!yoo*Qw8lz5CF8zZ6>nzjPD!2vg7iS$X(N8cS_qD)*ubE7e_N$3`e
zI3vwF-c6K|6rJ8FmQ?Y&z%f=AOsa)KPLVvKODa_!j%j`d)GM8*gccr{t#T6nx?(LL
zUL(@e9_jNSRi>N%6oc@1LAFVQc-on`pz{t1?~24ZKXRSD&}~w;E;_3CsQw>5I45>R
z4^P{K#<SpS9(~A2v)$TEF)d&+CmmB4y~k~KE6{Q)6xO)hA0)(pdv`zvUT}#+hON{K
bKLQK@4iZlyvK~kW00000NkvXXu0mjfs*taT

literal 1615
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
N002ovPDHLkV1j+o1E~N2

diff --git a/images/on-off-menu.png b/images/on-off-menu.png
new file mode 100755
index 0000000000000000000000000000000000000000..104595d74a7ad75d4973cbb638c7537800071678
GIT binary patch
literal 468
zcmV;_0W1EAP)<h;3K|Lk000e1NJLTq0015U000#T1^@s6QTJY90000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzc1c7*RCwB~mfdZGFc8O0)CH24K2~Z+
zU<EP)839IUUi#FRc7!lOGXfr=j1Z(g_N5-dy^}7L_3znW$Vmuc@cr)F6yAF?CEqU(
z&vdKh@qGXK^=?*5F%x{D+hee_Be+`w-pqh*0eTbp=dplJ0<&~+Sbt#OPD0<%#h$km
zfpIaIpbYE5!@aDT#2Ul*1Rt_PEuMZX3@h*LMMrjyxpGT*&tcZQ;I*RyKV^Z%(gvXv
zx?^mkv=qLtNmrTUaU&LAWlTW<Zeh8~0i%^&Mt;xebq*K{Y7D$`;MD-b!!GILyP4k|
zf*QbRxLbm^kV_{Ou1UEDY(YVlk>@IwCaQ2hm1C>4#bk9x+Rz4(Dk9xb{EbXf(u4Jb
zj6s)x_7Ev<!zblikH%~gEyM~xX;ZBzsuie-)xi}OMgR|qHyNEq$=eVZq|Nh=6t`=R
z#TYy#Sy1&yKt|;utj>gtau&C_?UelWkz7_vE(e)lomnWq0t^5dU7IpMG-u-g0000<
KMNUMnLSTXqQ^}tI

literal 0
HcmV?d00001

diff --git a/images/pencil-menu.png b/images/pencil-menu.png
new file mode 100755
index 0000000000000000000000000000000000000000..dc04e4cf3ff63ff13495b407c9b0a2dda7c37877
GIT binary patch
literal 350
zcmV-k0iphhP)<h;3K|Lk000e1NJLTq000^Q000#T1^@s6SRDQv0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz07*naRCwBA{Qv(y12N!btvoj24k&#O
zh-cx`&%!`HXaM4JB)%XJcj8jaM1dvsSbSGbO^c*}*dB)*PRp3c@X011-T}l1@K}~c
zNgSaE*J>#3fJLnmSv~@$IAlveKKTs9p?G|DmSi7cu>{>0=ss&i5+lwcA}ldRv+N)=
zh>6cfL|B4unJW;#Cn<T8U<nLt!Dk6pi^#B~5m#{Gw1`%gpu`cCEcuVuM^y9)BM$Y9
zu%Lrk0xIfxDGV+~Y<%>@PytP*XDN&mMs!QjE!qt&6tP)Gbi`xx84HfgXN*=bl4=Q2
w8P*u;GeMXo;>`~!vV@q@n<|!o06>5N00VeXNDu5U^#A|>07*qoM6N<$f=*|Jj{pDw

literal 0
HcmV?d00001

diff --git a/images/search.png b/images/search.png
new file mode 100755
index 0000000000000000000000000000000000000000..5bac23568c3b5189fef6bdab656e385883f4ddf5
GIT binary patch
literal 527
zcmV+q0`UEbP)<h;3K|Lk000e1NJLTq000~S000{Z1^@s6ZwT)!0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzu}MThRCwCFmc32HFcilVD=kH6=s-F~
z2qPpT<VHwFxGSKdxszCcjF60Q83B)Qmgu0$0u<QNvt*L@w;jRpq$frG`q}R@>Br-3
zvQjo$ORYIGH)@r>&Djc2t+gSTPn6b<bed0!2#|TnNoyYgvlcjLJ<}yu0Snq#ChH}q
zOE$4U`?5S>J{bVNx=<gm2QcH8z1Dlu2d$~rtp|P}Q$t`0%qR(Rym@|Cv_I9~W^N$(
z5m;+yK2netJ>zf#t8C;E<cEAd-LYnL<XV8+)Xeza2b+zz<ljYV2@shJQ|iM;AIyc)
znvOeLfIOPZ5CdbX&f;ujQqDiw$~<HvR)DaNx<o+ASfB!%znm!a3aw*fK}6cVus04t
zY5oeNg+hrx_$m*AI^!=)@EKPP2-pEXz5!FYFGERh9x<h!27Cr7k~sZN&YJQL?3t(}
zPMN2|Z#=GQz$=h!ZS;#!JNW}?-9Qu<gh}ci9hZk}cb?s{0@2HXT7pULC(3sA0yw*J
zHjcEuVAk92uR?!qO(e`6A3=c#3d%zS`?Uz0kpBU*CROC%+NlUCxsZGdFaU7Xd;R<V
R8Ych%002ovPDHLkV1ky7;;#Sz

literal 0
HcmV?d00001

diff --git a/images/toolkit_menu.png b/images/toolkit_menu.png
index f3b252df9eb321a86c3805b33ea0c61e58ed0af0..3e0fa4ecb85e6c5db30ecd253ccd073e6c3ecba4 100644
GIT binary patch
delta 485
zcmV<B0UG|U1M&lq7k?870ssI2ku>w300006VoOIv0RI600RN!9r;`8x010qNS#tmY
z3ljhU3ljkVnw%H_000McNliru-w6y7B03gkF&_W`0e?wEK~y-)V|-B~$3SDigh!4|
z(Sl9U0+$pO>|j&05KLOhBB_lj#p6^cn6#33Ynbp@z`(%3Wq+BBX#uxm!OL3tU-wTC
zX$NzO9X}RPL76`<uCs`$FbhaCGBU!AV^g%?3+iQHV1Ns<DO&vf@Pr&Y{(gA!`|<g2
z$LBIKGIBc>z)fTpl;JcCg%}MH6e&LX`@sqP*0A7r!k2yh3=9n1js*}lo1!ILircY(
z+p*y5{s{yFjemt;Xu_>wRkUDJK#AwC`zJtTDYXM)4YCDa_fPnB|2P8!1Ch~AlpQ=y
zg~%45xgDMe;o$weaAfP5h_L_?9}o+;9Sg*pAM!XA!WI0wf8y)@3CID6=07HqEP(rf
z+pz%InlJnMA=Y4xA?#@vj|Gg3jF21-NxqPT4)M+J2VN(>pI<|4{=nmdU-wTSTl43|
z_1}-r!*dmB<rO65VD&ycWWJwY^XK_hGRqQZR)28f--oBTa=@P#*MHqUKuq#w9N_w6
bDA@r3Ln6pRgXI8G00000NkvXXu0mjf#lzJ!

delta 417
zcmV;S0bc&{1Fi#*7k?250ssI2-276N0000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+
zQe|Oed2z{QJOBUzP)S5VRCwBAd{HCEKx4p!M~+R=0*G))QNa$NDS}BWStPYFrFfhQ
zfl|a<!-U5IAcM;?8Pfu8$AXu&^1tq%pwu6qw>SO$@RV6V8h>agvfV%nAT|*nXv`&c
z{FtJDKRo&U`24rya~T;KfrbJ}h^v_eWjGB(Ax1+4MT(F9esBV)9*-R?_?_@&Uq6t9
zxE;u5Q?!Ij0R@5R>;4G@1C52CPvO?E0+X2nO2_~$fXGs62gDj=3&3ta4rCA+?L^rD
zjA3L8(A*ABgnw}GeqK1T^-RQA0ErKX1wgiV^F!ps1~d*RjvRn!{$nD^0=N%=g2>hY
z#Ua*UjUnu57mo$NBn!zCkmL(V=n&rk6Y=-+Ye>k0xO@P2GQ>B?g$=GGfYT00%E9V=
zxHUjm|9O6u{B#9$6fk)JGac3(0Cd5>AD@605R-fv=^9Xf00bBSOsBmeyR$%@00000
LNkvXXu0mjfv3#x^

diff --git a/pages/UI.php b/pages/UI.php
index 763542c26..d2f09514a 100644
--- a/pages/UI.php
+++ b/pages/UI.php
@@ -511,7 +511,6 @@ try
 				if ($iErrors == 0)
 				{
 					$oP->set_title(Dict::S('UI:SearchResultsPageTitle'));
-					$oP->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/xlsx-export.js');
 					$oP->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/tabularfieldsselector.js');
 					$oP->add_linked_script(utils::GetAbsoluteUrlAppRoot().'js/jquery.dragtable.js');
 					$oP->add_linked_stylesheet(utils::GetAbsoluteUrlAppRoot().'css/dragtable.css');