From e4fa817d305f701be0aeb34c079c93108940e2c3 Mon Sep 17 00:00:00 2001
From: Steve Manuel <nilslice@gmail.com>
Date: Tue, 20 Dec 2016 13:13:54 -0800
Subject: adding style update to admin css

---
 system/admin/static/dashboard/css/admin.css | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/system/admin/static/dashboard/css/admin.css b/system/admin/static/dashboard/css/admin.css
index 8d2fb89..4d6e444 100644
--- a/system/admin/static/dashboard/css/admin.css
+++ b/system/admin/static/dashboard/css/admin.css
@@ -185,6 +185,11 @@ li:hover .quick-delete-post, li:hover .delete-user {
     padding: 20px;
 }
 
+.controls button {
+    padding: 0px 10px 5px 10px;
+    position: relative;
+    top: -10px;
+}
 
 /* OVERRIDE Bootstrap + Materialize conflicts */
 .iso-texteditor.input-field label {
-- 
cgit v1.2.3


From f6b39f22c712a11842b83e12879c1ef899337291 Mon Sep 17 00:00:00 2001
From: Steve Manuel <nilslice@gmail.com>
Date: Tue, 20 Dec 2016 13:15:06 -0800
Subject: adding generic RepeatController JS creator and working RepeatSelect
 repeater input

---
 management/editor/elements.go  |   2 +-
 management/editor/repeaters.go | 204 +++++++++++++++++++++++++++++++++++++++++
 management/manager/manager.go  |   2 +-
 3 files changed, 206 insertions(+), 2 deletions(-)
 create mode 100644 management/editor/repeaters.go

diff --git a/management/editor/elements.go b/management/editor/elements.go
index 9b35c65..75c37e2 100644
--- a/management/editor/elements.go
+++ b/management/editor/elements.go
@@ -325,7 +325,7 @@ func Checkbox(fieldName string, p interface{}, attrs, options map[string]string)
 			}
 		}
 
-		// create a *element manually using the maodified tagNameFromStructFieldMulti
+		// create a *element manually using the modified tagNameFromStructFieldMulti
 		// func since this is for a multi-value name
 		input := &element{
 			TagName: "input",
diff --git a/management/editor/repeaters.go b/management/editor/repeaters.go
new file mode 100644
index 0000000..f9c4da6
--- /dev/null
+++ b/management/editor/repeaters.go
@@ -0,0 +1,204 @@
+package editor
+
+import (
+	"bytes"
+	"strings"
+)
+
+// RepeatSelect returns the []byte of a <select> HTML element plus internal <options> with a label.
+// IMPORTANT:
+// The `fieldName` argument will cause a panic if it is not exactly the string
+// form of the struct field that this editor input is representing
+func RepeatSelect(fieldName string, p interface{}, attrs, options map[string]string) []byte {
+	// options are the value attr and the display value, i.e.
+	// <option value="{map key}">{map value}</option>
+	scope := tagNameFromStructField(fieldName, p)
+	html := &bytes.Buffer{}
+	html.WriteString(`<span class="__ponzu-repeat ` + scope + `">`)
+
+	// find the field values in p to determine if an option is pre-selected
+	fieldVals := valueFromStructField(fieldName, p)
+	vals := strings.Split(fieldVals, "__ponzu")
+
+	attrs["class"] = "browser-default"
+
+	// loop through vals and create selects and options for each, adding to html
+	if len(vals) > 0 {
+		for i, val := range vals {
+			sel := &element{
+				TagName: "select",
+				Attrs:   attrs,
+				Name:    tagNameFromStructFieldMulti(fieldName, i, p),
+				viewBuf: &bytes.Buffer{},
+			}
+
+			// only add the label to the first select in repeated list
+			if i == 0 {
+				sel.label = attrs["label"]
+			}
+
+			// create options for select element
+			var opts []*element
+
+			// provide a call to action for the select element
+			cta := &element{
+				TagName: "option",
+				Attrs:   map[string]string{"disabled": "true", "selected": "true"},
+				data:    "Select an option...",
+				viewBuf: &bytes.Buffer{},
+			}
+
+			// provide a selection reset (will store empty string in db)
+			reset := &element{
+				TagName: "option",
+				Attrs:   map[string]string{"value": ""},
+				data:    "None",
+				viewBuf: &bytes.Buffer{},
+			}
+
+			opts = append(opts, cta, reset)
+
+			for k, v := range options {
+				optAttrs := map[string]string{"value": k}
+				if k == val {
+					optAttrs["selected"] = "true"
+				}
+				opt := &element{
+					TagName: "option",
+					Attrs:   optAttrs,
+					data:    v,
+					viewBuf: &bytes.Buffer{},
+				}
+
+				opts = append(opts, opt)
+			}
+
+			html.Write(domElementWithChildrenSelect(sel, opts))
+		}
+	}
+
+	html.WriteString(`</span>`)
+	return append(html.Bytes(), RepeatController(fieldName, p, "select")...)
+}
+
+// RepeatController generates the javascript to control any repeatable form
+// element in an editor based on its type, field name and HTML tag name
+func RepeatController(fieldName string, p interface{}, htmlTagName string) []byte {
+	scope := tagNameFromStructField(fieldName, p)
+	script := `
+    <script>
+        $(function() {
+            // define the scope of the repeater
+            var scope = $('.__ponzu-repeat.` + scope + `');
+
+            var getChildren = function() {
+                return scope.find('` + htmlTagName + `')
+            }
+
+            var resetFieldNames = function() {
+                // loop through children, set its name to the fieldName.i where
+                // i is the current index number of children array
+                var children = getChildren();
+                for (var i = 0; i < children.length; i++) {
+                    var el = children[i];
+                    $(el).attr('name', '` + scope + `.'+String(i));
+                    
+                    // reset controllers
+                    $(el).find('.controls').remove();
+                }
+
+                applyRepeatControllers();
+            }
+
+            var addRepeater = function(e) {
+                e.preventDefault();
+                
+                // find and clone the repeatable input-like element
+                var controls = $(e.target).parent();
+                var clone = controls.parent().clone();
+
+                // if repeat has label, remove it
+                clone.find('label').remove();
+                
+                // remove the pre-filled value from clone
+                clone.find('` + htmlTagName + `').val("");
+
+                // remove controls if already present
+                clone.find('.controls').remove();
+
+                // add clone to scope and reset field name attributes
+                scope.append(clone);
+
+                resetFieldNames();
+            }
+
+            var delRepeater = function(e) {
+                e.preventDefault();
+
+                // do nothing if the input is the only child
+                var children = getChildren();
+                if (children.length === 1) {
+                    return;
+                }
+
+                var del = e.target;
+                
+                // pass label onto next input-like element if del 0 index
+                var wrapper = $(del).parent().parent();
+                if (wrapper.find('` + htmlTagName + `').attr('name') === '` + scope + `.0') {
+                    wrapper.next().append(wrapper.find('label'))
+                }
+                
+                // find the outermost element which is the input-like element
+                // within the scope that contains the repeater control (-) and
+                // delete it
+                $(del).parent().parent().remove();
+
+                resetFieldNames();
+            }
+
+            var createControls = function() {
+                // create + / - controls for each input-like child element of scope
+                var add = $('<button>+</button>');
+                add.addClass('repeater-add');
+                add.addClass('btn-flat waves-effect waves-green');
+
+                var del = $('<button>-</button>');
+                del.addClass('repeater-del');
+                del.addClass('btn-flat waves-effect waves-red');                
+
+                var controls = $('<span></span>');
+                controls.addClass('controls');
+                controls.addClass('right');
+
+                // bind listeners to child's controls
+                add.on('click', addRepeater);
+                del.on('click', delRepeater);
+
+                controls.append(add);
+                controls.append(del);
+
+                return controls;
+            }
+
+            var applyRepeatControllers = function() {
+                // add controls to each child
+                var children = getChildren()
+                for (var i = 0; i < children.length; i++) {
+                    var el = children[i];
+                    
+                    $(el).parent().find('.controls').remove();
+                    
+                    var controls = createControls();                                        
+                    $(el).parent().append(controls);
+                }
+            }
+
+            applyRepeatControllers();
+        });
+
+    </script>
+    `
+
+	return []byte(script)
+}
diff --git a/management/manager/manager.go b/management/manager/manager.go
index c54918f..594c258 100644
--- a/management/manager/manager.go
+++ b/management/manager/manager.go
@@ -136,7 +136,7 @@ func Manage(e editor.Editable, typeName string) ([]byte, error) {
 		ID:     i.ItemID(),
 		UUID:   i.UniqueID(),
 		Kind:   typeName,
-		Slug:   s.ItemSlug(), // TODO: just added this and its implementation -- need to rebuild & test
+		Slug:   s.ItemSlug(),
 		Editor: template.HTML(v),
 	}
 
-- 
cgit v1.2.3


From a8a626c96a699ceb6cfda0ed81a9910ed8ae9991 Mon Sep 17 00:00:00 2001
From: Steve Manuel <nilslice@gmail.com>
Date: Tue, 20 Dec 2016 18:00:19 -0800
Subject: fixing scope of FileRepeater and minor css updates

---
 management/editor/repeaters.go              | 101 ++++++++++++++++++++++++----
 system/admin/static/dashboard/css/admin.css |   4 ++
 2 files changed, 91 insertions(+), 14 deletions(-)

diff --git a/management/editor/repeaters.go b/management/editor/repeaters.go
index f9c4da6..f84c5ad 100644
--- a/management/editor/repeaters.go
+++ b/management/editor/repeaters.go
@@ -5,11 +5,11 @@ import (
 	"strings"
 )
 
-// RepeatSelect returns the []byte of a <select> HTML element plus internal <options> with a label.
+// SelectRepeater returns the []byte of a <select> HTML element plus internal <options> with a label.
 // IMPORTANT:
 // The `fieldName` argument will cause a panic if it is not exactly the string
 // form of the struct field that this editor input is representing
-func RepeatSelect(fieldName string, p interface{}, attrs, options map[string]string) []byte {
+func SelectRepeater(fieldName string, p interface{}, attrs, options map[string]string) []byte {
 	// options are the value attr and the display value, i.e.
 	// <option value="{map key}">{map value}</option>
 	scope := tagNameFromStructField(fieldName, p)
@@ -78,12 +78,86 @@ func RepeatSelect(fieldName string, p interface{}, attrs, options map[string]str
 	}
 
 	html.WriteString(`</span>`)
-	return append(html.Bytes(), RepeatController(fieldName, p, "select")...)
+	return append(html.Bytes(), RepeatController(fieldName, p, "select", ".input-field")...)
+}
+
+// FileRepeater returns the []byte of a <input type="file"> HTML element with a label.
+// IMPORTANT:
+// The `fieldName` argument will cause a panic if it is not exactly the string
+// form of the struct field that this editor input is representing
+func FileRepeater(fieldName string, p interface{}, attrs map[string]string) []byte {
+	name := tagNameFromStructField(fieldName, p)
+	tmpl :=
+		`<div class="file-input ` + name + ` input-field col s12">
+			<label class="active">` + attrs["label"] + `</label>
+			<div class="file-field input-field">
+				<div class="btn">
+					<span>Upload</span>
+					<input class="upload" type="file">
+				</div>
+				<div class="file-path-wrapper">
+					<input class="file-path validate" placeholder="` + attrs["label"] + `" type="text">
+				</div>
+			</div>
+			<div class="preview"><div class="img-clip"></div></div>			
+			<input class="store ` + name + `" type="hidden" name="` + name + `" value="` + valueFromStructField(fieldName, p) + `" />
+		</div>`
+
+	script :=
+		`<script>
+			$(function() {
+				var $file = $('.file-input.` + name + `'),
+					upload = $file.find('input.upload'),
+					store = $file.find('input.store'),
+					preview = $file.find('.preview'),
+					clip = preview.find('.img-clip'),
+					reset = document.createElement('div'),
+					img = document.createElement('img'),
+					uploadSrc = store.val();
+					preview.hide();
+				
+				// when ` + name + ` input changes (file is selected), remove
+				// the 'name' and 'value' attrs from the hidden store input.
+				// add the 'name' attr to ` + name + ` input
+				upload.on('change', function(e) {
+					resetImage();
+				});
+
+				if (uploadSrc.length > 0) {
+					$(img).attr('src', store.val());
+					clip.append(img);
+					preview.show();
+
+					$(reset).addClass('reset ` + name + ` btn waves-effect waves-light grey');
+					$(reset).html('<i class="material-icons tiny">clear<i>');
+					$(reset).on('click', function(e) {
+						e.preventDefault();
+						preview.animate({"opacity": 0.1}, 200, function() {
+							preview.slideUp(250, function() {
+								resetImage();
+							});
+						})
+						
+					});
+					clip.append(reset);
+				}
+
+				function resetImage() {
+					store.val('');
+					store.attr('name', '');
+					upload.attr('name', '` + name + `');
+					clip.empty();
+				}
+			});	
+		</script>`
+
+	html := `<span class="__ponzu-repeat ` + name + `">` + tmpl + `</span>`
+	return append([]byte(html+script), RepeatController(fieldName, p, "input.store."+name, "div.file-input."+name)...)
 }
 
 // RepeatController generates the javascript to control any repeatable form
 // element in an editor based on its type, field name and HTML tag name
-func RepeatController(fieldName string, p interface{}, htmlTagName string) []byte {
+func RepeatController(fieldName string, p interface{}, inputSelector, cloneSelector string) []byte {
 	scope := tagNameFromStructField(fieldName, p)
 	script := `
     <script>
@@ -92,7 +166,7 @@ func RepeatController(fieldName string, p interface{}, htmlTagName string) []byt
             var scope = $('.__ponzu-repeat.` + scope + `');
 
             var getChildren = function() {
-                return scope.find('` + htmlTagName + `')
+                return scope.find('` + inputSelector + `')
             }
 
             var resetFieldNames = function() {
@@ -113,15 +187,17 @@ func RepeatController(fieldName string, p interface{}, htmlTagName string) []byt
             var addRepeater = function(e) {
                 e.preventDefault();
                 
+                var add = e.target;
+
                 // find and clone the repeatable input-like element
-                var controls = $(e.target).parent();
-                var clone = controls.parent().clone();
+                var subject = $(add).parent().closest('` + cloneSelector + `');
+                var clone = subject.clone();
 
                 // if repeat has label, remove it
                 clone.find('label').remove();
                 
                 // remove the pre-filled value from clone
-                clone.find('` + htmlTagName + `').val("");
+                clone.find('` + inputSelector + `').val("");
 
                 // remove controls if already present
                 clone.find('.controls').remove();
@@ -144,15 +220,12 @@ func RepeatController(fieldName string, p interface{}, htmlTagName string) []byt
                 var del = e.target;
                 
                 // pass label onto next input-like element if del 0 index
-                var wrapper = $(del).parent().parent();
-                if (wrapper.find('` + htmlTagName + `').attr('name') === '` + scope + `.0') {
+                var wrapper = $(del).parent().closest('` + cloneSelector + `');
+                if (wrapper.find('` + inputSelector + `').attr('name') === '` + scope + `.0') {
                     wrapper.next().append(wrapper.find('label'))
                 }
                 
-                // find the outermost element which is the input-like element
-                // within the scope that contains the repeater control (-) and
-                // delete it
-                $(del).parent().parent().remove();
+                wrapper.remove();
 
                 resetFieldNames();
             }
diff --git a/system/admin/static/dashboard/css/admin.css b/system/admin/static/dashboard/css/admin.css
index 4d6e444..9cba7d0 100644
--- a/system/admin/static/dashboard/css/admin.css
+++ b/system/admin/static/dashboard/css/admin.css
@@ -221,4 +221,8 @@ li:hover .quick-delete-post, li:hover .delete-user {
 .approve-details {
     text-align: right;
     padding: 10px 0 !important;
+}
+
+select {
+    border: 1px solid #e2e2e2;
 }
\ No newline at end of file
-- 
cgit v1.2.3


From d4e33e1dc950664b653ae3a388b237112b1bfb3a Mon Sep 17 00:00:00 2001
From: Steve Manuel <nilslice@gmail.com>
Date: Thu, 22 Dec 2016 08:55:15 -0800
Subject: fixing typo

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 10825e9..f877bb5 100644
--- a/README.md
+++ b/README.md
@@ -180,10 +180,10 @@ $ ponzu --dev --fork=github.com/nilslice/ponzu new /path/to/new/project
 
 
 ### Logo
-The Go gopher was designed by Renee Frech. (http://reneefrench.blogspot.com)
+The Go gopher was designed by Renee French. (http://reneefrench.blogspot.com)
 The design is licensed under the Creative Commons 3.0 Attributions license.
 Read this article for more details: http://blog.golang.org/gopher
 
 The Go gopher vector illustraition by Hugo Arganda [@argandas](https://twitter.com/argandas) (http://about.me/argandas)
 
-"Gotoro", the sushi chef, is a modification of Hugo Arganda's illustration by Steve Manuel (https://github.com/nilslice).
\ No newline at end of file
+"Gotoro", the sushi chef, is a modification of Hugo Arganda's illustration by Steve Manuel (https://github.com/nilslice).
-- 
cgit v1.2.3


From 0ca645c0b75752e38d4ddde3c10849a25bb8b53b Mon Sep 17 00:00:00 2001
From: Steve Manuel <nilslice@gmail.com>
Date: Thu, 22 Dec 2016 13:11:14 -0800
Subject: adding fix for js in repeaters (mainly FileRepeater) and cleanup of
 form value transforms

---
 management/editor/elements.go  |   2 +-
 management/editor/repeaters.go | 164 ++++++++++++++++++++++++++++++++++-------
 system/admin/handlers.go       |   3 +-
 system/api/external.go         |   3 +-
 system/db/config.go            |   3 +-
 5 files changed, 144 insertions(+), 31 deletions(-)

diff --git a/management/editor/elements.go b/management/editor/elements.go
index 75c37e2..873e81c 100644
--- a/management/editor/elements.go
+++ b/management/editor/elements.go
@@ -15,7 +15,7 @@ import (
 // 	}
 //
 // 	func (p *Person) MarshalEditor() ([]byte, error) {
-// 		view, err := Form(p,
+// 		view, err := editor.Form(p,
 // 			editor.Field{
 // 				View: editor.Input("Name", p, map[string]string{
 // 					"label":       "Name",
diff --git a/management/editor/repeaters.go b/management/editor/repeaters.go
index f84c5ad..81497a5 100644
--- a/management/editor/repeaters.go
+++ b/management/editor/repeaters.go
@@ -2,10 +2,64 @@ package editor
 
 import (
 	"bytes"
+	"fmt"
 	"strings"
 )
 
+// InputRepeater returns the []byte of an <input> HTML element with a label.
+// It also includes repeat controllers (+ / -) so the element can be
+// dynamically multiplied or reduced.
+// IMPORTANT:
+// The `fieldName` argument will cause a panic if it is not exactly the string
+// form of the struct field that this editor input is representing
+// 	type Person struct {
+// 		Name string `json:"name"`
+// 	}
+//
+// 	func (p *Person) MarshalEditor() ([]byte, error) {
+// 		view, err := editor.Form(p,
+// 			editor.Field{
+// 				View: editor.InputRepeater("Name", p, map[string]string{
+// 					"label":       "Name",
+// 					"type":        "text",
+// 					"placeholder": "Enter the Name here",
+// 				}),
+// 			}
+// 		)
+// 	}
+func InputRepeater(fieldName string, p interface{}, attrs map[string]string) []byte {
+	// find the field values in p to determine pre-filled inputs
+	fieldVals := valueFromStructField(fieldName, p)
+	vals := strings.Split(fieldVals, "__ponzu")
+
+	scope := tagNameFromStructField(fieldName, p)
+	html := bytes.Buffer{}
+
+	html.WriteString(`<span class="__ponzu-repeat ` + scope + `">`)
+	for i, val := range vals {
+		el := &element{
+			TagName: "input",
+			Attrs:   attrs,
+			Name:    tagNameFromStructFieldMulti(fieldName, i, p),
+			data:    val,
+			viewBuf: &bytes.Buffer{},
+		}
+
+		// only add the label to the first input in repeated list
+		if i == 0 {
+			el.label = attrs["label"]
+		}
+
+		html.Write(domElementSelfClose(el))
+	}
+	html.WriteString(`</span>`)
+
+	return append(html.Bytes(), RepeatController(fieldName, p, "input", ".input-field")...)
+}
+
 // SelectRepeater returns the []byte of a <select> HTML element plus internal <options> with a label.
+// It also includes repeat controllers (+ / -) so the element can be
+// dynamically multiplied or reduced.
 // IMPORTANT:
 // The `fieldName` argument will cause a panic if it is not exactly the string
 // form of the struct field that this editor input is representing
@@ -13,7 +67,7 @@ func SelectRepeater(fieldName string, p interface{}, attrs, options map[string]s
 	// options are the value attr and the display value, i.e.
 	// <option value="{map key}">{map value}</option>
 	scope := tagNameFromStructField(fieldName, p)
-	html := &bytes.Buffer{}
+	html := bytes.Buffer{}
 	html.WriteString(`<span class="__ponzu-repeat ` + scope + `">`)
 
 	// find the field values in p to determine if an option is pre-selected
@@ -82,31 +136,44 @@ func SelectRepeater(fieldName string, p interface{}, attrs, options map[string]s
 }
 
 // FileRepeater returns the []byte of a <input type="file"> HTML element with a label.
+// It also includes repeat controllers (+ / -) so the element can be
+// dynamically multiplied or reduced.
 // IMPORTANT:
 // The `fieldName` argument will cause a panic if it is not exactly the string
 // form of the struct field that this editor input is representing
 func FileRepeater(fieldName string, p interface{}, attrs map[string]string) []byte {
-	name := tagNameFromStructField(fieldName, p)
+	// find the field values in p to determine if an option is pre-selected
+	fieldVals := valueFromStructField(fieldName, p)
+	vals := strings.Split(fieldVals, "__ponzu")
+
+	addLabelFirst := func(i int, label string) string {
+		if i == 0 {
+			return `<label class="active">` + label + `</label>`
+		}
+
+		return ""
+	}
+
 	tmpl :=
-		`<div class="file-input ` + name + ` input-field col s12">
-			<label class="active">` + attrs["label"] + `</label>
+		`<div class="file-input %[5]s %[4]s input-field col s12">
+			%[2]s
 			<div class="file-field input-field">
 				<div class="btn">
 					<span>Upload</span>
-					<input class="upload" type="file">
+					<input class="upload %[4]s" type="file" />
 				</div>
 				<div class="file-path-wrapper">
-					<input class="file-path validate" placeholder="` + attrs["label"] + `" type="text">
+					<input class="file-path validate" placeholder="Add %[5]s" type="text" />
 				</div>
 			</div>
 			<div class="preview"><div class="img-clip"></div></div>			
-			<input class="store ` + name + `" type="hidden" name="` + name + `" value="` + valueFromStructField(fieldName, p) + `" />
+			<input class="store %[4]s" type="hidden" name="%[1]s" value="%[3]s" />
 		</div>`
-
+		// 1=nameidx, 2=addLabelFirst, 3=val, 4=className, 5=fieldName
 	script :=
 		`<script>
 			$(function() {
-				var $file = $('.file-input.` + name + `'),
+				var $file = $('.file-input.%[2]s'),
 					upload = $file.find('input.upload'),
 					store = $file.find('input.store'),
 					preview = $file.find('.preview'),
@@ -116,9 +183,9 @@ func FileRepeater(fieldName string, p interface{}, attrs map[string]string) []by
 					uploadSrc = store.val();
 					preview.hide();
 				
-				// when ` + name + ` input changes (file is selected), remove
+				// when %[2]s input changes (file is selected), remove
 				// the 'name' and 'value' attrs from the hidden store input.
-				// add the 'name' attr to ` + name + ` input
+				// add the 'name' attr to %[2]s input
 				upload.on('change', function(e) {
 					resetImage();
 				});
@@ -128,10 +195,11 @@ func FileRepeater(fieldName string, p interface{}, attrs map[string]string) []by
 					clip.append(img);
 					preview.show();
 
-					$(reset).addClass('reset ` + name + ` btn waves-effect waves-light grey');
+					$(reset).addClass('reset %[2]s btn waves-effect waves-light grey');
 					$(reset).html('<i class="material-icons tiny">clear<i>');
 					$(reset).on('click', function(e) {
 						e.preventDefault();
+						var preview = $(this).parent().closest('.preview');
 						preview.animate({"opacity": 0.1}, 200, function() {
 							preview.slideUp(250, function() {
 								resetImage();
@@ -145,14 +213,26 @@ func FileRepeater(fieldName string, p interface{}, attrs map[string]string) []by
 				function resetImage() {
 					store.val('');
 					store.attr('name', '');
-					upload.attr('name', '` + name + `');
+					upload.attr('name', '%[1]s');
 					clip.empty();
 				}
 			});	
 		</script>`
+		// 1=nameidx, 2=className
+
+	name := tagNameFromStructField(fieldName, p)
+
+	html := bytes.Buffer{}
+	html.WriteString(`<span class="__ponzu-repeat ` + name + `">`)
+	for i, val := range vals {
+		className := fmt.Sprintf("%s-%d", name, i)
+		nameidx := tagNameFromStructFieldMulti(fieldName, i, p)
+		html.WriteString(fmt.Sprintf(tmpl, nameidx, addLabelFirst(i, attrs["label"]), val, className, fieldName))
+		html.WriteString(fmt.Sprintf(script, nameidx, className))
+	}
+	html.WriteString(`</span>`)
 
-	html := `<span class="__ponzu-repeat ` + name + `">` + tmpl + `</span>`
-	return append([]byte(html+script), RepeatController(fieldName, p, "input.store."+name, "div.file-input."+name)...)
+	return append(html.Bytes(), RepeatController(fieldName, p, "input.upload", "div.file-input."+fieldName)...)
 }
 
 // RepeatController generates the javascript to control any repeatable form
@@ -166,19 +246,45 @@ func RepeatController(fieldName string, p interface{}, inputSelector, cloneSelec
             var scope = $('.__ponzu-repeat.` + scope + `');
 
             var getChildren = function() {
-                return scope.find('` + inputSelector + `')
+                return scope.find('` + cloneSelector + `')
             }
 
             var resetFieldNames = function() {
                 // loop through children, set its name to the fieldName.i where
                 // i is the current index number of children array
                 var children = getChildren();
+
                 for (var i = 0; i < children.length; i++) {
-                    var el = children[i];
-                    $(el).attr('name', '` + scope + `.'+String(i));
-                    
+					var preset = false;					
+                    var $el = children.eq(i);
+					var name = '` + scope + `.'+String(i);
+
+                    $el.find('` + inputSelector + `').attr('name', name);
+
+					// ensure no other input-like elements besides ` + inputSelector + `
+					// get the new name by setting it to an empty string
+					$el.find('input, select, textarea').each(function(i, elem) {
+						var $elem = $(elem);
+						
+						// if the elem is not ` + inputSelector + ` and has no value 
+						// set the name to an empty string
+						if (!$elem.is('` + inputSelector + `')) {
+							if ($elem.val() === '') {
+								$elem.attr('name', '');
+							} else {
+								preset = true;
+							}						
+						}
+					});      
+
+					// if there is a preset value, remove the name attr from the
+					// ` + inputSelector + ` element so it doesn't overwrite db
+					if (preset) {
+						$el.find('` + inputSelector + `').attr('name', '');														
+					}          
+
                     // reset controllers
-                    $(el).find('.controls').remove();
+                    $el.find('.controls').remove();
                 }
 
                 applyRepeatControllers();
@@ -190,18 +296,22 @@ func RepeatController(fieldName string, p interface{}, inputSelector, cloneSelec
                 var add = e.target;
 
                 // find and clone the repeatable input-like element
-                var subject = $(add).parent().closest('` + cloneSelector + `');
-                var clone = subject.clone();
+                var source = $(add).parent().closest('` + cloneSelector + `');
+                var clone = source.clone();
 
-                // if repeat has label, remove it
+                // if clone has label, remove it
                 clone.find('label').remove();
                 
                 // remove the pre-filled value from clone
-                clone.find('` + inputSelector + `').val("");
+                clone.find('` + inputSelector + `').val('');
+				clone.find('input').val('');
 
-                // remove controls if already present
+                // remove controls from clone if already present
                 clone.find('.controls').remove();
 
+				// remove input preview on clone if copied from source
+				clone.find('.preview').remove();
+
                 // add clone to scope and reset field name attributes
                 scope.append(clone);
 
@@ -260,10 +370,10 @@ func RepeatController(fieldName string, p interface{}, inputSelector, cloneSelec
                 for (var i = 0; i < children.length; i++) {
                     var el = children[i];
                     
-                    $(el).parent().find('.controls').remove();
+                    $(el).find('` + inputSelector + `').parent().find('.controls').remove();
                     
                     var controls = createControls();                                        
-                    $(el).parent().append(controls);
+                    $(el).append(controls);
                 }
             }
 
diff --git a/system/admin/handlers.go b/system/admin/handlers.go
index e1487c5..ff30040 100644
--- a/system/admin/handlers.go
+++ b/system/admin/handlers.go
@@ -1403,10 +1403,11 @@ func editHandler(res http.ResponseWriter, req *http.Request) {
 
 				if req.PostForm.Get(key) == "" {
 					req.PostForm.Set(key, v[0])
-					discardKeys = append(discardKeys, k)
 				} else {
 					req.PostForm.Add(key, v[0])
 				}
+
+				discardKeys = append(discardKeys, k)
 			}
 		}
 
diff --git a/system/api/external.go b/system/api/external.go
index 86e4a99..302b7c9 100644
--- a/system/api/external.go
+++ b/system/api/external.go
@@ -85,10 +85,11 @@ func externalContentHandler(res http.ResponseWriter, req *http.Request) {
 
 			if req.PostForm.Get(key) == "" {
 				req.PostForm.Set(key, v[0])
-				discardKeys = append(discardKeys, k)
 			} else {
 				req.PostForm.Add(key, v[0])
 			}
+
+			discardKeys = append(discardKeys, k)
 		}
 	}
 
diff --git a/system/db/config.go b/system/db/config.go
index 0e49307..ce76021 100644
--- a/system/db/config.go
+++ b/system/db/config.go
@@ -34,10 +34,11 @@ func SetConfig(data url.Values) error {
 
 				if data.Get(key) == "" {
 					data.Set(key, v[0])
-					discardKeys = append(discardKeys, k)
 				} else {
 					data.Add(key, v[0])
 				}
+
+				discardKeys = append(discardKeys, k)
 			}
 		}
 
-- 
cgit v1.2.3


From d9916ff0fbba3d2a24c709f44fd728ef862daf69 Mon Sep 17 00:00:00 2001
From: Steve Manuel <nilslice@gmail.com>
Date: Thu, 22 Dec 2016 22:29:28 -0800
Subject: adding forgotten name attr to identified input

---
 management/editor/repeaters.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/management/editor/repeaters.go b/management/editor/repeaters.go
index 81497a5..fea09d4 100644
--- a/management/editor/repeaters.go
+++ b/management/editor/repeaters.go
@@ -272,6 +272,7 @@ func RepeatController(fieldName string, p interface{}, inputSelector, cloneSelec
 							if ($elem.val() === '') {
 								$elem.attr('name', '');
 							} else {
+								$elem.attr('name', name);
 								preset = true;
 							}						
 						}
-- 
cgit v1.2.3


From 91de4e0ad607aff54fa51914c08f357b535684b1 Mon Sep 17 00:00:00 2001
From: Steve Manuel <nilslice@gmail.com>
Date: Thu, 22 Dec 2016 22:52:10 -0800
Subject: checking for bad inputs explicitly -- could be improved

---
 management/editor/repeaters.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/management/editor/repeaters.go b/management/editor/repeaters.go
index fea09d4..f528894 100644
--- a/management/editor/repeaters.go
+++ b/management/editor/repeaters.go
@@ -269,7 +269,7 @@ func RepeatController(fieldName string, p interface{}, inputSelector, cloneSelec
 						// if the elem is not ` + inputSelector + ` and has no value 
 						// set the name to an empty string
 						if (!$elem.is('` + inputSelector + `')) {
-							if ($elem.val() === '') {
+							if ($elem.val() === '' || $elem.is('.file-path')) {
 								$elem.attr('name', '');
 							} else {
 								$elem.attr('name', name);
@@ -378,7 +378,7 @@ func RepeatController(fieldName string, p interface{}, inputSelector, cloneSelec
                 }
             }
 
-            applyRepeatControllers();
+			resetFieldNames();
         });
 
     </script>
-- 
cgit v1.2.3


From 29959dc55482b04388bc0c8a426650215ac3d5b2 Mon Sep 17 00:00:00 2001
From: Steve Manuel <nilslice@gmail.com>
Date: Thu, 22 Dec 2016 22:55:47 -0800
Subject: fixing docs

---
 management/editor/repeaters.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/management/editor/repeaters.go b/management/editor/repeaters.go
index f528894..37fb982 100644
--- a/management/editor/repeaters.go
+++ b/management/editor/repeaters.go
@@ -13,16 +13,16 @@ import (
 // The `fieldName` argument will cause a panic if it is not exactly the string
 // form of the struct field that this editor input is representing
 // 	type Person struct {
-// 		Name string `json:"name"`
+// 		Names []string `json:"names"`
 // 	}
 //
 // 	func (p *Person) MarshalEditor() ([]byte, error) {
 // 		view, err := editor.Form(p,
 // 			editor.Field{
-// 				View: editor.InputRepeater("Name", p, map[string]string{
-// 					"label":       "Name",
+// 				View: editor.InputRepeater("Names", p, map[string]string{
+// 					"label":       "Names",
 // 					"type":        "text",
-// 					"placeholder": "Enter the Name here",
+// 					"placeholder": "Enter a Name here",
 // 				}),
 // 			}
 // 		)
-- 
cgit v1.2.3