Merge 16355:16480 from trunk.

app/views/browse/relation_history.html.erb

@@ -11,9 +11,8 @@
         <%= render :partial => "relation_details", :object => relation %>
         <hr />
       <% end %>
-      <%= link_to "Download XML", :controller => "old_relation", :action => "history" %>
-      or
-      <%= link_to "view details", :action => "relation" %>
+      <%= t'browse.relation_history.download', :download_xml_link => link_to(t('browse.relation_history.download_xml'), :controller => "old_relation", :action => "history"), 
+                                               :view_details_link => link_to(t('browse.relation_history.view_details'), :action => "relation") %>
     </td>
     <%= render :partial => "map", :object => @relation %>
   </tr>

app/views/layouts/site.html.erb

@@ -114,10 +114,6 @@
         <%= yield :left_menu %>
       </div>
 
-      <div id="sotm" class="notice">
-        <%= link_to image_tag("sotm.png", :alt => t('layouts.sotm'), :title => t('layouts.sotm'), :border => "0"), "http://www.stateofthemap.org/register" %>
-      </div>
-
       <%= yield :optionals %>
 
       <center>

app/views/message/new.html.erb

@@ -6,7 +6,7 @@
   <table>
     <tr valign="top">
       <th><%= t'message.new.subject' %></th>
-      <td><%= f.text_field :title, :size => 60, :value => @title %></td>
+      <td><%= f.text_field :title, :size => 60, :value => @subject %></td>
     </tr>
     <tr valign="top">
       <th><%= t'message.new.body' %></th>

app/views/trace/_trace.html.erb

@@ -27,9 +27,7 @@
     <%= t'trace.trace.by' %> <%=link_to h(trace.user.display_name), {:controller => 'user', :action => 'view', :display_name => trace.user.display_name} %>
     <% if !trace.tags.empty? %>
       <%= t'trace.trace.in' %> 
-      <% trace.tags.each do |tag| %>
-        <%= link_to_tag tag.tag %>
-      <% end %>
+      <%= trace.tags.collect { |tag| link_to_tag tag.tag }.join(", ") %>
     <% end %>
   </td>
 </tr>

app/views/trace/_trace_form.html.erb

@@ -2,7 +2,7 @@
 <table>
   <tr><td align="right"><%= t'trace.trace_form.upload_gpx' %></td><td><%= f.file_field :gpx_file, :size => 50, :maxlength => 255 %></td></tr>
   <tr><td align="right"><%= t'trace.trace_form.description' %></td><td><%= f.text_field :description, :size => 50, :maxlength => 255 %></td></tr>
-  <tr><td align="right"><%= t'trace.trace_form.tags' %></td><td><%= f.text_field :tagstring, :size => 50, :maxlength => 255 %></td></tr>
+  <tr><td align="right"><%= t'trace.trace_form.tags' %></td><td><%= f.text_field :tagstring, :size => 50, :maxlength => 255 %> (<%= t'trace.trace_form.tags_help' %>)</td></tr>
   <tr><td align="right"><%= t'trace.trace_form.public' %></td><td><%= f.check_box :public %> <span class="minorNote">(<a href="<%= t'trace.trace_form.public_help_url' %>"><%= t'trace.trace_form.public_help' %></a>)</span></td></tr>
   <tr><td></td><td><%= submit_tag t('trace.trace_form.upload_button') %> | <a href="<%= t'trace.trace_form.help_url' %>"><%= t'trace.trace_form.help' %></a></td></tr>
 </table>

app/views/trace/edit.html.erb

@@ -28,11 +28,11 @@
   </tr>
   <tr>
     <td><%= t'trace.edit.description' %></td>
-    <td><%= f.text_field :description %></td>
+    <td><%= f.text_field :description, :size => 50 %></td>
   </tr>
   <tr>
     <td><%= t'trace.edit.tags' %></td>
-    <td><%= f.text_field :tagstring %></td>
+    <td><%= f.text_field :tagstring, :size => 50 %> (<%= t'trace.edit.tags_help' %>)</td>
   </tr>
 </table>
 

app/views/trace/view.html.erb

@@ -36,9 +36,7 @@
     <td><%= t'trace.view.tags' %></td>
     <td>
     <% unless @trace.tags.empty? %>
-      <% @trace.tags.each do |tag| %>
-        <%= link_to tag.tag, { :controller => 'trace', :action => 'list', :tag => tag.tag, :id => nil } %>
-      <% end %>
+      <%= @trace.tags.collect { |tag| link_to tag.tag, { :controller => 'trace', :action => 'list', :tag => tag.tag, :id => nil } }.join(", ") %>
     <% else %>
       <i><%= t'trace.view.none' %></i>
     <% end %>