From c22e41ea929b805f158d475904d6d5d9500e76ad Mon Sep 17 00:00:00 2001
From: will <will@cloud.com>
Date: Tue, 8 Feb 2011 12:28:08 -0800
Subject: [PATCH] bug 8482: Merge from 2.2.x. Added a refresh all link on top
 of the mid menu section.  Changed the top right refresh to refreshing only
 the highlighted item.

---
 ui/css/main.css                        |  18 +++++++++++++++-
 ui/images/search_closeicon.gif         | Bin 193 -> 138 bytes
 ui/images/search_closeicon_hover.gif   | Bin 193 -> 138 bytes
 ui/images/search_refreshicon.gif       | Bin 0 -> 227 bytes
 ui/images/search_refreshicon_hover.gif | Bin 0 -> 227 bytes
 ui/index.jsp                           |   4 ++--
 ui/scripts/cloud.core.init.js          |  28 ++++++++++++++++++-------
 ui/scripts/cloud.core.js               |   7 ++-----
 8 files changed, 42 insertions(+), 15 deletions(-)
 create mode 100644 ui/images/search_refreshicon.gif
 create mode 100644 ui/images/search_refreshicon_hover.gif

diff --git a/ui/css/main.css b/ui/css/main.css
index 9e3eced5ece..86e9b311884 100644
--- a/ui/css/main.css
+++ b/ui/css/main.css
@@ -1941,7 +1941,7 @@ a:hover {
 }
 
 .searchpanel .text{
-	width:145px;
+	width:131px;
 	height:14px;
 	float:left;
 	background:#FFF repeat top left;
@@ -1970,6 +1970,22 @@ a:hover {
 	background:url(../images/search_closeicon_hover.gif) no-repeat top left;
 }
 
+.search_refreshbutton {
+	width:13px;
+	height:13px;
+	background:url(../images/search_refreshicon.gif) no-repeat top left;
+	float:left;
+	margin:2px 0 0 2px;
+	display:inline;
+	padding:0;
+	cursor:pointer;
+	cursor:hand;
+}
+
+.search_refreshbutton:hover {
+	background:url(../images/search_refreshicon_hover.gif) no-repeat top left;
+}
+
 .search_textbg {
 	width:186px;
 	height:16px;
diff --git a/ui/images/search_closeicon.gif b/ui/images/search_closeicon.gif
index fed08fc9ee47c1f4ea94a9c861f6e4157d28b5ec..cfafde62be205b99a71f6452fccb711b33932f70 100644
GIT binary patch
literal 138
zcmZ?wbhEHb<YC}p*v!E2|NsA<o}MXFrhNbY{p87$yLRnby?XWH#fxv=yt!%9rUwrm
z96EI9!-o$qUc6uc1I3>#U|I)6g3MrGF&8-DnaPp5Ea4e1heOQVkeDW=n3*Or_e*)M
lY*^&0TGx_S&*XMgfcuOZ_mr-uJHH6bPh*l4U{GSP1^|nAIrsno

literal 193
zcmZ?wbhEHb<YC}pIKsft)6?_+|NkjdrhNGD;pEAat5>gHvu4fn=g;TQpa1C5qaQzh
z+`D)0*s){h&Yj!0Z{Ng;6W_gi$3P0u0VxLA#lY&8Ai(3I$iZsZ;h4lwkfZWg`aT<{
zKG!D)#t6=195PaFGc>med`(y`;q;_qVG_H#lc$2zMD~XduHH#w+&PWcU3j98##9X!
G25SH?&_aR$

diff --git a/ui/images/search_closeicon_hover.gif b/ui/images/search_closeicon_hover.gif
index 8980f90ed4f0a767996a4bdab21e36c400357598..02dcdc41c3b755bfc4c5724a2989f7116ae6fdff 100644
GIT binary patch
literal 138
zcmZ?wbhEHb<YC}p*v!E2|NsB+@bJXM#E&08E?>TU;>3x?#l^L?wfpz)Z)<Bib?Vfd
zIdh&qeR}=+bp|j{{K*2QbwDJ@3<ef+ffJsY9I49+p7C-x#LNweX;O-rX(DkymFLQa
jMZT(aEqV1!Zchcc&!}-v>3X{Ji@^LeCP@JXB?fB%a<w$|

literal 193
zcmZ?wbhEHb<YC}pIKsfNXV0Gh|NkF6c<}r8@8`~)d+^}Fg$oxxefo6r<jME%-~ayo
z`^}p-j~_q2fB*je{rhj-y7lebHwIFG4oES`E(TV&1OXmaMGhCk4#y;hf*h5{()Zao
z^|>B7Fh+1*<B*YXo1wW);A_Hi38ya|3zOK@ogx*aCbB<#aP>|a<IZWk?!ps&G^T2>
HFjxZs7JWxw

diff --git a/ui/images/search_refreshicon.gif b/ui/images/search_refreshicon.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e84278c2e004c9eb03a0d812267efbc3757ecb22
GIT binary patch
literal 227
zcmZ?wbhEHb<YnMxIKsg2|NsA<o}NpWE*&^<;MT2M|Ni}(H*em~ojW&f+}PXOd+5-i
zix)3`{rdIv>C<oDzU}Mld;a|Sgb5RV{ra_Z>C*f6?;ksMY~jL%-@bkO`Sa(D88fb3
zyLR~S;bqH~eg6EJ0Spv>vVdtF5DBuAfi*!vL8$$s1UqAZ=m8#2h0~p4ng<k=o0Ju%
zc{n(Bm~tsGq$vf<FmWvLI5bm}htW}pA+kbzg8PAuy38A*ia$x}ikrzg7#8@5Nj08P
b-TwM-3bT^Fp)n&TGf%XNnueB=B7-#m@#khH

literal 0
HcmV?d00001

diff --git a/ui/images/search_refreshicon_hover.gif b/ui/images/search_refreshicon_hover.gif
new file mode 100644
index 0000000000000000000000000000000000000000..8c6180a6a2adf100fbaecc06ee0480d5b2352fb6
GIT binary patch
literal 227
zcmZ?wbhEHb<YnMxIKsg2|NsB!=;)Z3m^pLiOrAWsqod>S;ltauZ7V1!`1|+o{Q2{@
zZr!?O&6?QQ*mv*VJ$(4^`t|Ga@$uijeS7`-b!KMf(xpp_i;F8NDn5Mp@b&B0s;a6}
zr%o+gxNy&&Jq%!=_>%=p>wrj*oeZoA3JOvzmlRqUb3`BTI4PWV64yMSAbz}9WSWOV
zVuzuSlEX8lU;!r9B_4}rY6>(u3o%4ih)-~Puu+$JLsao6NnLddVF$wkA2kU^F178i
Z|E4f2=^Gj|GBNW-tEg#cDJe2o0{~@AT%P~{

literal 0
HcmV?d00001

diff --git a/ui/index.jsp b/ui/index.jsp
index de1f15aa572..bd93164ae61 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -206,8 +206,8 @@
                                 <li>
                                     <div id="basic_search" class="search_textbg">
                                         <input class="text" type="text" id="search_input" />
-                                        <div id="clear_search" class="search_closebutton" style="display: none;">
-                                        </div>
+										<div id="refresh_mid" class="search_refreshbutton" style="display: block;"></div>
+                                        <div id="clear_search" class="search_closebutton" style="display: block;"></div>
                                     </div>
                                 </li>
                             </ol>
diff --git a/ui/scripts/cloud.core.init.js b/ui/scripts/cloud.core.init.js
index 6049623169c..72eea5f94e0 100644
--- a/ui/scripts/cloud.core.init.js
+++ b/ui/scripts/cloud.core.init.js
@@ -333,10 +333,20 @@ $(document).ready(function() {
 	}
 	
 	//clear search
-	$("#clear_search").unbind("click").bind("click", function(event) {	    
-	    if($selectedSubMenu != null)
-	        $selectedSubMenu.click();
-	    return false;
+	$("#clear_search").unbind("click").bind("click", function(event) {
+		if(searchParams.length > 0)  {
+			if($selectedSubMenu != null)
+				$selectedSubMenu.click();
+			return false;
+		}
+	});
+	
+	//refresh mid search
+	$("#refresh_mid").unbind("click").bind("click", function(event) {	    
+	    var onRefreshFn = $("#right_panel").data("onRefreshFn");
+		if(onRefreshFn != null)
+		    onRefreshFn();
+		return false;
 	});
 	
 	//basic search	
@@ -493,9 +503,13 @@ $(document).ready(function() {
 	
 	// refresh button
 	$("#refresh_link").unbind("click").bind("click", function(event) {		
-		var onRefreshFn = $("#right_panel").data("onRefreshFn");
-		if(onRefreshFn != null)
-		    onRefreshFn();
+		if ($currentMidmenuItem != null) {
+			$currentMidmenuItem.click();
+		} else {
+			var onRefreshFn = $("#right_panel").data("onRefreshFn");
+			if(onRefreshFn != null)
+				onRefreshFn();
+		}
 		return false;
 	});
 	
diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js
index 5ef781f9802..c5d717b2eae 100644
--- a/ui/scripts/cloud.core.js
+++ b/ui/scripts/cloud.core.js
@@ -1000,6 +1000,7 @@ function getMidmenuId(jsonObj) {
 
 //var lastSearchType;
 var currentCommandString;
+var searchParams;
 function listMidMenuItems2(commandString, getSearchParamsFn, jsonResponse1, jsonResponse2, toMidmenuFn, toRightPanelFn, getMidmenuIdFn, isMultipleSelectionInMidMenu, page) {                
 	$("#midmenu_container").hide();
 	$("#midmenu_spinning_wheel").show();
@@ -1019,11 +1020,7 @@ function listMidMenuItems2(commandString, getSearchParamsFn, jsonResponse1, json
 	
 	(page > 1)? $("#midmenu_prevbutton").show(): $("#midmenu_prevbutton").hide();
 	
-	var searchParams = getSearchParamsFn();
-	if(searchParams.length > 0)
-	    $("#clear_search").show();
-	else
-	    $("#clear_search").hide();
+	searchParams = getSearchParamsFn();
 	
     var count = 0;    
     $.ajax({