');
- if (!settings.editor) {$progress.find('.fileupload-loading').css({"top": "56px"}); }
- });
- $dropzone.trigger("uploadsuccess", [result]);
- $img.one('load', function () {
- animateDropzone($img);
- }).attr('src', result);
- }
- preLoadImage();
- },
-
- bindFileUpload: function () {
- var self = this;
-
- $dropzone.find('.js-fileupload').fileupload().fileupload("option", {
- url: Ghost.paths.subdir + '/ghost/upload/',
- headers: {
- 'X-CSRF-Token': $("meta[name='csrf-param']").attr('content')
- },
- add: function (e, data) {
- /*jshint unused:false*/
- $('.js-button-accept').prop('disabled', true);
- $dropzone.find('.js-fileupload').removeClass('right');
- $dropzone.find('.js-url').remove();
- $progress.find('.js-upload-progress-bar').removeClass('fail');
- $dropzone.trigger('uploadstart', [$dropzone.attr('id')]);
- $dropzone.find('span.media, div.description, a.image-url, a.image-webcam')
- .animate({opacity: 0}, 250, function () {
- $dropzone.find('div.description').hide().css({"opacity": 100});
- if (settings.progressbar) {
- $dropzone.find('div.js-fail').after($progress);
- $progress.animate({opacity: 100}, 250);
- }
- data.submit();
- });
- },
- dropZone: settings.fileStorage ? $dropzone : null,
- progressall: function (e, data) {
- /*jshint unused:false*/
- var progress = parseInt(data.loaded / data.total * 100, 10);
- if (!settings.editor) {$progress.find('div.js-progress').css({"position": "absolute", "top": "40px"}); }
- if (settings.progressbar) {
- $dropzone.trigger("uploadprogress", [progress, data]);
- $progress.find('.js-upload-progress-bar').css('width', progress + '%');
- }
- },
- fail: function (e, data) {
- /*jshint unused:false*/
- $('.js-button-accept').prop('disabled', false);
- $dropzone.trigger("uploadfailure", [data.result]);
- $dropzone.find('.js-upload-progress-bar').addClass('fail');
- if (data.jqXHR.status === 413) {
- $dropzone.find('div.js-fail').text("The image you uploaded was larger than the maximum file size your server allows.");
- } else if (data.jqXHR.status === 415) {
- $dropzone.find('div.js-fail').text("The image type you uploaded is not supported. Please use .PNG, .JPG, .GIF, .SVG.");
- } else {
- $dropzone.find('div.js-fail').text("Something went wrong :(");
- }
- $dropzone.find('div.js-fail, button.js-fail').fadeIn(1500);
- $dropzone.find('button.js-fail').on('click', function () {
- $dropzone.css({minHeight: 0});
- $dropzone.find('div.description').show();
- self.removeExtras();
- self.init();
- });
- },
- done: function (e, data) {
- /*jshint unused:false*/
- self.complete(data.result);
- }
- });
- },
-
- buildExtras: function () {
- if (!$dropzone.find('span.media')[0]) {
- $dropzone.prepend('-
- {{#each availableApps}}
-
- - {{#if package}}{{package.name}} - {{package.version}}{{else}}{{name}} - package.json missing :({{/if}} - - - {{/each}} -
{{{title}}}
- - diff --git a/core/clientold/tpl/login.hbs b/core/clientold/tpl/login.hbs deleted file mode 100644 index 3293741ea4..0000000000 --- a/core/clientold/tpl/login.hbs +++ /dev/null @@ -1,12 +0,0 @@ - diff --git a/core/clientold/tpl/modal.hbs b/core/clientold/tpl/modal.hbs deleted file mode 100644 index 7aefeb59fb..0000000000 --- a/core/clientold/tpl/modal.hbs +++ /dev/null @@ -1,14 +0,0 @@ -
-
\ No newline at end of file
diff --git a/core/clientold/tpl/modals/markdown.hbs b/core/clientold/tpl/modals/markdown.hbs
deleted file mode 100644
index 1d6383ea14..0000000000
--- a/core/clientold/tpl/modals/markdown.hbs
+++ /dev/null
@@ -1,69 +0,0 @@
-| Result | -Markdown | -Shortcut | -
|---|---|---|
| Bold | -**text** | -Ctrl / Cmd + B | -
| Emphasize | -*text* | -Ctrl / Cmd + I | -
| Strike-through | -~~text~~ | -Ctrl + Alt + U | -
| Link | -[title](http://) | -Ctrl + Shift + L | -
| Image | - | -Ctrl + Shift + I | -
| List | -* item | -Ctrl + L | -
| Blockquote | -> quote | -Ctrl + Q | -
| H1 | -# Heading | -Ctrl + Alt + 1 | -
| H2 | -## Heading | -Ctrl + Alt + 2 | -
| H3 | -### Heading | -Ctrl + Alt + 3 | -
Inline Code |
- `code` | -Cmd + K / Ctrl + Shift + K | -
{{{title}}}
{{{html}}}
-
-{{/unless}}
diff --git a/core/clientold/tpl/reset.hbs b/core/clientold/tpl/reset.hbs
deleted file mode 100644
index 242426b4c6..0000000000
--- a/core/clientold/tpl/reset.hbs
+++ /dev/null
@@ -1,9 +0,0 @@
-
diff --git a/core/clientold/tpl/settings/apps.hbs b/core/clientold/tpl/settings/apps.hbs
deleted file mode 100644
index e584081688..0000000000
--- a/core/clientold/tpl/settings/apps.hbs
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- You Haven't Written Any Posts Yet!
- -Apps
-General
-Settings
-Your Profile
-' + errorItem.message; - }); - } else { - message = request.responseJSON.error || "Unknown Error"; - } - } catch (e) { - msgDetail = request.status ? request.status + " - " + request.statusText : "Server was not available"; - message = "The server returned an error (" + msgDetail + ")."; - } - } - - return message; - }, - - // Getting URL vars - getUrlVariables: function () { - var vars = [], - hash, - hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&'), - i; - - for (i = 0; i < hashes.length; i += 1) { - hash = hashes[i].split('='); - vars.push(hash[0]); - vars[hash[0]] = hash[1]; - } - return vars; - } - }; - - /** - * This is the view to generate the markup for the individual - * notification. Will be included into #notifications. - * - * States can be - * - persistent - * - passive - * - * Types can be - * - error - * - success - * - alert - * - (empty) - * - */ - Ghost.Views.Notification = Ghost.View.extend({ - templateName: 'notification', - className: 'js-bb-notification', - template: function (data) { - return JST[this.templateName](data); - }, - render: function () { - var html = this.template(this.model); - this.$el.html(html); - return this; - } - }); - - /** - * This handles Notification groups - */ - Ghost.Views.NotificationCollection = Ghost.View.extend({ - el: '#notifications', - initialize: function () { - var self = this; - this.render(); - Ghost.on('urlchange', function () { - self.clearEverything(); - }); - shortcut.add("ESC", function () { - // Make sure there isn't currently an open modal, as the escape key should close that first. - // This is a temporary solution to enable closing extra-long notifications, and should be refactored - // into something more robust in future - if ($('.js-modal').length < 1) { - self.clearEverything(); - } - }); - }, - events: { - 'animationend .js-notification': 'removeItem', - 'webkitAnimationEnd .js-notification': 'removeItem', - 'oanimationend .js-notification': 'removeItem', - 'MSAnimationEnd .js-notification': 'removeItem', - 'click .js-notification.notification-passive .close': 'closePassive', - 'click .js-notification.notification-persistent .close': 'closePersistent' - }, - render: function () { - _.each(this.model, function (item) { - this.renderItem(item); - }, this); - }, - renderItem: function (item) { - var itemView = new Ghost.Views.Notification({ model: item }), - height, - $notification = $(itemView.render().el); - - this.$el.append($notification); - height = $notification.hide().outerHeight(true); - $notification.animate({height: height}, 250, function () { - $(this) - .css({height: "auto"}) - .fadeIn(250); - }); - }, - addItem: function (item) { - this.model.push(item); - this.renderItem(item); - }, - clearEverything: function () { - this.$el.find('.js-notification.notification-passive').parent().remove(); - }, - removeItem: function (e) { - e.preventDefault(); - var self = e.currentTarget, - bbSelf = this; - if (self.className.indexOf('notification-persistent') !== -1) { - $.ajax({ - type: "DELETE", - headers: { - 'X-CSRF-Token': $("meta[name='csrf-param']").attr('content') - }, - url: Ghost.paths.apiRoot + '/notifications/' + $(self).find('.close').data('id') - }).done(function (result) { - /*jshint unused:false*/ - bbSelf.$el.slideUp(250, function () { - $(this).show().css({height: "auto"}); - $(self).remove(); - }); - }); - } else { - $(self).slideUp(250, function () { - $(this) - .show() - .css({height: "auto"}) - .parent() - .remove(); - }); - } - }, - closePassive: function (e) { - $(e.currentTarget) - .parent() - .fadeOut(250) - .slideUp(250, function () { - $(this).remove(); - }); - }, - closePersistent: function (e) { - var self = e.currentTarget, - bbSelf = this; - $.ajax({ - type: "DELETE", - headers: { - 'X-CSRF-Token': $("meta[name='csrf-param']").attr('content') - }, - url: Ghost.paths.apiRoot + '/notifications/' + $(self).data('id') - }).done(function (result) { - /*jshint unused:false*/ - var height = bbSelf.$('.js-notification').outerHeight(true), - $parent = $(self).parent(); - bbSelf.$el.css({height: height}); - - if ($parent.parent().hasClass('js-bb-notification')) { - $parent.parent().fadeOut(200, function () { - $(this).remove(); - bbSelf.$el.slideUp(250, function () { - $(this).show().css({height: "auto"}); - }); - }); - } else { - $parent.fadeOut(200, function () { - $(this).remove(); - bbSelf.$el.slideUp(250, function () { - $(this).show().css({height: "auto"}); - }); - }); - } - }); - } - }); - - // ## Modals - Ghost.Views.Modal = Ghost.View.extend({ - el: '#modal-container', - templateName: 'modal', - className: 'js-bb-modal', - // Render and manages modal dismissal - initialize: function () { - this.render(); - var self = this; - if (this.model.options.close) { - shortcut.add("ESC", function () { - self.removeElement(); - }); - $(document).on('click', '.modal-background', function () { - self.removeElement(); - }); - } else { - shortcut.remove("ESC"); - $(document).off('click', '.modal-background'); - } - - if (this.model.options.confirm) { - // Initiate functions for buttons here so models don't get tied up. - this.acceptModal = function () { - this.model.options.confirm.accept.func.call(this); - self.removeElement(); - }; - this.rejectModal = function () { - this.model.options.confirm.reject.func.call(this); - self.removeElement(); - }; - } - }, - templateData: function () { - return this.model; - }, - events: { - 'click .close': 'removeElement', - 'click .js-button-accept': 'acceptModal', - 'click .js-button-reject': 'rejectModal' - }, - afterRender: function () { - this.$el.fadeIn(50); - $(".modal-background").show(10, function () { - $(this).addClass("in"); - }); - if (this.model.options.confirm) { - this.$('.close').remove(); - } - this.$(".modal-body").html(this.addSubview(new Ghost.Views.Modal.ContentView({model: this.model})).render().el); - -// if (document.body.style.webkitFilter !== undefined) { // Detect webkit filters -// $("body").addClass("blur"); // Removed due to poor performance in Chrome -// } - - if (_.isFunction(this.model.options.afterRender)) { - this.model.options.afterRender.call(this); - } - if (this.model.options.animation) { - this.animate(this.$el.children(".js-modal")); - } - }, - // #### remove - // Removes Backbone attachments from modals - remove: function () { - this.undelegateEvents(); - this.$el.empty(); - this.stopListening(); - return this; - }, - // #### removeElement - // Visually removes the modal from the user interface - removeElement: function (e) { - if (e) { - e.preventDefault(); - e.stopPropagation(); - } - - var self = this, - $jsModal = $('.js-modal'), - removeModalDelay = $jsModal.transitionDuration(), - removeBackgroundDelay = self.$el.transitionDuration(); - - $jsModal.removeClass('in'); - - if (!this.model.options.animation) { - removeModalDelay = removeBackgroundDelay = 0; - } - - setTimeout(function () { - - if (document.body.style.filter !== undefined) { - $("body").removeClass("blur"); - } - $(".modal-background").removeClass('in'); - - setTimeout(function () { - self.remove(); - self.$el.hide(); - $(".modal-background").hide(); - }, removeBackgroundDelay); - }, removeModalDelay); - - }, - // #### animate - // Animates the animation - animate: function (target) { - setTimeout(function () { - target.addClass('in'); - }, target.transitionDuration()); - } - }); - - // ## Modal Content - Ghost.Views.Modal.ContentView = Ghost.View.extend({ - - template: function (data) { - return JST['modals/' + this.model.content.template](data); - }, - templateData: function () { - return this.model; - } - - }); -}()); diff --git a/core/clientold/views/blog.js b/core/clientold/views/blog.js deleted file mode 100644 index a3d62a6935..0000000000 --- a/core/clientold/views/blog.js +++ /dev/null @@ -1,284 +0,0 @@ -/*global window, Ghost, $, _, Backbone, NProgress */ -(function () { - "use strict"; - - var ContentList, - ContentItem, - PreviewContainer; - - // Base view - // ---------- - Ghost.Views.Blog = Ghost.View.extend({ - initialize: function (options) { - /*jshint unused:false*/ - var self = this, - finishProgress = function () { - NProgress.done(); - }; - - // Basic collection request/sync flow progress bar handlers - this.listenTo(this.collection, 'request', function () { - NProgress.start(); - }); - this.listenTo(this.collection, 'sync', finishProgress); - - // A special case because models that are destroyed are removed from the - // collection before the sync event fires and bubbles up - this.listenTo(this.collection, 'destroy', function (model) { - self.listenToOnce(model, 'sync', finishProgress); - }); - - this.addSubview(new PreviewContainer({ el: '.js-content-preview', collection: this.collection })).render(); - this.addSubview(new ContentList({ el: '.js-content-list', collection: this.collection })).render(); - } - }); - - - // Content list (sidebar) - // ----------------------- - ContentList = Ghost.View.extend({ - - isLoading: false, - - events: { - 'click .content-list-content' : 'scrollHandler' - }, - - initialize: function () { - this.$('.content-list-content').scrollClass({target: '.content-list', offset: 10}); - this.listenTo(this.collection, 'remove', this.showNext); - this.listenTo(this.collection, 'add', this.renderPost); - // Can't use backbone event bind (see: http://stackoverflow.com/questions/13480843/backbone-scroll-event-not-firing) - this.$('.content-list-content').scroll($.proxy(this.checkScroll, this)); - }, - - showNext: function () { - if (this.isLoading) { return; } - - if (!this.collection.length) { - return Backbone.trigger('blog:activeItem', null); - } - - var id = this.collection.at(0) ? this.collection.at(0).id : false; - if (id) { - Backbone.trigger('blog:activeItem', id); - } - }, - - reportLoadError: function (response) { - var message = 'A problem was encountered while loading more posts'; - - if (response) { - // Get message from response - message += '; ' + Ghost.Views.Utils.getRequestErrorMessage(response); - } else { - message += '.'; - } - - Ghost.notifications.addItem({ - type: 'error', - message: message, - status: 'passive' - }); - }, - - checkScroll: function (event) { - var self = this, - element = event.target, - triggerPoint = 100; - - // If we haven't passed our threshold, exit - if (this.isLoading || (element.scrollTop + element.clientHeight + triggerPoint <= element.scrollHeight)) { - return; - } - - // If we've loaded the max number of pages, exit - if (this.collection.currentPage >= this.collection.totalPages) { - return; - } - - // Load moar posts! - this.isLoading = true; - this.collection.fetch({ - update: true, - remove: false, - data: { - status: 'all', - page: (self.collection.currentPage + 1), - staticPages: 'all' - } - }).then(function onSuccess(response) { - /*jshint unused:false*/ - self.render(); - self.isLoading = false; - }, function onError(e) { - self.reportLoadError(e); - }); - }, - - renderPost: function (model) { - this.$('ol').append(this.addSubview(new ContentItem({model: model})).render().el); - }, - - render: function () { - var $list = this.$('ol'); - - // Clear out any pre-existing subviews. - this.removeSubviews(); - - this.collection.each(function (model) { - $list.append(this.addSubview(new ContentItem({model: model})).render().el); - }, this); - this.showNext(); - } - - }); - - // Content Item - // ----------------------- - ContentItem = Ghost.View.extend({ - - tagName: 'li', - - events: { - 'click a': 'setActiveItem' - }, - - active: false, - - initialize: function () { - this.listenTo(Backbone, 'blog:activeItem', this.checkActive); - this.listenTo(this.model, 'change:page change:featured', this.render); - this.listenTo(this.model, 'destroy', this.removeItem); - }, - - removeItem: function () { - var self = this; - $.when(this.$el.slideUp()).then(function () { - self.remove(); - }); - }, - - // If the current item isn't active, we trigger the event to - // notify a change in which item we're viewing. - setActiveItem: function (e) { - e.preventDefault(); - if (this.active !== true) { - Backbone.trigger('blog:activeItem', this.model.id); - this.render(); - } - }, - - // Checks whether this item is active and doesn't match the current id. - checkActive: function (id) { - if (this.model.id !== id) { - if (this.active) { - this.active = false; - this.$el.removeClass('active'); - this.render(); - } - } else { - this.active = true; - this.$el.addClass('active'); - } - }, - - showPreview: function (e) { - var item = $(e.currentTarget); - this.$('.content-list-content li').removeClass('active'); - item.addClass('active'); - Backbone.trigger('blog:activeItem', item.data('id')); - }, - - templateName: "list-item", - - templateData: function () { - return _.extend({active: this.active}, this.model.toJSON()); - } - }); - - // Content preview - // ---------------- - PreviewContainer = Ghost.View.extend({ - - activeId: null, - - events: { - 'click .post-controls .post-edit' : 'editPost', - 'click .featured' : 'toggleFeatured', - 'click .unfeatured' : 'toggleFeatured' - }, - - initialize: function () { - this.listenTo(Backbone, 'blog:activeItem', this.setActivePreview); - }, - - setActivePreview: function (id) { - if (this.activeId !== id) { - this.activeId = id; - this.render(); - } - }, - - editPost: function (e) { - e.preventDefault(); - // for now this will disable "open in new tab", but when we have a Router implemented - // it can go back to being a normal link to '#/ghost/editor/X' - window.location = Ghost.paths.subdir + '/ghost/editor/' + this.model.get('id') + '/'; - }, - - toggleFeatured: function (e) { - e.preventDefault(); - var self = this, - featured = !self.model.get('featured'), - featuredEl = $(e.currentTarget), - model = this.collection.get(this.activeId); - - model.save({ - featured: featured - }, { - success : function () { - featuredEl.removeClass("featured unfeatured").addClass(featured ? "featured" : "unfeatured"); - Ghost.notifications.clearEverything(); - Ghost.notifications.addItem({ - type: 'success', - message: "Post successfully marked as " + (featured ? "featured" : "not featured") + ".", - status: 'passive' - }); - }, - error : function (model, xhr) { - /*jshint unused:false*/ - Ghost.notifications.addItem({ - type: 'error', - message: Ghost.Views.Utils.getRequestErrorMessage(xhr), - status: 'passive' - }); - } - }); - }, - - templateName: "preview", - - render: function () { - var self = this; - - this.model = this.collection.get(this.activeId); - this.$el.html(this.template(this.templateData())); - - this.$('.content-preview-content').scrollClass({target: '.content-preview', offset: 10}); - this.$('.wrapper').on('click', 'a', function (e) { - $(e.currentTarget).attr('target', '_blank'); - }); - - if (this.model !== undefined) { - this.model.fetch({ data: { status: 'all', include: 'tags,author' } }).then(function () { - self.addSubview(new Ghost.View.PostSettings({ el: $('.post-controls'), model: self.model })).render(); - }); - } - - Ghost.temporary.initToggles(this.$el); - return this; - } - }); - -}()); diff --git a/core/clientold/views/debug.js b/core/clientold/views/debug.js deleted file mode 100644 index bf4f63fbed..0000000000 --- a/core/clientold/views/debug.js +++ /dev/null @@ -1,189 +0,0 @@ -/*global Ghost, $ */ -(function () { - "use strict"; - - Ghost.Views.Debug = Ghost.View.extend({ - events: { - "click .settings-menu a": "handleMenuClick", - "click #startupload": "handleUploadClick", - "click .js-delete": "handleDeleteClick", - "click #sendtestmail": "handleSendTestMailClick" - }, - - initialize: function () { - var view = this; - - this.uploadButton = this.$el.find('#startupload'); - - // Disable import button and initizalize BlueImp file upload - this.uploadButton.prop('disabled', 'disabled'); - $('#importfile').fileupload({ - url: Ghost.paths.apiRoot + '/db/', - limitMultiFileUploads: 1, - replaceFileInput: false, - headers: { - 'X-CSRF-Token': $("meta[name='csrf-param']").attr('content') - }, - dataType: 'json', - add: function (e, data) { - /*jshint unused:false*/ - - // Bind the upload data to the view, so it is - // available to the click handler, and enable the - // upload button. - view.fileUploadData = data; - data.context = view.uploadButton.removeProp('disabled'); - }, - done: function (e, data) { - /*jshint unused:false*/ - $('#startupload').text('Import'); - if (!data.result) { - throw new Error('No response received from server.'); - } - if (!data.result.message) { - throw new Error('Unknown error'); - } - - Ghost.notifications.addItem({ - type: 'success', - message: data.result.message, - status: 'passive' - }); - }, - error: function (response) { - $('#startupload').text('Import'); - var responseJSON = response.responseJSON, - message = responseJSON && responseJSON.errors[0].message ? responseJSON.errors[0].message : 'unknown'; - Ghost.notifications.addItem({ - type: 'error', - message: ['A problem was encountered while importing new content to your blog. Error: ', message].join(''), - status: 'passive' - }); - } - - }); - - }, - - handleMenuClick: function (ev) { - ev.preventDefault(); - - var $target = $(ev.currentTarget); - - // Hide the current content - this.$(".settings-content").hide(); - - // Show the clicked content - this.$("#debug-" + $target.attr("class")).show(); - - return false; - }, - - handleUploadClick: function (ev) { - ev.preventDefault(); - - if (!this.uploadButton.prop('disabled')) { - this.fileUploadData.context = this.uploadButton.text('Importing'); - this.fileUploadData.submit(); - } - - // Prevent double post by disabling the button. - this.uploadButton.prop('disabled', 'disabled'); - }, - - handleDeleteClick: function (ev) { - ev.preventDefault(); - this.addSubview(new Ghost.Views.Modal({ - model: { - options: { - close: true, - confirm: { - accept: { - func: function () { - $.ajax({ - url: Ghost.paths.apiRoot + '/db/', - type: 'DELETE', - headers: { - 'X-CSRF-Token': $("meta[name='csrf-param']").attr('content') - }, - success: function onSuccess(response) { - if (!response) { - throw new Error('No response received from server.'); - } - if (!response.message) { - throw new Error(response.detail || 'Unknown error'); - } - - Ghost.notifications.addItem({ - type: 'success', - message: response.message, - status: 'passive' - }); - - }, - error: function onError(response) { - var responseText = JSON.parse(response.responseText), - message = responseText && responseText.errors[0].message ? responseText.errors[0].message : 'unknown'; - Ghost.notifications.addItem({ - type: 'error', - message: ['A problem was encountered while deleting content from your blog. Error: ', message].join(''), - status: 'passive' - }); - - } - }); - }, - text: "Delete", - buttonClass: "button-delete" - }, - reject: { - func: function () { - return true; - }, - text: "Cancel", - buttonClass: "button" - } - }, - type: "action", - style: ["wide", "centered"], - animation: 'fade' - }, - content: { - template: 'blank', - title: 'Would you really like to delete all content from your blog?', - text: '
This is permanent! No backups, no restores, no magic undo button.
We warned you, ok?
This is permanent! No backups, no restores, no magic undo button.
We warned you, ok?
Hello!
' + - 'A request has been made to reset the password on the site ' + siteLink + '.
' + - 'Please follow the link below to reset your password:
' + resetLink + '
Ghost
' - }, - options: {} - }] - }; - - return api.mail.send(payload); - }).then(function success() { - // TODO: note that this function takes a response as an - // argument but jshint complains of it not being used - var notification = { - type: 'success', - message: 'Check your email for further instructions', - status: 'passive' - }; - - return api.notifications.add({ notifications: [notification] }).then(function () { - res.json(200, {redirect: config().paths.subdir + '/ghost/signin/'}); - }); - - }, function failure(error) { - // TODO: This is kind of sketchy, depends on magic string error.message from Bookshelf. - if (error && error.message === 'EmptyResponse') { - error.message = "Invalid email address"; - } - - res.json(401, {error: error.message}); - }); - }, - // Route: reset - // Path: /ghost/reset/:token - // Method: GET - 'reset': function (req, res) { - // Validate the request token - var token = req.params.token; - - api.users.validateToken(token).then(function () { - // Render the reset form - res.render('reset', { - bodyClass: 'ghost-reset', - hideNavbar: true, - adminNav: setSelected(adminNavbar, 'reset') - }); - }).otherwise(function (err) { - // Redirect to forgotten if invalid token - var notification = { - type: 'error', - message: 'Invalid or expired token' - }; - - errors.logError(err, 'admin.js', "Please check the provided token for validity and expiration."); - - return api.notifications.add({ notifications: [notification] }).then(function () { - res.redirect(config().paths.subdir + '/ghost/forgotten'); - }); - }); - }, - // TODO: remove when old admin is removed, functionality lives now in api/authentication - // Route: doReset - // Path: /ghost/reset/:token - // Method: POST - 'doReset': function (req, res) { - var token = req.params.token, - newPassword = req.param('newpassword'), - ne2Password = req.param('ne2password'); - - api.users.resetPassword(token, newPassword, ne2Password).then(function () { - var notification = { - type: 'success', - message: 'Password changed successfully.', - status: 'passive' - }; - - return api.notifications.add({ notifications: [notification] }).then(function () { - res.json(200, {redirect: config().paths.subdir + '/ghost/signin/'}); - }); - }).otherwise(function (err) { - res.json(401, {error: err.message}); - }); } }; diff --git a/core/server/helpers/index.js b/core/server/helpers/index.js index 5895adfae9..62e1dfe87b 100644 --- a/core/server/helpers/index.js +++ b/core/server/helpers/index.js @@ -163,21 +163,17 @@ coreHelpers.url = function (options) { // *Usage example:* // `{{asset "css/screen.css"}}` // `{{asset "css/screen.css" ghost="true"}}` -// `{{asset "css/screen.css" ember="true"}}` // Returns the path to the specified asset. The ghost // flag outputs the asset path for the Ghost admin coreHelpers.asset = function (context, options) { var output = '', - isAdmin = options && options.hash && options.hash.ghost, - isEmberAdmin = options && options.hash && options.hash.ember; + isAdmin = options && options.hash && options.hash.ghost; output += config().paths.subdir + '/'; if (!context.match(/^favicon\.ico$/) && !context.match(/^shared/) && !context.match(/^asset/)) { if (isAdmin) { output += 'ghost/'; - } else if (isEmberAdmin) { - output += 'ghost/ember/'; } else { output += 'assets/'; } @@ -350,19 +346,6 @@ coreHelpers.apps = function (context, options) { }; coreHelpers.ghost_script_tags = function () { - var scriptList = isProduction ? scriptFiles.production : scriptFiles.development; - - scriptList = _.map(scriptList, function (fileName) { - return scriptTemplate({ - source: config().paths.subdir + '/ghost/scripts/' + fileName, - version: coreHelpers.assetHash - }); - }); - - return scriptList.join(''); -}; - -coreHelpers.ember_script_tags = function () { var scriptList = scriptFiles.ember; scriptList = _.map(scriptList, function (fileName) { @@ -825,18 +808,12 @@ registerHelpers = function (adminHbs, assetHash) { // Register admin helpers - registerAdminHelper('asset', coreHelpers.asset); - registerAdminHelper('ghost_script_tags', coreHelpers.ghost_script_tags); - registerAdminHelper('ember_script_tags', coreHelpers.ember_script_tags); - - registerAdminHelper('file_storage', coreHelpers.file_storage); - - registerAdminHelper('apps', coreHelpers.apps); - - registerAdminHelper('admin_url', coreHelpers.admin_url); + registerAdminHelper('asset', coreHelpers.asset); + // TODO: Make sure this works #3160 + // we probably don't need this code for it, but it needs to work still registerAsyncAdminHelper('update_notification', coreHelpers.update_notification); }; diff --git a/core/server/index.js b/core/server/index.js index 6a1adbd2d6..43c4a565c8 100644 --- a/core/server/index.js +++ b/core/server/index.js @@ -77,8 +77,7 @@ function builtFilesExist() { var deferreds = [], location = config().paths.builtScriptPath, - fileNames = process.env.NODE_ENV === 'production' ? - helpers.scriptFiles.production : helpers.scriptFiles.development; + fileNames = helpers.scriptFiles.ember; function checkExist(fileName) { var deferred = when.defer(), @@ -256,7 +255,7 @@ function init(server) { server.set('view engine', 'hbs'); // Create a hbs instance for admin and init view engine - server.set('admin view engine', adminHbs.express3({partialsDir: config().paths.adminViews + 'partials'})); + server.set('admin view engine', adminHbs.express3({})); // Load helpers helpers.loadCoreHelpers(adminHbs, assetHash); diff --git a/core/server/middleware/index.js b/core/server/middleware/index.js index 8f646c54a1..4d63460ac4 100644 --- a/core/server/middleware/index.js +++ b/core/server/middleware/index.js @@ -136,28 +136,13 @@ function updateActiveTheme(req, res, next) { }); } -// Redirect to signup if no user exists -// TODO Remove this when -function redirectToSignup(req, res, next) { - /*jslint unparam:true*/ - - api.users.doesUserExist().then(function (exists) { - if (!exists) { - return res.redirect(config().paths.subdir + '/ghost/signup/'); - } - next(); - }).otherwise(function (err) { - return next(new Error(err)); - }); -} - // Redirect to setup if no user exists function redirectToSetup(req, res, next) { /*jslint unparam:true*/ api.users.doesUserExist().then(function (exists) { - if (!exists && !req.path.match(/\/ghost\/ember\/setup\//)) { - return res.redirect(config().paths.subdir + '/ghost/ember/setup/'); + if (!exists && !req.path.match(/\/ghost\/setup\//)) { + return res.redirect(config().paths.subdir + '/ghost/setup/'); } next(); }).otherwise(function (err) { @@ -278,8 +263,7 @@ module.exports = function (server) { expressServer.use(decideContext); // Admin only config - expressServer.use(subdir + '/ghost', middleware.whenEnabled('admin', express['static'](path.join(corePath, '/clientold/assets'), {maxAge: ONE_YEAR_MS}))); - expressServer.use(subdir + '/ghost/ember', middleware.whenEnabled('admin', express['static'](path.join(corePath, '/client/assets'), {maxAge: ONE_YEAR_MS}))); + expressServer.use(subdir + '/ghost', middleware.whenEnabled('admin', express['static'](path.join(corePath, '/client/assets'), {maxAge: ONE_YEAR_MS}))); // Force SSL // NOTE: Importantly this is _after_ the check above for admin-theme static resources, @@ -339,5 +323,4 @@ module.exports = function (server) { // Export middleware functions directly module.exports.middleware = middleware; // Expose middleware functions in this file as well -module.exports.middleware.redirectToSignup = redirectToSignup; module.exports.middleware.redirectToSetup = redirectToSetup; diff --git a/core/server/middleware/middleware.js b/core/server/middleware/middleware.js index ea110192d5..96db709163 100644 --- a/core/server/middleware/middleware.js +++ b/core/server/middleware/middleware.js @@ -37,12 +37,7 @@ var middleware = { // exceptions for signin, signout, signup, forgotten, reset only // api and frontend use different authentication mechanisms atm authenticate: function (req, res, next) { - var noAuthNeeded = [ - '/ghost/signin/', '/ghost/signout/', '/ghost/signup/', - '/ghost/forgotten/', '/ghost/reset/', '/ghost/ember/', - '/ghost/setup/' - ], - path, + var path, subPath; // SubPath is the url path starting after any default subdirectories @@ -80,46 +75,10 @@ var middleware = { } )(req, res, next); } - if (noAuthNeeded.indexOf(subPath) < 0 && subPath.indexOf('/ghost/api/') !== 0) { - return middleware.auth(req, res, next); - } } next(); }, - // ### Auth Middleware - // Authenticate a request by redirecting to login if not logged in. - // We strip /ghost/ out of the redirect parameter for neatness - auth: function (req, res, next) { - if (!req.user) { - var subPath = req.path.substring(config().paths.subdir.length), - reqPath = subPath.replace(/^\/ghost\/?/gi, ''), - redirect = ''; - - if (reqPath !== '') { - redirect = '?r=' + encodeURIComponent(reqPath); - } - - if (subPath.indexOf('/ember') > -1) { - return res.redirect(config().paths.subdir + '/ghost/ember/signin/'); - } - - return res.redirect(config().paths.subdir + '/ghost/signin/' + redirect); - } - next(); - }, - - // ## AuthApi Middleware - // Authenticate a request to the API by responding with a 401 and json error details - authAPI: function (req, res, next) { - if (!req.user) { - res.json(401, { error: 'Please sign in' }); - return; - } - - next(); - }, - // Check if we're logged in, and if so, redirect people back to dashboard // Login and signup forms in particular redirectToDashboard: function (req, res, next) { diff --git a/core/server/routes/admin.js b/core/server/routes/admin.js index a11532be03..63597e8741 100644 --- a/core/server/routes/admin.js +++ b/core/server/routes/admin.js @@ -11,65 +11,38 @@ adminRoutes = function (middleware) { var router = express.Router(), subdir = config().paths.subdir; - // Have ember route look for hits first - // to prevent conflicts with pre-existing routes - router.get('/ghost/ember/*', middleware.redirectToSetup, admin.index); - // ### Admin routes - router.get('/logout/', function redirect(req, res) { + router.get('^/logout/', function redirect(req, res) { /*jslint unparam:true*/ res.set({'Cache-Control': 'public, max-age=' + ONE_YEAR_S}); res.redirect(301, subdir + '/ghost/signout/'); }); - router.get('/signout/', function redirect(req, res) { + router.get('^/signout/', function redirect(req, res) { /*jslint unparam:true*/ res.set({'Cache-Control': 'public, max-age=' + ONE_YEAR_S}); res.redirect(301, subdir + '/ghost/signout/'); }); - router.get('/signin/', function redirect(req, res) { + router.get('^/signin/', function redirect(req, res) { /*jslint unparam:true*/ res.set({'Cache-Control': 'public, max-age=' + ONE_YEAR_S}); res.redirect(301, subdir + '/ghost/signin/'); }); - router.get('/signup/', function redirect(req, res) { + router.get('^/signup/', function redirect(req, res) { /*jslint unparam:true*/ res.set({'Cache-Control': 'public, max-age=' + ONE_YEAR_S}); res.redirect(301, subdir + '/ghost/signup/'); }); router.post('/ghost/setup/', admin.doSignup); - router.get('/ghost/signout/', admin.signout); - router.post('/ghost/signout/', admin.doSignout); - router.get('/ghost/signin/', middleware.redirectToSignup, middleware.redirectToDashboard, admin.signin); - router.post('/ghost/signin/', admin.doSignin); - router.get('/ghost/signup/', middleware.redirectToDashboard, admin.signup); - router.post('/ghost/signup/', admin.doSignup); - router.get('/ghost/forgotten/', middleware.redirectToDashboard, admin.forgotten); - router.post('/ghost/forgotten/', admin.doForgotten); - router.get('/ghost/reset/:token', admin.reset); - router.post('/ghost/reset/:token', admin.doReset); - - router.get('/ghost/editor/:id/:action', admin.editor); - router.get('/ghost/editor/:id/', admin.editor); - router.get('/ghost/editor/', admin.editor); - router.get('/ghost/content/', admin.content); - router.get('/ghost/settings*', admin.settings); - router.get('/ghost/debug/', admin.debug.index); - - router.get('/ghost/export/', admin.debug.exportContent); - router.post('/ghost/upload/', middleware.busboy, admin.upload); // redirect to /ghost and let that do the authentication to prevent redirects to /ghost//admin etc. - router.get(/\/((ghost-admin|admin|wp-admin|dashboard|signin)\/?)$/, function (req, res) { + router.get(/^\/((ghost-admin|admin|wp-admin|dashboard|signin)\/?)$/, function (req, res) { /*jslint unparam:true*/ res.redirect(subdir + '/ghost/'); }); - router.get(/\/ghost$/, function (req, res) { - /*jslint unparam:true*/ - res.redirect(subdir + '/ghost/'); - }); - router.get('/ghost/', admin.indexold); + + router.get('/ghost/*', middleware.redirectToSetup, admin.index); return router; }; diff --git a/core/server/views/content.hbs b/core/server/views/content.hbs deleted file mode 100644 index 2b08442bd3..0000000000 --- a/core/server/views/content.hbs +++ /dev/null @@ -1,17 +0,0 @@ -{{!< default}} -
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/core/server/views/default-ember.hbs b/core/server/views/default-ember.hbs
deleted file mode 100644
index 80be672e9c..0000000000
--- a/core/server/views/default-ember.hbs
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
-
-
-
-
-