images and fixes for new test

diff --git a/edumed/settings/custom.py b/edumed/settings/custom.py
index 604e1d2..3be9e89 100644 (file)
--- a/edumed/settings/custom.py
+++ b/edumed/settings/custom.py
@@ -4,5 +4,5 @@ CONTACT_FORMS_MODULE = 'edumed.contact_forms'
 
 MAX_UPLOAD_SIZE = 20 * 1024 * 1024
 
 
 MAX_UPLOAD_SIZE = 20 * 1024 * 1024
 

-OLIMPIADA_START = (2017, 11, 13, 10)
+OLIMPIADA_START = (2017, 11, 23, 10)

 OLIMPIADA_END = (2017, 11, 23, 11)
 OLIMPIADA_END = (2017, 11, 23, 11)

diff --git a/wtem/static/wtem/img/cc-by-nc-nd.png b/wtem/static/wtem/img/cc-by-nc-nd.png
new file mode 100644 (file)
index 0000000..55e348a
Binary files /dev/null and b/wtem/static/wtem/img/cc-by-nc-nd.png differ

diff --git a/wtem/static/wtem/img/cc-by-nc.png b/wtem/static/wtem/img/cc-by-nc.png
new file mode 100644 (file)
index 0000000..0c99e71
Binary files /dev/null and b/wtem/static/wtem/img/cc-by-nc.png differ

diff --git a/wtem/static/wtem/img/cc-by-nd.png b/wtem/static/wtem/img/cc-by-nd.png
new file mode 100644 (file)
index 0000000..837376e
Binary files /dev/null and b/wtem/static/wtem/img/cc-by-nd.png differ

diff --git a/wtem/static/wtem/img/cc-by.png b/wtem/static/wtem/img/cc-by.png
new file mode 100644 (file)
index 0000000..44671b2
Binary files /dev/null and b/wtem/static/wtem/img/cc-by.png differ

diff --git a/wtem/static/wtem/img/monalisa.jpg b/wtem/static/wtem/img/monalisa.jpg
new file mode 100644 (file)
index 0000000..7674be0
Binary files /dev/null and b/wtem/static/wtem/img/monalisa.jpg differ

diff --git a/wtem/templates/wtem/exercises/edumed_wybor.html b/wtem/templates/wtem/exercises/edumed_wybor.html
index 0a87aca..2d021f0 100644 (file)
--- a/wtem/templates/wtem/exercises/edumed_wybor.html
+++ b/wtem/templates/wtem/exercises/edumed_wybor.html
@@ -21,7 +21,7 @@
             {% for option in exercise.options %}
                 <li class="question-piece" data-name="{{option.id}}">
                     <input type="checkbox" name="e{{no}}_{{option.id}}" id="e{{no}}_{{option.id}}"{% if option.id|stringformat:"s" in exercise.saved_answer.closed_part %} checked="checked"{% endif %}>
             {% for option in exercise.options %}
                 <li class="question-piece" data-name="{{option.id}}">
                     <input type="checkbox" name="e{{no}}_{{option.id}}" id="e{{no}}_{{option.id}}"{% if option.id|stringformat:"s" in exercise.saved_answer.closed_part %} checked="checked"{% endif %}>

-                    <label for="e{{no}}_{{option.id}}">{{option.text}}</label>
+                    <label for="e{{no}}_{{option.id}}">{{option.text|safe}}</label>

                 </li>
             {% endfor %}
         </ol>
                 </li>
             {% endfor %}
         </ol>