Skip to content

E
edx-ora2
Commit c9c73744 by gradyward
Options

Merge branch 'authoring' of https://github.com/edx/edx-ora2 into… 

Merge branch 'authoring' of https://github.com/edx/edx-ora2 into grady/student-training-authoring-templates

Conflicts:
	openassessment/xblock/static/sass/oa/utilities/_developer.scss
parents 5e7d1e68 64506f31
Showing with 97 additions and 22 deletions
openassessment/xblock/static/css/openassessment.css
...@@ -2137,10 +2137,11 @@ hr.divider, ...@@ -2137,10 +2137,11 @@ hr.divider,
border-bottom: none; } border-bottom: none; }
#openassessment-editor { #openassessment-editor {
margin-bottom: 0; } margin-bottom: 0;
height: 100%; }
#openassessment-editor .openassessment_editor_content_and_tabs { #openassessment-editor .openassessment_editor_content_and_tabs {
width: 100%; width: 100%;
height: 373px; } height: Calc(100% - 97px); }
#openassessment-editor #openassessment_editor_header { #openassessment-editor #openassessment_editor_header {
background-color: #e5e5e5; background-color: #e5e5e5;
width: 100%; width: 100%;
...@@ -2384,7 +2385,7 @@ hr.divider, ...@@ -2384,7 +2385,7 @@ hr.divider,
#openassessment-editor #oa_rubric_editor_wrapper .openassessment_large_text_input, #openassessment-editor #oa_rubric_editor_wrapper .openassessment_criterion .openassessment_criterion_basic_editor .comp-setting-entry .wrapper-comp-settings .openassessment_criterion_prompt, #openassessment-editor #oa_rubric_editor_wrapper .openassessment_criterion_option .openassessment_criterion_option_explanation_wrapper textarea, #openassessment-editor #oa_rubric_editor_wrapper .openassessment_line_input textarea { #openassessment-editor #oa_rubric_editor_wrapper .openassessment_large_text_input, #openassessment-editor #oa_rubric_editor_wrapper .openassessment_criterion .openassessment_criterion_basic_editor .comp-setting-entry .wrapper-comp-settings .openassessment_criterion_prompt, #openassessment-editor #oa_rubric_editor_wrapper .openassessment_criterion_option .openassessment_criterion_option_explanation_wrapper textarea, #openassessment-editor #oa_rubric_editor_wrapper .openassessment_line_input textarea {
height: 70px; height: 70px;
width: 70%; } width: 70%; }
#openassessment-editor #oa_rubric_editor_wrapper .openassessment_input_styling, #openassessment-editor #oa_rubric_editor_wrapper .openassessment_large_text_input, #openassessment-editor #oa_rubric_editor_wrapper .openassessment_criterion .openassessment_criterion_basic_editor .comp-setting-entry .wrapper-comp-settings .openassessment_criterion_prompt, #openassessment-editor #oa_rubric_editor_wrapper .openassessment_criterion_option .openassessment_criterion_option_explanation_wrapper textarea, #openassessment-editor #oa_rubric_editor_wrapper .openassessment_line_input textarea, #openassessment-editor #oa_rubric_editor_wrapper #student_training_settings_editor .openassessment_training_example .openassessment_training_example_body .openassessment_training_example_essay_wrapper textarea, #student_training_settings_editor .openassessment_training_example .openassessment_training_example_body .openassessment_training_example_essay_wrapper #openassessment-editor #oa_rubric_editor_wrapper textarea { #openassessment-editor #oa_rubric_editor_wrapper .openassessment_input_styling, #openassessment-editor #oa_rubric_editor_wrapper .openassessment_large_text_input, #openassessment-editor #oa_rubric_editor_wrapper .openassessment_criterion .openassessment_criterion_basic_editor .comp-setting-entry .wrapper-comp-settings .openassessment_criterion_prompt, #openassessment-editor #oa_rubric_editor_wrapper .openassessment_criterion_option .openassessment_criterion_option_explanation_wrapper textarea, #openassessment-editor #oa_rubric_editor_wrapper .openassessment_line_input textarea {
resize: none; resize: none;
box-sizing: border-box; box-sizing: border-box;
border: 1px solid #b2b2b2; border: 1px solid #b2b2b2;
...@@ -2396,16 +2397,16 @@ hr.divider, ...@@ -2396,16 +2397,16 @@ hr.divider,
font-size: 11px; font-size: 11px;
color: #4c4c4c; color: #4c4c4c;
outline: 0; } outline: 0; }
#openassessment-editor #oa_rubric_editor_wrapper .openassessment_rubric_remove_button, #openassessment-editor #oa_rubric_editor_wrapper .openassessment_criterion .openassessment_criterion_header .openassessment_criterion_header_remove, #openassessment-editor #oa_rubric_editor_wrapper .openassessment_criterion_option .openassessment_option_header .openassessment_option_header_remove, #openassessment-editor #oa_rubric_editor_wrapper #student_training_settings_editor .openassessment_training_example .openassessment_training_example_header .openassessment_training_example_remove, #student_training_settings_editor .openassessment_training_example .openassessment_training_example_header #openassessment-editor #oa_rubric_editor_wrapper .openassessment_training_example_remove { #openassessment-editor #oa_rubric_editor_wrapper .openassessment_rubric_remove_button, #openassessment-editor #oa_rubric_editor_wrapper .openassessment_criterion .openassessment_criterion_header .openassessment_criterion_header_remove, #openassessment-editor #oa_rubric_editor_wrapper .openassessment_criterion_option .openassessment_option_header .openassessment_option_header_remove {
margin: 0 5px; margin: 0 5px;
float: right; } float: right; }
#openassessment-editor #oa_rubric_editor_wrapper .openassessment_rubric_remove_button h2:after, #openassessment-editor #oa_rubric_editor_wrapper .openassessment_criterion .openassessment_criterion_header .openassessment_criterion_header_remove h2:after, #openassessment-editor #oa_rubric_editor_wrapper .openassessment_criterion_option .openassessment_option_header .openassessment_option_header_remove h2:after, #openassessment-editor #oa_rubric_editor_wrapper #student_training_settings_editor .openassessment_training_example .openassessment_training_example_header .openassessment_training_example_remove h2:after, #student_training_settings_editor .openassessment_training_example .openassessment_training_example_header #openassessment-editor #oa_rubric_editor_wrapper .openassessment_training_example_remove h2:after { #openassessment-editor #oa_rubric_editor_wrapper .openassessment_rubric_remove_button h2:after, #openassessment-editor #oa_rubric_editor_wrapper .openassessment_criterion .openassessment_criterion_header .openassessment_criterion_header_remove h2:after, #openassessment-editor #oa_rubric_editor_wrapper .openassessment_criterion_option .openassessment_option_header .openassessment_option_header_remove h2:after {
font-family: FontAwesome; font-family: FontAwesome;
content: "\f00d"; content: "\f00d";
display: inline-block; display: inline-block;
color: inherit; color: inherit;
margin: 0 5px; } margin: 0 5px; }
#openassessment-editor #oa_rubric_editor_wrapper .openassessment_rubric_remove_button h2, #openassessment-editor #oa_rubric_editor_wrapper .openassessment_criterion .openassessment_criterion_header .openassessment_criterion_header_remove h2, #openassessment-editor #oa_rubric_editor_wrapper .openassessment_criterion_option .openassessment_option_header .openassessment_option_header_remove h2, #openassessment-editor #oa_rubric_editor_wrapper #student_training_settings_editor .openassessment_training_example .openassessment_training_example_header .openassessment_training_example_remove h2, #student_training_settings_editor .openassessment_training_example .openassessment_training_example_header #openassessment-editor #oa_rubric_editor_wrapper .openassessment_training_example_remove h2 { #openassessment-editor #oa_rubric_editor_wrapper .openassessment_rubric_remove_button h2, #openassessment-editor #oa_rubric_editor_wrapper .openassessment_criterion .openassessment_criterion_header .openassessment_criterion_header_remove h2, #openassessment-editor #oa_rubric_editor_wrapper .openassessment_criterion_option .openassessment_option_header .openassessment_option_header_remove h2 {
text-transform: uppercase; text-transform: uppercase;
font-size: 80%; font-size: 80%;
float: right; float: right;
...@@ -2448,9 +2449,15 @@ hr.divider, ...@@ -2448,9 +2449,15 @@ hr.divider,
border: 0px; border: 0px;
clear: both; } clear: both; }
.modal-content { .modal-lg.modal-window.confirm.openassessment_modal_window {
height: 470px !important; height: 80%;
background-color: #e5e5e5; } top: 10%; }
.openassessment_full_height.edit-xblock-modal,
.openassessment_full_height.xblock-editor,
.openassessment_full_height.xblock.xblock-studio_view.xblock-initialized,
[class*="view-"] .modal-lg.modal-editor .openassessment_full_height.modal-content {
height: 100%; }
#student_training_settings_editor .openassessment_training_example .openassessment_training_example_header { #student_training_settings_editor .openassessment_training_example .openassessment_training_example_header {
margin: 10px; margin: 10px;
...@@ -2466,11 +2473,37 @@ hr.divider, ...@@ -2466,11 +2473,37 @@ hr.divider,
width: 50%; width: 50%;
display: inline-block; display: inline-block;
float: left; } float: left; }
#student_training_settings_editor .openassessment_training_example .openassessment_training_example_header .openassessment_training_example_remove {
margin: 0 5px;
float: right; }
#student_training_settings_editor .openassessment_training_example .openassessment_training_example_header .openassessment_training_example_remove h2:after {
font-family: FontAwesome;
content: "\f00d";
display: inline-block;
color: inherit;
margin: 0 5px; }
#student_training_settings_editor .openassessment_training_example .openassessment_training_example_header .openassessment_training_example_remove h2 {
text-transform: uppercase;
font-size: 80%;
float: right;
display: inline-block; }
#student_training_settings_editor .openassessment_training_example .openassessment_training_example_body { #student_training_settings_editor .openassessment_training_example .openassessment_training_example_body {
padding: 0 15px; } padding: 0 15px;
overflow-y: auto; }
#student_training_settings_editor .openassessment_training_example .openassessment_training_example_body .openassessment_training_example_essay_wrapper { #student_training_settings_editor .openassessment_training_example .openassessment_training_example_body .openassessment_training_example_essay_wrapper {
width: 60%; } width: 60%; }
#student_training_settings_editor .openassessment_training_example .openassessment_training_example_body .openassessment_training_example_essay_wrapper textarea { #student_training_settings_editor .openassessment_training_example .openassessment_training_example_body .openassessment_training_example_essay_wrapper textarea {
resize: none;
box-sizing: border-box;
border: 1px solid #b2b2b2;
border-radius: 2px;
padding: 6px 8px 8px;
background-color: #f2f2f2;
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
font-family: 'Open Sans', sans-serif;
font-size: 11px;
color: #4c4c4c;
outline: 0;
margin: 5px 15px 0 10px; margin: 5px 15px 0 10px;
width: Calc(100% - 25px); } width: Calc(100% - 25px); }
#student_training_settings_editor .openassessment_training_example .openassessment_training_example_body .openassessment_training_example_scored_rubric { #student_training_settings_editor .openassessment_training_example .openassessment_training_example_body .openassessment_training_example_scored_rubric {
...@@ -2483,10 +2516,10 @@ hr.divider, ...@@ -2483,10 +2516,10 @@ hr.divider,
#student_training_settings_editor .openassessment_training_example .openassessment_training_example_body .openassessment_training_example_scored_rubric .openassessment_training_example_criteria_selections .comp-setting-entry select { #student_training_settings_editor .openassessment_training_example .openassessment_training_example_body .openassessment_training_example_scored_rubric .openassessment_training_example_criteria_selections .comp-setting-entry select {
width: 60%; width: 60%;
float: right; } float: right; }
#student_training_settings_editor .openassessment_training_example .openassessment_add_training_example { #student_training_settings_editor .openassessment_add_training_example {
color: #009fe6; color: #009fe6;
margin-left: 10px; } margin-left: 10px; }
#student_training_settings_editor .openassessment_training_example .openassessment_add_training_example :before { #student_training_settings_editor .openassessment_add_training_example :before {
font-family: "FontAwesome"; font-family: "FontAwesome";
display: inline-block; display: inline-block;
margin-left: 5px; margin-left: 5px;
......
openassessment/xblock/static/js/src/oa_edit.js
...@@ -19,6 +19,8 @@ OpenAssessment.StudioView = function(runtime, element, server) { ...@@ -19,6 +19,8 @@ OpenAssessment.StudioView = function(runtime, element, server) {
var liveElement = this.liveElement; var liveElement = this.liveElement;
this.fixModalHeight();
// Instantiates JQuery selector variables which will allow manipulation and display controls. // Instantiates JQuery selector variables which will allow manipulation and display controls.
this.settingsFieldSelectors = { this.settingsFieldSelectors = {
promptBox: $('#openassessment_prompt_editor', liveElement), promptBox: $('#openassessment_prompt_editor', liveElement),
...@@ -90,6 +92,16 @@ OpenAssessment.StudioView = function(runtime, element, server) { ...@@ -90,6 +92,16 @@ OpenAssessment.StudioView = function(runtime, element, server) {
OpenAssessment.StudioView.prototype = { OpenAssessment.StudioView.prototype = {
/** /**
Adjusts the modal's height, position and padding to be larger for OA editing only (Does not impact other modals)
*/
fixModalHeight: function () {
var element = this.liveElement;
element.toggleClass('openassessment_full_height');
element.parentsUntil('.modal-window').toggleClass('openassessment_full_height');
$('.modal-window').toggleClass('openassessment_modal_window');
},
/**
Load the XBlock XML definition from the server and display it in the view. Load the XBlock XML definition from the server and display it in the view.
**/ **/
load: function () { load: function () {
......
openassessment/xblock/static/sass/oa/utilities/_developer.scss
...@@ -179,10 +179,11 @@ ...@@ -179,10 +179,11 @@
#openassessment-editor { #openassessment-editor {
margin-bottom: 0; margin-bottom: 0;
height: 100%;
.openassessment_editor_content_and_tabs { .openassessment_editor_content_and_tabs {
width: 100%; width: 100%;
height: 373px; height: Calc(100% - 97px);
} }
#openassessment_editor_header{ #openassessment_editor_header{
...@@ -659,16 +660,21 @@ ...@@ -659,16 +660,21 @@
} }
#openassessment_make_invisible{ //For Both of these, we use high specificity to overload the previous styles
//without the important tag.
.modal-lg.modal-window.confirm.openassessment_modal_window{
height: 80%;
top: 10%;
} }
.modal-content { .openassessment_full_height.edit-xblock-modal,
height: 470px !important; .openassessment_full_height.xblock-editor,
background-color: #e5e5e5; .openassessment_full_height.xblock.xblock-studio_view.xblock-initialized,
[class*="view-"] .modal-lg.modal-editor .openassessment_full_height.modal-content
{
height: 100%;
} }
#student_training_settings_editor{ #student_training_settings_editor{
.openassessment_training_example{ .openassessment_training_example{
...@@ -693,17 +699,42 @@ ...@@ -693,17 +699,42 @@
} }
.openassessment_training_example_remove { .openassessment_training_example_remove {
@extend .openassessment_rubric_remove_button; h2:after{
font-family: FontAwesome;
content: "\f00d";
display: inline-block;
color: inherit;
margin: 0 5px;
}
h2{
text-transform: uppercase;
font-size: 80%;
float: right;
display: inline-block;
}
margin: 0 5px;
float: right;
} }
} }
.openassessment_training_example_body { .openassessment_training_example_body {
padding: 0 15px; padding: 0 15px;
overflow-y: auto;
.openassessment_training_example_essay_wrapper { .openassessment_training_example_essay_wrapper {
width: 60%; width: 60%;
textarea { textarea {
@extend .openassessment_input_styling; resize: none;
box-sizing: border-box;
border: 1px solid #b2b2b2;
border-radius: 2px;
padding: 6px 8px 8px;
background-color: #f2f2f2;
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
font-family: 'Open Sans', sans-serif;
font-size: 11px;
color: #4c4c4c;
outline: 0;
margin: 5px 15px 0 10px; margin: 5px 15px 0 10px;
width: Calc(100% - 25px); width: Calc(100% - 25px);
} }
...@@ -720,7 +751,6 @@ ...@@ -720,7 +751,6 @@
select { select {
width: 60%; width: 60%;
float: right; float: right;
} }
} }
} }
......
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