diff --git a/client/WEB-INF/classes/resources/resource.properties b/client/WEB-INF/classes/resources/resource.properties index 7ac988b0ee4..aa5f63a7dcd 100644 --- a/client/WEB-INF/classes/resources/resource.properties +++ b/client/WEB-INF/classes/resources/resource.properties @@ -23,6 +23,15 @@ account = Account domain = Domain event = Event alert = Alert +system = System +global.settings = Global Settings +resources = Resources +service.offerings = Service Offerings +disk.offerings = Disk Offerings + +details = Details +network = Network +secondary.storage = Secondary Storage no.available.actions = No available actions diff --git a/ui/new/index.jsp b/ui/new/index.jsp index dc3da54b459..bfcc6af96cf 100644 --- a/ui/new/index.jsp +++ b/ui/new/index.jsp @@ -67,6 +67,8 @@ long milliseconds = new Date().getTime(); + + Cloud.com CloudStack @@ -507,38 +509,38 @@ long milliseconds = new Date().getTime();
- Configuration
- Configuration + System + <%=t.t("system")%> -
-
+
+
- Configuration
- Global Settings -
-
-
-
-
- Configuration
- Zones + Resources
+ <%=t.t("resources")%>
- Configuration
- Service Offerings + Service Offerings
+ <%=t.t("service.offerings")%>
- Configuration
- Disk Offerings + Disk Offerings
+ <%=t.t("disk.offerings")%> +
+
+
+
+
+ Global Settings
+ <%=t.t("global.settings")%>
diff --git a/ui/new/jsp/resource.jsp b/ui/new/jsp/resource.jsp new file mode 100644 index 00000000000..4c18009b104 --- /dev/null +++ b/ui/new/jsp/resource.jsp @@ -0,0 +1,212 @@ +<%@ page import="java.util.*" %> +<%@ page import="com.cloud.utils.*" %> + +<% + Locale browserLocale = request.getLocale(); + CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); +%> + + +
+ +

+ Resources +

+
+
+ +
+
+ <%=t.t("details")%>
+
+ <%=t.t("network")%>
+
+ <%=t.t("secondary.storage")%>
+
+ +
+
+
+
+
+ <%=t.t("ID")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Name")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Accounts")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Instances")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Volume")%>:
+
+
+
+
+
+
+
+
+ + + + + + + + + +
+ + + + + + + + + \ 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 44d9400a188..6c238b8df24 100644 --- a/ui/new/scripts/cloud.core2.init.js +++ b/ui/new/scripts/cloud.core2.init.js @@ -121,6 +121,24 @@ $(document).ready(function() { return false; }); + $("#leftmenu_resource").bind("click", function(event) { + if(selected_leftmenu_id != null && selected_leftmenu_id.length > 0) + $("#"+selected_leftmenu_id).removeClass("selected"); + selected_leftmenu_id = "leftmenu_resource"; + $(this).addClass("selected"); + + showMiddleMenuWithoutSearch(); + disableMultipleSelectionInMidMenu(); + + clearLeftMenu(); + clearMiddleMenu(); + + $("#right_panel").load("jsp/resource.jsp", function(){ + afterLoadResourceJSP(); + }); + + return false; + }); $("#midmenu_action_link").bind("mouseover", function(event) { diff --git a/ui/new/scripts/cloud.core2.resource.js b/ui/new/scripts/cloud.core2.resource.js new file mode 100644 index 00000000000..40ae9b0e5d4 --- /dev/null +++ b/ui/new/scripts/cloud.core2.resource.js @@ -0,0 +1,8 @@ +function afterLoadResourceJSP() { + //***** switch between different tabs (begin) ******************************************************************** + var tabArray = ["tab_details", "tab_network", "tab_secondary_storage"]; + var tabContentArray = ["tab_content_details", "tab_content_network", "tab_content_secondary_storage"]; + switchBetweenDifferentTabs(tabArray, tabContentArray); + //***** switch between different tabs (end) ********************************************************************** + +} \ No newline at end of file