Tweaking instructions

[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 8c0bcf5..67ad08b 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,18 +32,28 @@
 
         <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 %}
                 {% 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.href %}
+                {% 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>
-                        <img src="/static/wtem/img/{{item.href}}"/>
+                        
+                        {% if item.href %}
+                            <a href="/static/wtem/img/{{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>