changeset 1736:af5b4eab796c

Automated merge with http://hg.moinmo.in/moin/2.0
author Cheer Xiao <xiaqqaix@gmail.com>
date Sat, 25 Aug 2012 17:09:09 +0800
parents d4f76b82aa84 (current diff) 86c2c69421ef (diff)
children 7d258c74032d
files
diffstat 1 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/templates/forms.html	Thu Aug 23 14:04:41 2012 -0700
+++ b/MoinMoin/templates/forms.html	Sat Aug 25 17:09:09 2012 +0800
@@ -72,8 +72,13 @@
 {% endmacro %}
 
 {% macro annotated_input(field, type=none) %}
+  {% set type = type or field.properties.widget %}
   <dt>
-    {{ gen.label(field) }}
+    {% if type == 'checkbox' %}
+      {{ _checkbox_label(field) }}
+    {% else %}
+      {{ gen.label(field) }}
+    {% endif %}
   </dt>
   <dd>
     {{ raw_input(field, type) }}