[myexperiment-hackers] [2981] branches/galaxy-integration: Re-styled header to match latest version of galaxy.

[noreply]

Revision

2981

Author

fbacall

Date

2012-03-28 14:54:09 +0000 (Wed, 28 Mar 2012)

Log Message

Re-styled header to match latest version of galaxy. Enabled download of Galaxy workflows.

Modified Paths

• branches/galaxy-integration/app/views/layouts/integrations/_galaxy.html.erb
• branches/galaxy-integration/app/views/workflows/galaxy/_run_options.rhtml
• branches/galaxy-integration/lib/workflow_processors/galaxy.rb

Diff

Modified: branches/galaxy-integration/app/views/layouts/integrations/_galaxy.html.erb (2980 => 2981)

--- branches/galaxy-integration/app/views/layouts/integrations/_galaxy.html.erb	2012-03-28 11:48:22 UTC (rev 2980)
+++ branches/galaxy-integration/app/views/layouts/integrations/_galaxy.html.erb	2012-03-28 14:54:09 UTC (rev 2981)
@@ -1,7 +1,7 @@
 <style type="text/css">
   #galaxy_header {
-    background-color:#EEEEEE;
-    color: #EEEEEE;
+    background-color: #EEEEEE;
+    color: #FFFFFF;
     position: fixed;
     width: 100%;
     top: 0px;
@@ -13,20 +13,22 @@
   }
 
   #galaxy_inner_header {
-    background-color:#2C3143;
+    background-color: #303239;
+    background-image: -moz-linear-gradient(center top , #333333, #2C3143);
     color: #EEEEEE;
     height: 32px;
     width: 100%;
     border-bottom: 1px solid #444444;
-    margin-bottom: 6px;
+    margin-bottom: 4px;
   }
 
   #galaxy_logo {
-    font-size: 21px;
+    font-size: 20px;
     font-weight: bold;
     float: left;
-    padding: 3px 10px;
-    line-height: 27px;
+    padding: 5px 20px;
+    line-height: 1;
+    margin-left: -15px;
   }
 
   #remove_galaxy_frame {
@@ -35,8 +37,8 @@
     line-height: 27px;
   }
 
-  #galaxy_header a { text-decoration: none; color: #EEEEEE;}
-  #galaxy_header a:hover { text-decoration: underline; color: #EEEEEE;}
+  #galaxy_header a { text-decoration: none; color: #FFFFFF;}
+  #galaxy_header a:hover { text-decoration: underline; color: #FFFFFF; }
 
   #galaxy_header ul {
     margin: 0;
@@ -51,10 +53,12 @@
   #galaxy_header li a {
     display: inline-block;
     padding: 0 1em;
+    color: #999999;
   }
   
   #galaxy_header li.selected a {
     background-color: #000000;
+    color: #FFFFFF;
   }
 
   #galaxy_header li a:hover {

Modified: branches/galaxy-integration/app/views/workflows/galaxy/_run_options.rhtml (2980 => 2981)

--- branches/galaxy-integration/app/views/workflows/galaxy/_run_options.rhtml	2012-03-28 11:48:22 UTC (rev 2980)
+++ branches/galaxy-integration/app/views/workflows/galaxy/_run_options.rhtml	2012-03-28 14:54:09 UTC (rev 2981)
@@ -22,7 +22,8 @@
     <form action="" session[:return_url].chomp("/") -%>/workflow/import_workflow" method="POST" name="import_workflow">
       <input type="hidden" name="workflow_source" value="<%= Conf.sitename -%>"/>
       <textarea name="workflow_text" style="display: none">
-        <%= @viewing_version.content_blob.data -%>
+        <%# Decode JSON and convert again to cut out formatting whitespace %>
+        <%= ActiveSupport::JSON.decode(@viewing_version.content_blob.data).to_json -%>
       </textarea>
       <input type="submit" value="Import" name="import_button"/>
     </form>

Modified: branches/galaxy-integration/lib/workflow_processors/galaxy.rb (2980 => 2981)

--- branches/galaxy-integration/lib/workflow_processors/galaxy.rb	2012-03-28 11:48:22 UTC (rev 2980)
+++ branches/galaxy-integration/lib/workflow_processors/galaxy.rb	2012-03-28 14:54:09 UTC (rev 2981)
@@ -65,7 +65,7 @@
     end
     
     def self.show_download_section?
-      false
+      true
     end
 
     def initialize(workflow_definition)