From e2834349551102f8d21073a1aa6e66f538b6bcf0 Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Wed, 2 Sep 2015 17:48:52 +0200
Subject: [PATCH 1/8] Drop form fields already provided by the Form plugin

---
 .../forms/fields/checkbox/checkbox.html.twig  | 14 ------
 .../forms/fields/checkbox/checkbox.yaml       | 11 -----
 .../fields/checkboxes/checkboxes.html.twig    | 34 ---------------
 .../forms/fields/hidden/hidden.html.twig      |  3 --
 .../forms/fields/ignore/ignore.html.twig      |  0
 .../forms/fields/password/password.html.twig  | 30 -------------
 .../forms/fields/section/section.html.twig    | 18 --------
 .../forms/fields/select/select.html.twig      | 22 ----------
 .../templates/forms/fields/tab/tab.html.twig  | 10 -----
 .../forms/fields/tabs/tabs.html.twig          | 23 ----------
 .../forms/fields/text/text.html.twig          |  6 ---
 .../forms/fields/textarea/textarea.html.twig  | 21 ---------
 .../forms/fields/toggle/toggle.html.twig      | 43 -------------------
 13 files changed, 235 deletions(-)
 delete mode 100644 themes/grav/templates/forms/fields/checkbox/checkbox.html.twig
 delete mode 100644 themes/grav/templates/forms/fields/checkbox/checkbox.yaml
 delete mode 100644 themes/grav/templates/forms/fields/checkboxes/checkboxes.html.twig
 delete mode 100644 themes/grav/templates/forms/fields/hidden/hidden.html.twig
 delete mode 100644 themes/grav/templates/forms/fields/ignore/ignore.html.twig
 delete mode 100644 themes/grav/templates/forms/fields/password/password.html.twig
 delete mode 100644 themes/grav/templates/forms/fields/section/section.html.twig
 delete mode 100644 themes/grav/templates/forms/fields/select/select.html.twig
 delete mode 100644 themes/grav/templates/forms/fields/tab/tab.html.twig
 delete mode 100644 themes/grav/templates/forms/fields/tabs/tabs.html.twig
 delete mode 100644 themes/grav/templates/forms/fields/text/text.html.twig
 delete mode 100644 themes/grav/templates/forms/fields/textarea/textarea.html.twig
 delete mode 100644 themes/grav/templates/forms/fields/toggle/toggle.html.twig

diff --git a/themes/grav/templates/forms/fields/checkbox/checkbox.html.twig b/themes/grav/templates/forms/fields/checkbox/checkbox.html.twig
deleted file mode 100644
index dfd5dd0d..00000000
--- a/themes/grav/templates/forms/fields/checkbox/checkbox.html.twig
+++ /dev/null
@@ -1,14 +0,0 @@
-{% set value = (value is null ? field.default : value) %}
-
-<div class="form-field">
-    <label class="inline">
-        <input type="checkbox"
-               name="{{ (scope ~ field.name)|fieldName }}"
-                {% if value == true %} checked="checked" {% endif %}
-                {% if field.autofocus in ['on', 'true', 1] %}autofocus="autofocus"{% endif %}
-                {% if field.novalidate in ['on', 'true', 1] %}novalidate="novalidate"{% endif %}
-                {% if field.validate.required in ['on', 'true', 1] %}required="required"{% endif %}
-        />
-        {{ field.label|e }} {{ field.validate.required in ['on', 'true', 1] ? '<span class="required">*</span>' }}
-    </label>
-</div>
diff --git a/themes/grav/templates/forms/fields/checkbox/checkbox.yaml b/themes/grav/templates/forms/fields/checkbox/checkbox.yaml
deleted file mode 100644
index b4071446..00000000
--- a/themes/grav/templates/forms/fields/checkbox/checkbox.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-field:
-  checkbox:
-    node: boolean
-    key: name
-    fields:
-      name:
-        type: text
-        validation:
-          required: true
-      value:
-        type: text
diff --git a/themes/grav/templates/forms/fields/checkboxes/checkboxes.html.twig b/themes/grav/templates/forms/fields/checkboxes/checkboxes.html.twig
deleted file mode 100644
index 7aeeedec..00000000
--- a/themes/grav/templates/forms/fields/checkboxes/checkboxes.html.twig
+++ /dev/null
@@ -1,34 +0,0 @@
-{% extends "forms/field.html.twig" %}
-
-{% set originalValue = value %}
-{% set value = (value is null ? field.default : value) %}
-{% if field.use == 'keys' and field.default %}
-    {% set value = field.default|merge(value) %}
-{% endif %}
-
-{% block global_attributes %}
-    {{ parent() }}
-    data-grav-keys="{{ field.use == 'keys' ? 'true' : 'false' }}"
-    data-grav-field-name="{{ field.name|fieldName }}"
-{% endblock %}
-
-{% block input %}
-    {% for key, text in field.options %}
-
-        {% set id = field.name ~ '-' ~ key %}
-        {% set name = field.use == 'keys' ? key : id %}
-        {% set val = field.use == 'keys' ? '1' : key %}
-        {% set checked = (field.use == 'keys' ? value[key] : key in value) %}
-
-        <span class="checkboxes">
-            <input type="checkbox"
-                   id="{{ id|e }}"
-                   value="{{ val|e }}"
-                   name="{{ field.name|fieldName ~ '[' ~ name ~ ']' }}"
-                   {% if checked %}checked="checked"{% endif %}
-                   {% if field.validate.required %}required="required"{% endif %}
-            >
-            <label for="{{ id|e }}">{{ text|e }}</label>
-        </span>
-    {% endfor %}
-{% endblock %}
diff --git a/themes/grav/templates/forms/fields/hidden/hidden.html.twig b/themes/grav/templates/forms/fields/hidden/hidden.html.twig
deleted file mode 100644
index 1e90d477..00000000
--- a/themes/grav/templates/forms/fields/hidden/hidden.html.twig
+++ /dev/null
@@ -1,3 +0,0 @@
-{% set value = (value is null ? field.default : value) %}
-
-<input data-grav-field="hidden" data-grav-disabled="false" type="hidden" class="input" name="{{ (scope ~ field.name)|fieldName }}" value="{{ value|join(', ') }}" />
diff --git a/themes/grav/templates/forms/fields/ignore/ignore.html.twig b/themes/grav/templates/forms/fields/ignore/ignore.html.twig
deleted file mode 100644
index e69de29b..00000000
diff --git a/themes/grav/templates/forms/fields/password/password.html.twig b/themes/grav/templates/forms/fields/password/password.html.twig
deleted file mode 100644
index 2b604b6e..00000000
--- a/themes/grav/templates/forms/fields/password/password.html.twig
+++ /dev/null
@@ -1,30 +0,0 @@
-{% set value = (value is null ? field.default : value) %}
-
-<div class="form-field grid pure-g">
-    <div class="form-label block size-1-3 pure-u-1-3">
-        <label>
-        {% if field.help %}
-        <span class="tooltip" data-asTooltip-position="w" title="{{ field.help|e|tu }}">{{ field.label|tu }}</span>
-        {% else %}
-        {{ field.label|tu }}
-        {% endif %}
-        {{ field.validate.required in ['on', 'true', 1] ? '<span class="required">*</span>' }}
-        </label>
-    </div>
-    <div class="form-data block size-2-3 pure-u-2-3">
-        <div class="form-input-wrapper {{ field.size }}">
-            <input  type="password"
-                    class="input"
-                    name="{{ (scope ~ field.name)|fieldName }}"
-                    value="{{ value|join(', ') }}"
-                    {% if field.placeholder %}placeholder="{{ field.placeholder }}"{% endif %}
-                    {% if field.autofocus in ['on', 'true', 1] %}autofocus="autofocus"{% endif %}
-                    {% if field.novalidate in ['on', 'true', 1] %}novalidate="novalidate"{% endif %}
-                    {% if field.autocomplete in ['on', 'off'] %}autocomplete="{{ field.autocomplete }}"{% endif %}
-                    {% if field.validate.required in ['on', 'true', 1] %}required="required"{% endif %}
-                    {% if field.validate.pattern %}pattern="{{ field.validate.pattern }}"{% endif %}
-                    {% if field.validate.message %}title="{{ field.validate.message|e|tu }}"{% endif %}
-            />
-        </div>
-    </div>
-</div>
diff --git a/themes/grav/templates/forms/fields/section/section.html.twig b/themes/grav/templates/forms/fields/section/section.html.twig
deleted file mode 100644
index 281893cb..00000000
--- a/themes/grav/templates/forms/fields/section/section.html.twig
+++ /dev/null
@@ -1,18 +0,0 @@
-{% if field.title %}
-<h1 {% if not field.underline %}class="no_underline"{% endif %}>{{ field.title|tu }}</h1>
-{% endif %}
-
-{% if field.text %}
-<p>{{ field.text|tu }}<p>
-{% endif %}
-
-{% if field.fields %}
-    <div class="form-section">
-    {% for field in field.fields %}
-        {% if field.type %}
-            {% set value = data.value(field.name) %}
-            {% include ["forms/fields/#{field.type}/#{field.type}.html.twig", 'forms/fields/text/text.html.twig'] %}
-        {% endif %}
-    {% endfor %}
-    </div>
-{% endif %}
diff --git a/themes/grav/templates/forms/fields/select/select.html.twig b/themes/grav/templates/forms/fields/select/select.html.twig
deleted file mode 100644
index 01c8dfce..00000000
--- a/themes/grav/templates/forms/fields/select/select.html.twig
+++ /dev/null
@@ -1,22 +0,0 @@
-{% extends "forms/field.html.twig" %}
-
-{% block global_attributes %}
-    data-grav-selectize="{{ (field.selectize is defined ? field.selectize : {})|json_encode()|e('html_attr') }}"
-    {{ parent() }}
-{% endblock %}
-
-{% block input %}
-    <div class="form-select-wrapper {{ field.size }}">
-        <select class="{{ field.classes }}" name="{{ (scope ~ field.name)|fieldName ~ (field.multiple ? '[]' : '') }}"
-                {% if field.autofocus in ['on', 'true', 1] %}autofocus="autofocus"{% endif %}
-                {% if field.novalidate in ['on', 'true', 1] %}novalidate="novalidate"{% endif %}
-                {% if field.validate.required in ['on', 'true', 1] %}required="required"{% endif %}
-                {% if field.multiple in ['on', 'true', 1] %}multiple="multiple"{% endif %}
-                {% if field.form %}form="{{ field.form }}"{% endif %}
-                >
-            {% for key, text in field.options %}
-            <option {% if key == value or (field.multiple and text in value) %}selected="selected"{% endif %} value="{{ field.multiple ? text : key }}">{{ text|tu }}</option>
-            {% endfor %}
-        </select>
-    </div>
-{% endblock %}
diff --git a/themes/grav/templates/forms/fields/tab/tab.html.twig b/themes/grav/templates/forms/fields/tab/tab.html.twig
deleted file mode 100644
index 0c7c8e70..00000000
--- a/themes/grav/templates/forms/fields/tab/tab.html.twig
+++ /dev/null
@@ -1,10 +0,0 @@
-{% if field.fields %}
-    <div class="form-tab">
-    {% for field in field.fields %}
-        {% if field.type %}
-            {% set value = data.value(field.name) %}
-                {% include ["forms/fields/#{field.type}/#{field.type}.html.twig", 'forms/fields/text/text.html.twig'] %}
-        {% endif %}
-    {% endfor %}
-    </div>
-{% endif %}
diff --git a/themes/grav/templates/forms/fields/tabs/tabs.html.twig b/themes/grav/templates/forms/fields/tabs/tabs.html.twig
deleted file mode 100644
index 80508137..00000000
--- a/themes/grav/templates/forms/fields/tabs/tabs.html.twig
+++ /dev/null
@@ -1,23 +0,0 @@
-<div class="form-tabs">
-
-{% if uri.params.tab %}
-    {% set active = uri.params.tab %}
-{% elseif field.active %}
-    {% set active = field.active %}
-{% else %}
-    {% set active = 1 %}
-{% endif %}
-
-{% if field.fields %}
-    {% for tab in field.fields %}<input type="radio" name="tab" id="tab{{ loop.index }}" class="tab-head" {{ active == loop.index ? 'checked="checked"' : '' }}/><label for="tab{{ loop.index }}">{{ tab.title|tu }}</label>{% endfor %}
-    <div class="tab-body-wrapper">
-        {% for field in field.fields %}
-        {% set value = data.value(field.name) %}
-        <div id="tab-body-{{ loop.index }}" class="tab-body">
-        {% include ["forms/fields/#{field.type}/#{field.type}.html.twig", 'forms/fields/text/text.html.twig'] %}
-        </div>
-        {% endfor %}
-    </div>
-{% endif %}
-</div>
-
diff --git a/themes/grav/templates/forms/fields/text/text.html.twig b/themes/grav/templates/forms/fields/text/text.html.twig
deleted file mode 100644
index 2b96ebea..00000000
--- a/themes/grav/templates/forms/fields/text/text.html.twig
+++ /dev/null
@@ -1,6 +0,0 @@
-{% extends "forms/field.html.twig" %}
-
-{% block input_attributes %}
-    type="text"
-    {{ parent() }}
-{% endblock %}
diff --git a/themes/grav/templates/forms/fields/textarea/textarea.html.twig b/themes/grav/templates/forms/fields/textarea/textarea.html.twig
deleted file mode 100644
index af2315ce..00000000
--- a/themes/grav/templates/forms/fields/textarea/textarea.html.twig
+++ /dev/null
@@ -1,21 +0,0 @@
-{% extends "forms/field.html.twig" %}
-
-{% block input %}
-    <div class="form-textarea-wrapper {{ field.size }}">
-        <textarea class="input" name="{{ (scope ~ field.name)|fieldName }}"
-            {# required attribute structures #}
-            name="{{ (scope ~ field.name)|fieldName }}"
-            {# input attribute structures #}
-            {% block input_attributes %}
-                {% if field.placeholder %}placeholder="{{ field.placeholder }}"{% endif %}
-                {% if field.autofocus in ['on', 'true', 1] %}autofocus="autofocus"{% endif %}
-                {% if field.novalidate in ['on', 'true', 1] %}novalidate="novalidate"{% endif %}
-                {% if field.readonly in ['on', 'true', 1] %}readonly="readonly"{% endif %}
-                {% if field.autocomplete in ['on', 'off'] %}autocomplete="{{ field.autocomplete }}"{% endif %}
-                {% if field.validate.required in ['on', 'true', 1] %}required="required"{% endif %}
-                {% if field.validate.pattern %}pattern="{{ field.validate.pattern }}"{% endif %}
-                {% if field.validate.message %}title="{{ field.validate.message|tu }}"{% endif %}
-            {% endblock %}
-            >{{ value|trim|e('html') }}</textarea>
-    </div>
-{% endblock %}
\ No newline at end of file
diff --git a/themes/grav/templates/forms/fields/toggle/toggle.html.twig b/themes/grav/templates/forms/fields/toggle/toggle.html.twig
deleted file mode 100644
index 38634119..00000000
--- a/themes/grav/templates/forms/fields/toggle/toggle.html.twig
+++ /dev/null
@@ -1,43 +0,0 @@
-{% extends "forms/field.html.twig" %}
-
-{% set value = (value is null ? field.default : value) %}
-{% set value = (value is same as(false) ? 0 : value) %}
-
-{% set has_hidden = false %}
-{% for key, text in field.options %}
-    {% if key is empty %}
-      {% set has_hidden = true %}
-    {% endif %}
-{% endfor %}
-
-{% block global_attributes %}
-    {{ parent() }}
-    data-grav-field-name="{{ field.name|fieldName }}"
-{% endblock %}
-
-{% block input %}
-
-    <div class="switch-toggle switch-grav {{ field.size }} switch-{{ field.options|length }}">
-        {% for key, text in field.options %}
-            {% set id = "toggle_" ~ field.name ~ key %}
-
-            <input type="radio"
-                value="{{ key }}"
-                id="{{ id }}"
-                name="{{ (scope ~ field.name)|fieldName }}"
-                {% if field.highlight is defined %}
-                class="{{ field.highlight == '' ~ key ? 'highlight' : '' }}"
-                {% endif %}
-                {% if field.toggleable %}
-                    {% if '' ~ key == '' ~ value %}checked="checked" {% endif %}
-                    {% if value is defined and (key == 1 or key == '1') %}checked="checked" {% endif %}
-                {% else %}
-                    {% if '' ~ key == '' ~ value %}checked="checked" {% endif %}
-                {% endif %}
-                {% if field.validate.required in ['on', 'true', 1] %}required="required"{% endif %}
-            />
-            <label for="{{ id }}">{{ text|tu }}</label>
-        {% endfor %}
-        <a></a>
-    </div>
-{% endblock %}

From 3fe3c39f1303fdea27c383a626487f06df7bbb88 Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Thu, 3 Sep 2015 17:33:25 +0200
Subject: [PATCH 2/8] Drop Datetime field, now in Form

---
 .../forms/fields/datetime/datetime.html.twig  | 20 -------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 themes/grav/templates/forms/fields/datetime/datetime.html.twig

diff --git a/themes/grav/templates/forms/fields/datetime/datetime.html.twig b/themes/grav/templates/forms/fields/datetime/datetime.html.twig
deleted file mode 100644
index 8f00df1c..00000000
--- a/themes/grav/templates/forms/fields/datetime/datetime.html.twig
+++ /dev/null
@@ -1,20 +0,0 @@
-{% extends "forms/field.html.twig" %}
-
-{% set value = (value is null ? field.default : value) %}
-{% set value = (value is null ? value : value|date("d-m-Y H:i")) %}
-
-{% block input %}
-    <input
-        type="text"
-        data-grav-field-datetime
-        class="{{ field.classes }}"
-        name="{{ (scope ~ field.name)|fieldName }}"
-        value="{{ value }}"
-        {% if field.autofocus in ['on', 'true', 1] %}autofocus="autofocus"{% endif %}
-        {% if field.novalidate in ['on', 'true', 1] %}novalidate="novalidate"{% endif %}
-        {% if field.autocomplete in ['on', 'off'] %}autocomplete="{{ field.autocomplete }}"{% endif %}
-        {% if field.validate.required in ['on', 'true', 1] %}required="required"{% endif %}
-        {% if field.validate.min %}min="{{ (field.validate.min is null ? field.validate.min : field.validate.min|date("d-m-Y H:i")) }}"{% endif %}
-        {% if field.validate.max %}max="{{ (field.validate.max is null ? field.validate.max : field.validate.max|date("d-m-Y H:i")) }}"{% endif %}
-        />
-{% endblock %}

From 91f30214d372eb9e2665a7b754a6298832dad5ec Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Thu, 3 Sep 2015 18:47:24 +0200
Subject: [PATCH 3/8] Move section, tab, tabs back to the admin plugin

---
 .../forms/fields/section/section.html.twig    | 18 +++++++++++++++
 .../templates/forms/fields/tab/tab.html.twig  | 10 ++++++++
 .../forms/fields/tabs/tabs.html.twig          | 23 +++++++++++++++++++
 3 files changed, 51 insertions(+)
 create mode 100644 themes/grav/templates/forms/fields/section/section.html.twig
 create mode 100644 themes/grav/templates/forms/fields/tab/tab.html.twig
 create mode 100644 themes/grav/templates/forms/fields/tabs/tabs.html.twig

diff --git a/themes/grav/templates/forms/fields/section/section.html.twig b/themes/grav/templates/forms/fields/section/section.html.twig
new file mode 100644
index 00000000..c382b04e
--- /dev/null
+++ b/themes/grav/templates/forms/fields/section/section.html.twig
@@ -0,0 +1,18 @@
+{% if field.title %}
+<h1 {% if not field.underline %}class="no_underline"{% endif %}>{% if grav.twig.twig.filters['tu'] is defined %}{{ field.title|tu }}{% else %}{{ field.title|t }}{% endif %}</h1>
+{% endif %}
+
+{% if field.text %}
+<p>{% if grav.twig.twig.filters['tu'] is defined %}{{ field.text|tu }}{% else %}{{ field.text|t }}{% endif %}<p>
+{% endif %}
+
+{% if field.fields %}
+    <div class="form-section">
+    {% for field in field.fields %}
+        {% if field.type %}
+            {% set value = data.value(field.name) %}
+            {% include ["forms/fields/#{field.type}/#{field.type}.html.twig", 'forms/fields/text/text.html.twig'] %}
+        {% endif %}
+    {% endfor %}
+    </div>
+{% endif %}
diff --git a/themes/grav/templates/forms/fields/tab/tab.html.twig b/themes/grav/templates/forms/fields/tab/tab.html.twig
new file mode 100644
index 00000000..0c7c8e70
--- /dev/null
+++ b/themes/grav/templates/forms/fields/tab/tab.html.twig
@@ -0,0 +1,10 @@
+{% if field.fields %}
+    <div class="form-tab">
+    {% for field in field.fields %}
+        {% if field.type %}
+            {% set value = data.value(field.name) %}
+                {% include ["forms/fields/#{field.type}/#{field.type}.html.twig", 'forms/fields/text/text.html.twig'] %}
+        {% endif %}
+    {% endfor %}
+    </div>
+{% endif %}
diff --git a/themes/grav/templates/forms/fields/tabs/tabs.html.twig b/themes/grav/templates/forms/fields/tabs/tabs.html.twig
new file mode 100644
index 00000000..f28d87c0
--- /dev/null
+++ b/themes/grav/templates/forms/fields/tabs/tabs.html.twig
@@ -0,0 +1,23 @@
+<div class="form-tabs">
+
+{% if uri.params.tab %}
+    {% set active = uri.params.tab %}
+{% elseif field.active %}
+    {% set active = field.active %}
+{% else %}
+    {% set active = 1 %}
+{% endif %}
+
+{% if field.fields %}
+    {% for tab in field.fields %}<input type="radio" name="tab" id="tab{{ loop.index }}" class="tab-head" {{ active == loop.index ? 'checked="checked"' : '' }}/><label for="tab{{ loop.index }}">{% if grav.twig.twig.filters['tu'] is defined %}{{ tab.title|tu }}{% else %}{{ tab.title|t }}{% endif %}</label>{% endfor %}
+    <div class="tab-body-wrapper">
+        {% for field in field.fields %}
+        {% set value = data.value(field.name) %}
+        <div id="tab-body-{{ loop.index }}" class="tab-body">
+        {% include ["forms/fields/#{field.type}/#{field.type}.html.twig", 'forms/fields/text/text.html.twig'] %}
+        </div>
+        {% endfor %}
+    </div>
+{% endif %}
+</div>
+

From a40169471d11d1c2939c0ca39534e388bac35ad4 Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Thu, 3 Sep 2015 18:50:10 +0200
Subject: [PATCH 4/8] Move toggle field to the admin plugin

---
 .../forms/fields/toggle/toggle.html.twig      | 43 +++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 themes/grav/templates/forms/fields/toggle/toggle.html.twig

diff --git a/themes/grav/templates/forms/fields/toggle/toggle.html.twig b/themes/grav/templates/forms/fields/toggle/toggle.html.twig
new file mode 100644
index 00000000..d6f61662
--- /dev/null
+++ b/themes/grav/templates/forms/fields/toggle/toggle.html.twig
@@ -0,0 +1,43 @@
+{% extends "forms/field.html.twig" %}
+
+{% set value = (value is null ? field.default : value) %}
+{% set value = (value is same as(false) ? 0 : value) %}
+
+{% set has_hidden = false %}
+{% for key, text in field.options %}
+    {% if key is empty %}
+      {% set has_hidden = true %}
+    {% endif %}
+{% endfor %}
+
+{% block global_attributes %}
+    {{ parent() }}
+    data-grav-field-name="{{ field.name|fieldName }}"
+{% endblock %}
+
+{% block input %}
+
+    <div class="switch-toggle switch-grav {{ field.size }} switch-{{ field.options|length }}">
+        {% for key, text in field.options %}
+            {% set id = "toggle_" ~ field.name ~ key %}
+
+            <input type="radio"
+                value="{{ key }}"
+                id="{{ id }}"
+                name="{{ (scope ~ field.name)|fieldName }}"
+                {% if field.highlight is defined %}
+                class="{{ field.highlight == '' ~ key ? 'highlight' : '' }}"
+                {% endif %}
+                {% if field.toggleable %}
+                    {% if '' ~ key == '' ~ value %}checked="checked" {% endif %}
+                    {% if value is defined and (key == 1 or key == '1') %}checked="checked" {% endif %}
+                {% else %}
+                    {% if '' ~ key == '' ~ value %}checked="checked" {% endif %}
+                {% endif %}
+                {% if field.validate.required in ['on', 'true', 1] %}required="required"{% endif %}
+            />
+            <label for="{{ id }}">{% if grav.twig.twig.filters['tu'] is defined %}{{ text|tu }}{% else %}{{ text|t }}{% endif %}</label>
+        {% endfor %}
+        <a></a>
+    </div>
+{% endblock %}

From c25c501b6f288c8a7a312e3c5976428f9ec304e9 Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Fri, 4 Sep 2015 16:59:18 +0200
Subject: [PATCH 5/8] Renamed `uploads` form field to `pagemedia`

---
 .../{uploads/uploads.html.twig => pagemedia/pagemedia.html.twig}  | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename themes/grav/templates/forms/fields/{uploads/uploads.html.twig => pagemedia/pagemedia.html.twig} (100%)

diff --git a/themes/grav/templates/forms/fields/uploads/uploads.html.twig b/themes/grav/templates/forms/fields/pagemedia/pagemedia.html.twig
similarity index 100%
rename from themes/grav/templates/forms/fields/uploads/uploads.html.twig
rename to themes/grav/templates/forms/fields/pagemedia/pagemedia.html.twig

From 72819f20c52afa8378e36bbd31f3ae7dbd163d60 Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Fri, 4 Sep 2015 18:20:39 +0200
Subject: [PATCH 6/8] Move ignore to `admin`, move email to `form`

---
 .../forms/fields/email/email.html.twig        | 32 -------------------
 .../forms/fields/ignore/ignore.html.twig      |  0
 2 files changed, 32 deletions(-)
 delete mode 100644 themes/grav/templates/forms/fields/email/email.html.twig
 create mode 100644 themes/grav/templates/forms/fields/ignore/ignore.html.twig

diff --git a/themes/grav/templates/forms/fields/email/email.html.twig b/themes/grav/templates/forms/fields/email/email.html.twig
deleted file mode 100644
index 9176ba12..00000000
--- a/themes/grav/templates/forms/fields/email/email.html.twig
+++ /dev/null
@@ -1,32 +0,0 @@
-{% set value = (value is null ? field.default : value) %}
-
-<div class="form-field grid pure-g">
-    <div class="form-label block size-1-3 pure-u-1-3">
-        <label>
-            {% if field.help %}
-            <span class="tooltip" data-asTooltip-position="w" title="{{ field.help|e|tu }}">{{ field.label|tu }}</span>
-            {% else %}
-            {{ field.label|tu }}
-            {% endif %}
-            {{ field.validate.required in ['on', 'true', 1] ? '<span class="required">*</span>' }}
-        </label>
-    </div>
-    <div class="form-data block size-2-3 pure-u-2-3">
-        <div class="form-input-wrapper {{ field.size }}">
-            <input  type="email"
-                    class="{{ field.classes }}"
-                    name="{{ (scope ~ field.name)|fieldName }}"
-                    value="{{ value|join(', ') }}"
-                    {% if field.placeholder %}placeholder="{{ field.placeholder }}"{% endif %}
-                    {% if field.title %}title="{{ field.title }}"{% endif %}
-                    {% if field.autofocus in ['on', 'true', 1] %}autofocus="autofocus"{% endif %}
-                    {% if field.novalidate in ['on', 'true', 1] %}novalidate="novalidate"{% endif %}
-                    {% if field.readonly in ['on', 'true', 1] %}readonly="readonly"{% endif %}
-                    {% if field.autocomplete in ['on', 'off'] %}autocomplete="{{ field.autocomplete }}"{% endif %}
-                    {% if field.validate.required in ['on', 'true', 1] %}required="required"{% endif %}
-                    {% if field.validate.pattern %}pattern="{{ field.validate.pattern }}"{% endif %}
-                    {% if field.validate.message %}title="{{ field.validate.message|e|tu }}"{% endif %}
-            />
-        </div>
-    </div>
-</div>
diff --git a/themes/grav/templates/forms/fields/ignore/ignore.html.twig b/themes/grav/templates/forms/fields/ignore/ignore.html.twig
new file mode 100644
index 00000000..e69de29b

From a63262763d95404eab3acf885b34e4008a10472f Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Mon, 7 Sep 2015 15:48:52 +0200
Subject: [PATCH 7/8] Drop erroneously re-added datetime, now provided by the
 form plugin

---
 .../forms/fields/datetime/datetime.html.twig  | 20 -------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 themes/grav/templates/forms/fields/datetime/datetime.html.twig

diff --git a/themes/grav/templates/forms/fields/datetime/datetime.html.twig b/themes/grav/templates/forms/fields/datetime/datetime.html.twig
deleted file mode 100644
index 0eaed7c0..00000000
--- a/themes/grav/templates/forms/fields/datetime/datetime.html.twig
+++ /dev/null
@@ -1,20 +0,0 @@
-{% extends "forms/field.html.twig" %}
-
-{% set value = (value is null ? field.default : value) %}
-{% set value = (value is null ? value : value|date('d-m-Y H:i')) %}
-
-{% block input %}
-    <input
-        type="text"
-        data-grav-field-datetime
-        class="{{ field.classes }}"
-        name="{{ (scope ~ field.name)|fieldName }}"
-        value="{{ value }}"
-        {% if field.autofocus in ['on', 'true', 1] %}autofocus="autofocus"{% endif %}
-        {% if field.novalidate in ['on', 'true', 1] %}novalidate="novalidate"{% endif %}
-        {% if field.autocomplete in ['on', 'off'] %}autocomplete="{{ field.autocomplete }}"{% endif %}
-        {% if field.validate.required in ['on', 'true', 1] %}required="required"{% endif %}
-        {% if field.validate.min %}min="{{ (field.validate.min is null ? field.validate.min : field.validate.min|date("d-m-Y H:i")) }}"{% endif %}
-        {% if field.validate.max %}max="{{ (field.validate.max is null ? field.validate.max : field.validate.max|date("d-m-Y H:i")) }}"{% endif %}
-        />
-{% endblock %}

From d87ae7b06ac4e038f3d4868a1e980755379bfa86 Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Mon, 7 Sep 2015 15:50:01 +0200
Subject: [PATCH 8/8] Move display to the form plugin

---
 .../templates/forms/fields/display/display.html.twig  | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 themes/grav/templates/forms/fields/display/display.html.twig

diff --git a/themes/grav/templates/forms/fields/display/display.html.twig b/themes/grav/templates/forms/fields/display/display.html.twig
deleted file mode 100644
index 9ad1dee0..00000000
--- a/themes/grav/templates/forms/fields/display/display.html.twig
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends "forms/field.html.twig" %}
-
-{% block input %}
-    <div class="form-display-wrapper {{ field.size }}">
-        {% if field.markdown %}
-            {{ field.content|markdown }}
-        {% else %}
-            {{ field.content }}
-        {% endif %}
-    </div>
-{% endblock %}