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

give context to a text submission 

fixes OUT-1077

Test Plan:
- create an assignment
- submit a text entry to the assignment
- go view it in either eportfolio or submission details
- notice it now tells you the id of that submission

Change-Id: If45d7e178a328e19af72a5057ba6bb75acc3f33d
Reviewed-on: https://gerrit.instructure.com/125879
Tested-by: Jenkins
Reviewed-by: Felix Milea-Ciobanu <fmileaciobanu@instructure.com>
QA-Review: Leo Abner <rabner@instructure.com>
Product-Review: Steven Burnett <sburnett@instructure.com>
This commit is contained in:
Steven Burnett 2017-09-13 09:53:39 -06:00
parent c4b3328233
commit 24a67c187c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/eportfolios/_page_section.html.erb
View File

@ -53,7 +53,7 @@
<% elsif page_section["section_type"] == "submission" %>
<% submission = @portfolio.user.submissions.where(id: page_section["submission_id"]).first if page_section["submission_id"].present? %>
<% if submission %>
<iframe class="submission_preview" src="<%= eportfolio_entry_preview_submission_path(@portfolio, @page, submission.id) %>" style="border: 1px solid #aaa; width: 100%; height: 300px; display: block; margin-left: auto; margin-right: auto;" title="<%= t('Preview') %>">
<iframe class="submission_preview" src="<%= eportfolio_entry_preview_submission_path(@portfolio, @page, submission.id) %>" style="border: 1px solid #aaa; width: 100%; height: 300px; display: block; margin-left: auto; margin-right: auto;" title="<%= t("%{assignment} preview", :assignment=> submission.assignment.title) %>">
</iframe>
<% end %>
<% end %>

2
app/views/eportfolios/show.html.erb
View File

@ -346,7 +346,7 @@
</div>
<%= form_for :attachment, :url => context_url(@portfolio.user, :controller => :files, :action => :create, :format => "text"), :html => {:id => "upload_file_form"} do |f| %>
<% end %>
<iframe class="submission_preview" style="border: 1px solid #aaa; width: 95%; height: 300px; display: block; margin-left: auto; margin-right: auto;" src="about:blank" title="<%= t('Preview') %>">
<iframe class="submission_preview" style="border: 1px solid #aaa; width: 95%; height: 300px; display: block; margin-left: auto; margin-right: auto;" src="about:blank" title="<%= t("Preview") %>">
</iframe>
</div>
<div style="display: none;">

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

@ -92,8 +92,8 @@
<% js_bundle 'legacy/submissions_show_preview_text' %>
<div style="text-align: right; margin-top: 15px;">
<select class="data_view">
<option value="paper"><%= t('paper_view', 'Paper View') %></option>
<option value="plain_text"><%= t('plain_view', 'Plain Text View') %></option>
<option aria-label="<%= t("Assignment %{assignment} submission Paper View", :assignment=> @assignment.title) %>" value="paper"><%= t('Paper View') %></option>
<option aria-label="<%= t("Assignment %{assignment} submission Plain Text View", :assignment=> @assignment.title) %>" value="plain_text"><%= t('Plain Text View') %></option>
</select>
</div>
<div id="submission_preview" class="paper user_content">