diff --git a/ui/new/jsp/event.jsp b/ui/new/jsp/event.jsp index 7ef509ba0c5..778de56e2e9 100644 --- a/ui/new/jsp/event.jsp +++ b/ui/new/jsp/event.jsp @@ -29,6 +29,16 @@ <%=t.t("Details")%>
+
+
+
+ <%=t.t("id")%>:
+
+
+
+
+
+
diff --git a/ui/new/jsp/template.jsp b/ui/new/jsp/template.jsp index 007b0294498..4e74c261341 100644 --- a/ui/new/jsp/template.jsp +++ b/ui/new/jsp/template.jsp @@ -35,7 +35,7 @@ <%=t.t("ID")%>:
-
+
@@ -45,7 +45,7 @@ <%=t.t("Zone")%>:
-
+
@@ -55,7 +55,7 @@ <%=t.t("Name")%>:
-
+
@@ -65,7 +65,7 @@ <%=t.t("Display.Text")%>:
-
+
@@ -75,7 +75,7 @@ <%=t.t("Status")%>:
-
+
@@ -85,7 +85,7 @@ <%=t.t("Password.Enabled")%>:
-
+
@@ -95,7 +95,7 @@ <%=t.t("Public")%>:
-
+
@@ -105,7 +105,7 @@ <%=t.t("Featured")%>:
-
+
@@ -115,7 +115,7 @@ <%=t.t("Cross.Zones")%>:
-
+
@@ -125,7 +125,7 @@ <%=t.t("OS.Type")%>:
-
+
@@ -135,7 +135,7 @@ <%=t.t("Account")%>:
-
+
@@ -145,7 +145,7 @@ <%=t.t("Created")%>:
-
+
@@ -155,7 +155,7 @@ <%=t.t("Size")%>:
-
+
diff --git a/ui/new/scripts/cloud.core2.account.js b/ui/new/scripts/cloud.core2.account.js index ccfca5f67d2..1554bc1dc51 100644 --- a/ui/new/scripts/cloud.core2.account.js +++ b/ui/new/scripts/cloud.core2.account.js @@ -23,6 +23,7 @@ function accountToRigntPanel($midmenuItem) { var jsonObj = $midmenuItem.data("jsonObj"); var $rightPanelContent = $("#right_panel_content"); + $rightPanelContent.find("#id").text(jsonObj.id); $rightPanelContent.find("#role").text(toRole(jsonObj.accounttype)); $rightPanelContent.find("#account").text(fromdb(jsonObj.name)); $rightPanelContent.find("#domain").text(fromdb(jsonObj.domain)); diff --git a/ui/new/scripts/cloud.core2.event.js b/ui/new/scripts/cloud.core2.event.js index 160a559a487..c680c68a73b 100644 --- a/ui/new/scripts/cloud.core2.event.js +++ b/ui/new/scripts/cloud.core2.event.js @@ -23,6 +23,7 @@ function eventToRigntPanel($midmenuItem) { var jsonObj = $midmenuItem.data("jsonObj"); var $rightPanelContent = $("#right_panel_content"); + $rightPanelContent.find("#id").text(fromdb(jsonObj.id)); $rightPanelContent.find("#username").text(fromdb(jsonObj.username)); $rightPanelContent.find("#account").text(fromdb(jsonObj.account)); $rightPanelContent.find("#type").text(jsonObj.type); diff --git a/ui/new/scripts/cloud.core2.template.js b/ui/new/scripts/cloud.core2.template.js index f3b34dd6f21..41a5e4b8c7d 100644 --- a/ui/new/scripts/cloud.core2.template.js +++ b/ui/new/scripts/cloud.core2.template.js @@ -14,24 +14,37 @@ function templateToMidmenu(jsonObj, $midmenuItem1, toRightPanelFn) { 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.description.substring(0,25)); - $midmenuItem1.find("#second_row").text(jsonObj.type.substring(0,25)); + $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 templateToRigntPanel($midmenuItem) { - /* +function templateToRigntPanel($midmenuItem) { var jsonObj = $midmenuItem.data("jsonObj"); var $rightPanelContent = $("#right_panel_content"); - $rightPanelContent.find("#username").text(fromdb(jsonObj.username)); + $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)); + + var status = "Ready"; + if (jsonObj.isready == "false") + status = jsonObj.templatestatus; + $rightPanelContent.find("#status").text(status); + + $rightPanelContent.find("#passwordenabled").text(fromdb(jsonObj.passwordenabled)); + $rightPanelContent.find("#ispublic").text(fromdb(jsonObj.ispublic)); + $rightPanelContent.find("#isfeatured").text(fromdb(jsonObj.isfeatured)); + $rightPanelContent.find("#crossZones").text(fromdb(jsonObj.crossZones)); + $rightPanelContent.find("#ostypename").text(fromdb(jsonObj.ostypename)); $rightPanelContent.find("#account").text(fromdb(jsonObj.account)); - $rightPanelContent.find("#type").text(jsonObj.type); - $rightPanelContent.find("#level").text(jsonObj.level); - $rightPanelContent.find("#description").text(fromdb(jsonObj.description)); - $rightPanelContent.find("#state").text(jsonObj.state); - setDateField(jsonObj.created, $rightPanelContent.find("#created")); - */ + + if(jsonObj.size != null) + $rightPanelContent.find("#size").text(convertBytes(parseInt(jsonObj.size))); + + setDateField(jsonObj.created, $rightPanelContent.find("#created")); } \ No newline at end of file