spontaneous 0.2.0.beta5 → 0.2.0.beta6

data/application/js/views/page_piece_view.js

@@ -1,34 +1,36 @@
 // console.log('Loading PageEntry...')
 
 Spontaneous.Views.PagePieceView = (function($, S) {
-	"use strict";
+	'use strict';
 	var dom = S.Dom;
 
 	var PagePieceView = new JS.Class(Spontaneous.Views.PieceView, {
 		// will eventually overwrite panel()
 		panel: function() {
-			var wrapper = dom.div(['entry-wrap page no-boxes', this.depth_class(), this.visibility_class()])
+			var self = this;
+			var wrapper = dom.div(['entry-wrap page no-boxes', self.alias_class(), self.fields_class(), self.depth_class(), self.visibility_class()]);
 			var contents = dom.div('.entry-contents');
 			var inside = dom.div('.entry-inner');
-			var outline = dom.div('.white-bg').mouseover(this.mouseover.bind(this)).mouseout(this.mouseout.bind(this)).click(this.edit.bind(this))
-			inside.append(outline)
-			contents.append(this.action_buttons(contents));
-			if (this.content.type().is_alias()) {
-				contents.append(this.alias_target_panel());
+			var outline = dom.div('.white-bg').mouseover(self.mouseover.bind(self)).mouseout(self.mouseout.bind(self)).click(self.edit.bind(self));
+			inside.append(outline);
+			contents.append(self.action_buttons(contents));
+			if (self.content.type().is_alias()) {
+				contents.append(self.alias_target_panel());
+			} else {
+				contents.append(self.page_title_panel());
 			}
 
-			contents.append(this.page_title_panel());
 			var entry = dom.div('.entry');
-			var fields = new Spontaneous.FieldPreview(this, '', true);
+			var fields = new Spontaneous.FieldPreview(self, '', true);
 			var fields_panel = fields.panel();
 			entry.append(fields_panel);
 			inside.append(entry);
-			var preview_area = this.create_edit_wrapper(inside);
+			var preview_area = self.create_edit_wrapper(inside);
 			contents.append(preview_area);
-			wrapper.append(contents, this.entry_spacer());
-			this.wrapper = wrapper;
-			this.outline = outline;
-			this.fields_preview = fields_panel;
+			wrapper.append(contents, self.entry_spacer());
+			self.wrapper = wrapper;
+			self.outline = outline;
+			self.fields_preview = fields_panel;
 			return wrapper;
 		},
 		page_title_panel: function() {
@@ -38,7 +40,7 @@ Spontaneous.Views.PagePieceView = (function($, S) {
 			self = this,
 			content = self.content,
 			title = dom.a().html(this.content.title()),
-			type = dom.span(".content-type").text(content.type().display_title(content));
+			type = dom.span('.content-type').text(content.type().display_title(content));
 			this.content.title_field().watch('value', function(t) { title.html(t); }.bind(this));
 			wrapper.append(title, type);
 			return wrapper;

data/application/js/views/page_view.js

@@ -28,19 +28,20 @@ Spontaneous.Views.PageView = (function($, S) {
 			path_wrap.append(path_text);
 
 			if (!self.page.is_root()) {
-				var resync = dom.a({ "title":"Sync the path to the page title"}).click(function() {
-					Spontaneous.Ajax.put(['/page', self.page.id(), "slug/sync"].join("/"), {}, self.save_complete.bind(self));
+				var resync = dom.a({ 'title':'Sync the path to the page title'}).click(function() {
+					Spontaneous.Ajax.put(['/page', self.page.id(), 'slug/sync'].join('/'), {}, self.save_complete.bind(self));
 				});
-				path_wrap.append( dom.h3('.titlesync').append(resync));
+				path_wrap.append(dom.h3('.titlesync').append(resync));
 			}
 
+			path_wrap.append(dom.div('.path-spacer'));
 
 			if (user.is_developer()) {
-				var uid_text = dom.h3('.developer.uid' + (!this.page.content.uid ? '.missing' : '')).text('#' + (this.page.content.uid || "----")).click(function() {
-					this.open_uid_editor();
-				}.bind(this));
+				// var uid_text = dom.h3('.developer.uid' + (!this.page.content.uid ? '.missing' : '')).text('#' + (this.page.content.uid || "----")).click(function() {
+				// 	this.open_uid_editor();
+				// }.bind(this));
 				var dev_desc = dom.h3('.developer').append(dom.a().attr('href', this.page.developer_edit_url()).text(this.page.developer_description()));
-				path_wrap.append(uid_text, dev_desc);
+				path_wrap.append(dev_desc);
 			}
 
 			path_wrap.append(dom.div('.edit'));
@@ -50,9 +51,12 @@ Spontaneous.Views.PageView = (function($, S) {
 			}.bind(this));
 
 			this.panel.append(path_wrap);
-			this.path_wrap = path_wrap
+			this.path_wrap = path_wrap;
 			return this.panel;
 		},
+		unload: function() {
+			// fit with the view prototype
+		},
 		set_title: function(title) {
 			var self = this;
 			title = title || this.page.title();
@@ -63,9 +67,8 @@ Spontaneous.Views.PageView = (function($, S) {
 			var maxHeight = 36;
 			window.setTimeout(function()  {
 				var t = self.title
-				, height = function() { return t.height();  }
-				, fs =  window.parseInt(t.css('font-size'), 10);
-				;
+        , height = function() { return t.height(); }
+				, fs = window.parseInt(t.css('font-size'), 10);
 				while (height() > maxHeight && fs > 10) {
 					t.css('font-size', --fs);
 				}
@@ -79,7 +82,7 @@ Spontaneous.Views.PageView = (function($, S) {
 			this.unavailable = u;
 		},
 		open_uid_editor: function() {
-			this.panel.animate({'height': '+=14'}, 200, function() {
+			this.panel.velocity({'height': '+=14'}, { duration: 200, complete: function() {
 				var view = $('h3', this.panel), edit = $('.edit', this.panel);
 				view.hide();
 				edit.hide().empty();
@@ -114,15 +117,15 @@ Spontaneous.Views.PageView = (function($, S) {
 				}.bind(this)).keydown(function(event) {
 					if (event.keyCode === 27) { this.close(); }
 				}.bind(this));
-				edit.fadeIn(200);
-			}.bind(this));
+				edit.velocity('fadeIn', 200);
+			}.bind(this)});
 		},
 		save_uid: function(uid) {
-			Spontaneous.Ajax.put(['/page',this.page.id(), "uid"].join("/"), {'uid':uid}, this.uid_save_complete.bind(this));
+			Spontaneous.Ajax.put(['/page',this.page.id(), 'uid'].join('/'), {'uid':uid}, this.uid_save_complete.bind(this));
 		},
 		uid_save_complete: function(response, status, xhr) {
 			if (status === 'success') {
-				var view = $('h3.uid', this.panel), edit = $('.edit', this.panel), uid = (response.uid == "" ? "----" : response.uid);
+				var view = $('h3.uid', this.panel), edit = $('.edit', this.panel), uid = (response.uid === '' ? '----' : response.uid);
 				// nasty but the value is only used for display
 				this.page.content.uid = response.uid;
 				view.text('#'+uid);
@@ -133,20 +136,21 @@ Spontaneous.Views.PageView = (function($, S) {
 			this.unavailable = false;
 			this.url_editor_open = true;
 			Spontaneous.Ajax.get(['/page', this.page.id(), 'slug/unavailable'].join('/'), this.unavailable_loaded.bind(this));
-			this.panel.animate({'height': '+=14'}, 200, function() {
-				var view = $('h3', this.panel), edit = $('.edit', this.panel);
-				view.hide();
+			this.panel.velocity({'height': '+=14'}, {duration: 200, complete: function() {
+				var view = $('h3', this.panel), edit = $('.edit', this.panel), spacer = $('.path-spacer', this.panel);
+				spacer.add(view).hide();
 				edit.hide().empty();
-				var path = [""], parts = this.page.get('path').split('/'), slug = parts.pop();
+				var path = [''], parts = this.page.get('path').split('/'), slug = parts.pop();
 				parts.shift(); // remove empty entry caused by leading '/'
-				edit.append(dom.span().text('/'))
+				edit.append(dom.span().text('/'));
+				var click = function() {
+					S.Location.load_path($(this).attr('href'));
+					return false;
+				};
 				for (var i = 0, ii = parts.length; i < ii; i++) {
 					var p = parts[i];
-					path.push(p)
-					edit.append(dom.a('.path').text(p).attr('href', path.join('/')).click(function() {
-						S.Location.load_path($(this).attr('href'));
-						return false;
-					}));
+					path.push(p);
+					edit.append(dom.a('.path').text(p).attr('href', path.join('/')).click(click));
 					edit.append(dom.span().text('/'));
 				}
 				var input_and_error = dom.span('.input-error');
@@ -204,25 +208,25 @@ Spontaneous.Views.PageView = (function($, S) {
 					if (event.keyCode === 27) { close(); }
 				}.bind(this));
 
-				edit.fadeIn(200, function() {
+				edit.velocity({opacity: 1}, {duration: 200, display: 'flex', complete: function() {
 					input.focus();
-				});
+				}});
 				this.input = input;
 				this.error = error;
-			}.bind(this));
+			}.bind(this)});
 		},
 		show_path_error: function(error_text) {
-			error_text = (error_text || "Duplicate URL");
-			this.error.text(error_text).fadeIn(100);
+			error_text = (error_text || 'Duplicate URL');
+			this.error.text(error_text).velocity('fadeIn', 100);
 			this.input.addClass('error');
 		},
 		hide_path_error: function(error_text) {
-			if (this.error) { this.error.fadeOut(100); }
+			if (this.error) { this.error.velocity('fadeOut', 100); }
 
 			if (this.input && this.input.hasClass('error')) { this.input.removeClass('error'); }
 		},
 		save: function(slug) {
-			Spontaneous.Ajax.put(['/page',this.page.id(), "slug"].join("/"), {'slug':slug}, this.save_complete.bind(this));
+			Spontaneous.Ajax.put(['/page',this.page.id(), 'slug'].join('/'), {'slug':slug}, this.save_complete.bind(this));
 		},
 
 		save_complete: function(response, status, xhr) {
@@ -236,7 +240,7 @@ Spontaneous.Views.PageView = (function($, S) {
 				this.page.set('path', response.path);
 				this.page.set('slug', response.slug);
 				// HACK: see preview.js (Preview.display)
-				Spontaneous.Location.set('path', this.page.get('path'))
+				Spontaneous.Location.set('path', this.page.get('path'));
 			} else {
 				if (xhr.status === 409) { // duplicate path
 					this.show_path_error();
@@ -248,10 +252,10 @@ Spontaneous.Views.PageView = (function($, S) {
 		},
 		close: function() {
 			this.url_editor_open = false;
-			var view = $('h3', this.panel), edit = $('.edit', this.panel);
-			view.show();
+			var view = $('h3', this.panel), edit = $('.edit', this.panel), spacer = $('.path-spacer', this.panel);
+			view.add(spacer).show();
 			edit.hide();
-			this.panel.animate({'height': '-=14'}, 200)
+			this.panel.velocity({'height': '-=14'}, 200);
 		}
 	};
 	var PageView = new JS.Class(Spontaneous.Views.View, {
@@ -263,19 +267,24 @@ Spontaneous.Views.PageView = (function($, S) {
 		panel: function() {
 			this.panel = dom.div('#page-content');
 			if (this.page.hidden()) {
-				this.panel.addClass('hidden')
+				this.panel.addClass('hidden');
 			}
-			this.panel.append(new FunctionBar(this.page).panel());
+			var functionbar = new FunctionBar(this.page);
+			this._subviews.push(functionbar);
+			this.panel.append(functionbar.panel());
 
-			var fields = dom.div('#page-fields')
+			var fields = dom.div('#page-fields');
 			var fp = new Spontaneous.FieldPreview(this, '');
+			this._subviews.push(fp);
 			var p = fp.panel();
-			p.prepend(dom.div('.overlay'))
+			p.prepend(dom.div('.overlay'));
 
 			var preview_area = this.create_edit_wrapper(p);
-			fields.append(preview_area)
+			fields.append(preview_area);
 			this.panel.append(fields);
-			this.panel.append(new Spontaneous.BoxContainer(this.page, 'page-slots').panel());
+			var boxes = new Spontaneous.BoxContainer(this.page, 'page-slots');
+			this._subviews.push(boxes);
+			this.panel.append(boxes.panel());
 			this.fields_preview = p;
 			return this.panel;
 		},
@@ -291,6 +300,8 @@ Spontaneous.Views.PageView = (function($, S) {
 		},
 		depth: function() {
 			return this.page.depth();
+		},
+		unloadView: function() {
 		}
 	});
 

data/application/js/views/piece_view.js

@@ -17,11 +17,13 @@ Spontaneous.Views.PieceView = (function($, S) {
 			return false;
 		},
 		title: function() {
-			return "Delete this " + (this.parent_view.content.is_page() ? "Page?" : "Piece?");
+			return 'Delete this ' + (this.parent_view.content.is_page() ? 'Page?' : 'Piece?');
+		},
+		position_from_event: function(event) {
+			var p = this.callSuper();
+			p.left = p.left - 3;
+			return p;
 		},
-		// position_from_event: function(event) {
-		// 	return this.position_from_element(event);
-		// },
 		view: function() {
 			var __entry = this.parent_view;
 			var w = dom.div('#popover-delete').click(function() {
@@ -29,12 +31,12 @@ Spontaneous.Views.PieceView = (function($, S) {
 				return false;
 			});
 
-			var ok = dom.a('.ok').text("Delete").click(function() {
+			var ok = dom.a('.ok').text('Delete').click(function() {
 				__entry.destroy();
 				return false;
 			});
-			var cancel = dom.a('.cancel').text("Cancel");
-			w.append(cancel, ok)
+			var cancel = dom.a('.cancel').text('Cancel');
+			w.append(cancel, ok);
 			return w;
 		},
 		scroll: true
@@ -46,7 +48,7 @@ Spontaneous.Views.PieceView = (function($, S) {
 			this.container_view = container_view;
 		},
 		panel: function() {
-			var wrapper = dom.div(['entry-wrap', this.depth_class(), this.visibility_class(), this.boxes_class()])
+			var wrapper = dom.div(['entry-wrap', this.fields_class(), this.alias_class(), this.depth_class(), this.visibility_class(), this.boxes_class()]);
 			var contents = dom.div('.entry-contents');
 			var inside = dom.div('.entry-inner');
 			var outline = dom.div('.white-bg').
@@ -59,9 +61,9 @@ Spontaneous.Views.PieceView = (function($, S) {
 			}
 
 			if (!this.content.type().is_alias()) {
-				wrapper.append(this.content_type_info());
+				contents.append(this.content_type_info());
 			}
-			contents.append( this.action_buttons(contents));
+			contents.append(this.action_buttons(contents));
 			if (this.content.type().is_alias()) {
 				contents.append(this.alias_target_panel());
 			}
@@ -69,8 +71,9 @@ Spontaneous.Views.PieceView = (function($, S) {
 			// contents.append(this.dialogue_box);
 			var entry = dom.div('.entry');
 			var fields = new Spontaneous.FieldPreview(this, '', true);
+			var fields_panel;
 			if (fields.has_fields()) {
-				var fields_panel = fields.panel();
+				fields_panel = fields.panel();
 				entry.append(fields_panel);
 			}
 			var box_container = new Spontaneous.BoxContainer(this.content);
@@ -94,7 +97,8 @@ Spontaneous.Views.PieceView = (function($, S) {
 			return entry_spacer;
 		},
 		edit: function(focus_field) {
-			this.wrapper.addClass('editing')
+			if (!this.content.has_fields()) { return; }
+			this.wrapper.addClass('editing');
 			this.callSuper(focus_field);
 		},
 		edit_closed: function() {
@@ -103,46 +107,48 @@ Spontaneous.Views.PieceView = (function($, S) {
 		},
 		alias_target_panel: function() {
 			var content = this.content,
-			click = function() { S.Location.load_id(content.target().id); },
+			click = function() { S.Location.load_id(content.target().page_id); },
 			wrap = dom.div('.alias-target').click(click),
 			icon = content.alias_icon,
-			type = dom.span(".content-type").text(content.type().display_title(content));
+			type = dom.span('.content-type').text(content.type().display_title(content));
 			title = dom.a().html(content.content.alias_title);
 
 			if (!content.has_fields()) { wrap.addClass('no-fields'); }
 
 			if (icon) {
 				var img = new Spontaneous.Image(icon);
-				wrap.append(img.icon(60, 60).click(click))
+				wrap.append(img.icon(60, 60).click(click));
 			}
 
-			return wrap.append(title, type)
+			return wrap.append(title, type);
 		},
 		content_type_info: function() {
-			var type = dom.div(".content-type.piece").text(this.content.type().display_title(this.content));
+			var type = dom.div('.content-type.piece').text(this.content.type().display_title(this.content));
 			return type;
 		},
 		action_buttons: function(wrapper) {
-			if (!this._title_bar) {
-				var label = user.is_developer() ? dom.a('.developer.source').attr('href', this.content.developer_edit_url()).text(this.content.developer_description()) : (this.content.type().title);
-				var action_buttons = dom.div('.title-bar');//.append(label);
-				var actions = dom.div('.actions', {'xstyle':'display: none'});
-				var destroy = dom.a('.delete');
-				var visibility = dom.a('.visibility');
-				actions.append(destroy);
-				actions.append(visibility);
-				action_buttons.append(actions);
-				var _hide_pause;
-				// wrapper.mouseenter(function() {
-				// 	if (_hide_pause) { window.clearTimeout(_hide_pause); }
-				// 	actions.slideDown(50);
-				// }).mouseleave(function() {
-				// 	_hide_pause = window.setTimeout(function() { actions.slideUp(100) }, 200);
-				// });
-				destroy.click(this.confirm_destroy.bind(this));
-				this.content.watch('hidden', this.visibility_changed.bind(this));
-				visibility.click(this.toggle_visibility.bind(this));
-				this._action_buttons = action_buttons;
+			if (!this._action_buttons) {
+				if (this.content.container.isWritable()) {
+					// var label = user.is_developer() ? dom.a('.developer.source').attr('href', this.content.developer_edit_url()).text(this.content.developer_description()) : (this.content.type().title);
+					var action_buttons = dom.div('.title-bar');//.append(label);
+					var actions = dom.div('.actions');
+					var destroy = dom.a('.delete');
+					var visibility = dom.a('.visibility');
+					actions.append(destroy);
+					actions.append(visibility);
+					action_buttons.append(actions);
+					var _hide_pause;
+					// wrapper.mouseenter(function() {
+					// 	if (_hide_pause) { window.clearTimeout(_hide_pause); }
+					// 	actions.slideDown(50);
+					// }).mouseleave(function() {
+					// 	_hide_pause = window.setTimeout(function() { actions.slideUp(100) }, 200);
+					// });
+					destroy.click(this.confirm_destroy.bind(this));
+					this.content.watch('hidden', this.visibility_changed.bind(this));
+					visibility.click(this.toggle_visibility.bind(this));
+					this._action_buttons = action_buttons;
+				}
 			}
 			return this._action_buttons;
 		},
@@ -163,6 +169,7 @@ Spontaneous.Views.PieceView = (function($, S) {
 			}
 		},
 		mouseover: function() {
+			if (!this.content.has_fields()) { return; }
 			this.outline.addClass('active');
 			if (this.fields_preview) {
 				this.fields_preview.addClass('hover');

data/application/views/index.erb

@@ -9,6 +9,7 @@
 
 		<link rel="stylesheet" href="<%= style_url("spontaneous") %>" type="text/css" media="screen" charset="utf-8" />
     <script type="text/javascript" charset="utf-8" src="<%= script_url("vendor/jquery") %>"></script>
+    <script type="text/javascript" charset="utf-8" src="<%= script_url("vendor/jquery.velocity.min") %>"></script>
 		<script type="text/javascript" charset="utf-8">
 			Spontaneous = {
 				site_domain: '<%= Spontaneous::Site.config.site_domain %>',

data/db/migrations/20130114120000_create_revision_tables.rb

@@ -2,6 +2,7 @@
 require 'logger'
 require 'spontaneous'
 require 'benchmark'
+require 'spontaneous/publishing/revision'
 
 Sequel.migration do
   ::ContentTable = S::DataMapper::ContentTable unless defined?(::ContentTable)
@@ -23,7 +24,7 @@ Sequel.migration do
 
     [revision_table, archive_table].each do |table|
       drop_table?(table)
-      run %(CREATE TABLE #{literal(table)} AS (SELECT * FROM #{literal(content_table)} LIMIT 1);)
+      Spontaneous::Publishing.create_content_table(self, content_table, table)
     end