gistfile1.diff

diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.j
index e4ee67d..657f4aa 100644
--- a/src/sunstone/public/js/plugins/templates-tab.js
+++ b/src/sunstone/public/js/plugins/templates-tab.js
@@ -3612,13 +3612,9 @@ function initialize_create_template_dialog(dialog) {
         setup_other_tab_content(tab);
     }

-    // Re-Setup tips
-    setupTips(dialog);
-
-
-    $(document).foundation();
-
+    dialog.foundation();
     // Add first disk and network
+    setupTips(dialog);
     $("#tf_btn_disks", dialog).trigger("click");
     $("#tf_btn_nics", dialog).trigger("click");

@@ -3869,7 +3865,7 @@ function popUpCreateTemplateDialog(){

     $('#wizard_mode', $create_template_dialog).show();

-    $create_template_dialog.foundation().foundation('reveal', 'open');
+    $create_template_dialog.foundation('reveal', 'open');

     $("input#NAME",$create_template_dialog).focus();

diff --git a/src/sunstone/public/js/sunstone.js b/src/sunstone/public/js/sunstone.js
index 21790d1..00fb16c 100644
--- a/src/sunstone/public/js/sunstone.js
+++ b/src/sunstone/public/js/sunstone.js
@@ -1702,9 +1702,9 @@ function setupTips(context, position){
         }
         //replace the text with an icon and spans
         obj.html('<span data-tooltip class="'+tip_classes.join(' ')+'" data-width="210" title="'+tip+'"><i c
+        obj.foundation();
     });

-    context.foundation();
 }

 //returns an array of ids of selected elements in a dataTable
@@ -3591,7 +3591,7 @@ function hideDialog(){

 function popDialog(content, context){
     $(".right-info", context).html(content);
-    $(document).foundation();
+    context.foundation();
     //innerLayout.open("south");
 }