diff --git a/ui/new/images/title_storageicon.gif b/ui/new/images/title_storageicon.gif new file mode 100644 index 00000000000..6c8725c13ae Binary files /dev/null and b/ui/new/images/title_storageicon.gif differ diff --git a/ui/new/jsp/cluster.jsp b/ui/new/jsp/cluster.jsp index d59e7d2ffb8..7811fb0372a 100644 --- a/ui/new/jsp/cluster.jsp +++ b/ui/new/jsp/cluster.jsp @@ -1,81 +1,81 @@ -<%@ page import="java.util.*" %> - -<%@ page import="com.cloud.utils.*" %> - -<% - Locale browserLocale = request.getLocale(); - CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); -%> - -
-
- Cluster
-

- Cluster -

-
-
- -
-
- <%=t.t("details")%>
-
- -
- -
-
-
-
- <%=t.t("ID")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("name")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("zone")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("pod")%>:
-
-
-
-
-
-
-
-
- -
- +<%@ page import="java.util.*" %> + +<%@ page import="com.cloud.utils.*" %> + +<% + Locale browserLocale = request.getLocale(); + CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); +%> + +
+
+ Cluster
+

+ Cluster +

+
+
+ +
+
+ <%=t.t("details")%>
+
+ +
+ +
+
+
+
+ <%=t.t("ID")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("name")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("zone")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("pod")%>:
+
+
+
+
+
+
+
+
+ +
+ diff --git a/ui/new/jsp/host.jsp b/ui/new/jsp/host.jsp index bfb28c2a160..f95abc97532 100644 --- a/ui/new/jsp/host.jsp +++ b/ui/new/jsp/host.jsp @@ -1,367 +1,367 @@ -<%@ page import="java.util.*" %> - -<%@ page import="com.cloud.utils.*" %> - -<% - Locale browserLocale = request.getLocale(); - CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); -%> - -
-
- Host
-

- Host -

-
-
- -
-
- <%=t.t("details")%>
-
- -
- -
-
-
- (title)
- -
-
-
-

- Waiting …

-
-
-
-
-
- <%=t.t("ID")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("name")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("state")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("type")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("zone")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("pod")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("cluster")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("ip.address")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("version")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("os.preference")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("last.disconnected")%>:
-
-
-
-
-
-
-
-
- -
- - - - - - - - - - - - +<%@ page import="java.util.*" %> + +<%@ page import="com.cloud.utils.*" %> + +<% + Locale browserLocale = request.getLocale(); + CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); +%> + +
+
+ Host
+

+ Host +

+
+
+ +
+
+ <%=t.t("details")%>
+
+ +
+ +
+
+
+ (title)
+ +
+
+
+

+ Waiting …

+
+
+
+
+
+ <%=t.t("ID")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("name")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("state")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("type")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("zone")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("pod")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("cluster")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("ip.address")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("version")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("os.preference")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("last.disconnected")%>:
+
+
+
+
+
+
+
+
+ +
+ + + + + + + + + + + + diff --git a/ui/new/jsp/pod.jsp b/ui/new/jsp/pod.jsp index f7c5f5c903b..cf6aa1cdaf7 100644 --- a/ui/new/jsp/pod.jsp +++ b/ui/new/jsp/pod.jsp @@ -1,268 +1,268 @@ -<%@ page import="java.util.*" %> - -<%@ page import="com.cloud.utils.*" %> - -<% - Locale browserLocale = request.getLocale(); - CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); -%> - -
-
- Pod
-

- Pod -

-
-
- -
-
- <%=t.t("details")%>
-
- -
- -
-
-
- (title)
- -
-
-
-

- Waiting …

-
-
-
-
-
- <%=t.t("ID")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("name")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("private.cidr")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("private.ip.range")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("gateway")%>:
-
-
-
-
-
-
-
-
- -
- - - - - - - +<%@ page import="java.util.*" %> + +<%@ page import="com.cloud.utils.*" %> + +<% + Locale browserLocale = request.getLocale(); + CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); +%> + +
+
+ Pod
+

+ Pod +

+
+
+ +
+
+ <%=t.t("details")%>
+
+ +
+ +
+
+
+ (title)
+ +
+
+
+

+ Waiting …

+
+
+
+
+
+ <%=t.t("ID")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("name")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("private.cidr")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("private.ip.range")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("gateway")%>:
+
+
+
+
+
+
+
+
+ +
+ + + + + + + diff --git a/ui/new/jsp/primarystorage.jsp b/ui/new/jsp/primarystorage.jsp index 7305b3e2a12..e5b6e7dd984 100644 --- a/ui/new/jsp/primarystorage.jsp +++ b/ui/new/jsp/primarystorage.jsp @@ -1,332 +1,332 @@ -<%@ page import="java.util.*" %> - -<%@ page import="com.cloud.utils.*" %> - -<% - Locale browserLocale = request.getLocale(); - CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); -%> - -
-
- Primary Storage
-

- Primary Storage -

-
-
- -
-
- <%=t.t("details")%>
-
- -
- -
-
-
- (title)
- -
-
-
-

- Waiting …

-
-
-
-
-
- <%=t.t("ID")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("name")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("zone")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("pod")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("cluster")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("type")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("IP.or.FQDN")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("path")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("disk.total")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("disk.allocated")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("tags")%>:
-
-
-
-
-
-
-
-
- -
- - - - - - - +<%@ page import="java.util.*" %> + +<%@ page import="com.cloud.utils.*" %> + +<% + Locale browserLocale = request.getLocale(); + CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); +%> + +
+
+ Primary Storage
+

+ Primary Storage +

+
+
+ +
+
+ <%=t.t("details")%>
+
+ +
+ +
+
+
+ (title)
+ +
+
+
+

+ Waiting …

+
+
+
+
+
+ <%=t.t("ID")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("name")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("zone")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("pod")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("cluster")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("type")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("IP.or.FQDN")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("path")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("disk.total")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("disk.allocated")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("tags")%>:
+
+
+
+
+
+
+
+
+ +
+ + + + + + + diff --git a/ui/new/jsp/systemvm.jsp b/ui/new/jsp/systemvm.jsp index 51cccbe8578..3e860d20a3b 100644 --- a/ui/new/jsp/systemvm.jsp +++ b/ui/new/jsp/systemvm.jsp @@ -1,203 +1,203 @@ -<%@ page import="java.util.*" %> - -<%@ page import="com.cloud.utils.*" %> - -<% - Locale browserLocale = request.getLocale(); - CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); -%> - -
-
- System VM
-

- System VM -

-
-
- -
-
- <%=t.t("details")%>
-
- -
- -
-
-
- (title)
- -
-
-
-

- Detaching Disk …

-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-

-

-
-
-
-
-
-
- <%=t.t("system.vm.type")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("zone")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("ID")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("name")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("active.sessions")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("public.ip")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("private.ip")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("host")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("gateway")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("created")%>:
-
-
-
-
-
-
-
-
- -
- - - - - - - - +<%@ page import="java.util.*" %> + +<%@ page import="com.cloud.utils.*" %> + +<% + Locale browserLocale = request.getLocale(); + CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); +%> + +
+
+ System VM
+

+ System VM +

+
+
+ +
+
+ <%=t.t("details")%>
+
+ +
+ +
+
+
+ (title)
+ +
+
+
+

+ Detaching Disk …

+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+

+

+
+
+
+
+
+
+ <%=t.t("system.vm.type")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("zone")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("ID")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("name")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("active.sessions")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("public.ip")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("private.ip")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("host")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("gateway")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("created")%>:
+
+
+
+
+
+
+
+
+ +
+ + + + + + + + diff --git a/ui/new/jsp/zone.jsp b/ui/new/jsp/zone.jsp index fa7fca44680..1d915aa7075 100644 --- a/ui/new/jsp/zone.jsp +++ b/ui/new/jsp/zone.jsp @@ -1,584 +1,584 @@ -<%@ page import="java.util.*" %> - -<%@ page import="com.cloud.utils.*" %> - -<% - Locale browserLocale = request.getLocale(); - CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); -%> - -
-
- Zone
-

- Zone -

-
-
- -
-
- <%=t.t("details")%>
-
- <%=t.t("network")%>
-
- <%=t.t("secondary.storage")%>
-
- -
- -
-
-
-
- Title
- -
-
-
-

- Waiting …

-
-
-
-
-
- <%=t.t("ID")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("name")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("dns1")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("dns2")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("internaldns1")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("internaldns2")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("vlan")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("guestcidraddress")%>:
-
-
-
-
-
-
-
-
-
- - - - - - - -
- - - - - - - - - - - - - - - - - - +<%@ page import="java.util.*" %> + +<%@ page import="com.cloud.utils.*" %> + +<% + Locale browserLocale = request.getLocale(); + CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); +%> + +
+
+ Zone
+

+ Zone +

+
+
+ +
+
+ <%=t.t("details")%>
+
+ <%=t.t("network")%>
+
+ <%=t.t("secondary.storage")%>
+
+ +
+ +
+
+
+
+ Title
+ +
+
+
+

+ Waiting …

+
+
+
+
+
+ <%=t.t("ID")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("name")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("dns1")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("dns2")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("internaldns1")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("internaldns2")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("vlan")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("guestcidraddress")%>:
+
+
+
+
+
+
+
+
+
+ + + + + + + +
+ + + + + + + + + + + + + + + + + + \ No newline at end of file