API 0.4: User rename, view trace links, tag filter summary / see all link, traces testing

app/views/layouts/site.rhtml

@@ -80,9 +80,7 @@
           </center>
 
         </div>
-
         <%= yield :optionals %>
-
         <div id="cclogo">
           <center>
 

app/views/trace/_trace.rhtml

@@ -20,9 +20,9 @@
     by <%= link_to trace.user.display_name, {:controller => 'trace', :action => 'list', :display_name => trace.user.display_name} %>
     in 
     <% if trace.tags %>
-    <% trace.tags.each do |tag| %>
-      <%= link_to tag.tag, :controller => 'trace', :action => @paging_action, :tag => tag.tag %>
-    <% end %>
+      <% trace.tags.each do |tag| %>
+        <%= link_to tag.tag, :controller => 'trace', :action => @paging_action, :tag => tag.tag %>
+      <% end %>
     <% end %>
   </td>
 </tr>

app/views/trace/_trace_optionals.rhtml

@@ -1,17 +1,25 @@
 <% content_for "optionals" do %>
   <div class="optionalbox">
-    <h2>Tags</h2>
+    <span class="oboxheader">Tags</span>
+    <br />
+    <br />
     <% if @all_tags %>
       <% @all_tags.each do |tag| %>
         <%= link_to tag, :controller => 'trace', :action => @paging_action, :tag => tag %><br />
       <% end %>
     <% end %>
   </div>
-  <div class="optionalbox" >
-    <h2>User</h2>
-    <p>It's an optional box!!</p>
-<% if @user %>
-  <%= "<p><b>...and you're logged in!</b></p>" %>
-<% end %>
-  </div>
+  <% if @user %>
+    <div class="optionalbox">
+      <span class="oboxheader">User</span>
+      <br />
+      <br />
+      <form action="/user/rename" method="get" style="margin: 0px">
+        <span>Display name:</span><br />
+        <input type="text" value="<%= @user.display_name %>" maxlength="255" size="8" name="display_name"/>
+        <input type="submit" value="Save"/>
+        <input type="hidden" value="<%= request.request_uri %>" name="redirect_url"/>
+      </form>
+    </div>
+  <% end %>
 <% end %>

app/views/trace/list.rhtml

@@ -1,16 +1,23 @@
 <h1>Public GPS Traces</h1>
 
-<br />
-
+<% if @tag %>
+ Traces filtered by tag <b><%= @tag %></b>
+ <br/><br/>
+<% end %>
 <span class="rsssmall"><a href="<%= url_for :controller => 'trace', :action => 'georss' %>"><img src="/images/RSS.gif" border="0"></a></span> | 
 <% if @user %>
   <%= link_to 'See just your traces', {:controller => 'trace', :action => 'mine'} %>
 <% else %>
   <%= link_to 'login', {:controller => 'user', :action => 'login'} %> to see just your traces
 <% end %>
+<% if @tag %>
+ | <%= link_to 'See all traces', {:controller => 'trace', :action => 'list'} %>
+<% end %>
 
 
-<br /><br />
+<br />
+<br />
+
 <%= render (:partial => 'trace_paging_nav') %>
 
 <table id="keyvalue" cellpadding="3">

app/views/trace/mine.rhtml

@@ -1,8 +1,16 @@
 <h1>Your GPS Traces</h1>
 
-<br />
+<% if @tag %>
+ Traces filtered by tag <b><%= @tag %></b>
+ <br/><br/>
+<% end %>
+<%= link_to 'See all traces', {:controller => 'trace', :action => 'list'} %>
+<% if @tag %>
+  | <%= link_to 'See all your traces', {:controller => 'trace', :action => 'mine'} %>
+<% end %>
 
-<%= link_to 'See all traces', {:controller => 'trace', :action => 'list'} %><br /><br />
+<br />
+<br />
 
 <% if @user %>
 <%= start_form_tag({:action => 'create'}, :multipart => true) %>
@@ -17,8 +25,6 @@
 </td></tr>
 </table>
 
-<br>
-
 <%= end_form_tag %> 
 
 <%= render (:partial => 'trace_paging_nav') %>

app/views/trace/view.rhtml

@@ -3,11 +3,17 @@
 <img src="<%= url_for :controller => 'trace', :action => 'picture', :id => @trace.id, :user_login => @trace.user.display_name %>">
 
 <table border="0">
-  <tr><td>filename:</td><td><%= @trace.name %></td></tr>
+  <tr><td>filename:</td><td><%= @trace.name %></td></tr> <!-- TODO link to download -->
   <tr><td>uploaded at:</td><td><%= @trace.timestamp %></td></tr>
   <tr><td>points:</td><td><%= @trace.size %></td></tr>
-  <tr><td>start coordinate:</td><td><%= @trace.latitude %>, <%= @trace.longitude %></td></tr>
-  <tr><td>owner:</td><td><%= link_to @trace.user.display_name, {:controller => 'trace', :action => 'by_user'} %></td></tr>
+  <tr><td>start coordinate:</td><td><%= @trace.latitude %>, <%= @trace.longitude %></td></tr> <!-- TODO link to map -->
+  <tr><td>owner:</td><td><%= link_to @trace.user.display_name, {:controller => 'trace', :action => 'view', :display_name => @trace.user.display_name, :id => nil} %></td></tr>
   <tr><td>description:</td><td><%= @trace.description %></td></tr>
-  <tr><td>tags:</td><td><%= @trace.tags.collect {|tag| tag.tag} %></td></tr>
+  <tr><td>tags:</td><td>
+    <% if @trace.tags %>
+      <% @trace.tags.each do |tag| %>
+        <%= link_to tag.tag, { :controller => 'trace', :action => 'list', :tag => tag.tag, :id => nil } %>
+      <% end %>
+    <% end %>
+  </td></tr>
 </table>