Diff
Modified: branches/events/app/views/blobs/show.rhtml (3102 => 3103)
--- branches/events/app/views/blobs/show.rhtml 2012-08-23 13:36:02 UTC (rev 3102)
+++ branches/events/app/views/blobs/show.rhtml 2012-08-23 13:40:36 UTC (rev 3103)
@@ -14,33 +14,22 @@
<%= render :partial => "contributions/datetime_info", :locals => { :contributable => @blob } -%>
<div class="contribution_mini_nav">
- |
- <%= link_to "License", "#license" %>
- |
- <%= link_to "Credits (address@hidden)", "#credits" %>
- |
- <%= link_to "Attributions (address@hidden)", "#attributions" %>
- |
- <%= link_to "Tags <span id='mini_nav_tag_link'>(address@hidden)</span>", "#tags" %>
- |
- <%= link_to "Featured in Packs (#{Pack.packs_with_contributable(@blob).length})", "#featured_in_packs" %>
- |
- <%= link_to "Ratings (address@hidden)", "#ratings" %>
- |
- <%= link_to "Attributed By (address@hidden)", "#attributed_by" %>
- |
- <%= link_to "Favourited By (address@hidden)", "#favourited_by" %>
- |
- <br/>
- |
- <%= link_to("Version History", "#version_history") -%>
- |
- <% if logged_in? and @blob.owner?(current_user) %>
- <a href=""
- |
- <% end %>
- <%= link_to "Comments (address@hidden)", "#comments" %>
- |
+ <ul class="link_list">
+ <li><%= link_to "License", "#license" %></li>
+ <li><%= link_to "Credits (address@hidden)", "#credits" %></li>
+ <li><%= link_to "Attributions (address@hidden)", "#attributions" %></li>
+ <li><%= link_to "Tags <span id='mini_nav_tag_link'>(address@hidden)</span>", "#tags" %></li>
+ <li><%= link_to "Featured in Packs (#{Pack.packs_with_contributable(@blob).length})", "#featured_in_packs" %></li>
+ <li><%= link_to "Ratings (address@hidden)", "#ratings" %></li>
+ <li><%= link_to "Attributed By (address@hidden)", "#attributed_by" %></li>
+ <li><%= link_to "Favourited By (address@hidden)", "#favourited_by" %></li>
+ <br/>
+ <li><%= link_to("Version History (address@hidden)", "#version_history") -%></li>
+ <% if logged_in? and @blob.owner?(current_user) %>
+ <li><a href=""
+ <% end %>
+ <li><%= link_to "Comments (address@hidden)", "#comments" %> </li>
+ </ul>
</div>
<div class="contribution_left_box">
Modified: branches/events/app/views/gadgets/_asset_manager.rhtml (3102 => 3103)
--- branches/events/app/views/gadgets/_asset_manager.rhtml 2012-08-23 13:36:02 UTC (rev 3102)
+++ branches/events/app/views/gadgets/_asset_manager.rhtml 2012-08-23 13:40:36 UTC (rev 3103)
@@ -4,17 +4,13 @@
<div class="header">
<p>My Stuff</p>
- <p>
- <small>
- <%= link_to(pluralize(current_user.friends.length, "Friend"), currentusers_things_url('friends')) %>
- <span style="color:#999999;"> | </span>
- <%= 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)), currentusers_things_url(controller_visible_name(klass.humanize.pluralize).downcase)) %>
- <% end %>
- </small>
- </p>
+ <ul class="link_list subheader">
+ <li><%= link_to(pluralize(current_user.friends.length, "Friend"), currentusers_things_url('friends')) %></li>
+ <li><%= link_to(pluralize(current_user.networks_owned.length + current_user.networks.length, "Group"), currentusers_things_url('groups')) %></li>
+ <% filter_contributables(current_user.contributions).each do |klass,contributables| %>
+ <li><%= link_to(pluralize(contributables.length, controller_visible_name(klass.humanize.pluralize)), currentusers_things_url(controller_visible_name(klass.humanize.pluralize).downcase)) %></li>
+ <% end %>
+ </ul>
</div>
<div id="myexp_assetmanager_gadget_contents" class="contents">
Modified: branches/events/app/views/layouts/_myexperiment.rhtml (3102 => 3103)
--- branches/events/app/views/layouts/_myexperiment.rhtml 2012-08-23 13:36:02 UTC (rev 3102)
+++ branches/events/app/views/layouts/_myexperiment.rhtml 2012-08-23 13:40:36 UTC (rev 3103)
@@ -38,14 +38,14 @@
<% 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 style="text-align: left; float: left;" 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 style="text-align: right; float: right;" id="user_links" class="links">
<%= render :partial => 'layouts/user_links' %>
</div>
</div>
Modified: branches/events/app/views/layouts/_site_info_links.rhtml (3102 => 3103)
--- branches/events/app/views/layouts/_site_info_links.rhtml 2012-08-23 13:36:02 UTC (rev 3102)
+++ branches/events/app/views/layouts/_site_info_links.rhtml 2012-08-23 13:40:36 UTC (rev 3103)
@@ -1,3 +1,5 @@
-<%= link_to "About", "http://wiki.myexperiment.org/", :target => '_blank' %> |
-<%= link_to "Mailing List", "http://lists.nongnu.org/mailman/listinfo/myexperiment-discuss", :target => '_blank' %> |
-<%= link_to "Publications", "http://wiki.myexperiment.org/index.php/Papers", :target => '_blank' %>
\ No newline at end of file
+<ul class="link_list">
+<li><%= link_to "About", "http://wiki.myexperiment.org/", :target => '_blank' %></li>
+<li><%= link_to "Mailing List", "http://lists.nongnu.org/mailman/listinfo/myexperiment-discuss", :target => '_blank' %></li>
+<li><%= link_to "Publications", "http://wiki.myexperiment.org/index.php/Papers", :target => '_blank' %></li>
+</ul>
Modified: branches/events/app/views/layouts/_user_links.rhtml (3102 => 3103)
--- branches/events/app/views/layouts/_user_links.rhtml 2012-08-23 13:36:02 UTC (rev 3102)
+++ branches/events/app/views/layouts/_user_links.rhtml 2012-08-23 13:40:36 UTC (rev 3103)
@@ -1,8 +1,10 @@
+<ul class="link_list">
<% if logged_in? -%>
- <%= signout_link -%> |
+ <li><%= signout_link -%></li>
<% else -%>
- <%= icon "login", new_session_url, nil, nil, "Log in" -%> |
- <%= icon "user", new_user_url, nil, nil, "Register" -%> |
+ <li><%= icon "login", new_session_url, nil, nil, "Log in" -%></li>
+ <li><%= icon "user", new_user_url, nil, nil, "Register" -%></li>
<% end %>
-<%= icon "feedback", "/feedback", nil, nil, "Give us Feedback" -%> |
-<%= icon "user-invite", invite_users_path, nil, nil, "Invite" -%>
\ No newline at end of file
+<li><%= icon "feedback", "/feedback", nil, nil, "Give us Feedback" -%></li>
+<li><%= icon "user-invite", invite_users_path, nil, nil, "Invite" -%></li>
+</ul>
Modified: branches/events/app/views/packs/show.rhtml (3102 => 3103)
--- branches/events/app/views/packs/show.rhtml 2012-08-23 13:36:02 UTC (rev 3102)
+++ branches/events/app/views/packs/show.rhtml 2012-08-23 13:40:36 UTC (rev 3103)
@@ -16,35 +16,24 @@
<%= render :partial => "contributions/datetime_info", :locals => { :contributable => @pack } -%>
<div class="contribution_mini_nav">
- |
- <% if @authorised_to_edit %>
- <%= link_to "Add an Item", "#add_item" %>
- |
- <% end %>
- <% if logged_in? and @pack.owner? current_user %>
- <a href=""
- |
- <% end %>
- <%= link_to "Tags <span id='mini_nav_tag_link'>(address@hidden)</span>", "#tags" %>
- |
- <%= link_to "Featured in Packs (#{Pack.packs_with_contributable(@pack).length})", "#featured_in_packs" %>
- |
- <%= link_to "Favourited By (address@hidden)", "#favourited_by" %>
- |
- <%= link_to "Comments (address@hidden)", "#comments" %>
- |
+ <ul class="link_list">
+ <% if @authorised_to_edit %>
+ <li><%= link_to "Add an Item", "#add_item" %></li>
+ <% end %>
+ <% if logged_in? and @pack.owner? current_user %>
+ <li><a href=""
+ <% end %>
+ <li><%= link_to "Tags <span id='mini_nav_tag_link'>(address@hidden)</span>", "#tags" %></li>
+ <li><%= link_to "Featured in Packs (#{Pack.packs_with_contributable(@pack).length})", "#featured_in_packs" %></li>
+ <li><%= link_to "Favourited By (address@hidden)", "#favourited_by" %></li>
+ <li><%= link_to "Comments (address@hidden)", "#comments" %></li>
+ </ul>
</div>
<div class="contribution_left_box">
<div class="contribution_version_box">
<div class="contribution_version_inner_box">
- <p>
- <b>Title:</b>
- <span class="title"><%=h @pack.title %></span>
- </p>
- <br/>
-
<h3>
<%= info_icon_with_tooltip("This section shows the overall description of this Pack") %>
Description
Modified: branches/events/app/views/users/show.rhtml (3102 => 3103)
--- branches/events/app/views/users/show.rhtml 2012-08-23 13:36:02 UTC (rev 3102)
+++ branches/events/app/views/users/show.rhtml 2012-08-23 13:40:36 UTC (rev 3103)
@@ -362,7 +362,8 @@
<% case (@tab||"News"); when "News" %>
- <%= render :partial => "layouts/news", :locals => { :collection => news(@user, true) } %>
+ <h3>Activity from <%=h @user.name -%></h3>
+ <%= activity_feed(:subject => @user) -%>
<% when "Friends" %>
Modified: branches/events/app/views/workflows/show.rhtml (3102 => 3103)
--- branches/events/app/views/workflows/show.rhtml 2012-08-23 13:36:02 UTC (rev 3102)
+++ branches/events/app/views/workflows/show.rhtml 2012-08-23 13:40:36 UTC (rev 3103)
@@ -3,6 +3,7 @@
<ul class="sectionIcons">
<% if @authorised_to_edit -%>
<li><%= icon('new', new_version_workflow_path(@workflow), nil, nil, 'Upload New Version')%></li>
+ <li><%= icon('edit', workflow_version_edit_url(@workflow.id, @viewing_version.version), nil, nil, "Edit This Version") %></li>
<% end -%>
<% if mine?(@workflow) -%>
<li><%= icon('manage', edit_workflow_path(@workflow), nil, nil, 'Manage Workflow Entry')%></li>
@@ -21,37 +22,24 @@
<%= render :partial => "contributions/datetime_info", :locals => { :contributable => @workflow } -%>
<div class="contribution_mini_nav">
- |
- <%= link_to "License", "#license" %>
- |
- <%= link_to "Credits (address@hidden)", "#credits" %>
- |
- <%= link_to "Attributions (address@hidden)", "#attributions" %>
- |
- <%= link_to "Tags <span id='mini_nav_tag_link'>(address@hidden)</span>", "#tags" %>
- |
- <%= link_to "Featured in Packs (#{Pack.packs_with_contributable(@workflow).length})", "#featured_in_packs" %>
- |
- <%= link_to "Ratings (address@hidden)", "#ratings" %>
- |
- <%= link_to "Attributed By (address@hidden)", "#attributed_by" %>
- |
- <%= link_to "Favourited By (address@hidden)", "#favourited_by" %>
- |
- <br/>
- |
- <a href="" (<%= @workflow.citations.length -%>)</a>
- |
- <a href="" History</a>
- |
- <% if logged_in? and @workflow.owner?(current_user) %>
- <a href=""
- |
- <% end %>
- <%= link_to "Reviews (address@hidden)", "#reviews" %>
- |
- <%= link_to "Comments (address@hidden)", "#comments" %>
- |
+ <ul class="link_list">
+ <li><%= link_to "License", "#license" %></li>
+ <li><%= link_to "Credits (address@hidden)", "#credits" %></li>
+ <li><%= link_to "Attributions (address@hidden)", "#attributions" %></li>
+ <li><%= link_to "Tags <span id='mini_nav_tag_link'>(address@hidden)</span>", "#tags" %></li>
+ <li><%= link_to "Featured in Packs (#{Pack.packs_with_contributable(@workflow).length})", "#featured_in_packs" %></li>
+ <li><%= link_to "Ratings (address@hidden)", "#ratings" %></li>
+ <li><%= link_to "Attributed By (address@hidden)", "#attributed_by" %></li>
+ <li><%= link_to "Favourited By (address@hidden)", "#favourited_by" %></li>
+ <br />
+ <li><a href="" (<%= @workflow.citations.length -%>)</a></li>
+ <li><a href="" History (<%= @workflow.versions.length -%>)</a></li>
+ <% if logged_in? and @workflow.owner?(current_user) %>
+ <li><a href=""
+ <% end %>
+ <li><%= link_to "Reviews (address@hidden)", "#reviews" %></li>
+ <li><%= link_to "Comments (address@hidden)", "#comments" %></li>
+ </ul>
</div>
@@ -61,34 +49,8 @@
<%= render(:partial => "contributions/version_selector", :locals => { :resource => @workflow, :version => @viewing_version, :path => :workflow_version_path }) %>
- <% if @authorised_to_edit %>
- <div style="margin-top: 1em;">
- <ul class="sectionIcons" style="margin-top: 0.7em; margin-bottom: 0.6em;">
- <li style="margin-left: 0;"><%= icon('edit', workflow_version_edit_url(@workflow.id, @viewing_version.version), nil, nil, "Edit This Version") %></li>
- <% if false %>
- <% if @latest_version_number > 1 %>
- <% if Authorization.check("destroy", @workflow, current_user) %>
- <li><%= icon('destroy', workflow_version_delete_url(@workflow.id, @viewing_version.version), nil, { :confirm => "Are you sure you want to delete this version (Version address@hidden) of the Workflow file (including title/description metadata)?", :method => :delete }, 'Delete This Version') %></li>
- <% end %>
- <% end %>
- <% end %>
- </ul>
- </div>
- <% end %>
-
<div class="contribution_version_inner_box">
- <p>
- <b>Title:</b>
- <span class="title"><%= h @viewing_version.title %></span>
- </p>
- <p>
- <b>Type:</b>
- <%= link_to(h(@viewing_version.content_type.title), content_type_path(@viewing_version.content_type)) %>
- </p>
-
- <br/>
-
<h3>
<%= info_icon_with_tooltip("This section shows the preview of this version of the Workflow (click on the image to expand)") %>
Preview
@@ -204,77 +166,62 @@
</p>
<% end %>
- <br/>
-
- <h3>
- <%= info_icon_with_tooltip("This section shows the internal components of this workflow version") %>
- Workflow Components
- </h3>
-
- <% if @authorised_to_download %>
- <% begin %>
- <%= render :partial => "workflows/#{get_type_dir(@viewing_version)}/internals", :locals => { :workflow => @workflow, :version => @viewing_version_number } -%>
- <% rescue %>
- <p class="none_text">
- There was a problem in extracting the internals of this workflow.
- </p>
- <% end %>
- <% else %>
- <p class="none_text">
- You do not have permission to see the internals of this workflow
- </p>
- <% end %>
</div>
</div>
-</div>
-
-<div class="contribution_right_box">
- <div class="contribution_section_box" style= "font-size: 100%; padding: 0.7em 0.9em; font-weight: bold;">
- <p><%= info_icon_with_tooltip("The type of workflow system that this Workflow is designed for.") %> Workflow Type</p>
- <p><%= link_to(h(@viewing_version.content_type.title), content_type_path(@viewing_version.content_type)) %></p>
- </div>
-
- <%= render :partial => "contributions/uploader_box", :locals => { :contributable => @workflow } %>
-
- <%= render :partial => "contributions/license_box", :locals => { :contributable => @workflow } %>
-
- <%= render :partial => "contributions/credits_attributions_box", :locals => { :contributable => @workflow, :edit_path => edit_workflow_path(@workflow) } %>
-
- <%= render :partial => "contributions/curation_box", :locals => { :contributable => @workflow } %>
-
- <%= render :partial => "tags/tags_box", :locals => { :taggable => @workflow,
- :owner_id => ((@workflow.contribution.contributor_type == 'User') ? @workflow.contribution.contributor_id : nil),
- :add_path => tag_workflow_path(@workflow),
- :edit_path => edit_workflow_path(@workflow),
- :allow_edit => @authorised_to_edit } %>
-
- <%= render :partial => "contributions/shared_with_groups_box", :locals => { :contributable => @workflow } %>
-
- <%= render :partial => "contributions/in_packs_box", :locals => { :contributable => @workflow, :contributable_url => @workflow_entry_url } %>
-
- <%= render :partial => "contributions/ratings_box", :locals => { :contributable => @workflow } %>
-
- <%= render :partial => "contributions/attributed_by", :locals => { :contributable => @workflow } %>
-
- <%= render :partial => "contributions/favourited_box", :locals => { :contributable => @workflow,
- :add_to_favourites_path => favourite_workflow_url(@workflow),
- :remove_from_favourites_path => favourite_delete_workflow_url(@workflow) } %>
-
- <%= render :partial => "contributions/statistics_box", :locals => { :contributable => @workflow } %>
-</div>
-
-<div class="clearer"> </div>
-
<!-- BEGIN tabs -->
<br/>
<div id="tabsContainer" class="tabsContainer"></div>
+<div class="tabContainer">
+ <div class="tabTitle">Comments</div>
+ <div class="tabContent">
+ <a name="comments"></a>
+ <div id="commentsBox">
+ <%= render :partial => "comments/comments", :locals => { :commentable => @workflow } %>
+ </div>
+ </div>
+</div>
+
+<div class="tabContainer">
+ <div class="tabTitle">Activity</div>
+ <div class="tabContent">
+ <a name="activity"></a>
+ <%= activity_feed(:object => @workflow) -%>
+ </div>
+</div>
+
+<div class="tabContainer">
+ <div class="tabTitle">Reviews</div>
+ <div class="tabContent">
+ <a name="reviews"></a>
+ <div id="ratingsBox">
+ <%= render :partial => "reviews/reviews", :locals => { :reviewable => @workflow } %>
+ </div>
+ </div>
+</div>
+
<%= render :partial => "contributions/citations_tab", :locals => { :item => @workflow } %>
+<% if @authorised_to_download -%>
+ <div class="tabContainer">
+ <div class="tabTitle">Components</div>
+ <div class="tabContent">
+ <a name="components"></a>
+ <% begin %>
+ <%= render :partial => "workflows/#{get_type_dir(@viewing_version)}/internals", :locals => { :workflow => @workflow, :version => @viewing_version_number } -%>
+ <% rescue %>
+ <p class="none_text">
+ There was a problem in extracting the internals of this workflow.
+ </p>
+ <% end %>
+ </div>
+ </div>
+<% end %>
+
<div class="tabContainer">
<div class="tabTitle">Version History</div>
<div class="tabContent">
@@ -283,6 +230,29 @@
</div>
</div>
+<% if @contributions_with_similar_services.length > 0 %>
+ <div class="tabContainer">
+ <div class="tabTitle">Similar</div>
+ <div class="tabContent">
+ <a name="similar"></a>
+
+ <h2>
+ <%= icon "workflow", nil, nil, { :style => "vertical-align: middle;" }, "" -%>
+ <span style="vertical-align: middle;">Other workflows that use similar services</span>
+ <span class="count_text" style="vertical-align: middle;">(<%= @contributions_with_similar_services.length %>)</span>
+ </h2>
+
+ <% if @contributions_with_similar_services.length > @similar_services_limit %>
+ <p><i>Only the first <%= @similar_services_limit %> workflows that use similar services are shown</i>. <a href="" workflows_path(@wsdls_filter) -%>">View all workflows that use these services</a>.</p>
+ <br />
+ <% end %>
+
+ <%= render :partial => "contributions/list", :locals => { :collection => @address@hidden - 1], :table => true } %>
+
+ </div>
+ </div>
+<% end %>
+
<% if logged_in? and @workflow.owner?(current_user) %>
<div class="tabContainer">
@@ -302,56 +272,49 @@
</div>
</div>
- <% if false %>
- <div class="tabContainer">
- <div class="tabTitle">Viewing History</div>
- <div class="tabContent">
- <%= render :partial => "contributions/history", :object => @workflow.contribution %>
- </div>
- </div>
- <% end %>
-
<% end %>
<!-- END tabs -->
-<br/>
-<br/>
-
-<div id="ratingsBox">
- <%= render :partial => "reviews/reviews", :locals => { :reviewable => @workflow } %>
</div>
-<br/>
-<br/>
+<div class="contribution_right_box">
+ <div class="contribution_section_box" style= "font-size: 100%; padding: 0.7em 0.9em; font-weight: bold;">
+ <p><%= info_icon_with_tooltip("The type of workflow system that this Workflow is designed for.") %> Workflow Type</p>
+ <p><%= link_to(h(@viewing_version.content_type.title), content_type_path(@viewing_version.content_type)) %></p>
+ </div>
+
+ <%= render :partial => "contributions/uploader_box", :locals => { :contributable => @workflow } %>
+
+ <%= render :partial => "contributions/license_box", :locals => { :contributable => @workflow } %>
+
+ <%= render :partial => "contributions/credits_attributions_box", :locals => { :contributable => @workflow, :edit_path => edit_workflow_path(@workflow) } %>
+
+ <%= render :partial => "contributions/curation_box", :locals => { :contributable => @workflow } %>
-<div id="commentsBox">
- <%= render :partial => "comments/comments", :locals => { :commentable => @workflow } %>
+ <%= render :partial => "tags/tags_box", :locals => { :taggable => @workflow,
+ :owner_id => ((@workflow.contribution.contributor_type == 'User') ? @workflow.contribution.contributor_id : nil),
+ :add_path => tag_workflow_path(@workflow),
+ :edit_path => edit_workflow_path(@workflow),
+ :allow_edit => @authorised_to_edit } %>
+
+ <%= render :partial => "contributions/shared_with_groups_box", :locals => { :contributable => @workflow } %>
+
+ <%= render :partial => "contributions/in_packs_box", :locals => { :contributable => @workflow, :contributable_url => @workflow_entry_url } %>
+
+ <%= render :partial => "contributions/ratings_box", :locals => { :contributable => @workflow } %>
+
+ <%= render :partial => "contributions/attributed_by", :locals => { :contributable => @workflow } %>
+
+ <%= render :partial => "contributions/favourited_box", :locals => { :contributable => @workflow,
+ :add_to_favourites_path => favourite_workflow_url(@workflow),
+ :remove_from_favourites_path => favourite_delete_workflow_url(@workflow) } %>
+
+ <%= render :partial => "contributions/statistics_box", :locals => { :contributable => @workflow } %>
</div>
-<!-- Other workflows that use a service this workflow users -->
+<div class="clearer"> </div>
-<br />
-<br />
-
-<h2>
- <%= icon "workflow", nil, nil, { :style => "vertical-align: middle;" }, "" -%>
- <span style="vertical-align: middle;">Other workflows that use similar services</span>
- <span class="count_text" style="vertical-align: middle;">(<%= @contributions_with_similar_services.length %>)</span>
-</h2>
-
-<% if @contributions_with_similar_services.length > @similar_services_limit %>
- <p><i>Only the first <%= @similar_services_limit %> workflows that use similar services are shown</i>. <a href="" workflows_path(@wsdls_filter) -%>">View all workflows that use these services</a>.</p>
- <br />
-<% end %>
-
-<% if @contributions_with_similar_services.length > 0 %>
- <%= render :partial => "contributions/list", :locals => { :collection => @address@hidden - 1], :table => true } %>
-<% else %>
- <p>There are no workflows in <%= Conf.sitename %> that use similar services to this Workflow.</p>
-<% end %>
-
-
<%= render :partial => "contributions/alternative_formats" %>
<!-- OpenURL context object -->
Modified: branches/events/public/_javascript_s/tag_suggestions.js (3102 => 3103)
--- branches/events/public/_javascript_s/tag_suggestions.js 2012-08-23 13:36:02 UTC (rev 3102)
+++ branches/events/public/_javascript_s/tag_suggestions.js 2012-08-23 13:40:36 UTC (rev 3103)
@@ -41,7 +41,7 @@
function updateTagViews() {
- separator = ' <span style="color: #999999;">|</span> ';
+ separator = ' ';
markup = "";
summary = "";
@@ -54,11 +54,11 @@
for (i = 0; i < suggestions.length; i++) {
tag = suggestions[i];
- cl = 'unselected_tag_suggestion';
+ cl = 'unselected_tag';
fun = 'addTag';
if (tagsToAdd.indexOf(tag) != -1) {
- cl = 'selected_tag_suggestion';
+ cl = 'tag';
fun = 'removeTag';
}
Modified: branches/events/public/stylesheets/gadgets.css (3102 => 3103)
--- branches/events/public/stylesheets/gadgets.css 2012-08-23 13:36:02 UTC (rev 3102)
+++ branches/events/public/stylesheets/gadgets.css 2012-08-23 13:40:36 UTC (rev 3103)
@@ -36,11 +36,20 @@
padding: 0 6px 0 6px;
}
-.myexperiment_gadget .header p {
+.myexperiment_gadget .subheader {
font-weight: bold;
text-align: center;
+ font-size: 85%;
+ line-height: 1.4;
+ color: #333333;
+ margin: 0 4px;
}
+.myexperiment_gadget .header P {
+ font-weight: bold;
+ text-align: center;
+}
+
.myexperiment_gadget .header small {
font-size: 85%;
line-height: 1.4;
Modified: branches/events/public/stylesheets/styles.css (3102 => 3103)
--- branches/events/public/stylesheets/styles.css 2012-08-23 13:36:02 UTC (rev 3102)
+++ branches/events/public/stylesheets/styles.css 2012-08-23 13:40:36 UTC (rev 3103)
@@ -53,7 +53,7 @@
border: none;
padding: 0 0 0.3em 0;
margin: 1em 0 0.8em 0;
- border-bottom: 1px dotted #999999;
+ border-bottom: 1px solid #C8C8C8;
}
h4 {
@@ -191,6 +191,11 @@
padding: 0 6px 0 6px;
background-color: #456AAA;
width: 180px;
+
+ border-radius: 0px 0px 8px 8px;
+ -moz-border-radius: 0px 0px 8px 8px;
+ -webkit-border-bottom-left-radius: 8px;
+ -webkit-border-bottom-right-radius: 8px;
}
/* Begin Footer styles */
@@ -1106,12 +1111,9 @@
}
.contribution_section_box {
- background-image: url('/images/box-bg1.png');
- background-position: top;
- background-repeat: repeat-x;
- background-color: #FFFFCC;
+ background-color: #F8F8C8;
+ border-bottom: 1px solid #CCCC99;
padding: 0.3em 0.3em;
- border: 1px dotted #999999;
text-align: center;
margin-bottom: 0.6em;
}
@@ -1204,9 +1206,7 @@
}
.contribution_version_box {
- border: 1px dotted #999999;
margin-bottom: 1em;
- background-color: #F7F7F7;
}
.contribution_version_box .title {
@@ -1216,13 +1216,9 @@
}
.contribution_version_selector_box {
+ background-color: #F8F8C8;
+ border-bottom: 1px solid #CCCC99;
padding: 0.6em 0.5em 0.4em 0.5em;
- border: 0px dotted #999999;
- border-width: 0 0 1px 0;
- background-image: url('/images/box-bg1.png');
- background-position: top;
- background-repeat: repeat-x;
- background-color: #FFFFCC;
color: #333333;
}
@@ -1459,8 +1455,8 @@
.box_standout {
padding: 0.5em 0.8em;
- border: 1px dotted #999999;
- background-color: #FFFFCC;
+ background-color: #F8F8C8;
+ border-bottom: 1px solid #CCCC99;
}
.box_important {
@@ -1953,34 +1949,30 @@
line-height: 20px;
}
-.unselected_tag_suggestion {
- border: 1px SOLID white;
- padding-left: 4px;
- padding-right: 4px;
+.unselected_tag {
+ background-color: #e0e0e0;
+ color: #808080;
+ border-bottom: 1px SOLID #c0c0c0;
+ padding: 2px 8px 2px 8px;
}
-.unselected_tag_suggestion:hover {
- border: 1px SOLID #d0d0f0;
- background-color: white;
- padding-left: 4px;
- padding-right: 4px;
- color: #000099;
+.unselected_tag:hover {
+ background-color: #d0d0d0;
+ color: #808080;
+ border-bottom: 1px SOLID #a0a0a0;
text-decoration: none;
}
-.selected_tag_suggestion {
- border: 1px SOLID #a0a0c0;
+.tag {
background-color: #d0d0f0;
- padding-left: 4px;
- padding-right: 4px;
+ border-bottom: 1px SOLID #a0a0c0;
+ padding: 2px 8px 2px 8px;
}
-.selected_tag_suggestion:hover {
- border: 1px SOLID #a0a0c0;
- background-color: #d0d0f0;
- padding-left: 4px;
- padding-right: 4px;
+.tag:hover {
+ background-color: #c0c0e0;
color: #000099;
+ border-bottom: 1px SOLID #9090b0;
text-decoration: none;
}
@@ -2010,8 +2002,8 @@
.quality {
width: 157px;
- background: #EEA;
- border: 1px solid #CCCCAA;
+ background: #DDA;
+ border-bottom: 1px solid #BB8;
margin: 4px;
padding: 4px;
text-align: center;
@@ -2365,3 +2357,25 @@
line-height: 1.2;
font-size: 85%;
}
+
+.hTagcloud LI + LI:before {
+ content: "\0000a0"
+}
+
+.link_list {
+ padding: 0;
+ margin: 0;
+}
+
+.link_list LI {
+ list-style: none;
+ display: inline;
+ padding: 0;
+ margin: 0;
+ white-space: nowrap;
+}
+
+.link_list LI + LI:before {
+ content: "\0000a0";
+}
+