From 551df392ba9b44d4e45749e9273b22e53c45873f Mon Sep 17 00:00:00 2001
From: James Taylor <james@jamestaylor.org>
Date: Thu, 12 Jul 2007 18:27:58 +0000
Subject: [PATCH] Make new style work better with old layout and vice versa (so
 people with customized styles can still use the new layout). Changed the
 config parameter to enable the new layout to "use_new_layout" (since it has
 nothing to do with style!!!)

NEXT PERSON TO UPDATE TEST PLEASE ADD

[app:universe]
use_new_layout=true
---
 lib/galaxy/interfaces/root.py                 |   2 +-
 static/june_2007_style/base.css.tmpl          |  77 +++++++-----------
 static/june_2007_style/blue/base.css          |  77 +++++++-----------
 static/june_2007_style/blue/base_bg.png       | Bin 232 -> 232 bytes
 static/june_2007_style/blue/error_bg.png      | Bin 168 -> 168 bytes
 .../june_2007_style/blue/footer_title_bg.png  | Bin 334 -> 334 bytes
 static/june_2007_style/blue/form_body_bg.png  | Bin 178 -> 178 bytes
 static/june_2007_style/blue/form_title_bg.png | Bin 207 -> 207 bytes
 static/june_2007_style/blue/gray_bg.png       | Bin 169 -> 169 bytes
 static/june_2007_style/blue/history.css       |  12 +--
 static/june_2007_style/blue/masthead_bg.png   | Bin 128 -> 128 bytes
 static/june_2007_style/blue/menu_bg.png       | Bin 624 -> 624 bytes
 static/june_2007_style/blue/ok_bg.png         | Bin 168 -> 168 bytes
 .../june_2007_style/blue/panel_header_bg.png  | Bin 144 -> 144 bytes
 static/june_2007_style/blue/warn_bg.png       | Bin 169 -> 169 bytes
 static/june_2007_style/history.css.tmpl       |  12 +--
 static/june_2007_style/make_style.py          |   1 +
 static/light_hatched_style/blue/base_bg.png   | Bin 297 -> 279 bytes
 static/light_hatched_style/blue/error_bg.png  | Bin 183 -> 168 bytes
 .../blue/footer_title_bg.png                  | Bin 342 -> 334 bytes
 .../blue/form_title_bg.png                    | Bin 550 -> 503 bytes
 static/light_hatched_style/blue/gray_bg.png   | Bin 184 -> 169 bytes
 static/light_hatched_style/blue/history.css   |   6 ++
 static/light_hatched_style/blue/masthead.css  |   2 +-
 .../light_hatched_style/blue/masthead_bg.png  | Bin 459 -> 427 bytes
 static/light_hatched_style/blue/menu_bg.png   | Bin 1798 -> 1248 bytes
 static/light_hatched_style/blue/ok_bg.png     | Bin 183 -> 168 bytes
 static/light_hatched_style/blue/tool_menu.css |   8 ++
 static/light_hatched_style/blue/warn_bg.png   | Bin 183 -> 169 bytes
 static/light_hatched_style/history.css.tmpl   |   6 ++
 static/light_hatched_style/masthead.css.tmpl  |   2 +-
 static/light_hatched_style/tool_menu.css.tmpl |   8 ++
 templates/history.tmpl                        |   2 +-
 templates/index_frames.tmpl                   |   2 +-
 templates/tool_menu.tmpl                      |   2 -
 universe_wsgi.ini.sample                      |   7 +-
 36 files changed, 108 insertions(+), 118 deletions(-)

diff --git a/lib/galaxy/interfaces/root.py b/lib/galaxy/interfaces/root.py
index ee134d4fdf9..01937f5ce0f 100644
--- a/lib/galaxy/interfaces/root.py
+++ b/lib/galaxy/interfaces/root.py
@@ -31,7 +31,7 @@ class Universe(common.Root):
         #         trans.ensure_valid_galaxy_session()
         #         result = trans.fill_template('index_frames.tmpl', mode=mode)
         #         return [ result ]
-        if trans.app.config.get( "new_style_june_2007", "false" ) == "true":
+        if trans.app.config.get( "use_new_layout", "false" ) == "true":
             return trans.fill_template( "root/index.tmpl" )
         else:
             return trans.fill_template( "index_frames.tmpl" )
diff --git a/static/june_2007_style/base.css.tmpl b/static/june_2007_style/base.css.tmpl
index 469e3d700df..eb0aaa25ee3 100644
--- a/static/june_2007_style/base.css.tmpl
+++ b/static/june_2007_style/base.css.tmpl
@@ -48,12 +48,12 @@ div.toolFormTitle
 
 div.toolParamHelp
 {
-  font-style: italic;
+  color: #666;
 }
 
 div.toolFormBody
 { 
-  padding: 5px;
+  padding: 10px;
   background: $form_body_bg_bottom;
   background-image: url(form_body_bg.png);
   background-repeat: repeat-x;
@@ -79,18 +79,38 @@ div.toolHelpBody
 	overflow: auto;
 }
 
-select
+/* Forms */
+
+div.form-row 
 {
-    max-width: 300px;
+    margin-bottom: 1em;
 }
 
+div.form-row label
+{
+    font-weight: bold;
+    display: block;
+    margin-bottom: .1em;
+}
+
+select, input, textarea
+{
+    font-size: 115%;
+}
+
+select, textarea, input[type="text"], input[type="file"]
+{
+    max-width: 400px;
+}
+
+/* Messages */
+
 .errormessage, .warningmessage, .donemessage, .infomessage, .welcomemessage
 {
     padding: 10px;
     padding-left: 52px;
     min-height: 32px;
-    border-top: 1px solid $error_message_border;
-    border-bottom: 1px solid $error_message_border;
+    border: 1px solid $error_message_border;
     background-color: $error_message_bg;
     background-image: url(error_message_icon.png);
     background-repeat: no-repeat;
@@ -130,8 +150,7 @@ select
     padding: 5px;
     padding-left: 25px;
     min-height: 25px;
-    border-top: 1px solid $error_message_border;
-    border-bottom: 1px solid $error_message_border;
+    border: 1px solid $error_message_border;
     background-color: $error_message_bg;
     background-image: url(error_small.png);
     background-repeat: no-repeat;
@@ -222,45 +241,5 @@ div.odd_row
 }
     
 #footer {
-  position: fixed;
-  background: $footer_bg;
-  width: 100%;
-  left: 0px;
-  bottom: 0px;
-  color: white;
-  z-index:10000;
-  opacity:0.9;
-  filter:alpha(opacity:90);
-}
-
-#footer a {
-    color: white;
-}
-
-.footerheader
-{
-  padding: 5px;
-  text-align:center;
-  background-image: url(footer_title_bg.png);
-  background-position: bottom right;
-}
-
-.footermenu
-{
-  /*border-top: solid white 1px; */
-}
-
-.footermenuitem
-{
-    margin-top: 5px;
-    margin-bottom: 5px;
-    margin-right: 5px;
-    margin-left: 25px;
-    display: list-item;
-    list-style: square outside;
-}
-
-.footermenumessage
-{
-    margin: 5px;
+  display: none;
 }
\ No newline at end of file
diff --git a/static/june_2007_style/blue/base.css b/static/june_2007_style/blue/base.css
index 0f6e46350ae..83832c13944 100644
--- a/static/june_2007_style/blue/base.css
+++ b/static/june_2007_style/blue/base.css
@@ -48,12 +48,12 @@ div.toolFormTitle
 
 div.toolParamHelp
 {
-  font-style: italic;
+  color: #666;
 }
 
 div.toolFormBody
 { 
-  padding: 5px;
+  padding: 10px;
   background: #FFFFFF;
   background-image: url(form_body_bg.png);
   background-repeat: repeat-x;
@@ -79,18 +79,38 @@ div.toolHelpBody
 	overflow: auto;
 }
 
-select
+/* Forms */
+
+div.form-row 
 {
-    max-width: 300px;
+    margin-bottom: 1em;
 }
 
+div.form-row label
+{
+    font-weight: bold;
+    display: block;
+    margin-bottom: .1em;
+}
+
+select, input, textarea
+{
+    font-size: 115%;
+}
+
+select, textarea, input[type="text"], input[type="file"]
+{
+    max-width: 400px;
+}
+
+/* Messages */
+
 .errormessage, .warningmessage, .donemessage, .infomessage, .welcomemessage
 {
     padding: 10px;
     padding-left: 52px;
     min-height: 32px;
-    border-top: 1px solid #AA6666;
-    border-bottom: 1px solid #AA6666;
+    border: 1px solid #AA6666;
     background-color: #FFCCCC;
     background-image: url(error_message_icon.png);
     background-repeat: no-repeat;
@@ -130,8 +150,7 @@ select
     padding: 5px;
     padding-left: 25px;
     min-height: 25px;
-    border-top: 1px solid #AA6666;
-    border-bottom: 1px solid #AA6666;
+    border: 1px solid #AA6666;
     background-color: #FFCCCC;
     background-image: url(error_small.png);
     background-repeat: no-repeat;
@@ -222,45 +241,5 @@ div.odd_row
 }
     
 #footer {
-  position: fixed;
-  background: #023858;
-  width: 100%;
-  left: 0px;
-  bottom: 0px;
-  color: white;
-  z-index:10000;
-  opacity:0.9;
-  filter:alpha(opacity:90);
-}
-
-#footer a {
-    color: white;
-}
-
-.footerheader
-{
-  padding: 5px;
-  text-align:center;
-  background-image: url(footer_title_bg.png);
-  background-position: bottom right;
-}
-
-.footermenu
-{
-  /*border-top: solid white 1px; */
-}
-
-.footermenuitem
-{
-    margin-top: 5px;
-    margin-bottom: 5px;
-    margin-right: 5px;
-    margin-left: 25px;
-    display: list-item;
-    list-style: square outside;
-}
-
-.footermenumessage
-{
-    margin: 5px;
+  display: none;
 }
\ No newline at end of file
diff --git a/static/june_2007_style/blue/base_bg.png b/static/june_2007_style/blue/base_bg.png
index b2ed02935794b997c7541288ac9fc7366173ec3a..19ca36f9ee7c77bfd96eca57c85c56f744e92f64 100644
GIT binary patch
delta 18
ZcmaFC_=0hQ9S4t)1n&*Oveb!givT(C1}Ojl

delta 18
acmaFC_=0hQ9S5tRiO4Tjmm3q^76AY}Mh2Sz

diff --git a/static/june_2007_style/blue/error_bg.png b/static/june_2007_style/blue/error_bg.png
index a68067de6966a56c77f33d2129757acdf3c1f6c6..9e537638d5c6ed9c2af520f44b9ef01203e71eef 100644
GIT binary patch
delta 18
ZcmZ3%xPozl9S4t)1fQdX`u&M+NdPUM1qA>A

delta 18
ZcmZ3%xPozl9S5tRiO4Tjmm3q^k^nP?1=|1s

diff --git a/static/june_2007_style/blue/footer_title_bg.png b/static/june_2007_style/blue/footer_title_bg.png
index 2c258128a60dc2b8161106708cda4733d4f203cd..577046d7f3910e0e8d0ac4dfa8ca3911e8e54897 100644
GIT binary patch
delta 19
acmX@dbdG6)9S4t)1fQdX`u&Y=9E<=r>jfGB

delta 19
acmX@dbdG6)9S5tRiO4Tjmm3@1I2Zvws0Hu<

diff --git a/static/june_2007_style/blue/form_body_bg.png b/static/june_2007_style/blue/form_body_bg.png
index 0cf6caf7fb213b8b9ecba2157a5b7e589ef8eaf5..2d594ab7afeba5aa8cc4c2c86f98aa8741c6e86e 100644
GIT binary patch
delta 18
ZcmdnQxQTIs9S4t)1n&*Oveb!gIRG+`1&06t

delta 18
ZcmdnQxQTIs9S5tRiO4Tjmm3q^asV{s1^EB~

diff --git a/static/june_2007_style/blue/form_title_bg.png b/static/june_2007_style/blue/form_title_bg.png
index 4a281d5289e256d76a6c05c7b7772521c04e2a8a..56788e39fe28ff3570e692e9fc081c96780d9654 100644
GIT binary patch
delta 18
ZcmX@lc%E^B9S4t)1fQdX`u&M+od7cQ1$qDg

delta 18
ZcmX@lc%E^B9S5tRiO4Tjmm3q^IsrJ_22cP1

diff --git a/static/june_2007_style/blue/gray_bg.png b/static/june_2007_style/blue/gray_bg.png
index 42247901a1b8a3ae9ceaae076cd8c126fb2d22f1..2c59cafd6ffd29a11eed352e477ffcc6f61eb60b 100644
GIT binary patch
delta 18
ZcmZ3<xRP;#9S4t)1fQdX`u&M+$p9_F1qc8D

delta 18
ZcmZ3<xRP;#9S5tRiD)lViQh!GWB@O01r-1Q

diff --git a/static/june_2007_style/blue/history.css b/static/june_2007_style/blue/history.css
index d0cbbb0e35b..3a2243bf20d 100644
--- a/static/june_2007_style/blue/history.css
+++ b/static/june_2007_style/blue/history.css
@@ -5,9 +5,7 @@ body
     background-image: url(menu_bg.png);
     background-repeat: repeat-x;
     background-position: top;
-    margin-top: 5px;
-    margin-right: 0;
-    margin-left: 0;
+    margin: 5px;
     border: 0;
     padding: 0;
 }
@@ -20,7 +18,8 @@ a
 div.historyLinks
 {
     padding: 5px;
-    margin: 5px;
+    margin-top: 5px;
+    margin-bottom: 5px;
     padding-right: 5px;
     padding-left: 5px;
     margin-bottom: 5px;
@@ -28,8 +27,9 @@ div.historyLinks
 
 div.historyItem
 {
-    margin: 5px;
-    margin-right: 0px;
+    margin-right: -5px;
+    margin-top: 5px;
+    margin-bottom: 5px;
     padding: 5px;
     padding-right: 11px;
 
diff --git a/static/june_2007_style/blue/masthead_bg.png b/static/june_2007_style/blue/masthead_bg.png
index e81e2f32c8a053117a3d0a3d9d4334dade70c6e7..0fa04cf0439f083f4e74162d9b6a3ab00df35383 100644
GIT binary patch
delta 18
ZcmZo*Y+#&V$H5~c!RIKUet)8y6#ytF1dRXy

delta 18
ZcmZo*Y+#&V$H6LSBJzvX<;FxeD*!GI1!DjJ

diff --git a/static/june_2007_style/blue/menu_bg.png b/static/june_2007_style/blue/menu_bg.png
index a181ef9000d85878c8142b9e4a9dc4ccdab4ef06..6847a88b2603321362eaad12c747828b42c2d11c 100644
GIT binary patch
delta 19
acmeys@_}W79S4t)1n&*Oveb=kT1)^zG6m@X

delta 19
acmeys@_}W79S5tRiO4Tjmm3@1w3q-x`3746

diff --git a/static/june_2007_style/blue/ok_bg.png b/static/june_2007_style/blue/ok_bg.png
index dd0f2731d641aac0a64a41481aaa760010186840..838e2abdd6c2dc417b8e5516af855914b9820979 100644
GIT binary patch
delta 18
ZcmZ3%xPozl9S4t)1fQdX`u&M+NdPUM1qA>A

delta 18
ZcmZ3%xPozl9S5tRiO4Tjmm3q^k^nP?1=|1s

diff --git a/static/june_2007_style/blue/panel_header_bg.png b/static/june_2007_style/blue/panel_header_bg.png
index 37ce50151b8615ef483b2138c1ed4ec4d4b8d456..195c9dade86225248165c8e8a4873afc0d361c7b 100644
GIT binary patch
delta 18
ZcmbQhIDv739S4t)1n&*Oveb!gUH~oW1t9<c

delta 18
ZcmbQhIDv739S5tRiEv8d#p;P}UH~tV1&9Cu

diff --git a/static/june_2007_style/blue/warn_bg.png b/static/june_2007_style/blue/warn_bg.png
index 4ed6df05a5cb80b86344052e1b362bb4b29ae3ab..30aa1ea5204c57839aa43ca89895bdeb55acc0fb 100644
GIT binary patch
delta 18
ZcmZ3<xRP;#9S4t)1fQdX`u&M+$p9_F1qc8D

delta 18
ZcmZ3<xRP;#9S5tRiD)lViQh!GWB@O01r-1Q

diff --git a/static/june_2007_style/history.css.tmpl b/static/june_2007_style/history.css.tmpl
index 901a2fa82ab..30c285b20fb 100644
--- a/static/june_2007_style/history.css.tmpl
+++ b/static/june_2007_style/history.css.tmpl
@@ -5,9 +5,7 @@ body
     background-image: url(menu_bg.png);
     background-repeat: repeat-x;
     background-position: top;
-    margin-top: 5px;
-    margin-right: 0;
-    margin-left: 0;
+    margin: 5px;
     border: 0;
     padding: 0;
 }
@@ -20,7 +18,8 @@ a
 div.historyLinks
 {
     padding: 5px;
-    margin: 5px;
+    margin-top: 5px;
+    margin-bottom: 5px;
     padding-right: 5px;
     padding-left: 5px;
     margin-bottom: 5px;
@@ -28,8 +27,9 @@ div.historyLinks
 
 div.historyItem
 {
-    margin: 5px;
-    margin-right: 0px;
+    margin-right: -5px;
+    margin-top: 5px;
+    margin-bottom: 5px;
     padding: 5px;
     padding-right: 11px;
 
diff --git a/static/june_2007_style/make_style.py b/static/june_2007_style/make_style.py
index c0d6da6571a..a7371b8fb8d 100755
--- a/static/june_2007_style/make_style.py
+++ b/static/june_2007_style/make_style.py
@@ -17,6 +17,7 @@ templates = [ ( "base.css.tmpl", "base.css" ),
               
 images = [ 
            ( "./gradient.py 9 30 $panel_header_bg_top - $panel_header_bg_bottom 0 0 $panel_header_bg_bottom 1 1", "panel_header_bg.png" ),
+           ( "./gradient.py 9 30 $panel_header_bg_bottom - $panel_header_bg_top 0 0 $panel_header_bg_top 1 1", "panel_header_bg_pressed.png" ),
            ( "./gradient.py 9 1000 $menu_bg_top $menu_bg_hatch $menu_bg_over 0 0 $menu_bg_over 1 1", "menu_bg.png" ),
            ( "./gradient.py 9 1000 $base_bg_top - $base_bg_bottom 0 0 $base_bg_bottom 1 1", "base_bg.png" ),
            ( "./gradient.py 9 500 $form_body_bg_top - $form_body_bg_bottom 0 0 $form_body_bg_bottom 1 1", "form_body_bg.png" ),
diff --git a/static/light_hatched_style/blue/base_bg.png b/static/light_hatched_style/blue/base_bg.png
index 697db74ad87dbbf66f8ece592353c5b0283d521d..7bc65774ab5348e34b386c1b5794b864efe61aa1 100644
GIT binary patch
literal 279
zcmeAS@N?(olHy`uVBq!ia0vp^oD2-iFF4qMES|(GtAG?+lDE4H!+#K5uy^@npa^@3
zr>`sfb#@*h5!p;(O<thTPEQxdkcv5PuN~xUFkoPDRQ?v971g22V!!Uto$3este?fa
zzVYS`BS+JM`-`)C%-<_;Gy##E;#ww00T#!AmJ|*a5JPa1B9IhdarJ0(05L=qC8?y~
u!t{w@jUZb!oQzmNb}!&KDe&U>3$|C=xZmA1=-&+V1cRrmpUXO@geCxP=uFW7

delta 244
zcmbQvw32CpZ9S``ur>4Cqnmy*Ffg3<ba4!+nDh49M&1JoJg$x%H|j615inx%WofLx
zqW<t$)w=J0zZg|q=cwt9dVhFg+Ibeo3pH1==KhpraTH*2%%1SX8At`NOse5%QsC%v
zn8Xhf-mPrfuE5c>fJ5ackSD;R>vT>4E}sh&67=|__@d&9m*o4O^6c#jFM=ToMH*G)
zfyOi`L5vmH!eQwQ<SJy8FL?$s2u&Wv+T)AGk6+{aC>K$E2IwyaPgg&ebxsLQ05t7Z
A)Bpeg

diff --git a/static/light_hatched_style/blue/error_bg.png b/static/light_hatched_style/blue/error_bg.png
index 984d1663b142a86ae88198d611afe6fe26bb808a..52d89b5869fbe8da57fc7757b78445e3fc660a31 100644
GIT binary patch
delta 114
zcmdnaxPozlZ8kfPkciv|sfz6k3=CeLE{-7)t#8jA<YZ9bVL9mXX1`JOC80_4m5Sdt
z-oBIlR>Mq-!BKz(imqSmIaB}MB=eHUtX&?Hmzg7&YF38ktX(`zCY3-_89ZJ6T-G@y
GGywo)bSb_7

delta 129
zcmZ3%xSer=Z56Aeur&+wLiH#H28Kva7srr@*0<L;@*Ys&VQ`d5{eSd^<~a_x6Ru5t
zzf$Z=ju@x+J&F-+P~d2Spas4q>C^sSI_jysC_U)$Ta(ORPpo`r)$Q?{yzKI9n?^O?
fwXaQN?|os~6~xgtB~;D;XbFR-tDnm{r-UW|k%cpu

diff --git a/static/light_hatched_style/blue/footer_title_bg.png b/static/light_hatched_style/blue/footer_title_bg.png
index 77586eca6f57cf0dc5c0296c5e0a32ec757803ef..0d271f83951c6a69e3de6ba0054dd72683655a7a 100644
GIT binary patch
delta 282
zcmV+#0p<SI0?q=EJ%0xb5)>V26DbV<008hwL_t(IjqT07N&`_4hT(U{ldvo?#Hfg7
z5hbw@Q=||y_uzeNVPPRys3;N?QB+a{*`G5O+s>NS!tP=ChF5fQW&rW-934$@y>u{|
zB6Qa6w*i1I8~o?~Y%b{V1S}HoFVNws>p)o$A1~3pW11|aJ%7{PNu7AQ!gJ8U5mW_n
zc8z9Z*TJd+d%i(-4r#KGbWFAm0I=6vJc|s*24L?G$i_aN167WF%#eOYlZ94d(%Y`T
zzFzPw($DJL{0-@D;yF+j*y0mO*J!e^5{#q^0N-;w3(2YhkT0N};#p`VMwvrs*GI<!
gVyM=~81eiA&l7_mf?jNiRR91007*qoM6N<$g5M{9;s5{u

delta 290
zcmV+-0p0%20@ebMJ%0rm6FUS0p(k1Z008(&L_t(Ijor{aOT$nU#_|6XV~nv{C8$tB
zMT>*bqJu;I4t{V42f@KXR1_(w6jXeRX?h&4Q@CkXar<$2&V9H?+CR1!<MZkS^@adg
z#Q_Zg^@fO6YO?|WK~vzjZg$`g*Bucz*Zt#ThLi<%bBeYPseiLb)=XOmZtM08pF?GR
zqOu^rKS$ZXy-;yT`At5$K%G4|^jO5prp;Yf@o<UHQZ_IEd%8yJJNWE=H@-t@mpY4R
z(OB&O!1D;7McOq0ULRp)1D`|60^Y{ZN~yD$n>UiS+xmFHXOXlm0H$B>5HGnv#Ue_K
oNe<zH8+t4xBO3_aa5}-~AN@EIi4d&b;{X5v07*qoM6N<$f<38%eE<Le

diff --git a/static/light_hatched_style/blue/form_title_bg.png b/static/light_hatched_style/blue/form_title_bg.png
index 0fc30d583ad73192881d4d66c3438761ee4ed5ae..2a35b6d4af3ff7e9b7c0f1bbb78dbe0421c73a54 100644
GIT binary patch
delta 452
zcmV;#0XzPt1os1wJ%0xb5)>V26DbV<00EgvL_t(IjeXBclG`v0MbQfs2eu?icJF@=
zy_)PHvxr}*N6CQnr@D#EPQ4=VK>7Xa^Dn?2{&3swjI1E+ap$&uVA+MZbKgFmQzPsD
zHax5dgt)gG47(5mTR$?yeQ4dbJBScce>|`XLX3giddIR0DSxo7y&~;H>$bMF@$q<I
z1&ArIt~V^Zm?B#bLkvS}gYbI%(~1Z&$5vt3r4(6xTboiCT35dzK*|xzy)Lo(4a+V)
z!nY0It-epClCZ38D&dzE%PyD9>R;i=+NOk*GnN&ETwdYGE|<*GZ^$_ft$y(c^r^8G
z5ppf~#bdeE&40dClr*$1%L*ctTCl7jl#-cek7ZYCVVV1nY93mbc>$qS7;bg7FwYB?
zT|H{Q0ctHn>pU$8(n7<n?kLPt|Ixs%9&PGbF|bZkJF*@X%PJxqM{PG4cCRU@M;W@+
ziBQk}cwhxMj>>eMvFwiXc!u??L+f;%L4@byffX9A*F71_u3_pojI9mAd7fBSd4!h<
u%kKO-pKH&z>UZnq(${{SSXSgMH2e=spU4!2F&vNp0000<MNUMnLSTZ-M%g|9

delta 499
zcmV<P0Sx~41EvI!J%0rm6FUS0p(k1Z00GEJL_t(IjdjmaZk;d?h2eijZc@Nt=>FHx
z-E<3$R8<K!#^yfJ2b1LH)_(gm@|iQ1mtQ~6@0`56d6vZi@b+Lm&y(M;o_ThhC%jf{
z)-|yFm;qSdeAT)v4guCR(6S=Jx^Cr$hRwQe%-50Y8miWLc7H%gwX7oGePCH8S~jbX
zR|;0YRju>vcoxC?jd`A+Vg>l)BksDvS8TlBnB8<$gsRK$MDXFdp<)HWhlq1mMa3qB
z4d+Gxg0EYhn-GK$A}wp_EyI@0dkUab|8Je9iDw{$$TVH|JXl5G@3!OIh={ONY{IsG
zrnXqMPSXfis()pLf^iyY*?bOR3$bdQCW`=Z+iAJf#l$#TS~l@xSW-2s9Y>xJVoca;
z!=qIMUaxH;W%y_<7)nLMYR3UYh<m1G1!0dFYX@33`~E(JxTmVs+PjK|OWl4~QL*lO
zVi<Y=T2^Z<Pa>prVC{fZtN?4uS4!9`HhVf4hT*EnRcz~fDy4&#RRmJX3`0lDCZ*fQ
zFFrSXwf22i*5-qj6%lei==+|QP0j~hU)JWFtJc2n`F59*iWOk{xPj}zSDSp?=<bF!
pYuA-u<b0!L6@=rs(RUp!{{s#a&<U{bB!~b2002ovPDHLkV1mzD_GAD6

diff --git a/static/light_hatched_style/blue/gray_bg.png b/static/light_hatched_style/blue/gray_bg.png
index 6521682ffc4902027ff36807b7d0c9da1ac0cf11..ed3929364499515da4ed85c40ec2681cc7c852d2 100644
GIT binary patch
delta 115
zcmdnNxRP;#Z4Nt+kciv|sfz6k3=H0$E{-7)t#2=G<YiFcVRme~QGaC(gYpt*mpQK|
z$JC@elRKKms=(0%MK8>^C_Q>4yF}Jx%j=#k)j}sPiDzC1qwgwKp7&WB-R8*h0*z(x
MboFyt=akR{0DRagvj6}9

delta 130
zcmZ3<xPx(mZ8fW;ur&+wLiH#H28Jk47srr@*0<L;avm_?aXqM!^556C*{I2<>jUre
zUk*a+i`H)aC3Vl1k)ufgihgy>d-pM3YUhu8rJ-LRTX;-so~Sd?W15GGx5}iaF-u}q
fCaDUkrd2ZD4&!KA_V=+o&=v+yS3j3^P6<r_)k`ym

diff --git a/static/light_hatched_style/blue/history.css b/static/light_hatched_style/blue/history.css
index b02955dc6bf..2bd8dd51a27 100644
--- a/static/light_hatched_style/blue/history.css
+++ b/static/light_hatched_style/blue/history.css
@@ -17,6 +17,12 @@ a
     color: #base_text;
 }
 
+div.historyLinks
+{
+    padding: 5px;
+    margin: 5px;
+}
+
 div.historyItem
 {
     padding: 5px;
diff --git a/static/light_hatched_style/blue/masthead.css b/static/light_hatched_style/blue/masthead.css
index 5138c5e9df4..635f2ee43ae 100644
--- a/static/light_hatched_style/blue/masthead.css
+++ b/static/light_hatched_style/blue/masthead.css
@@ -11,7 +11,7 @@ body
 
 div.pageTitle
 {
-    font-size: x-large;
+    font-size: 160%;
     font-weight: bold;
 }
 
diff --git a/static/light_hatched_style/blue/masthead_bg.png b/static/light_hatched_style/blue/masthead_bg.png
index efd2845c369dfc5d36c2539f8982ff8d8ef9b4be..32118cc15d175d673596a1ff305d24194ce7836c 100644
GIT binary patch
delta 375
zcmV--0f_#~1FHj&J%0xb5)>V26DbV<00B)&L_t(IjqS~AE5uO{fbnOJ!>(Oxv9WSp
zmy{48@g00`l9VJR_ggNxwUNvI&v<dXoWmE`cfY2YdBiQOD?m8fz)h}U`rn1gHH40e
z{<Q$${#$6~nz?4~*B({E@g{C!m6U~IkGk=dcy+RcW$$WB5Pvel**31WY}%t4;cN$2
zTO?(n(4}r<J|-@9vFzQ@Y<zpUhZ~+V?KNcR^*%B<L&`$Fq%trKfZiNn*-QTvgbcks
zBxO%%pm)beb%K<ITv4TWEG8aKvFxQX65l?aBb8Cpo{*tWS4htgDGP1wDqRCH@p6M@
zFP+tR^?Hkx`*2OiT>Ty?^^vmRb1J1uOw=E-EK;s2fWAE=#cnLe-1{q1D3h|#;+1>}
z06ywi7TP-%fX{cx6|n3H8GL_0Yo3$^af)w?SB)<$3oWfN7aHI^mg6T4ATACK{{W0G
V?be%jd@uk2002ovPDHLkV1m>GtW5v_

delta 408
zcmV;J0cZZJ1Iq)DJ%0rm6FUQ)#j^PT00C`DL_t(IjqT7~OH@%5hw<lsW;?IxOitQ}
zuVqD$BB6wRhdy`&5fMQ|saaxJmL%rr%-+k3?M=fP=f;aJy!)|O>pYw-t-Y`+#_8vm
zXn7L=8*ssh1ubtPZnf>I1%P7I!e#F2h5tDBoa*S@&12p?=6`kOCQbLA<>B@#JO?dq
zP)U*Q&TF)^4k=;-4x~Qa-8X3AX&yQj^_FR2Ehl#0;yGw;C0~7ehvrsY2U5iL-lN$k
z46~?Bm}Va5#Qq072i<*`ufBgooky;7?%)%ee!wt`O2agDKPP@{;W?<iL`ad|;TP0i
z%wHIA!20wKzkj0kJXpjWi*n7lJqrN8_wXEOb|6JK+K1MR>p+U|=Kv<A8D<eG#`v9_
zIR1%e(d-xiC%>REiRYaAdj$0s!z@Z;Ms+-2b&v5Z>P;(v)IEV}<8t9&2T~-RpF+8o
z6OM%nW2};|dS`eRp`8CN_MsH;EQ*q02~^~v;|rWk+7Y<wmrmIL0000<MNUMnLSTX*
CZN|g^

diff --git a/static/light_hatched_style/blue/menu_bg.png b/static/light_hatched_style/blue/menu_bg.png
index 9004e8ef858859236fffe6da28be2e9c01fd4f4a..363031cf958a58f7da691c05f1976edcc2a5067c 100644
GIT binary patch
delta 1203
zcmYL|eNfVO9LLdOE+T45c^YOd9}a8k4Mhpl+m`3F@}@?(X<TMvDDn_KP>4TuQyb>P
z={&@s)(&M-YUL^lSX_!W3)o~PQ`7kX&UvD{RLm##`?2%({p0)J`}6RAy+7rsKX=p~
z2V9V@XfK)@b{7n`y)^d3Cug|gxyISV;ov=GHTVE&nd|!tn>EG??4jnV=f2?^A5<<~
z^68l2)-|X%@+_}BfPU+@L#=B|+0R^x$DWm}@eVe}B1Xox`M_bt(&F*WZMFps^)B|B
zl88?~od|<{j);hWO<`^wl96_Ex|K=5wYNIarC|w4%W@8k;8((<zP=x5%b(PIw2$7?
zRH{&C;9fgwX)Yw#mpt{gMtKF{a%zguYQ5SfK>zhbv@t&Pl;0O-%$M!6t-OGGy%Xz_
z>(MY+opVjilAG868U~XGY8nkrV-cURyD&B@(gu`;ah^;SeBAs}Eg7%gpqA^m<C-hg
z=l)Qb>vZ3>m|Yc5(s1BPM}@mmQ<8ldk<+puSx!Outf2mBu7Di<cim8$XZ7ZK8csH|
z+N2ZvVOjihlhTggbh_JyaU{0wa^oZ79mH6BPG~>{Exan+z8JE4>&ktF%pcEbqT&GX
zmul!|K}l;jp%?cHZCEmXY@(18Gel{4M4@3U8a7~mATs9WX{qt`XvI@GyMOQ!o*2R3
zs@@RZdh+m(eL_}_+LKEXXv-p_qBxJ!&spbsN_a(7+-r2V;TCA7RO26b=0n*_Z_7P)
zj9h^JRRCHKn5=>!Nn9#-Klw<JKO{mHAV#vZ)Hq`nJeBf5)b9h2yn*HG!VF)G1g~iy
zwzU|8YgEK8ul#AuJ&N~oL%(^Hfl(|q>5`N7xVuArV6a+ra>uMa6p{IYHqeD3w6~oU
z3e{($5sM?QHd#4uBF#5w%A|^&4JJCEH~{f3C&C$>pwYBWr=s=qkl}^+q}3+o&D)B!
zYF<GA+ueN~Z~19X&w@{`=MRrI|G*^U8OjV$p@jboWI_u1V-S(aF=wxu*p&y`N$i_R
z4@+_|(mzv~tZ`bk>Ym6LA^{Ecfwvev{Q>@IUp?VwY`jfHq=lMMMpjJEyFv1rNGRa(
zGeD^8Vh7YB3IsLxDtGm{N8(rJU?>9RZ*^X@Y-&nJ2#RA0w=Ywp-X^k{Ou8jRBDoJW
z(Cf3ri=hqS(_BBo@dbI|j=|S=O32MS^<kM8lt;1(<m`E19*X(Oa@AI3=jWGhc>EVx
zx|pQRAMCXv2Y0!zs)pGPrVt)RFNlZX!ZlFi>d`Comc`JmK;I3xo}E(F14feV?G06K
zJY~8b8tVi*h+X(6!QP1%I}UG3@hI@hST;$j0WLbPSUd##EsBCnMUYBF(#~Iu6Y_{%
zUy_jINx1;L0lD)v(<xe=GigBcu#7a}=Vs-^4}(MP_0O9@cL;v>eb^O(nX`dw6MCVD
zvQP^;1B%(WF(DnO4axc5@W!M4u%0lQ5WjmZlVY`^CnC-(kL+~;L41Qc3cPm!(aEZw
ncAZTlYe@q|LHbw(GHP+Rx({<qNC%u?;ERopKhgf_`O<#@EDm8s

delta 1757
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

diff --git a/static/light_hatched_style/blue/ok_bg.png b/static/light_hatched_style/blue/ok_bg.png
index 43e6ababa7dc3d75ac6e6031cbb316781c6b386e..42cfd91d9d902ad5c9c8cef738634ce2953bafba 100644
GIT binary patch
delta 114
zcmdnaxPozlZ8kfPkciv|sfz6k3=CeLE{-7)t#8jA<YZ9bVL9mXX1`JOC80_4m5Sdt
z-j1n$t6`?a;3&WXMb|H$IZ^-KB=eHUtX&?Hmzg7&YF37_tX-_ZA-{p9GI+ZBxvX<a
GXaWFTdn#N2

delta 129
zcmZ3%xSer=Z56Aeur&+wLiH#H28Kva7srr@*0<L;@*Ys&VQ`d5{eSd^<~a_x6Ru5t
zzf$Z=j?|>}J&F-+P~d2Spas4q>C^sSI_hb-C_U)$Ta(ORPpo`r)$Q?{yzKI9n?^O?
fwXaQN?|os~Wx>&=_Hcs`&=LkuS3j3^P6<r_uZ%Qi

diff --git a/static/light_hatched_style/blue/tool_menu.css b/static/light_hatched_style/blue/tool_menu.css
index c6f2dc6c7ea..47591adc925 100644
--- a/static/light_hatched_style/blue/tool_menu.css
+++ b/static/light_hatched_style/blue/tool_menu.css
@@ -15,6 +15,14 @@ hr
     margin-top: 0px;
 }
 
+div.toolSectionPad
+{
+    margin: 0;
+    padding: 0;
+    height: 5px;
+    font-size: 0px;
+}
+
 div.toolSectionDetailsInner
 { 
   margin-left: 10px;
diff --git a/static/light_hatched_style/blue/warn_bg.png b/static/light_hatched_style/blue/warn_bg.png
index 03c638d3a7e3aa57f421b65677a65f1cf2459b58..f824057a31792dc9eceaf2645bbafe43c1df78f4 100644
GIT binary patch
delta 115
zcmdnaxRP;#Z4Nt+kciv|sfz6k3=H0$E{-7)t#8k5<UL@(!|ZtL!@tR?>Xj@jy#-`m
zGyhoqYNg3-*#-rUCJ0(^{i5f!`u8T8mqdJnmv~+_M=%9qZCzQHi0v|!2O7)Z>FVdQ
I&MBb@0Q=S}@Bjb+

delta 129
zcmZ3<xSer=Z56Aeur&+wLiH#H28Kva7srr@*0<L;@*Ys&VQ>^q{eN_m@Hq~*6Ru5t
zzf$Z=dMxMnJc<!*P~d2Spas4q>C^sSI_fF7I6dg`Ta(ORPpo`r)$Q?{yzKI9n?^O?
fwXaQN?|or9YQeGKhd@st&=LkuS3j3^P6<r_fuuA5

diff --git a/static/light_hatched_style/history.css.tmpl b/static/light_hatched_style/history.css.tmpl
index 97207ce7cf9..f62dad98ec2 100644
--- a/static/light_hatched_style/history.css.tmpl
+++ b/static/light_hatched_style/history.css.tmpl
@@ -17,6 +17,12 @@ a
     color: #base_text;
 }
 
+div.historyLinks
+{
+    padding: 5px;
+    margin: 5px;
+}
+
 div.historyItem
 {
     padding: 5px;
diff --git a/static/light_hatched_style/masthead.css.tmpl b/static/light_hatched_style/masthead.css.tmpl
index 2df3f4f6f45..fdf739ec916 100644
--- a/static/light_hatched_style/masthead.css.tmpl
+++ b/static/light_hatched_style/masthead.css.tmpl
@@ -11,7 +11,7 @@ body
 
 div.pageTitle
 {
-    font-size: x-large;
+    font-size: 160%;
     font-weight: bold;
 }
 
diff --git a/static/light_hatched_style/tool_menu.css.tmpl b/static/light_hatched_style/tool_menu.css.tmpl
index 519653ed0bb..a7e20b744d2 100644
--- a/static/light_hatched_style/tool_menu.css.tmpl
+++ b/static/light_hatched_style/tool_menu.css.tmpl
@@ -15,6 +15,14 @@ hr
     margin-top: 0px;
 }
 
+div.toolSectionPad
+{
+    margin: 0;
+    padding: 0;
+    height: 5px;
+    font-size: 0px;
+}
+
 div.toolSectionDetailsInner
 { 
   margin-left: 10px;
diff --git a/templates/history.tmpl b/templates/history.tmpl
index ac2ef236f90..44ab9e72eea 100644
--- a/templates/history.tmpl
+++ b/templates/history.tmpl
@@ -305,7 +305,7 @@ div#footer {
 
 </body>
 
-#if $app.config.get( "new_style_july_2007", "false" ) == "true"
+#if $app.config.get( "show_panel_footers", "true" ) == "true"
 <div style="height: 20px"></div>
 <div id="footer" >
     <div class="footerheader">
diff --git a/templates/index_frames.tmpl b/templates/index_frames.tmpl
index e6be84f6fc4..280e15a5d69 100644
--- a/templates/index_frames.tmpl
+++ b/templates/index_frames.tmpl
@@ -3,7 +3,7 @@
 <HEAD>
 <TITLE>Galaxy</TITLE>
 </HEAD>
-<FRAMESET rows="40,*" border="0" framespacing="0" frameborder="0">
+<FRAMESET rows="36,*" border="0" framespacing="0" frameborder="0">
     <FRAME name="galaxy_masthead" src="$h.url_for('masthead')" frameborder="0" border="0" framespacing="0">
     <FRAME name="mainframe" src="$h.url_for('static/index_frame_three_col.html')" border="3" framespacing="3" frameborder="1">
 </FRAMESET>
diff --git a/templates/tool_menu.tmpl b/templates/tool_menu.tmpl
index fbd43eeac1e..a229190a2ec 100644
--- a/templates/tool_menu.tmpl
+++ b/templates/tool_menu.tmpl
@@ -104,13 +104,11 @@ div#footer {
 
 </div>
 
-#if $app.config.get( "new_style_july_2007", "false" ) == "true"
 <div style="height: 20px"></div>
 
 <div id="footer">
 <div class="footerheader"><b>Tools</b></div>
 </div>
 </body>
-#end if
 
 </html>
\ No newline at end of file
diff --git a/universe_wsgi.ini.sample b/universe_wsgi.ini.sample
index 77b1d2e4c0c..c39cb3e8e8e 100644
--- a/universe_wsgi.ini.sample
+++ b/universe_wsgi.ini.sample
@@ -88,6 +88,8 @@ use_heartbeat = True
 # Comma separated list of UCSC browsers to use for viewing
 ucsc_display_sites = main,test,archaea
 gbrowse_display_sites = wormbase,flybase
+# Use the new iframe/javascript based layout
+use_new_layout=true
 
 # Static files
 
@@ -103,7 +105,10 @@ document_root = %(here)s/static/favicon.ico
 [app:static_style]
 paste.app_factory = galaxy.web.static:make_static
 cache_seconds = 360
-document_root = %(here)s/static/light_hatched_style/blue
+# The new (June 2007) style
+document_root = %(here)s/static/june_2007_style/blue
+# The old hatched style
+#document_root = %(here)s/static/light_hatched_style/blue
 #document_root = %(here)s/static/light_hatched_style/green
 #document_root = %(here)s/static/old_blue_style