spontaneous 0.2.0.beta1 → 0.2.0.beta2

data/application/css/editing.css.scss

@@ -124,9 +124,11 @@ $text-edit-width: 621px;
 				border: none;
 				width: 100%;
 				// padding-right: 64px;
-				padding-left: 0;
-				padding-right: 0;
+				padding-left: 7px;
+				padding-right: 7px;
 				resize:vertical;
+				position: relative;
+				left: -7px;
 			}
 			input[type="text"] {
 				@include text-input;
@@ -312,36 +314,64 @@ $text-edit-width: 621px;
 	}
 }
 .field {
-  .markdown-editor .md-toolbar {
-    @include display-box;
-    @include box-orient;
-    background-color: $editing-blur;
-    a {
-      @include interface;
-      @include no-select;
-      color: $editing-3;
-      display: block;
-      border: solid 1px transparent;
-      padding: 2px 6px;
-      cursor: pointer;
-    }
-    a.active {
-      // border: solid 1px $editing-2;
-      background-color: $editing-2;
-    }
-    a:hover {
-      background-color: $editing-3;
-    }
-    a + a {
-      margin-left: 10px;
-    }
-  }
+	.markdown-editor  {
+		position: relative;
+		.md-toolbar {
+			@include display-box;
+			@include box-orient;
+			@include rounded(5px);
+			position: absolute;
+			z-index: 100;
+			background-color: $action;
+			a {
+				@include interface;
+				@include no-select;
+				color: #333;
+				display: block;
+				border: solid 1px transparent;
+				padding: 2px 6px;
+				cursor: pointer;
+				min-width: 30px;
+				text-align: center;
+			}
+			a:first-of-type {
+				@include rounded-left(5px);
+			}
+			a:last-child {
+				@include rounded-right(5px);
+			}
+			a.active:hover,
+			a.active {
+				// border: solid 1px $editing-2;
+				background-color: $editing-focus;
+				color: #fff;
+			}
+			a:hover {
+				// background-color: $highlight;
+				background-color: $editing-blur;
+			}
+			a + a {
+				// margin-left: 10px;
+				border-left: solid 1px $editing-blur;
+			}
+			.arrow {
+				@include transform(rotate(45deg));
+				position: absolute;
+				width: 10px;
+				height: 10px;
+				bottom: -5px;
+				left: 50%;
+				background-color: $action;
+				z-index: -10;
+			}
+		}
+	}
 }
 .field.focus {
   .markdown-editor .md-toolbar {
-    background-color: $editing-focus;
+		background-color: $action;
+    // background-color: $editing-focus;
     a {
-      color: #333;
     }
   }
 
@@ -415,3 +445,15 @@ $text-edit-width: 621px;
 	background: url(/@spontaneous/static/editing-textarea-resize-s-b5af62365eb7e19ea4beccf7242d508e.png) repeat-x;
 	cursor: ns-resize;
 }
+
+.field-boolean {
+	.value {
+		label {
+			@include interface;
+			color: #333;
+		}
+		label + label {
+			margin-left: 20px;
+		}
+	}
+}

data/application/css/font.css.scss

@@ -1,6 +1,6 @@
 @font-face {
     font-family: 'FontAwesome';
-    src:  url('/@spontaneous/static/font/fontawesome-webfont-5c5c21100a346972a82c34c5e96ffcfe.ttf') format('truetype');
+    src:  url('/@spontaneous/static/font/fontawesome-webfont-1c66a4738b40ef0f6b1abca0ba9a796d.ttf') format('truetype');
     font-weight: normal;
     font-style: normal;
 }

data/application/css/popover.css.scss

@@ -224,6 +224,8 @@
 
 			background-color: #fff;
 			padding: $unit 0;
+			max-height: 350px;
+			overflow: auto;
 
 			$deeper-width: 80px;
 

data/application/css/top.css.scss

@@ -0,0 +1,231 @@
+@import "definitions.css.scss";
+
+$navigation-color: #555;
+
+#top {
+	@extend .container-padding;
+	@extend .controls-gradient;
+	@extend .clearfix;
+	@include display-box;
+	@include box-align(center);
+	position: fixed;
+	height: 31px;
+	top: 0;
+	right: 0;
+	left: 0;
+	#navigation {
+		@include box-flex;
+		font-size: 11px;
+		font-weight: bold;
+		color: #999999;
+		width: 100%;
+		li {
+      @include no-select;
+			padding-left: 10px;
+			padding-right: 15px;
+			background: url("/@spontaneous/static/location-arrow-c1c1d3ca472481c61a0a5f8cb289d743.png") right 0 no-repeat;
+			float: left;
+			display: block;
+			font-weight: bold;
+			cursor: pointer;
+			position: relative;
+			padding-right: 30px;
+
+			select {
+				@include box-sizing;
+				@include interface;
+				text-transform: none;
+				font-size: 11px;
+        line-height: 13px;
+				-webkit-appearance: none;
+				cursor: pointer;
+				display: block;
+				background: none;
+				// background: url("/@spontaneous/static/select-arrow-83cb131e0a646a7956141b7791351b97") 95% 50% no-repeat;
+				border: none;
+				outline: none;
+				position: relative;
+				padding-top: 0px;
+				padding-right: 25px;
+				height: 31px;
+				color: #ccc;
+				font-weight: bold;
+				width: 100%;
+			}
+			.unselected {
+				color: #888;
+				font-weight: normal;
+				font-style: italic;
+				max-width: 90px;
+				optgroup, optgroup option {
+					font-style: normal !important;
+				}
+			}
+			a {
+				@include box-sizing;
+				cursor: pointer;
+				// color: #888888;
+				color: #ddd;
+				height: 31px;
+				padding-top: 8px;
+				display: block;
+				max-width: 200px;
+				white-space: nowrap;
+				overflow: hidden;
+				}
+			a:hover, select:hover {
+				color: white;
+			}
+		}
+		li:before {
+			@include awesome-icon("\f0dc");
+			position: absolute;
+			right: 10px;
+			top: 50%;
+			margin-top: -6px;
+			font-size: 118.2%;
+			color: $navigation-color;
+		}
+		li:hover:before {
+			color: #fff;
+		}
+		li.disabled:hover:before {
+			color: $navigation-color;
+		}
+		li.root {
+			min-width: 100px;
+		}
+		li.singular:before {
+			display: none;
+			content: "";
+		}
+	}
+  #spontaneous-root {
+    background-image: url("/@spontaneous/static/spontaneous-states-e91ec89db525c62da0105b97cdd781ce.png"), url("/@spontaneous/static/location-arrow-c1c1d3ca472481c61a0a5f8cb289d743.png");
+    background-position: 0 5px, right 0;
+    background-repeat: no-repeat;
+    padding-right: 12px;
+    cursor: pointer;
+    height: 31px;
+
+    span {
+      padding-right: 28px;
+    }
+    &:hover {
+      background-position: 0 -83px, right 0;
+
+    }
+
+    &.active {
+      background-position: 0 -39px, right 0;
+    }
+  }
+  #service-outer {
+		@include box-flex;
+  }
+  #cms-navigation-view {
+    @include display-box;
+    @include box-align(center);
+  }
+  #service-navigation {
+    @include display-box;
+    @include box-align(center);
+    h2 {
+      @include box-flex;
+      @include interface;
+      text-transform: none;
+      font-size: 11px;
+      padding-left: $unit;
+      color: #fff;
+      font-weight: bold;
+    }
+    a {
+      display: block;
+      width: 64px;
+    }
+  }
+	#switch-mode, #open-publish {
+		@include button;
+		@include display-box;
+		@include box-orient(vertical);
+		@include box-align(center);
+		margin: 0;
+		width: 70px;
+	}
+	#open-publish {
+		position: relative;
+		margin-right: $unit;
+		#publish-progress {
+			position: absolute;
+			left: 4px;
+			top: 1px;
+		}
+		&.disabled {
+		}
+	}
+	#open-publish.progress {
+		padding-left: 20px;
+		padding-right: 20px;
+		width: 124px;
+		@include button-color(#666666);
+		color: #999999;
+	}
+}
+
+
+#navigation-page-browser {
+	@include interface;
+	@include box-sizing;
+
+	.search {
+		@include rounded-top();
+		background-color: #666;
+		padding: 2px;
+		input {
+			display: block;
+			margin: 0;
+			width: 100%;
+		}
+	}
+	.frame {
+		max-height: 508px;
+		overflow: auto;
+	}
+	.pages {
+		@include rounded-bottom();
+		background-color: #fff;
+		color: #333;
+		font-size: 110.0%;
+		padding: 4px 0;
+
+		h4, .page {
+			padding: 2px 4px;
+		}
+		h4 {
+			border-bottom: solid 1px #999;
+			color: #666;
+		}
+		h3 {
+			padding: 4px;
+			text-transform: none;
+			color: #666;
+		}
+		.page {
+			padding-top: 3px;
+			padding-bottom: 3px;
+			cursor: pointer;
+			text-transform: none;
+			border-bottom: dotted 1px #eee;
+		}
+		.page:hover {
+			color: $action;
+		}
+		.box {
+			margin-top: 8px;
+		}
+		.box:first-child {
+			margin-top: 0px;
+		}
+	}
+
+}

data/application/js/add_alias_dialogue.js

@@ -60,7 +60,7 @@ Spontaneous.AddAliasDialogue = (function($, S) {
 					}
 
 					self.spinner.start();
-					Spontaneous.Ajax.get(['/targets', self.type.schema_id, self.box().id()].join('/'), params, self.targets_loaded.bind(self));
+					Spontaneous.Ajax.get(['/alias', self.type.schema_id, self.box().id()].join('/'), params, self.targets_loaded.bind(self));
 				}
 				, input = dom.input({"type":"search", "placeholder":"Search..."}).keydown(function(event) {
 					if (event.keyCode === 13) {

data/application/js/add_home_dialogue.js

@@ -23,7 +23,7 @@ Spontaneous.AddHomeDialogue = (function($, S) {
 		},
 		create_home: function() {
 			if (this.type) {
-				S.Ajax.post('/root', {'type':this.type.schema_id}, this.home_created.bind(this));
+				S.Ajax.post('/site/home', {'type':this.type.schema_id}, this.home_created.bind(this));
 			}
 		},
 		home_created: function(data) {

data/application/js/ajax.js

@@ -1,44 +1,72 @@
 // console.log("Loading Ajax...");
 
 Spontaneous.Ajax = (function($, S) {
+	"use strict";
+
 	$.ajaxSetup({
 		'async': true,
 		'cache': false,
 		'dataType': 'json',
-		'ifModified': true
+		'ifModified': false
 	});
+
+	var csrfToken = S.csrf_token;
+	var requestCache = {};
+
+	var __authenticate = function(request) {
+		request.setRequestHeader(S.csrf_header, csrfToken);
+	};
 	// wraps jQuery.ajax with a auth aware error catcher
 	var __request = function(params) {
-		var requestErrorHandler = params["error"]
-		, errorHandler = function(xhr, textStatus, error_thrown) {
-			console.log('caught http error', xhr, textStatus, error_thrown)
+		// console.log("AJAX", params)
+		var requestSuccessHandler = params["success"];
+		var successHandler = function(data, textStatus, xhr) {
+			if (textStatus === "success") {
+				if (params.ifModified) {
+					requestCache[params.url] = data;
+				}
+			} else if (!data && (textStatus === "notmodified")) {
+				data = requestCache[params.url];
+			}
+			requestSuccessHandler(data, textStatus, xhr)
+		};
+		var requestErrorHandler = params["error"];
+		var errorHandler = function(xhr, textStatus, error_thrown) {
 			if (xhr.status === 401) {
 				S.Ajax.unauthorized();
 			} else if (requestErrorHandler) {
 				requestErrorHandler(xhr, textStatus, error_thrown);
 			}
 		};
-		params["error"] = errorHandler;
+		params['error'] = errorHandler;
+		params['success'] = successHandler;
+		params['beforeSend'] = function (request) {
+			__authenticate(request);
+		};
 		$.ajax(params);
 	};
 	return {
 		namespace: "/@spontaneous",
-
-		get: function(url, data, callback) {
+		// returns a modified xmlhttprequest that adds csrf headers
+		// after #open is called.
+		authenticatedRequest: function(request) {
+			var xhr = new XMLHttpRequest();
+			xhr.__open = xhr.open;
+			xhr.open = function() {
+				this.__open.apply(this, arguments);
+				__authenticate(this);
+			};
+			return xhr;
+		},
+		authenticateRequest: function(request) {
+			__authenticate(request);
+		},
+		get: function(url, data, callback, options) {
 			if (typeof data === "function") {
 				callback = data;
 				data = {};
 			}
-			var handle_response = function(data, textStatus, xhr) {
-				callback(data, textStatus, xhr);
-			};
-			__request({
-				'url': this.request_url(url),
-				'success': handle_response,
-				'ifModified': true,
-				'data': $.extend(data, this.api_access_key()),
-				'error': handle_response // pass the error to the handler too
-			});
+			this.makeRequest("GET", url, data, callback, options)
 		},
 		put: function(url, data, callback) {
 			this.makeRequest("PUT", url, data, callback);
@@ -49,33 +77,35 @@ Spontaneous.Ajax = (function($, S) {
 		post: function(url, data, callback) {
 			this.makeRequest("POST", url, data, callback);
 		},
-		makeRequest: function(method, url, data, callback) {
-			var success = function(data, textStatus, XMLHttpRequest) {
+		patch: function(url, data, callback) {
+			this.makeRequest("PATCH", url, data, callback);
+		},
+		makeRequest: function(method, url, data, callback, options) {
+			var success = function(data, textStatus, xhr) {
 				if (typeof callback === "function") {
-					callback(data, textStatus, XMLHttpRequest);
+					callback(data, textStatus, xhr);
 				}
 			};
-			var error = function(XMLHttpRequest, textStatus, error_thrown) {
+			var error = function(xhr, textStatus, error_thrown) {
 				var result = false;
 				try {
-					result = $.parseJSON(XMLHttpRequest.responseText);
+					result = $.parseJSON(xhr.responseText);
 				} catch (e) { }
 				if (typeof callback === "function") {
-					callback(result, textStatus, XMLHttpRequest);
+					callback(result, textStatus, xhr);
 				}
 			};
 			data = data || {};
-			data = $.extend(data, this.api_access_key());
-			__request({
-				'url': this.request_url(url, true),
+			var ajaxOptions = $.extend({}, options, {
+				'url': this.request_url(url),
 				'type': method,
 				'data': data,
 				'success': success,
 				'error': error
 			});
+			__request(ajaxOptions);
 		},
 		unauthorized: function() {
-			console.log("UNAUTH!")
 			window.location.href = "/";
 		},
 		test_field_versions: function(target, fields, success, failure) {
@@ -89,7 +119,7 @@ Spontaneous.Ajax = (function($, S) {
 			}
 			if (modified === 0) { success(); }
 
-			this.post(['/version', target.id()].join('/'), version_data, function(data, textStatus, xhr) {
+			this.post(['/field/conflicts', target.id()].join('/'), version_data, function(data, textStatus, xhr) {
 				if (textStatus === 'success') {
 					success();
 				} else {
@@ -119,13 +149,13 @@ Spontaneous.Ajax = (function($, S) {
 				}
 			});
 		},
-		api_access_key: function() {
-			return {'__key':Spontaneous.Auth.Key.load(S.site_id)}
+		csrf_token: function() {
+			return {'__token':csrfToken }
 		},
 		request_url: function(url, needs_key) {
 			var path = this.namespace + url;
 			if (needs_key) {
-				path += "?"+$.param(this.api_access_key())
+				path += "?"+$.param(this.csrf_token())
 			}
 			return path
 		}

data/application/js/box.js

@@ -81,7 +81,7 @@ Spontaneous.Box = (function($, S) {
 		},
 
 		add_entry: function(type, position) {
-			Spontaneous.Ajax.post(['/add', this.id(), type.schema_id].join('/'), {position: position}, this.entry_added.bind(this));
+			Spontaneous.Ajax.post(['/content', this.id(), type.schema_id].join('/'), {position: position}, this.entry_added.bind(this));
 		},
 
 		add_alias: function(alias_target_id, type, position) {
@@ -121,9 +121,9 @@ Spontaneous.Box = (function($, S) {
 			this.trigger('entry_removed', entry);
 		},
 
-		save_path: function() {
-			return ['/savebox', this.id()].join('/');
-		},
+		// save_path: function() {
+		// 	return [this.id()].join('/');
+		// },
 		entry_wrappers: function() {
 			return this._entry_container.find('> .'+this.entry_class())
 		}

data/application/js/conflicted_field_dialogue.js

@@ -37,7 +37,7 @@ Spontaneous.ConflictedFieldDialogue = (function($, S) {
 		},
 		create_home: function() {
 			if (this.type) {
-				S.Ajax.post('/root', {'type':this.type.schema_id}, this.home_created.bind(this));
+				S.Ajax.post('/site/home', {'type':this.type.schema_id}, this.home_created.bind(this));
 			}
 		},
 		home_created: function(data) {

data/application/js/content.js

@@ -121,11 +121,11 @@ Spontaneous.Content = (function($, S) {
 		save_field: function(field) {
 			var params = { field: {} };
 			params.field[field.name] = {value: field.value()};
-			Spontaneous.Ajax.post(this.save_path(), params, this.save_complete.bind(this));
+			Spontaneous.Ajax.put(this.save_path(), params, this.save_complete.bind(this));
 		},
 
 		save_path: function() {
-			return ['/save', this.content.id].join('/');
+			return ['/content', this.content.id].join('/');
 		},
 
 		save_complete: function(response) {
@@ -197,10 +197,10 @@ Spontaneous.Content = (function($, S) {
 		},
 
 		destroy: function() {
-			Spontaneous.Ajax.post(['/destroy', this.content.id].join('/'), {}, this.destroyed.bind(this));
+			Spontaneous.Ajax.del(['/content', this.content.id].join('/'), {}, this.destroyed.bind(this));
 		},
 		toggle_visibility: function() {
-			Spontaneous.Ajax.post(['/toggle', this.content.id].join('/'), {}, this.visibility_toggled.bind(this));
+			Spontaneous.Ajax.patch(['/content', this.content.id, "toggle"].join('/'), {}, this.visibility_toggled.bind(this));
 		},
 		visibility_toggled: function(result) {
 			this.set('hidden', result.hidden);
@@ -212,7 +212,7 @@ Spontaneous.Content = (function($, S) {
 			page.trigger('removed_entry', this);
 		},
 		reposition: function(position) {
-			Spontaneous.Ajax.post(['/content', this.content.id, 'position', position].join('/'), {}, function() {
+			Spontaneous.Ajax.patch(['/content', this.content.id, 'position', position].join('/'), {}, function() {
 				this.repositioned();
 			}.bind(this));
 		},

data/application/js/dom.js

@@ -48,6 +48,11 @@ Spontaneous.Dom = (function($, S) {
 				result['class'] = classes.join(' ')
 			}
 			return result;
+		},
+		radio: function(selector, params) {
+			var input = this.input(selector, params);
+			input.attr('type', 'radio');
+			return input;
 		}
 	};
 	var generate = function(tag_name) {

data/application/js/edit_panel.js

@@ -244,6 +244,7 @@ Spontaneous.EditPanel = (function($, S) {
 			}
 		},
 		field_edit: function(field) {
+			field.editor = this;
 			var d = dom.div('.field');
 			// console.log("field_edit", field.type)
 			d.addClass(field.type.type.toLowerCase().split(".").splice(1).join("-"));

data/application/js/editing.js

@@ -18,7 +18,7 @@ Spontaneous.Editing = (function($, S) {
 		goto_page: function(page) {
 			if (!page) { return; }
 			this.container.show().fadeOut(0)
-			S.Ajax.get('/page/{id}'.replace('{id}', page.id), this.page_loaded.bind(this));
+			S.Ajax.get(["/page", page.id].join("/"), this.page_loaded.bind(this));
 			this.set('location', page);
 		},
 		page_loaded: function(page_data) {

data/application/js/extensions.js

@@ -48,6 +48,14 @@ function $A(iterable) {
 			};
 		};
 	}
+	if (!(typeof Function.prototype.delay === 'function')) {
+		Function.prototype.delay = function(delay) {
+			var __function__ = this;
+			return function() {
+				window.setTimeout(__function__, delay)
+			};
+		};
+	}
 	$.extend(Function.prototype, {
 		cache: function(name) {
 			var __method = this, id = name || ('__cached__'+(++function_id)), _undefined_;