diff --git a/ui/new/jsp/account.jsp b/ui/new/jsp/account.jsp index f2b3ad9c769..2dc43ed9ed6 100644 --- a/ui/new/jsp/account.jsp +++ b/ui/new/jsp/account.jsp @@ -1,143 +1,146 @@ -<%@ page import="java.util.*" %> -<%@ page import="com.cloud.utils.*" %> - -<% - Locale browserLocale = request.getLocale(); - CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); -%> - - -
-
- Accounts
-

Accounts

-
- -
- -
-
- <%=t.t("Details")%>
-
-
-
- -
-
- - -
-

Disk has been succesfully dettached …

-
-
- - -
-
-
-
-
- <%=t.t("id")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("Role")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("Account")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("Domain")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("VMs")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("IPs")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("Bytes.Received")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("Bytes.Sent")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("State")%>:
-
-
-
-
-
-
-
-
- - \ No newline at end of file +<%@ page import="java.util.*" %> + +<%@ page import="com.cloud.utils.*" %> + +<% + Locale browserLocale = request.getLocale(); + CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); +%> + +
+
+ Accounts
+

+ Accounts

+
+
+ +
+
+ <%=t.t("Details")%>
+
+
+
+ +
+
+
+
+
+

+ Detaching Disk …

+
+ +
+
+
+
+
+ <%=t.t("id")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Role")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Account")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Domain")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("VMs")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("IPs")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Bytes.Received")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Bytes.Sent")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("State")%>:
+
+
+
+
+
+
+
+
+
+ diff --git a/ui/new/jsp/ip_address.jsp b/ui/new/jsp/ip_address.jsp index 66bc2a8d091..5a0da21199b 100644 --- a/ui/new/jsp/ip_address.jsp +++ b/ui/new/jsp/ip_address.jsp @@ -1,325 +1,382 @@ -<%@ page import="java.util.*" %> -<%@ page import="com.cloud.utils.*" %> - -<% - Locale browserLocale = request.getLocale(); - CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); -%> - - -
- -
- IP Address
- -

IP Address -

-
-
- -
-
- <%=t.t("Details")%>
-
- <%=t.t("Port Forwarding")%>
-
- <%=t.t("Load Balancer")%>
-
-
-
-
-
- -
-
-
-
- IP:
-
-
-
-
-
-
-
-
-
- Zone:
-
-
-
-
-
-
-
-
-
- VLAN:
-
-
-
-
-
-
-
-
-
- <%=t.t("Level")%>:
-
-
-
-
-
-
-
-
-
- Source NAT:
-
-
-
-
-
-
-
-
-
- Network Type:
-
-
-
-
-
-
-
-
-
- Domain:
-
-
-
-
-
-
-
-
-
- Account:
-
-
-
-
-
-
-
-
-
- Allocated:
-
-
-
-
-
-
-
- - - -
-
-
-
Public Port
-
-
-
Private Port
-
-
-
Protocol
-
-
-
Instance
-
-
- - - -
-
- -
-
- -
-
- -
-
- -
-
-
Add
-
- -
- -
-
-
8080
-
-
-
80
-
-
-
8 GB
-
-
-
Instance Name
-
- - -
- -
-
-
8080
-
-
-
80
-
-
-
8 GB
-
-
-
Instance Name
-
- -
-
- - - - -
-
-
-
Name
-
-
-
Public Port
-
-
-
Private Port
-
-
-
Algorithm
-
-
- -
-
- -
-
- -
-
- -
-
- -
-
-
Add
-
- -
- -
-
-
LB#1
-
-
-
8080
-
-
-
80
-
-
-
Source
-
-
-
-
-
-
-
-
-
- -
- -
-
Add
-
-
-
-
-
-
-
-
1-2-2-TEST
-
- -
-
Remove
-
-
- -
-
-
-
-
-
1-2-2-TEST
-
- -
-
Remove
-
-
-
-
-
- -
-
-
LB#1
-
-
-
8080
-
-
-
80
-
-
-
Source
-
- - -
- -
- -
- \ No newline at end of file +<%@ page import="java.util.*" %> + +<%@ page import="com.cloud.utils.*" %> + +<% + Locale browserLocale = request.getLocale(); + CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); +%> + +
+
+ IP Address
+

+ IP Address +

+
+
+ +
+
+ <%=t.t("Details")%>
+
+ <%=t.t("Port Forwarding")%>
+
+ <%=t.t("Load Balancer")%>
+
+
+
+ +
+
+
+
+
+

+ Detaching Disk …

+
+ +
+
+
+
+
+ IP:
+
+
+
+
+
+
+
+
+
+ Zone:
+
+
+
+
+
+
+
+
+
+ VLAN:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Level")%>:
+
+
+
+
+
+
+
+
+
+ Source NAT:
+
+
+
+
+
+
+
+
+
+ Network Type:
+
+
+
+
+
+
+
+
+
+ Domain:
+
+
+
+
+
+
+
+
+
+ Account:
+
+
+
+
+
+
+
+
+
+ Allocated:
+
+
+
+
+
+
+
+
+ + + + + + + +
+ diff --git a/ui/new/jsp/iso.jsp b/ui/new/jsp/iso.jsp index 75233072897..291b5ee856e 100644 --- a/ui/new/jsp/iso.jsp +++ b/ui/new/jsp/iso.jsp @@ -1,122 +1,149 @@ -<%@ page import="java.util.*" %> -<%@ page import="com.cloud.utils.*" %> - -<% - Locale browserLocale = request.getLocale(); - CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); -%> - - -
- -
- ISO
- -

ISO -

-
-
- -
-
- <%=t.t("Details")%>
-
-
-
-
-
- <%=t.t("ID")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("Zone")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("Name")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("Display.Text")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("Status")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("Bootable")%>:
-
-
-
-
-
-
-
-
-
-
-
- <%=t.t("Account")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("Created")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("Size")%>:
-
-
-
-
-
-
- -
-
- \ No newline at end of file +<%@ page import="java.util.*" %> + +<%@ page import="com.cloud.utils.*" %> + +<% + Locale browserLocale = request.getLocale(); + CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); +%> + +
+
+ ISO
+

+ ISO +

+
+
+ +
+
+ <%=t.t("Details")%>
+
+
+
+ +
+
+
+
+
+

+ Detaching Disk …

+
+ +
+
+
+
+
+ <%=t.t("ID")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Zone")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Name")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Display.Text")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Status")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Bootable")%>:
+
+
+
+
+
+
+
+
+
+
+
+ <%=t.t("Account")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Created")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Size")%>:
+
+
+
+
+
+
+
+
+
+ diff --git a/ui/new/jsp/router.jsp b/ui/new/jsp/router.jsp index 499fcc855aa..e98941a6530 100644 --- a/ui/new/jsp/router.jsp +++ b/ui/new/jsp/router.jsp @@ -1,129 +1,159 @@ <%@ page import="java.util.*" %> + <%@ page import="com.cloud.utils.*" %> <% Locale browserLocale = request.getLocale(); CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); %> -
-

Router +

+ Router

-