Merge WTEM support into master

[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..00140e3 100644 (file)
--- a/wtem/templates/wtem/exercises/edumed_przyporzadkuj.html
+++ b/wtem/templates/wtem/exercises/edumed_przyporzadkuj.html
@@ -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>
@@ -30,6 +29,12 @@
 
         <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 {% if exercise.items_inline %}wtem-items-inline{% endif %}" data-target="kategorie">
@@ -38,17 +43,22 @@
                 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 %}
+                {% 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.href %}
-                            <a href="/static/wtem/img/{{item.href}}">
+                        {% 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 %}
-                        
-                        <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>
@@ -59,6 +69,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>