diff --git a/ghost/admin/assets/sass/layouts/users.scss b/ghost/admin/assets/sass/layouts/users.scss index 09e3656f49..7f5d6d0693 100644 --- a/ghost/admin/assets/sass/layouts/users.scss +++ b/ghost/admin/assets/sass/layouts/users.scss @@ -209,7 +209,6 @@ display: block; width: 110px; height: 110px; - background-image: url(/shared/img/user-image.png); background-size: cover; background-position: center center; border-radius: 100%; diff --git a/ghost/admin/helpers/index.js b/ghost/admin/helpers/index.js index b27fa282fc..6d7b1947b2 100644 --- a/ghost/admin/helpers/index.js +++ b/ghost/admin/helpers/index.js @@ -32,4 +32,22 @@ Handlebars.registerHelper('url', function () { return Ghost.paths.subdir; }); + + Handlebars.registerHelper('asset', function (context, options) { + var output = '', + isAdmin = options && options.hash && options.hash.ghost; + + output += Ghost.paths.subdir + '/'; + + if (!context.match(/^shared/)) { + if (isAdmin) { + output += 'ghost/'; + } else { + output += 'assets/'; + } + } + + output += context; + return new Handlebars.SafeString(output); + }); }()); diff --git a/ghost/admin/tpl/settings/user-profile.hbs b/ghost/admin/tpl/settings/user-profile.hbs index 20d3087354..3d6c313415 100644 --- a/ghost/admin/tpl/settings/user-profile.hbs +++ b/ghost/admin/tpl/settings/user-profile.hbs @@ -9,7 +9,8 @@
- + + Change Cover
@@ -18,7 +19,7 @@
-
+
Edit Picture