From 955e8867d0cc19c84fa7e3b2818dc99b0fb071d1 Mon Sep 17 00:00:00 2001
From: Hector Sanjuan <hsanjuan@opennebula.org>
Date: Mon, 28 Nov 2011 20:50:01 +0100
Subject: [PATCH] oZones: small fixes

Improve the regexp matching zone endpoint urls for the vdc information to display sunstone and onexml_rpc variable addresses.

Enlarge the hosts boxes when creating an VDC. Set variable dialog height.
(cherry picked from commit 33d157cc7ff9f0175bcd744a194d86bf0b530b12)
---
 .../Server/public/js/plugins/vdcs-tab.js       | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/ozones/Server/public/js/plugins/vdcs-tab.js b/src/ozones/Server/public/js/plugins/vdcs-tab.js
index 06ae83e6d5..3f15e02315 100644
--- a/src/ozones/Server/public/js/plugins/vdcs-tab.js
+++ b/src/ozones/Server/public/js/plugins/vdcs-tab.js
@@ -51,12 +51,12 @@ var create_vdc_tmpl =
         <input type="checkbox" name="vdc_force_hosts" id="vdc_force_hosts" />\
         <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:205px;font-size:0.8em;color:#bbbbbb">Drag & Drop</label>\
-        <label style="margin-left:195px;font-size:0.8em;color:#bbbbbb">Available / Selected</label>\
+        <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>Hosts:</label>\
-        <div id="vdc_hosts_lists" class="dd_lists">\
-          <ul id="vdc_available_hosts_list" class="dd_list dd_left"></ul>\
-          <ul id="vdc_selected_hosts_list" class="dd_list dd_right"></ul>\
+        <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>\
+          <ul id="vdc_selected_hosts_list" class="dd_list dd_right" style="width:115px"></ul>\
      </div>\
    </fieldset>\
    <fieldset>\
@@ -278,7 +278,7 @@ function updateVDCInfo(req,vdc_json){
     var zone_host = "";
     var zone_port = "";
     var sun_link = "";
-    var zone_match = zone_endpoint.match(/^http:\/\/(\w+):(\d+)\/RPC2$/);
+    var zone_match = zone_endpoint.match(/^https?:\/\/([\w.]+):(\d+)\/([\W\w]+)$/);
 
     if (zone_match){
         zone_host = zone_match[1];
@@ -428,10 +428,14 @@ function setupCreateVDCDialog(){
     $('div#dialogs').append('<div title="Create VDC" id="create_vdc_dialog"></div>');
     var dialog = $('div#create_vdc_dialog');
     dialog.html(create_vdc_tmpl);
+
+    var height = Math.floor($(window).height()*0.8);
+
     dialog.dialog({
         autoOpen: false,
         modal: true,
-        width: 420
+        height: height,
+        width: 500
     });
 
     $('button',dialog).button();