diff --git a/ui/new/images/title_diskofferingicon.gif b/ui/new/images/title_diskofferingicon.gif new file mode 100644 index 00000000000..f294f15986e Binary files /dev/null and b/ui/new/images/title_diskofferingicon.gif differ diff --git a/ui/new/images/title_globalsettingsicon.gif b/ui/new/images/title_globalsettingsicon.gif new file mode 100644 index 00000000000..6ac39d26ec3 Binary files /dev/null and b/ui/new/images/title_globalsettingsicon.gif differ diff --git a/ui/new/images/title_resourceicon.gif b/ui/new/images/title_resourceicon.gif new file mode 100644 index 00000000000..865de37b488 Binary files /dev/null and b/ui/new/images/title_resourceicon.gif differ diff --git a/ui/new/images/title_serviceofferingicon.gif b/ui/new/images/title_serviceofferingicon.gif new file mode 100644 index 00000000000..df049b821dc Binary files /dev/null and b/ui/new/images/title_serviceofferingicon.gif differ diff --git a/ui/new/index.jsp b/ui/new/index.jsp index f7472d47148..4faf013754d 100644 --- a/ui/new/index.jsp +++ b/ui/new/index.jsp @@ -574,7 +574,10 @@ long milliseconds = new Date().getTime();
- +
diff --git a/ui/new/jsp/diskoffering.jsp b/ui/new/jsp/diskoffering.jsp index c6994eee70a..57446b67d7a 100644 --- a/ui/new/jsp/diskoffering.jsp +++ b/ui/new/jsp/diskoffering.jsp @@ -1,152 +1,152 @@ -<%@ page import="java.util.*" %> - -<%@ page import="com.cloud.utils.*" %> - -<% - Locale browserLocale = request.getLocale(); - CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); -%> - -
- -

- Disk Offering -

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

- Waiting …

-
-
-
-
-
-
- <%=t.t("ID")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("name")%>:
-
-
-
-
- - -
-
-
-
-
- <%=t.t("display.text")%>:
-
-
-
-
- - -
-
-
-
-
- <%=t.t("disk.size")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("tags")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("domain")%>:
-
-
-
-
-
-
-
-
- - -
-
-
- - - - +<%@ page import="java.util.*" %> + +<%@ page import="com.cloud.utils.*" %> + +<% + Locale browserLocale = request.getLocale(); + CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); +%> + +
+ +
+ Disk Offering
+ +

+ Disk Offering +

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

+ Waiting …

+
+
+
+
+
+
+ <%=t.t("ID")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("name")%>:
+
+
+
+
+ + +
+
+
+
+
+ <%=t.t("display.text")%>:
+
+
+
+
+ + +
+
+
+
+
+ <%=t.t("disk.size")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("tags")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("domain")%>:
+
+
+
+
+
+
+
+
+ + +
+
+
+ + + + diff --git a/ui/new/jsp/globalsetting.jsp b/ui/new/jsp/globalsetting.jsp index f4f8243bd08..a046c973a41 100644 --- a/ui/new/jsp/globalsetting.jsp +++ b/ui/new/jsp/globalsetting.jsp @@ -1,102 +1,102 @@ -<%@ page import="java.util.*" %> - -<%@ page import="com.cloud.utils.*" %> - -<% - Locale browserLocale = request.getLocale(); - CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); -%> - -
- -

- Global Settings -

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

- Waiting …

-
-
-
-
-
-
- <%=t.t("name")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("value")%>:
-
-
-
-
- - -
-
-
-
-
- <%=t.t("description")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("category")%>:
-
-
-
-
-
-
-
-
- - -
-
-
- - +<%@ page import="java.util.*" %> + +<%@ page import="com.cloud.utils.*" %> + +<% + Locale browserLocale = request.getLocale(); + CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); +%> + +
+ +
+  Global_Settings
+ +

+ Global Settings +

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

+ Waiting …

+
+
+
+
+
+
+ <%=t.t("name")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("value")%>:
+
+
+
+
+ + +
+
+
+
+
+ <%=t.t("description")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("category")%>:
+
+
+
+
+
+
+
+
+ + +
+
+
+ + diff --git a/ui/new/jsp/resource.jsp b/ui/new/jsp/resource.jsp index 6293792f654..12394990de3 100644 --- a/ui/new/jsp/resource.jsp +++ b/ui/new/jsp/resource.jsp @@ -8,10 +8,10 @@ %>
- + Resource
+

diff --git a/ui/new/jsp/serviceoffering.jsp b/ui/new/jsp/serviceoffering.jsp index 510807d7e73..3659a23137a 100644 --- a/ui/new/jsp/serviceoffering.jsp +++ b/ui/new/jsp/serviceoffering.jsp @@ -1,226 +1,226 @@ -<%@ page import="java.util.*" %> - -<%@ page import="com.cloud.utils.*" %> - -<% - Locale browserLocale = request.getLocale(); - CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); -%> - -
- -

- Service Offering -

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

- Waiting …

-
-
-
-
-
-
- <%=t.t("ID")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("name")%>:
-
-
-
-
- - -
-
-
-
-
- <%=t.t("display.text")%>:
-
-
-
-
- - -
-
-
-
-
- <%=t.t("storage.type")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("CPU")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("memory")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("offer.HA")%>:
-
-
-
-
- -
-
-
-
-
- <%=t.t("network.type")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("tags")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("created")%>:
-
-
-
-
-
-
-
-
- - -
-
-
- - -