spontaneous 0.2.0.beta4 → 0.2.0.beta5

data/application/js/content.js

@@ -25,7 +25,7 @@ Spontaneous.Content = (function($, S) {
 			return this.content.target;
 		},
 		developer_description: function() {
-			return this.type().type + "["+this.id()+']'
+			return this.type().type + "["+this.id()+']';
 		},
 		developer_edit_url: function() {
 			return this.type().edit_url();
@@ -68,8 +68,16 @@ Spontaneous.Content = (function($, S) {
 			return this.filter_fields(function(f) { return !f.is_image(); });
 		},
 		// fields that should be saved as strings
-		string_fields: function() {
-			return this.filter_fields(function(f) { return !f.is_file(); });
+		string_values: function() {
+			var i, ii, v, values = [], fields = this.field_list();
+			for (i = 0, ii = fields.length; i < ii; i++) {
+				v = fields[i].stringValue();
+				if (v) {
+					values.push(v);
+				}
+			}
+			// return this.filter_fields(function(f) { return !f.is_file(); });
+			return values;
 		},
 		image_fields: function() {
 			return this.filter_fields(function(f) { return f.is_image(); });

data/application/js/edit_panel.js

@@ -32,10 +32,7 @@ Spontaneous.EditPanel = (function($, S) {
 		},
 
 		upload_values: function() {
-			var fields = this.parent_view.string_fields();
-			var values = fields.map(function(field) {
-				return field.serializedValue();
-			});
+			var values = this.parent_view.string_values();
 			// console.log("field values", values)
 			// var values = this.form.serializeArray();
 			var field_data = new FormData();

data/application/js/field/file.js

@@ -272,7 +272,24 @@ Spontaneous.Field.File = (function($, S) {
 				this.selected_files = null;
 				this.set('value', value);
 			}
+		},
+		stringValue: function() {
+			if (this.mark_cleared) {
+				this.mark_cleared = false;
+				return { name: this.form_name(), value: '' };
+			}
+			return false; // don't upload this field as text
+		},
+
+		mark_cleared: false,
+
+		clear_file: function() {
+			// this.set('value', {});
+			this.mark_cleared = true;
+			this.selected_files = null;
+			this.mark_modified();
 		}
+
 	});
 	return FileField;
 })(jQuery, Spontaneous);

data/application/js/field/image.js

@@ -24,7 +24,7 @@ Spontaneous.Field.Image = (function($, S) {
 				edited.addClass('selected');
 			}.bind(this));
 			labels.append(local_label, server_label);
-			image_outer.append(original, edited)
+			image_outer.append(original, edited);
 			outer.append(labels, image_outer);
 			return outer;
 		}
@@ -64,7 +64,7 @@ Spontaneous.Field.Image = (function($, S) {
 				pending['path'] = pending['src'];
 				return pending['value'];
 			}
-			return v['__ui__'] || v['original'];
+			return v['__ui__'] || v['original'] || {};
 		},
 
 		currentEditValue: function() {
@@ -81,8 +81,8 @@ Spontaneous.Field.Image = (function($, S) {
 		},
 
 		currentFilename: function() {
-			var v = this.currentValue();
-			return v['filename'];
+			var v = this.get('value');
+			return (v['__pending__'] || v['original'])['filename'];
 		},
 		/*
 		* HACK: The async nature of image updates means that the version setting
@@ -106,24 +106,24 @@ Spontaneous.Field.Image = (function($, S) {
 			return this.data.version;
 		},
 
-		preview: function(container) {
+		preview: function() {
 			Spontaneous.UploadManager.register(this);
 			var self = this
 			, value = this.currentValue()
 			, src = value.src
 			, img = null
-			, dim = 45
-			, container = container.parent('li');
+			, dim = 45;
+			// , container = container.parent('li');
 
 			if (src === "") {
-				img = dom.img('.missing-image', {'src':'/@spontaneous/static/px.gif'});
+				img = dom.img('.missing-image', {'src':''});
 			} else {
 				img = dom.img();
 				img.load(function() {
 					var r = this.width/this.height, $this = $(this), h = $this.height(), dh = 0;
 					if (r >= 1) { // landscape -- fit image vertically
 						// tag for extra css styles applicable to landscape images
-						container.addClass('landscape');
+						// container.addClass('landscape');
 						if (h <= dim) {
 							dh = (dim - h)/2;
 						}
@@ -171,9 +171,9 @@ Spontaneous.Field.Image = (function($, S) {
 						}
 						var img = image[0], w = img.width, h = img.height, r = w/h;
 						if (r > 1) {
-							container.addClass('landscape');
+							// container.addClass('landscape');
 						} else {
-							container.removeClass('landscape');
+							// container.removeClass('landscape');
 						}
 					}.bind(this))
 					image.attr('src', url)
@@ -263,7 +263,8 @@ Spontaneous.Field.Image = (function($, S) {
 			return 0;
 		},
 		edit: function() {
-			var wrap = dom.div({'style':'position:relative;'}),
+			var wrap = dom.div(),
+			drop_wrap = dom.div({'style':'position:relative;'}),
 				value = this.currentEditValue(),
 				src = value.src,
 				img = dom.img({'src':src}),
@@ -296,7 +297,10 @@ Spontaneous.Field.Image = (function($, S) {
 				filename_info.text(filename);
 				if (filesize) {
 					filesize_info.text(parseFloat(filesize, 10).to_filesize());
+				} else if (filesize === 0 || filesize === "0") {
+					filesize_info.text('');
 				}
+
 				set_dimensions(width, height);
 			};
 
@@ -305,11 +309,11 @@ Spontaneous.Field.Image = (function($, S) {
 					var file = files[0], url = window.URL.createObjectURL(file);
 					img.attr('src', url).removeClass('empty');
 					this.select_files(files);
-					img.attr('src', url)
+					img.attr('src', url);
 					this._edited_value = url;
-					this.image.attr('src', url)
+					this.image.attr('src', url);
 					window.URL.revokeObjectURL(url);
-					set_info(File.filename(file), file.fileSize, null, null)
+					set_info(File.filename(file), file.fileSize, null, null);
 				}
 			}.bind(this);
 
@@ -324,14 +328,18 @@ Spontaneous.Field.Image = (function($, S) {
 				return false;
 			};
 
-			if (src == '') { img.addClass('empty'); }
+			if (src === '') { img.addClass('empty'); }
 
 			var dropper = dom.div('.image-drop').click(onclick);
 
 			var actions = dom.div('.actions');
-			// var clear = dom.a('.button.clear').text('Clear');
-			actions.append(input)//.append(clear);
-			wrap.append(dropper);
+			var clear = dom.a('.button.clear').text('Clear').click(function() {
+				img.css({width: dom.px(img.width()), height: dom.px(img.height())}).attr('src', '/@spontaneous/static/px.gif');
+				set_info('', 0, null, null);
+				this.clear_file();
+			}.bind(this));
+			actions.append(input, clear);
+			drop_wrap.append(dropper);
 
 
 			var drop = function(event) {
@@ -366,7 +374,8 @@ Spontaneous.Field.Image = (function($, S) {
 			dropper.get(0).addEventListener('drop', drop, true);
 			dropper.bind('dragenter', drag_enter).bind('dragover', drag_over).bind('dragleave', drag_leave);
 
-			wrap.append(img, actions, info);
+			drop_wrap.append(img, info);
+			wrap.append(drop_wrap, actions);
 
 			if (value) {
 				// var s = value.path.split('/'), filename = s[s.length - 1];
@@ -402,7 +411,7 @@ Spontaneous.Field.Image = (function($, S) {
 			this.preview_img.attr('src', value);
 			this.callSuper(value);
 		},
-		accept_mimetype: "image/*",
+		accept_mimetype: "image/*"
 	});
 
 	ImageField.ConflictView = ImageFieldConflictView;

data/application/js/field/string.js

@@ -78,7 +78,7 @@ Spontaneous.Field.String = (function($, S) {
 			this.set('unprocessed_value', values.unprocessed_value);
 		},
 		preview: function() {
-			return this.get('value')
+			return this.get('value');
 		},
 		activate: function(el) {
 			el.find('a[href^="/"]').click(function() {
@@ -196,6 +196,9 @@ Spontaneous.Field.String = (function($, S) {
 		conflict_view: function(dialogue, conflict) {
 			return new StringFieldConflictView(dialogue, conflict);
 		},
+		stringValue: function() {
+			return this.serializedValue();
+		},
 		serializedValue: function() {
 			return {
 				name: this.form_name(),

data/application/js/field_preview.js

@@ -4,9 +4,10 @@ Spontaneous.FieldPreview = (function($, S) {
 	var dom = S.Dom;
 
 	var FieldPreview = new JS.Class({
-		initialize: function(view, wrap_id) {
+		initialize: function(view, wrap_id, listView) {
 			this.view = view;
 			this.wrap_id = wrap_id;
+			this.listView = listView;
 		},
 
 		depth_class: function() {
@@ -16,39 +17,43 @@ Spontaneous.FieldPreview = (function($, S) {
 			return this.view.has_fields();
 		},
 		panel: function() {
-			var wrapper = dom.div([dom.id(this.wrap_id), 'fields-preview', this.depth_class()])
+			var wrapper = dom.div([dom.id(this.wrap_id), 'fields-preview', this.depth_class()]);
 			// $(dom.div, {'id':this.wrap_id, 'class':'fields-preview ' + this.depth_class()});
 			wrapper.append(this.fields_panel(this.view.text_fields(), 'text'));
 			wrapper.append(this.fields_panel(this.view.image_fields(), 'image', true));
 			if (this.view.mouseover) {
-				wrapper.mouseover(this.view.mouseover.bind(this.view))
+				wrapper.mouseover(this.view.mouseover.bind(this.view));
 			}
 			if (this.view.mouseout) {
-				wrapper.mouseout(this.view.mouseout.bind(this.view))
+				wrapper.mouseout(this.view.mouseout.bind(this.view));
 			}
 			wrapper.click(function() {
 				this.view.edit(this.field_to_edit);
-			}.bind(this))
+			}.bind(this));
 			return wrapper;
 		},
 		fields_panel: function(fields, type, ignore_changes) {
 			var wrapper = dom.ul('.fields-preview-'+type), __this = this;
 			if (fields.length === 0) { wrapper.addClass('empty'); }
 			$.each(fields, function(i, field) {
-				var li = dom.li();
-				var name = dom.div('.name').text(field.title);
-				var value = dom.div('.value');
-				li.click(function() {
-					__this.field_to_edit = field;
-				})
-				field.activate(value);
-				if (!ignore_changes) {
-					field.watch('value', function(field, v) { $(this).html(field.preview()) }.bind(value, field));
-				}
+				if (!__this.listView || field.type.list) {
+					var li = dom.li();
+					var name = dom.div('.name').text(field.title);
+					var value = dom.div('.value');
+					li.click(function() {
+						__this.field_to_edit = field;
+					});
+					field.activate(value);
+				// if (!ignore_changes) {
+					field.watch('value', function(field, v) {
+						$(this).html(field.preview());
+					}.bind(value, field));
+				// }
 				li.append(name).append(value);
 				wrapper.append(li);
 				value.html(field.preview(value));
-			});
+			}
+		});
 			return wrapper;
 		}
 	});

data/application/js/publish.js

@@ -76,10 +76,10 @@ Spontaneous.Publishing = (function($, S) {
 			, self = this
 			, changed_wrap = dom.div("#changes.change-list").css("opacity", 0)
 			, publish_wrap = dom.div("#to-publish.change-list").css("opacity", 0)
-			, first_publish = outstanding.first_publish
+			, must_publish_all = outstanding.first_publish || outstanding.must_publish_all
 			, spinner = this.spinner
 			, append_to;
-			if (first_publish) {
+			if (must_publish_all) {
 				w.addClass("first-publish");
 			}
 			if (change_list.length === 0) {
@@ -96,22 +96,22 @@ Spontaneous.Publishing = (function($, S) {
 
 				var changed_toolbar = dom.div('.actions').append(dom.div().text("Modified pages")).append(publish_all);
 				var publish_toolbar = dom.div('.actions').append(dom.div().text("Publish pages"));
-				if (!first_publish) {
+				if (!must_publish_all) {
 					publish_toolbar.append(clear_all);
 				}
 				var changed_entries = dom.div('.change-sets'), publish_entries = dom.div('.change-sets')
 				changed_wrap.append(changed_toolbar, changed_entries);
 				publish_wrap.append(publish_toolbar, publish_entries);
 				append_to = changed_entries;
-				if (first_publish) {
+				if (must_publish_all) {
 					append_to = publish_entries;
 				}
 				for (var i = 0, ii = change_list.length; i < ii; i++) {
-					var cs = new ChangeSet(i, self, change_list[i], first_publish);
+					var cs = new ChangeSet(i, self, change_list[i], must_publish_all);
 					self.change_sets.push(cs);
 					append_to.append(cs.panel())
 				}
-				if (!first_publish) {
+				if (!must_publish_all) {
 					publish_entries.append(dom.div('.instructions').text('Add pages to publish from the list on the left'));
 				}
 				spinner.stop();

data/application/js/types.js

@@ -19,10 +19,11 @@ Spontaneous.Types = (function($, S) {
 			}
 		},
 		allowed_types: function() {
-			var types = [];
-			if (this.data.allowed_types.length > 0) {
-				for (var i = 0, ii = this.data.allowed_types.length; i < ii; i++) {
-					types.push(Spontaneous.Types.type(this.data.allowed_types[i]));
+			var allowed_types = this.data.allowed_types, types = [], a;
+			if (allowed_types.length > 0) {
+				for (var i = 0, ii = allowed_types.length; i < ii; i++) {
+					a = allowed_types[i];
+					types.push({type: Spontaneous.Types.type(a.type), as: a.as});
 				}
 			}
 			return types;
@@ -55,15 +56,6 @@ Spontaneous.Types = (function($, S) {
 		box_prototype: function(box_id) {
 			return this.box_prototypes[box_id];
 		},
-		allowed_types: function() {
-			var types = [];
-			if (this.data.allowed_types.length > 0) {
-				for (var i = 0, ii = this.data.allowed_types.length; i < ii; i++) {
-					types.push(Spontaneous.Types.type(this.data.allowed_types[i]));
-				}
-			}
-			return types;
-		},
 		is_page: function() {
 			return this.data.is_page;
 		},

data/application/js/views.js

@@ -37,8 +37,8 @@ Spontaneous.Views = (function($, S) {
 		text_fields: function() {
 			return this.content.text_fields();
 		},
-		string_fields: function() {
-			return this.content.string_fields();
+		string_values: function() {
+			return this.content.string_values();
 		},
 		file_fields: function() {
 			return this.content.file_fields();

data/application/js/views/box_view.js

@@ -152,8 +152,9 @@ Spontaneous.Views.BoxView = (function($, S) {
 			dropper.get(0).addEventListener('drop', drop, true);
 			dropper.bind('dragenter', drag_enter).bind('dragover', drag_over).bind('dragleave', drag_leave);
 
-			$.each(allowed, function(i, type) {
-				var a = dom.a().text(type.title), add_allowed;
+			$.each(allowed, function(i, allow) {
+				var type = allow.type, as = allow.as || type.title;
+				var a = dom.a().text(as), add_allowed;
 				if (type.is_alias()) {
 					a.addClass('alias')
 					add_allowed = function(type) {

data/application/js/views/page_piece_view.js

@@ -19,7 +19,7 @@ Spontaneous.Views.PagePieceView = (function($, S) {
 
 			contents.append(this.page_title_panel());
 			var entry = dom.div('.entry');
-			var fields = new Spontaneous.FieldPreview(this, '');
+			var fields = new Spontaneous.FieldPreview(this, '', true);
 			var fields_panel = fields.panel();
 			entry.append(fields_panel);
 			inside.append(entry);

data/application/js/views/piece_view.js

@@ -68,7 +68,7 @@ Spontaneous.Views.PieceView = (function($, S) {
 			// this.dialogue_box = $(dom.div, {'class':'dialogue', 'style':'display: none'});
 			// contents.append(this.dialogue_box);
 			var entry = dom.div('.entry');
-			var fields = new Spontaneous.FieldPreview(this, '');
+			var fields = new Spontaneous.FieldPreview(this, '', true);
 			if (fields.has_fields()) {
 				var fields_panel = fields.panel();
 				entry.append(fields_panel);

data/application/views/schema_modification_error.html.erb

@@ -30,10 +30,10 @@
     <div id="container">
 
       <%
-          types = modification.actions.map { |a| a.source.owner}.uniq
+          types = modification.actions.map { |a| a.source.owner}.uniq.compact
       %>
 
-    <h1>There are unresolved changes to <%= types.length > 1 ? "s" : "" %> <%= types.map { |o| "<strong>&lsquo;#{o}&rsquo;</strong>"}.join(', ')%></h1>
+    <h1>There are unresolved changes to <%= types.length == 0 ? "the schema" : types.map { |o| "<strong>&lsquo;#{o}&rsquo;</strong>"}.join(', ')%></h1>
     <% source_file = modification.actions[0].source.source_file %>
     <p class="src"><a href="mvim://open?url=file://<%= source_file %>"><%= source_file %></a></p>
 
@@ -55,7 +55,17 @@
           to &lsquo;<em><%= action.dest.name %></em>&rsquo;
           <% end %>
         </a>
-        <p id="<%= id %>" style="display: none">Are you sure? <a class="button cancel" onclick="_cancel('#<%= id %>')">No</a> <button class="button" onclick="solution('<%= action.action %>', '<%= action.source.name %>', '<%= action.dest ? action.dest.name : '' %>')">Yes</button></p>
+        <div id="<%= id %>" style="display: none">
+        <% if action.action == :delete %>
+          <% case action.category %>
+          <% when :type %>
+          <p class="warning">Deleting a type will delete all instances of it from the db and any of their descendents. This cannot be undone so snapshot your database with <code>spot site dump</code> before proceeding.</p>
+          <% when :box %>
+          <p class="warning">Deleting a box will delete the contents of all boxes of that type. This cannot be undone so snapshot your database with <code>spot site dump</code> before proceeding.</p>
+          <% end %>
+        <% end %>
+        <p>Are you sure? <a class="button cancel" onclick="_cancel('#<%= id %>')">No</a> <button class="button" onclick="solution('<%= action.action %>', '<%= action.source.name %>', '<%= action.dest ? action.dest.name : '' %>')">Yes</button></p>
+        </div>
         </form>
         </li>
       <% end %>