mirror of
https://github.com/TryGhost/Ghost.git
synced 2024-12-23 19:02:29 +03:00
Merge pull request #6341 from kevinansfield/fix-mixed-content-on-team-page
Move user/cover image files used in admin team area into the client folder
This commit is contained in:
commit
3e61d07ac1
@ -27,7 +27,7 @@ export default Component.extend(ActiveLinkWrapper, {
|
||||
}),
|
||||
|
||||
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 () {
|
||||
|
@ -41,7 +41,7 @@ export default Component.extend({
|
||||
},
|
||||
|
||||
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})`);
|
||||
}),
|
||||
|
||||
|
@ -14,7 +14,7 @@ export default Component.extend({
|
||||
ghostPaths: service(),
|
||||
|
||||
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 () {
|
||||
|
@ -56,7 +56,7 @@ export default Controller.extend(ValidationEngine, {
|
||||
|
||||
// duplicated in gh-user-active -- find a better home and consolidate?
|
||||
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 () {
|
||||
@ -67,7 +67,7 @@ export default Controller.extend(ValidationEngine, {
|
||||
// end duplicated
|
||||
|
||||
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 () {
|
||||
|
BIN
ghost/admin/public/assets/img/user-cover.png
Normal file
BIN
ghost/admin/public/assets/img/user-cover.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 23 KiB |
BIN
ghost/admin/public/assets/img/user-image.png
Normal file
BIN
ghost/admin/public/assets/img/user-image.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 2.4 KiB |
Loading…
Reference in New Issue
Block a user