spontaneous 0.2.0.alpha2 → 0.2.0.alpha3

data/application/js/page_browser.js

@@ -2,7 +2,19 @@
 
 
 Spontaneous.PageBrowser = (function($, S) {
-	var dom = S.Dom;
+	var dom = S.Dom
+	, flattenPageList = function(pageList) {
+		var pages = []
+		, comparator = function(a, b) {
+			var at = a.title, bt = b.title;
+			if (at > bt) { return 1; }
+			if (at < bt) { return -1; }
+			return 0;
+		};
+		$.each(pageList, function(key, list) { pages = pages.concat(list); });
+		pages.sort(comparator);
+		return pages;
+	};
 	var PageBrowser = new JS.Class(Spontaneous.PopoverView, {
 		initialize: function(origin) {
 			origin = String(origin || "");
@@ -19,12 +31,12 @@ Spontaneous.PageBrowser = (function($, S) {
 		},
 		origin_list: function() {
 			return function(location) {
-				return location.generation;
+				return flattenPageList(location.generation);
 			}
 		},
 		children_list: function() {
 			return function(location) {
-				return location.children;
+				return flattenPageList(location.children);
 			}
 		},
 		origin_ancestors: function() {
@@ -44,7 +56,7 @@ Spontaneous.PageBrowser = (function($, S) {
 			} else {
 				path = '/map/' + this.origin.id;
 			}
-			S.Ajax.get(path, this.page_list_loaded.bind(this));
+			S.Location.retrieve(path, this.page_list_loaded.bind(this));
 		},
 		view: function() {
 			var wrapper = dom.div('.page-browser'), table = dom.div('.page-list');
@@ -56,37 +68,35 @@ Spontaneous.PageBrowser = (function($, S) {
 			this.get_page_list();
 			return wrapper;
 		},
-		page_list_loaded: function(page_list, status) {
-			if (status === 'success') {
-				this.table.empty();
-				this.location = page_list;
-				this.manager.page_list_loaded(this);
-				var g = this.page_list(this.location), table = this.table;
-				for (var i = 0, ii = g.length; i < ii; i++) {
-					var page = g[i];
-					table.append(this.get_entry(page));
-				}
+		page_list_loaded: function(page_list, xhr) {
+			this.table.empty();
+			this.location = page_list;
+			this.manager.page_list_loaded(this);
+			var g = this.page_list(this.location), table = this.table;
+			for (var i = 0, ii = g.length; i < ii; i++) {
+				var page = g[i];
+				table.append(this.get_entry(page));
+			}
 
-				this.ancestors.empty();
-				var _browser = this, list = dom.ul(), ancestors = this.ancestor_list(this.location);
+			this.ancestors.empty();
+			var _browser = this, list = dom.ul(), ancestors = this.ancestor_list(this.location);
 
-				this.depth = ancestors.length;
-				var click = function(p) {
-					return function(event) {
-						_browser.ancestor_selected(p);
-						return false;
-					};
+			this.depth = ancestors.length;
+			var click = function(p) {
+				return function(event) {
+					_browser.ancestor_selected(p);
+					return false;
 				};
+			};
 
-				for (var i = 0, ii = ancestors.length; i < ii; i++) {
-					var a = ancestors[i], li = dom.li().append(dom.a().text(a.title)).append(dom.span().text("/")).click(click(a));
-					list.append(li);
-				}
-				if (ancestors.length === 0) {
-					list.append(dom.li().append(dom.a().text('Choose a page...')))
-				}
-				this.ancestors.append(list);
+			for (var i = 0, ii = ancestors.length; i < ii; i++) {
+				var a = ancestors[i], li = dom.li().append(dom.a().text(a.title)).append(dom.span().text("/")).click(click(a));
+				list.append(li);
+			}
+			if (ancestors.length === 0) {
+				list.append(dom.li().append(dom.a().text('Choose a page...')))
 			}
+			this.ancestors.append(list);
 		},
 		get_entry: function(page) {
 			var _browser = this, selected = function(p) {

data/application/js/page_entry.js

@@ -2,6 +2,10 @@
 
 Spontaneous.PageEntry = (function($, S) {
 	var PageEntry = new JS.Class(Spontaneous.Content, {
+		initialize: function(content, container) {
+			this.container = container;
+			this.callSuper(content);
+		},
 		save_complete: function(values) {
 			var _this = this;
 			_this.callSuper(values)

data/application/js/panel/root_menu.js

@@ -0,0 +1,66 @@
+(function(S, $) {
+	var dom = S.Dom;
+	var sharedUserAdmin = new Spontaneous.MetaView.UserAdmin();
+	var RootMenuView = new JS.Class(S.PopoverView, {
+		initialize: function(afterCloseCallback) {
+			this.afterCloseCallback = afterCloseCallback;
+			this.callSuper();
+		},
+		width: function() {
+			return 250;
+		},
+		title: function() {
+			return "Main Menu";
+		},
+		position_from_event: function(event) {
+			var pos = this.callSuper();
+			return {left: pos.left - 12, top: pos.top + 1};
+		},
+		view: function() {
+			var outer = dom.div("#root-menu")
+			outer.append(this.serviceMenu(), this.userActionMenu());
+			return outer;
+		},
+		after_close: function() {
+			console.log("root menu after close")
+			if (this.afterCloseCallback && (typeof this.afterCloseCallback === "function")) {
+				this.afterCloseCallback();
+			}
+		},
+		userActionMenu: function() {
+			var menu = dom.ul(".user-actions");
+			menu.append(dom.li('.user.title').text(S.User.name()));
+			if (S.User.is_admin()) {
+				var manage = dom.a().text("User Administration").click(function() {
+					Spontaneous.ContentArea.enterMeta(sharedUserAdmin);
+					Spontaneous.Popover.close();
+				});
+				menu.append(dom.li('.user-administration').append(manage));
+			}
+			var logout = dom.a().text("Logout").click(function() {
+				console.log("Logout");
+				S.User.logout();
+			});
+			menu.append(dom.li('.logout').append(logout));
+			return menu;
+		},
+		serviceMenu: function() {
+			var menu = dom.ul(".external-services");
+			var self = this;
+			var services = S.Services.serviceList();
+			if (services.length > 0) {
+				menu.append(dom.li(".title").text("Services"));
+				services.forEach(function(service) {
+					var link = dom.a().text(service.title).click(function() {
+						self.close();
+						S.Services.open(service);
+					});
+					menu.append(dom.li().append(link))
+				});
+			}
+			return menu;
+		}
+	});
+	S.RootMenuView = RootMenuView;
+
+}(Spontaneous, jQuery));

data/application/js/popover.js

@@ -41,7 +41,7 @@ Spontaneous.Popover = (function($, S) {
 			// need to subtract the height of the top-bar because the
 			// popover is positioned absolutely inside the data-pane but
 			// given coordinates relative to the body
-			top -= 31 - Popover.div().scrollTop();
+			top -= 37 - Popover.div().scrollTop();
 			wrapper.offset({top:(o.top+top), left:(o.left + left)});
 			wrapper.hide();
 			location.append(wrapper);
@@ -72,7 +72,7 @@ Spontaneous.Popover = (function($, S) {
 	Popover.extend({
 		_instance: false,
 		div: function() {
-			if (!this._div) { this._div = $('#content'); }
+			if (!this._div) { this._div = $('#content-outer'); }
 			return this._div;
 		},
 		open: function(event, view) {

data/application/js/preview.js

@@ -42,7 +42,7 @@ Spontaneous.Preview = (function($, S) {
 		},
 		goto_path: function(path) {
 			if (path) {
-				path += click_param();
+				// path += click_param();
 				this.iframe[0].contentWindow.location.href = path;
 			}
 		},

data/application/js/publish.js

@@ -17,7 +17,7 @@ Spontaneous.Publishing = (function($, S) {
 			return "publishing";
 		},
 		body: function() {
-			var wrapper = dom.div('#publishing-dialogue').text('publishing')
+			var wrapper = dom.div('#publishing-dialogue');
 			this.wrapper = wrapper;
 			Spontaneous.Ajax.get(['/publish', 'changes'].join('/'), this.change_list_loaded.bind(this));
 			return wrapper;
@@ -30,10 +30,10 @@ Spontaneous.Publishing = (function($, S) {
 		publish: function() {
 			var ids = [], changes = this.changes_to_publish();
 			for (var i = 0, ii = changes.length; i < ii; i++) {
-				ids.push(changes[i].id);
+				ids = ids.concat(changes[i].page_ids());
 			}
 			if (ids.length > 0) {
-				Spontaneous.Ajax.post(['/publish', 'publish'].join('/'),{'change_set_ids': ids}, this.publish_requested.bind(this));
+				Spontaneous.Ajax.post(['/publish', 'publish'].join('/'),{'page_ids': ids}, this.publish_requested.bind(this));
 			} else {
 			}
 		},
@@ -101,6 +101,27 @@ Spontaneous.Publishing = (function($, S) {
 				change_set.panel().appear();
 			}
 		},
+		change_set_dependency_state: function(dependentPage) {
+			var self = this;
+			var dependentSet = this.change_sets.filter(function(set) {
+				return set.change.id === dependentPage.id;
+			});
+			var dependentGraph = this.change_sets.filter(function(set) {
+				return set.has_dependency(dependentPage);
+			});
+			var group = dependentSet.concat(dependentGraph)
+			group.forEach(function(set) {
+				set.select(true);
+			});
+		},
+		dependency_forces_publish: function(set) {
+			var dependencyPage = set.page();
+			return this.change_sets.some(function(set) {
+				return set.selected && set.dependent_pages().some(function(page) {
+					return page.id === dependencyPage.id;
+				});
+			});
+		},
 		selected: function() {
 			var selected = [], cs;
 			for (var i = 0, ii = this.change_sets.length; i < ii; i++) {
@@ -112,15 +133,55 @@ Spontaneous.Publishing = (function($, S) {
 			return selected;
 		},
 		changes_to_publish: function() {
-			var changes = [], selected = this.selected(), cs;
-			for (var i = 0, ii = selected.length; i < ii; i++) {
-				cs = selected[i];
-				changes = changes.concat(cs.change.changes)
-			}
-			return changes;
+			return this.selected();
 		}
 	});
 
+	var Page = new JS.Class({
+		initialize: function(details) {
+			$.extend(this, details);
+		},
+		isUnpublished: function() {
+			return !this.published_at;
+		},
+		isDependent: function() {
+			return !this.hasOwnProperty("dependent");
+		},
+
+		panel: function() {
+			var self = this
+			, pageTitle = dom.span(".page-title").html(this.title)
+			, classes = ".title" + (this.isDependent() ? ".dependent" : "")
+			, modificationDate = dom.div('.modification-date').html(this.modifiedAt())
+			, publicationDate = dom.div('.publication-date').html(this.publishedAt())
+			, metadata = dom.div(".dates").append(modificationDate, publicationDate)
+			if (this.isUnpublished()) {
+				pageTitle.attr("title", "This page is new and has never been published");
+			}
+			return dom.div(classes).append(pageTitle, dom.div('.url').text(this.url)).append(metadata).click(function() {
+				S.Dialogue.close();
+				S.Location.load_id(self.id);
+			});
+		},
+		modifiedAt: function() {
+			return "Modified: " + this.formatDate(this.modified_at);
+		},
+		publishedAt: function() {
+			var date;
+			if (this.isUnpublished()) {
+				date = 'Never';
+			} else {
+				date = this.formatDate(this.published_at);
+			}
+			return "Published: " + date;
+		},
+		formatDate: function(dateString) {
+			if (!dateString) { return ""; }
+			var d = new Date(dateString);
+			// use date.js formatting
+			return d.toString("d MMM yyyy, HH:mm");
+		}
+	});
 	var ChangeSet = new JS.Class({
 		initialize: function(id, dialogue, change) {
 			this.id = id;
@@ -128,31 +189,61 @@ Spontaneous.Publishing = (function($, S) {
 			this.change = change;
 			this.selected = false;
 		},
+		page_ids: function() {
+			var ids = [this.change.id];
+			return ids.concat(this.dependent_pages().map(function(p) { return p.id; }));
+		},
 		panel: function() {
 			if (!this._panel) {
-				var w = dom.div('.change-set'), inner = dom.div('.inner'), page_list = dom.div('.pages'), add = dom.div('.add').append(dom.span().text('+')), pages = this.pages();
-				for (var i = 0, ii = pages.length; i < ii; i++) {
-					page_list.append(dom.div('.title').text(pages[i].title).append(dom.div('.url').text(pages[i].path)));
-				}
-				add.click(function() {
-					this.select_toggle();
-				}.bind(this))
-				inner.append(page_list, add)
-				w.append(inner)
-				this.wrapper = w;
-				this._panel = w;
+				this._panel = this.createPanel();
+				this.wrapper = this._panel;
 			}
 			return this._panel;
 		},
+		createPanel: function() {
+			var w = dom.div('.change-set')
+			, inner = dom.div('.inner')
+			, page_list = dom.div('.pages')
+			, add = dom.div('.add').append(dom.span().text(''))
+			, page = this.page()
+			, pages = this.dependent_pages();
+
+			if (page.isUnpublished()) {
+				w.addClass('unpublished');
+			}
+			page_list.append(page.panel());
+			for (var i = 0, ii = pages.length; i < ii; i++) {
+				page_list.append(pages[i].panel());
+			}
+			add.click(function() {
+				this.select_toggle();
+			}.bind(this));
+			inner.append(page_list, add);
+			w.append(inner);
+			return w;
+		},
 		selected_panel: function(id) {
-			var panel = this.panel().clone().attr('id', id);
-			panel.find('.add').click(this.select_toggle.bind(this)).find('span').text('-');
+			var panel = this.createPanel().attr('id', id);
+			panel.find('.add').find('span').addClass('active');
 			return panel;
 		},
 		select: function(state) {
-			if (state === this.selected) { return; }
-			this.selected = state;
-			this.dialogue.change_set_state(this, this.selected);
+			var self = this;
+			if (state === self.selected) { return; }
+			if (!state && self.dependency_forces_publish()) {
+				return;
+			}
+			self.selected = state;
+			self.dialogue.change_set_state(self, self.selected);
+			if (state) {
+				self.dependent_pages().forEach(function(page) {
+					self.dialogue.change_set_dependency_state(page);
+				});
+				var page = self.page();
+				if (page.isUnpublished()) {
+					self.dialogue.change_set_dependency_state(page);
+				}
+			}
 		},
 		select_toggle: function() {
 			this.select(!this.selected)
@@ -164,15 +255,32 @@ Spontaneous.Publishing = (function($, S) {
 				this.wrapper.removeClass('selected')
 			}
 		},
-		pages: function() {
-			if (!this._pages) {
-				this._pages = this.change.pages.sort(function(p1, p2) {
-					var a = p1.depth, b = p2.depth;
+		page: function() {
+			return new Page(this.change);
+		}.cache("_page_"),
+
+		dependency_forces_publish: function() {
+			return this.dialogue.dependency_forces_publish(this);
+		},
+		dependent_pages: function() {
+			if (!this._dependent_pages) {
+				this._dependent_pages = this.change.dependent.map(function(p) {
+					return new Page(p);
+				}).sort(function(p1, p2) {
+					var a = p2.depth, b = p1.depth;
 					if (a == b) return 0;
 					return (a < b ? -1 : 1);
 				});
 			}
-			return this._pages;
+			return this._dependent_pages;
+		},
+		has_dependency: function(onPage) {
+			var dependents = this.dependent_pages();
+			if (dependents.length === 0) { return false; }
+			var matches = dependents.filter(function(dep) {
+				return dep.id === onPage.id;
+			});
+			return matches.length > 0;
 		}
 	});
 

data/application/js/services.js

@@ -0,0 +1,43 @@
+// console.log('Loading Metadata...')
+
+Spontaneous.Services = (function($, S) {
+	var dom = S.Dom;
+	var instance = new JS.Singleton({
+		include: S.Properties,
+		loaded: function(serviceData) {
+			this.set('services', serviceData);
+		},
+		serviceList: function() {
+			return this.get("services");
+		},
+		open: function(service) {
+			S.TopBar.showService(service);
+			S.ContentArea.showService(service);
+		},
+		close: function() {
+			S.TopBar.showNavigationView();
+			S.ContentArea.hideService();
+		},
+		init: function(container) {
+			this.iframe = dom.iframe("#services_pane", {'src':'about:blank'})
+			this.iframe.hide();
+			container.append(this.iframe);
+			return this;
+		},
+		display: function(url) {
+			var iframe = this.iframe;
+			iframe.fadeIn(200);
+			// iframe.bind('ready.services', function() {
+			// 	iframe.fadeIn(200);
+			// });
+			iframe[0].contentWindow.location.href = url;
+		},
+		hide: function() {
+			this.iframe.unbind('ready.services').hide();
+		},
+		show: function() {
+			this.iframe.show();
+		}
+	});
+	return instance;
+}(jQuery, Spontaneous));

data/application/js/sharded_upload.js

@@ -88,7 +88,7 @@ Spontaneous.ShardedUpload = (function($, S) {
 		onload: function(event) {
 		},
 		onloadend: function(event) {
-			console.error('Shard#onloadend: shard upload failed', event);
+			console.log('Shard#onloadend: shard upload complete', event);
 		},
 		onreadystatechange: function(event) {
 			var xhr = event.currentTarget;
@@ -140,7 +140,7 @@ Spontaneous.ShardedUpload = (function($, S) {
 			form.append('version', this.target_version);
 			form.append('shards', this.hashes().join(','));
 			form.append('mime_type', this.mime_type());
-			form.append('filename', this.file.fileName);
+			form.append('filename', File.filename(this.file));
 			this.post(this.path(), form);
 		},
 		path: function() {

data/application/js/spontaneous.js

@@ -1,6 +1,65 @@
-// console.log('Loading Spontaneous...')
-
-Spontaneous.page = function() {
-	return Spontaneous.Editing.get('page');
-}
+//= require compatibility
+//= require vendor/jquery-ui-1.8.18.custom.min
+//= require vendor/JS.Class-2.1.5/min/core
+//= require vendor/crypto-2.3.0-crypto
+//= require vendor/crypto-2.3.0-sha1
+//= require vendor/diff_match_patch
+//= require vendor/date
+//= require extensions
+//= require properties
+//= require dom
+//= require ajax
+//= require authentication
+//= require user
+//= require popover
+//= require popover_view
+//= require event_source
+//= require metadata
+//= require types
+//= require image
+//= require content
+//= require views
+//= require views/box_view
+//= require views/page_view
+//= require views/piece_view
+//= require views/page_piece_view
+//= require meta_view
+//= require meta_view/user_admin
+//= require entry
+//= require page_entry
+//= require box
+//= require page
+//= require field
+//= require field_types/string_field
+//= require field_types/long_string_field
+//= require field_types/file_field
+//= require field_types/image_field
+//= require field_types/markdown_field
+//= require field_types/date_field
+//= require field_types/webvideo_field
+//= require field_types/select_field
+//= require content_area
+//= require preview
+//= require editing
+//= require location
+//= require state
+//= require panel/root_menu
+//= require top_bar
+//= require field_preview
+//= require box_container
+//= require progress
+//= require status_bar
+//= require upload
+//= require sharded_upload
+//= require upload_manager
+//= require dialogue
+//= require edit_panel
+//= require add_home_dialogue
+//= require page_browser
+//= require add_alias_dialogue
+//= require conflicted_field_dialogue
+//= require publish
+//= require services
+//= require init
+//= require load
 

data/application/js/state.js

@@ -34,6 +34,17 @@ Spontaneous.State = (function($, S) {
 		},
 		toString: function() {
 			return JSON.stringify(this.state);
+		},
+		setFieldMetadata: function(field, key, value) {
+			var s = this.state;
+			s.fields = s.fields || {};
+			s.fields[field.schema_id()] = s.fields[field.schema_id()] || {};
+			s.fields[field.schema_id()][key] = value;
+			this.save();
+		},
+		getFieldMetadata: function(field, key) {
+			var s = this.state, f = (s.fields || {})[field.schema_id()] || {};
+			return f[key]
 		}
 	});
 	var State = new JS.Singleton({
@@ -50,15 +61,15 @@ Spontaneous.State = (function($, S) {
 			var s = this.get(content);
 			return s.active_box();
 		},
-		activate_slot: function(content, slot) {
-			var s = this.get(content);
-			s.activate_slot(slot);
-			s.save();
-		},
-		active_slot: function(content) {
-			var s = this.get(content);
-			return s.active_slot();
-		}
+		// activate_slot: function(content, slot) {
+		// 	var s = this.get(content);
+		// 	s.activate_slot(slot);
+		// 	s.save();
+		// },
+		// active_slot: function(content) {
+		// 	var s = this.get(content);
+		// 	return s.active_slot();
+		// }
 	});
 	return State;
 }(jQuery, Spontaneous));