Skip to content

Commit

Permalink
consistent link naming for discussion reply links
Browse files Browse the repository at this point in the history
Sometimes it said "reply", sometimes it said "add a new
entry". Sometimes there was a title on hover, sometimes
there wasn't.

Change-Id: I02c7636cf59f0d931d7e2fa602fa59b447faea87
Reviewed-on: https://gerrit.instructure.com/6976
Tested-by: Hudson <[email protected]>
Reviewed-by: Ryan Shaw <[email protected]>
  • Loading branch information
whitmer committed Nov 16, 2011
1 parent f69d403 commit 6782081
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions app/views/discussion_topics/_entry.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@
<div class="link_box">
<span class="links">
<% if !@topic_agglomerated && (!entry || !entry.new_record?) %>
<a href="<%= context_url(entry_context, :new_context_discussion_entry_url) %>" class="add_entry_link disabled_link atr-reply"><%= t :reply_to_message, "Reply to this Message" %></a>
<a href="<%= context_url(entry_context, :edit_context_discussion_entry_url, entry_id) %>" class="edit_entry_link disabled_link atr-edit"><%= t :edit_message, "Edit this Message" %></a>
<a href="<%= context_url(entry_context, :context_discussion_entry_url, entry_id) %>" class="delete_entry_link disabled_link atr-delete"><%= t :delete_message, "Delete this Message" %></a>
<a href="<%= context_url(entry_context, :new_context_discussion_entry_url) %>" class="add_entry_link disabled_link atr-reply" title="<%= t :reply_to_message, "Make a Side Comment" %>"><%= t :reply_to_message, "Make a Side Comment" %></a>
<a href="<%= context_url(entry_context, :edit_context_discussion_entry_url, entry_id) %>" class="edit_entry_link disabled_link atr-edit" title="<%= t :edit_message, "Edit this Message" %>"><%= t :edit_message, "Edit this Message" %></a>
<a href="<%= context_url(entry_context, :context_discussion_entry_url, entry_id) %>" class="delete_entry_link disabled_link atr-delete" title="<%= t :delete_message, "Delete this Message" %>"><%= t :delete_message, "Delete this Message" %></a>
<% end %>
</span>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/views/shared/_topic.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<div class="link_box">
<span class="links">
<% if single_topic && topic && can_do(topic, @current_user, :reply) %>
<a href="#" class="add_entry_link atr-reply" title="<%= t('links.reply', %{Reply}) %>"><%= t('links.reply', %{Reply}) %></a>
<a href="#" class="add_entry_link atr-reply" title="<%= t('links.reply', %{Add New Entry}) %>"><%= t('links.reply', %{Add New Entry}) %></a>
<% end %>
<a style="<%= "display: none;" if !can_do(topic, @current_user, :update) %>" href="<%= context_url(topic_context, :controller => :discussion_topics, :action => :update, :id => topic_id) %>" class="edit_topic_link no-hover"><%= image_tag "edit.png", :alt => t('images.alt.edit', "Edit"), :title => t('images.title.edit', "Edit %{topic}", :topic => topic_desc) %></a>
<a style="<%= "display: none;" if !can_do(topic, @current_user, :delete) %>" href="<%= context_url(topic_context, :controller => :discussion_topics, :action => :destroy, :id => topic_id) %>" class="delete_topic_link no-hover"><%= image_tag "delete.png", :alt => t('images.alt.delete', "Delete"), :title => t('images.title.delete', "Delete %{topic}", :topic => topic_desc) %></a>
Expand Down

0 comments on commit 6782081

Please sign in to comment.