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

core/client/app/components/gh-posts-list-item.js

@@ -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 () {

core/client/app/components/gh-profile-image.js

@@ -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})`);
     }),
 

core/client/app/components/gh-user-active.js

@@ -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 () {

core/client/app/controllers/team/user.js

@@ -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 () {

core/test/functional/routes/frontend_spec.js

@@ -243,13 +243,6 @@ describe('Frontend Routing', 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) {
                 request.get('/assets/css/screen.css')
                     .expect('Cache-Control', testUtils.cacheRules.year)