Diff
Modified: trunk/app/controllers/application_controller.rb (3470 => 3471)
--- trunk/app/controllers/application_controller.rb 2013-03-06 11:38:40 UTC (rev 3470)
+++ trunk/app/controllers/application_controller.rb 2013-03-06 15:09:41 UTC (rev 3471)
@@ -28,6 +28,8 @@
before_filter :check_external_site_request
include ActionView::Helpers::NumberHelper
+
+ layout :configure_layout
def check_for_sleeper
if request.method != :get && logged_in?
@@ -530,8 +532,6 @@
end
end
-
-
def check_context
if params[:user_id]
@context = User.find_by_id(params[:user_id])
@@ -541,4 +541,29 @@
error("Group not found") if @context.nil?
end
end
+
+ #Selects layout for contributables/groups or uses site's default
+ def configure_layout
+ contributable = (@workflow || @pack || @blob)
+ layout = nil
+
+ if params["layout_preview"]
+ layout = Conf.layouts[params["layout_preview"]]
+ elsif contributable && contributable.contribution && contributable.contribution.policy
+ layout = Conf.layouts[contributable.contribution.policy.layout]
+ if layout.nil?
+ logger.error("Missing layout for #{contributable.class.name} #{contributable.id}: "+
+ "#{contributable.contribution.policy.layout}")
+ end
+ elsif (network = @network) || (@context.is_a?(Network) && (network = @context))
+ layout = network.layout
+ if layout.nil?
+ logger.error("Missing layout for Group #{network.id}")
+ end
+ end
+
+ @layout = layout || {"layout" => 'application', "stylesheets" => [Conf.stylesheet]}
+ @layout["layout"]
+ end
+
end
Modified: trunk/app/helpers/application_helper.rb (3470 => 3471)
--- trunk/app/helpers/application_helper.rb 2013-03-06 11:38:40 UTC (rev 3470)
+++ trunk/app/helpers/application_helper.rb 2013-03-06 15:09:41 UTC (rev 3471)
@@ -1564,30 +1564,6 @@
result
end
- #Selects layout for contributables/groups or uses site's default
- def configure_layout
- contributable = (@workflow || @pack || @blob)
- layout = nil
-
- if params["layout_preview"]
- layout = Conf.layouts[params["layout_preview"]]
- elsif contributable && contributable.contribution && contributable.contribution.policy
- layout = Conf.layouts[contributable.contribution.policy.layout]
- if layout.nil?
- logger.error("Missing layout for #{contributable.class.name} #{contributable.id}: "+
- "#{contributable.contribution.policy.layout}")
- end
- elsif (network = @network) || (@context.is_a?(Network) && (network = @context))
- layout = network.layout
- if layout.nil?
- logger.error("Missing layout for Group #{network.id}")
- end
- end
-
- @layout = layout || {"layout" => Conf.page_template, "stylesheets" => [Conf.stylesheet]}
- end
-
-
def context_prefix(context)
case context
when User
Modified: trunk/app/views/blobs/_table.rhtml (3470 => 3471)
--- trunk/app/views/blobs/_table.rhtml 2013-03-06 11:38:40 UTC (rev 3470)
+++ trunk/app/views/blobs/_table.rhtml 2013-03-06 15:09:41 UTC (rev 3471)
@@ -16,7 +16,7 @@
<%= contributor(blob.contribution.contributor_id, blob.contribution.contributor_type, true, 60) %>
<% if layout = blob.contribution.policy.layout %>
<% begin %>
- <%= render :partial => "skins/branding/#{layout}" %>
+ <%= render :partial => "layouts/skins/branding/#{layout}" %>
<% rescue ActionView::MissingTemplate %>
<% end %>
<% end %>
Copied: trunk/app/views/layouts/_myexperiment.html.erb (from rev 3470, trunk/app/views/layouts/_myexperiment.rhtml) (0 => 3471)
--- trunk/app/views/layouts/_myexperiment.html.erb (rev 0)
+++ trunk/app/views/layouts/_myexperiment.html.erb 2013-03-06 15:09:41 UTC (rev 3471)
@@ -0,0 +1,110 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+ <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
+ <%= t :site => "#{Conf.sitename} - #{controller_visible_name(controller.controller_name.humanize)}", :separator => "-" %>
+ <% if @lod_rdf %><link rel="alternate" href="" @lod_rdf -%>" type="application/rdf+xml" title="RDF+XML" /><% end %>
+ <% if @lod_xml %><link rel="alternate" href="" @lod_xml -%>" type="application/xml" title="REST XML" /><% end %>
+ <link rel="shortcut icon" href="" type="image/x-icon"/>
+ <%= stylesheet_link_tag 'reset-fonts-grids', 'base-min', 'acts_as_taggable_stylesheet',
+ 'star_rating', 'gadgets', 'misc_skinning', address@hidden"stylesheets"] %>
+ <%= _javascript__include_tag :defaults, "boxover.js", "tabs.js", "folds.js" %>
+
+ <% if controller.action_name.downcase == "timeline" %>
+ <script src="" type="text/_javascript_"></script>
+ <% end -%>
+
+ <%= render :partial => "layouts/feed_link_tags" %>
+
+ <%= yield :head_options -%>
+</head>
+<body>
+
+<%= render :partial => "layouts/integrations/#{session[:came_from]}" unless session[:came_from].blank? %>
+
+<div id="doc2" class="yui-t4">
+
+ <% if @content_for_header %>
+ <%= yield :header %>
+ <% else %>
+ <div id="hd">
+ <div id="myexp_header">
+ <div class="logo">
+ <% if @content_for_logo %>
+ <%= yield :logo %>
+ <% else %>
+ <%= link_to image_tag(Conf.site_logo), "/" %>
+ <% end %>
+ </div>
+ <div id="myexp_links">
+ <div id="site_info_links" class="links">
+ <% if @content_for_site_info_links %>
+ <%= yield :site_info_links %>
+ <% else %>
+ <%= render :partial => 'layouts/site_info_links' %>
+ <% end %>
+ </div>
+ <div id="user_links" class="links">
+ <%= render :partial => 'layouts/user_links' %>
+ </div>
+ </div>
+ </div>
+ <div id="myexp_tabs">
+ <% if @content_for_tabs %>
+ <%= yield :tabs %>
+ <% else %>
+ <%= render :partial => 'layouts/tab_bar' %>
+ <% end %>
+ </div>
+ <div id="myexp_searchbar">
+ <%= render :partial => "layouts/search" %>
+ </div>
+ </div>
+ <% end %>
+
+
+ <% if @content_for_body %>
+ <%= yield :body %>
+ <% else %>
+ <div id="bd">
+ <div id="yui-main">
+ <div class="yui-b">
+ <div id="myexp_breadcrumbs_bar">
+ <%= render :partial => "layouts/breadcrumbs_bar" %>
+ </div>
+ <div id="myexp_content">
+ <%= render :partial => 'layouts/alerts' %>
+
+ <%= yield :layout %>
+
+ </div>
+ </div>
+ </div>
+ <div id="myexp_sidebar" class="yui-b">
+ <%= render :partial => "layouts/sidebar" %>
+ </div>
+ </div>
+ <% end %>
+
+
+ <% if @content_for_footer %>
+ <%= yield :footer %>
+ <% else %>
+ <% cache(:controller => 'global_cache', :action ="" 'footer') do -%>
+ <div id="ft">
+ <%= render :partial => "layouts/footer" %>
+ </div>
+ <br class="clearer"/>
+ <% end -%>
+ <% end %>
+
+
+ <%= render :partial => "layouts/debug" if Conf.show_debug %>
+</div>
+
+<%= render :partial => "layouts/web_analytics" if Conf.google_web_analytics["enable"] %>
+
+</body>
+</html>
Deleted: trunk/app/views/layouts/_myexperiment.rhtml (3470 => 3471)
--- trunk/app/views/layouts/_myexperiment.rhtml 2013-03-06 11:38:40 UTC (rev 3470)
+++ trunk/app/views/layouts/_myexperiment.rhtml 2013-03-06 15:09:41 UTC (rev 3471)
@@ -1,110 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
- <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
- <%= t :site => "#{Conf.sitename} - #{controller_visible_name(controller.controller_name.humanize)}", :separator => "-" %>
- <% if @lod_rdf %><link rel="alternate" href="" @lod_rdf -%>" type="application/rdf+xml" title="RDF+XML" /><% end %>
- <% if @lod_xml %><link rel="alternate" href="" @lod_xml -%>" type="application/xml" title="REST XML" /><% end %>
- <link rel="shortcut icon" href="" type="image/x-icon"/>
- <%= stylesheet_link_tag 'reset-fonts-grids', 'base-min', 'acts_as_taggable_stylesheet',
- 'star_rating', 'gadgets', 'misc_skinning', address@hidden"stylesheets"] %>
- <%= _javascript__include_tag :defaults, "boxover.js", "tabs.js", "folds.js" %>
-
- <% if controller.action_name.downcase == "timeline" %>
- <script src="" type="text/_javascript_"></script>
- <% end -%>
-
- <%= render :partial => "layouts/feed_link_tags" %>
-
- <%= yield :head_options -%>
-</head>
-<body>
-
-<%= render :partial => "layouts/integrations/#{session[:came_from]}" unless session[:came_from].blank? %>
-
-<div id="doc2" class="yui-t4">
-
- <% if @content_for_header %>
- <%= yield :header %>
- <% else %>
- <div id="hd">
- <div id="myexp_header">
- <div class="logo">
- <% if @content_for_logo %>
- <%= yield :logo %>
- <% else %>
- <%= link_to image_tag(Conf.site_logo), "/" %>
- <% end %>
- </div>
- <div id="myexp_links">
- <div id="site_info_links" class="links">
- <% if @content_for_site_info_links %>
- <%= yield :site_info_links %>
- <% else %>
- <%= render :partial => 'layouts/site_info_links' %>
- <% end %>
- </div>
- <div id="user_links" class="links">
- <%= render :partial => 'layouts/user_links' %>
- </div>
- </div>
- </div>
- <div id="myexp_tabs">
- <% if @content_for_tabs %>
- <%= yield :tabs %>
- <% else %>
- <%= render :partial => 'layouts/tab_bar' %>
- <% end %>
- </div>
- <div id="myexp_searchbar">
- <%= render :partial => "layouts/search" %>
- </div>
- </div>
- <% end %>
-
-
- <% if @content_for_body %>
- <%= yield :body %>
- <% else %>
- <div id="bd">
- <div id="yui-main">
- <div class="yui-b">
- <div id="myexp_breadcrumbs_bar">
- <%= render :partial => "layouts/breadcrumbs_bar" %>
- </div>
- <div id="myexp_content">
- <%= render :partial => 'layouts/alerts' %>
-
- <%= yield :layout %>
-
- </div>
- </div>
- </div>
- <div id="myexp_sidebar" class="yui-b">
- <%= render :partial => "layouts/sidebar" %>
- </div>
- </div>
- <% end %>
-
-
- <% if @content_for_footer %>
- <%= yield :footer %>
- <% else %>
- <% cache(:controller => 'global_cache', :action ="" 'footer') do -%>
- <div id="ft">
- <%= render :partial => "layouts/footer" %>
- </div>
- <br class="clearer"/>
- <% end -%>
- <% end %>
-
-
- <%= render :partial => "layouts/debug" if Conf.show_debug %>
-</div>
-
-<%= render :partial => "layouts/web_analytics" if Conf.google_web_analytics["enable"] %>
-
-</body>
-</html>
Modified: trunk/app/views/layouts/application.rhtml (3470 => 3471)
--- trunk/app/views/layouts/application.rhtml 2013-03-06 11:38:40 UTC (rev 3470)
+++ trunk/app/views/layouts/application.rhtml 2013-03-06 15:09:41 UTC (rev 3471)
@@ -1,2 +1 @@
-<% configure_layout %>
-<%= render :partial => @layout["layout"] %>
\ No newline at end of file
+<%= render :partial => Conf.page_template %>
Deleted: trunk/app/views/layouts/skins/_biovel.rhtml (3467 => 3471)
--- trunk/app/views/skins/_biovel.rhtml 2013-03-05 15:23:08 UTC (rev 3467)
+++ trunk/app/views/layouts/skins/_biovel.rhtml 2013-03-06 15:09:41 UTC (rev 3471)
@@ -1,42 +0,0 @@
-<% @logo_link_url = "http://biovel.eu/" # The URL that the logo links to when clicked
- @logo_image_url = "/images/biovel.png" # The logo image %>
-
-<% content_for :site_info_links do %>
-
-<% end %>
-
-<% content_for :logo do %>
- <div style="float: left; margin-bottom: 0.5em">
- <%= link_to image_tag(@logo_image_url), @logo_link_url, :style => "float: left" -%>
- <div style="float: left; margin-top: 1em; margin-left: 1em">
- <div style="font-weight: bold; vertical-align: middle">
- <a href="" @logo_link_url -%>" class="biovel_logo_link">
- <span style="font-size: 280%"><span style="color:black;">B</span>io<span style="color:black">V</span>e<span style="color:black">L</span></span><br/>
- <span style="font-size: 100%">Biodiversity Virtual e-Laboratory</span>
- </a>
- </div>
- <div style="margin: 0.5em 0 0 1em; color: black;">
- on <%= link_to image_tag("/images/logo_tiny.png", :style=>"-moz-border-radius: 2px; border-radius: 2px; vertical-align: middle;border: 1px solid #ccc"), "/" -%>
- </div>
- </div>
- </div>
- <br class="clearer"/>
-<% end %>
-
-<%= render :partial => "layouts/myexperiment" %>
-
-<% if Rails.env == "production" %>
-<script type="text/_javascript_">
-
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-36850736-1']);
- _gaq.push(['_trackPageview']);
-
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/_javascript_'; ga.async = true;
- ga.src = "" == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
-
-</script>
-<% end %>
Deleted: trunk/app/views/layouts/skins/_elico.rhtml (3467 => 3471)
--- trunk/app/views/skins/_elico.rhtml 2013-03-05 15:23:08 UTC (rev 3467)
+++ trunk/app/views/layouts/skins/_elico.rhtml 2013-03-06 15:09:41 UTC (rev 3471)
@@ -1,49 +0,0 @@
-<%# Defines a new header, then calls main myExperiment layout %>
-
-<% content_for :header do %>
-</div>
-
-<div id="elico_header">
- <div class="logo">
- <div style="float: left; margin-bottom: 0.5em">
- <img src="" style="float: left; vertical-align: middle; width: 60px; height: 60px"/>
- <div style="float: left; margin-top: 1em; margin-left: 1em">
- <div style="font-size: 220%; font-weight: bold; vertical-align: middle">Data Mining Portal</div>
- <div style="margin: 0.5em 0 0 1em">
- on <%= link_to image_tag("/images/logo_tiny.png", :style=>"-moz-border-radius: 2px; border-radius: 2px; vertical-align: middle;border: 1px solid white"), "/" -%>
- </div>
- </div>
- </div>
- <div style="float: right; font-size: 120%; margin-top: 1.5em">
- e-Laboratory for Interdisciplinary Collaborative Data Mining
- </div>
- <br class="clearer"/>
- </div>
- <div id="elico_links_bar">
- <div id="inner">
- <div style="float: left;" class="links">
- <%= link_to "About", "http://www.e-lico.eu/?q=node/4", :target => '_blank' %> |
- <%= link_to "Mailing List", "http://lists.e-lico.eu/mailman/listinfo/dm-myexperiment", :target => '_blank' %> |
- <%= link_to "Publications", "http://www.e-lico.eu/?q=publications", :target => '_blank' %>
- </div>
- <div style="float: right;" class="links">
- <%= render :partial => 'layouts/user_links' %>
- </div>
- <br class="clearer"/>
- </div>
- </div>
-</div>
-
-<div id="doc2" class="yui-t4" style="*overflow: visible; *height: auto">
- <div id="hd">
- <div id="myexp_tabs">
- <%= render :partial => 'layouts/tab_bar' %>
- </div>
- <div id="myexp_searchbar">
- <%= render :partial => "layouts/search" %>
- </div>
- </div>
-<% end %>
-
-<%# TODO: In rails 2, this can possibly be removed, and the layout specified when rendering the partial in application.rhtml %>
-<%= render :partial => "layouts/myexperiment" %>
Deleted: trunk/app/views/layouts/skins/_scape.html.erb (3467 => 3471)
--- trunk/app/views/skins/_scape.html.erb 2013-03-05 15:23:08 UTC (rev 3467)
+++ trunk/app/views/layouts/skins/_scape.html.erb 2013-03-06 15:09:41 UTC (rev 3471)
@@ -1,9 +0,0 @@
-<% @logo_link_url = "http://www.scape-project.eu/" # The URL that the logo links to when clicked
- @logo_image_url = "/images/scape_logo.png" # The logo image %>
-
-<% content_for :site_info_links do %>
- <a target="_blank" href="" SCAPE</a> |
- <a target="_blank" href="" Wiki</a>
-<% end %>
-
-<%= render :partial => "layouts/skin_template" %>
Copied: trunk/app/views/layouts/skins/biovel.html.erb (from rev 3468, trunk/app/views/skins/_biovel.rhtml) (0 => 3471)
--- trunk/app/views/layouts/skins/biovel.html.erb (rev 0)
+++ trunk/app/views/layouts/skins/biovel.html.erb 2013-03-06 15:09:41 UTC (rev 3471)
@@ -0,0 +1,63 @@
+<% @logo_link_url = "http://biovel.eu/" # The URL that the logo links to when clicked
+ @logo_image_url = "/images/biovel.png" # The logo image
+
+ biovel_id = @layout['network_id']
+
+ biovel_tabs = [
+ {'controller' => 'networks', 'label' => 'BioVeL', 'link' => network_path(biovel_id)},
+ {'controller' => 'workflows', 'label' => 'Workflows', 'link' => network_workflows_path(biovel_id)},
+ {'controller' => 'blobs', 'label' => 'Files', 'link' => network_blobs_path(biovel_id)},
+ {'controller' => 'packs', 'label' => 'Packs', 'link' => network_packs_path(biovel_id)}
+ ]
+
+%>
+
+<% content_for :site_info_links do %>
+
+<% end %>
+
+<% content_for :logo do %>
+ <div style="float: left; margin-bottom: 0.5em">
+ <%= link_to image_tag(@logo_image_url), @logo_link_url, :style => "float: left" -%>
+ <div style="float: left; margin-top: 2em">
+ <div style="font-weight: bold; vertical-align: middle">
+ <a href="" @logo_link_url -%>" class="biovel_logo_link">
+ <span style="font-size: 200%">Biodiversity Virtual e-Laboratory</span>
+ </a>
+ </div>
+ <div style="margin: 0.5em 0 0 1em; color: black;">
+ on <%= link_to image_tag("/images/logo_tiny.png", :style=>"vertical-align: middle"), "/" -%>
+ </div>
+ </div>
+ </div>
+ <br class="clearer"/>
+<% end %>
+
+<% content_for :tabs do %>
+ <ul class="tabnav">
+ <li class="return_tab"><%= link_to 'Home', '/home'-%></li>
+ <% biovel_tabs.each do |tab| %>
+ <li <%= (tab['controller'] && controller.controller_name.match(tab['controller'])) ? 'id="selected_tabnav"' : '' %>>
+ <%= link_to(tab['label'], tab['link']) -%>
+ </li>
+ <% end %>
+ </ul>
+<% end %>
+
+<%= render :partial => "layouts/myexperiment" %>
+
+<% if Rails.env == "production" %>
+<script type="text/_javascript_">
+
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-36850736-1']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ var ga = document.createElement('script'); ga.type = 'text/_javascript_'; ga.async = true;
+ ga.src = "" == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+ var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+ })();
+
+</script>
+<% end %>
Deleted: trunk/app/views/layouts/skins/branding/_biovel.html.erb (3467 => 3471)
--- trunk/app/views/skins/branding/_biovel.html.erb 2013-03-05 15:23:08 UTC (rev 3467)
+++ trunk/app/views/layouts/skins/branding/_biovel.html.erb 2013-03-06 15:09:41 UTC (rev 3471)
@@ -1,5 +0,0 @@
-<div style="text-align: center; margin-top: 0.5em;">
- <span class="owner">Project</span>
- <%= link_to image_tag('/images/biovel.png', :style => 'width: 60px; height: 60px; margin-top: 0.2em;') + '<br/>BioVeL',
- network_path(643) -%>
-</div>
\ No newline at end of file
Copied: trunk/app/views/layouts/skins/branding/_biovel.html.erb (from rev 3468, trunk/app/views/skins/branding/_biovel.html.erb) (0 => 3471)
--- trunk/app/views/layouts/skins/branding/_biovel.html.erb (rev 0)
+++ trunk/app/views/layouts/skins/branding/_biovel.html.erb 2013-03-06 15:09:41 UTC (rev 3471)
@@ -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']['network_id']) -%>
+</div>
\ No newline at end of file
Copied: trunk/app/views/layouts/skins/elico.html.erb (from rev 3467, trunk/app/views/skins/_elico.rhtml) (0 => 3471)
--- trunk/app/views/layouts/skins/elico.html.erb (rev 0)
+++ trunk/app/views/layouts/skins/elico.html.erb 2013-03-06 15:09:41 UTC (rev 3471)
@@ -0,0 +1,49 @@
+<%# Defines a new header, then calls main myExperiment layout %>
+
+<% content_for :header do %>
+</div>
+
+<div id="elico_header">
+ <div class="logo">
+ <div style="float: left; margin-bottom: 0.5em">
+ <img src="" style="float: left; vertical-align: middle; width: 60px; height: 60px"/>
+ <div style="float: left; margin-top: 1em; margin-left: 1em">
+ <div style="font-size: 220%; font-weight: bold; vertical-align: middle">Data Mining Portal</div>
+ <div style="margin: 0.5em 0 0 1em">
+ on <%= link_to image_tag("/images/logo_tiny.png", :style=>"-moz-border-radius: 2px; border-radius: 2px; vertical-align: middle;border: 1px solid white"), "/" -%>
+ </div>
+ </div>
+ </div>
+ <div style="float: right; font-size: 120%; margin-top: 1.5em">
+ e-Laboratory for Interdisciplinary Collaborative Data Mining
+ </div>
+ <br class="clearer"/>
+ </div>
+ <div id="elico_links_bar">
+ <div id="inner">
+ <div style="float: left;" class="links">
+ <%= link_to "About", "http://www.e-lico.eu/?q=node/4", :target => '_blank' %> |
+ <%= link_to "Mailing List", "http://lists.e-lico.eu/mailman/listinfo/dm-myexperiment", :target => '_blank' %> |
+ <%= link_to "Publications", "http://www.e-lico.eu/?q=publications", :target => '_blank' %>
+ </div>
+ <div style="float: right;" class="links">
+ <%= render :partial => 'layouts/user_links' %>
+ </div>
+ <br class="clearer"/>
+ </div>
+ </div>
+</div>
+
+<div id="doc2" class="yui-t4" style="*overflow: visible; *height: auto">
+ <div id="hd">
+ <div id="myexp_tabs">
+ <%= render :partial => 'layouts/tab_bar' %>
+ </div>
+ <div id="myexp_searchbar">
+ <%= render :partial => "layouts/search" %>
+ </div>
+ </div>
+<% end %>
+
+<%# TODO: In rails 2, this can possibly be removed, and the layout specified when rendering the partial in application.rhtml %>
+<%= render :partial => "layouts/myexperiment" %>
Copied: trunk/app/views/layouts/skins/scape.html.erb (from rev 3467, trunk/app/views/skins/_scape.html.erb) (0 => 3471)
--- trunk/app/views/layouts/skins/scape.html.erb (rev 0)
+++ trunk/app/views/layouts/skins/scape.html.erb 2013-03-06 15:09:41 UTC (rev 3471)
@@ -0,0 +1,9 @@
+<% @logo_link_url = "http://www.scape-project.eu/" # The URL that the logo links to when clicked
+ @logo_image_url = "/images/scape_logo.png" # The logo image %>
+
+<% content_for :site_info_links do %>
+ <a target="_blank" href="" SCAPE</a> |
+ <a target="_blank" href="" Wiki</a>
+<% end %>
+
+<%= render :partial => "layouts/skin_template" %>
Modified: trunk/app/views/packs/_table.rhtml (3470 => 3471)
--- trunk/app/views/packs/_table.rhtml 2013-03-06 11:38:40 UTC (rev 3470)
+++ trunk/app/views/packs/_table.rhtml 2013-03-06 15:09:41 UTC (rev 3471)
@@ -16,7 +16,7 @@
<%= contributor(pack.contribution.contributor_id, pack.contribution.contributor_type, true, 60) %>
<% if layout = pack.contribution.policy.layout %>
<% begin %>
- <%= render :partial => "skins/branding/#{layout}" %>
+ <%= render :partial => "layouts/skins/branding/#{layout}" %>
<% rescue ActionView::MissingTemplate %>
<% end %>
<% end %>
Modified: trunk/app/views/workflows/_table.rhtml (3470 => 3471)
--- trunk/app/views/workflows/_table.rhtml 2013-03-06 11:38:40 UTC (rev 3470)
+++ trunk/app/views/workflows/_table.rhtml 2013-03-06 15:09:41 UTC (rev 3471)
@@ -19,7 +19,7 @@
<%= contributor(workflow.contribution.contributor_id, workflow.contribution.contributor_type, true, 60) %>
<% if layout = workflow.contribution.policy.layout %>
<% begin %>
- <%= render :partial => "skins/branding/#{layout}" %>
+ <%= render :partial => "layouts/skins/branding/#{layout}" %>
<% rescue ActionView::MissingTemplate %>
<% end %>
<% end %>