style the "File Uploads For" iframe and handle swf's
2 things: 1. styled the file uploads for: thing so that it is not so ugly. 2. if anything in the file list is a swf, when they click it embed it inline with wmode: opaque so that it doesn't appear on to of everything (like the students dropdown in the speedGrader) Change-Id: Ifcc1044d5256269f1f8b5549f1fb51fde088dba8 fixes: #3497 and zendesk #4562 Reviewed-on: https://gerrit.instructure.com/2192 Tested-by: Hudson <hudson@instructure.com> Reviewed-by: Brian Whitmer <brian@instructure.com>
This commit is contained in:
Ryan Shaw
Ryan Shaw
parent
e1a3350d7e
commit
96b0b820eb
|
|
@ -0,0 +1,79 @@
|
|||
@import "environment.sass";
|
||||
|
||||
.ui-listview {
|
||||
-moz-box-shadow: 0px 1px 4px rgba(0,0,0,.3);
|
||||
-webkit-box-shadow: 0px 1px 4px rgba(0,0,0,.3);
|
||||
box-shadow: 0px 1px 4px rgba(0,0,0,.3);
|
||||
padding: 0;
|
||||
list-style: none;
|
||||
min-width: 300px;
|
||||
|
||||
@include border-radius(0.6em);
|
||||
li:first-child { @include border-top-radius(0.6em); }
|
||||
li:last-child { @include border-bottom-radius(0.6em); }
|
||||
&, li:first-child, li:last-child {
|
||||
-webkit-background-clip: padding-box;
|
||||
-moz-background-clip: padding-box;
|
||||
background-clip: padding-box;
|
||||
}
|
||||
|
||||
li {
|
||||
border: 1px solid #ccc;
|
||||
border-bottom-width: 0;
|
||||
background: #eee;
|
||||
font-weight: bold;
|
||||
color: #444;
|
||||
text-shadow: 0 1px 1px #f6f6f6;
|
||||
text-decoration: none;
|
||||
@include vertical-gradiant(#fdfdfd, #eeeeee);
|
||||
.ui-listview-text{
|
||||
display: block;
|
||||
position: relative;
|
||||
height: 100%;
|
||||
padding: .7em 15px .7em 44px;
|
||||
text-overflow: ellipsis; overflow: hidden; white-space: nowrap;
|
||||
font-size: 1em; /*this is to override the .file, .pdf, .doc etc 10px size*/
|
||||
background-position: 15px center; /*overrides background-position left of attachment_links*/
|
||||
}
|
||||
&:hover {
|
||||
border-color: #bbb;
|
||||
background: #dadada;
|
||||
font-weight: bold;
|
||||
color: #101010;
|
||||
text-decoration: none;
|
||||
text-shadow: 0 1px 1px #fff;
|
||||
@include vertical-gradiant(#ededed, #dadada);
|
||||
a{ text-decoration: none;}
|
||||
}
|
||||
&:active {
|
||||
border: 1px solid #999;
|
||||
background: #999;
|
||||
font-weight: bold;
|
||||
color: #fff;
|
||||
cursor: pointer;
|
||||
text-shadow: 0 -1px 1px #999;
|
||||
text-decoration: none;
|
||||
@include vertical-gradiant(#ccc, #aaa);
|
||||
outline: none;
|
||||
a { color: #fff; }
|
||||
}
|
||||
.ui-listview-right {
|
||||
display: block;
|
||||
float: right;
|
||||
.turnitin_similarity_score {
|
||||
margin-right: 10px;
|
||||
}
|
||||
}
|
||||
|
||||
&.ui-listview-header, &.ui-listview-header:hover {
|
||||
padding: .5em 15px;
|
||||
font-size: 14px;
|
||||
border: 1px solid #b3cbbc;
|
||||
background: #5e87b0;
|
||||
color: #747575;
|
||||
font-weight: normal;
|
||||
text-shadow: 0 -1px 1px #cce6d6;
|
||||
@include vertical-gradiant(#c8e0d1, #b3cbbc);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -64,21 +64,37 @@
|
|||
<%= user_content(@submission.body, @context.asset_string, @submission.asset_string) %>
|
||||
</div>
|
||||
<% elsif @submission.submission_type == "online_upload" %>
|
||||
<div style="width: 600px; margin: 5px auto;">
|
||||
File Uploads for <%= @submission.user.name %>:<br/>
|
||||
<% @submission.attachments.each do |attachment| %>
|
||||
<div style="font-size: 1.2em; margin-top: 10px;">
|
||||
<a style="font-size: 1em;" href="<%= context_url(@context, :context_assignment_submission_url, @assignment.id, @submission.user_id, :download => attachment.id) %>" class="comment_attachment_link <%= attachment.mime_class %> <%= 'instructure_scribd_file' if attachment.scribdable? %>"><%= attachment.display_name %></a>
|
||||
<% if @submission.turnitin_data && (@submission.current_submission_graded? || can_do(@context, @current_user, :manage_grades)) %>
|
||||
<% if (turnitin_score = @submission.turnitin_data[attachment.asset_string]) && turnitin_score[:similarity_score] %>
|
||||
<a href="<%= context_url(@context, :context_assignment_submission_turnitin_report_url, @submission.assignment_id, @submission.user_id, attachment.asset_string) %>" target="_blank" class="not_external turnitin_similarity_score <%= turnitin_score[:state] %>_score"><%= turnitin_score[:similarity_score] %> %</a>
|
||||
<div class="centered-block">
|
||||
<div class="centered-block-wrap">
|
||||
<div class="centered-block-inner">
|
||||
<ul class="ui-listview" style="margin-top: 30px">
|
||||
<li class="ui-listview-header">File Uploads for <b><%= @submission.user.name %></b></li>
|
||||
<% @submission.attachments.each do |attachment| %>
|
||||
<li>
|
||||
<div class="ui-listview-text ui-listview-right">
|
||||
<% if @submission.turnitin_data && (@submission.current_submission_graded? || can_do(@context, @current_user, :manage_grades)) && (turnitin_score = @submission.turnitin_data[attachment.asset_string]) && turnitin_score[:similarity_score] %>
|
||||
<a href="<%= context_url(@context, :context_assignment_submission_turnitin_report_url, @submission.assignment_id, @submission.user_id, attachment.asset_string) %>" target="_blank" class="not_external turnitin_similarity_score <%= turnitin_score[:state] %>_score"><%= turnitin_score[:similarity_score] %> %</a>
|
||||
<% end %>
|
||||
<span><%= number_to_human_size(attachment.size) %></span>
|
||||
</div>
|
||||
<a href="<%= context_url(@context, :context_assignment_submission_url, @assignment.id, @submission.user_id, :download => attachment.id) %>" class="ui-listview-text comment_attachment_link <%= attachment.mime_class %> <%= 'instructure_scribd_file' if attachment.scribdable? %>">
|
||||
<%= attachment.display_name %>
|
||||
</a>
|
||||
</li>
|
||||
<% end %>
|
||||
<% end %>
|
||||
|
||||
</ul>
|
||||
</div>
|
||||
<span style="padding-left: 20px;"><%= number_to_human_size(attachment.size) %></span>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
<% js_block do %>
|
||||
<script>
|
||||
$("a.flash").click(function() {
|
||||
swfobject.embedSWF($(this).attr('href'), "main", "100%", "100%", "9.0.0", false, null, { wmode: "opaque" }, null);
|
||||
return false;
|
||||
});
|
||||
</script>
|
||||
<% end %>
|
||||
|
||||
<% elsif @submission.submission_type == "online_quiz" %>
|
||||
<% content_for :stylesheets do %>
|
||||
<meta HTTP-EQUIV="REFRESH" content="0; url=<%= context_url(@context, :context_quiz_history_url, @assignment.quiz.id, :user_id => @submission.user_id, :headless => 1, :version => @submission.quiz_submission_version) %>"/>
|
||||
|
|
|
|||
|
|
@ -179,6 +179,7 @@ stylesheets:
|
|||
- public/stylesheets/compiled/g_util_buttons.css
|
||||
- public/stylesheets/compiled/g_util_inst_tree.css
|
||||
- public/stylesheets/compiled/g_util_chevron_crumbs.css
|
||||
- public/stylesheets/compiled/g_util_ui_listview.css
|
||||
- public/stylesheets/compiled/g_assignments.css
|
||||
- public/stylesheets/compiled/g_content_imports.css
|
||||
- public/stylesheets/compiled/g_gradebook_history.css
|
||||
|
|
|
|||
Loading…
Reference in New Issue