bug #1832: Fix template create dialog, reset button

src/sunstone/public/js/plugins/clusters-tab.js

@@ -160,7 +160,6 @@ var create_cluster_tmpl ='<div id="cluster_create_tabs">\
     <div class="form_buttons row">\
         <button class="button success right radius" type="submit" id="create_cluster_submit" value="OpenNebula.Cluster.create">' + tr("Create") + '</button>\
         <button class="button right radius" type="submit" id="update_cluster_submit">' + tr("Update") + '</button>\
-        <button class="button secondary radius" type="reset" value="reset">' + tr("Reset") + '</button>\
         <button class="close-reveal-modal button secondary radius" type="button" value="close">' + tr("Close") + '</button>\
     </div>\
         <a class="close-reveal-modal">&#215;</a>\

src/sunstone/public/js/plugins/files-tab.js

@@ -74,8 +74,8 @@ var create_file_tmpl =
   <div class="panel">\
     <h3><small>'+tr("Create File")+'</small></h4>\
   </div>\
-  <div class="reveal-body">\
      <form id="create_file_form_easy" action="" class="custom creation">\
+  <div class="reveal-body">\
             <div class="row vm_param">\
               <div class="six columns">\
                 <div class="row">\
@@ -172,13 +172,13 @@ var create_file_tmpl =
             </div>\
             </div>\
             <hr>\
-      </form>\
       <div class="form_buttons">\
         <button class="button success radius right" id="create_file_submit" value="file/create">'+tr("Create")+'</button>\
         <button class="button secondary radius" type="reset" value="reset">'+tr("Reset")+'</button>\
         <button class="close-reveal-modal button secondary radius" type="button" value="close">' + tr("Close") + '</button>\
       </div>\
   <a class="close-reveal-modal">&#215;</a>\
+      </form>\
 </div>';
 
 var dataTable_files;

src/sunstone/public/js/plugins/images-tab.js

@@ -74,6 +74,7 @@ var create_image_tmpl =
   <div class="panel">\
     <h3><small>'+tr("Create Image")+'</small></h4>\
   </div>\
+  <form id="create_image" action="" class="custom creation">\
         <dl class="tabs">\
         <dd class="active"><a href="#img_easy">'+tr("Wizard")+'</a></dd>\
           <dd><a href="#img_manual">'+tr("Advanced mode")+'</a></dd>\
@@ -81,7 +82,6 @@ var create_image_tmpl =
         <ul class="tabs-content">\
         <li id="img_easyTab" class="active">\
         <div class="reveal-body">\
-           <form id="create_image_form_easy" action="" class="custom creation">\
                   <div class="row vm_param">\
                     <div class="six columns">\
                       <div class="row">\
@@ -256,7 +256,6 @@ var create_image_tmpl =
                   </div>\
                   </div>\
                   <hr>\
-            </form>\
             <div class="form_buttons">\
               <button class="button success radius right" id="create_image_submit" value="image/create">'+tr("Create")+'</button>\
               <button class="button secondary radius" type="reset" value="reset">'+tr("Reset")+'</button>\
@@ -265,7 +264,6 @@ var create_image_tmpl =
         </li>\
         <li id="img_manualTab">\
         <div class="reveal-body">\
-            <form id="create_image_form_manual" action="" class="custom">\
                  <h4><small>'+tr("Write the image template here")+'</small></h4>\
                  <label for="img_datastores_raw">'+tr("Datastore")+':</label>\
                  <select id="img_datastore_raw" name="img_datastore_raw">\
@@ -278,10 +276,10 @@ var create_image_tmpl =
                  <button class="button secondary radius" type="reset" value="reset">'+tr("Reset")+'</button>\
                  <button class="close-reveal-modal button secondary radius" type="button" value="close">' + tr("Close") + '</button>\
                </div>\
-           </form>\
         </li>\
         </ul>\
         <a class="close-reveal-modal">&#215;</a>\
+           </form>\
 </div>';
 
 var dataTable_images;

src/sunstone/public/js/plugins/templates-tab.js

@@ -67,30 +67,31 @@ var templates_tab_content = '\
 
 
 var create_template_tmpl = '<div class="panel">'+
-  '<h3><small>'+tr("Create VM Template")+'</small></h4>'+
+  '<h3><small id="create_template_header">'+tr("Create VM Template")+'</small><small id="update_template_header" class="hidden">'+tr("Update VM Template")+'</small></h3>'+
   '</div>'+
+  '<form class="custom creation">'+
+        '<div class="reveal-body">'+
   '<div class="row">'+
     '<div class="columns three">'+
         '<dl id="template_create_tabs" class="tabs vertical">'+
         '</dl>'+
     '</div>'+
     '<div class="columns nine">'+
-        '<div class="reveal-body">'+
-        '<form class="custom creation">'+
             '<ul id="template_create_tabs_content" class="tabs-content">'+
             '</ul>'+
-        '</form>'+
-        '</div>'+
     '</div>'+
   '</div>'+
+        '</div>'+
   '<div class="">'+
       '<hr>'+
       '<button class="success button radius" id="create_template_form_easy" value="OpenNebula.Template.create" style="float: right">'+tr("Create")+'</button>'+
       '<button class="button hidden radius" id="template_template_update_button" value="Template.update_template" style="float: right">'+tr("Update")+'</button>'+
-      '<button class="button secondary radius" id="template_template_reset_button" value="">'+tr("Reset")+'</button>'+
+      '<button class="button secondary radius" id="template_template_reset_button" value="reset" type="reset">'+tr("Reset")+'</button>'+
+      '<button class="button secondary hidden radius" id="template_template_reset_button_update" value="reset" type="reset">'+tr("Reset")+'</button>'+
       '<button class="close-reveal-modal button secondary radius" type="button" value="close">' + tr("Close") + '</button>'+
   '</div>'+
-  '<a class="close-reveal-modal">&#215;</a>';
+  '<a class="close-reveal-modal">&#215;</a>'+
+  '</form>';
 
 
 var update_template_tmpl =
@@ -3012,11 +3013,32 @@ function setupCreateTemplateDialog(){
     //  tabs.tabs("option", "active", selected-1);
     //});
 
+
     $('#template_template_reset_button').click(function(){
-        $create_template_dialog.trigger("reveal:close")
         $create_template_dialog.empty();
         setupCreateTemplateDialog();
-        $create_template_dialog.reveal();
+
+        $('button#create_template_form_easy', $create_template_dialog).show();
+        $('button#template_template_update_button', $create_template_dialog).hide();
+        $('button#template_template_reset_button', $create_template_dialog).show();
+        $('button#template_template_reset_button_update', $create_template_dialog).hide();
+
+        $('#create_template_header', $create_template_dialog).show();
+        $('#update_template_header', $create_template_dialog).hide();
+
+    });
+
+    $('#template_template_reset_button_update').click(function(){
+        $create_template_dialog.empty();
+        setupCreateTemplateDialog();
+
+        $('button#create_template_form_easy', $create_template_dialog).hide();
+        $('button#template_template_update_button', $create_template_dialog).show();
+        $('button#template_template_reset_button', $create_template_dialog).hide();
+        $('button#template_template_reset_button_update', $create_template_dialog).show();
+
+        $('#create_template_header', $create_template_dialog).hide();
+        $('#update_template_header', $create_template_dialog).show();
     });
 
     add_capacityTab();
@@ -3231,18 +3253,23 @@ function setupCreateTemplateDialog(){
     });
 
     //Reset form - empty boxes
-    $('button#reset_vm_form',dialog).click(function(){
-        $('select#disks_box option',section_disks).remove();
-       $('select#nics_box option',section_networks).remove();
-        $('select#inputs_box option',section_inputs).remove();
-        $('select#custom_var_box option',section_custom_var).remove();
-        return true;
-    });
+    //$('button#reset_vm_form',dialog).click(function(){
+    //    $('select#disks_box option',section_disks).remove();
+    //   $('select#nics_box option',section_networks).remove();
+    //    $('select#inputs_box option',section_inputs).remove();
+    //    $('select#custom_var_box option',section_custom_var).remove();
+    //    return true;
+    //});
 }
 
 function popUpUpdateTemplateDialog(){
     $('button#create_template_form_easy', $create_template_dialog).hide();
     $('button#template_template_update_button', $create_template_dialog).show();
+    $('button#template_template_reset_button', $create_template_dialog).hide();
+    $('button#template_template_reset_button_update', $create_template_dialog).show();
+
+    $('#create_template_header', $create_template_dialog).hide();
+    $('#update_template_header', $create_template_dialog).show();
 
     $create_template_dialog.reveal();
 };
@@ -3250,6 +3277,11 @@ function popUpUpdateTemplateDialog(){
 function popUpCreateTemplateDialog(){
     $('button#create_template_form_easy', $create_template_dialog).show();
     $('button#template_template_update_button', $create_template_dialog).hide();
+    $('button#template_template_reset_button', $create_template_dialog).show();
+    $('button#template_template_reset_button_update', $create_template_dialog).hide();
+
+    $('#create_template_header', $create_template_dialog).show();
+    $('#update_template_header', $create_template_dialog).hide();
 
     $create_template_dialog.reveal();
 };

src/sunstone/public/js/plugins/vnets-tab.js

@@ -78,8 +78,8 @@ var create_vn_tmpl =
         </dl>\
         <ul class="tabs-content">\
         <li class="active" id="easyTab">\
-        <div class="reveal-body">\
            <form id="create_vn_form_easy" action="" class="creation">\
+        <div class="reveal-body">\
             <div class="row">\
               <div class="three columns">\
                 <label class="right inline" for="name" >' + tr("Name") + ':</label>\
@@ -240,7 +240,8 @@ var create_vn_tmpl =
                   <div class="one columns">\
                   </div>\
                 </div>\
-              </div>\<div class="six columns">\
+              </div>\
+              <div class="six columns">\
                 <div class="row">\
                   <div class="four columns">\
                     <label class="right inline" for="vlan">'+tr("VLAN")+':</label>\
@@ -316,7 +317,6 @@ var create_vn_tmpl =
                  </div>\
               </fieldset>\
             </div>\
-        </form>\
         </div>\
         <hr>\
         <div class="form_buttons">\
@@ -326,13 +326,13 @@ var create_vn_tmpl =
           <button class="button secondary radius" type="reset" value="reset">'+tr("Reset")+'</button>\
           <button class="close-reveal-modal button secondary radius" type="button" value="close">' + tr("Close") + '</button>\
         </div>\
+        </form>\
       </li>\
       <li id="manualTab">\
-        <div class="reveal-body">\
         <form id="create_vn_form_manual" action="">\
+        <div class="reveal-body">\
            <h4><small>'+tr("Write the Virtual Network template here")+'</small></h4>\
                <textarea id="template" rows="15" style="width:100%;"></textarea>\
-          </form>\
           </div>\
           <hr>\
                 <div class="form_buttons">\
@@ -342,6 +342,7 @@ var create_vn_tmpl =
                 <button class="button secondary radius" type="reset" value="reset">'+tr("Reset")+'</button>\
                 <button class="close-reveal-modal button secondary radius" type="button" value="close">' + tr("Close") + '</button>\
                 </div>\
+          </form>\
         </li>\
     </ul>\
     <a class="close-reveal-modal">&#215;</a>\