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 fed08fc9ee4..cfafde62be2 100644 Binary files a/ui/images/search_closeicon.gif and b/ui/images/search_closeicon.gif differ diff --git a/ui/images/search_closeicon_hover.gif b/ui/images/search_closeicon_hover.gif index 8980f90ed4f..02dcdc41c3b 100644 Binary files a/ui/images/search_closeicon_hover.gif and b/ui/images/search_closeicon_hover.gif differ diff --git a/ui/images/search_refreshicon.gif b/ui/images/search_refreshicon.gif new file mode 100644 index 00000000000..e84278c2e00 Binary files /dev/null and b/ui/images/search_refreshicon.gif differ diff --git a/ui/images/search_refreshicon_hover.gif b/ui/images/search_refreshicon_hover.gif new file mode 100644 index 00000000000..8c6180a6a2a Binary files /dev/null and b/ui/images/search_refreshicon_hover.gif differ 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 @@
  • 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({