diff --git a/client/WEB-INF/classes/resources/resource.properties b/client/WEB-INF/classes/resources/resource.properties index 89a034da27d..aae6152b85b 100644 --- a/client/WEB-INF/classes/resources/resource.properties +++ b/client/WEB-INF/classes/resources/resource.properties @@ -59,6 +59,7 @@ memory = Memory offer.HA = Offer HA network.type = Network Type created = Created +disk.size = Disk Size disk.offering = Disk Offering copy.ISO.to = Copy ISO to diff --git a/ui/new/index.jsp b/ui/new/index.jsp index c649e9b1c5e..091f32cae59 100644 --- a/ui/new/index.jsp +++ b/ui/new/index.jsp @@ -71,6 +71,8 @@ long milliseconds = new Date().getTime(); + + Cloud.com CloudStack diff --git a/ui/new/jsp/diskoffering.jsp b/ui/new/jsp/diskoffering.jsp new file mode 100644 index 00000000000..f0c5b0339f0 --- /dev/null +++ b/ui/new/jsp/diskoffering.jsp @@ -0,0 +1,223 @@ +<%@ page import="java.util.*" %> + +<%@ page import="com.cloud.utils.*" %> + +<% + Locale browserLocale = request.getLocale(); + CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); +%> + +
+ +

+ Disk Offering +

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

+ Waiting …

+
+
+
+
+
+
+ <%=t.t("ID")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("name")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("display.text")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("disk.size")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("tags")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("domain")%>:
+
+
+
+
+
+
+
+
+ + +
+
+
+ + + + + + + + + + + + + + + + + + diff --git a/ui/new/scripts/cloud.core2.diskoffering.js b/ui/new/scripts/cloud.core2.diskoffering.js new file mode 100644 index 00000000000..d7c034b5787 --- /dev/null +++ b/ui/new/scripts/cloud.core2.diskoffering.js @@ -0,0 +1,30 @@ +function afterLoadDiskOfferingJSP() { + +} + +function diskOfferingToMidmenu(jsonObj, $midmenuItem1) { + $midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.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(convertBytes(jsonObj.disksize)); +} + +function diskOfferingToRigntPanel($midmenuItem) { + var jsonObj = $midmenuItem.data("jsonObj"); + diskOfferingJsonToDetailsTab(jsonObj); +} + +function diskOfferingJsonToDetailsTab(jsonObj) { + var $detailsTab = $("#right_panel_content #tab_content_details"); + $detailsTab.data("jsonObj", jsonObj); + $detailsTab.find("#id").text(jsonObj.id); + $detailsTab.find("#name").text(fromdb(jsonObj.name)); + $detailsTab.find("#displaytext").text(fromdb(jsonObj.displaytext)); + $detailsTab.find("#disksize").text(convertBytes(jsonObj.disksize)); + $detailsTab.find("#tags").text(fromdb(jsonObj.tags)); + $detailsTab.find("#domain").text(fromdb(jsonObj.domain)); +} \ 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 89e0526af61..c31ceb10f82 100644 --- a/ui/new/scripts/cloud.core2.init.js +++ b/ui/new/scripts/cloud.core2.init.js @@ -87,6 +87,7 @@ $(document).ready(function() { listMidMenuItems("leftmenu_submenu_community_iso", "listIsos&isofilter=community", "listisosresponse", "iso", "jsp/iso.jsp", afterLoadIsoJSP, isoToMidmenu, isoToRigntPanel, isoGetMidmenuId); 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); $("#leftmenu_instance_group_header").bind("click", function(event) { showMiddleMenu();