Merge branch 'twohustlers' of github.com:okfocus/okcms into twohustlers

2 files changed, 34 insertions, 0 deletions

diff --git a/themes/okadmin/public/css/main.css b/themes/okadmin/public/css/main.css
index 5dbd910..e5af10c 100644
--- a/themes/okadmin/public/css/main.css
+++ b/themes/okadmin/public/css/main.css
@@ -335,9 +335,12 @@ button, input[type=submit] {
 .image-element .remove:hover {
 	color: red;
 }
+
+/* 
 .remove {
   display: none;
 }
+ */
 
 #delete_form button:hover { color: red }
 
diff --git a/themes/okadmin/templates/partials/inputs.liquid b/themes/okadmin/templates/partials/inputs.liquid
index b29a289..1ddbffd 100644
--- a/themes/okadmin/templates/partials/inputs.liquid
+++ b/themes/okadmin/templates/partials/inputs.liquid
@@ -139,7 +139,38 @@
           {% endfor %}
         </ol>
       </div>
+    {% elsif type == 'double-captioned-image-list' %}
+      <div class="image-list group loaded">
+        <div class="fields">
+          <div class="add-image-button">
+            <input type="file" accept="image/*" multiple>
+            <button>+ Add images</button>
+          </div>
+          <input class="add-url" type="text" placeholder="+ Add URL">
+        </div>
+
+        <script type="text/html" class="image-template">
+          <li class="image-element">
+            <input class="uri" type="hidden" name="{{name}}[][uri]" value="">
+            <input class="caption" name="{{name}}[][caption]">
+            <input class="caption" name="{{name}}[][label]">
+            <img alt="{{image.caption}}">
+            <button class="remove">x</button>
+          </li>
+        </script>
 
+        <ol>
+          {% for image in spec.value %}
+            <li class="image-element">
+              <input type="hidden" name="{{name}}[{{forloop.index0}}][uri]" value="{{image.uri}}">
+              <input class="caption" name="{{name}}[{{forloop.index0}}][caption]" value="{{image.caption}}">
+              <input class="caption" name="{{name}}[{{forloop.index0}}][label]" value="{{image.label}}">
+              <img src="{{image.uri}}" alt="{{image.caption}}">
+              <button class="remove">x</button>
+            </li>
+          {% endfor %}
+        </ol>
+      </div>
     {% elsif type == 'meta' %}
       <input class="hidden" type="hidden" name="{{name}}" value="{{spec.value}}">
     {% else %}