Skip to content

Updates for component tabs #4

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

Open
rythmE wants to merge 17 commits into
base: hawthorn
Choose a base branch
from
Open

Updates for component tabs #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
dbeff39
Updates for component tabs
rythmE Mar 11, 2021
cd62436
Updated span wrapper for lable title and question mark with help text
rythmE Mar 19, 2021
82d750d
template modification for support styling.
Mar 25, 2021
e259973
enable question mark for setting panel of ORA2 component editing form
Mar 26, 2021
cbb910b
sv2
Apr 7, 2021
43e4f86
In editing form, stop the action of scrolling to top when user click …
Apr 19, 2021
6fc5bc2
apply switcher onto checkbox
Apr 20, 2021
e703e6a
restore checkbox
Apr 22, 2021
b96cc5b
convert field "Allow LaTeX Responses" to switcher component
Apr 23, 2021
0e9c2fa
prevent page scroll to top when user click cancel button of ora2 edit…
Apr 25, 2021
5be825c
prevent event propagation for save and cancel buttons of editing form…
Apr 25, 2021
bc15f9e
# merge all files.
Apr 25, 2021
b69e49c
stop event propagation on editing form
Apr 25, 2021
1c65b33
add switcher back for settings tab.
Apr 26, 2021
94a7b4d
fixing
Apr 26, 2021
ce1092a
fixing
Apr 26, 2021
9bdd1dd
in editing form of ora2, display corresponding content when user clic…
Apr 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ update-npm-requirements:
cp ./node_modules/backgrid/lib/backgrid*.css $(STATIC_CSS)/lib/backgrid/

javascript: update-npm-requirements
node_modules/.bin/uglifyjs $(STATIC_JS)/src/oa_shared.js $(STATIC_JS)/src/*.js $(STATIC_JS)/src/lms/*.js $(STATIC_JS)/lib/backgrid/backgrid.min.js -c warnings=false > "$(STATIC_JS)/openassessment-lms.min.js"
node_modules/.bin/uglifyjs $(STATIC_JS)/src/oa_shared.js $(STATIC_JS)/src/*.js $(STATIC_JS)/src/studio/*.js $(STATIC_JS)/lib/backgrid/backgrid.min.js -c warnings=false > "$(STATIC_JS)/openassessment-studio.min.js"
node_modules/.bin/uglifyjs $(STATIC_JS)/src/oa_shared.js $(STATIC_JS)/src/*.js $(STATIC_JS)/src/lms/*.js $(STATIC_JS)/lib/backgrid/backgrid.min.js -c > "$(STATIC_JS)/openassessment-lms.min.js"
node_modules/.bin/uglifyjs $(STATIC_JS)/src/oa_shared.js $(STATIC_JS)/src/*.js $(STATIC_JS)/src/studio/*.js $(STATIC_JS)/lib/backgrid/backgrid.min.js -c > "$(STATIC_JS)/openassessment-studio.min.js"

sass:
python scripts/compile_sass.py
Expand Down
28 changes: 21 additions & 7 deletions openassessment/templates/openassessmentblock/edit/oa_edit.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,13 @@

<div id="openassessment_editor_header">
<h6 id="oa_editor_window_title" class="title modal_window_title" >{% trans "Open Response Assessment" %}</h6>
<ul class="editor_modes action_list action_modes editor_tabs">
<li class="view-button oa_editor_tab"><a href="#oa_settings_editor_wrapper">{% trans "Settings" %}</a></li>
<li class="view-button oa_editor_tab"><a href="#oa_rubric_editor_wrapper">{% trans "Rubric" %}</a></li>
<li class="view-button oa_editor_tab"><a href="#oa_prompt_editor_wrapper">{% trans "Prompt" %}</a></li>
</div>

<div class="modal-tabs">
<ul class="editor_modes action_list action_modes editor_tabs settings-tabs-header">
<li class="view-button oa_editor_tab settings-tab-buttons"><a class="settings-tab-button" href="#oa_settings_editor_wrapper">{% trans "Settings" %}</a></li>
<li class="view-button oa_editor_tab settings-tab-buttons"><a class="settings-tab-button" href="#oa_rubric_editor_wrapper">{% trans "Rubric" %}</a></li>
<li class="view-button oa_editor_tab settings-tab-buttons"><a class="settings-tab-button" href="#oa_prompts_editor_wrapper">{% trans "Prompt" %}</a></li>
</ul>
</div>

Expand All @@ -29,6 +32,7 @@ <h2 class="openassessment_alert_title">{% trans "Rubric Change Impacts Settings
</a>
</div>

<div class="oa_editor_content_outer_wrapper">
{% include "openassessmentblock/edit/oa_edit_prompts.html" %}

{% include "openassessmentblock/edit/oa_edit_rubric.html" %}
Expand All @@ -40,6 +44,7 @@ <h2 class="openassessment_alert_title">{% trans "Rubric Change Impacts Settings
<div class="wrapper-comp-setting">
<label for="openassessment_title_editor" class="setting-label">{% trans "Display Name "%}</label>
<input type="text" id="openassessment_title_editor" class="input setting-input" value="{{ title }}">
<span class="question-mark-wrapper" data-title='{% trans "The display name for this component." %}'></span>
</div>
<p class="setting-help">{% trans "The display name for this component." %}</p>
</li>
Expand Down Expand Up @@ -69,6 +74,7 @@ <h2 class="openassessment_alert_title">{% trans "Rubric Change Impacts Settings
id="openassessment_submission_start_time"
value="{{ submission_start|utc|date:"H:i" }}"
>
<span class="question-mark-wrapper" data-title='{% trans "The date and time when learners can begin submitting responses." %}'></span>
</div>
<p class="setting-help">{% trans "The date and time when learners can begin submitting responses." %}</p>
</li>
Expand Down Expand Up @@ -98,6 +104,7 @@ <h2 class="openassessment_alert_title">{% trans "Rubric Change Impacts Settings
id="openassessment_submission_due_time"
value="{{ submission_due|utc|date:"H:i" }}"
>
<span class="question-mark-wrapper" data-title='{% trans "The date and time when learners can no longer submit responses." %}'></span>
</div>
<p class="setting-help">{% trans "The date and time when learners can no longer submit responses." %}</p>
</li>
Expand All @@ -109,6 +116,7 @@ <h2 class="openassessment_alert_title">{% trans "Rubric Change Impacts Settings
<option value="{{ option_key }}" {% if option_key == text_response %} selected="true" {% endif %}>{{ option_name }}</option>
{% endfor %}
</select>
<span class="question-mark-wrapper" data-title='{% trans "Specify whether learners must include a text based response to this problem's prompt." %}'></span>
</div>
<p class="setting-help">
{% trans "Specify whether learners must include a text based response to this problem's prompt." %}
Expand All @@ -122,6 +130,7 @@ <h2 class="openassessment_alert_title">{% trans "Rubric Change Impacts Settings
<option value="{{ option_key }}" {% if option_key == file_upload_response %} selected="true" {% endif %}>{{ option_name }}</option>
{% endfor %}
</select>
<span class="question-mark-wrapper" data-title='{% trans "Specify whether learners are able to upload files as a part of their response." %}'></span>
</div>
<p class="setting-help">
{% trans "Specify whether learners are able to upload files as a part of their response." %}
Expand All @@ -134,6 +143,7 @@ <h2 class="openassessment_alert_title">{% trans "Rubric Change Impacts Settings
<option value="image" {% if file_upload_type == "image" %} selected="true" {% endif %}>{% trans "Image Files"%}</option>
<option value="custom" {% if file_upload_type == "custom" %} selected="true" {% endif %}>{% trans "Custom File Types"%}</option>
</select>
<span class="question-mark-wrapper" data-title='{% trans "Specify whether learners can submit files along with their text responses. Select Images to allow JPG, GIF, or PNG files. Select PDF or Images to allow PDF files and images. Select Custom File Types to allow files with extensions that you specify below. (Use the Select Custom File Types option with caution.)" %}'></span>
</div>
<p class="setting-help">
{% trans "Specify whether learners can submit files along with their text responses. Select Images to allow JPG, GIF, or PNG files. Select PDF or Images to allow PDF files and images. Select Custom File Types to allow files with extensions that you specify below. (Use the Select Custom File Types option with caution.)" %}
Expand All @@ -146,6 +156,7 @@ <h2 class="openassessment_alert_title">{% trans "Rubric Change Impacts Settings
type="text"
value="{{ white_listed_file_types }}"
/>
<span class="question-mark-wrapper" data-title='{% trans "Enter the file extensions, separated by commas, that you want learners to be able to upload. For example: pdf,doc,docx." %}'></span>
</div>
<p class="setting-help">
{% trans "Enter the file extensions, separated by commas, that you want learners to be able to upload. For example: pdf,doc,docx." %}
Expand All @@ -161,6 +172,8 @@ <h2 class="openassessment_alert_title">{% trans "Rubric Change Impacts Settings
<option value="0">{% trans "False"%}</option>
<option value="1" {% if allow_latex %} selected="true" {% endif %}>{% trans "True"%}</option>
</select>
<span class="switcher-wrapper"></span>
<span class="question-mark-wrapper" data-title='{% trans "Specify whether learners can write LaTeX formatted strings"%}'></span>
</div>
<p class="setting-help">{% trans "Specify whether learners can write LaTeX formatted strings"%}</p>
</li>
Expand All @@ -174,6 +187,7 @@ <h2 class="openassessment_alert_title">{% trans "Rubric Change Impacts Settings
value="{{ leaderboard_show }}"
min="0" max="99"
/>
<span class="question-mark-wrapper" data-title='{% trans "Specify the number of top scoring responses to display. Valid numbers are 0 to 99. If the number is 0, the Top Responses section does not appear to learners." %}'></span>
</div>
<p class="setting-help">{% trans "Specify the number of top scoring responses to display. Valid numbers are 0 to 99. If the number is 0, the Top Responses section does not appear to learners." %}</p>
</li>
Expand All @@ -191,17 +205,17 @@ <h2 class="openassessment_alert_title">{% trans "Rubric Change Impacts Settings
{% endfor %}
</ol>
</div>
</div>
</div>

<div class="openassessment_editor_buttons xblock-actions">
<h3 class="sr">Actions</h3>
<ul>
<li class="action-item">
<a href="#" class="button action-primary openassessment_save_button">{% trans "Save" %}</a>
<a href="#" class="button openassessment_cancel_button">{% trans "Cancel" %}</a>
</li>

<li class="action-item">
<a href="#" class="button openassessment_cancel_button">{% trans "Cancel" %}</a>
<a href="#" class="button action-primary openassessment_save_button">{% trans "Save" %}</a>
</li>
</ul>
</div>
Expand Down
9 changes: 5 additions & 4 deletions openassessment/templates/openassessmentblock/edit/oa_edit_criterion.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<h6 class="openassessment_container_header_title openassessment_criterion_header_title">{% trans "Criterion" %}</h6>
<p class="openassessment_container_guide openassessment_criterion_guide">{% trans "You cannot delete a criterion after the assignment has been released." %}</p>
</div>
<div class="openassessment_container_remove_button openassessment_criterion_remove_button"><h2>{% trans "Remove" %}</h2></div>
<div class="openassessment_container_remove_button openassessment_criterion_remove_button"><h2><!--{% trans "Remove" %}--></h2></div>
</div>
<div class="openassessment_criterion_body wrapper-comp-settings">
<input type="hidden" class="openassessment_criterion_name" value="{{ criterion_name }}" />
<ul class="list-input settings-list openassessment_criterion_basic_editor">
<li class="field comp-setting-entry">
<div class="wrapper-comp-settings">
<label class="openassessment_criterion_name_label setting-label">
{% trans "Criterion Name" %}
<span class="setting-label-title">{% trans "Criterion Name" %}</span>
<input
class="openassessment_criterion_label input setting-input"
type="text"
Expand All @@ -26,7 +26,7 @@ <h6 class="openassessment_container_header_title openassessment_criterion_header
<li class="field comp-setting-entry">
<div class="wrapper-comp-settings">
<label class="openassessment_criterion_prompt_label setting-label">
{% trans "Criterion Prompt" %}
<span class="setting-label-title">{% trans "Criterion Prompt" %}</span>
<textarea class="openassessment_criterion_prompt setting-input" maxlength="10000">{{ criterion_prompt }}</textarea>
</label>
</div>
Expand All @@ -49,14 +49,15 @@ <h2>{% trans "Add Option" %}</h2>
<li class="field comp-setting-entry">
<div class="wrapper-comp-setting">
<label class="setting-label">
{% trans "Feedback for This Criterion" %}
<span class="setting-label-title">{% trans "Feedback for This Criterion" %}</span>
<select class="openassessment_criterion_feedback input setting-input">
<option value="disabled">{% trans "None" %}</option>
<option value="optional" {% if criterion_feedback == "optional" %} selected="true" {% endif %}>{% trans "Optional" %}</option>
<option value="required" {% if criterion_feedback == "required" %} selected="true" {% endif %}>{% trans "Required" %}</option>
</select>
</label>
</div>
<span class="question-mark-wrapper" data-title='{% trans "Select one of the options above. This describes whether or not the learner will have to provide criterion feedback." %}'></span>
<p class="setting-help">
{% trans "Select one of the options above. This describes whether or not the learner will have to provide criterion feedback." %}
</p>
Expand Down
8 changes: 4 additions & 4 deletions openassessment/templates/openassessmentblock/edit/oa_edit_option.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<div class="openassessment_option_header">
<div class="openassessment_option_header_title">{% trans "Option" %}</div>
<div class="openassessment_criterion_option_remove_button">
<h2>{% trans "Remove" %}</h2>
<h2><!--{% trans "Remove" %}--></h2>
</div>
</div>
<div class="wrapper-comp-settings">
Expand All @@ -13,7 +13,7 @@ <h2>{% trans "Remove" %}</h2>
<li class="field comp-setting-entry openassessment_criterion_option_name_wrapper">
<div class="wrapper-comp-setting">
<label class="openassessment_criterion_option_name_label setting-label">
{% trans "Option Name"%}
<span class="setting-label-title">{% trans "Option Name"%}</span>
<input
class="openassessment_criterion_option_label input input-label"
type="text"
Expand All @@ -26,7 +26,7 @@ <h2>{% trans "Remove" %}</h2>
<li class="field comp-setting-entry openassessment_criterion_option_point_wrapper">
<div class="wrapper-comp-setting">
<label class="openassessment_criterion_option_points_label setting-label">
{% trans "Option Points"%}
<span class="setting-label-title">{% trans "Option Points"%}</span>
<input
class="openassessment_criterion_option_points input setting-input"
type="number"
Expand All @@ -39,7 +39,7 @@ <h2>{% trans "Remove" %}</h2>
<li class="field comp-setting-entry openassessment_criterion_option_explanation_wrapper">
<div class="wrapper-comp-setting">
<label class="openassessment_criterion_option_explanation_label setting-label">
{% trans "Option Explanation"%}
<span class="setting-label-title">{% trans "Option Explanation"%}</span>
<textarea class="openassessment_criterion_option_explanation setting-input" maxlength="10000">{{ option_explanation }}</textarea>
</label>
</div>
Expand Down
8 changes: 7 additions & 1 deletion openassessment/templates/openassessmentblock/edit/oa_edit_peer_assessment.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
<div class="openassessment_inclusion_wrapper">
<input type="checkbox" id="include_peer_assessment"
{% if assessments.peer_assessment %} checked="true" {% endif %}>
<label for="include_peer_assessment">{% trans "Step: Peer Assessment" %}</label>
<span class="switcher-wrapper"></span>
<label>{% trans "Step: Peer Assessment" %}</label>
</div>
<div class="openassessment_assessment_module_editor">
<p id="peer_assessment_description_closed" class="openassessment_description_closed {% if assessments.peer_assessment %} is--hidden {% endif %}">
Expand All @@ -21,13 +22,15 @@
<div class="wrapper-comp-setting">
<label for="peer_assessment_must_grade" class="setting-label">{% trans "Must Grade" %}</label>
<input id="peer_assessment_must_grade" class="input setting-input" type="number" value="{{ assessments.peer_assessment.must_grade }}" min="0" max="99">
<span class="question-mark-wrapper" data-title='{% trans "Specify the number of peer assessments that each learner must complete. Valid numbers are 0 to 99."%}'></span>
</div>
<p class="setting-help">{% trans "Specify the number of peer assessments that each learner must complete. Valid numbers are 0 to 99."%}</p>
</li>
<li class="field comp-setting-entry">
<div class="wrapper-comp-setting">
<label for="peer_assessment_graded_by" class="setting-label"> {% trans "Graded By" %}</label>
<input id="peer_assessment_graded_by" class="input setting-input" type="number" value="{{ assessments.peer_assessment.must_be_graded_by }}" min="0" max="99">
<span class="question-mark-wrapper" data-title='{% trans "Specify the number of learners that each response must be assessed by. Valid numbers are 0 to 99."%}'></span>
</div>
<p class="setting-help">{% trans "Specify the number of learners that each response must be assessed by. Valid numbers are 0 to 99."%}</p>
</li>
Expand All @@ -40,6 +43,7 @@
class="input setting-input"
value="{{ assessments.peer_assessment.start|utc|date:"Y-m-d" }}"
>
<span class="question-mark-wrapper" data-title='{% trans "Enter the date and time when learners can begin assessing peer responses." %}'></span>
</div>
<div class="wrapper-comp-setting">
<label for="peer_assessment_start_time" class="setting-label">{% trans "Start Time" %}</label>
Expand All @@ -49,6 +53,7 @@
class="input setting-input"
value="{{ assessments.peer_assessment.start|utc|date:"H:i" }}"
>
<span class="question-mark-wrapper" data-title='{% trans "Enter the date and time when learners can begin assessing peer responses." %}'></span>
</div>
<p class="setting-help">{% trans "Enter the date and time when learners can begin assessing peer responses." %}</p>
</li>
Expand All @@ -70,6 +75,7 @@
class="input setting-input"
value="{{ assessments.peer_assessment.due|utc|date:"H:i" }}"
>
<span class="question-mark-wrapper" data-title='{% trans "Enter the date and time when all peer assessments must be complete." %}'></span>
</div>
<p class="setting-help">{% trans "Enter the date and time when all peer assessments must be complete." %}</p>
</li>
Expand Down
Loading