From a59859ce988a72a0221f68be44da47f83f90b77e Mon Sep 17 00:00:00 2001
From: Hector Sanjuan <hsanjuan@opennebula.org>
Date: Wed, 30 Nov 2011 11:41:03 +0100
Subject: [PATCH] OZones GUI: Style fixes after vendor update

---
 src/ozones/Server/public/css/application.css  | 17 ++++++++++-
 src/ozones/Server/public/css/layout.css       | 30 ++++++++-----------
 .../Server/public/js/plugins/vdcs-tab.js      |  7 +++--
 3 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/src/ozones/Server/public/css/application.css b/src/ozones/Server/public/css/application.css
index c99f7b641e..1ecaeec46d 100644
--- a/src/ozones/Server/public/css/application.css
+++ b/src/ozones/Server/public/css/application.css
@@ -215,6 +215,12 @@ label{
 	text-align:left;
 	}
 
+.dataTables_wrapper label {
+    float: none;
+    width: auto;
+    padding: 0 0;
+    text-align:right;
+}
 
 div.tip {
 	display: inline-block;
@@ -411,7 +417,7 @@ tr.even:hover{
 }
 
 .top_button {
-    font-size: 0.8em;
+    font-size: 0.8em!important;
     height: 25px;
     margin: 3px 2px;
     vertical-align: middle;
@@ -578,4 +584,13 @@ ul.dd_right{
 }
 ul.dd_left{
 
+}
+
+.ui-widget{
+    font: 10pt Arial, Verdana, Geneva, Helvetica, sans-serif;
+}
+
+.ui-layout-resizer-open-hover, /* hover-color to 'resize' */
+.ui-layout-resizer-dragging {
+    background: #EEE;
 }
\ No newline at end of file
diff --git a/src/ozones/Server/public/css/layout.css b/src/ozones/Server/public/css/layout.css
index e4d6e2864a..b61f0b6ea6 100644
--- a/src/ozones/Server/public/css/layout.css
+++ b/src/ozones/Server/public/css/layout.css
@@ -44,19 +44,26 @@ body {
 }
 
 #header {
-    padding:0;
+    padding: 0 10px 0 10px;
     background-color: #353735;
+    border:0;
 }
 
 #footer {
-    padding:0;
+    padding-top: 9px;
+    font-size: 0.8em;
+    color: white;
+    text-align: center;
     background-color: #353735;
+    border:0;
+
 }
 
-#header {
-    padding: 0 10px 0 10px;
-    background-color: #353735;
+#footer a {
+    color: white;
+    text-decoration: underline;
 }
+
 #logo {
     padding-top: 6px;
     font-weight: bold;
@@ -87,18 +94,6 @@ body {
     color: #88C140;
 }
 
-#footer {
-    padding-top: 9px;
-    font-size: 0.8em;
-    color: white;
-    text-align: center;
-}
-
-#footer a {
-    color: white;
-    text-decoration: underline;
-}
-
 #logo-wrapper {
     float:  right;
     margin-top: 0px;
@@ -108,6 +103,7 @@ body {
 #menu {
     padding-right:  0;
     padding-left:   0;
+    border:0;
     border-right: 1px solid #353735;
     background-image: -webkit-gradient(
     linear,
diff --git a/src/ozones/Server/public/js/plugins/vdcs-tab.js b/src/ozones/Server/public/js/plugins/vdcs-tab.js
index 3f15e02315..d46b8edacd 100644
--- a/src/ozones/Server/public/js/plugins/vdcs-tab.js
+++ b/src/ozones/Server/public/js/plugins/vdcs-tab.js
@@ -42,7 +42,7 @@ var create_vdc_tmpl =
         <label for="vdcadminname">Admin name:</label>\
         <input type="text" name="vdcadminname" id="vdcadminname" /><br />\
         <label for="vdcadminpass">Admin pass:</label>\
-        <input type="password" name="vdcadminpass" id="vdcadminpass" />\
+        <input type="password" name="vdcadminpass" id="vdcadminpass" /><br />\
         <label for="zone">Zone:</label>\
         <select id="zoneid" name="zone">\
         </select><br />\
@@ -52,7 +52,8 @@ var create_vdc_tmpl =
         <div class="tip">Allows hosts belonging to other VDCs to be re-added to this one. They will appear greyed-out in the lists.</div>\
         <div class="clear"></div>\
         <label style="margin-left:265px;font-size:0.8em;color:#bbbbbb">Drag & Drop</label>\
-        <label style="margin-left:243px;font-size:0.8em;color:#bbbbbb">Available / Selected</label>\
+        <label style="margin-left:243px;font-size:0.8em;color:#bbbbbb">Available / Selected</label><br />\
+        <div class="clear"></div>\
         <label>Hosts:</label>\
         <div id="vdc_hosts_lists" class="dd_lists" style="width:250px">\
           <ul id="vdc_available_hosts_list" class="dd_list dd_left" style="width:115px"></ul>\
@@ -278,7 +279,7 @@ function updateVDCInfo(req,vdc_json){
     var zone_host = "";
     var zone_port = "";
     var sun_link = "";
-    var zone_match = zone_endpoint.match(/^https?:\/\/([\w.]+):(\d+)\/([\W\w]+)$/);
+    var zone_match = zone_endpoint.match(/^https?:\/\/([\w.-]+):(\d+)\/([\W\w]+)$/);
 
     if (zone_match){
         zone_host = zone_match[1];