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.

This commit is contained in:
will 2011-02-08 12:28:08 -08:00
parent 2b46ea5c0a
commit c22e41ea92
8 changed files with 42 additions and 15 deletions

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 193 B

After

Width:  |  Height:  |  Size: 138 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 193 B

After

Width:  |  Height:  |  Size: 138 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 227 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 227 B

View File

@ -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>

View File

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

View File

@ -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({