Test notices of disabled changeset commenting

[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 74596e529c6e1ed5f8926161c71fa227c4e1131a..583ac107fbb34fa35b01ee656b61a92d935b4f9e 100644 (file)
--- a/app/views/browse/changeset.html.erb
+++ b/app/views/browse/changeset.html.erb
@@ -35,8 +35,7 @@
               <li id="c<%= comment.id %>">
                 <small class='text-muted'>
                   <%= t(".comment_by_html",
               <li id="c<%= comment.id %>">
                 <small class='text-muted'>
                   <%= t(".comment_by_html",

-                        :time_ago => tag.abbr(friendly_date_ago(comment.created_at),
-                                              :title => l(comment.created_at)),
+                        :time_ago => friendly_date_ago(comment.created_at),

                         :user => link_to(comment.author.display_name, user_path(comment.author))) %>
                   <% if current_user and current_user.moderator? %>
                     — <span class="action-button" data-comment-id="<%= comment.id %>" data-method="POST" data-url="<%= changeset_comment_hide_url(comment.id) %>"><%= t("javascripts.changesets.show.hide_comment") %></span>
                         :user => link_to(comment.author.display_name, user_path(comment.author))) %>
                   <% if current_user and current_user.moderator? %>
                     — <span class="action-button" data-comment-id="<%= comment.id %>" data-method="POST" data-url="<%= changeset_comment_hide_url(comment.id) %>"><%= t("javascripts.changesets.show.hide_comment") %></span>


@@ -50,8 +49,7 @@
               <li id="c<%= comment.id %>">
                 <small class='text-muted'>
                   <%= t(".hidden_comment_by_html",
               <li id="c<%= comment.id %>">
                 <small class='text-muted'>
                   <%= t(".hidden_comment_by_html",

-                        :time_ago => tag.abbr(friendly_date_ago(comment.created_at),
-                                              :title => l(comment.created_at)),
+                        :time_ago => friendly_date_ago(comment.created_at),

                         :user => link_to(comment.author.display_name, user_path(comment.author))) %>
                   — <span class="action-button text-muted" data-comment-id="<%= comment.id %>" data-method="POST" data-url="<%= changeset_comment_unhide_url(comment.id) %>"><%= t("javascripts.changesets.show.unhide_comment") %></span>
                  </small>
                         :user => link_to(comment.author.display_name, user_path(comment.author))) %>
                   — <span class="action-button text-muted" data-comment-id="<%= comment.id %>" data-method="POST" data-url="<%= changeset_comment_unhide_url(comment.id) %>"><%= t("javascripts.changesets.show.unhide_comment") %></span>
                  </small>


@@ -67,7 +65,7 @@
   <% end %>
 
   <% unless current_user %>
   <% end %>
 
   <% unless current_user %>

-    <p class="notice">
+    <p>

       <%= link_to(t(".join_discussion"), login_path(:referer => request.fullpath)) %>
     </p>
   <% end %>
       <%= link_to(t(".join_discussion"), login_path(:referer => request.fullpath)) %>
     </p>
   <% end %>


@@ -85,7 +83,7 @@
         </div>
       </form>
     <% else %>
         </div>
       </form>
     <% else %>

-      <p class="notice">
+      <p>

         <%= t(".still_open") %>
       </p>
     <% end %>
         <%= t(".still_open") %>
       </p>
     <% end %>


@@ -122,14 +120,20 @@
 <% if @next_by_user || @prev_by_user %>
   <div class='secondary-actions'>
     <% if @prev_by_user %>
 <% if @next_by_user || @prev_by_user %>
   <div class='secondary-actions'>
     <% if @prev_by_user %>

-      <%= link_to "<< #{@prev_by_user.id}", :id => @prev_by_user.id %>
+      <%= link_to({ :id => @prev_by_user.id }, :class => "icon-link") do %>
+        <%= previous_page_svg_tag :height => 11 %>
+        <%= @prev_by_user.id %>
+      <% end %>

       &middot;
     <% end %>
     <%= user = (@prev_by_user || @next_by_user).user.display_name
         link_to tag.bdi(user), :controller => "changesets", :action => "index", :display_name => user %>
     <% if @next_by_user %>
       &middot;
       &middot;
     <% end %>
     <%= user = (@prev_by_user || @next_by_user).user.display_name
         link_to tag.bdi(user), :controller => "changesets", :action => "index", :display_name => user %>
     <% if @next_by_user %>
       &middot;

-      <%= link_to "#{@next_by_user.id} >>", :id => @next_by_user.id %>
+      <%= link_to({ :id => @next_by_user.id }, :class => "icon-link") do %>
+        <%= @next_by_user.id %>
+        <%= next_page_svg_tag :height => 11 %>
+      <% end %>

     <% end %>
   </div>
 <% end %>
     <% end %>
   </div>
 <% end %>