diff --git a/client/WEB-INF/classes/resources/resource.properties b/client/WEB-INF/classes/resources/resource.properties index aae6152b85b..e11b0388b7d 100644 --- a/client/WEB-INF/classes/resources/resource.properties +++ b/client/WEB-INF/classes/resources/resource.properties @@ -60,6 +60,8 @@ offer.HA = Offer HA network.type = Network Type created = Created disk.size = Disk Size +value = Value +description = Description disk.offering = Disk Offering copy.ISO.to = Copy ISO to diff --git a/ui/new/index.jsp b/ui/new/index.jsp index 091f32cae59..f184f97e7f0 100644 --- a/ui/new/index.jsp +++ b/ui/new/index.jsp @@ -73,6 +73,8 @@ long milliseconds = new Date().getTime(); + + Cloud.com CloudStack diff --git a/ui/new/jsp/globalsetting.jsp b/ui/new/jsp/globalsetting.jsp new file mode 100644 index 00000000000..0c9cd28f60e --- /dev/null +++ b/ui/new/jsp/globalsetting.jsp @@ -0,0 +1,193 @@ +<%@ page import="java.util.*" %> + +<%@ page import="com.cloud.utils.*" %> + +<% + Locale browserLocale = request.getLocale(); + CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); +%> + +
+ +

+ Global Settings +

+
+
+ +
+
+ <%=t.t("details")%>
+
+
+
+ +
+
+
+
+
+

+ Waiting …

+
+
+
+
+
+
+ <%=t.t("name")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("value")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("description")%>:
+
+
+
+
+
+
+
+
+ + +
+
+
+ + + + + + + + + + + + + + + + + + diff --git a/ui/new/scripts/cloud.core2.globalsetting.js b/ui/new/scripts/cloud.core2.globalsetting.js new file mode 100644 index 00000000000..3941af69d16 --- /dev/null +++ b/ui/new/scripts/cloud.core2.globalsetting.js @@ -0,0 +1,33 @@ +function afterLoadGlobalSettingJSP() { + +} + +function globalSettingGetMidmenuId(jsonObj) { + return "midmenuItem_" + fromdb(jsonObj.name).replace(/\./g, "_").replace(/\s/g, ""); //remove all spaces in jsonObj.name +} + +function globalSettingToMidmenu(jsonObj, $midmenuItem1) { + var id = globalSettingGetMidmenuId(jsonObj); + $midmenuItem1.attr("id", id); + + $midmenuItem1.data("jsonObj", jsonObj); + + //var $iconContainer = $midmenuItem1.find("#icon_container").show(); + //$iconContainer.find("#icon").attr("src", "images/midmenuicon_storage_volume.png"); + + $midmenuItem1.find("#first_row").text(fromdb(jsonObj.name).substring(0,25)); + $midmenuItem1.find("#second_row").text(fromdb(jsonObj.value).substring(0,25)); +} + +function globalSettingToRigntPanel($midmenuItem) { + var jsonObj = $midmenuItem.data("jsonObj"); + globalSettingJsonToDetailsTab(jsonObj); +} + +function globalSettingJsonToDetailsTab(jsonObj) { + var $detailsTab = $("#right_panel_content #tab_content_details"); + $detailsTab.data("jsonObj", jsonObj); + $detailsTab.find("#name").text(fromdb(jsonObj.name)); + $detailsTab.find("#value").text(fromdb(jsonObj.value)); + $detailsTab.find("#description").text(fromdb(jsonObj.description)); +} \ No newline at end of file diff --git a/ui/new/scripts/cloud.core2.init.js b/ui/new/scripts/cloud.core2.init.js index c31ceb10f82..399b4253b98 100644 --- a/ui/new/scripts/cloud.core2.init.js +++ b/ui/new/scripts/cloud.core2.init.js @@ -88,6 +88,7 @@ $(document).ready(function() { listMidMenuItems("leftmenu_service_offering", "listServiceOfferings", "listserviceofferingsresponse", "serviceoffering", "jsp/serviceoffering.jsp", afterLoadServiceOfferingJSP, serviceOfferingToMidmenu, serviceOfferingToRigntPanel); listMidMenuItems("leftmenu_disk_offering", "listDiskOfferings", "listdiskofferingsresponse", "diskoffering", "jsp/diskoffering.jsp", afterLoadDiskOfferingJSP, diskOfferingToMidmenu, diskOfferingToRigntPanel); + listMidMenuItems("leftmenu_global_setting", "listConfigurations", "listconfigurationsresponse", "configuration", "jsp/globalsetting.jsp", afterLoadGlobalSettingJSP, globalSettingToMidmenu, globalSettingToRigntPanel, globalSettingGetMidmenuId); $("#leftmenu_instance_group_header").bind("click", function(event) { showMiddleMenu();