Commit 2b4e9f45 by Diana Huang

Updates to the CSS and html formatting for statuses

and self-assessment
parent 280a2f29
...@@ -54,10 +54,17 @@ section.combined-open-ended-status { ...@@ -54,10 +54,17 @@ section.combined-open-ended-status {
font-family: monospace; font-family: monospace;
font-size: 1em; font-size: 1em;
padding: 10px; padding: 10px;
.show-results {
margin-top: .3em;
text-align:right;
}
.show-results-button {
font: 1em monospace;
}
} }
.statusitem-current { .statusitem-current {
background-color: #ccc; background-color: #cdc;
color: #2C2C2C; color: #2C2C2C;
} }
...@@ -624,7 +631,15 @@ section.open-ended-child { ...@@ -624,7 +631,15 @@ section.open-ended-child {
font-size: 0.9em; font-size: 0.9em;
} }
.assessment { .assessment-container {
margin: 40px 0px 20px 0px; margin: 40px 0px 30px 0px;
.scoring-container
{
p
{
margin-bottom: 1em;
}
}
} }
} }
...@@ -2,10 +2,7 @@ ...@@ -2,10 +2,7 @@
<h2>${display_name}</h2> <h2>${display_name}</h2>
<div class="status-container"> <div class="status-container">
<h4>Status</h4>
<div class="status-elements">
${status | n} ${status | n}
</div>
</div> </div>
<div class="item-container"> <div class="item-container">
...@@ -21,6 +18,7 @@ ...@@ -21,6 +18,7 @@
<input type="button" value="Next Step" class="next-step-button" name="reset"/> <input type="button" value="Next Step" class="next-step-button" name="reset"/>
</div> </div>
<a name="results" />
<div class="result-container"> <div class="result-container">
</div> </div>
</section> </section>
......
<div class="result-container"> <div class="result-container">
<h4>Results from Step ${task_number}</h4><br/> <h4>Results from Step ${task_number}</h4>
${results | n} ${results | n}
</div> </div>
\ No newline at end of file
%if len(status_list) > 1:
<h4>Status</h4>
<div class="status-elements">
<section id="combined-open-ended-status" class="combined-open-ended-status"> <section id="combined-open-ended-status" class="combined-open-ended-status">
%for i in xrange(0,len(status_list)): %for i in xrange(0,len(status_list)):
<%status=status_list[i]%> <%status=status_list[i]%>
...@@ -20,9 +23,12 @@ ...@@ -20,9 +23,12 @@
%if status['type']=="openended" and status['state'] in ['done', 'post_assessment']: %if status['type']=="openended" and status['state'] in ['done', 'post_assessment']:
<div class="show-results"> <div class="show-results">
<a href="#" class="show-results-button">Show results from step ${status['task_number']}</a> <a href="#results" class="show-results-button">Show results from Step ${status['task_number']}</a>
</div> </div>
%endif %endif
</div> </div>
%endfor %endfor
</section> </section>
</div>
%endif
<div class="assessment"> <div class="assessment-container">
<div class="rubric"> <div class="rubric">
${rubric | n } ${rubric | n }
</div> </div>
% if not read_only: % if not read_only:
<div class="scoring-container">
<h3>Scoring</h3>
<p>Please select a score below:</p>
<select name="assessment" class="assessment"> <select name="assessment" class="assessment">
%for i in xrange(0,max_score+1): %for i in xrange(0,max_score+1):
<option value="${i}">${i}</option> <option value="${i}">${i}</option>
%endfor %endfor
</select> </select>
</div>
% endif % endif
</div> </div>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment