Cosmetics on menus, details and the top bar...

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@3757 a333f486-631f-4898-b8df-5754b55c2be0

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}')");

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;

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;">';

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;
+#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 #cccccc solid;
   height: 18px;
   width: 180px;
-  padding-top: 4;
-  background: transparent;
+  padding: 3px;
+  background: white;
+  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;
 }
 
 
@@ -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;

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;
 }

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');