ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

crocodoc button for assignment submission page 

fixes CNVS-10289
fixes CNVS-12066

test plan:
 - as a student, submit an assignment with crocodoc
 - view your submission
 - there should be a 'View Feedback' button that links you to
   the crocodoc view of the document
   - it should have a tooltip
 - as a student, submit an assignment with scribd
 - view your submission
 - there should be a 'Preview' button that has a tooltip

Change-Id: I6ead48eff4f30d95e1730d3bff905a29833b9073
Reviewed-on: https://gerrit.instructure.com/31994
Reviewed-by: Cameron Matheson <cameron@instructure.com>
Tested-by: Jenkins <jenkins@instructure.com>
QA-Review: Caleb Guanzon <cguanzon@instructure.com>
Product-Review: Cameron Sutter <csutter@instructure.com>
This commit is contained in:
Cameron Sutter 2014-03-17 10:59:10 -06:00
parent 8d7a11e132
commit b5b370d3e2
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/views/submissions/show_preview.html.erb
View File

@ -85,11 +85,19 @@
<span><%= number_to_human_size(attachment.size) %></span>
</div>
<% preview_url = context_url(@context, :context_assignment_submission_url, @assignment.id, @submission.user_id, :download => attachment.id) %>
<% preview_document = t('preview_document', 'Preview the document') %>
<% if attachment.crocodoc_available? %>
<% preview_document = t('preview_crocodoc_document', 'Preview your submission and view teacher feedback, if available')
button_text = t('view_feedback_button', 'View Feedback')
%>
<% elsif attachment.scribdable? %>
<% preview_document = t('preview_scribd_document', 'Preview your submission')
button_text = t('view_preview_button', 'Preview')
%>
<% end %>
<% if attachment.crocodoc_available? || attachment.scribdable? %>
<div class="ui-listview-text ui-listview-right" style="padding-left:5px; padding-right:5px;">
<a href=<%= preview_url %> title="<%= preview_document %>" class="modal_preview_link" aria-hidden="true" tabindex="-1" data-attachment_id="<%= attachment.id %>" data-submission_id="<%= @submission.id %>" data-dialog-title="<%= attachment.display_name %>" <%= doc_preview_attributes(attachment) %>><%= image_tag('preview.png') %></a>
</div>
<div class="ui-listview-text ui-listview-right" style="padding: 4px 5px 0px 5px;">
<a href=<%= preview_url %> data-tooltip title="<%= preview_document %>" class="modal_preview_link btn" role="button" aria-hidden="true" tabindex="-1" data-attachment_id="<%= attachment.id %>" data-submission_id="<%= @submission.id %>" data-dialog-title="<%= attachment.display_name %>" <%= doc_preview_attributes(attachment) %>><%= button_text %></a>
</div>
<% end %>
<a href="<%= preview_url %>" class="ui-listview-text comment_attachment_link <%= attachment.mime_class %>">
<%= attachment.display_name %>