1) Modified index page so progressive loading works better for slower

connections

2) Added a script for packing the javascripts, everything is now repacked
   with yui-compressor (the packed versions are slightly large, but they
   gzip better resulting in an overall reduction).

static/june_2007_style/blue/base.css

@@ -182,15 +182,15 @@ select, textarea, input[type="text"], input[type="file"]
 {
     padding-left: 10px;
     border-color: #6666AA;
-    background-color: #CCCCFF;
+    background-color: #6666AA;
     background-image: none;
 }
 
 .welcomeRed 
 {
     padding-left: 10px;
-    border-color: #AA6666;
-    background-color: #FFCCCC;
+    border-color: #AAAA66;
+    background-color: #FFFFCC;
     background-image: none;
 }
 

static/june_2007_style/blue/masthead.css

@@ -24,8 +24,3 @@ a:link, a:visited, a:active
 {
     color: #eeeeee;
 }
-
-span.brand
-{
-    font-size:60%;
-}

static/june_2007_style/blue/panel_layout.css

@@ -12,6 +12,15 @@ body
     background: #eee;
     font-size: 77%;
 }
+#background
+{
+    background: #eee;
+    z-index: -1;
+    margin: 0;
+    padding: 0;
+    width: 100%;
+    height: 100%;
+}
 #masthead 
 {
     position:absolute; 
@@ -109,7 +118,7 @@ body
 }
 td.panel-header
 {
-    background: #cccccc;
+    background: #f5f5f5;
     background-image: url(panel_header_bg.png);
     background-position: top center;
     background-repeat: repeat-x;
@@ -148,6 +157,10 @@ div.unified-panel-header {
     color: #333;
     font-weight: bold;
 }
+  
+.menu-bg {
+    background: #C1C9E5 url(menu_bg.png) top repeat-x;
+}
     
 div.unified-panel-body {
     position: absolute;

static/june_2007_style/blue/panel_layout_ie.css

@@ -1,7 +1,11 @@
 #left, #left-border, #center, #right-border, #right
 {
-     height: 600px;
-     height: expression(document.body.clientHeight - 39 + "px");
+    height: 600px;
+    height: expression(document.body.clientHeight - 39 + "px");
+}
+#background 
+{
+    height: expression(document.body.clientHeight + "px");
 }
 #left-border, #right-border
 {

static/june_2007_style/panel_layout.css.tmpl

@@ -12,6 +12,15 @@ body
     background: ${layout_bg};
     font-size: 77%;
 }
+#background
+{
+    background: ${layout_bg};
+    z-index: -1;
+    margin: 0;
+    padding: 0;
+    width: 100%;
+    height: 100%;
+}
 #masthead 
 {
     position:absolute; 
@@ -109,7 +118,7 @@ body
 }
 td.panel-header
 {
-    background: ${panel_header_bg_bottom};
+    background: ${panel_header_bg_top};
     background-image: url(panel_header_bg.png);
     background-position: top center;
     background-repeat: repeat-x;
@@ -148,6 +157,10 @@ div.unified-panel-header {
     color: #333;
     font-weight: bold;
 }
+  
+.menu-bg {
+    background: $menu_bg_over url(menu_bg.png) top repeat-x;
+}
     
 div.unified-panel-body {
     position: absolute;

static/june_2007_style/panel_layout_ie.css.tmpl

@@ -1,7 +1,11 @@
 #left, #left-border, #center, #right-border, #right
 {
-     height: 600px;
-     height: expression(document.body.clientHeight - 39 + "px");
+    height: 600px;
+    height: expression(document.body.clientHeight - 39 + "px");
+}
+#background 
+{
+    height: expression(document.body.clientHeight + "px");
 }
 #left-border, #right-border
 {

static/scripts/galaxy.panels.js

@@ -1,8 +1,22 @@
 var hidden_width = 7;
 var border_tweak = jQuery.browser.msie ? 14 : 9;
 
+var jq = jQuery;
+
+function ensure_dd_helper() {
+    // Insert div that covers everything when dragging the borders
+    if ( jq( "#DD-helper" ).length == 0 ) {
+        var e = jq("<div id='DD-helper' style='background: white; opacity: 0.00; top: 0; left: 0; width: 100%; height: 100%; position: absolute; z-index: 9000;'></div>");
+        if ( jq.browser.ie ) {
+            // Element will not capture drags in ie without nonzero opacity,
+            // but causes flashing in firefox with nonzero opacity
+            e.css( "opacity", "0.01" );
+        }
+        e.appendTo("body").hide();
+    }
+}
+
 function make_left_panel( panel_el, center_el, border_el ) {
-    var jq = jQuery;
     var hidden = false;
     var saved_size = null;
     // Functions for managing panel
@@ -70,7 +84,6 @@ function make_left_panel( panel_el, center_el, border_el ) {
 };
 
 function make_right_panel( panel_el, center_el, border_el ) {
-    var jq = jQuery;
     var hidden = false;
     var hidden_by_tool = false;
     var saved_size = null;    
@@ -105,7 +118,7 @@ function make_right_panel( panel_el, center_el, border_el ) {
         hidden_by_tool = false;
     };
     var handle_minwidth_hint = function( x ) {
-        var space = q( center_el ).width() - ( hidden ? saved_size : 0 );
+        var space = jq( center_el ).width() - ( hidden ? saved_size : 0 );
         if ( space < x )
         {
             if ( ! hidden ) {

static/scripts/pack_scripts.py

@@ -0,0 +1,19 @@
+#!/usr/bin/env python
+
+from glob import glob
+from subprocess import call
+from shutil import copyfile
+from os import path
+
+# Scripts that should not be packed
+do_not_pack = set( [ "ie_pngfix.js", "aflax.js" ] )
+
+cmd = "java -jar ../../scripts/yuicompressor.jar --warn %(fname)s > packed/%(fname)s"
+
+for fname in glob( "*.js" ):
+    d = dict( fname=fname )
+    print "%(fname)s --> packed/%(fname)s" % d
+    if fname in do_not_pack:
+        copyfile( fname, path.join( 'packed', fname ) )
+    else:
+        out = call( cmd % d, shell=True )

static/scripts/packed/cookie_set.js

@@ -1 +1 @@
-function CookieSet(cookie_name){this.cookie_name=cookie_name;this.store=store={};q.each((q.cookie(cookie_name)||"").split("|"),function(k,v){store[v]=true})};CookieSet.prototype.add=function(value){this.store[value]=true;return this};CookieSet.prototype.remove=function(value){delete this.store[value];return this};CookieSet.prototype.removeAll=function(value){this.store={};return this};CookieSet.prototype.contains=function(value){return(value in this.store)};CookieSet.prototype.save=function(){t=[];for(key in this.store){if(key!=""){t.push(key)}}q.cookie(this.cookie_name,t.join("|"));return this};
+function CookieSet(A){this.cookie_name=A;this.store=store={};q.each((q.cookie(A)||"").split("|"),function(C,B){store[B]=true})}CookieSet.prototype.add=function(A){this.store[A]=true;return this};CookieSet.prototype.remove=function(A){delete this.store[A];return this};CookieSet.prototype.removeAll=function(A){this.store={};return this};CookieSet.prototype.contains=function(A){return(A in this.store)};CookieSet.prototype.save=function(){t=[];for(key in this.store){if(key!=""){t.push(key)}}q.cookie(this.cookie_name,t.join("|"));return this}

static/scripts/packed/galaxy.panels.js

@@ -1 +1 @@
-eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('4 K=7;4 E=M.15.18?14:9;2 16(b,c,d){4 e=M;4 f=6;4 g=11;N=2(x){4 a=x;o(x<0)x=0;e(b).5("r",x);e(d).5("3",a);e(c).5("3",x+7)};U=2(){o(f){e(d).8("l");e(d).p({3:g},"n");e(b).5("3",-g).z().p({"3":0},"n",2(){N(g);e(d).8("y")});f=6}P{g=e(d).A().3;e(c).5("3",K);e(d).8("l");e(b).p({3:-g},"n");e(d).p({3:-1},"n",2(){e(v).F("y")});f=O}};e(d).l(2(){e(v).F("l")},2(){e(v).8("l")}).u({10:2(t,a){e(\'#D-C\').z()},Z:2(t,a){e(\'#D-C\').X();L 6},W:2(t,a){x=a.A.3;x=s.J(I,s.H(G,x));o(f){e(b).5("3",0);e(d).8("y");f=6}N(x);a.u.B[0]=x;a.u.B[1]=a.V.T.Y},S:2(){U()}}).R("Q").z()};2 13(b,c,d){4 e=M;4 f=6;4 g=6;4 h=11;4 i=2(x){e(b).5("r",x);e(c).5("m",x+9);e(d).5("m",x).5("3","")};4 j=2(){o(f){e(d).8("l");e(d).p({m:h},"n");e(b).5("m",-h).z().p({"m":0},"n",2(){i(h);e(d).8("y")});f=6}P{h=e(17).r()-e(d).A().3-E;e(c).5("m",K+1);e(d).8("l");e(b).p({m:-h},"n");e(d).p({m:-1},"n",2(){e(v).F("y")});f=O}g=6};4 k=2(x){4 a=q(c).r()-(f?h:0);o(a<x){o(!f){j();g=O}}P{o(g){j();g=6}}};e(d).l(2(){e(v).F("l")},2(){e(v).8("l")}).u({10:2(t,a){e(\'#D-C\').z()},Z:2(t,a){x=a.A.3;w=e(12).r();x=s.J(w-G,x);x=s.H(w-I,x);i(w-x-E);e(\'#D-C\').X();L 6},S:2(){j()},W:2(t,a){x=a.A.3;w=e(12).r();x=s.J(w-G,x);x=s.H(w-I,x);o(f){e(b).5("m",0);e(d).8("y");f=6}i(w-x-E);a.u.B[0]=x;a.u.B[1]=a.V.T.Y}}).R("Q").z();L{19:k}};',62,72,'||function|left|var|css|false||removeClass|||||||||||||hover|right|fast|if|animate||width|Math|_|draggable|this|||hidden|show|position|pos|helper|DD|border_tweak|addClass|100|max|400|min|hidden_width|return|jQuery|resize|true|else|div|find|click|co|toggle|options|drag|hide|top|stop|start|null|window|make_right_panel||browser|make_left_panel|document|msie|handle_minwidth_hint'.split('|'),0,{}))
+var hidden_width=7;var border_tweak=jQuery.browser.msie?14:9;var jq=jQuery;function ensure_dd_helper(){if(jq("#DD-helper").length==0){var A=jq("<div id='DD-helper' style='background: white; opacity: 0.00; top: 0; left: 0; width: 100%; height: 100%; position: absolute; z-index: 9000;'></div>");if(jq.browser.ie){A.css("opacity","0.01")}A.appendTo("body").hide()}}function make_left_panel(E,A,B){var D=false;var C=null;resize=function(F){var G=F;if(F<0){F=0}jq(E).css("width",F);jq(B).css("left",G);jq(A).css("left",F+7)};toggle=function(){if(D){jq(B).removeClass("hover");jq(B).animate({left:C},"fast");jq(E).css("left",-C).show().animate({"left":0},"fast",function(){resize(C);jq(B).removeClass("hidden")});D=false}else{C=jq(B).position().left;jq(A).css("left",hidden_width);jq(B).removeClass("hover");jq(E).animate({left:-C},"fast");jq(B).animate({left:-1},"fast",function(){jq(this).addClass("hidden")});D=true}};jq(B).hover(function(){jq(this).addClass("hover")},function(){jq(this).removeClass("hover")}).draggable({start:function(F,G){jq("#DD-helper").show()},stop:function(F,G){jq("#DD-helper").hide();return false},drag:function(F,G){x=G.position.left;x=Math.min(400,Math.max(100,x));if(D){jq(E).css("left",0);jq(B).removeClass("hidden");D=false}resize(x);G.draggable.pos[0]=x;G.draggable.pos[1]=G.options.co.top},click:function(){toggle()}}).find("div").show()}function make_right_panel(A,E,G){var I=false;var F=false;var C=null;var D=function(J){jq(A).css("width",J);jq(E).css("right",J+9);jq(G).css("right",J).css("left","")};var H=function(){if(I){jq(G).removeClass("hover");jq(G).animate({right:C},"fast");jq(A).css("right",-C).show().animate({"right":0},"fast",function(){D(C);jq(G).removeClass("hidden")});I=false}else{C=jq(document).width()-jq(G).position().left-border_tweak;jq(E).css("right",hidden_width+1);jq(G).removeClass("hover");jq(A).animate({right:-C},"fast");jq(G).animate({right:-1},"fast",function(){jq(this).addClass("hidden")});I=true}F=false};var B=function(J){var K=jq(E).width()-(I?C:0);if(K<J){if(!I){H();F=true}}else{if(F){H();F=false}}};jq(G).hover(function(){jq(this).addClass("hover")},function(){jq(this).removeClass("hover")}).draggable({start:function(J,K){jq("#DD-helper").show()},stop:function(J,K){x=K.position.left;w=jq(window).width();x=Math.min(w-100,x);x=Math.max(w-400,x);D(w-x-border_tweak);jq("#DD-helper").hide();return false},click:function(){H()},drag:function(J,K){x=K.position.left;w=jq(window).width();x=Math.min(w-100,x);x=Math.max(w-400,x);if(I){jq(A).css("right",0);jq(G).removeClass("hidden");I=false}D(w-x-border_tweak);K.draggable.pos[0]=x;K.draggable.pos[1]=K.options.co.top}}).find("div").show();return{handle_minwidth_hint:B}}

static/scripts/packed/ie_pngfix.js

@@ -1,8 +1,18 @@
+/*
+ 
+Correctly handle PNG transparency in Win IE 5.5 & 6.
+http://homepage.ntlworld.com/bobosola. Updated 18-Jan-2006.
+
+Use in <HEAD> with DEFER keyword wrapped in conditional comments:
+<!--[if lt IE 7]>
+<script defer type="text/javascript" src="pngfix.js"></script>
+<![endif]-->
+
+*/
+
 var arVersion = navigator.appVersion.split("MSIE")
 var version = parseFloat(arVersion[1])
 
-alert( document.body.filters );
-
 if ((version >= 5.5) && (document.body.filters)) 
 {
    for(var i=0; i<document.images.length; i++)

static/scripts/packed/jquery.center.js

@@ -0,0 +1 @@
+jQuery.fn.center=function(A){return this.each(function(){var D=this.parentNode;if(jQuery.css(D,"position")=="static"){D.style.position="relative"}var C=this.style;C.position="absolute";if(!A||A=="horizontal"){if(((parseInt(jQuery.css(D,"width"))-parseInt(jQuery.css(this,"width")))/2)>0){C.left=((parseInt(jQuery.css(D,"width"))-parseInt(jQuery.css(this,"width")))/2)+"px"}else{C.left="0"}}if(!A||A=="vertical"){if(((parseInt(jQuery.css(D,"height"))-parseInt(jQuery.css(this,"height")))/2)>0){C.top=((parseInt(jQuery.css(D,"height"))-parseInt(jQuery.css(this,"height")))/2)+"px"}else{if(D.nodeName.toLowerCase()=="body"){if(window.innerHeight){var B=window.innerHeight}else{if(document.body&&document.body.offsetHeight){var B=document.body.offsetHeight}}C.top=((B-parseInt(jQuery.css(this,"height")))/2)+"px"}else{C.top="0"}}}})}

static/scripts/packed/jquery.cookie.js

@@ -1 +1 @@
-eval(function(p,a,c,k,e,d){e=function(c){return(c<a?"":e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('j.5=u(9,a,2){6(h a!=\'v\'){2=2||{};6(a===m){a=\'\';2.3=-1}4 3=\'\';6(2.3&&(h 2.3==\'n\'||2.3.k)){4 7;6(h 2.3==\'n\'){7=w C();7.B(7.z()+(2.3*A*o*o*E))}l{7=2.3}3=\'; 3=\'+7.k()}4 8=2.8?\'; 8=\'+2.8:\'\';4 b=2.b?\'; b=\'+2.b:\'\';4 c=2.c?\'; c\':\'\';d.5=[9,\'=\',q(a),3,8,b,c].t(\'\')}l{4 g=m;6(d.5&&d.5!=\'\'){4 e=d.5.x(\';\');D(4 i=0;i<e.f;i++){4 5=j.r(e[i]);6(5.p(0,9.f+1)==(9+\'=\')){g=y(5.p(9.f+1));s}}}F g}};',42,42,'||options|expires|var|cookie|if|date|path|name|value|domain|secure|document|cookies|length|cookieValue|typeof||jQuery|toUTCString|else|null|number|60|substring|encodeURIComponent|trim|break|join|function|undefined|new|split|decodeURIComponent|getTime|24|setTime|Date|for|1000|return'.split('|'),0,{}))
+jQuery.cookie=function(B,I,L){if(typeof I!="undefined"){L=L||{};if(I===null){I="";L.expires=-1}var E="";if(L.expires&&(typeof L.expires=="number"||L.expires.toUTCString)){var F;if(typeof L.expires=="number"){F=new Date();F.setTime(F.getTime()+(L.expires*24*60*60*1000))}else{F=L.expires}E="; expires="+F.toUTCString()}var K=L.path?"; path="+L.path:"";var G=L.domain?"; domain="+L.domain:"";var A=L.secure?"; secure":"";document.cookie=[B,"=",encodeURIComponent(I),E,K,G,A].join("")}else{var D=null;if(document.cookie&&document.cookie!=""){var J=document.cookie.split(";");for(var H=0;H<J.length;H++){var C=jQuery.trim(J[H]);if(C.substring(0,B.length+1)==(B+"=")){D=decodeURIComponent(C.substring(B.length+1));break}}}return D}}

static/scripts/packed/jquery.dimensions.js

@@ -1 +1 @@
-eval(function(p,a,c,k,e,r){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('(3($){$.12={L:\'@11\'};$.t([\'e\',\'s\'],3(i,c){$.j[\'M\'+c]=3(){k(!1[0])4;q a=c==\'e\'?\'n\':\'f\',9=c==\'e\'?\'z\':\'y\';4 2(1,c.w())+2(1,\'m\'+a)+2(1,\'m\'+9)};$.j[\'K\'+c]=3(a){k(!1[0])4;q b=c==\'e\'?\'n\':\'f\',9=c==\'e\'?\'z\':\'y\';a=$.u({o:E},a||{});4 2(1,c.w())+2(1,\'B\'+b+\'s\')+2(1,\'B\'+9+\'s\')+2(1,\'m\'+b)+2(1,\'m\'+9)+(a.o?(2(1,\'o\'+b)+2(1,\'o\'+9)):0)}});$.t([\'f\',\'n\'],3(i,b){$.j[\'h\'+b]=3(a){k(!1[0])4;4 a!=X?1.t(3(){1==g||1==p?g.W(b==\'f\'?a:$(g)[\'U\'](),b==\'n\'?a:$(g)[\'T\']()):1[\'h\'+b]=a}):1[0]==g||1[0]==p?S[(b==\'f\'?\'Q\':\'P\')]||$.O&&p.N[\'h\'+b]||p.x[\'h\'+b]:1[0][\'h\'+b]}});$.j.u({v:3(){q a=0,7=0,l=1[0],6,8,5,r;k(l){5=1.5();6=1.6();8=5.6();6.7-=2(l,\'J\');6.d-=2(l,\'I\');8.7+=2(5,\'R\');8.d+=2(5,\'H\');r={7:6.7-8.7,d:6.d-8.d}}4 r},5:3(){q a=1[0].5;G(a&&(!/^x|F$/i.V(a.D)&&$.A(a,\'v\')==\'C\'))a=a.5;4 $(a)}});3 2(a,b){4 Z($.A(a.10?a[0]:a,b))||0}})(Y);',62,65,'|this|num|function|return|offsetParent|offset|top|parentOffset|borr||||left|Height|Left|window|scroll||fn|if|elem|padding|Top|margin|document|var|results|Width|each|extend|position|toLowerCase|body|Right|Bottom|css|border|static|tagName|false|html|while|borderLeftWidth|marginLeft|marginTop|outer|version|inner|documentElement|boxModel|pageYOffset|pageXOffset|borderTopWidth|self|scrollTop|scrollLeft|test|scrollTo|undefined|jQuery|parseInt|jquery|VERSION|dimensions'.split('|'),0,{}))
+(function(B){B.dimensions={version:"@VERSION"};B.each(["Height","Width"],function(D,C){B.fn["inner"+C]=function(){if(!this[0]){return }var F=C=="Height"?"Top":"Left",E=C=="Height"?"Bottom":"Right";return A(this,C.toLowerCase())+A(this,"padding"+F)+A(this,"padding"+E)};B.fn["outer"+C]=function(F){if(!this[0]){return }var G=C=="Height"?"Top":"Left",E=C=="Height"?"Bottom":"Right";F=B.extend({margin:false},F||{});return A(this,C.toLowerCase())+A(this,"border"+G+"Width")+A(this,"border"+E+"Width")+A(this,"padding"+G)+A(this,"padding"+E)+(F.margin?(A(this,"margin"+G)+A(this,"margin"+E)):0)}});B.each(["Left","Top"],function(D,C){B.fn["scroll"+C]=function(E){if(!this[0]){return }return E!=undefined?this.each(function(){this==window||this==document?window.scrollTo(C=="Left"?E:B(window)["scrollLeft"](),C=="Top"?E:B(window)["scrollTop"]()):this["scroll"+C]=E}):this[0]==window||this[0]==document?self[(C=="Left"?"pageXOffset":"pageYOffset")]||B.boxModel&&document.documentElement["scroll"+C]||document.body["scroll"+C]:this[0]["scroll"+C]}});B.fn.extend({position:function(){var H=0,G=0,F=this[0],I,C,E,D;if(F){E=this.offsetParent();I=this.offset();C=E.offset();I.top-=A(F,"marginTop");I.left-=A(F,"marginLeft");C.top+=A(E,"borderTopWidth");C.left+=A(E,"borderLeftWidth");D={top:I.top-C.top,left:I.left-C.left}}return D},offsetParent:function(){var C=this[0].offsetParent;while(C&&(!/^body|html$/i.test(C.tagName)&&B.css(C,"position")=="static")){C=C.offsetParent}return B(C)}});function A(C,D){return parseInt(B.css(C.jquery?C[0]:C,D))||0}})(jQuery)

static/scripts/packed/jquery.fx.drop.js

@@ -0,0 +1 @@
+(function(A){A.fx.drop=function(B,E,C,D){this.each(function(){if(!E.direction){E.direction="left"}var G=A.fx.findSides(A(this)),F={left:G[0],right:G[0],up:G[1],down:G[1]};var K=A(this);A.fx.relativize(K);if(B=="show"){var I={},J={};var H={left:(G[0]=="left"?"+=":"-="),right:(G[0]=="left"?"-=":"+="),up:(G[1]=="top"?"+=":"-="),down:(G[1]=="top"?"-=":"+=")};I[F[E.direction]]=H[E.direction]+200;K.show().css(F[E.direction],parseInt(K.css(F[E.direction]))+(H[E.direction]=="+="?-200:200))}else{var I={},J={display:"none"};var H={left:(G[0]=="left"?"-=":"+="),right:(G[0]=="left"?"+=":"-="),up:(G[1]=="top"?"-=":"+="),down:(G[1]=="top"?"+=":"-=")};I[F[E.direction]]=H[E.direction]+200;J[F[E.direction]]=A(this).css(F[E.direction])}K.animate(I,C,E.easing,function(){K.css(J);if(D){D.apply(this,arguments)}})})}})(jQuery)

static/scripts/packed/jquery.fx.js

@@ -0,0 +1 @@
+(function(A){A.fx=A.fx||{};A.extend(A.fx,{relativize:function(B){if(!B.css("position")||!B.css("position").match(/fixed|absolute|relative/)){B.css("position","relative")}},save:function(C,D){for(var B=0;B<D.length;B++){if(D[B]!==null){A.data(C[0],"fx.storage."+D[B],C.css(D[B]))}}},restore:function(D,F,B){if(B){var E={}}for(var C=0;C<F.length;C++){if(B){E[F[C]]=A.data(D[0],"fx.storage."+F[C])}if(F[C]!==null&&!B){D.css(F[C],A.data(D[0],"fx.storage."+F[C]))}}if(B){return E}},findSides:function(B){return[!!parseInt(B.css("left"))?"left":"right",!!parseInt(B.css("top"))?"top":"bottom"]},animateClass:function(D,E,G,F){var B=(typeof G=="function"?G:(F?F:null));var C=(typeof G=="object"?G:null);this.each(function(){var L={};var J=A(this);var K=J.attr("style")||"";if(typeof K=="object"){K=K["cssText"]}if(D.toggle){J.hasClass(D.toggle)?D.remove=D.toggle:D.add=D.toggle}var H=A.extend({},(document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle));if(D.add){J.addClass(D.add)}if(D.remove){J.removeClass(D.remove)}var I=A.extend({},(document.defaultView?document.defaultView.getComputedStyle(this,null):this.currentStyle));if(D.add){J.removeClass(D.add)}if(D.remove){J.addClass(D.remove)}for(var M in I){if(typeof I[M]!="function"&&I[M]&&M.indexOf("Moz")==-1&&M.indexOf("length")==-1&&I[M]!=H[M]&&(M.match(/color/i)||(!M.match(/color/i)&&!isNaN(parseInt(I[M]))))&&(H.position!="static"||(H.position=="static"&&!M.match(/left|top|bottom|right/)))){L[M]=I[M]}}J.animate(L,E,C,function(){if(typeof A(this).attr("style")=="object"){A(this).attr("style")["cssText"]="";A(this).attr("style")["cssText"]=K}else{A(this).attr("style",K)}if(D.add){A(this).addClass(D.add)}if(D.remove){A(this).removeClass(D.remove)}if(B){B.apply(this,arguments)}})})}});A.fn.extend({effect:function(B,C){if(A.fx[B]){this.each(function(){A.fx[B].apply(this,[C])})}},_show:A.fn.show,_hide:A.fn.hide,_addClass:A.fn.addClass,_removeClass:A.fn.removeClass,_toggleClass:A.fn.toggleClass,show:function(C,B,D){return typeof C=="string"||typeof C=="undefined"?this._show(C,B):A.fx[C.method].apply(this,["show",C,B,D])},hide:function(C,B,D){return typeof C=="string"||typeof C=="undefined"?this._hide(C,B):A.fx[C.method].apply(this,["hide",C,B,D])},addClass:function(C,B,E,D){return B?A.fx.animateClass.apply(this,[{add:C},B,E,D]):this._addClass(C)},removeClass:function(C,B,E,D){return B?A.fx.animateClass.apply(this,[{remove:C},B,E,D]):this._removeClass(C)},toggleClass:function(C,B,E,D){return B?A.fx.animateClass.apply(this,[{toggle:C},B,E,D]):this._toggleClass(C)},morph:function(B,D,C,F,E){return A.fx.animateClass.apply(this,[{add:D,remove:B},C,F,E])},switchClass:function(){this.morph.apply(this,arguments)}})})(jQuery)

static/scripts/packed/jquery.hoverIntent.js

@@ -0,0 +1 @@
+(function(A){A.fn.hoverIntent=function(I,H){var J={sensitivity:7,interval:100,timeout:0};J=A.extend(J,H?{over:I,out:H}:I);var L,K,F,D;var E=function(M){L=M.pageX;K=M.pageY};var C=function(N,M){M.hoverIntent_t=clearTimeout(M.hoverIntent_t);if((Math.abs(F-L)+Math.abs(D-K))<J.sensitivity){A(M).unbind("mousemove",E);M.hoverIntent_s=1;return J.over.apply(M,[N])}else{F=L;D=K;M.hoverIntent_t=setTimeout(function(){C(N,M)},J.interval)}};var G=function(N,M){M.hoverIntent_t=clearTimeout(M.hoverIntent_t);M.hoverIntent_s=0;return J.out.apply(M,[N])};var B=function(P){var O=(P.type=="mouseover"?P.fromElement:P.toElement)||P.relatedTarget;while(O&&O!=this){try{O=O.parentNode}catch(P){O=this}}if(O==this){return false}var N=A.extend({},P);var M=this;if(M.hoverIntent_t){M.hoverIntent_t=clearTimeout(M.hoverIntent_t)}if(P.type=="mouseover"){F=N.pageX;D=N.pageY;A(M).bind("mousemove",E);if(M.hoverIntent_s!=1){M.hoverIntent_t=setTimeout(function(){C(N,M)},J.interval)}}else{A(M).unbind("mousemove",E);if(M.hoverIntent_s==1){M.hoverIntent_t=setTimeout(function(){G(N,M)},J.timeout)}}};return this.mouseover(B).mouseout(B)}})(jQuery)

static/scripts/packed/jquery.json.js

@@ -0,0 +1 @@
+(function($){var m={"\b":"\\b","\t":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"},s={"array":function(x){var a=["["],b,f,i,l=x.length,v;for(i=0;i<l;i+=1){v=x[i];f=s[typeof v];if(f){v=f(v);if(typeof v=="string"){if(b){a[a.length]=","}a[a.length]=v;b=true}}}a[a.length]="]";return a.join("")},"boolean":function(x){return String(x)},"null":function(x){return"null"},"number":function(x){return isFinite(x)?String(x):"null"},"object":function(x){if(x){if(x instanceof Array){return s.array(x)}var a=["{"],b,f,i,v;for(i in x){v=x[i];f=s[typeof v];if(f){v=f(v);if(typeof v=="string"){if(b){a[a.length]=","}a.push(s.string(i),":",v);b=true}}}a[a.length]="}";return a.join("")}return"null"},"string":function(x){if(/["\\\x00-\x1f]/.test(x)){x=x.replace(/([\x00-\x1f\\"])/g,function(a,b){var c=m[b];if(c){return c}c=b.charCodeAt();return"\\u00"+Math.floor(c/16).toString(16)+(c%16).toString(16)})}return'"'+x+'"'}};$.toJSON=function(v){var f=isNaN(v)?s[typeof v]:s["number"];if(f){return f(v)}};$.parseJSON=function(v,safe){if(safe===undefined){safe=$.parseJSON.safe}if(safe&&!/^("(\\.|[^"\\\n\r])*?"|[,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t])+?$/.test(v)){return undefined}return eval("("+v+")")};$.parseJSON.safe=false})(jQuery)

templates/root/index.tmpl

@@ -3,36 +3,19 @@
 <html lang="en">
 <head>
     <title>Galaxy</title>
-
+    ## Stylesheets must get loaded early so iframes are in the right place 
+    ## when the load (rendering stops until these are loaded)
     <link rel="stylesheet" type="text/css" href="$h.url_for('/static/style/reset.css')"></link>
     <link rel="stylesheet" type="text/css" href="${h.url_for('/static/style/panel_layout.css')}"></link>
     <!--[if IE]>
     <link rel="stylesheet" type="text/css" href="${h.url_for('/static/style/panel_layout_ie.css')}"></link>
     <![endif]-->
-
-    <script type="text/javascript" src="$h.url_for('/static/scripts/jquery.js')"></script>
-    <script type="text/javascript" src="$h.url_for('/static/scripts/jquery.dimensions.js')"></script>
-    <script type="text/javascript" src="$h.url_for('/static/scripts/jquery.ui.js')"></script>
-    <script type="text/javascript" src="$h.url_for('/static/scripts/galaxy.panels.js')"></script>
-    <script type="text/javascript">
-    <!--
-    var q = jQuery.noConflict();
-		
-    q(document).ready( function() {
-	// Make panels
-        var lp = make_left_panel( q("#left"), q("#center"), q("#left-border" ) );
-        var rp = make_right_panel( q("#right"), q("#center"), q("#right-border" ) );
-        handle_minwidth_hint = rp.handle_minwidth_hint;
-        // Insert div that covers everything when dragging the borders
-    	q("<div id='DD-helper' style='background: white; top: 0; left: 0; width: 100%; height: 100%; position: absolute; z-index: 9000;'></div>")
-	    .css("opacity", "0.01").appendTo("body").hide();
-    });
-    // -->
-    </script>
-
 </head>
 
 <body scroll="no">
+    ## Background displays first
+    <div id="background"></div>
+    ## Layer iframes over backgrounds
     <div id="masthead">
        <iframe name="galaxy_masthead" src="$h.url_for( 'masthead' )" width="38" height="100%" frameborder="0" scroll="no" style="margin: 0; border: 0 none; width: 100%; height: 38px; overflow: hidden;"> </iframe>
     </div>
@@ -45,7 +28,7 @@
       </div>
       </td>
       </tr><tr>
-      <td height="100%" class="panel-body">
+      <td height="100%" class="panel-body menu-bg">
            <iframe name="galaxy_tools" src="$h.url_for( 'tool_menu' )" width="100%" height="100%" frameborder="0" style="margin: 0; border: 0 none; height: 100%;"> </iframe>
       </td></tr></table>
     </div>
@@ -53,7 +36,7 @@
     <div id="center">
 	<table class="column-layout" cellpadding="0" cellspacing="0" border="0" height="100%" width="100%">
 	    <tr height="100%" style="height: 100%"><td height="100%" style="height: 100%;">
-		<iframe name="galaxy_main" width="100%" height="100%" frameborder="0" style="margin: 0; border: 0 none; width: 100%; height: 100%;" src="${h.url_for( '/static/welcome.html' )}"> </iframe>
+		<iframe name="galaxy_main" id="galaxy_main" width="100%" height="100%" frameborder="0" style="margin: 0; border: 0 none; width: 100%; height: 100%;" src="${h.url_for( '/static/welcome.html' )}"> </iframe>
 	    </td></tr>
 	</table>
     </div>
@@ -67,9 +50,21 @@
 	</div>
 	</td>
 	</tr><tr height="100%">
-	<td height="100%" style="height: 100%;" class="panel-body">
-	    <iframe name="galaxy_history" width="100%" height="100%" frameborder="0" style="margin: 0; border: 0 none; height: 100%;" src="$h.url_for( action='history' )">
+	<td height="100%" style="height: 100%;" class="panel-body menu-bg">
+	    <iframe name="galaxy_history" width="100%" height="100%" frameborder="0" style="margin: 0; border: 0 none; height: 100%;" src="$h.url_for( action='history' )"></iframe>
 	</td></tr></table>
     </div>
+    ## Scripts can be loaded later since they progressively add features to
+    ## the panels, but do not change layout
+    <script type="text/javascript" src="$h.url_for('/static/scripts/jquery.js')"></script>
+    <script type="text/javascript" src="$h.url_for('/static/scripts/jquery.dimensions.js')"></script>
+    <script type="text/javascript" src="$h.url_for('/static/scripts/jquery.ui.js')"></script>
+    <script type="text/javascript" src="$h.url_for('/static/scripts/galaxy.panels.js')"></script>
+    <script type="text/javascript">
+        ensure_dd_helper();
+        var lp = make_left_panel( $("#left"), $("#center"), $("#left-border" ) );
+        var rp = make_right_panel( $("#right"), $("#center"), $("#right-border" ) );
+        handle_minwidth_hint = rp.handle_minwidth_hint;
+    </script>
 </body>
 </html>