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
2026-09-21 13:50:20 +08:00 · 2007-07-12 18:27:58 +00:00
parent 0c067f843d
commit 551df392ba
36 changed files with 108 additions and 118 deletions
@@ -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" )
@@ -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;
 }
@@ -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;
 }
@@ -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;

@@ -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;

@@ -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" ),
@@ -17,6 +17,12 @@ a
    color: #base_text;
 }

+div.historyLinks
+{
+    padding: 5px;
+    margin: 5px;
+}
+
 div.historyItem
 {
    padding: 5px;
@@ -11,7 +11,7 @@ body

 div.pageTitle
 {
-    font-size: x-large;
+    font-size: 160%;
    font-weight: bold;
 }

@@ -15,6 +15,14 @@ hr
    margin-top: 0px;
 }

+div.toolSectionPad
+{
+    margin: 0;
+    padding: 0;
+    height: 5px;
+    font-size: 0px;
+}
+
 div.toolSectionDetailsInner
 { 
  margin-left: 10px;
@@ -17,6 +17,12 @@ a
    color: #base_text;
 }

+div.historyLinks
+{
+    padding: 5px;
+    margin: 5px;
+}
+
 div.historyItem
 {
    padding: 5px;
@@ -11,7 +11,7 @@ body

 div.pageTitle
 {
-    font-size: x-large;
+    font-size: 160%;
    font-weight: bold;
 }

@@ -15,6 +15,14 @@ hr
    margin-top: 0px;
 }

+div.toolSectionPad
+{
+    margin: 0;
+    padding: 0;
+    height: 5px;
+    font-size: 0px;
+}
+
 div.toolSectionDetailsInner
 { 
  margin-left: 10px;
@@ -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">
@@ -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>
@@ -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>
@@ -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