From 214646c609d0997cb4a5f93ecfe8148018ff9b5c Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Tue, 14 Sep 2010 21:05:04 -0700 Subject: [PATCH] new UI - implement Router page. --- ui/new/index.jsp | 2 ++ ui/new/jsp/account.jsp | 6 ------ ui/new/jsp/alert.jsp | 5 ----- ui/new/jsp/event.jsp | 5 ----- ui/new/jsp/ip_address.jsp | 1 - ui/new/jsp/iso.jsp | 5 ----- ui/new/jsp/snapshot.jsp | 5 ----- ui/new/jsp/template.jsp | 5 ----- ui/new/jsp/volume.jsp | 6 ------ ui/new/scripts/cloud.core2.init.js | 1 + 10 files changed, 3 insertions(+), 38 deletions(-) diff --git a/ui/new/index.jsp b/ui/new/index.jsp index f3a3b430569..14abb69651d 100644 --- a/ui/new/index.jsp +++ b/ui/new/index.jsp @@ -54,6 +54,8 @@ long milliseconds = new Date().getTime(); + + Cloud.com CloudStack diff --git a/ui/new/jsp/account.jsp b/ui/new/jsp/account.jsp index ff73aa49790..f2b3ad9c769 100644 --- a/ui/new/jsp/account.jsp +++ b/ui/new/jsp/account.jsp @@ -1,13 +1,7 @@ - - - <%@ page import="java.util.*" %> <%@ page import="com.cloud.utils.*" %> <% - Locale browserLocale = request.getLocale(); CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); %> diff --git a/ui/new/jsp/alert.jsp b/ui/new/jsp/alert.jsp index 7879ff56c5a..ce1c4cee77f 100644 --- a/ui/new/jsp/alert.jsp +++ b/ui/new/jsp/alert.jsp @@ -1,12 +1,7 @@ - - <%@ page import="java.util.*" %> <%@ page import="com.cloud.utils.*" %> <% - Locale browserLocale = request.getLocale(); CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); %> diff --git a/ui/new/jsp/event.jsp b/ui/new/jsp/event.jsp index 563ab2973c5..f63d11d6aca 100644 --- a/ui/new/jsp/event.jsp +++ b/ui/new/jsp/event.jsp @@ -1,12 +1,7 @@ - - <%@ page import="java.util.*" %> <%@ page import="com.cloud.utils.*" %> <% - Locale browserLocale = request.getLocale(); CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); %> diff --git a/ui/new/jsp/ip_address.jsp b/ui/new/jsp/ip_address.jsp index 56aa7a927bd..66bc2a8d091 100644 --- a/ui/new/jsp/ip_address.jsp +++ b/ui/new/jsp/ip_address.jsp @@ -2,7 +2,6 @@ <%@ page import="com.cloud.utils.*" %> <% - Locale browserLocale = request.getLocale(); CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); %> diff --git a/ui/new/jsp/iso.jsp b/ui/new/jsp/iso.jsp index 57f68875187..75233072897 100644 --- a/ui/new/jsp/iso.jsp +++ b/ui/new/jsp/iso.jsp @@ -1,12 +1,7 @@ - - <%@ page import="java.util.*" %> <%@ page import="com.cloud.utils.*" %> <% - Locale browserLocale = request.getLocale(); CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); %> diff --git a/ui/new/jsp/snapshot.jsp b/ui/new/jsp/snapshot.jsp index 107cdf24fde..5448dd27e63 100644 --- a/ui/new/jsp/snapshot.jsp +++ b/ui/new/jsp/snapshot.jsp @@ -1,12 +1,7 @@ - - <%@ page import="java.util.*" %> <%@ page import="com.cloud.utils.*" %> <% - Locale browserLocale = request.getLocale(); CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); %> diff --git a/ui/new/jsp/template.jsp b/ui/new/jsp/template.jsp index 45db59599f5..74b91e26a4f 100644 --- a/ui/new/jsp/template.jsp +++ b/ui/new/jsp/template.jsp @@ -1,12 +1,7 @@ - - <%@ page import="java.util.*" %> <%@ page import="com.cloud.utils.*" %> <% - Locale browserLocale = request.getLocale(); CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); %> diff --git a/ui/new/jsp/volume.jsp b/ui/new/jsp/volume.jsp index 202f78f1783..89a48705355 100644 --- a/ui/new/jsp/volume.jsp +++ b/ui/new/jsp/volume.jsp @@ -1,14 +1,8 @@ - - - <%@ page import="java.util.*" %> <%@ page import="com.cloud.utils.*" %> <% - Locale browserLocale = request.getLocale(); CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); %> diff --git a/ui/new/scripts/cloud.core2.init.js b/ui/new/scripts/cloud.core2.init.js index fdc5daf2955..26423b8e8a5 100644 --- a/ui/new/scripts/cloud.core2.init.js +++ b/ui/new/scripts/cloud.core2.init.js @@ -81,6 +81,7 @@ $(document).ready(function() { listMidMenuItems("leftmenu_volume", "listVolumes", "listvolumesresponse", "volume", "jsp/volume.jsp", afterLoadVolumeJSP, volumeToMidmenu, volumeToRigntPanel); 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_router", "listRouters", "listroutersresponse", "router", "jsp/router.jsp", afterLoadRouterJSP, routerToMidmenu, routerToRigntPanel); 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);