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

bug 8360: Make default option in advanced search field capitalized.

This commit is contained in:
Jessica Wang 2011-02-03 16:43:38 -08:00
parent f75be002e2
commit 57d1e546de
13 changed files with 30 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/WEB-INF/classes/resources/messages.properties
View File

@ -10,7 +10,15 @@ message.download.template=Please click <a href="#">#</a> to download template
message.download.ISO=Please click <a href="#">#</a> to download ISO
message.action.instance.reset.password=Please confirm that you want to change the ROOT password for this virtual machine.
label.owner.domain=Owner Domain
label.by.type.id=By Type ID
label.by.zone=By Zone
label.by.pod=By Pod
label.by.domain=By Domain
label.by.account=By Account
label.by.start.date=By Start Date
label.by.end.date=By End Date
#Labels
label.account.id=Account ID
label.account.name=Account Name

4
ui/index.jsp
View File

@ -82,6 +82,10 @@
'label.character': '<fmt:message key="label.character"/>',
'label.double.quotes.are.not.allowed': '<fmt:message key="label.double.quotes.are.not.allowed"/>',
'label.example': '<fmt:message key="label.example"/>',
'label.by.zone': '<fmt:message key="label.by.zone"/>',
'label.by.pod': '<fmt:message key="label.by.pod"/>',
'label.by.domain': '<fmt:message key="label.by.domain"/>',
'label.by.account': '<fmt:message key="label.by.account"/>'
};
</script>
</head>

2
ui/jsp/alert.jsp
View File

@ -98,7 +98,7 @@
<form action="#" method="post">
<ol>
<li>
<input class="text textwatermark" type="text" id="adv_search_typeid" value="by Type ID" />
<input class="text textwatermark" type="text" id="adv_search_typeid" value='<fmt:message key="label.by.type.id"/>'/>
</li>
</ol>
</form>

6
ui/jsp/event.jsp
View File

@ -301,13 +301,13 @@
</select>
</li>
<li id="adv_search_account_li" style="display: none;">
<input class="text textwatermark" type="text" id="adv_search_account" value="by account" />
<input class="text textwatermark" type="text" id="adv_search_account" value='<fmt:message key="label.by.account" />' />
</li>
<li>
<input class="text textwatermark" type="text" id="adv_search_startdate" value="by start date" />
<input class="text textwatermark" type="text" id="adv_search_startdate" value='<fmt:message key="label.by.start.date" />' />
</li>
<li>
<input class="text textwatermark" type="text" id="adv_search_enddate" value="by end date" />
<input class="text textwatermark" type="text" id="adv_search_enddate" value='<fmt:message key="label.by.end.date" />' />
</li>
</ol>
</form>

4
ui/jsp/instance.jsp
View File

@ -1270,7 +1270,7 @@ dictionary = {
</select>
</li>
<li id="adv_search_account_li" style="display: none;">
<input class="text textwatermark" type="text" id="adv_search_account" value="by account" />
<input class="text textwatermark" type="text" id="adv_search_account" value='<fmt:message key="label.by.account" />' />
</li>
</ol>
</form>
@ -1289,7 +1289,7 @@ dictionary = {
</select>
</li>
<li id="adv_search_account_li" style="display: none;">
<input class="text textwatermark" type="text" id="adv_search_account" value="by account" />
<input class="text textwatermark" type="text" id="adv_search_account" value='<fmt:message key="label.by.account" />' />
</li>
</ol>
</form>

2
ui/jsp/ipaddress.jsp
View File

@ -876,7 +876,7 @@ dictionary = {
</select>
</li>
<li id="adv_search_account_li" style="display: none;">
<input class="text textwatermark" type="text" id="adv_search_account" value="by account" />
<input class="text textwatermark" type="text" id="adv_search_account" value='<fmt:message key="label.by.account" />' />
</li>
</ol>
</form>

2
ui/jsp/iso.jsp
View File

@ -407,7 +407,7 @@ dictionary = {
</select>
</li>
<li id="adv_search_account_li" style="display: none;">
<input class="text textwatermark" type="text" id="adv_search_account" value="by account" />
<input class="text textwatermark" type="text" id="adv_search_account" value='<fmt:message key="label.by.account" />' />
</li>
</ol>
</form>

2
ui/jsp/network.jsp
View File

@ -1297,7 +1297,7 @@ dictionary = {
</select>
</li>
<li id="adv_search_account_li" style="display: none;">
<input class="text textwatermark" type="text" id="adv_search_account" value="by account" />
<input class="text textwatermark" type="text" id="adv_search_account" value='<fmt:message key="label.by.account" />' />
</li>
</ol>
</form>

2
ui/jsp/router.jsp
View File

@ -235,7 +235,7 @@ dictionary = {
</select>
</li>
<li id="adv_search_account_li" style="display: none;">
<input class="text textwatermark" type="text" id="adv_search_account" value="by account" />
<input class="text textwatermark" type="text" id="adv_search_account" value='<fmt:message key="label.by.account" />' />
</li>
</ol>
</form>

2
ui/jsp/snapshot.jsp
View File

@ -213,7 +213,7 @@ dictionary = {
</select>
</li>
<li id="adv_search_account_li" style="display: none;">
<input class="text textwatermark" type="text" id="adv_search_account" value="by account" />
<input class="text textwatermark" type="text" id="adv_search_account" value='<fmt:message key="label.by.account" />' />
</li>
</ol>
</form>

2
ui/jsp/template.jsp
View File

@ -434,7 +434,7 @@ dictionary = {
</select>
</li>
<li id="adv_search_account_li" style="display: none;">
<input class="text textwatermark" type="text" id="adv_search_account" value="by account" />
<input class="text textwatermark" type="text" id="adv_search_account" value='<fmt:message key="label.by.account" />' />
</li>
</ol>
</form>

2
ui/jsp/volume.jsp
View File

@ -781,7 +781,7 @@ dictionary = {
</select>
</li>
<li id="adv_search_account_li" style="display: none;">
<input class="text textwatermark" type="text" id="adv_search_account" value="by account" />
<input class="text textwatermark" type="text" id="adv_search_account" value='<fmt:message key="label.by.account" />' />
</li>
</ol>
</form>

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

@ -403,7 +403,7 @@ $(document).ready(function() {
success: function(json) {
var zones = json.listzonesresponse.zone;
zoneSelect.empty();
zoneSelect.append("<option value=''>by zone</option>");
zoneSelect.append("<option value=''>" + g_dictionary["label.by.zone"] + "</option>");
if (zones != null && zones.length > 0) {
for (var i = 0; i < zones.length; i++) {
zoneSelect.append("<option value='" + zones[i].id + "'>" + fromdb(zones[i].name) + "</option>");
@ -431,7 +431,7 @@ $(document).ready(function() {
success: function(json) {
var pods = json.listpodsresponse.pod;
podSelect.empty();
podSelect.append("<option value=''>by pod</option>");
podSelect.append("<option value=''>" + g_dictionary["label.by.pod"] + "</option>");
if (pods != null && pods.length > 0) {
for (var i = 0; i < pods.length; i++) {
podSelect.append("<option value='" + pods[i].id + "'>" + fromdb(pods[i].name) + "</option>");
@ -455,7 +455,7 @@ $(document).ready(function() {
success: function(json) {
var domains = json.listdomainsresponse.domain;
domainSelect.empty();
domainSelect.append("<option value=''>by domain</option>");
domainSelect.append("<option value=''>" + g_dictionary["label.by.domain"] + "</option>");
if (domains != null && domains.length > 0) {
for (var i = 0; i < domains.length; i++) {
domainSelect.append("<option value='" + domains[i].id + "'>" + fromdb(domains[i].name) + "</option>");
@ -464,27 +464,7 @@ $(document).ready(function() {
}
});
}
/*
var vmSelect = $advancedSearchPopup.find("#adv_search_vm");
if(vmSelect.length>0) {
$.ajax({
data: createURL("command=listVirtualMachines"),
dataType: "json",
success: function(json) {
var items = json.listvirtualmachinesresponse.virtualmachine;
vmSelect.empty();
vmSelect.append("<option value=''>by instance</option>");
if (items != null && items.length > 0) {
for (var i = 0; i < items.length; i++) {
vmSelect.append("<option value='" + items[i].id + "'>" + fromdb(items[i].name) + "</option>");
}
}
}
});
}
*/
$advancedSearchPopup.find("#adv_search_startdate, #adv_search_enddate").datepicker({dateFormat: 'yy-mm-dd'});
}
}