X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/3fd04fa811ccc4be2c8f949d06faef9b0325a393..d9436e8a12e4834cb110d386c9e6fdb973c6204a:/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 3fb9517..2a6916b 100644
--- 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>
@@ -28,19 +30,50 @@
         </ul>
         <br class="clr">
 
-        <div class="description">
+        <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" data-target="kategorie">
+        <ul class="lista punkt subject {% if exercise.items_inline %}wtem-items-inline{% endif %}" data-target="kategorie">
             {% for item in exercise.items %}
-                <!-- data-solution set to single bogus value only to indicate that this piece has no multiple solutions, not used otherwise (see: is_multiple in edumed.coffee). -->
-                <li data-solution="1" data-no="{{forloop.counter}}" data-id="{{item.id}}" class="question-piece draggable ui-draggable">{{item.text}}</li>
+                {% comment %}
+                data-solution set to single bogus value only to indicate that this piece has no multiple solutions, not used otherwise (see: is_multiple in edumed.coffee). 
+                {% endcomment %}
+                
+                {% if item.img %}
+                    <li style="magin-bottom:5px;">
+                        <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="{% if not item.href_absolute %}/static/wtem/img/{% endif %}{{item.href}}">
+                        {% endif %}
+                        
+                        <img src="/static/wtem/img/{{item.img}}"/>
+                        
+                        {% if item.href %}</a>{% endif %}
+                    </li>
+                {% else %}
+                    <li data-solution="1" data-no="{{forloop.counter}}" data-id="{{item.id}}" class="question-piece draggable ui-draggable">{{item.text}}</li>
+                {% endif %}
+            
             {% endfor %}
         </ul>
 
         <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>