Diff
Modified: trunk/app/views/blobs/_table.rhtml (3332 => 3333)
--- trunk/app/views/blobs/_table.rhtml 2013-01-22 16:18:41 UTC (rev 3332)
+++ trunk/app/views/blobs/_table.rhtml 2013-01-23 11:42:21 UTC (rev 3333)
@@ -17,7 +17,7 @@
<p style="margin-top:0; padding-top:0; text-align: center;"><b>Uploader:</b></p>
<center><%= contributor(blob.contribution.contributor_id, blob.contribution.contributor_type, true, 60) %></center>
</td>
- <td style="text-align: left;">
+ <td style="text-align: left; max-width: 370px">
<a name="<%= blob.local_name.gsub(/ /, "_") %>"></a>
<p class="title">
<%= icon "blob", nil, nil, nil, '' %>
Deleted: trunk/app/views/layouts/_biovel.rhtml (3332 => 3333)
--- trunk/app/views/layouts/_biovel.rhtml 2013-01-22 16:18:41 UTC (rev 3332)
+++ trunk/app/views/layouts/_biovel.rhtml 2013-01-23 11:42:21 UTC (rev 3333)
@@ -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/_elico.rhtml (3332 => 3333)
--- trunk/app/views/layouts/_elico.rhtml 2013-01-22 16:18:41 UTC (rev 3332)
+++ trunk/app/views/layouts/_elico.rhtml 2013-01-23 11:42:21 UTC (rev 3333)
@@ -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/_scape.html.erb (3332 => 3333)
--- trunk/app/views/layouts/_scape.html.erb 2013-01-22 16:18:41 UTC (rev 3332)
+++ trunk/app/views/layouts/_scape.html.erb 2013-01-23 11:42:21 UTC (rev 3333)
@@ -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" %>
Modified: trunk/app/views/packs/_table.rhtml (3332 => 3333)
--- trunk/app/views/packs/_table.rhtml 2013-01-22 16:18:41 UTC (rev 3332)
+++ trunk/app/views/packs/_table.rhtml 2013-01-23 11:42:21 UTC (rev 3333)
@@ -17,7 +17,7 @@
<p style="margin-top:0; padding-top:0; text-align: center;"><b><%= owner_text pack -%>:</b></p>
<center><%= contributor(pack.contribution.contributor_id, pack.contribution.contributor_type, true, 60) %></center>
</td>
- <td style="text-align: left;">
+ <td style="text-align: left; max-width: 370px">
<a name="<%= pack.title.gsub(/ /, "_") %>"></a>
<p class="title">
<%= icon "pack", nil, nil, nil, '' %>
Copied: trunk/app/views/skins/_biovel.rhtml (from rev 3299, trunk/app/views/layouts/_biovel.rhtml) (0 => 3333)
--- trunk/app/views/skins/_biovel.rhtml (rev 0)
+++ trunk/app/views/skins/_biovel.rhtml 2013-01-23 11:42:21 UTC (rev 3333)
@@ -0,0 +1,42 @@
+<% @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 %>
Copied: trunk/app/views/skins/_elico.rhtml (from rev 3299, trunk/app/views/layouts/_elico.rhtml) (0 => 3333)
--- trunk/app/views/skins/_elico.rhtml (rev 0)
+++ trunk/app/views/skins/_elico.rhtml 2013-01-23 11:42:21 UTC (rev 3333)
@@ -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/skins/_scape.html.erb (from rev 3299, trunk/app/views/layouts/_scape.html.erb) (0 => 3333)
--- trunk/app/views/skins/_scape.html.erb (rev 0)
+++ trunk/app/views/skins/_scape.html.erb 2013-01-23 11:42:21 UTC (rev 3333)
@@ -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/users/_listing.rhtml (3332 => 3333)
--- trunk/app/views/users/_listing.rhtml 2013-01-22 16:18:41 UTC (rev 3332)
+++ trunk/app/views/users/_listing.rhtml 2013-01-23 11:42:21 UTC (rev 3333)
@@ -1,5 +1,5 @@
<td style="width: 100px"><div style="text-align: center; font-weight: bold">Member</div><br /><br /><center><%= contributor(user.id, 'User', true, 60) %></center></td>
- <td class="mid" style="text-align: left;">
+ <td class="mid" style="text-align: left; max-width: 370px;">
<p style="margin-top:0; padding-top:0; font-weight:bold; font-size: 108%;">
<%= icon "user", nil, nil, nil, '' %>
Modified: trunk/app/views/workflows/_table.rhtml (3332 => 3333)
--- trunk/app/views/workflows/_table.rhtml 2013-01-22 16:18:41 UTC (rev 3332)
+++ trunk/app/views/workflows/_table.rhtml 2013-01-23 11:42:21 UTC (rev 3333)
@@ -21,15 +21,14 @@
<p style="margin-top:0; padding-top:0; text-align: center;"><b><%= owner_text workflow -%></b></p>
<center><%= contributor(workflow.contribution.contributor_id, workflow.contribution.contributor_type, true, 60) %></center>
</td>
- <td style="text-align: left; width: 587px">
+ <td style="text-align: left; max-width: 350px">
<a name="<%= workflow.title.gsub(/ /, "_") %>"></a>
<p class="title">
<%= icon "workflow", nil, nil, nil, '' %>
- <% title = contributable_name(workflow.id, 'Workflow') %>
- <%=link_to(query ? highlight_all(title, query) : title, workflow_path(workflow)) %>
- <span style="font-weight:normal;">
- (v<%= workflow.current_version %>)
- </span>
+ <% truncated_title = truncate(workflow.title, :length => 35) %>
+ <%=link_to(query ? highlight_all(truncated_title, query) : truncated_title, workflow_path(workflow),
+ :title => workflow.title) %>
+ <span style="font-weight:normal;">(<%= workflow.current_version %>) </span>
</p>
<p style="font-size: 85%; margin-top: 0; padding-top: 0;">
Modified: trunk/public/stylesheets/styles.css (3332 => 3333)
--- trunk/public/stylesheets/styles.css 2013-01-22 16:18:41 UTC (rev 3332)
+++ trunk/public/stylesheets/styles.css 2013-01-23 11:42:21 UTC (rev 3333)
@@ -826,13 +826,13 @@
table.alt_table {
border-collapse: collapse;
+ border: 1px solid #ccc;
+ margin-bottom: 0.5em;
}
table.alt_table td {
- border-top: 1px solid #BBBBBB;
- border-bottom: 1px solid #BBBBBB;
margin-bottom: 0.5em;
- padding: 1em 0.5em;
+ padding: 0.5em;
vertical-align: top;
width: 737px;
}
@@ -1052,13 +1052,12 @@
vertical-align: middle;
}
-.icon A {
- white-space: nowrap;
+.icon a {
padding-right: 2px;
vertical-align: middle;
}
-.icon IMG {
+.icon img {
padding: 2px;
vertical-align: middle;
}