Skip to content

Commit

Permalink
Miscellaneous fixes
Browse files Browse the repository at this point in the history
* Consistent capitalization in the Studio editor
* Remove dangerous recommendation to delete from the top of the editor
* Stop large images from overflowing feedback popups in Studio
  • Loading branch information
arbrandes committed Sep 15, 2016
1 parent d6b3696 commit c486867
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 19 deletions.
4 changes: 4 additions & 0 deletions drag_and_drop_v2/public/css/drag_and_drop.css
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,10 @@
font-size: 14px;
}

.xblock--drag-and-drop .popup .popup-content img {
max-width: 100%;
}

.xblock--drag-and-drop .popup .close-feedback-popup-button {
cursor: pointer;
float: right;
Expand Down
7 changes: 2 additions & 5 deletions drag_and_drop_v2/templates/html/drag_and_drop_edit.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@

<section class="drag-builder">
<div class="tab feedback-tab">
<p class="tab-content">
{% trans "Note: do not edit the problem if students have already completed it. Delete the problem and create a new one." %}
</p>

<section class="tab-content">
<form class="feedback-form">
Expand Down Expand Up @@ -71,12 +68,12 @@
</div>

<label class="h4">
<span>{% trans "Introductory Feedback" %}</span>
<span>{% trans "Introductory feedback" %}</span>
<textarea class="intro-feedback">{{ self.data.feedback.start }}</textarea>
</label>

<label class="h4">
<span>{% trans "Final Feedback" %}</span>
<span>{% trans "Final feedback" %}</span>
<textarea class="final-feedback">{{ self.data.feedback.finish }}</textarea>
</label>
</form>
Expand Down
4 changes: 2 additions & 2 deletions drag_and_drop_v2/templates/html/js_templates.html
Original file line number Diff line number Diff line change
Expand Up @@ -142,13 +142,13 @@
</div>
<div class="row">
<label class="h4">
<span>{{i18n "Success Feedback"}}</span>
<span>{{i18n "Success feedback"}}</span>
<textarea class="success-feedback">{{ feedback.correct }}</textarea>
</label>
</div>
<div class="row">
<label class="h4">
<span>{{i18n "Error Feedback"}}</span>
<span>{{i18n "Error feedback"}}</span>
<textarea class="error-feedback">{{ feedback.incorrect }}</textarea>
</label>
</div>
Expand Down
8 changes: 4 additions & 4 deletions drag_and_drop_v2/translations/en/LC_MESSAGES/text.po
Original file line number Diff line number Diff line change
Expand Up @@ -304,11 +304,11 @@ msgid ""
msgstr ""

#: templates/html/js_templates.html
msgid "Success Feedback"
msgid "Success feedback"
msgstr ""

#: templates/html/js_templates.html
msgid "Error Feedback"
msgid "Error feedback"
msgstr ""

#: templates/html/js_templates.html
Expand Down Expand Up @@ -340,11 +340,11 @@ msgid ""
msgstr ""

#: templates/html/drag_and_drop_edit.html
msgid "Introductory Feedback"
msgid "Introductory feedback"
msgstr ""

#: templates/html/drag_and_drop_edit.html
msgid "Final Feedback"
msgid "Final feedback"
msgstr ""

#: templates/html/drag_and_drop_edit.html
Expand Down
16 changes: 8 additions & 8 deletions drag_and_drop_v2/translations/eo/LC_MESSAGES/text.po
Original file line number Diff line number Diff line change
Expand Up @@ -366,12 +366,12 @@ msgstr ""
"évén ïf thé ïmägé dïd nöt löäd) Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт #"

#: templates/html/js_templates.html
msgid "Success Feedback"
msgstr "Süççéss Féédßäçk Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αм#"
msgid "Success feedback"
msgstr "Süççéss féédßäçk Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αм#"

#: templates/html/js_templates.html
msgid "Error Feedback"
msgstr "Érrör Féédßäçk Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт#"
msgid "Error feedback"
msgstr "Érrör féédßäçk Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт#"

#: templates/html/js_templates.html
msgid "Show advanced settings"
Expand Down Expand Up @@ -413,12 +413,12 @@ msgstr ""
"thé prößlém änd çréäté ä néw öné. Ⱡ'σяєм ιρѕυм ∂σłσя ѕ#"

#: templates/html/drag_and_drop_edit.html
msgid "Introductory Feedback"
msgstr "Ìntrödüçtörý Féédßäçk Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, #"
msgid "Introductory feedback"
msgstr "Ìntrödüçtörý féédßäçk Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт αмєт, #"

#: templates/html/drag_and_drop_edit.html
msgid "Final Feedback"
msgstr "Fïnäl Féédßäçk Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт#"
msgid "Final feedback"
msgstr "Fïnäl féédßäçk Ⱡ'σяєм ιρѕυм ∂σłσя ѕιт#"

#: templates/html/drag_and_drop_edit.html
msgid "Background URL"
Expand Down

0 comments on commit c486867

Please sign in to comment.