cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Navigation changes to the GPX traces page

Browse source 
Display a better message when no traces are present and only
display the paging links when multiple pages exist.
This commit is contained in:
Steve Singer 2012-07-22 10:41:17 -04:00 • committed by Tom Hughes
parent 51079ecafb
commit 69d91bf24a
3 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

25
app/views/trace/_trace_paging_nav.html.erb
View file

@ -1,15 +1,18 @@
<p>
<% if @page > 1 %>
<%= link_to t('trace.trace_paging_nav.previous'), params.merge({ :page => @page - 1 }) %>
<% else %>
<%= t('trace.trace_paging_nav.previous') %>
<% end %>
| <%= t('trace.trace_paging_nav.showing_page', :page => @page) %> |
<% if @traces.size > 1 %>
<% if @page > 1 %>
<%= link_to t('trace.trace_paging_nav.previous'), params.merge({ :page => @page - 1 }) %>
<% else %>
<%= t('trace.trace_paging_nav.previous') %>
<% end %>
<% if @traces.size < @page_size %>
<%= t('trace.trace_paging_nav.next') %>
<% else %>
<%= link_to t('trace.trace_paging_nav.next'), params.merge({ :page => @page + 1 }) %>
<% end %>
| <%= t('trace.trace_paging_nav.showing_page', :page => @page) %> |
<% if @traces.size < @page_size %>
<%= t('trace.trace_paging_nav.next') %>
<% else %>
<%= link_to t('trace.trace_paging_nav.next'), params.merge({ :page => @page + 1 }) %>
<% end %>
<% end %>
</p>

26
app/views/trace/list.html.erb
View file

@ -20,22 +20,20 @@
<% end %>
</p>
<% if @traces.size > 1 %>
<% if @traces.size > 0 %>
<%= render :partial => 'trace_paging_nav' %>
<table id="trace_list" cellpadding="3">
<tr>
<th></th>
<th></th>
</tr>
<%= render :partial => 'trace', :collection => @traces unless @traces.nil? %>
</table>
<%= render :partial => 'trace_paging_nav' %>
<% else %>
<%= t('trace.list.empty') %> <%= link_to t('trace.list.upload_new'), :controller => 'trace', :action => 'list', :display_name => nil, :tag => nil, :page => nil %> <%= raw t('trace.list.learn_more') %>
<% end %>
<table id="trace_list" cellpadding="3">
<tr>
<th></th>
<th></th>
</tr>
<%= render :partial => 'trace', :collection => @traces unless @traces.nil? %>
</table>
<% if @traces.size > 1 %>
<%= render :partial => 'trace_paging_nav' %>
<%= t 'trace.list.empty_html', :upload_link => link_to(t('trace.list.upload_new'), trace_create_path) %>
<% end %>
<%= render :partial => 'trace_optionals' %>