From 4b2479a67217baa238beb0b407a63ff1025b09f1 Mon Sep 17 00:00:00 2001 From: Jan Szejko Date: Wed, 24 Feb 2016 15:42:40 +0100 Subject: [PATCH 1/1] adapt templates to the current edition of WTEM also some code style changes --- edumed/templates/base_super.html | 2 +- edumed/templates/contact/tem/mail_body.txt | 2 +- edumed/templates/contact/wtem/mail_body.txt | 4 +- .../contact/wtem/student_mail_body.html | 4 +- edumed/templates/contact/wtem/thanks.html | 2 +- edumed/urls.py | 5 +- wtem/forms.py | 4 +- .../management/commands/wtem_generate_keys.py | 9 +- wtem/management/commands/wtem_send_keys.py | 24 +++--- wtem/models.py | 63 +++++++------- wtem/templates/wtem-wtem/admin_report.csv | 2 - .../wtem-wtem/disabled_contact_form.html | 13 --- wtem/templates/wtem-wtem/email_key.txt | 13 --- wtem/templates/wtem-wtem/email_key.txt.wtem | 16 ---- .../wtem-wtem/email_teacher_before.txt | 18 ---- .../email_teacher_before_subject.txt | 1 - .../exercises/edumed_prawdafalsz.html | 26 ------ .../exercises/edumed_przyporzadkuj.html | 85 ------------------- .../exercises/edumed_uporzadkuj.html | 23 ----- .../wtem-wtem/exercises/edumed_wybor.html | 46 ---------- .../wtem-wtem/exercises/file_upload.html | 28 ------ wtem/templates/wtem-wtem/exercises/open.html | 38 --------- wtem/templates/wtem-wtem/key_not_found.html | 9 -- .../wtem-wtem/key_not_found_before.html | 9 -- wtem/templates/wtem-wtem/main.html | 82 ------------------ wtem/templates/wtem-wtem/main_after.html | 9 -- wtem/templates/wtem-wtem/main_before.html | 9 -- .../wtem-wtem/results_student_failed.txt | 13 --- .../wtem-wtem/results_student_passed.txt | 14 --- wtem/templates/wtem-wtem/results_teacher.txt | 16 ---- wtem/templates/wtem-wtem/thanks.html | 19 ----- .../templates/wtem/disabled_contact_form.html | 4 +- wtem/templates/wtem/email_key.txt | 17 ++-- wtem/templates/wtem/email_teacher_before.txt | 2 +- wtem/templates/wtem/key_not_found.html | 2 +- wtem/templates/wtem/key_not_found_before.html | 2 +- wtem/templates/wtem/main.html | 14 +-- wtem/templates/wtem/main_after.html | 4 +- wtem/templates/wtem/main_before.html | 4 +- wtem/templates/wtem/thanks.html | 12 ++- wtem/templates/wtem/title.html | 1 + wtem/urls.py | 4 +- wtem/views.py | 29 ++++--- 43 files changed, 116 insertions(+), 587 deletions(-) delete mode 100644 wtem/templates/wtem-wtem/admin_report.csv delete mode 100644 wtem/templates/wtem-wtem/disabled_contact_form.html delete mode 100644 wtem/templates/wtem-wtem/email_key.txt delete mode 100644 wtem/templates/wtem-wtem/email_key.txt.wtem delete mode 100644 wtem/templates/wtem-wtem/email_teacher_before.txt delete mode 100644 wtem/templates/wtem-wtem/email_teacher_before_subject.txt delete mode 100644 wtem/templates/wtem-wtem/exercises/edumed_prawdafalsz.html delete mode 100644 wtem/templates/wtem-wtem/exercises/edumed_przyporzadkuj.html delete mode 100644 wtem/templates/wtem-wtem/exercises/edumed_uporzadkuj.html delete mode 100644 wtem/templates/wtem-wtem/exercises/edumed_wybor.html delete mode 100644 wtem/templates/wtem-wtem/exercises/file_upload.html delete mode 100644 wtem/templates/wtem-wtem/exercises/open.html delete mode 100644 wtem/templates/wtem-wtem/key_not_found.html delete mode 100644 wtem/templates/wtem-wtem/key_not_found_before.html delete mode 100644 wtem/templates/wtem-wtem/main.html delete mode 100644 wtem/templates/wtem-wtem/main_after.html delete mode 100644 wtem/templates/wtem-wtem/main_before.html delete mode 100644 wtem/templates/wtem-wtem/results_student_failed.txt delete mode 100644 wtem/templates/wtem-wtem/results_student_passed.txt delete mode 100644 wtem/templates/wtem-wtem/results_teacher.txt delete mode 100644 wtem/templates/wtem-wtem/thanks.html create mode 100644 wtem/templates/wtem/title.html diff --git a/edumed/templates/base_super.html b/edumed/templates/base_super.html index 430422c..3a7e794 100644 --- a/edumed/templates/base_super.html +++ b/edumed/templates/base_super.html @@ -67,7 +67,7 @@ {# chunks? #}