diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index a1ed853632b..9564403552f 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -272,7 +272,7 @@ label.account.specific=Account-Specific label.ip.range=IP Range label.network.offering=Network Offering label.availability=Availability -label.require=Required +label.required=Required label.optional=Optional label.unavailable=Unavailable label.specify.vlan=Specify VLAN @@ -575,6 +575,9 @@ label.action.edit.disk.offering=Edit Disk Offering label.action.delete.disk.offering=Delete Disk Offering label.action.delete.disk.offering.processing=Deleting Disk Offering.... +label.action.edit.network.offering=Edit Network Offering +label.action.edit.global.setting=Edit Global Setting + #Messages message.action.start.instance=Please confirm you want to start instance message.action.stop.instance=Please confirm you want to stop instance diff --git a/ui/jsp/globalsetting.jsp b/ui/jsp/globalsetting.jsp index d0537822d0d..3c92be5be48 100644 --- a/ui/jsp/globalsetting.jsp +++ b/ui/jsp/globalsetting.jsp @@ -5,6 +5,12 @@ + +
diff --git a/ui/jsp/networkoffering.jsp b/ui/jsp/networkoffering.jsp index cd648c99e6e..1e8fb207b25 100644 --- a/ui/jsp/networkoffering.jsp +++ b/ui/jsp/networkoffering.jsp @@ -5,6 +5,11 @@ +
diff --git a/ui/scripts/cloud.core.globalsetting.js b/ui/scripts/cloud.core.globalsetting.js index fa29c61645f..cb4dd9c8a9d 100644 --- a/ui/scripts/cloud.core.globalsetting.js +++ b/ui/scripts/cloud.core.globalsetting.js @@ -22,7 +22,7 @@ function afterLoadGlobalSettingJSP() { //actions var $actionList = $("#right_panel_content #tab_content_details #action_link #action_menu").find("#action_list").empty(); var $listItem = $("#action_list_item").clone(); - $listItem.find("#link").text("Edit Global Setting"); + $listItem.find("#link").text(dictionary["label.action.edit.global.setting"]); $listItem.bind("click", function(event) { doEditGlobalSetting(); return false; diff --git a/ui/scripts/cloud.core.networkoffering.js b/ui/scripts/cloud.core.networkoffering.js index c183e2e8b47..c9eb51e000f 100644 --- a/ui/scripts/cloud.core.networkoffering.js +++ b/ui/scripts/cloud.core.networkoffering.js @@ -168,7 +168,7 @@ function networkOfferingJsonToDetailsTab() { //actions *** var $actionMenu = $("#right_panel_content #tab_content_details #action_link #action_menu"); $actionMenu.find("#action_list").empty(); - buildActionLinkForTab("Edit Network Offering", networkOfferingActionMap, $actionMenu, $midmenuItem1, $thisTab); + buildActionLinkForTab("label.action.edit.network.offering", networkOfferingActionMap, $actionMenu, $midmenuItem1, $thisTab); $thisTab.find("#tab_spinning_wheel").hide(); $thisTab.find("#tab_container").show(); @@ -196,7 +196,7 @@ function networkOfferingClearDetailsTab() { } var networkOfferingActionMap = { - "Edit Network Offering": { + "label.action.edit.network.offering": { dialogBeforeActionFn: doEditNetworkOffering } } \ No newline at end of file