futuro 1.0.6 → 1.1.1

data/_includes/html/page/content/loop/form/alert.liquid

@@ -1,14 +1,9 @@
 
-{%- if include.context == "form" -%}
-
-  <p class="block form-row alert-row">
-
-    <span class="block form-alert">{{ item.alert }}</span>
-
-  </p>
-
-{%- else -%}
-
-  <span class="block form-alert">{{ item.alert }}</span>
-
-{%- endif -%}
+<p class="block form-row alert-row">
+  
+  {% include {{ ContentLoop | append : 'alert.liquid' }} 
+                 title = item.alert.title
+                 type  = item.alert.type 
+                 price = item.alert.price %}               
+
+</p>

data/_includes/html/page/content/loop/form/callout.liquid

@@ -1,6 +1,6 @@
 
 <p class="block form-row title-row">
 
-  <span class="block title">{{ item.callout }}</span>
+  <span class="block title">{{ item.callout.title }}</span>
 
 </p>

data/_includes/html/page/content/loop/form/date.liquid

@@ -3,14 +3,14 @@
 
   {% include html/assign/name.liquid parent="day" %}
 
-  {% include {{ LoopForm | append : 'label.liquid' }}
-                 title    = item.date
-                 small    = item.small
-                 subtitle = item.subtitle %}
+  {% include {{ ContentLoop | append : 'label.liquid' }}
+                 label    = item.date.label
+                 small    = item.date.small
+                 subtitle = item.date.subtitle %}
 
   <span class="block form-date-group">
 
-    {% include {{ ContentLoop | append : 'select/create.liquid' }} 
+    {% include {{ ContentLoop | append : 'select.liquid' }} 
                   options = "Day, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 
                              11, 12, 13, 14, 15, 16, 17, 18, 19, 
                              20, 21, 22, 23, 24, 25, 26, 27, 28, 
@@ -18,13 +18,13 @@
 
     {% include html/assign/name.liquid parent="month" %}
 
-    {% include {{ ContentLoop | append : 'select/create.liquid' }} 
+    {% include {{ ContentLoop | append : 'select.liquid' }} 
                   options = "Month, Jan, Feb, Mar, Apr, May, Jun, 
                              Jul, Aug, Sep, Oct, Nov, Dec" %}
 
     {% include html/assign/name.liquid parent="year" %}
 
-    {% include {{ ContentLoop | append : 'select/create.liquid' }} 
+    {% include {{ ContentLoop | append : 'select.liquid' }} 
                   options = "Year, 2020, 2019, 2018, 2017, 2016, 2015, 
                              2014, 2013, 2012, 2011, 2010, 2020, 2009, 
                              2008, 2007, 2006, 2005, 2004, 2003, 2002, 

data/_includes/html/page/content/loop/form/email.liquid

@@ -0,0 +1,38 @@
+
+{% if item.email.tag %}
+
+  {% assign ItemTags = item.email.tag | prepend : 'tag-' | split : ' ' | join : ' tag-' %}
+  
+{% endif %}
+
+<p class="block form-row text-row">
+
+  {% include html/assign/name.liquid parent="email" %}
+
+  {% include {{ ContentLoop | append : 'label.liquid' }}
+                label = item.email.label
+                small = item.email.small
+                subtitle = item.email.subtitle
+                required = item.email.required 
+                position = "top"
+                class = "form-label" %}
+
+  <span class="block text-input {% if item.email.tag %}{{ ItemTags }}{% endif %}">
+
+    <span class="wrap text-input">
+
+      {% include {{ ContentLoop | append : 'input.liquid' }}
+                    required = item.email.required              
+                    type  = "email" %}
+
+    </span>
+
+    {% if item.email.inline %}
+
+      <small>{{ item.email.inline }}</small>
+
+    {% endif %}
+
+  </span>
+
+</p>

data/_includes/html/page/content/loop/form/item.liquid

@@ -2,8 +2,8 @@
 {%- if include.context == "legend" -%}
 
 {% assign StyleDot = include.title | slice : 6   
-                                       | prepend : 'style-level-' 
-                                       | downcase %}
+                                   | prepend : 'style-level-' 
+                                   | downcase %}
 
 <span class="block legend-row">
 
@@ -35,13 +35,10 @@
 
 <p class="block form-row item-row">
 
-  <span class="block item-object">
-
-    <span>{{ item.item }}</span>
-
-    <span class="block item-object-price">{{ item.price | prepend: '£' }}</span>
-
-  </span>
+  {% include {{ ContentLoop | append : 'item.liquid' }} 
+                title = item.item.title
+                price = item.item.price
+                nolabel = true %}
 
 </p>
 

data/_includes/html/page/content/loop/form/message.liquid

@@ -1,6 +1,6 @@
 
 <p class="block form-row message-row">
 
-  <span class="block message">{{ item.message }}</span>
+  <span class="block message">{{ item.message.title }}</span>
 
 </p>

data/_includes/html/page/content/loop/form/number.liquid

@@ -8,8 +8,8 @@
 
   {% include html/assign/name.liquid parent=item.number %}
 
-  {% include {{ LoopForm | append : 'label.liquid' }}
-                title = item.number
+  {% include {{ ContentLoop | append : 'label.liquid' }}
+                label = item.number
                 small = item.small
                 position = "top"
                 class = "form-label" %}
@@ -18,7 +18,7 @@
 
     <span class="wrap text-input">
 
-      {% include {{ LoopForm | append : 'input.liquid' }}
+      {% include {{ ContentLoop | append : 'input.liquid' }}
                     type  = "number"
                     class = "text-input" %}
 

data/_includes/html/page/content/loop/form/phone.liquid

@@ -1,37 +1,38 @@
 
+{% if item.phone.tag %}
 
-{% if include.context == "legend" %}
+{% assign ItemTags = item.phone.tag | prepend : 'tag-' | split : ' ' | join : ' tag-' %}
 
-{% else %}
+{% endif %}
 
 <p class="block form-row text-row">
 
-  {% include html/assign/name.liquid parent=item.phone %}
+{% include html/assign/name.liquid parent="phone" %}
 
-  {% include {{ LoopForm | append : 'label.liquid' }}
-                title = item.phone
-                small = item.small
-                position = "top"
-                class = "form-label" %}
+{% include {{ ContentLoop | append : 'label.liquid' }}
+              label = item.phone.label
+              small = item.phone.small
+              subtitle = item.phone.subtitle
+              required = item.phone.required 
+              position = "top"
+              class = "form-label" %}
 
-  <span class="block text-input {% if item.tag %}{{ ItemTags }}{% endif %}">
+<span class="block text-input {% if item.phone.tag %}{{ ItemTags }}{% endif %}">
 
-    <span class="wrap text-input">
+  <span class="wrap text-input">
 
-      {% include {{ LoopForm | append : 'input.liquid' }}
-                    type  = "tel"
-                    class = "text-input" %}
+    {% include {{ ContentLoop | append : 'input.liquid' }}
+                  required = item.phone.required              
+                  type  = "tel" %}
 
-    </span>
+  </span>
 
-    {% if item.inline %}
+  {% if item.phone.inline %}
 
-      <small>{{ item.inline }}</small>
+    <small>{{ item.phone.inline }}</small>
 
-    {% endif %}
+  {% endif %}
 
-  </span>
+</span>
 
-</p>
-
-{% endif %}
+</p>

data/_includes/html/page/content/loop/form/radio.liquid

@@ -1,30 +1,30 @@
 
-{% assign RadioGroup = item.radio | replace : ' ','-' | downcase %}
+{% assign RadioGroup = item.radio.label | replace : ' ','-' | downcase %}
 
 <p class="block form-row form-radio">
 
   {% include html/assign/name.liquid parent="radio" %}
 
-  {% include {{ LoopForm | append : 'label.liquid' }} 
-                title = item.radio 
+  {% include {{ ContentLoop | append : 'label.liquid' }} 
+                label = item.radio.label 
                 class = "form-label" %}
 
   <span class="wrap form-radio">
 
-    {% for item in item.list %}
+    {% for item in item.radio.list %}
 
       {% include html/assign/name.liquid parent="radio" %}
 
       <span class="block form-radio-group">
 
-        {% include {{ LoopForm | append : 'input.liquid' }}
+        {% include {{ ContentLoop | append : 'input.liquid' }}
                        name  = RadioGroup
                        type  = "radio"
                        class = "radio-input" %}
 
-        {% include {{ LoopForm | append : 'label.liquid' }} 
+        {% include {{ ContentLoop | append : 'label.liquid' }} 
                        name  = RadioGroup
-                       title = item.input
+                       label = item.input
                        class = "form-radio-label" %}
 
       </span>

data/_includes/html/page/content/loop/form/select.liquid

@@ -1,19 +1,19 @@
 
-{% include html/assign/name.liquid parent=item.select %}
+{% include html/assign/name.liquid parent="select" %}
 
 <p class="block form-row select-row">
 
-  {% include {{ LoopForm | append : 'label.liquid' }}
-                title    = item.select
-                small    = item.small
-                subtitle = item.subtitle %}
+  {% include {{ ContentLoop | append : 'label.liquid' }}
+                label    = item.select.label
+                small    = item.select.small
+                subtitle = item.select.subtitle %}
 
-  {% assign PrepList = item.list | replace : '[','' 
-                                 | replace : '{"option"=>"','' 
-                                 | replace : '"}','' 
-                                 | replace : ']','' %}
+  {% assign PrepList = item.select.list | replace : '[','' 
+                                        | replace : '{"option"=>"','' 
+                                        | replace : '"}','' 
+                                        | replace : ']','' %}
 
-  {% include {{ ContentLoop | append : 'select/create.liquid' }} 
+  {% include {{ ContentLoop | append : 'select.liquid' }} 
                 options = PrepList %}
 
 </p>

data/_includes/html/page/content/loop/form/text.liquid

@@ -1,42 +1,38 @@
 
-{% if item.tag %}
+{% if item.text.tag %}
 
-  {% assign ItemTags = item.tag | prepend : 'tag-' | split : ' ' | join : ' tag-' %}
+  {% assign ItemTags = item.text.tag | prepend : 'tag-' | split : ' ' | join : ' tag-' %}
   
 {% endif %}
 
-{% if include.context == "legend" %}
+<p class="block form-row text-row">
 
-{% else %}
+  {% include html/assign/name.liquid parent="text" %}
 
-  <p class="block form-row text-row">
+  {% include {{ ContentLoop | append : 'label.liquid' }}
+                label = item.text.label
+                small = item.text.small
+                subtitle = item.text.subtitle
+                required = item.text.required 
+                position = "top"
+                class = "form-label" %}
 
-    {% include html/assign/name.liquid parent=item.text %}
+  <span class="block text-input {% if item.text.tag %}{{ ItemTags }}{% endif %}">
 
-    {% include {{ LoopForm | append : 'label.liquid' }}
-                  title = item.text
-                  small = item.small
-                  position = "top"
-                  class = "form-label" %}
+    <span class="wrap text-input">
 
-    <span class="block text-input {% if item.tag %}{{ ItemTags }}{% endif %}">
+      {% include {{ ContentLoop | append : 'input.liquid' }}
+                    required = item.text.required              
+                    type  = "text" %}
 
-      <span class="wrap text-input">
+    </span>
 
-        {% include {{ LoopForm | append : 'input.liquid' }}
-                      type  = "text"
-                      class = "text-input" %}
-  
-      </span>
-  
-      {% if item.inline %}
-  
-        <small>{{ item.inline }}</small>
-  
-      {% endif %}
+    {% if item.text.inline %}
 
-    </span>
+      <small>{{ item.text.inline }}</small>
 
-  </p>
+    {% endif %}
 
-{% endif %}
+  </span>
+
+</p>

data/_includes/html/page/content/loop/form/textarea.liquid

@@ -1,12 +1,13 @@
 
-{% include html/assign/name.liquid parent=item.textarea %}
+{% include html/assign/name.liquid parent=item.textarea.label %}
 
 <p class="block form-row textarea-row">
 
-  {% include {{ LoopForm | append : 'label.liquid' }}
-                title    = item.textarea
-                small    = item.small
-                subtitle = item.subtitle
+  {% include {{ ContentLoop | append : 'label.liquid' }}
+                label = item.textarea.label
+                small = item.textarea.small
+                subtitle = item.textarea.subtitle
+                required = item.textarea.required 
                 position = "top" %}
 
   <span class="wrap textarea">

data/_includes/html/page/content/loop/header/search.liquid

@@ -3,7 +3,7 @@
 
 <div class="block search-form">
 
-  {%- include {{ LoopForm | append : 'input.liquid' }}
+  {%- include {{ ContentLoop | append : 'input.liquid' }}
               type        = "text"
               id          = unique
               placeholder = page.header.search

data/_includes/html/page/content/loop/input.liquid

@@ -0,0 +1,17 @@
+
+{% if include.name %}
+
+  {% assign group = include.name %}
+
+{% else %}
+
+  {% assign group = name %}
+
+{% endif %}
+
+<input {% if include.required %}class="is-required"{% endif %}
+          type  = "{{ include.type }}"
+          id    = "{{ name }}"
+          name  = "{{ group }}"
+          value = "{{ include.value }}"
+       {% if include.placeholder %}placeholder="{{ include.placeholder }}"{% endif %}>

data/_includes/html/page/content/loop/item.liquid

@@ -0,0 +1,16 @@
+
+<span class="block 
+            {{ PageTitle | prepend: 'title-' }}
+            {% if include.price %}has-price{% endif %}
+            {% if include.nolabel %}no-label{% endif %}
+            {% if include.alert %}form-alert{% endif %}">
+
+<span>{{ include.title }}</span>
+
+{% if include.price %}
+
+<span>{{ include.price | prepend: '£' }}</span>
+
+{% endif %}
+
+</span>

data/_includes/html/page/content/loop/{form/label.liquid → label.liquid}

@@ -4,14 +4,34 @@
        {% if include.class %}{{ include.class }}{% else %}form-label{% endif %} 
        {% if include.position %}{{ include.position | prepend : 'style-' }}{% else %}style-top{% endif %}">
 
-  {{ include.title }}
+  {{ include.label }}
 
   {% if include.small %}
-    <small> {{ include.small }} </small>
+
+    <small>
+
+      {{ include.small }}
+      
+    </small>
+
   {% endif %}
 
-  {% if include.subtitle %}
-    <br><small> {{ include.subtitle }} </small>
+  {% if include.required %}
+
+    <small>(required)</small>
+
   {% endif %}
 
+  {% if include.subtitle %}
+
+  <br>
+
+  <small>
+
+    {{ include.subtitle }}
+    
+  </small>
+
+{% endif %}
+
 </label>