X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/985a407d3afd4dae71a362116a2d8bd91fe6babd..e23381c38df328491275d6b512b035974d8b8ff2:/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 b5a1a3d..00140e3 100644
--- a/wtem/templates/wtem/exercises/edumed_przyporzadkuj.html
+++ b/wtem/templates/wtem/exercises/edumed_przyporzadkuj.html
@@ -1,4 +1,4 @@
-<div class="exercise exercise-wtem przyporzadkuj" data-type="przyporzadkuj">
+<div class="exercise exercise-wtem przyporzadkuj" data-type="przyporzadkuj" data-id="{{exercise.id}}">
 
     <h3>Zadanie {{no}}</h3>
     
@@ -11,7 +11,6 @@
             </p>
 
         {% endfor %}
-            <span class="instruction">Przeciągnij odpowiedzi i upuść w wybranym polu.</span>
         </div>
 
         <p class="paragraph">{{exercise.buckets_name|default:"kategorie"|capfirst}}:</p>
@@ -28,19 +27,58 @@
         </ul>
         <br class="clr">
 
-        <div class="description">
+        <div class="description" style="margin-bottom:10px;">
             <p class="paragraph">{{exercise.items_name|capfirst}}:</p>
+            {% if not exercise.hide_default_instruction %}
+                <span class="instruction">Przeciągnij i upuść numery odpowiedzi w wybranym polu powyżej.</span>
+            {% endif %}
+            {% 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 or item.desc %}
+                    <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.img %}
+                            {% if 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}}"/>
+                            
+                            {% if item.href %}</a>{% endif %}
+                        {% endif %}
+                        {% if item.desc %}
+                            {{item.desc}}
+                        {% 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>