From f2b2cf2519b44f1ec55ab633fbcab0f90ca22e7e Mon Sep 17 00:00:00 2001
From: Mattias Cibien <mattias@mattiascibien.net>
Date: Thu, 25 Sep 2014 13:05:55 +0200
Subject: [PATCH] Clean up hardcoded ghost paths

closes #4144
- made contributors template use the `gh-path` helper
- Removing blogRoot from application.js
- made error image use the `gh-path` helper
---
 Gruntfile.js                     | 2 +-
 core/client/templates/error.hbs  | 2 +-
 core/client/utils/ghost-paths.js | 4 ----
 core/client/views/application.js | 2 --
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 2858ee8bac..82c7118320 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -975,7 +975,7 @@ var _              = require('lodash'),
                 count: 20
             }).then(function makeContributorTemplate(contributors) {
                 var contributorTemplate = '<li>\n\t<a href="<%githubUrl%>" title="<%name%>">\n' +
-                    '\t\t<img src="{{unbound ghostPaths.contributorsDir}}/<%name%>" alt="<%name%>">\n' +
+                    '\t\t<img src="{{gh-path "admin" "/img/contributors"}}/<%name%>" alt="<%name%>">\n' +
                     '\t</a>\n</li>';
 
                 grunt.verbose.writeln('Creating contributors template.');
diff --git a/core/client/templates/error.hbs b/core/client/templates/error.hbs
index d38823d6be..ecb168b2fd 100644
--- a/core/client/templates/error.hbs
+++ b/core/client/templates/error.hbs
@@ -1,7 +1,7 @@
 <section class="error-content error-404 js-error-container">
     <section class="error-details">
          <figure class="error-image">
-             <img class="error-ghost" {{bind-attr src=ghostPaths.errorImageSrc srcset=ghostPaths.errorImageSrcSet}} />
+             <img class="error-ghost" src="{{gh-path 'admin' '/img/404-ghost@2x.png'}}" srcset="{{gh-path 'admin' '/img/404-ghost.png'}} 1x, {{gh-path 'admin' '/img/404-ghost@2x.png'}} 2x" />
          </figure>
          <section class="error-message">
              <h1 class="error-code">{{code}}</h1>
diff --git a/core/client/utils/ghost-paths.js b/core/client/utils/ghost-paths.js
index 2d03c1bf6b..6adca26d06 100644
--- a/core/client/utils/ghost-paths.js
+++ b/core/client/utils/ghost-paths.js
@@ -25,10 +25,6 @@ function ghostPaths() {
         blogRoot: subdir + '/',
         adminRoot: adminRoot,
         apiRoot: apiRoot,
-        contributorsDir: assetUrl('/ghost/img/contributors'),
-        errorImageSrc: assetUrl('/ghost/img/404-ghost@2x.png'),
-        errorImageSrcSet: assetUrl('/ghost/img/404-ghost.png') + ' 1x, ' +
-            assetUrl('/ghost/img/404-ghost@2x.png') + ' 2x',
 
         url: {
             admin: function () {
diff --git a/core/client/views/application.js b/core/client/views/application.js
index a64ef37856..ad6018df56 100644
--- a/core/client/views/application.js
+++ b/core/client/views/application.js
@@ -3,8 +3,6 @@ import mobileQuery from 'ghost/utils/mobile';
 var ApplicationView = Ember.View.extend({
     elementId: 'container',
 
-    blogRoot: Ember.computed.alias('controller.ghostPaths.blogRoot'),
-
     setupGlobalMobileNav: function () {
         // #### Navigating within the sidebar closes it.
         var self = this;