Move user/cover image files used in admin team area into the client folder

no issue
- fixes potential "mixed content" warnings if non-admin urls are redirected
This commit is contained in:
Kevin Ansfield 2016-01-14 16:25:29 +00:00
parent 749bd29e12
commit da0a0c559b
7 changed files with 5 additions and 12 deletions

View File

@ -22,7 +22,7 @@ export default Component.extend(ActiveLinkWrapper, {
}), }),
authorAvatar: computed('post.author.image', function () { authorAvatar: computed('post.author.image', function () {
return this.get('post.author.image') || this.get('ghostPaths.url').asset('/shared/img/user-image.png'); return this.get('post.author.image') || `${this.get('ghostPaths.subdir')}/ghost/img/user-image.png`;
}), }),
authorAvatarBackground: computed('authorAvatar', function () { authorAvatarBackground: computed('authorAvatar', function () {

View File

@ -36,7 +36,7 @@ export default Component.extend({
}, },
defaultImage: computed('ghostPaths', function () { defaultImage: computed('ghostPaths', function () {
let url = this.get('ghostPaths.url').asset('/shared/img/user-image.png'); let url = `${this.get('ghostPaths.subdir')}/ghost/img/user-image.png`;
return Ember.String.htmlSafe(`background-image: url(${url})`); return Ember.String.htmlSafe(`background-image: url(${url})`);
}), }),

View File

@ -10,7 +10,7 @@ export default Component.extend({
ghostPaths: inject.service('ghost-paths'), ghostPaths: inject.service('ghost-paths'),
userDefault: computed('ghostPaths', function () { userDefault: computed('ghostPaths', function () {
return this.get('ghostPaths.url').asset('/shared/img/user-image.png'); return `${this.get('ghostPaths.subdir')}/ghost/img/user-image.png`;
}), }),
userImageBackground: computed('user.image', 'userDefault', function () { userImageBackground: computed('user.image', 'userDefault', function () {

View File

@ -50,7 +50,7 @@ export default Controller.extend(ValidationEngine, {
// duplicated in gh-user-active -- find a better home and consolidate? // duplicated in gh-user-active -- find a better home and consolidate?
userDefault: computed('ghostPaths', function () { userDefault: computed('ghostPaths', function () {
return this.get('ghostPaths.url').asset('/shared/img/user-image.png'); return `${this.get('ghostPaths.subdir')}/ghost/img/user-image.png`;
}), }),
userImageBackground: computed('user.image', 'userDefault', function () { userImageBackground: computed('user.image', 'userDefault', function () {
@ -61,7 +61,7 @@ export default Controller.extend(ValidationEngine, {
// end duplicated // end duplicated
coverDefault: computed('ghostPaths', function () { coverDefault: computed('ghostPaths', function () {
return this.get('ghostPaths.url').asset('/shared/img/user-cover.png'); return `${this.get('ghostPaths.subdir')}/ghost/img/user-cover.png`;
}), }),
coverImageBackground: computed('user.cover', 'coverDefault', function () { coverImageBackground: computed('user.cover', 'coverDefault', function () {

View File

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

View File

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

View File

@ -243,13 +243,6 @@ describe('Frontend Routing', function () {
}); });
describe('Static assets', function () { describe('Static assets', function () {
it('should retrieve shared assets', function (done) {
request.get('/shared/img/user-image.png')
.expect('Cache-Control', testUtils.cacheRules.hour)
.expect(200)
.end(doEnd(done));
});
it('should retrieve theme assets', function (done) { it('should retrieve theme assets', function (done) {
request.get('/assets/css/screen.css') request.get('/assets/css/screen.css')
.expect('Cache-Control', testUtils.cacheRules.year) .expect('Cache-Control', testUtils.cacheRules.year)