Diff
Modified: trunk/app/views/content/_index.rhtml (3567 => 3568)
--- trunk/app/views/content/_index.rhtml 2013-05-23 10:56:31 UTC (rev 3567)
+++ trunk/app/views/content/_index.rhtml 2013-05-23 14:38:23 UTC (rev 3568)
@@ -53,18 +53,7 @@
<% end %>
</div>
<div class="main">
- <div class="sort">
- Sort by:
- <select = this.options[this.selectedIndex].value;">
- <% @pivot[:pivot_options]["order"].each do |args| %>
- <option value="<%= url_with_params(request.path, request.query_parameters.merge({:order => args["option"]})) -%>"
- <% if params[:order] == args["option"] -%> selected="selected"<% end -%>><%= args["label"] -%></option>
- <% end %>
- </select>
- </div>
- <div>
- <%= render :partial => "layouts/paginate", :locals => { :collection => @pivot[:results] } %>
- </div>
+ <%= render :partial => "layouts/paginate", :locals => { :collection => @pivot[:results], :sort_by => @pivot[:pivot_options]["order"], :num_options => @pivot[:pivot_options]["num_options"] } %>
<div class="summary">
<div class="result-count">
Showing <%= pluralize(@pivot[:results].total_entries, 'result') -%>.
@@ -116,9 +105,7 @@
<% end %>
</div>
<% end %>
- <div>
- <%= render :partial => "layouts/paginate", :locals => { :collection => @pivot[:results], :sort_by => @pivot[:pivot_options]["order"], :num_options => @pivot[:pivot_options]["num_options"] } %>
- </div>
+ <%= render :partial => "layouts/paginate", :locals => { :collection => @pivot[:results], :sort_by => @pivot[:pivot_options]["order"], :num_options => @pivot[:pivot_options]["num_options"] } %>
</div>
</div>
Modified: trunk/app/views/layouts/_myexperiment.html.erb (3567 => 3568)
--- trunk/app/views/layouts/_myexperiment.html.erb 2013-05-23 10:56:31 UTC (rev 3567)
+++ trunk/app/views/layouts/_myexperiment.html.erb 2013-05-23 14:38:23 UTC (rev 3568)
@@ -9,7 +9,7 @@
<% 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"] %>
+ 'star_rating', 'gadgets', 'misc_skinning', 'pagination', address@hidden"stylesheets"] %>
<%= _javascript__include_tag :defaults, "boxover.js", "tabs.js", "folds.js" %>
<% if controller.action_name.downcase == "timeline" %>
Modified: trunk/app/views/layouts/_paginate.rhtml (3567 => 3568)
--- trunk/app/views/layouts/_paginate.rhtml 2013-05-23 10:56:31 UTC (rev 3567)
+++ trunk/app/views/layouts/_paginate.rhtml 2013-05-23 14:38:23 UTC (rev 3568)
@@ -1,28 +1,25 @@
-<%= stylesheet_link_tag "pagination" %>
+<div class="digg_pagination">
+ <%= will_paginate(collection, :outer_window => 0, :inner_window => 2) -%>
-<% if local_assigns[:sort_by] %>
- <div style="float: right; margin: 1em;">
- Sort by:
- <select = this.options[this.selectedIndex].value;">
- <% sort_by.each do |args| %>
- <option value="<%= url_for(request.query_parameters.merge("order" => args["option"])) -%>" <% if params[:order] == args["option"] -%> selected="selected"<% end -%>><%= args["label"] -%></option>
- <% end %>
- </select>
-
- <% if local_assigns[:num_options] %>
- <br />
- <br />
- Results per page:
+ <% if local_assigns[:sort_by] %>
+ <div style="float: right; text-align: right">
+ Sort by:
<select = this.options[this.selectedIndex].value;">
- <% num_options.each do |num_option| %>
- <option value="<%= url_for(request.query_parameters.merge("num" => num_option)) -%>" <% if params[:num] == num_option -%> selected="selected"<% end -%>><%= num_option -%></option>
+ <% sort_by.each do |args| %>
+ <option value="<%= url_with_params(request.path, request.query_parameters.merge({:order => args["option"]})) -%>"
+ <% if params[:order] == args["option"] -%> selected="selected"<% end -%>><%= args["label"] -%></option>
<% end %>
</select>
- <% end %>
- </div>
-<% end %>
-
-<div class="digg_pagination" style="text-align: center">
- <%= will_paginate(collection, :outer_window => 0, :inner_window => 2) -%>
+ <% if local_assigns[:num_options] %>
+ <br /><br />
+ Results per page:
+ <select = this.options[this.selectedIndex].value;">
+ <% num_options.each do |num_option| %>
+ <option value="<%= url_for(request.query_parameters.merge("num" => num_option)) -%>" <% if params[:num] == num_option -%> selected="selected"<% end -%>><%= num_option -%></option>
+ <% end %>
+ </select>
+ <% end %>
+ </div>
+ <% end %>
</div>
Modified: trunk/public/stylesheets/pagination.css (3567 => 3568)
--- trunk/public/stylesheets/pagination.css 2013-05-23 10:56:31 UTC (rev 3567)
+++ trunk/public/stylesheets/pagination.css 2013-05-23 14:38:23 UTC (rev 3568)
@@ -1,6 +1,8 @@
.digg_pagination {
background: white;
cursor: default;
+ margin-bottom: 0.5em;
+ overflow: auto;
/* self-clearing method: */ }
.digg_pagination a, .digg_pagination span, .digg_pagination em {
padding: 0.2em 0.5em;
@@ -34,11 +36,6 @@
color: #000033;
background: #456aaa;
padding: 0.1em 0.25em; }
-.digg_pagination:after {
- display: block;
- height: 0;
- clear: both;
- visibility: hidden; }
* html .digg_pagination {
height: 1%; }
*:first-child + html .digg_pagination {