fnp
/
edumed.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d2e2fc5
)
fix numbering bug
author
Jan Szejko
<janek37@gmail.com>
Thu, 16 Nov 2017 11:05:58 +0000
(12:05 +0100)
committer
Jan Szejko
<janek37@gmail.com>
Thu, 16 Nov 2017 11:05:58 +0000
(12:05 +0100)
wtem/templates/wtem/exercises/edumed_prawdafalsz.html
patch
|
blob
|
history
wtem/templates/wtem/exercises/edumed_przyporzadkuj.html
patch
|
blob
|
history
wtem/templates/wtem/exercises/edumed_uporzadkuj.html
patch
|
blob
|
history
wtem/templates/wtem/exercises/edumed_wybor.html
patch
|
blob
|
history
wtem/templates/wtem/exercises/edumed_wybor_auto.html
patch
|
blob
|
history
wtem/templates/wtem/exercises/file_upload.html
patch
|
blob
|
history
wtem/templates/wtem/exercises/open.html
patch
|
blob
|
history
wtem/templates/wtem/single.html
patch
|
blob
|
history
diff --git
a/wtem/templates/wtem/exercises/edumed_prawdafalsz.html
b/wtem/templates/wtem/exercises/edumed_prawdafalsz.html
index
67bf0ae
..
2b1802b
100644
(file)
--- a/
wtem/templates/wtem/exercises/edumed_prawdafalsz.html
+++ b/
wtem/templates/wtem/exercises/edumed_prawdafalsz.html
@@
-1,6
+1,8
@@
<div class="exercise exercise-wtem prawdafalsz" data-type="prawdafalsz" data-id="{{exercise.id}}">
<div class="exercise exercise-wtem prawdafalsz" data-type="prawdafalsz" data-id="{{exercise.id}}">
- {% include "wtem/exercises/exercise_no.html" %}
+ {% if no %}
+ {% include "wtem/exercises/exercise_no.html" %}
+ {% endif %}
<div class="question" data-no="1">
<div class="description">
<div class="question" data-no="1">
<div class="description">
diff --git
a/wtem/templates/wtem/exercises/edumed_przyporzadkuj.html
b/wtem/templates/wtem/exercises/edumed_przyporzadkuj.html
index
bdb17af
..
6f6ac21
100644
(file)
--- a/
wtem/templates/wtem/exercises/edumed_przyporzadkuj.html
+++ b/
wtem/templates/wtem/exercises/edumed_przyporzadkuj.html
@@
-1,6
+1,8
@@
<div class="exercise exercise-wtem przyporzadkuj" data-type="przyporzadkuj" data-id="{{exercise.id}}">
<div class="exercise exercise-wtem przyporzadkuj" data-type="przyporzadkuj" data-id="{{exercise.id}}">
- {% include "wtem/exercises/exercise_no.html" %}
+ {% if no %}
+ {% include "wtem/exercises/exercise_no.html" %}
+ {% endif %}
<div class="question" data-no="1">
<div class="question" data-no="1">
diff --git
a/wtem/templates/wtem/exercises/edumed_uporzadkuj.html
b/wtem/templates/wtem/exercises/edumed_uporzadkuj.html
index
200271e
..
ba05c50
100644
(file)
--- a/
wtem/templates/wtem/exercises/edumed_uporzadkuj.html
+++ b/
wtem/templates/wtem/exercises/edumed_uporzadkuj.html
@@
-1,6
+1,8
@@
<div class="exercise exercise-wtem uporzadkuj" data-type="uporzadkuj" data-id="{{exercise.id}}">
<div class="exercise exercise-wtem uporzadkuj" data-type="uporzadkuj" data-id="{{exercise.id}}">
- {% include "wtem/exercises/exercise_no.html" %}
+ {% if no %}
+ {% include "wtem/exercises/exercise_no.html" %}
+ {% endif %}
<div class="question" data-no="1">
<div class="description">
<div class="question" data-no="1">
<div class="description">
diff --git
a/wtem/templates/wtem/exercises/edumed_wybor.html
b/wtem/templates/wtem/exercises/edumed_wybor.html
index
2ac1e2c
..
0a87aca
100644
(file)
--- a/
wtem/templates/wtem/exercises/edumed_wybor.html
+++ b/
wtem/templates/wtem/exercises/edumed_wybor.html
@@
-1,6
+1,9
@@
<div class="exercise exercise-wtem wybor" data-type="wybor" data-id="{{exercise.id}}">
<div class="exercise exercise-wtem wybor" data-type="wybor" data-id="{{exercise.id}}">
- {% include "wtem/exercises/exercise_no.html" %}
+ {% if no %}
+ {% include "wtem/exercises/exercise_no.html" %}
+ {% endif %}
+
{% autoescape off %}
<div class="description">
{% for para in exercise.description %}
{% autoescape off %}
<div class="description">
{% for para in exercise.description %}
diff --git
a/wtem/templates/wtem/exercises/edumed_wybor_auto.html
b/wtem/templates/wtem/exercises/edumed_wybor_auto.html
index
edd9dad
..
0cd51f0
100644
(file)
--- a/
wtem/templates/wtem/exercises/edumed_wybor_auto.html
+++ b/
wtem/templates/wtem/exercises/edumed_wybor_auto.html
@@
-1,6
+1,8
@@
<div class="exercise exercise-wtem wybor" data-type="wybor" data-id="{{exercise.id}}">
<div class="exercise exercise-wtem wybor" data-type="wybor" data-id="{{exercise.id}}">
- {% include "wtem/exercises/exercise_no.html" %}
+ {% if no %}
+ {% include "wtem/exercises/exercise_no.html" %}
+ {% endif %}
{% autoescape off %}
<div class="description">
{% for para in exercise.description %}
{% autoescape off %}
<div class="description">
{% for para in exercise.description %}
diff --git
a/wtem/templates/wtem/exercises/file_upload.html
b/wtem/templates/wtem/exercises/file_upload.html
index
b452070
..
a5c3782
100644
(file)
--- a/
wtem/templates/wtem/exercises/file_upload.html
+++ b/
wtem/templates/wtem/exercises/file_upload.html
@@
-1,6
+1,8
@@
<div class="exercise-wtem" data-type="file" data-id="{{exercise.id}}">
<div class="exercise-wtem" data-type="file" data-id="{{exercise.id}}">
- {% include "wtem/exercises/exercise_no.html" %}
+ {% if no %}
+ {% include "wtem/exercises/exercise_no.html" %}
+ {% endif %}
<div class="description">
{% for para in exercise.description %}
<div class="description">
{% for para in exercise.description %}
diff --git
a/wtem/templates/wtem/exercises/open.html
b/wtem/templates/wtem/exercises/open.html
index
c30a5b0
..
3f771fb
100644
(file)
--- a/
wtem/templates/wtem/exercises/open.html
+++ b/
wtem/templates/wtem/exercises/open.html
@@
-1,6
+1,8
@@
<div class="exercise-wtem" data-type="open" data-id="{{exercise.id}}">
<div class="exercise-wtem" data-type="open" data-id="{{exercise.id}}">
- {% include "wtem/exercises/exercise_no.html" %}
+ {% if no %}
+ {% include "wtem/exercises/exercise_no.html" %}
+ {% endif %}
<div class="description">
{% autoescape off %}
<div class="description">
{% autoescape off %}
diff --git
a/wtem/templates/wtem/single.html
b/wtem/templates/wtem/single.html
index
3380145
..
8bb12bd
100644
(file)
--- a/
wtem/templates/wtem/single.html
+++ b/
wtem/templates/wtem/single.html
@@
-40,9
+40,10
@@
<form method="post">
<form method="post">
+{% include 'wtem/exercises/exercise_no.html' %}
{% cache 300 wtem exercise.id %}
{% with 'wtem/exercises/'|add:exercise.type|add:'.html' as template_name %}
{% cache 300 wtem exercise.id %}
{% with 'wtem/exercises/'|add:exercise.type|add:'.html' as template_name %}
-{% include
template_name with exercise=exercise
%}
+{% include
template_name with exercise=exercise no=''
%}
{% endwith %}
{% endcache %}
{% endwith %}
{% endcache %}