From 16bc449325039e1c061eb771a3f3f289a730e29a Mon Sep 17 00:00:00 2001
From: Ryan Shaw <ryan@instructure.com>
Date: Thu, 13 Dec 2012 21:43:24 -0700
Subject: [PATCH] fix icons on assignment right side
this: http://cl.ly/image/0S2f0s1g2p2E
instead of: http://cl.ly/image/0a3g402b2g1A
Change-Id: I7d85f916fd2d5dac481e4dbb3c6ee996f5310c75
Reviewed-on: https://gerrit.instructure.com/16087
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Clare Hetherington <clare@instructure.com>
Reviewed-by: Chris Hart <chris@12spokes.com>
---
app/views/assignments/_assignment_sidebar.html.erb | 8 ++++----
app/views/assignments/_grade_assignment.html.erb | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/app/views/assignments/_assignment_sidebar.html.erb b/app/views/assignments/_assignment_sidebar.html.erb
index dec33d117ad..44573a0ef9d 100644
--- a/app/views/assignments/_assignment_sidebar.html.erb
+++ b/app/views/assignments/_assignment_sidebar.html.erb
@@ -17,16 +17,16 @@
<div class="rs-margin-lr rs-margin-top">
<% if can_do(@assignment, @current_user, :update_content) %>
<% if @assignment.external_tool? %>
- <%= link_to(image_tag("back.png") + t('links.view_assignment', "View Assignment"), polymorphic_url([@context, @assignment]), :class => 'view_assignment_link btn button-sidebar-wide') %>
+ <a href="<%= polymorphic_url([@context, @assignment]) %>" class="view_assignment_link btn button-sidebar-wide"><i class="icon-arrow-left"></i> <%= t('links.view_assignment', "View Assignment") %></a>
<% end %>
- <a href="#" class="edit_full_assignment_link btn button-sidebar-wide"><%= image_tag "edit.png" %> <%= t 'links.edit_assignment', "Edit Assignment" %></a>
+ <a href="#" class="edit_full_assignment_link btn button-sidebar-wide"><i class="icon-edit"></i> <%= t 'links.edit_assignment', "Edit Assignment" %></a>
<% end %>
</div>
<% unless @assignment.new_record? %>
<% if can_do(@assignment, @current_user, :update) %>
<div class="rs-margin-lr">
- <a href="<%= context_url(@context, :context_rubrics_url) %>" class="add_rubric_link btn button-sidebar-wide" style="<%= hidden if @assignment.rubric_association %>"><i class="icon-add"></i> <%= t 'links.add_rubric', "Add Rubric" %></a>
+ <a href="<%= context_url(@context, :context_rubrics_url) %>" class="add_rubric_link btn button-sidebar-wide" style="<%= hidden if @assignment.rubric_association %>"><i class="icon-rubric"></i> <%= t 'links.add_rubric', "Add Rubric" %></a>
</div>
<% end %>
@@ -57,7 +57,7 @@
<%= render :partial => "submission_sidebar" %>
<% elsif @assignment.expects_submission? && can_do(@assignment, @current_user, :submit) %>
<div class="rs-margin-lr">
- <a href="#" class="submit_assignment_link button-sidebar-wide btn <%= 'late' if @current_user_submission && @current_user_submission.late? %>"><%= image_tag "add.png" %> <%= t 'links.submit', "Submit Assignment" %></a><br/>
+ <a href="#" class="submit_assignment_link button-sidebar-wide btn <%= 'late' if @current_user_submission && @current_user_submission.late? %>"><i class="icon-add"></i> <%= t 'links.submit', "Submit Assignment" %></a><br/>
</div>
<% end %>
<% end %>
diff --git a/app/views/assignments/_grade_assignment.html.erb b/app/views/assignments/_grade_assignment.html.erb
index 7fbdbc3018a..f8d6789be88 100644
--- a/app/views/assignments/_grade_assignment.html.erb
+++ b/app/views/assignments/_grade_assignment.html.erb
@@ -16,7 +16,7 @@
<b><br /><%= t :resubmission_count, { :one => "1 Ungraded Re-submission", :other => "%{count} Ungraded Re-submissions" }, :count => resubmitted %></b>
<% end %>
</div>
- <a target="_blank" class="btn button-sidebar-wide" href="<%= context_url(@context, :speed_grader_context_gradebook_url, :assignment_id => @assignment.id) %>"><%= image_tag "grading_icon.png" %> SpeedGrader™</a><br/>
+ <a target="_blank" class="btn button-sidebar-wide" href="<%= context_url(@context, :speed_grader_context_gradebook_url, :assignment_id => @assignment.id) %>"><i class="icon-speed-grader"></i> SpeedGrader™</a><br/>
<% if @assignment.submission_types && @assignment.submission_types.match(/(online_upload|online_text_entry|online_url)/)%>
<div>
<%= render :partial => 'submissions/submission_download' %>
@@ -44,9 +44,9 @@ Students will see the modified files in their comments for the submission.
<% end %>
</div>
<% else %>
- <a target="_blank" class="btn button-sidebar-wide" href="<%= context_url(@context, :speed_grader_context_gradebook_url, :assignment_id => @assignment.id) %>"><%= image_tag "grading_icon.png" %> SpeedGrader™</a>
+ <a target="_blank" class="btn button-sidebar-wide" href="<%= context_url(@context, :speed_grader_context_gradebook_url, :assignment_id => @assignment.id) %>"><i class="icon-speed-grader"></i> SpeedGrader™</a>
<% end %>
<div class="rs-margin-lr">
- <a style="<%= hidden unless @assignment.has_peer_reviews? %>" class="assignment_peer_reviews_link btn button-sidebar-wide" href="<%= context_url(@context, :context_assignment_peer_reviews_url, @assignment.id) %>"><%= image_tag "word_bubble.png", :alt => "" %> <%= t 'links.peer_reviews', "Peer Reviews" %></a>
+ <a style="<%= hidden unless @assignment.has_peer_reviews? %>" class="assignment_peer_reviews_link btn button-sidebar-wide" href="<%= context_url(@context, :context_assignment_peer_reviews_url, @assignment.id) %>"><i class="icon-peer-review"></i> <%= t 'links.peer_reviews', "Peer Reviews" %></a>
</div>
</div>