diff --git a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
index 0112dd40ac..8c6fc24420 100644
--- a/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
+++ b/common/lib/xmodule/xmodule/css/combinedopenended/display.scss
@@ -54,10 +54,17 @@ section.combined-open-ended-status {
font-family: monospace;
font-size: 1em;
padding: 10px;
+ .show-results {
+ margin-top: .3em;
+ text-align:right;
+ }
+ .show-results-button {
+ font: 1em monospace;
+ }
}
.statusitem-current {
- background-color: #ccc;
+ background-color: #cdc;
color: #2C2C2C;
}
@@ -624,7 +631,15 @@ section.open-ended-child {
font-size: 0.9em;
}
- .assessment {
- margin: 40px 0px 20px 0px;
+ .assessment-container {
+ margin: 40px 0px 30px 0px;
+ .scoring-container
+ {
+ p
+ {
+ margin-bottom: 1em;
+ }
+
+ }
}
}
diff --git a/lms/templates/combined_open_ended.html b/lms/templates/combined_open_ended.html
index a32a496895..c99ebe21d1 100644
--- a/lms/templates/combined_open_ended.html
+++ b/lms/templates/combined_open_ended.html
@@ -2,10 +2,7 @@
${display_name}
-
Status
-
${status | n}
-
@@ -21,6 +18,7 @@
+
diff --git a/lms/templates/combined_open_ended_results.html b/lms/templates/combined_open_ended_results.html
index db86e95016..65732cdbaa 100644
--- a/lms/templates/combined_open_ended_results.html
+++ b/lms/templates/combined_open_ended_results.html
@@ -1,4 +1,4 @@
-
Results from Step ${task_number}
+ Results from Step ${task_number}
${results | n}
-
\ No newline at end of file
+
diff --git a/lms/templates/combined_open_ended_status.html b/lms/templates/combined_open_ended_status.html
index ff6f06e221..63111704ae 100644
--- a/lms/templates/combined_open_ended_status.html
+++ b/lms/templates/combined_open_ended_status.html
@@ -1,3 +1,6 @@
+%if len(status_list) > 1:
+Status
+
%for i in xrange(0,len(status_list)):
<%status=status_list[i]%>
@@ -20,9 +23,12 @@
%if status['type']=="openended" and status['state'] in ['done', 'post_assessment']:
%endif
%endfor
+
+%endif
diff --git a/lms/templates/self_assessment_rubric.html b/lms/templates/self_assessment_rubric.html
index da05f87e6d..75c9b41bd6 100644
--- a/lms/templates/self_assessment_rubric.html
+++ b/lms/templates/self_assessment_rubric.html
@@ -1,14 +1,18 @@
-
+
${rubric | n }
% if not read_only:
+
+
Scoring
+
Please select a score below:
%for i in xrange(0,max_score+1):
${i}
%endfor
+
% endif