diff --git a/ui/new/css/main.css b/ui/new/css/main.css index 57d80b0c569..b3b9ce4ffb6 100644 --- a/ui/new/css/main.css +++ b/ui/new/css/main.css @@ -1986,6 +1986,14 @@ a:hover.search_button { cursor:hand; } +.text_container { + width:100%; + height:auto; + float:left; + margin:7px 0 0 0; + padding:0; +} + .grid_container { width:100%; height:auto; @@ -2999,4 +3007,218 @@ a:hover.search_button { margin:0; padding:5px 0 5px 0; border-bottom:1px solid #999; -} \ No newline at end of file +} + +.network_dgbox { + width:440px; + height:auto; + float:left; + margin:20px 0 0 10px; + display:inline; + padding:0; +} + +.networkdg_zonepanel { + width:440px; + height:75px; + float:left; + margin:0; + padding:0; +} + +.networkdg_zonecloud { + width:127px; + height:71px; + float:left; + background:url(../images/network_zonecloud.gif) no-repeat top left; + margin:0 0 0 109px; + display:inline; + padding:0; +} + +.networkdg_zonecloud p { + width:125px; + height:auto; + float:left; + text-align:center; + font-size:11px; + font-weight:bold; + color:#002451; + margin:30px 0 0 0; + padding:0; +} + +.networkdg_zoneconnect { + width:171px; + height:32px; + float:left; + background:url(../images/network_zoneconnect.gif) no-repeat top left; + margin:38px 0 0 0; + padding:0; +} + +.networkswitchpanel { + width:440px; + height:auto; + float:left; + margin:0; + padding:0; +} + +.networkswitch_titlebox { + width:370px; + height:19px; + float:left; + background:#fefbdc repeat top left; + border:1px solid #d3cc8a; + border-bottom:none; + margin:7px 0 0 10px; + padding:0; +} + +.networkswitch_titlebox p{ + width:300px; + height:auto; + float:left; + color:#333; + text-align:left; + font-size:11px; + font-weight:normal; + margin:3px 0 0 10px; + padding:0; +} + +.networkswitch_top { + width:38px; + height:27px; + float:left; + background:url(../images/switch_top.gif) no-repeat top left; + margin:0; + padding:0; + overflow:hidden; +} + +.networkswitch_midpanel { + width:420px; + height:auto; + float:left; + background:url(../images/vlan_barbg.gif) repeat-y top left; + border-top:1px dashed #333; + border-bottom:1px dashed #333; + margin:0; + padding:0 0 60px 0; +} + + +.networkswitch_vlanpanel { + width:404px; + height:auto; + float:left; + margin:35px 0 0 16px; + display:inline; + padding:0; +} + +.networkswitch_vlanconnect { + width:404px; + height:12px; + float:left; + background:url(../images/vlan_connect.gif) no-repeat top left; + margin:26px 0 0 0; + padding:0; +} + +.networkswitch_vlan_infoicon { + width:12px; + height:15px; + float:left; + background:url(../images/networkswitch_infoicon.gif) no-repeat top left; + margin:-12px 0 0 20px; + display:inline; + padding:0; + cursor:pointer; + cursor:hand; +} + +.networkswitch_vlan_infoicon:hover { + background:url(../images/networkswitch_infoicon_hover.gif) no-repeat top left; +} + +.networkswitch_vlan_detailsbox { + width:167px; + height:auto; + float:left; + background:#e9e9e9 url(../images/networkswitch_detailsbox.gif) repeat-x top left; + border-top:2px solid #d1d1d1; + border-right:2px solid #d1d1d1; + border-left:1px solid #dedede; + border-bottom:1px solid #dedede; + margin:-20px 0 0 30px; + display:inline; + padding:0 0 8px 0; +} + +.networkswitch_vlan_detailsbox_textbox { + width:150px; + height:auto; + float:left; + margin:6px 0 0 8px; + padding:0; +} + +.networkswitch_vlan_detailsbox_textbox_label { + width:60px; + height:auto; + float:left; + color:#333; + font-size:11px; + font-weight:normal; + text-align:left; + margin:0; + padding:0; +} + + + + +.networkswitch_vlan_detailsbox_textbox span { + width:auto; + height:auto; + float:left; + color:#09426e; + font-size:11px; + font-weight:bold; + text-align:left; + margin:0; + padding:0; +} + + + +.networkswitch_typeicon { + width:45px; + height:21px; + float:left; + margin:-22px 0 0 38px; + padding:0; +} + +.networkswitch_typeicon.direct { + background:url(../images/networkswitch_directicon.gif) no-repeat top left; +} + +.networkswitch_typeicon.virtual { + background:url(../images/networkswitch_virtualicon.gif) no-repeat top left; +} + + +.networkswitch_end { + width:43px; + height:54px; + float:right; + background:url(../images/switch_end.gif) no-repeat top left; + margin:0 18px 0 0; + display:inline; + padding:0; +} + diff --git a/ui/new/images/network_zonecloud.gif b/ui/new/images/network_zonecloud.gif new file mode 100644 index 00000000000..de6136519c0 Binary files /dev/null and b/ui/new/images/network_zonecloud.gif differ diff --git a/ui/new/images/network_zoneconnect.gif b/ui/new/images/network_zoneconnect.gif new file mode 100644 index 00000000000..5817ab57d4c Binary files /dev/null and b/ui/new/images/network_zoneconnect.gif differ diff --git a/ui/new/images/networkswitch_detailsbox.gif b/ui/new/images/networkswitch_detailsbox.gif new file mode 100644 index 00000000000..c7363d838f5 Binary files /dev/null and b/ui/new/images/networkswitch_detailsbox.gif differ diff --git a/ui/new/images/networkswitch_directicon.gif b/ui/new/images/networkswitch_directicon.gif new file mode 100644 index 00000000000..8ab7b2701ac Binary files /dev/null and b/ui/new/images/networkswitch_directicon.gif differ diff --git a/ui/new/images/networkswitch_infoicon.gif b/ui/new/images/networkswitch_infoicon.gif new file mode 100644 index 00000000000..df6ac00a85a Binary files /dev/null and b/ui/new/images/networkswitch_infoicon.gif differ diff --git a/ui/new/images/networkswitch_infoicon_hover.gif b/ui/new/images/networkswitch_infoicon_hover.gif new file mode 100644 index 00000000000..45d44b8101b Binary files /dev/null and b/ui/new/images/networkswitch_infoicon_hover.gif differ diff --git a/ui/new/images/networkswitch_virtualicon.gif b/ui/new/images/networkswitch_virtualicon.gif new file mode 100644 index 00000000000..a4301ad8a0d Binary files /dev/null and b/ui/new/images/networkswitch_virtualicon.gif differ diff --git a/ui/new/images/switch_end.gif b/ui/new/images/switch_end.gif new file mode 100644 index 00000000000..94fd6d698e9 Binary files /dev/null and b/ui/new/images/switch_end.gif differ diff --git a/ui/new/images/switch_mid.gif b/ui/new/images/switch_mid.gif new file mode 100644 index 00000000000..bc316109d37 Binary files /dev/null and b/ui/new/images/switch_mid.gif differ diff --git a/ui/new/images/switch_top.gif b/ui/new/images/switch_top.gif new file mode 100644 index 00000000000..0475743f663 Binary files /dev/null and b/ui/new/images/switch_top.gif differ diff --git a/ui/new/images/vlan_barbg.gif b/ui/new/images/vlan_barbg.gif new file mode 100644 index 00000000000..c1a6ea19cb7 Binary files /dev/null and b/ui/new/images/vlan_barbg.gif differ diff --git a/ui/new/images/vlan_connect.gif b/ui/new/images/vlan_connect.gif new file mode 100644 index 00000000000..6643983aedc Binary files /dev/null and b/ui/new/images/vlan_connect.gif differ diff --git a/ui/new/jsp/resource.jsp b/ui/new/jsp/resource.jsp index 4c18009b104..374423a928b 100644 --- a/ui/new/jsp/resource.jsp +++ b/ui/new/jsp/resource.jsp @@ -1,212 +1,269 @@ -<%@ page import="java.util.*" %> -<%@ page import="com.cloud.utils.*" %> - -<% - Locale browserLocale = request.getLocale(); - CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); -%> - - -
- -

- Resources -

-
-
- -
-
- <%=t.t("details")%>
-
- <%=t.t("network")%>
-
- <%=t.t("secondary.storage")%>
-
- -
-
-
-
-
- <%=t.t("ID")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("Name")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("Accounts")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("Instances")%>:
-
-
-
-
-
-
-
-
-
- <%=t.t("Volume")%>:
-
-
-
-
-
-
-
-
- - - - - - - - - -
- - - - - - - - +<%@ page import="java.util.*" %> +<%@ page import="com.cloud.utils.*" %> + +<% + Locale browserLocale = request.getLocale(); + CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); +%> + + +
+ +

+ Resources +

+
+
+ +
+
+ <%=t.t("details")%>
+
+ <%=t.t("network")%>
+
+ <%=t.t("secondary.storage")%>
+
+ +
+
+
+
+
+ <%=t.t("ID")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Name")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Accounts")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Instances")%>:
+
+
+
+
+
+
+
+
+
+ <%=t.t("Volume")%>:
+
+
+
+
+
+
+
+
+ + + + + + + + + +
+ + + + + + + + \ No newline at end of file