Many improvements, post editing almost complete

admin/admin.js

@@ -8,35 +8,48 @@ var route = require('./lib/router');
 var hex = require('./hex');
 var api = require('./api');
 var menu = require('./menu');
+var message = require('./message');
 
 route(/^posts/, function() {
 
     menu.active('posts');
-    post.list('post').done();
+    post.list('post').catch(message.error);
 });
 
 route(/^pages/, function() {
 
     menu.active('pages');
-    post.list('page').done();
+    post.list('page').catch(message.error);
 });
 
 route(/^blocks/, function() {
 
     menu.active('blocks');
-    post.list('block').done();
+    post.list('block').catch(message.error);
 });
 
 route(/^post\/([^\/]+)/, function(id) {
 
     menu.active('posts');
-    post.edit(id).done();
+    post.edit(id).catch(message.error);
+});
+
+route(/^page\/([^\/]+)/, function(id) {
+
+    menu.active('pages');
+    post.edit(id).catch(message.error);
+});
+
+route(/^block\/([^\/]+)/, function(id) {
+
+    menu.active('blocks');
+    post.edit(id).catch(message.error);
 });
 
 route(/^new\/([^\/]+)/, function(type) {
 
     menu.active(type + 's');
-    post.create(type).done();
+    post.create(type).catch(message.error);
 });
 
 route(/^files/, function() {
@@ -48,43 +61,43 @@ route(/^files/, function() {
 route(/^directory\/([^\/]+)/, function(directory) {
 
     menu.active('files');
-    file.directory(hex.string(directory)).done();
+    file.directory(hex.string(directory)).catch(message.error);
 });
 
 route(/^file\/([^\/]+)/, function(filename) {
 
     menu.active('files');
-    file.file(hex.string(filename)).done();
+    file.file(hex.string(filename)).catch(message.error);
 });
 
 route(/^comments\/([^\/]+)/, function(id) {
 
     menu.active('posts');
-    comment.list(id).done();
+    comment.list(id).catch(message.error);
 });
 
 route(/^users/, function() {
 
     menu.active('users');
-    user.list().done();
+    user.list().catch(message.error);
 });
 
 route(/^user\/new/, function() {
 
     menu.active('users');
-    user.create().done();
+    user.create().catch(message.error);
 });
 
 route(/^user\/([^\/]+)/, function(id) {
 
     menu.active('users');
-    user.edit(id).done();
+    user.edit(id).catch(message.error);
 });
 
 route(/^login/, function() {
 
     menu.active();
-    auth.form().done();
+    auth.form().catch(message.error);
 });
 
 route(/.*/, function() {

admin/api.js

@@ -149,6 +149,25 @@ exports.savePost = function(data) {
     });
 };
 
+// Removes the given post.
+
+exports.removePost = function(id) {
+
+    var options = {
+
+        method: 'DELETE',
+
+        url: '/api/entry/' + encodeURIComponent(id),
+
+        headers: { 'X-Key': apiKey() }
+    };
+
+    return xhr(options).then(function(response) {
+
+        return JSON.parse(response);
+    });
+};
+
 exports.directory = function(directory) {
 
     var options = {
@@ -347,4 +366,4 @@ var apiKey = exports.apiKey = function() {
     }
 
     return key;
-}
+};

admin/controller/file.js

@@ -135,7 +135,7 @@ exports.directory = function(directory) {
                         xhr.setRequestHeader('Content-Type', 'application/octet-stream');
 
                         xhr.send(new Uint8Array(reader.result));
-                    }
+                    };
 
                     reader.readAsArrayBuffer(file);
                 }

admin/controller/post.js

@@ -2,13 +2,13 @@ var view = require('../view');
 var api = require('../api');
 var message = require('../message');
 var ko = require('../lib/knockout');
+var route = require('../lib/router');
 var postVm = require('../vm/post_vm');
 
 exports.list = function(type) {
 
-    var type = type || 'post';
-
     var mytype = sessionStorage.getItem('user-type');
+
     var myid = sessionStorage.getItem('user-id');
 
     return api.posts(type).then(function(posts) {
@@ -46,7 +46,7 @@ exports.list = function(type) {
 
                             message.info('The post was removed.');
 
-                            route.go(type + 's');
+                            route.refresh();
 
                         } else {
 

admin/message.js

@@ -5,7 +5,7 @@ exports.info = function(text) {
     var messages = document.getElementById('messages');
     var message = document.createElement('div');
 
-    message.className = 'alert alert-success';
+    message.className = 'alert alert-success message';
     message.innerHTML = text;
 
     messages.appendChild(message);
@@ -21,11 +21,26 @@ exports.info = function(text) {
 
 exports.error = function(err) {
 
+    var button = document.createElement('button');
+
+    button.className = 'close';
+    button.innerHTML = '×';
+
+    var text = document.createElement('span');
+    text.innerHTML = err.toString();
+
     var messages = document.getElementById('messages');
     var message = document.createElement('div');
 
-    message.className = 'alert alert-danger';
-    message.innerHTML = err.toString();
+    message.className = 'alert alert-danger message';
+    message.appendChild(button);
+    message.appendChild(text);
+
+    button.addEventListener('click', function() {
+
+        messages.removeChild(message);
+
+    }, false);
 
     messages.appendChild(message);
 };

admin/validate.js

@@ -3,16 +3,17 @@
 exports.clear = function(form) {
 
     var errors = form.querySelectorAll('.error-message');
+    var error, i;
 
-    for (var i = 0; i < errors.length; i++) {
+    for (i = 0; i < errors.length; i++) {
 
-        var error = errors.item(i);
+        error = errors.item(i);
 
         error.parentNode.classList.remove('has-error');
         error.parentNode.removeChild(error);
     }
 
-    var errors = form.parentNode.querySelectorAll('.alert-danger');
+    errors = form.parentNode.querySelectorAll('.alert-danger');
 
     for (i = 0; i < errors.length; i++) {