aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLouise Crow <louise.crow@gmail.com>2013-12-09 09:30:10 +0000
committerLouise Crow <louise.crow@gmail.com>2013-12-09 09:30:10 +0000
commit650cf463a4123fbeb270d049649f267cc074c5a9 (patch)
treeaecbba11b4e585088741ec747a05dd6320539052
parent441d5c7e222ef16ef4e3513dcc1b9d510011e1f7 (diff)
parent4b3bdf38a19a1aa8c4cf6d216cb68c37e2238bf2 (diff)
Merge remote-tracking branch 'openaustralia_github/consistent-admin-links' into rails-3-develop
-rw-r--r--app/views/comment/_single_comment.html.erb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/comment/_single_comment.html.erb b/app/views/comment/_single_comment.html.erb
index d2edc8dbe..a6d234b34 100644
--- a/app/views/comment/_single_comment.html.erb
+++ b/app/views/comment/_single_comment.html.erb
@@ -17,10 +17,10 @@
</div>
<p class="event_actions">
<% if !comment.id.nil? %>
- <%= link_to "Link to this", comment_path(comment), :class => "link_to_this" %>
<% if !@user.nil? && @user.admin_page_links? %>
- | <%= link_to "Admin", admin_request_edit_comment_path(comment) %>
+ <%= link_to "Admin", admin_request_edit_comment_path(comment) %> |
<% end %>
+ <%= link_to "Link to this", comment_path(comment), :class => "link_to_this" %>
<!-- | <%= link_to _('Report abuse'), comment_path(comment) %> -->
<% end %>
</p>