From d4207060b4f7740d94e8ed58421c31760ad32041 Mon Sep 17 00:00:00 2001 From: NIKITA Date: Thu, 21 Oct 2010 14:42:46 -0700 Subject: [PATCH] New icons for Service Offering, Disk Offering, Global Settings --- ui/new/images/title_diskofferingicon.gif | Bin 0 -> 1466 bytes ui/new/images/title_globalsettingsicon.gif | Bin 0 -> 1418 bytes ui/new/images/title_resourceicon.gif | Bin 0 -> 1472 bytes ui/new/images/title_serviceofferingicon.gif | Bin 0 -> 1550 bytes ui/new/index.jsp | 5 +- ui/new/jsp/diskoffering.jsp | 304 ++++++------- ui/new/jsp/globalsetting.jsp | 204 ++++----- ui/new/jsp/resource.jsp | 6 +- ui/new/jsp/serviceoffering.jsp | 450 ++++++++++---------- 9 files changed, 486 insertions(+), 483 deletions(-) create mode 100644 ui/new/images/title_diskofferingicon.gif create mode 100644 ui/new/images/title_globalsettingsicon.gif create mode 100644 ui/new/images/title_resourceicon.gif create mode 100644 ui/new/images/title_serviceofferingicon.gif diff --git a/ui/new/images/title_diskofferingicon.gif b/ui/new/images/title_diskofferingicon.gif new file mode 100644 index 0000000000000000000000000000000000000000..f294f15986ec526d4e227f4d373beb07e4cf31e9 GIT binary patch literal 1466 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 Y1rUG$0~A7v4)|U$fB*r2duTuaJAwO?hyVZp literal 0 HcmV?d00001 diff --git a/ui/new/images/title_resourceicon.gif b/ui/new/images/title_resourceicon.gif new file mode 100644 index 0000000000000000000000000000000000000000..865de37b4884b78fc15994fb9495f38a9fde50d8 GIT binary patch literal 1472 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
- +
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")%>:
-
-
-
-
-
-
-
-
- - -
-
-
- - -