diff --git a/scripts/yuicompressor.jar b/scripts/yuicompressor.jar new file mode 100644 index 00000000000..89841be8717 Binary files /dev/null and b/scripts/yuicompressor.jar differ diff --git a/static/june_2007_style/blue/base.css b/static/june_2007_style/blue/base.css index 2cb941dac47..4922aa7dfd5 100644 --- a/static/june_2007_style/blue/base.css +++ b/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; } diff --git a/static/june_2007_style/blue/base_bg.png b/static/june_2007_style/blue/base_bg.png index 882f8d35971..211816a0435 100644 Binary files a/static/june_2007_style/blue/base_bg.png and b/static/june_2007_style/blue/base_bg.png differ diff --git a/static/june_2007_style/blue/error_bg.png b/static/june_2007_style/blue/error_bg.png index f5c4edddef8..242cdba5356 100644 Binary files a/static/june_2007_style/blue/error_bg.png and b/static/june_2007_style/blue/error_bg.png differ diff --git a/static/june_2007_style/blue/footer_title_bg.png b/static/june_2007_style/blue/footer_title_bg.png index 5b5bea63ca8..1e6e16233ef 100644 Binary files a/static/june_2007_style/blue/footer_title_bg.png and b/static/june_2007_style/blue/footer_title_bg.png differ diff --git a/static/june_2007_style/blue/form_body_bg.png b/static/june_2007_style/blue/form_body_bg.png index 584f9a18132..cc721b330ea 100644 Binary files a/static/june_2007_style/blue/form_body_bg.png and b/static/june_2007_style/blue/form_body_bg.png differ diff --git a/static/june_2007_style/blue/form_title_bg.png b/static/june_2007_style/blue/form_title_bg.png index f83638cfc88..dd7599aa3b7 100644 Binary files a/static/june_2007_style/blue/form_title_bg.png and b/static/june_2007_style/blue/form_title_bg.png differ diff --git a/static/june_2007_style/blue/gray_bg.png b/static/june_2007_style/blue/gray_bg.png index ace3e79878b..f4f8fd60db2 100644 Binary files a/static/june_2007_style/blue/gray_bg.png and b/static/june_2007_style/blue/gray_bg.png differ diff --git a/static/june_2007_style/blue/masthead.css b/static/june_2007_style/blue/masthead.css index 2453c846da6..f206e7f1b44 100644 --- a/static/june_2007_style/blue/masthead.css +++ b/static/june_2007_style/blue/masthead.css @@ -24,8 +24,3 @@ a:link, a:visited, a:active { color: #eeeeee; } - -span.brand -{ - font-size:60%; -} diff --git a/static/june_2007_style/blue/masthead_bg.png b/static/june_2007_style/blue/masthead_bg.png index cd6ce134b44..afff035b4c3 100644 Binary files a/static/june_2007_style/blue/masthead_bg.png and b/static/june_2007_style/blue/masthead_bg.png differ diff --git a/static/june_2007_style/blue/menu_bg.png b/static/june_2007_style/blue/menu_bg.png index 16c4d5f170f..10cf2810a9e 100644 Binary files a/static/june_2007_style/blue/menu_bg.png and b/static/june_2007_style/blue/menu_bg.png differ diff --git a/static/june_2007_style/blue/ok_bg.png b/static/june_2007_style/blue/ok_bg.png index 3ba07fa901c..53783569f13 100644 Binary files a/static/june_2007_style/blue/ok_bg.png and b/static/june_2007_style/blue/ok_bg.png differ diff --git a/static/june_2007_style/blue/panel_header_bg.png b/static/june_2007_style/blue/panel_header_bg.png index 39f9520cb1f..899ffb3fb33 100644 Binary files a/static/june_2007_style/blue/panel_header_bg.png and b/static/june_2007_style/blue/panel_header_bg.png differ diff --git a/static/june_2007_style/blue/panel_layout.css b/static/june_2007_style/blue/panel_layout.css index 609c345618d..7189c5b28df 100644 --- a/static/june_2007_style/blue/panel_layout.css +++ b/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; diff --git a/static/june_2007_style/blue/panel_layout_ie.css b/static/june_2007_style/blue/panel_layout_ie.css index b40a9d99fd5..79307d0abe2 100644 --- a/static/june_2007_style/blue/panel_layout_ie.css +++ b/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 { diff --git a/static/june_2007_style/blue/popupmenu_callout_top.png b/static/june_2007_style/blue/popupmenu_callout_top.png index 4318e8eea51..9e3b35df6c1 100644 Binary files a/static/june_2007_style/blue/popupmenu_callout_top.png and b/static/june_2007_style/blue/popupmenu_callout_top.png differ diff --git a/static/june_2007_style/blue/warn_bg.png b/static/june_2007_style/blue/warn_bg.png index e621dc039a4..98b4cc8172c 100644 Binary files a/static/june_2007_style/blue/warn_bg.png and b/static/june_2007_style/blue/warn_bg.png differ diff --git a/static/june_2007_style/panel_layout.css.tmpl b/static/june_2007_style/panel_layout.css.tmpl index 3eead5bb8fa..812de1a9d0b 100644 --- a/static/june_2007_style/panel_layout.css.tmpl +++ b/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; diff --git a/static/june_2007_style/panel_layout_ie.css.tmpl b/static/june_2007_style/panel_layout_ie.css.tmpl index b40a9d99fd5..79307d0abe2 100644 --- a/static/june_2007_style/panel_layout_ie.css.tmpl +++ b/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 { diff --git a/static/scripts/galaxy.panels.js b/static/scripts/galaxy.panels.js index 8fbba3d15be..b249313a120 100644 --- a/static/scripts/galaxy.panels.js +++ b/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("
"); + 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 ) { diff --git a/static/scripts/pack_scripts.py b/static/scripts/pack_scripts.py new file mode 100755 index 00000000000..732eda31ee2 --- /dev/null +++ b/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 ) diff --git a/static/scripts/packed/cookie_set.js b/static/scripts/packed/cookie_set.js index b3b67e9aa18..3ec86bb5530 100644 --- a/static/scripts/packed/cookie_set.js +++ b/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}; \ No newline at end of file +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} \ No newline at end of file diff --git a/static/scripts/packed/galaxy.panels.js b/static/scripts/packed/galaxy.panels.js index 68c7bff6141..6f5da46ac99 100644 --- a/static/scripts/packed/galaxy.panels.js +++ b/static/scripts/packed/galaxy.panels.js @@ -1 +1 @@ -eval(function(p,a,c,k,e,r){e=function(c){return(c35?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| + |
| - + |