Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Devansh v2.1.0 patches #950

Merged
merged 3 commits into from Dec 16, 2017
Merged

Devansh v2.1.0 patches #950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
537a1ad
bolded notice that annotations and gradebook are decoupled
devanshk Dec 12, 2017
c0f2dd5
added annotation collapse and expand buttons
devanshk Dec 12, 2017
7f85356
Merge branch 'develop' into devansh_v2.1.0_patches
devanshk Dec 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/assets/javascripts/annotations.js
View file
Open in desktop
Expand Up @@ -131,7 +131,7 @@ var initializeAnnotationsForCode = function() {
}, elt("i", {class: "material-icons"}, "delete"));

var min = elt("span", {
class: "delete"
class: "minimize"
}, elt("i", {class: "material-icons"}, "remove"));

if (isInstructor) {
Expand Down
4 changes: 4 additions & 0 deletions app/assets/stylesheets/annotations.css
View file
Open in desktop
Expand Up @@ -229,3 +229,7 @@ pre {
.header > .grader {
flex: 2 0 0;
}

.collapse_expand{
margin-bottom:10px;
}
6 changes: 3 additions & 3 deletions app/views/submissions/view.html.erb
View file
Open in desktop
Expand Up @@ -47,14 +47,14 @@
<h3 class="annotationHeader">Summary</h3>
<% if @problemSummaries.empty? then %>
<% if (@cud.instructor? or @cud.course_assistant?) then %>
<p>Hover over a line of code and click the green box to annotate.<br><br>Note: Point tweaks here don't affect the gradebook.</p>
<p>Hover over a line of code and click the green box to annotate.<br><br><b>Note: Point tweaks here don't affect the gradebook.</b></p>
<% else %>
<p>Nothing to summarize yet.</p>
<% end %>
<% else %>
<div id="summaryList">
<% if (@cud.instructor? or @cud.course_assistant?) then %>
<div class="problemListItem">Note: Point tweaks here don't affect the gradebook.</div>
<b><div class="problemListItem">Note: Point tweaks here don't affect the gradebook.</div></b>
<% end %>
<% @problemSummaries.each do |problem, descriptTuples| %>
<hr>
Expand All @@ -76,7 +76,7 @@

</div>
<div class="col l9">
<h3 id="filename"><%= @displayFilename %></h3>
<h3 id="filename"><%= @displayFilename %></h3><button class="btn collapse_expand" onclick="$('.minimize').click();">Collapse All</button> <button class="btn collapse_expand" onclick="$('.ann-box').click();">Expand All</button>
<div id="code-box">
<% # these lines can't have white space due to the styling for pre and code tages %>
<% # anything wrapped in a <pre><code> will be highlighted by highlightsjs %>
Expand Down