Open images in a new tab

[edumed.git] / wtem / templates / wtem / exercises / edumed_przyporzadkuj.html

diff --git a/wtem/templates/wtem/exercises/edumed_przyporzadkuj.html b/wtem/templates/wtem/exercises/edumed_przyporzadkuj.html
index f4eac19..2908f70 100644 (file)
--- a/wtem/templates/wtem/exercises/edumed_przyporzadkuj.html
+++ b/wtem/templates/wtem/exercises/edumed_przyporzadkuj.html
@@ -11,7 +11,9 @@
             </p>
 
         {% endfor %}
-            <span class="instruction">Przeciągnij odpowiedzi i upuść w wybranym polu.</span>
+            {% if not exercise.hide_default_instruction %}
+                <span class="instruction">Przeciągnij odpowiedzi i upuść w wybranym polu.</span>
+            {% endif %}
         </div>
 
         <p class="paragraph">{{exercise.buckets_name|default:"kategorie"|capfirst}}:</p>
@@ -30,6 +32,9 @@
 
         <div class="description" style="margin-bottom:10px;">
             <p class="paragraph">{{exercise.items_name|capfirst}}:</p>
+            {% if exercise.items_instruction %}
+                <span class="instruction">{{exercise.items_instruction}}</span>
+            {% endif %}
         </div>
          
         <ul class="lista punkt subject {% if exercise.items_inline %}wtem-items-inline{% endif %}" data-target="kategorie">
@@ -43,7 +48,7 @@
                         <span data-solution="1" data-no="{{forloop.counter}}" data-id="{{item.id}}" class="question-piece draggable ui-draggable">{{item.text}}</span>
                         
                         {% if item.href %}
-                            <a href="/static/wtem/img/{{item.href}}">
+                            <a href="{% if not item.href_absolute %}/static/wtem/img/{% endif %}{{item.href}}" target="wtem_aside">
                         {% endif %}
                         
                         <img src="/static/wtem/img/{{item.img}}"/>
@@ -59,6 +64,16 @@
 
         <br class="clr">
 
+        {% if exercise.description_after %}
+            {% autoescape off %}
+            {% for para in exercise.description_after %}
+                <p class="paragraph">
+                    {{para}}
+                </p>
+            {% endfor %}
+            {% endautoescape %}
+        {% endif %}
+
     </div>
 
 </div>