From b31024b49490a8df4b52ec5a6094b797f301982b Mon Sep 17 00:00:00 2001
From: Kanwei Li <kanwei@gmail.com>
Date: Tue, 5 Jan 2010 16:32:30 -0500
Subject: [PATCH] Quickies: add close button, fix window height to fit
 flowplayer

---
 static/scripts/galaxy.panels.js |  3 ++-
 static/welcome.html             | 14 +++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/static/scripts/galaxy.panels.js b/static/scripts/galaxy.panels.js
index 7621c6c205c..67990b28cbd 100644
--- a/static/scripts/galaxy.panels.js
+++ b/static/scripts/galaxy.panels.js
@@ -210,7 +210,8 @@ function show_in_overlay( options ) {
         hide_modal();
         $("#overlay-background").unbind( "click.overlay" );
     });
-    show_modal( null, $("<div style='margin: -5px;'><iframe style='margin: 0; padding: 0;' src='" + options.url + "' width='" + width + "' height='" + height + "' scrolling='" + scroll + "' frameborder='0'></iframe></div>" ) );
+    show_modal( null, $("<div style='margin: -5px;'><img id='close_button' style='position:absolute;right:3px;top:3px;' src='../images/icon_error_sml.gif'><iframe style='margin: 0; padding: 0;' src='" + options.url + "' width='" + width + "' height='" + height + "' scrolling='" + scroll + "' frameborder='0'></iframe></div>" ) );
+    $("#close_button").bind( "click", function() { hide_modal() } );
 }
     
 // Tab management
diff --git a/static/welcome.html b/static/welcome.html
index 6c0e4b5f934..2afabc41fbc 100644
--- a/static/welcome.html
+++ b/static/welcome.html
@@ -75,49 +75,49 @@ $(document).ready(function() {
         <table border="0" cellpadding="0" cellspacing="0" width="100%">
             <tr>
                 <td>
-                    <a href="javascript:parent.show_in_overlay({url:'http://screencast.g2.bx.psu.edu/galaxy/quickie1_TabSeq/quickie1_TabSeq.flv',width:640,height:500,scroll:'no'})">
+                    <a href="javascript:parent.show_in_overlay({url:'http://screencast.g2.bx.psu.edu/galaxy/quickie1_TabSeq/flow.html',width:640,height:480,scroll:'no'})">
 	                   <div class="quickie">
                         <img src="images/qk/quickie1_small.png" border="0">
 	                   </div>
                     </a>
                 </td>
                 <td>
-                    <a href="javascript:parent.show_in_overlay({url:'http://screencast.g2.bx.psu.edu/galaxy/quickie2_Grouping/flow.html',width:640,height:500,scroll:'no'})">
+                    <a href="javascript:parent.show_in_overlay({url:'http://screencast.g2.bx.psu.edu/galaxy/quickie2_Grouping/flow.html',width:640,height:480,scroll:'no'})">
 	                   <div class="quickie">
                         <img src="images/qk/quickie2_small.png" border="0">
 	                   </div>
                     </a>
                 </td>
                 <td>
-                    <a href="javascript:parent.show_in_overlay({url:'http://screencast.g2.bx.psu.edu/galaxy/quickie3_Intervals/flow.html',width:640,height:500,scroll:'no'})">
+                    <a href="javascript:parent.show_in_overlay({url:'http://screencast.g2.bx.psu.edu/galaxy/quickie3_Intervals/flow.html',width:640,height:480,scroll:'no'})">
 	                   <div class="quickie">
                         <img src="images/qk/quickie3_small.png" border="0">
 	                   </div>
                     </a>
                 </td>
                 <td>
-                    <a href="javascript:parent.show_in_overlay({url:'http://screencast.g2.bx.psu.edu/galaxy/quickie4_whatsNew/flow.html',width:640,height:500,scroll:'no'})">
+                    <a href="javascript:parent.show_in_overlay({url:'http://screencast.g2.bx.psu.edu/galaxy/quickie4_whatsNew/flow.html',width:640,height:480,scroll:'no'})">
 	                   <div class="quickie">
                         <img src="images/qk/quickie4_small.png" border="0">
 	                   </div>
                     </a>
                 </td>
                 <td>
-                    <a href="javascript:parent.show_in_overlay({url:'http://screencast.g2.bx.psu.edu/galaxy/quickie5_join/flow.html',width:640,height:500,scroll:'no'})">
+                    <a href="javascript:parent.show_in_overlay({url:'http://screencast.g2.bx.psu.edu/galaxy/quickie5_join/flow.html',width:640,height:480,scroll:'no'})">
 	                   <div class="quickie">
                         <img src="images/qk/quickie5_small.png" border="0">
 	                   </div>
                     </a>
                 </td>
                 <td>
-                    <a href="javascript:parent.show_in_overlay({url:'http://screencast.g2.bx.psu.edu/galaxy/quickie6_share/flow.html',width:640,height:500,scroll:'no'})">
+                    <a href="javascript:parent.show_in_overlay({url:'http://screencast.g2.bx.psu.edu/galaxy/quickie6_share/flow.html',width:640,height:480,scroll:'no'})">
 	                   <div class="quickie">
                         <img src="images/qk/quickie6_small.png" border="0">
 	                   </div>
                     </a>
                 </td>
                 <td>
-                    <a href="javascript:parent.show_in_overlay({url:'http://screencast.g2.bx.psu.edu/galaxy/quickie7_sr_beta/flow.html',width:640,height:500,scroll:'no'})">
+                    <a href="javascript:parent.show_in_overlay({url:'http://screencast.g2.bx.psu.edu/galaxy/quickie7_sr_beta/flow.html',width:640,height:480,scroll:'no'})">
 	                   <div class="quickie">
                         <img src="images/qk/quickie7_small.png" border="0">
 	                   </div>