Merge pull request #2269 from hswolff/ember-admin

Ember admin

.bowerrc

@@ -0,0 +1,3 @@
+{
+  "directory": "core/shared/vendor"
+}

Gruntfile.js

@@ -54,6 +54,10 @@ var path           = require('path'),
                     files: ['core/clientold/tpl/**/*.hbs'],
                     tasks: ['handlebars']
                 },
+                emberTemplates: {
+                    files: 'core/client/templates/**/*.hbs',
+                    tasks: ['emberTemplates']
+                },
                 sass: {
                     files: ['<%= paths.adminOldAssets %>/sass/**/*'],
                     tasks: ['sass:admin']
@@ -68,6 +72,12 @@ var path           = require('path'),
                     ],
                     tasks: ['concat']
                 },
+                'concat-ember': {
+                    files: [
+                        'core/client/**/*.js'
+                    ],
+                    tasks: ['concat:dev-ember']
+                },
                 livereload: {
                     files: [
                         // Theme CSS
@@ -298,6 +308,19 @@ var path           = require('path'),
                 }
             },
 
+            // ### Config for grunt-ember-templates
+            // Compiles handlebar templates for ember
+            emberTemplates: {
+                compile: {
+                    options: {
+                        templateBasePath: /core\/client\/templates/
+                    },
+                    files: {
+                        "core/built/scripts/templates-ember.js": "core/client/templates/**/*.hbs"
+                    }
+                }
+            },
+
             // ### Config for grunt-groc
             // Generate documentation from code
             groc: {
@@ -415,6 +438,19 @@ var path           = require('path'),
                         ]
                     }
                 },
+                'dev-ember': {
+                    files: {
+                        'core/built/scripts/vendor-ember.js': [
+                            'core/shared/vendor/jquery/jquery.js',
+                            'core/shared/vendor/handlebars/handlebars.js',
+                            'core/shared/vendor/ember/ember.js'
+                        ],
+
+                        'core/built/scripts/ghost-dev-ember.js': [
+                            'core/client/**/*.js'
+                        ]
+                    }
+                },
                 prod: {
                     files: {
                         'core/built/scripts/ghost.js': [
@@ -840,7 +876,7 @@ var path           = require('path'),
         grunt.registerTask('prod', 'Build CSS, JS & templates for production', ['sass:compress', 'handlebars', 'concat', 'uglify']);
 
         // When you just say 'grunt'
-        grunt.registerTask('default', 'Build CSS, JS & templates for development', ['update_submodules', 'sass:compress', 'handlebars', 'concat']);
+        grunt.registerTask('default', 'Build CSS, JS & templates for development', ['update_submodules', 'sass:compress', 'handlebars', 'emberTemplates:compile', 'concat']);
     };
 
 module.exports = configureGrunt;

bower.json

@@ -0,0 +1,7 @@
+{
+  "name": "ghost",
+  "dependencies": {
+    "handlebars": "~1.1.2",
+    "ember": "~1.4.0"
+  }
+}

core/client/README.md

@@ -1 +0,0 @@
-#Ember goes here

core/client/app.js

@@ -0,0 +1,14 @@
+/*global Ember */
+
+var App = Ember.Application.create({
+    /**
+     * These are debugging flags, they are useful during development
+     */
+    LOG_ACTIVE_GENERATION: true,
+    LOG_MODULE_RESOLVER: true,
+    LOG_TRANSITIONS: true,
+    LOG_TRANSITIONS_INTERNAL: true,
+    LOG_VIEW_LOOKUPS: true,
+    rootElement: '#ember-app' // tells ember to inject this app into element with selector #ember-app
+});
+

core/client/router.js

@@ -0,0 +1,9 @@
+/*global App */
+
+App.Router.map(function () {
+    'use strict';
+    this.resource('posts');
+    this.resource('post', {path: 'post/:id'}, function () {
+        this.route('edit');
+    });
+});

core/client/templates/application.hbs

@@ -0,0 +1,3 @@
+<h2 id='title'>Welcome to Ghost on Ember.js</h2>
+
+{{outlet}}

core/server/controllers/admin.js

@@ -45,8 +45,7 @@ function setSelected(list, name) {
 adminControllers = {
     'index': function (req, res) {
         /*jslint unparam:true*/
-        // Ember goes here.
-        res.send(200);
+        res.render('default-ember');
     },
     // Route: index
     // Path: /ghost/

core/server/routes/admin.js

@@ -55,4 +55,6 @@ module.exports = function (server) {
         res.redirect(subdir + '/ghost/');
     });
     server.get('/ghost/', admin.indexold);
+
+    server.get('/ghost/ember/', admin.index);
 };

core/server/views/default-ember.hbs

@@ -0,0 +1,41 @@
+<!doctype html>
+<!--[if (IE 8)&!(IEMobile)]><html class="no-js lt-ie9" lang="en"><![endif]-->
+<!--[if (gte IE 9)| IEMobile |!(IE)]><!--><html class="no-js" lang="en"><!--<![endif]-->
+<head>
+    <meta http-equiv="Content-Type" content="text/html" charset="UTF-8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+    <meta name="csrf-param" content="{{csrfToken}}">
+
+    <title>Ghost Admin</title>
+
+    <meta name="HandheldFriendly" content="True">
+    <meta name="MobileOptimized" content="320">
+    <meta name="viewport" content="user-scalable=no, width=device-width, initial-scale=1, maximum-scale=1">
+
+    <meta http-equiv="cleartype" content="on">
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+
+    <link rel="shortcut icon" href="{{asset "favicon.ico"}}">
+    <link rel="apple-touch-icon-precomposed" href="{{asset "img/touch-icon-iphone.png" ghost="true"}}" />
+    <link rel="apple-touch-icon-precomposed" sizes="76x76" href="{{asset "img/touch-icon-ipad.png" ghost="true"}}" />
+    <link rel="apple-touch-icon-precomposed" sizes="120x120" href="{{asset "img/small.png" ghost="true"}}" />
+    <link rel="apple-touch-icon-precomposed" sizes="152x152" href="{{asset "img/medium.png" ghost="true"}}" />
+
+    <meta name="application-name" content="Ghost"/>
+    <meta name="msapplication-TileColor" content="#ffffff"/>
+    <meta name="msapplication-square70x70logo" content="{{asset "img/small.png" ghost="true"}}" />
+    <meta name="msapplication-square150x150logo" content="{{asset "img/medium.png" ghost="true"}}" />
+    <meta name="msapplication-square310x310logo" content="{{asset "img/large.png" ghost="true"}}" />
+
+    <link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Open+Sans:400,300,700">
+    <link rel="stylesheet" href="{{asset "css/screen.css" ghost="true"}}">
+</head>
+<body class="{{bodyClass}}{{update_notification classOnly="true"}}">
+
+    <div id="ember-app"></div>
+
+    <script src="/ghost/scripts/vendor-ember.js"></script>
+    <script src="/ghost/scripts/templates-ember.js"></script>
+    <script src="/ghost/scripts/ghost-dev-ember.js"></script>
+</body>
+</html>

core/test/unit/client_ghostdown_spec.js

@@ -10,7 +10,7 @@ var testUtils = require('../utils'),
     should = require('should'),
 
     // Stuff we are testing
-    gdPath = "../../client/assets/vendor/showdown/extensions/ghostdown.js",
+    gdPath = "../../clientold/assets/vendor/showdown/extensions/ghostdown.js",
     ghostdown = require(gdPath);
 
 describe("Ghostdown showdown extensions", function () {

core/test/unit/client_showdown_int_spec.js

@@ -11,7 +11,7 @@ var testUtils = require('../utils'),
 // Stuff we are testing
     Showdown = require('showdown'),
     github = require('../../shared/vendor/showdown/extensions/github'),
-    ghostdown = require('../../client/assets/vendor/showdown/extensions/ghostdown'),
+    ghostdown = require('../../clientold/assets/vendor/showdown/extensions/ghostdown'),
     converter = new Showdown.converter({extensions: [ghostdown, github]});
 
 describe("Showdown client side converter", function () {

package.json

@@ -60,6 +60,7 @@
     "devDependencies": {
         "blanket": "~1.1.5",
         "grunt": "~0.4.1",
+        "grunt-ember-templates": "~0.4.18",
         "grunt-cli": "~0.1.13",
         "grunt-contrib-clean": "~0.5.0",
         "grunt-contrib-compress": "~0.5.2",