diff --git a/ui/new/index.jsp b/ui/new/index.jsp index 9484d79dd08..f3a3b430569 100644 --- a/ui/new/index.jsp +++ b/ui/new/index.jsp @@ -52,6 +52,8 @@ long milliseconds = new Date().getTime(); + + Cloud.com CloudStack @@ -471,7 +473,7 @@ long milliseconds = new Date().getTime();
-
+
@@ -479,7 +481,7 @@ long milliseconds = new Date().getTime(); My Templates
-
+
@@ -487,7 +489,7 @@ long milliseconds = new Date().getTime(); Featured
-
+
@@ -506,7 +508,7 @@ long milliseconds = new Date().getTime();
-
+
@@ -514,7 +516,7 @@ long milliseconds = new Date().getTime(); My ISOs
-
+
@@ -522,7 +524,7 @@ long milliseconds = new Date().getTime(); Featured
-
+
diff --git a/ui/new/jsp/iso.jsp b/ui/new/jsp/iso.jsp new file mode 100644 index 00000000000..1344d1cd5dc --- /dev/null +++ b/ui/new/jsp/iso.jsp @@ -0,0 +1,125 @@ + + +<%@ page import="java.util.*" %> +<%@ page import="com.cloud.utils.*" %> + +<% + + Locale browserLocale = request.getLocale(); + CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); +%> + + +
+ +

ISO +

+
+
+ +
+
+ <%=t.t("Details")%>
+
+
+
+
+
+ <%=t.t("ID")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Zone")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Name")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Display.Text")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Status")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Bootable")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Account")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Created")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Size")%>:
+
+
+
+
+
+
+ +
+
+ \ 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 c3ded528257..721b73180c6 100644 --- a/ui/new/scripts/cloud.core2.init.js +++ b/ui/new/scripts/cloud.core2.init.js @@ -89,11 +89,14 @@ $(document).ready(function() { listMidMenuItems("leftmenu_snapshot", "listSnapshots", "listsnapshotsresponse", "snapshot", "jsp/snapshot.jsp", afterLoadSnapshotJSP, snapshotToMidmenu, snapshotToRigntPanel); listMidMenuItems("leftmenu_ip", "listPublicIpAddresses", "listpublicipaddressesresponse", "publicipaddress", "jsp/ip_address.jsp", afterLoadIpJSP, ipToMidmenu, ipToRigntPanel); - listMidMenuItems("leftmenu_submenu_myTemplate", "listTemplates&templatefilter=self", "listtemplatesresponse", "template", "jsp/template.jsp", afterLoadTemplateJSP, templateToMidmenu, templateToRigntPanel); - listMidMenuItems("leftmenu_submenu_featuredTemplate", "listTemplates&templatefilter=featured", "listtemplatesresponse", "template", "jsp/template.jsp", afterLoadTemplateJSP, templateToMidmenu, templateToRigntPanel); - listMidMenuItems("leftmenu_submenu_communityTemplate", "listTemplates&templatefilter=community", "listtemplatesresponse", "template", "jsp/template.jsp", afterLoadTemplateJSP, templateToMidmenu, templateToRigntPanel); - + listMidMenuItems("leftmenu_submenu_my_template", "listTemplates&templatefilter=self", "listtemplatesresponse", "template", "jsp/template.jsp", afterLoadTemplateJSP, templateToMidmenu, templateToRigntPanel); + listMidMenuItems("leftmenu_submenu_featured_template", "listTemplates&templatefilter=featured", "listtemplatesresponse", "template", "jsp/template.jsp", afterLoadTemplateJSP, templateToMidmenu, templateToRigntPanel); + listMidMenuItems("leftmenu_submenu_community_template", "listTemplates&templatefilter=community", "listtemplatesresponse", "template", "jsp/template.jsp", afterLoadTemplateJSP, templateToMidmenu, templateToRigntPanel); + listMidMenuItems("leftmenu_submenu_my_iso", "listIsos&isofilter=self", "listisosresponse", "iso", "jsp/iso.jsp", afterLoadIsoJSP, isoToMidmenu, isoToRigntPanel); + listMidMenuItems("leftmenu_submenu_featured_iso", "listIsos&isofilter=featured", "listisosresponse", "iso", "jsp/iso.jsp", afterLoadIsoJSP, isoToMidmenu, isoToRigntPanel); + listMidMenuItems("leftmenu_submenu_community_iso", "listIsos&isofilter=community", "listisosresponse", "iso", "jsp/iso.jsp", afterLoadIsoJSP, isoToMidmenu, isoToRigntPanel); + $("#leftmenu_instance_group_header").bind("click", function(event) { clearMidMenu(); var $arrowIcon = $(this).find("#arrow_icon"); diff --git a/ui/new/scripts/cloud.core2.iso.js b/ui/new/scripts/cloud.core2.iso.js new file mode 100644 index 00000000000..dc10db856bc --- /dev/null +++ b/ui/new/scripts/cloud.core2.iso.js @@ -0,0 +1,45 @@ +function afterLoadIsoJSP() { + +} + +function isoToMidmenu(jsonObj, $midmenuItem1, toRightPanelFn) { + $midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id)); + $midmenuItem1.data("jsonObj", jsonObj); + + /* + var iconContainer = $midmenuItem1.find("#icon_container").show(); + if(jsonObj.level == "INFO") + iconContainer.find("#icon").attr("src", "images/midmenuicon_events_info.png"); + else if(jsonObj.level == "ERROR") + iconContainer.find("#icon").attr("src", "images/midmenuicon_events_error.png"); + else if(jsonObj.level == "WARN") + iconContainer.find("#icon").attr("src", "images/midmenuicon_events_warning.png"); + */ + + $midmenuItem1.find("#first_row").text(jsonObj.name.substring(0,25)); + $midmenuItem1.find("#second_row").text(jsonObj.zonename.substring(0,25)); + $midmenuItem1.data("toRightPanelFn", toRightPanelFn); + +} + +function isoToRigntPanel($midmenuItem) { + var jsonObj = $midmenuItem.data("jsonObj"); + + var $rightPanelContent = $("#right_panel_content"); + $rightPanelContent.find("#id").text(fromdb(jsonObj.id)); + $rightPanelContent.find("#zonename").text(fromdb(jsonObj.zonename)); + $rightPanelContent.find("#name").text(fromdb(jsonObj.name)); + $rightPanelContent.find("#displaytext").text(fromdb(jsonObj.displaytext)); + $rightPanelContent.find("#account").text(fromdb(jsonObj.account)); + + if(jsonObj.size != null) + $rightPanelContent.find("#size").text(convertBytes(parseInt(jsonObj.size))); + + var status = "Ready"; + if (jsonObj.isready == "false") + status = jsonObj.isostatus; + $rightPanelContent.find("#status").text(status); + + setBooleanField(jsonObj.bootable, $rightPanelContent.find("#bootable")); + setDateField(jsonObj.created, $rightPanelContent.find("#created")); +} \ No newline at end of file