myexperiment-hackers
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[myexperiment-hackers] [3802] branches/ro: cd ^/branches/ro ; svn merge


From: noreply
Subject: [myexperiment-hackers] [3802] branches/ro: cd ^/branches/ro ; svn merge -r3788:3801 ^/trunk .
Date: Tue, 26 Nov 2013 13:25:45 +0000 (UTC)

Revision
3802
Author
dgc
Date
2013-11-26 13:25:44 +0000 (Tue, 26 Nov 2013)

Log Message

cd ^/branches/ro ; svn merge -r3788:3801 ^/trunk .

Modified Paths

Added Paths

Diff

Modified: branches/ro/app/controllers/application_controller.rb (3801 => 3802)


--- branches/ro/app/controllers/application_controller.rb	2013-11-19 16:54:42 UTC (rev 3801)
+++ branches/ro/app/controllers/application_controller.rb	2013-11-26 13:25:44 UTC (rev 3802)
@@ -512,11 +512,11 @@
 
       if external_url_keys.size == 1
         external_url_key = external_url_keys.first
-        external_url = params[external_url_key]
+        external_url = CGI.unescape(params[external_url_key])
 
         if %w(http https).include?(URI.parse(external_url).scheme)
           session[:came_from] = external_url_key[0..-5] # Strip the _url part
-          session[:return_url] = CGI.unescape(external_url)
+          session[:return_url] = external_url
         else
           raise("Invalid return URL given for #{external_url_key}: \n\t#{external_url}")
         end

Copied: branches/ro/app/views/layouts/skins/branding/_biovel_internal.html.erb (from rev 3801, trunk/app/views/layouts/skins/branding/_biovel_internal.html.erb) (0 => 3802)


--- branches/ro/app/views/layouts/skins/branding/_biovel_internal.html.erb	                        (rev 0)
+++ branches/ro/app/views/layouts/skins/branding/_biovel_internal.html.erb	2013-11-26 13:25:44 UTC (rev 3802)
@@ -0,0 +1,5 @@
+<div style="text-align: center; margin-top: 0.5em;">
+  <span class="owner">Project</span>
+  <%= link_to image_tag('/images/biovel.png', :style => 'width: 80px; height: 80px; margin-top: 0.2em;'),
+              network_path(Conf.layouts['biovel_internal']['network_id']) -%>
+</div>
\ No newline at end of file

Modified: branches/ro/app/views/workflows/show.rhtml (3801 => 3802)


--- branches/ro/app/views/workflows/show.rhtml	2013-11-19 16:54:42 UTC (rev 3801)
+++ branches/ro/app/views/workflows/show.rhtml	2013-11-26 13:25:44 UTC (rev 3802)
@@ -3,6 +3,9 @@
 <%= render :partial => "workflows/deprecation_event", :collection => @workflow.deprecations -%>
 
 <ul class="sectionIcons">
+  <% if @authorised_to_download %>
+    <li><%= icon('download', @named_download_url, "Download Workflow (for version address@hidden)", nil, "Download Workflow") -%></li>
+  <% end %>
 	<% if @authorised_to_edit -%>
 		<li><%= icon('new', new_version_workflow_path(@workflow), nil, nil, 'Upload New Version')%></li>
 	<% end -%>	
@@ -153,7 +156,7 @@
           <br />
 
           <ul class="sectionIcons">
-            <li style="margin-left: 0;"><%= icon('workflow', @named_download_url, "Download Workflow file/package (for version address@hidden)", nil, "Download Workflow File/Package (address@hidden)") -%></li>
+            <li style="margin-left: 0;"><%= icon('workflow', @named_download_url, "Download Workflow (for version address@hidden)", nil, "Download Workflow") -%></li>
           </ul>
           <% if session[:callback] &&
                 session[:callback][:types].include?(@workflow.content_type_id) -%>

Modified: branches/ro/public/stylesheets/misc_skinning.css (3801 => 3802)


--- branches/ro/public/stylesheets/misc_skinning.css	2013-11-19 16:54:42 UTC (rev 3801)
+++ branches/ro/public/stylesheets/misc_skinning.css	2013-11-26 13:25:44 UTC (rev 3802)
@@ -1,7 +1,8 @@
-table.alt_table tr.odd_row.biovel td, table.alt_table tr.even_row.biovel td, .resource_list_item.biovel {
+table.alt_table tr.odd_row.biovel td, table.alt_table tr.even_row.biovel td, .resource_list_item.biovel,
+table.alt_table tr.odd_row.biovel_internal td, table.alt_table tr.even_row.biovel_internal td, .resource_list_item.biovel_internal {
   background-color: #EEFFCC;
 }
 
-table.alt_table.biovel, .resource_list_item.biovel {
+table.alt_table.biovel, .resource_list_item.biovel, table.alt_table.biovel_internal, .resource_list_item.biovel_internal {
   border-color: #99cc33;
 }

reply via email to

[Prev in Thread] Current Thread [Next in Thread]