Use named paths for messages

[rails.git] / app / views / browse / changeset.html.erb

diff --git a/app/views/browse/changeset.html.erb b/app/views/browse/changeset.html.erb
index bbe22792101c283e39fd7084be5a0d930627aa85..ed1e596ee16afb65fcbebffd073f9385f86e15a3 100644 (file)
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -1,8 +1,8 @@
-<% set_title(t('browse.changeset.title', :id => @changeset.id)) %>
+<% set_title(t('.title', :id => @changeset.id)) %>

 
 <h2>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>
 
 <h2>
   <a class="geolink" href="<%= root_path %>"><span class="icon close"></span></a>

-  <%= t('browse.changeset.title', :id => @changeset.id) %>
+  <%= t('.title', :id => @changeset.id) %>

 </h2>
 
 <div class="browse-section">
 </h2>
 
 <div class="browse-section">


@@ -11,11 +11,11 @@
 
   <%= render :partial => "tag_details", :object => @changeset.tags.except('comment') %>
 
 
   <%= render :partial => "tag_details", :object => @changeset.tags.except('comment') %>
 

-  <h4 class="comments-header"><%= t('browse.changeset.discussion') %></h4>
-  
+  <h4 class="comments-header"><%= t('.discussion') %></h4>
+

   <div class="buttons clearfix subscribe-buttons">
     <form action="#" class="hide_unless_logged_in">
   <div class="buttons clearfix subscribe-buttons">
     <form action="#" class="hide_unless_logged_in">

-      <% if @changeset.subscribers.exists?(@user) %>
+      <% if current_user and @changeset.subscribers.exists?(current_user.id) %>

         <input class="action-button" type="submit" name="unsubscribe" value="<%= t('javascripts.changesets.show.unsubscribe') %>" data-method="POST" data-url="<%= changeset_unsubscribe_url(@changeset) %>" />
       <% else %>
         <input class="action-button" type="submit" name="subscribe" value="<%= t('javascripts.changesets.show.subscribe') %>" data-method="POST" data-url="<%= changeset_subscribe_url(@changeset) %>" />
         <input class="action-button" type="submit" name="unsubscribe" value="<%= t('javascripts.changesets.show.unsubscribe') %>" data-method="POST" data-url="<%= changeset_unsubscribe_url(@changeset) %>" />
       <% else %>
         <input class="action-button" type="submit" name="subscribe" value="<%= t('javascripts.changesets.show.subscribe') %>" data-method="POST" data-url="<%= changeset_subscribe_url(@changeset) %>" />


@@ -33,23 +33,21 @@
             <% if comment.visible %>
               <li id="c<%= comment.id %>">
                 <small class='deemphasize'>
             <% if comment.visible %>
               <li id="c<%= comment.id %>">
                 <small class='deemphasize'>

-                  <%= t("browse.changeset.commented_by",
+                  <%= t(".commented_by",

                     :when => friendly_date(comment.created_at), :exact_time => l(comment.created_at),
                     :when => friendly_date(comment.created_at), :exact_time => l(comment.created_at),

-                    :user => link_to(h(comment.author.display_name), {:controller => "user", :action => "view",
-                    :display_name => comment.author.display_name})).html_safe %>
-                  <% if @user and @user.moderator? %>
+                    :user => link_to(h(comment.author.display_name), user_path(comment.author))).html_safe %>
+                  <% if current_user and current_user.moderator? %>

                     — <span class="action-button deemphasize" data-comment-id="<%= comment.id %>" data-method="POST" data-url="<%= changeset_comment_hide_url(comment.id) %>"><%= t('javascripts.changesets.show.hide_comment') %></span>
                   <% end %>
                 </small>
                 <%= comment.body.to_html %>
               </li>
                     — <span class="action-button deemphasize" data-comment-id="<%= comment.id %>" data-method="POST" data-url="<%= changeset_comment_hide_url(comment.id) %>"><%= t('javascripts.changesets.show.hide_comment') %></span>
                   <% end %>
                 </small>
                 <%= comment.body.to_html %>
               </li>

-            <% elsif @user and @user.moderator? %>
+            <% elsif current_user and current_user.moderator? %>

               <li id="c<%= comment.id %>">
                 <small class='deemphasize'>
               <li id="c<%= comment.id %>">
                 <small class='deemphasize'>

-                  <%= t("browse.changeset.hidden_commented_by",
+                  <%= t(".hidden_commented_by",

                     :when => friendly_date(comment.created_at), :exact_time => l(comment.created_at),
                     :when => friendly_date(comment.created_at), :exact_time => l(comment.created_at),

-                    :user => link_to(h(comment.author.display_name), {:controller => "user", :action => "view",
-                    :display_name => comment.author.display_name})).html_safe %>
+                    :user => link_to(h(comment.author.display_name), user_path(comment.author))).html_safe %>

                   — <span class="action-button deemphasize" data-comment-id="<%= comment.id %>" data-method="POST" data-url="<%= changeset_comment_unhide_url(comment.id) %>"><%= t('javascripts.changesets.show.unhide_comment') %></span>
                  </small>
                 <%= comment.body.to_html %>
                   — <span class="action-button deemphasize" data-comment-id="<%= comment.id %>" data-method="POST" data-url="<%= changeset_comment_unhide_url(comment.id) %>"><%= t('javascripts.changesets.show.unhide_comment') %></span>
                  </small>
                 <%= comment.body.to_html %>


@@ -62,7 +60,7 @@
   <% end %>
 
   <div class="notice hide_if_logged_in">
   <% end %>
 
   <div class="notice hide_if_logged_in">

-    <%= link_to(t("browse.changeset.join_discussion"), :controller => 'user', :action => 'login', :referer => request.fullpath) %>
+    <%= link_to(t(".join_discussion"), :controller => 'user', :action => 'login', :referer => request.fullpath) %>

   </div>
 
   <% unless @changeset.is_open? %>
   </div>
 
   <% unless @changeset.is_open? %>


@@ -72,6 +70,10 @@
         <input type="submit" name="comment" value="<%= t('javascripts.changesets.show.comment') %>" data-changeset-id="<%= @changeset.id %>" data-method="POST" data-url="<%= changeset_comment_url(@changeset) %>" disabled="1"/>
       </div>
     </form>
         <input type="submit" name="comment" value="<%= t('javascripts.changesets.show.comment') %>" data-changeset-id="<%= @changeset.id %>" data-method="POST" data-url="<%= changeset_comment_url(@changeset) %>" disabled="1"/>
       </div>
     </form>

+  <% else %>
+    <div class="notice hide_unless_logged_in">
+    <%= t('.still_open') %>
+    </div>

   <% end %>
 
   <% unless @ways.empty? %>
   <% end %>
 
   <% unless @ways.empty? %>


@@ -105,7 +107,7 @@
     </h4>
     <ul>
       <% @nodes.each do |node| %>
     </h4>
     <ul>
       <% @nodes.each do |node| %>

-        <li><%= link_to printable_name(node, true), { :action => "node", :id => node.node_id.to_s }, :class => link_class('node', node), :title => link_title(node) %></li>
+        <li><%= link_to printable_name(node, true), { :action => "node", :id => node.node_id.to_s }, :class => link_class('node', node), :title => link_title(node), :rel => link_follow(node) %></li>

       <% end %>
     </ul>
   <% end %>
       <% end %>
     </ul>
   <% end %>


@@ -119,7 +121,7 @@
     <% end %>
     <%=
         user = (@prev_by_user || @next_by_user).user.display_name
     <% end %>
     <%=
         user = (@prev_by_user || @next_by_user).user.display_name

-        link_to user, :controller => "changeset", :action => "list", :display_name => user
+        link_to content_tag(:bdi, user), :controller => "changeset", :action => "list", :display_name => user

     %>
     <% if @next_by_user %>
       &middot;
     %>
     <% if @next_by_user %>
       &middot;


@@ -129,7 +131,7 @@
 <% end %>
 
 <div class='secondary-actions'>
 <% end %>
 
 <div class='secondary-actions'>

-  <%= link_to(t('browse.changeset.changesetxml'), :controller => "changeset", :action => "read") %>
+  <%= link_to(t('.changesetxml'), :controller => "changeset", :action => "read") %>

   &middot;
   &middot;

-  <%= link_to(t('browse.changeset.osmchangexml'), :controller => "changeset", :action => "download") %>
+  <%= link_to(t('.osmchangexml'), :controller => "changeset", :action => "download") %>

 </div>
 </div>