diff --git a/ui/new/index.jsp b/ui/new/index.jsp index a3ceeedb72f..9484d79dd08 100644 --- a/ui/new/index.jsp +++ b/ui/new/index.jsp @@ -50,7 +50,7 @@ long milliseconds = new Date().getTime(); - + Cloud.com CloudStack @@ -471,7 +471,7 @@ long milliseconds = new Date().getTime();
-
+
@@ -506,7 +506,7 @@ long milliseconds = new Date().getTime();
-
+
diff --git a/ui/new/jsp/template.jsp b/ui/new/jsp/template.jsp new file mode 100644 index 00000000000..007b0294498 --- /dev/null +++ b/ui/new/jsp/template.jsp @@ -0,0 +1,164 @@ + + +<%@ page import="java.util.*" %> +<%@ page import="com.cloud.utils.*" %> + +<% + + Locale browserLocale = request.getLocale(); + CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); +%> + + +
+ +

Template +

+
+
+ +
+
+ <%=t.t("Details")%>
+
+
+
+
+
+ <%=t.t("ID")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Zone")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Name")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Display.Text")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Status")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Password.Enabled")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Public")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Featured")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Cross.Zones")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("OS.Type")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Account")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Created")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Size")%>:
+
+
+
+
+
+
+
+
+ \ No newline at end of file diff --git a/ui/new/scripts/cloud.core2.account.js b/ui/new/scripts/cloud.core2.account.js index 1b5db3800a8..ccfca5f67d2 100644 --- a/ui/new/scripts/cloud.core2.account.js +++ b/ui/new/scripts/cloud.core2.account.js @@ -3,8 +3,7 @@ function afterLoadAccountJSP() { } function accountToMidmenu(jsonObj, $midmenuItem1, toRightPanelFn) { - $midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id)); - $midmenuItem1.data("id", jsonObj.id); + $midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id)); $midmenuItem1.data("jsonObj", jsonObj); var iconContainer = $midmenuItem1.find("#icon_container").show(); diff --git a/ui/new/scripts/cloud.core2.alert.js b/ui/new/scripts/cloud.core2.alert.js index 46e2d5756c6..ff395d19b24 100644 --- a/ui/new/scripts/cloud.core2.alert.js +++ b/ui/new/scripts/cloud.core2.alert.js @@ -3,8 +3,7 @@ function afterLoadAlertJSP() { } function alertToMidmenu(jsonObj, $midmenuItem1, toRightPanelFn) { - $midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id)); - $midmenuItem1.data("id", jsonObj.id); + $midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id)); $midmenuItem1.data("jsonObj", jsonObj); $midmenuItem1.find("#first_row").text(jsonObj.description.substring(0,25)); $midmenuItem1.find("#second_row").text(jsonObj.type.substring(0,25)); diff --git a/ui/new/scripts/cloud.core2.event.js b/ui/new/scripts/cloud.core2.event.js index b3d86a66e0e..160a559a487 100644 --- a/ui/new/scripts/cloud.core2.event.js +++ b/ui/new/scripts/cloud.core2.event.js @@ -3,8 +3,7 @@ function afterLoadEventJSP() { } function eventToMidmenu(jsonObj, $midmenuItem1, toRightPanelFn) { - $midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id)); - $midmenuItem1.data("id", jsonObj.id); + $midmenuItem1.attr("id", ("midmenuItem_"+jsonObj.id)); $midmenuItem1.data("jsonObj", jsonObj); var iconContainer = $midmenuItem1.find("#icon_container").show(); diff --git a/ui/new/scripts/cloud.core2.init.js b/ui/new/scripts/cloud.core2.init.js index a874bb18fb5..c3ded528257 100644 --- a/ui/new/scripts/cloud.core2.init.js +++ b/ui/new/scripts/cloud.core2.init.js @@ -21,7 +21,7 @@ $(document).ready(function() { if(ui.selecting.id.indexOf("midmenuItem") != -1) { var $midmenuItem1 = $("#"+ui.selecting.id); if($midmenuItem1.find("#content").hasClass("inaction") == false) { //only items not in action are allowed to be selected - var id =$midmenuItem1.data("id"); + var id =$midmenuItem1.data("jsonObj").id; selectedItemsInMidMenu[id] = $midmenuItem1; $midmenuItem1.find("#content").addClass("selected"); } @@ -32,7 +32,7 @@ $(document).ready(function() { unselecting: function(event, ui) { if(ui.unselecting.id.indexOf("midmenuItem") != -1) { var $midmenuItem1 = $("#"+ui.unselecting.id); - var id = $midmenuItem1.data("id"); + var id = $midmenuItem1.data("jsonObj").id; if(id in selectedItemsInMidMenu) { delete selectedItemsInMidMenu[id]; $midmenuItem1.find("#content").removeClass("selected"); @@ -51,24 +51,23 @@ $(document).ready(function() { } function clearMidMenu() { + $("#midmenu_container").empty(); $("#midmenu_action_link").hide(); - $("#midmenu_add_link").hide(); + $("#midmenu_add_link").hide(); } var $midmenuItem = $("#midmenu_item"); - function listMidMenuItems(leftmenuId, apiName, jsonResponse1, jsonResponse2, rightPanelJSP, afterLoadRightPanelJSP, toMidmenu, toRightPanel) { + function listMidMenuItems(leftmenuId, commandString, jsonResponse1, jsonResponse2, rightPanelJSP, afterLoadRightPanelJSP, toMidmenu, toRightPanel) { $("#"+leftmenuId).bind("click", function(event) { clearMidMenu(); $("#right_panel").load(rightPanelJSP, function(){ - afterLoadRightPanelJSP(); + afterLoadRightPanelJSP(); $.ajax({ cache: false, - data: createURL("command="+apiName+"&pagesize="+midmenuItemCount), + data: createURL("command="+commandString+"&pagesize="+midmenuItemCount), dataType: "json", - success: function(json) { - $("#midmenu_container").empty(); - selectedItemsInMidMenu = {}; - + success: function(json) { + selectedItemsInMidMenu = {}; var items = json[jsonResponse1][jsonResponse2]; if(items != null && items.length > 0) { for(var i=0; i