From 7f64982fc0760f2bfa24db99ac6cb04b6dd6c16b Mon Sep 17 00:00:00 2001
From: Denis Flaven <denis.flaven@combodo.com>
Date: Sat, 12 Sep 2015 14:38:06 +0000
Subject: [PATCH] Cosmetics: the refresh button is now displayed as part of the
 "actions" at the top-right of the "details".

SVN:trunk[3756]
---
 application/cmdbabstract.class.inc.php |   5 +----
 application/displayblock.class.inc.php |  16 +++++++++++++++-
 css/light-grey.css                     |   9 +++++++++
 css/light-grey.scss                    |   8 +++++++-
 images/refresh-fff.png                 | Bin 0 -> 235 bytes
 5 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100755 images/refresh-fff.png

diff --git a/application/cmdbabstract.class.inc.php b/application/cmdbabstract.class.inc.php
index 53740d2c6..49d10c506 100644
--- a/application/cmdbabstract.class.inc.php
+++ b/application/cmdbabstract.class.inc.php
@@ -179,13 +179,10 @@ EOF
 		}
 
 		$oPage->add("<div class=\"page_header\"><h1>".$this->GetIcon()."&nbsp;\n");
-		if (!$oPage->IsPrintableVersion() && ($_SERVER['REQUEST_METHOD'] == 'GET'))
-		{
-			$aIcons[] = '<img src="../images/reload.png" style="cursor:pointer;vertical-align:middle;margin-left:1em;" onclick="window.location.reload();" title="'.htmlentities(Dict::S('UI:Button:Refresh'), ENT_QUOTES, 'UTF-8').'"/>';
-		}
 
 		// Master data sources
 		$bSynchronized = false;
+		$aIcons = array();
 		if (!$oPage->IsPrintableVersion())
 		{
 			$oCreatorTask = null;
diff --git a/application/displayblock.class.inc.php b/application/displayblock.class.inc.php
index f39aa0b54..7d80763d3 100644
--- a/application/displayblock.class.inc.php
+++ b/application/displayblock.class.inc.php
@@ -1382,6 +1382,7 @@ class MenuBlock extends DisplayBlock
 			}
 		}
 		$bIsCreationAllowed = (UserRights::IsActionAllowed($sClass, UR_ACTION_CREATE) == UR_ALLOWED_YES) && ($oReflectionClass->IsSubclassOf('cmdbAbstractObject'));
+		$sRefreshAction = '';
 		switch($oSet->Count())
 		{
 			case 0:
@@ -1401,6 +1402,15 @@ class MenuBlock extends DisplayBlock
 			else
 			{
 				$id = $oObj->GetKey();
+				if ($_SERVER['REQUEST_METHOD'] == 'GET')
+				{
+					$sRefreshAction = "window.location.reload();";
+				}
+				else
+				{
+					$sRefreshAction = "window.location.href='".ApplicationContext::MakeObjectUrl(get_class($oObj), $id)."';";
+				}
+				
 				$bLocked = false;
 				if (MetaModel::GetConfig()->Get('concurrent_lock_enabled'))
 				{
@@ -1671,8 +1681,12 @@ class MenuBlock extends DisplayBlock
 			{
 				$sHtml .= "<div class=\"itop_popup actions_menu\"><ul>\n<li>".Dict::S('UI:Menu:Actions')."\n<ul>\n";
 			}
-	
+				
 			$sHtml .= $oPage->RenderPopupMenuItems($aActions, $aFavoriteActions);
+			if (!$oPage->IsPrintableVersion() && ($sRefreshAction!=''))
+			{
+				$sHtml .= "<div class=\"actions_button\" title=\"".htmlentities(Dict::S('UI:Button:Refresh'), ENT_QUOTES, 'UTF-8')."\"><span class=\"refresh-button\" onclick=\"$sRefreshAction\"></span></div>";
+			}
 		}
 
 		static $bPopupScript = false;
diff --git a/css/light-grey.css b/css/light-grey.css
index 3931031d2..b4e4e56af 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -2069,3 +2069,12 @@ select.multiselect {
 }
 
 
+span.refresh-button {
+  display: inline-block;
+  width: 21px;
+  height: 18px;
+  cursor: pointer;
+  background: transparent url(../images/refresh-fff.png) left center no-repeat;
+}
+
+
diff --git a/css/light-grey.scss b/css/light-grey.scss
index eb35e2441..e35643f78 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -302,7 +302,6 @@ input.textSearch {
 	border: 1px solid #7f9db9;
 	background: #fff url(../images/ac-background.gif) no-repeat right;
 }
-
 /* By Rom */
 .csvimport_createobj {
     color: #AA0000;
@@ -1524,4 +1523,11 @@ h2.printable-tab-title {
 }
 select.multiselect {
 	max-width: 150px;
+}
+span.refresh-button {
+	display: inline-block;
+	width: 21px;
+	height: 18px;
+	cursor: pointer;
+	background: transparent url(../images/refresh-fff.png) left center no-repeat;
 }
\ No newline at end of file
diff --git a/images/refresh-fff.png b/images/refresh-fff.png
new file mode 100755
index 0000000000000000000000000000000000000000..9d01f7d906306c9cc59274b167b2872b387e4ea0
GIT binary patch
literal 235
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5XdOcknLn>}<3BJwSpun@_*g=U--c{Bg&P%L&toBvVH%nea
zF|Md(%fkiNnOsDw3`*wsKCjwyAVI13(5H%{Qyi9<X)yAM>`dY;;5WMMZ=D|aIm;^X
zPG6gP9;fo<rmn{y+@+^7SWY?MzAk9_Q`Sv2({iUoXtlrWt1rCe^o8X^YQZEO?{oDT
gs$c4!`!+B#lykFitrnf&3v?KRr>mdKI;Vst0F!Q4nE(I)

literal 0
HcmV?d00001