details: http://www.bx.psu.edu/hg/galaxy/rev/9500dce290d0 changeset: 3207:9500dce290d0 user: Kanwei Li kanwei@gmail.com date: Tue Jan 05 16:32:30 2010 -0500 description: Quickies: add close button, fix window height to fit flowplayer
diffstat:
static/scripts/galaxy.panels.js | 3 ++- static/welcome.html | 14 +++++++------- 2 files changed, 9 insertions(+), 8 deletions(-)
diffs (73 lines):
diff -r 84a9e0f0387b -r 9500dce290d0 static/scripts/galaxy.panels.js --- a/static/scripts/galaxy.panels.js Tue Jan 05 15:17:10 2010 -0500 +++ b/static/scripts/galaxy.panels.js Tue Jan 05 16:32:30 2010 -0500 @@ -210,7 +210,8 @@ 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 -r 84a9e0f0387b -r 9500dce290d0 static/welcome.html --- a/static/welcome.html Tue Jan 05 15:17:10 2010 -0500 +++ b/static/welcome.html Tue Jan 05 16:32:30 2010 -0500 @@ -75,49 +75,49 @@ <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>