From a261449229229388ba6300142297873612c378ea Mon Sep 17 00:00:00 2001
From: Daniel Molina <dmolina@opennebula.org>
Date: Wed, 5 Mar 2014 13:00:41 +0100
Subject: [PATCH] Merge master

---
 src/sunstone/public/js/plugins/groups-tab.js | 17 +++++++++--------
 src/sunstone/public/js/sunstone.js           | 17 ++---------------
 2 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/src/sunstone/public/js/plugins/groups-tab.js b/src/sunstone/public/js/plugins/groups-tab.js
index 76db980c32..e69dac7896 100644
--- a/src/sunstone/public/js/plugins/groups-tab.js
+++ b/src/sunstone/public/js/plugins/groups-tab.js
@@ -247,7 +247,7 @@ var group_actions = {
             Sunstone.runAction('Group.showinfo',request.request.data[0][0]);
         },
         error: onError
-    },    
+    },
 
     "Group.delete" : {
         type: "multiple",
@@ -585,13 +585,14 @@ function updateGroupInfo(request,group){
     var info = group.GROUP;
 
     var info_tab = {
-          title: tr("Information"),
+          title: tr("Info"),
+          icon: "fa-info-circle",
           content:
-          '<form class="custom"><div class="">\
-          <div class="six columns">\
-          <table id="info_img_table" class="twelve datatable extended_table">\
+          '<div class="">\
+          <div class="large-6 columns">\
+          <table id="info_img_table" class="dataTable extended_table">\
              <thead>\
-              <tr><th colspan="3">'+tr("Group")+' - '+info.NAME+'</th></tr>\
+              <tr><th colspan="3">'+tr("Information")+'</th></tr>\
              </thead>\
              <tr>\
                 <td class="key_td">'+tr("ID")+'</td>\
@@ -605,13 +606,13 @@ function updateGroupInfo(request,group){
             </tr>\
           </table>\
           </div>\
-          <div class="six columns">'
+          <div class="large-6 columns">'
               + insert_extended_template_table(info.TEMPLATE,
                                                  "Group",
                                                  info.ID,
                                                  "Configuration & Tags") +
           '</div>\
-        </div></form>'
+        </div>'
       }
 
     var  default_group_quotas = Quotas.default_quotas(info.DEFAULT_GROUP_QUOTAS);
diff --git a/src/sunstone/public/js/sunstone.js b/src/sunstone/public/js/sunstone.js
index 774335f8ce..b79a7f8768 100644
--- a/src/sunstone/public/js/sunstone.js
+++ b/src/sunstone/public/js/sunstone.js
@@ -2646,7 +2646,7 @@ function insert_extended_template_table(template_json,resource_type,resource_id,
                   </thead>\
                   <tr>\
                     <td class="key_td"><input type="text" name="new_key" id="new_key" /></td>\
-                    <td class="value_td"><input type="text" name="new_value" id="new_value" /></td>\
+                    <td class="value_td"><textarea rows="1" type="text" name="new_value" id="new_value"></textarea></td>\
                     <td colspan="2" class=""><button type="button" id="button_add_value" class="button small secondary">'+tr("Add")+'</button>\</td>\
                   </tr>' + fromJSONtoHTMLTable(template_json,
                                                resource_type,
@@ -2690,19 +2690,6 @@ function insert_extended_template_table(template_json,resource_type,resource_id,
         }
     });
 
-    // Capture the enter key
-    $('#new_value').live("keypress", function(e) {
-          var ev = e || window.event;
-          var key = ev.keyCode;
-
-          if (key == 13)
-          {
-             //Get the button the user wants to have clicked
-             $('#button_add_value', $(this).parent().parent()).click();
-             ev.preventDefault();
-          }
-    })
-
     // Listener for single values
 
     // Listener for key,value pair remove action
@@ -2737,7 +2724,7 @@ function insert_extended_template_table(template_json,resource_type,resource_id,
         var key_str=this.firstElementChild.id.substring(9,this.firstElementChild.id.length);
 
         var value_str = $("#value_td_input_"+key_str).text();
-        input = $("#value_td_input_"+key_str).html('<input class="input_edit_value" id="input_edit_'+key_str+'" type="text"/>');
+        input = $("#value_td_input_"+key_str).html('<textarea class="input_edit_value" id="input_edit_'+key_str+'" type="text"></textarea>');
         $('#input_edit_'+key_str).val(value_str);
 
     });