etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

new Advanced Search - fix a bug that advanced search dialog didn't appear when clicking the same type of submenu (e.g. "my accounts", "all accounts").

This commit is contained in:
Jessica Wang 2010-12-23 10:30:08 -08:00
parent 3775ba043e
commit bceff4068f
5 changed files with 80 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
ui/jsp/account.jsp
View File

@ -776,26 +776,26 @@
<!-- dialogs (end) -->
<!-- advanced search template (begin) -->
<div class="adv_searchpopup_bg" id="advanced_search_popup" style="display:none;">
<div class="adv_searchformbox">
<form action="#" method="post">
<ol>
<li>
<input class="text textwatermark" type="text" id="adv_search_name" value="by name"/>
</li>
<li>
<select class="select" id="adv_search_role">
<option value=""></option>
<option value="0">User</option>
<option value="2">Domain-Admin</option>
<option value="1">Admin</option>
</select>
</li>
</ol>
</form>
</div>
</div>
<!-- advanced search template (end) -->
<div id="hidden_container">
<!-- advanced search popup (begin) -->
<div class="adv_searchpopup_bg" id="advanced_search_popup" style="display: none;">
<div class="adv_searchformbox">
<form action="#" method="post">
<ol>
<li>
<input class="text textwatermark" type="text" id="adv_search_name" value="by name" />
</li>
<li>
<select class="select" id="adv_search_role">
<option value=""></option>
<option value="0">User</option>
<option value="2">Domain-Admin</option>
<option value="1">Admin</option>
</select>
</li>
</ol>
</form>
</div>
</div>
<!-- advanced search popup (end) -->
</div>

50
ui/jsp/iso.jsp
View File

@ -392,28 +392,30 @@
</p>
</div>
<!-- advanced search template (begin) -->
<div class="adv_searchpopup_bg" id="advanced_search_popup" style="display:none;">
<div class="adv_searchformbox">
<form action="#" method="post">
<ol>
<li>
<input class="text textwatermark" type="text" name="adv_search_name" id="adv_search_name" value="by name"/>
</li>
<li>
<select class="select" id="adv_search_zone">
</select>
</li>
<li id="adv_search_domain_li" style="display: none;">
<select class="select" id="adv_search_domain">
</select>
</li>
<li id="adv_search_account_li" style="display: none;">
<input class="text textwatermark" type="text" id="adv_search_account" value="by account" />
</li>
</ol>
</form>
</div>
<div id="hidden_container">
<!-- advanced search popup (begin) -->
<div class="adv_searchpopup_bg" id="advanced_search_popup" style="display: none;">
<div class="adv_searchformbox">
<form action="#" method="post">
<ol>
<li>
<input class="text textwatermark" type="text" name="adv_search_name" id="adv_search_name"
value="by name" />
</li>
<li>
<select class="select" id="adv_search_zone">
</select>
</li>
<li id="adv_search_domain_li" style="display: none;">
<select class="select" id="adv_search_domain">
</select>
</li>
<li id="adv_search_account_li" style="display: none;">
<input class="text textwatermark" type="text" id="adv_search_account" value="by account" />
</li>
</ol>
</form>
</div>
</div>
<!-- advanced search popup (end) -->
</div>
<!-- advanced search template (end) -->

50
ui/jsp/template.jsp
View File

@ -408,28 +408,30 @@
</p>
</div>
<!-- advanced search template (begin) -->
<div class="adv_searchpopup_bg" id="advanced_search_popup" style="display:none;">
<div class="adv_searchformbox">
<form action="#" method="post">
<ol>
<li>
<input class="text textwatermark" type="text" name="adv_search_name" id="adv_search_name" value="by name" />
</li>
<li>
<select class="select" id="adv_search_zone">
</select>
</li>
<li id="adv_search_domain_li" style="display: none;">
<select class="select" id="adv_search_domain">
</select>
</li>
<li id="adv_search_account_li" style="display: none;">
<input class="text textwatermark" type="text" id="adv_search_account" value="by account" />
</li>
</ol>
</form>
</div>
<div id="hidden_container">
<!-- advanced search popup (begin) -->
<div class="adv_searchpopup_bg" id="advanced_search_popup" style="display: none;">
<div class="adv_searchformbox">
<form action="#" method="post">
<ol>
<li>
<input class="text textwatermark" type="text" name="adv_search_name" id="adv_search_name"
value="by name" />
</li>
<li>
<select class="select" id="adv_search_zone">
</select>
</li>
<li id="adv_search_domain_li" style="display: none;">
<select class="select" id="adv_search_domain">
</select>
</li>
<li id="adv_search_account_li" style="display: none;">
<input class="text textwatermark" type="text" id="adv_search_account" value="by account" />
</li>
</ol>
</form>
</div>
</div>
<!-- advanced search popup (end) -->
</div>
<!-- advanced search template (end) -->

7
ui/scripts/cloud.core.init.js
View File

@ -274,7 +274,8 @@ $(document).ready(function() {
$("#advanced_search_container").find("#advanced_search_popup").slideDown("500");
}
else {
var $advancedSearchPopup = $("#advanced_search_popup");
var $advancedSearchPopup = $("#hidden_container").find("#advanced_search_popup");
$("#advanced_search_container").append($advancedSearchPopup.slideDown("500"));
$advancedSearchPopup.unbind("click").bind("click", function(event) {
var $target = $(event.target);
@ -389,9 +390,7 @@ $(document).ready(function() {
});
}
$advancedSearchPopup.find("#adv_search_startdate, #adv_search_enddate").datepicker({dateFormat: 'yy-mm-dd'});
$("#advanced_search_container").empty().append($advancedSearchPopup.slideDown("500"));
$advancedSearchPopup.find("#adv_search_startdate, #adv_search_enddate").datepicker({dateFormat: 'yy-mm-dd'});
}
}

4
ui/scripts/cloud.core.js
View File

@ -557,8 +557,8 @@ function clearMiddleMenu() {
$("#midmenu_action_link").hide();
lastSearchType = null;
$("#basic_search").find("#search_input").val("");
$("#advanced_search_icon").removeClass("up");
$("#advanced_search_container").empty();
$("#advanced_search_icon").removeClass("up");
$("#advanced_search_container").find("#advanced_search_popup").hide().appendTo($("#hidden_container"));
$("#midmenu_prevbutton, #midmenu_nextbutton").hide();
$("#middle_menu_pagination").data("params", null);
}