Diff
Modified: branches/contextualisation/app/helpers/application_helper.rb (3466 => 3467)
--- branches/contextualisation/app/helpers/application_helper.rb 2013-03-05 14:03:38 UTC (rev 3466)
+++ branches/contextualisation/app/helpers/application_helper.rb 2013-03-05 15:23:08 UTC (rev 3467)
@@ -1168,11 +1168,15 @@
perm
end
- def currentusers_things_url(thing)
+ def currentusers_things_url(klass)
return nil unless current_user
- return url_for(:controller => 'users',
- :id => current_user.id,
- :action ="" thing)
+ if Conf.contributable_models.include?(klass)
+ return polymorphic_url([current_user, klass.pluralize.underscore.to_sym])
+ else
+ return url_for(:controller => 'users',
+ :id => current_user.id,
+ :action ="" controller_visible_name(klass))
+ end
end
def view_privileges_notice
Modified: branches/contextualisation/app/views/gadgets/_asset_manager.rhtml (3466 => 3467)
--- branches/contextualisation/app/views/gadgets/_asset_manager.rhtml 2013-03-05 14:03:38 UTC (rev 3466)
+++ branches/contextualisation/app/views/gadgets/_asset_manager.rhtml 2013-03-05 15:23:08 UTC (rev 3467)
@@ -11,7 +11,7 @@
<%= link_to(pluralize(current_user.networks_owned.length + current_user.networks.length, "Group"), currentusers_things_url('groups')) %>
<% filter_contributables(current_user.contributions).each do |klass,contributables| %>
<span style="color:#999999;">|</span>
- <%= link_to(pluralize(contributables.length, controller_visible_name(klass.humanize.pluralize).singularize), currentusers_things_url(controller_visible_name(klass.humanize.pluralize).downcase)) %>
+ <%= link_to(pluralize(contributables.length, controller_visible_name(klass.humanize.pluralize).singularize), currentusers_things_url(klass)) %>
<% end %>
</small>
</p>
@@ -55,7 +55,7 @@
<% filter_contributables(current_user.contributions, true).each do |klass, array| %>
<div>
<div class="title">
- <%= link_to(visible_name(klass.humanize).pluralize, currentusers_things_url(controller_visible_name(klass.humanize.pluralize).downcase)) %>
+ <%= link_to(visible_name(klass.humanize).pluralize, currentusers_things_url(klass)) %>
</div>
<div class="content">
<ul class="gadget_list">
Modified: branches/contextualisation/app/views/layouts/_myexperiment.rhtml (3466 => 3467)
--- branches/contextualisation/app/views/layouts/_myexperiment.rhtml 2013-03-05 14:03:38 UTC (rev 3466)
+++ branches/contextualisation/app/views/layouts/_myexperiment.rhtml 2013-03-05 15:23:08 UTC (rev 3467)
@@ -39,18 +39,17 @@
<% end %>
</div>
<div id="myexp_links">
- <div style="text-align: left; float: left; width: 34%; padding-top: 6px;" id="site_info_links" class="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 style="text-align: right; float: right; width: 64%;" id="user_links" class="links">
+ <div id="user_links" class="links">
<%= render :partial => 'layouts/user_links' %>
</div>
</div>
- <div class="clearer"> </div>
</div>
<div id="myexp_tabs">
<% if @content_for_tabs %>
Modified: branches/contextualisation/app/views/skins/_biovel.rhtml (3466 => 3467)
--- branches/contextualisation/app/views/skins/_biovel.rhtml 2013-03-05 14:03:38 UTC (rev 3466)
+++ branches/contextualisation/app/views/skins/_biovel.rhtml 2013-03-05 15:23:08 UTC (rev 3467)
@@ -19,15 +19,14 @@
<% 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="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: 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>
+ <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=>"-moz-border-radius: 2px; border-radius: 2px; vertical-align: middle;border: 1px solid #ccc"), "/" -%>
+ on <%= link_to image_tag("/images/logo_tiny.png", :style=>"vertical-align: middle"), "/" -%>
</div>
</div>
</div>
Modified: branches/contextualisation/app/views/skins/branding/_biovel.html.erb (3466 => 3467)
--- branches/contextualisation/app/views/skins/branding/_biovel.html.erb 2013-03-05 14:03:38 UTC (rev 3466)
+++ branches/contextualisation/app/views/skins/branding/_biovel.html.erb 2013-03-05 15:23:08 UTC (rev 3467)
@@ -1,5 +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: 60px; height: 60px; margin-top: 0.2em;') + '<br/>BioVeL',
- network_path(643) -%>
+ <%= 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
Modified: branches/contextualisation/app/views/users/show.rhtml (3466 => 3467)
--- branches/contextualisation/app/views/users/show.rhtml 2013-03-05 14:03:38 UTC (rev 3466)
+++ branches/contextualisation/app/views/users/show.rhtml 2013-03-05 15:23:08 UTC (rev 3467)
@@ -232,7 +232,8 @@
<% filter_contributables(@user.contributions).each do |klass, contributables| %>
<p>
<b>
- <%= link_to(pluralize(Authorization.scoped(klass.constantize, :authorised_user => current_user).find(:all, :select => "0", :conditions => { :contributor_type => 'User', :contributor_id => @user.id } ).length, controller_visible_name(klass.humanize.pluralize)), url_for(:action ="" controller_visible_name(klass.humanize.pluralize).downcase)) %>
+ <%= link_to(pluralize(Authorization.scoped(klass.constantize, :authorised_user => current_user).find(:all, :select => "0", :conditions => { :contributor_type => 'User', :contributor_id => @user.id } ).length, controller_visible_name(klass.humanize.pluralize)),
+ currentusers_things_url(klass)) %>
</b>
</p>
<% end %>
Modified: branches/contextualisation/public/images/biovel.png
(Binary files differ)
Modified: branches/contextualisation/public/stylesheets/biovel.css (3466 => 3467)
--- branches/contextualisation/public/stylesheets/biovel.css 2013-03-05 14:03:38 UTC (rev 3466)
+++ branches/contextualisation/public/stylesheets/biovel.css 2013-03-05 15:23:08 UTC (rev 3467)
@@ -18,9 +18,8 @@
background-image: url('/images/sidebar_alpha.png');
}
-
.logo a {
- color: #99cc33;
+ color: #333;
}#
.logo a:hover {
@@ -35,19 +34,15 @@
/* To add a white margin around the content */
#doc2 {
- padding: 0 1em;
- border-color: #DFD96D;
- border-style: solid;
- border-width: 0 4px;
+ box-shadow: 0 0 16px 4px #7f793f;
}
#myexp_header {
- margin: 0em 0.5em;
+ margin: 0 0.5em;
}
-#hd
-{
- padding-top: 1em;
+#site_info_links {
+ display: none;
}
.tabnav li.return_tab {
Modified: branches/contextualisation/public/stylesheets/styles.css (3466 => 3467)
--- branches/contextualisation/public/stylesheets/styles.css 2013-03-05 14:03:38 UTC (rev 3466)
+++ branches/contextualisation/public/stylesheets/styles.css 2013-03-05 15:23:08 UTC (rev 3467)
@@ -128,12 +128,12 @@
#myexp_header {
padding-top: 1em;
- margin: 0 0.5em 0 0.5em;
+ margin: 0 0.5em 1em 0.5em;
+ overflow: auto;
}
.logo {
float: left;
- width: 300px;
}
.links {
@@ -144,15 +144,19 @@
#myexp_links
{
float: right;
- width: 600px;
font-size: 93%;
}
#site_info_links {
+ text-align: left;
+ float: left;
+ padding-top: 6px;
+ margin-right: 100px;
}
-/* margin: 0.5em 0; */
+
#user_links {
+ text-align: right;
float: right;
}
@@ -2447,4 +2451,5 @@
font-weight: bold;
color: #333333;
font-size: 100%;
-}
\ No newline at end of file
+}
+