From e32c784042263412ff0f13aa6df3ca9e9e3bfad5 Mon Sep 17 00:00:00 2001
From: Hector Sanjuan <hsanjuan@opennebula.org>
Date: Thu, 27 Sep 2012 17:38:01 +0200
Subject: [PATCH] Several small fixes for UIs:

  * Fixed bug affecting only IE that prevented images/vnets from being selected in IE in Self-Service
  * Fixed IE login to sunstone
  * Fixed menu with in Sunstone so that french (and other long translations) translation doesn't push the + icon to a second line
  * Fixed uglyness in datastore create dialog when labels go multiline
  * Fixed opening extended info when changing image type in Images list
(cherry picked from commit 7d6366a6620df82fa3f7f178208deee53783b08a)
---
 .../occi/lib/ui/public/js/plugins/compute.js   | 18 ++++++++----------
 src/sunstone/public/js/layout.js               |  2 +-
 .../public/js/plugins/datastores-tab.js        |  4 ++--
 src/sunstone/public/js/plugins/images-tab.js   |  2 +-
 src/sunstone/public/js/sunstone-util.js        | 12 +++++++-----
 src/sunstone/views/login.erb                   |  5 +++++
 6 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/cloud/occi/lib/ui/public/js/plugins/compute.js b/src/cloud/occi/lib/ui/public/js/plugins/compute.js
index 98256594d4..6a67129b83 100644
--- a/src/cloud/occi/lib/ui/public/js/plugins/compute.js
+++ b/src/cloud/occi/lib/ui/public/js/plugins/compute.js
@@ -894,20 +894,18 @@ function popUpCreateVMDialog(){
 
 
     $('#network_box,#disk_box',dialog).change(function(){
-        $(this).val("");
-        return false;
-    });
-
-    $('#network_box option,#disk_box option',dialog).click(function(){
-        var clicked = $(this).attr('clicked');
+        var option = $('option:selected', this);
+        var clicked = option.attr('clicked');
         if (clicked){//unbold, unmark
-            $(this).text($(this).text().replace(/☒/g,'☐'));
-            $(this).removeAttr('clicked');
+            option.text(option.text().replace(/☒/g,'☐'));
+            option.removeAttr('clicked');
         }
         else {//bold,mark
-            $(this).text($(this).text().replace(/☐/g,'☒'));
-            $(this).attr('clicked','clicked');
+            option.text(option.text().replace(/☐/g,'☒'));
+            option.attr('clicked','clicked');
         }
+
+        $(this).val("");
         return false;
     });
 
diff --git a/src/sunstone/public/js/layout.js b/src/sunstone/public/js/layout.js
index 7ebae4c5ad..049e895644 100644
--- a/src/sunstone/public/js/layout.js
+++ b/src/sunstone/public/js/layout.js
@@ -128,7 +128,7 @@ $(document).ready(function () {
         applyDefaultStyles:       false
     ,   center__paneSelector:	".outer-center"
     ,	west__paneSelector:		".outer-west"
-    ,	west__size:				200
+    ,	west__size:				210
     ,	north__size:			26
     ,   south__size:            26
     ,	spacing_open:			0 // ALL panes
diff --git a/src/sunstone/public/js/plugins/datastores-tab.js b/src/sunstone/public/js/plugins/datastores-tab.js
index 6e9f886618..931de0179a 100644
--- a/src/sunstone/public/js/plugins/datastores-tab.js
+++ b/src/sunstone/public/js/plugins/datastores-tab.js
@@ -73,8 +73,8 @@ var create_datastore_tmpl =
         <option value="ssh">' + tr("SSH") + '</option>\
         <option value="iscsi">' + tr("iSCSI") + '</option>\
         <option value="dummy">' + tr("Dummy") + '</option>\
-  </select><br />\
-  <label>' + tr("Disk type") + ':</label>\
+  </select><div class="clear">\
+  <label for="disk_type">' + tr("Disk type") + ':</label>\
   <select id="disk_type" name="disk_type">\
         <option value="file">' + tr("File") + '</option>\
         <option value="block">' + tr("Block") + '</option>\
diff --git a/src/sunstone/public/js/plugins/images-tab.js b/src/sunstone/public/js/plugins/images-tab.js
index 3d99b58206..829addbf10 100644
--- a/src/sunstone/public/js/plugins/images-tab.js
+++ b/src/sunstone/public/js/plugins/images-tab.js
@@ -813,7 +813,7 @@ function setupCreateImageDialog(){
             });
             //we pop up an upload progress dialog
             var pos_top = $(window).height() - 120;
-            var pos_left = 190;
+            var pos_left = 220;
             var pb_dialog = $('<div id="pb_dialog" title="'+
                               tr("Uploading...")+'">'+
                               '<div id="upload-progress"></div>'+
diff --git a/src/sunstone/public/js/sunstone-util.js b/src/sunstone/public/js/sunstone-util.js
index 849ac710d1..a9dfbe9879 100644
--- a/src/sunstone/public/js/sunstone-util.js
+++ b/src/sunstone/public/js/sunstone-util.js
@@ -85,7 +85,7 @@ function humanize_size(value,from_bytes) {
     if (typeof(value) === "undefined") {
         value = 0;
     }
-    var binarySufix = from_bytes ? 
+    var binarySufix = from_bytes ?
         ["", "K", "M", "G", "T" ] : ["K", "M", "G", "T" ];
     var i=0;
     while (value > 1024 && i < 3){
@@ -567,8 +567,8 @@ function getSelectedNodes(dataTable){
     return selected_nodes;
 }
 
-//returns a HTML string with options for 
-//a select input code generated from a dataTable. 
+//returns a HTML string with options for
+//a select input code generated from a dataTable.
 //Allows filtering elements specifing status columns
 //and bad status (if the values of the columns match the bad status)
 //then this elem is skipped.
@@ -590,7 +590,7 @@ function makeSelectOptions(dataTable,
 
         //ASSUMPTION: elem id in column 1
         var id = elem[1];
-            
+
         var name = elem[option_name_col];
         var status, bad_status;
         var ok=true;
@@ -826,7 +826,9 @@ function popUpTemplateUpdateDialog(elem_str,select_items,sel_elems){
 //Shows run a custom action when clicking on rows.
 function infoListener(dataTable, info_action){
     $('tbody tr',dataTable).live("click",function(e){
-        if ($(e.target).is('input')) {return true;}
+        if ($(e.target).is('input') ||
+            $(e.target).is('select') ||
+            $(e.target).is('option')) return true;
 
         var aData = dataTable.fnGetData(this);
         var id = $(aData[0]).val();
diff --git a/src/sunstone/views/login.erb b/src/sunstone/views/login.erb
index 14fb9b2c52..30147df259 100644
--- a/src/sunstone/views/login.erb
+++ b/src/sunstone/views/login.erb
@@ -10,6 +10,11 @@
     <script type="text/javascript" src="vendor/jQuery/jquery-1.7.2.min.js"></script>
     <!-- End Vendor Libraries -->
 
+    <!--[if IE]>
+    <script type="text/javascript" src="vendor/crypto-js/core-min.js"></script>
+    <script type="text/javascript" src="vendor/crypto-js/enc-base64-min.js"></script>
+    <![endif]-->
+
     <script type="text/javascript" src="js/opennebula.js"></script>
     <script type="text/javascript" src="js/login.js"></script>