Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-01-27 22:49:56 -05:00
Code Issues Activity

Merge pull request #4163 from mattiascibien/issue-4144

Browse source 
Clean up hardcoded ghost paths
This commit is contained in:
Matt Enlow 2014-10-06 09:01:26 -06:00
commit 58ec6e0ac9
4 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gruntfile.js
View file

@ -975,7 +975,7 @@ var _ = require('lodash'),
count: 20 count: 20
}).then(function makeContributorTemplate(contributors) { }).then(function makeContributorTemplate(contributors) {
var contributorTemplate = '<li>\n\t<a href="<%githubUrl%>" title="<%name%>">\n' + 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>'; '\t</a>\n</li>';
grunt.verbose.writeln('Creating contributors template.'); grunt.verbose.writeln('Creating contributors template.');

2
core/client/templates/error.hbs
View file

@ -1,7 +1,7 @@
<section class="error-content error-404 js-error-container"> <section class="error-content error-404 js-error-container">
<section class="error-details"> <section class="error-details">
<figure class="error-image"> <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> </figure>
<section class="error-message"> <section class="error-message">
<h1 class="error-code">{{code}}</h1> <h1 class="error-code">{{code}}</h1>

4
core/client/utils/ghost-paths.js
View file

@ -25,10 +25,6 @@ function ghostPaths() {
blogRoot: subdir + '/', blogRoot: subdir + '/',
adminRoot: adminRoot, adminRoot: adminRoot,
apiRoot: apiRoot, 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: { url: {
admin: function () { admin: function () {

2
core/client/views/application.js
View file

@ -3,8 +3,6 @@ import mobileQuery from 'ghost/utils/mobile';
var ApplicationView = Ember.View.extend({ var ApplicationView = Ember.View.extend({
elementId: 'container', elementId: 'container',
blogRoot: Ember.computed.alias('controller.ghostPaths.blogRoot'),
setupGlobalMobileNav: function () { setupGlobalMobileNav: function () {
// #### Navigating within the sidebar closes it. // #### Navigating within the sidebar closes it.
var self = this; var self = this;