summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorNico von Geyso <Nico.Geyso@FU-Berlin.de>2012-08-11 13:45:42 +0200
committerNico von Geyso <Nico.Geyso@FU-Berlin.de>2012-08-11 13:45:42 +0200
commit9b8967e4ef3d86d124d62bc1a65183e05cf50b4e (patch)
treee456e7dd383ae699677fe530154397ad17cca961 /templates
parentdd5194709bd6d44dd5f02881d94e278fbebb0841 (diff)
downloadklausuren-9b8967e4ef3d86d124d62bc1a65183e05cf50b4e.tar.gz
klausuren-9b8967e4ef3d86d124d62bc1a65183e05cf50b4e.tar.bz2
klausuren-9b8967e4ef3d86d124d62bc1a65183e05cf50b4e.zip
moved item order of select, some style and validation tweaks
Diffstat (limited to 'templates')
-rw-r--r--templates/upload.html24
1 files changed, 15 insertions, 9 deletions
diff --git a/templates/upload.html b/templates/upload.html
index 2ad5224..2032323 100644
--- a/templates/upload.html
+++ b/templates/upload.html
@@ -5,16 +5,18 @@
{% macro render_fields(field, extra_field) %}
<p>
<label>{{ field.label }}</label>
- {{ field(**kwargs)|safe }}
- {% if field.errors %}
- <span class="error">
- {% for error in field.errors %}{{ error }}{% endfor %}
- </span>
- {% endif %}
+ {{ field|safe }}
{% if extra_field %}
{{extra_field(**kwargs)|safe}}
{% endif %}
+
+ {% if field.errors or extra_field.errors %}
+ <span class="error">
+ {% for error in field.errors %}{{ error }}{% endfor %}
+ {% for error in extra_field.errors %}{{ error }}{% endfor %}
+ </span>
+ {% endif %}
</p>
{% endmacro %}
@@ -24,9 +26,13 @@
<script type="text/javascript">
$(document).ready(function() {
- $('#module').change(function(){
+ var elem = $('#module_new');
+ var module = $('#module');
+ if(module.val() != 'new')
+ elem.hide();
+
+ module.change(function(){
var value = $(this).val();
- var elem = $('#module_new');
if(value == 'new')
elem.fadeIn();
else
@@ -38,7 +44,7 @@
{{ form.csrf_token }}
{{ render_field(form.exam) }}
- {{ render_fields(form.module, form.module_new) }}
+ {{ render_fields(form.module, form.module_new, placeholder='Modulname') }}
{{ render_field(form.year) }}
<p>