--- a/default/input/field.html	Fri Oct 27 18:52:34 2017 +0200
+++ b/default/input/field.html	Fri Oct 27 18:54:01 2017 +0200
@@ -1,20 +1,38 @@
 {% macro choices(name, choices_list, checked=none) %}
     {% for choice, label in choices_list %}
         <div class="form_input">
-            <input id="{{'field'|next_gidx}}" type="radio" name="{{name}}" value="{{choice}}"{{" checked" if checked==choice}}><label for="{{'field'|cur_gidx}}">{{label}}</label>
+            <input id="{{name|next_gidx}}" type="radio" name="{{name}}" value="{{choice}}"{{" checked" if checked==choice}}><label for="{{name|cur_gidx}}">{{label}}</label>
         </div>
     {% endfor %}
 {% endmacro %}
 
 {% macro int(name, label="", init=0) %}
     <span class="form_input">
-        <label id="{{'field'|next_gidx}}">{{label}}</label><input id="{{'field'|cur_gidx}}" type="number" name="{{name}}" value="{{init}}" step="1" min="0"></label>
+        <label id="{{name|next_gidx}}">{{label}}</label><input id="{{name|cur_gidx}}" type="number" name="{{name}}" value="{{init}}" step="1" min="0">
+    </span>
+{% endmacro %}
+
+{% macro text(name, label="", placeholder="", required=false) %}
+    {# single line text field
+       additional kwargs will be passed as attributes #}
+    <span class="form_input">
+        <label id="{{name|next_gidx}}">{{label}}</label><input id="{{name|cur_gidx}}" type="text" name="{{name}}" placeholder="{{placeholder}}" {{"required" if required}} {{kwargs|xmlattr}}>
     </span>
 {% endmacro %}
 
-{% macro text(name, label="", placeholder="") %}
+{% macro password(name, label="", required=false) %}
+    {# password field
+       additional kwargs will be passed as attributes #}
     <span class="form_input">
-        <label id="{{'field'|next_gidx}}">{{label}}</label><input id="{{'field'|cur_gidx}}" type="text" name="{{name}}" placeholder="{{placeholder}}"></label>
+        <label id="{{name|next_gidx}}">{{label}}</label><input id="{{name|cur_gidx}}" type="password" name="{{name}}" {{"required" if required}} {{kwargs|xmlattr}}>
+    </span>
+{% endmacro %}
+
+{% macro email(name, label="", required=false) %}
+    {# email field
+       additional kwargs will be passed as attributes #}
+    <span class="form_input">
+        <label id="{{name|next_gidx}}">{{label}}</label><input id="{{name|cur_gidx}}" type="email" name="{{name}}" {{"required" if required}} {{kwargs|xmlattr}}>
     </span>
 {% endmacro %}