From b6806373668e06c4fbcbd767147639905ef87b75 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Tue, 28 Sep 2010 16:04:14 -0700 Subject: [PATCH] new UI - add JSP file, javascript file for Domain page. --- ui/new/index.jsp | 2 + ui/new/jsp/domain.jsp | 109 +++++++++++++++++++++++++++ ui/new/scripts/cloud.core2.domain.js | 3 + ui/new/scripts/cloud.core2.init.js | 19 ++++- ui/new/scripts/cloud.core2.js | 6 +- 5 files changed, 137 insertions(+), 2 deletions(-) create mode 100644 ui/new/jsp/domain.jsp create mode 100644 ui/new/scripts/cloud.core2.domain.js diff --git a/ui/new/index.jsp b/ui/new/index.jsp index c00ca7b6ae6..17185781259 100644 --- a/ui/new/index.jsp +++ b/ui/new/index.jsp @@ -58,6 +58,8 @@ long milliseconds = new Date().getTime(); + + Cloud.com CloudStack diff --git a/ui/new/jsp/domain.jsp b/ui/new/jsp/domain.jsp new file mode 100644 index 00000000000..16e11335ffd --- /dev/null +++ b/ui/new/jsp/domain.jsp @@ -0,0 +1,109 @@ +<%@ page import="java.util.*" %> +<%@ page import="com.cloud.utils.*" %> + +<% + Locale browserLocale = request.getLocale(); + CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); +%> + + +
+ +
+ Event
+ +

Domain +

+
+
+ +
+
+ <%=t.t("Details")%>
+
+
+
+
+
+ <%=t.t("id")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Initiated.By")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Owner.Account")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Type")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Level")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Description")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("State")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Date")%>:
+
+
+
+
+
+
+
+
+ \ No newline at end of file diff --git a/ui/new/scripts/cloud.core2.domain.js b/ui/new/scripts/cloud.core2.domain.js new file mode 100644 index 00000000000..49829f6e2be --- /dev/null +++ b/ui/new/scripts/cloud.core2.domain.js @@ -0,0 +1,3 @@ +function afterLoadDomainJSP() { + +} \ 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 4f06e793ef1..9e75c6d385a 100644 --- a/ui/new/scripts/cloud.core2.init.js +++ b/ui/new/scripts/cloud.core2.init.js @@ -25,7 +25,7 @@ $(document).ready(function() { $(this).addClass("selected"); showMiddleMenu(); - $("#midmenu_container").selectable("destroy" ); //Most pages don't need multiple selection in middle menu. + $("#midmenu_container").selectable("destroy"); //Most pages don't need multiple selection in middle menu. clearLeftMenu(); clearMiddleMenu(); @@ -102,6 +102,23 @@ $(document).ready(function() { return false; }); + $("#leftmenu_domain").bind("click", function(event) { + if(selected_leftmenu_id != null && selected_leftmenu_id.length > 0) + $("#"+selected_leftmenu_id).removeClass("selected"); + selected_leftmenu_id = "leftmenu_domain"; + $(this).addClass("selected"); + + showMiddleMenuWithoutSearch(); + $("#midmenu_container").selectable("destroy"); //Most pages don't need multiple selection in middle menu. + + clearLeftMenu(); + clearMiddleMenu(); + + $("#right_panel").load("jsp/domain.jsp", function(){ + afterLoadDomainJSP(); + }); + return false; + }); diff --git a/ui/new/scripts/cloud.core2.js b/ui/new/scripts/cloud.core2.js index ddfde4ca684..72f01954eaa 100644 --- a/ui/new/scripts/cloud.core2.js +++ b/ui/new/scripts/cloud.core2.js @@ -591,7 +591,11 @@ function showMiddleMenu() { $("#middle_menu, #search_panel, #middle_menu_pagination").show(); $("#right_panel").removeClass("main_contentarea_dashboard").addClass("main_contentarea"); } - +function showMiddleMenuWithoutSearch() { + $("#middle_menu").show(); + $("#search_panel, #middle_menu_pagination").hide(); + $("#right_panel").removeClass("main_contentarea_dashboard").addClass("main_contentarea"); +} // adding middle menu item *** function beforeAddingMidMenuItem() {