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

bug 4556: IP Address page - localize all loading text.

This commit is contained in:
Jessica Wang 2011-01-28 16:46:36 -08:00
parent e9652e67ad
commit 18dc5f7d90
4 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,6 +19,9 @@ label.add=Add
label.adding.processing=Adding....
label.adding.succeeded=Adding Succeeded
label.adding.failed=Adding Failed
label.deleting.processing=Deleting....
label.deleting.failed=Deleting Failed
label.saving.processing=Saving....
label.succeeded=Succeeded
label.failed=Failed
label.error.code=Error Code
@ -209,7 +212,6 @@ label.delete=Delete
label.assign=Assign
label.assign.to.load.balancer=Assigning instance to load balancer
label.remove.from.load.balancer=Removing instance from load balancer
label.revoke=Revoke
label.removing.user=Removing User
label.enabling.vpn.access=Enabling VPN Access
label.disabling.vpn.access=Disabling VPN Access

3
ui/index.jsp
View File

@ -68,6 +68,9 @@
'label.adding.processing': '<fmt:message key="label.adding.processing"/>',
'label.adding.succeeded': '<fmt:message key="label.adding.succeeded"/>',
'label.adding.failed': '<fmt:message key="label.adding.failed"/>',
'label.deleting.processing': '<fmt:message key="label.deleting.processing"/>',
'label.deleting.failed': '<fmt:message key="label.deleting.failed"/>',
'label.saving.processing': '<fmt:message key="label.saving.processing"/>',
'label.succeeded': '<fmt:message key="label.succeeded"/>',
'label.failed': '<fmt:message key="label.failed"/>',
'label.error.code': '<fmt:message key="label.error.code"/>',

4
ui/jsp/ipaddress.jsp
View File

@ -611,7 +611,7 @@ dictionary = {
</div>
<div class="grid_row_cell" style="width: 15%; padding: 1px;">
<div class="row_celltitles">
<a id="revoke_link" href="#" style="float:left;"><fmt:message key="label.revoke"/> </a>
<a id="delete_link" href="#" style="float:left;"><fmt:message key="label.delete"/> </a>
</div>
</div>
<div class="gridrow_loaderbox" style="display: none;" id="spinning_wheel">
@ -645,7 +645,7 @@ dictionary = {
</div>
<div class="grid_row_cell" style="width: 15%;">
<div class="row_celltitles">
<a id="revoke_link" href="#" style="float:left;"><fmt:message key="label.revoke"/> </a>
<a id="delete_link" href="#" style="float:left;"><fmt:message key="label.delete"/> </a>
<!--
<a id="edit_link" href="#" style="float:left; margin-left:15px;">Edit</a>
-->

36
ui/scripts/cloud.core.ipaddress.js
View File

@ -129,7 +129,8 @@ function afterLoadIpJSP() {
$("#tab_content_port_range #grid_content").append($template.show());
var $spinningWheel = $template.find("#row_container").find("#spinning_wheel");
$spinningWheel.find("#description").text("Adding....");
//$spinningWheel.find("#description").text("Adding....");
$spinningWheel.find("#description").text(g_dictionary["label.adding.processing"]);
$spinningWheel.show();
var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
@ -225,7 +226,7 @@ function afterLoadIpJSP() {
$("#tab_content_port_forwarding #grid_content").append($template.show());
var $spinningWheel = $template.find("#row_container").find("#spinning_wheel");
$spinningWheel.find("#description").text("Adding....");
$spinningWheel.find("#description").text(g_dictionary["label.adding.processing"]);
$spinningWheel.show();
var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
@ -323,7 +324,7 @@ function afterLoadIpJSP() {
$("#tab_content_load_balancer #grid_content").append($template.show());
var $spinningWheel = $template.find("#row_container").find("#spinning_wheel");
$spinningWheel.find("#description").text("Adding load balancer rule....");
$spinningWheel.find("#description").text(g_dictionary["label.adding.processing"]);
$spinningWheel.show();
var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
@ -1372,9 +1373,9 @@ function portRangeJsonToTemplate(jsonObj, $template) {
$template.find("#row_container #protocol").text(fromdb(jsonObj.protocol));
ipSetRuleState(fromdb(jsonObj.state), $template.find("#row_container #state"));
$template.find("#revoke_link").unbind("click").bind("click", function(event){
$template.find("#delete_link").unbind("click").bind("click", function(event){
var $spinningWheel = $template.find("#row_container").find("#spinning_wheel");
$spinningWheel.find("#description").text("Revoking....");
$spinningWheel.find("#description").text(g_dictionary["label.deleting.processing"]);
$spinningWheel.show();
$.ajax({
@ -1402,7 +1403,7 @@ function portRangeJsonToTemplate(jsonObj, $template) {
$(this).remove();
});
} else if (result.jobstatus == 2) { // Failed
$("#dialog_error").text("Revoking Port Range rule failed.").dialog("open");
$("#dialog_error").text(g_dictionary["label.deleting.failed"]).dialog("open");
}
}
},
@ -1473,9 +1474,9 @@ function portForwardingJsonToTemplate(jsonObj, $template) {
var $rowContainer = $template.find("#row_container");
var $rowContainerEdit = $template.find("#row_container_edit");
$template.find("#revoke_link").unbind("click").bind("click", function(event){
$template.find("#delete_link").unbind("click").bind("click", function(event){
var $spinningWheel = $rowContainer.find("#spinning_wheel");
$spinningWheel.find("#description").text("Revoking....");
$spinningWheel.find("#description").text(g_dictionary["label.deleting.processing"]);
$spinningWheel.show();
$.ajax({
@ -1503,7 +1504,7 @@ function portForwardingJsonToTemplate(jsonObj, $template) {
$(this).remove();
});
} else if (result.jobstatus == 2) { // Failed
$("#dialog_error").text("Revoking port forwarding rule failed.").dialog("open");
$("#dialog_error").text(g_dictionary["label.deleting.failed"]).dialog("open");
}
}
},
@ -1526,16 +1527,21 @@ function portForwardingJsonToTemplate(jsonObj, $template) {
return false;
});
/*
$template.find("#edit_link").unbind("click").bind("click", function(event){
$rowContainer.hide();
$rowContainerEdit.show();
});
*/
/*
$template.find("#cancel_link").unbind("click").bind("click", function(event){
$rowContainer.show();
$rowContainerEdit.hide();
});
*/
/*
$template.find("#save_link").unbind("click").bind("click", function(event){
// validate values
var isValid = true;
@ -1543,7 +1549,7 @@ function portForwardingJsonToTemplate(jsonObj, $template) {
if (!isValid) return;
var $spinningWheel = $rowContainerEdit.find("#spinning_wheel");
$spinningWheel.find("#description").text("Saving....");
$spinningWheel.find("#description").text(g_dictionary["label.saving.processing"]);
$spinningWheel.show();
var publicPort = $rowContainerEdit.find("#public_port").text();
@ -1601,6 +1607,7 @@ function portForwardingJsonToTemplate(jsonObj, $template) {
}
});
});
*/
}
function refreshCreatePortForwardingRow() {
@ -1714,7 +1721,7 @@ function loadBalancerJsonToTemplate(jsonObj, $template) {
$managementArea.hide();
var $spinningWheel = $template.find("#row_container").find("#spinning_wheel");
$spinningWheel.find("#description").text("Deleting load balancer rule....");
$spinningWheel.find("#description").text(g_dictionary["label.deleting.processing"]);
$spinningWheel.show();
$.ajax({
@ -1736,12 +1743,13 @@ function loadBalancerJsonToTemplate(jsonObj, $template) {
return; //Job has not completed
} else {
$("body").stopTime(timerKey);
$spinningWheel.hide();
if (result.jobstatus == 1) { // Succeeded
$template.slideUp("slow", function() {
$(this).remove();
});
} else if (result.jobstatus == 2) { // Failed
$spinningWheel.hide();
} else if (result.jobstatus == 2) { // Failed
$("#dialog_error").text(g_dictionary["label.deleting.failed"]).dialog("open");
}
}
},
@ -1781,7 +1789,7 @@ function loadBalancerJsonToTemplate(jsonObj, $template) {
return;
var $spinningWheel = $template.find("#row_container_edit").find("#spinning_wheel");
$spinningWheel.find("#description").text("Saving load balancer rule....");
$spinningWheel.find("#description").text(g_dictionary["label.saving.processing"]);
$spinningWheel.show();
var name = $rowContainerEdit.find("#name").val();