diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index c4195370346..a92f975f98e 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -47,7 +47,7 @@ label.menu.storage=Storage label.menu.volumes=Volumes label.menu.snapshots=Snapshots label.menu.network=Network -label.menu.ipaddresses=Ip Addresses +label.menu.ipaddresses=IP Addresses label.menu.templates=Templates label.menu.my.templates=My Templates label.menu.featured.templates=Featured Templates @@ -69,6 +69,7 @@ label.menu.configuration=Configuration label.menu.service.offerings=Service Offerings label.menu.disk.offerings=Disk Offerings label.menu.global.settings=Global Settings +label.menu.security.groups=Security Groups label.vm.start=Start VM label.vm.stop=Stop VM diff --git a/client/WEB-INF/classes/resources/messages_en.properties b/client/WEB-INF/classes/resources/messages_en.properties index c4195370346..a92f975f98e 100644 --- a/client/WEB-INF/classes/resources/messages_en.properties +++ b/client/WEB-INF/classes/resources/messages_en.properties @@ -47,7 +47,7 @@ label.menu.storage=Storage label.menu.volumes=Volumes label.menu.snapshots=Snapshots label.menu.network=Network -label.menu.ipaddresses=Ip Addresses +label.menu.ipaddresses=IP Addresses label.menu.templates=Templates label.menu.my.templates=My Templates label.menu.featured.templates=Featured Templates @@ -69,6 +69,7 @@ label.menu.configuration=Configuration label.menu.service.offerings=Service Offerings label.menu.disk.offerings=Disk Offerings label.menu.global.settings=Global Settings +label.menu.security.groups=Security Groups label.vm.start=Start VM label.vm.stop=Stop VM diff --git a/ui/index.jsp b/ui/index.jsp index 65d61817665..9d6f050414f 100644 --- a/ui/index.jsp +++ b/ui/index.jsp @@ -1,1059 +1,1059 @@ -<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %> - -<% long now = System.currentTimeMillis(); %> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <fmt:message key="label.cloud.console"/> - - - - - - - - - - - - - - - - - - - - - - - -
-
-
-
-
- -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +<%@ taglib uri="http://java.sun.com/jstl/fmt" prefix="fmt" %> + +<% long now = System.currentTimeMillis(); %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <fmt:message key="label.cloud.console"/> + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+ +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ui/jsp/account.jsp b/ui/jsp/account.jsp index 82a88ffc496..8b13e27e924 100644 --- a/ui/jsp/account.jsp +++ b/ui/jsp/account.jsp @@ -12,7 +12,7 @@
- Accounts
+

Accounts

diff --git a/ui/jsp/alert.jsp b/ui/jsp/alert.jsp index 2ac4c6c7c3a..8220c89472b 100644 --- a/ui/jsp/alert.jsp +++ b/ui/jsp/alert.jsp @@ -11,7 +11,7 @@
- Alerts
+

Alerts

diff --git a/ui/jsp/cluster.jsp b/ui/jsp/cluster.jsp index ba490a86798..2b43d0f2042 100644 --- a/ui/jsp/cluster.jsp +++ b/ui/jsp/cluster.jsp @@ -9,7 +9,7 @@
- Cluster
+

Cluster

diff --git a/ui/jsp/dashboard.jsp b/ui/jsp/dashboard.jsp index fbe32ca0783..b046dea4a1b 100644 --- a/ui/jsp/dashboard.jsp +++ b/ui/jsp/dashboard.jsp @@ -9,7 +9,7 @@
- Dashboard
+

Dashboard

diff --git a/ui/jsp/diskoffering.jsp b/ui/jsp/diskoffering.jsp index e0249ef867c..027dad90419 100644 --- a/ui/jsp/diskoffering.jsp +++ b/ui/jsp/diskoffering.jsp @@ -12,7 +12,7 @@
- Disk Offering
+

Disk Offering diff --git a/ui/jsp/domain.jsp b/ui/jsp/domain.jsp index ff37bee8915..c23afe1460f 100644 --- a/ui/jsp/domain.jsp +++ b/ui/jsp/domain.jsp @@ -12,7 +12,7 @@
- Domain
+

Domain diff --git a/ui/jsp/event.jsp b/ui/jsp/event.jsp index a7da929c79f..fe09582bac9 100644 --- a/ui/jsp/event.jsp +++ b/ui/jsp/event.jsp @@ -11,7 +11,7 @@
- Event
+

Event

diff --git a/ui/jsp/globalsetting.jsp b/ui/jsp/globalsetting.jsp index 12de196b2c4..742ec2c9aca 100644 --- a/ui/jsp/globalsetting.jsp +++ b/ui/jsp/globalsetting.jsp @@ -12,7 +12,7 @@
- Global_Settings
+

Global Settings diff --git a/ui/jsp/host.jsp b/ui/jsp/host.jsp index 2c06dd2df23..c4aabcd566e 100644 --- a/ui/jsp/host.jsp +++ b/ui/jsp/host.jsp @@ -9,7 +9,7 @@
- Host
+

Host

diff --git a/ui/jsp/instance.jsp b/ui/jsp/instance.jsp index f597df2966b..8b51ca7c920 100644 --- a/ui/jsp/instance.jsp +++ b/ui/jsp/instance.jsp @@ -87,7 +87,7 @@
- Instance
+

Instance

diff --git a/ui/jsp/ipaddress.jsp b/ui/jsp/ipaddress.jsp index 8472e5a6c68..1c894863a07 100644 --- a/ui/jsp/ipaddress.jsp +++ b/ui/jsp/ipaddress.jsp @@ -11,7 +11,7 @@
- IP Address
+

IP Address

diff --git a/ui/jsp/iso.jsp b/ui/jsp/iso.jsp index 78c6920b4da..8e311ae1165 100644 --- a/ui/jsp/iso.jsp +++ b/ui/jsp/iso.jsp @@ -12,7 +12,7 @@
- ISO
+

ISO

diff --git a/ui/jsp/network.jsp b/ui/jsp/network.jsp index 3d495533f26..934655762c4 100644 --- a/ui/jsp/network.jsp +++ b/ui/jsp/network.jsp @@ -9,7 +9,7 @@
- Network
+

Network

diff --git a/ui/jsp/pod.jsp b/ui/jsp/pod.jsp index 8e0486fd9d7..e2c8025cbd6 100644 --- a/ui/jsp/pod.jsp +++ b/ui/jsp/pod.jsp @@ -9,7 +9,7 @@
- Pod
+

Pod

diff --git a/ui/jsp/primarystorage.jsp b/ui/jsp/primarystorage.jsp index a81673fee9f..f5057e4cbf6 100644 --- a/ui/jsp/primarystorage.jsp +++ b/ui/jsp/primarystorage.jsp @@ -9,7 +9,7 @@
- Primary Storage
+

Primary Storage

diff --git a/ui/jsp/resource.jsp b/ui/jsp/resource.jsp index cc1c8655d91..f8685c87a92 100644 --- a/ui/jsp/resource.jsp +++ b/ui/jsp/resource.jsp @@ -9,7 +9,7 @@
- Resource
+
- Routers
+

Virtual Appliance diff --git a/ui/jsp/securitygroup.jsp b/ui/jsp/securitygroup.jsp index b9872213a11..52e8558dc14 100644 --- a/ui/jsp/securitygroup.jsp +++ b/ui/jsp/securitygroup.jsp @@ -12,7 +12,7 @@
- Disk Offering
+

Security Group diff --git a/ui/jsp/serviceoffering.jsp b/ui/jsp/serviceoffering.jsp index 10ec3b7a25d..e7545f5b3a7 100644 --- a/ui/jsp/serviceoffering.jsp +++ b/ui/jsp/serviceoffering.jsp @@ -11,7 +11,7 @@
- Service Offering
+

Service Offering diff --git a/ui/jsp/snapshot.jsp b/ui/jsp/snapshot.jsp index bf10ef64fca..f77fa685852 100644 --- a/ui/jsp/snapshot.jsp +++ b/ui/jsp/snapshot.jsp @@ -10,7 +10,7 @@
- Instance
+

Snapshot

diff --git a/ui/jsp/systemvm.jsp b/ui/jsp/systemvm.jsp index 6c83bd254dd..2151ae1a908 100644 --- a/ui/jsp/systemvm.jsp +++ b/ui/jsp/systemvm.jsp @@ -9,7 +9,7 @@
- System VM
+

System VM

diff --git a/ui/jsp/template.jsp b/ui/jsp/template.jsp index a3761de9ee0..a3acdd6acd2 100644 --- a/ui/jsp/template.jsp +++ b/ui/jsp/template.jsp @@ -13,7 +13,7 @@
- Instance
+

Template

diff --git a/ui/jsp/volume.jsp b/ui/jsp/volume.jsp index 4b58bbd7864..edf753d7e55 100644 --- a/ui/jsp/volume.jsp +++ b/ui/jsp/volume.jsp @@ -14,7 +14,7 @@
- Volume
+

Volume diff --git a/ui/jsp/zone.jsp b/ui/jsp/zone.jsp index c6a3e910b10..c19a836321a 100644 --- a/ui/jsp/zone.jsp +++ b/ui/jsp/zone.jsp @@ -9,7 +9,7 @@
- Zone
+

Zone