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

bug 4556: network page - public network - localize all actions.

This commit is contained in:
Jessica Wang 2011-01-27 19:45:46 -08:00
parent 097e432c75
commit 4fcd6dec89
3 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -544,6 +544,13 @@ label.action.delete.primary.storage.processing=Deleting Primary Storage....
label.action.delete.secondary.storage=Delete Secondary Storage
label.action.delete.secondary.storage.processing=Deleting Secondary Storage....
label.action.delete.IP.range=Delete IP Range
label.action.delete.IP.range.processing=Deleting IP Range....
label.action.delete.firewall=Delete Firewall
label.action.delete.firewall.processing=Deleting Firewall....
label.action.delete.load.balancer=Delete Load Balancer
label.action.delete.load.balancer.processing=Deleting Load Balancer....
#Messages
message.action.start.instance=Please confirm you want to start instance
message.action.stop.instance=Please confirm you want to stop instance

11
ui/jsp/network.jsp
View File

@ -5,6 +5,17 @@
</c:if>
<fmt:setBundle basename="resources/messages"/>
<script language="javascript">
dictionary = {
'label.action.delete.IP.range' : '<fmt:message key="label.action.delete.IP.range"/>',
'label.action.delete.IP.range.processing' : '<fmt:message key="label.action.delete.IP.range.processing"/>',
'label.action.delete.firewall' : '<fmt:message key="label.action.delete.firewall"/>',
'label.action.delete.firewall.processing' : '<fmt:message key="label.action.delete.firewall.processing"/>',
'label.action.delete.load.balancer' : '<fmt:message key="label.action.delete.load.balancer"/>',
'label.action.delete.load.balancer.processing' : '<fmt:message key="label.action.delete.load.balancer.processing"/>'
};
</script>
<div class="main_title" id="right_panel_header">
<div class="main_titleicon">
<img src="images/title_podicon.gif" /></div>

24
ui/scripts/cloud.core.network.js
View File

@ -247,7 +247,7 @@ function publicNetworkIprangeJsonToTemplate(jsonObj, $template) {
var $actionMenu = $actionLink.find("#iprange_action_menu");
$actionMenu.find("#action_list").empty();
buildActionLinkForSubgridItem("Delete IP Range", publicNetworkIpRangeActionMap, $actionMenu, $template);
buildActionLinkForSubgridItem("label.action.delete.IP.range", publicNetworkIpRangeActionMap, $actionMenu, $template);
}
function publicNetworkJsonToFirewallTab() {
@ -339,14 +339,14 @@ function publicNetworkFirewallJsonToTemplate(jsonObj, $template) {
var $actionMenu = $actionLink.find("#firewall_action_menu");
$actionMenu.find("#action_list").empty();
buildActionLinkForSubgridItem("Delete Firewall", publicNetworkFirewallActionMap, $actionMenu, $template);
buildActionLinkForSubgridItem("label.action.delete.firewall", publicNetworkFirewallActionMap, $actionMenu, $template);
}
var publicNetworkFirewallActionMap = {
"Delete Firewall": {
"label.action.delete.firewall": {
api: "deleteExternalFirewall",
isAsyncJob: false,
inProcessText: "Deleting Firewall....",
inProcessText: "label.action.delete.firewall.processing",
afterActionSeccessFn: function(json, id, $subgridItem) {
$subgridItem.slideUp("slow", function() {
$(this).remove();
@ -410,14 +410,14 @@ function publicNetworkLoadBalancerJsonToTemplate(jsonObj, $template) {
var $actionMenu = $actionLink.find("#loadbalancer_action_menu");
$actionMenu.find("#action_list").empty();
buildActionLinkForSubgridItem("Delete Load Balancer", publicNetworkLoadBalancerActionMap, $actionMenu, $template);
buildActionLinkForSubgridItem("label.action.delete.load.balancer", publicNetworkLoadBalancerActionMap, $actionMenu, $template);
}
var publicNetworkLoadBalancerActionMap = {
"Delete Load Balancer": {
"label.action.delete.load.balancer": {
api: "deleteExternalLoadBalancer",
isAsyncJob: false,
inProcessText: "Deleting Load Balancer....",
inProcessText: "label.action.delete.load.balancer.processing",
afterActionSeccessFn: function(json, id, $subgridItem) {
$subgridItem.slideUp("slow", function() {
$(this).remove();
@ -771,10 +771,10 @@ function bindAddExternalFirewallButton($button, $midmenuItem1) {
}
var publicNetworkIpRangeActionMap = {
"Delete IP Range": {
"label.action.delete.IP.range": {
api: "deleteVlanIpRange",
isAsyncJob: false,
inProcessText: "Deleting IP Range....",
inProcessText: "label.action.delete.IP.range.processing",
afterActionSeccessFn: function(json, id, $subgridItem) {
$subgridItem.slideUp("slow", function() {
$(this).remove();
@ -1054,14 +1054,14 @@ function directNetworkIprangeJsonToTemplate(jsonObj, $template) {
var $actionMenu = $actionLink.find("#iprange_action_menu");
$actionMenu.find("#action_list").empty();
buildActionLinkForSubgridItem("Delete IP Range", directNetworkIpRangeActionMap, $actionMenu, $template);
buildActionLinkForSubgridItem("label.action.delete.IP.range", directNetworkIpRangeActionMap, $actionMenu, $template);
}
var directNetworkIpRangeActionMap = {
"Delete IP Range": {
"label.action.delete.IP.range": {
api: "deleteVlanIpRange",
isAsyncJob: false,
inProcessText: "Deleting IP Range....",
inProcessText: "label.action.delete.IP.range.processing",
afterActionSeccessFn: function(json, id, $subgridItem) {
$subgridItem.slideUp("slow", function() {
$(this).remove();