Navigation changes to the GPX traces page

Display a better message when no traces are present and only
display the paging links when multiple pages exist.

diff --git a/app/views/trace/_trace_paging_nav.html.erb b/app/views/trace/_trace_paging_nav.html.erb
index 724efdd74535b669338d43548c0d502066ea7a83..669c1fe70d6f3b323c1e1c357f9eb30975facf44 100644 (file)
--- a/app/views/trace/_trace_paging_nav.html.erb
+++ b/app/views/trace/_trace_paging_nav.html.erb
@@ -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>

diff --git a/app/views/trace/list.html.erb b/app/views/trace/list.html.erb
index 06c6fb9f1c194f3b692288bc3e8d19b07f756dcc..3003df98a58d661a2c9651e7efa03f396759b915 100644 (file)
--- a/app/views/trace/list.html.erb
+++ b/app/views/trace/list.html.erb
@@ -20,22 +20,20 @@
   <% end %>
 </p>
 
-<% if @traces.size > 1 %>
+<% if @traces.size > 0 %>
   <%= 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>
+  <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' %>
+<% else %>
+  <%= t 'trace.list.empty_html', :upload_link => link_to(t('trace.list.upload_new'), trace_create_path) %>
 <% end %>
 
 <%= render :partial => 'trace_optionals' %>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index c3d31f5f32c6029888b62a103088e57b3e548319..5669d843769928b6e410662445aee14c7169216a 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1490,8 +1490,8 @@ en:
       visibility: "Visibility:"
     trace_paging_nav:
       showing_page: "Showing page %{page}"
-      next: "Next »"
-      previous: "« Previous"
+      older: "Older Traces"
+      newer: "Newer Traces"
     trace:
       pending: "PENDING"
       count_points: "%{count} points"
@@ -1513,9 +1513,8 @@ en:
       your_traces: "Your GPS traces"
       public_traces_from: "Public GPS traces from %{user}"
       tagged_with: " tagged with %{tags}"
-      empty: "Nothing here yet."
+      empty_html: "Nothing here yet. %{upload_link} Or learn more about GPS tracing on the <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki page</a>."
       upload_new: "Upload a new trace"
-      learn_more: "Or learn more about GPS tracing on the <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki page</a>."
     delete:
       scheduled_for_deletion: "Trace scheduled for deletion"
     make_public: