From 7193f05376d6ad621327fc9c8b88c92e10988d17 Mon Sep 17 00:00:00 2001 From: Hannah Wolfe Date: Wed, 18 Sep 2013 15:54:52 +0100 Subject: [PATCH] Default user image and cover closes #812 - replace defaults with consistently named .png files - change the settings saving code so that it doesn't double-save images and save the defaults to the db --- core/client/assets/sass/layouts/users.scss | 8 ++++---- core/client/tpl/settings/user-profile.hbs | 2 +- core/client/views/settings.js | 6 +----- core/server/views/partials/navbar.hbs | 2 +- .../shared/img/default-user-profile-picture.jpg | Bin 20767 -> 0 bytes core/shared/img/{cover.png => user-cover.png} | Bin core/shared/img/user-image.png | Bin 0 -> 5907 bytes 7 files changed, 7 insertions(+), 11 deletions(-) delete mode 100644 core/shared/img/default-user-profile-picture.jpg rename core/shared/img/{cover.png => user-cover.png} (100%) create mode 100644 core/shared/img/user-image.png diff --git a/core/client/assets/sass/layouts/users.scss b/core/client/assets/sass/layouts/users.scss index 505509294c..5d10d6044b 100644 --- a/core/client/assets/sass/layouts/users.scss +++ b/core/client/assets/sass/layouts/users.scss @@ -104,7 +104,7 @@ .user-last-seen { line-height: 1em; } - + } .user-role { @@ -128,7 +128,7 @@ .user-profile-header { position: relative; - + // Gradient overlay &:after { content: ""; @@ -208,7 +208,7 @@ display: block; width: 100%; height: 100%; - background-image: url(/shared/img/default-user-profile-picture.jpg); + background-image: url(/shared/img/user-image.png); background-size: cover; background-position: center center; } @@ -236,7 +236,7 @@ #user-name { border-color: #fff; } - + .user-details-bottom { padding: 0 40px; margin: -30px 0 0 0; diff --git a/core/client/tpl/settings/user-profile.hbs b/core/client/tpl/settings/user-profile.hbs index 69e821142c..12255a8f27 100644 --- a/core/client/tpl/settings/user-profile.hbs +++ b/core/client/tpl/settings/user-profile.hbs @@ -9,7 +9,7 @@
diff --git a/core/client/views/settings.js b/core/client/views/settings.js index 67fff9df78..2b31ea94a1 100644 --- a/core/client/views/settings.js +++ b/core/client/views/settings.js @@ -180,8 +180,6 @@ this.model.save({ title: title, description: description, - logo: this.$('#blog-logo').attr("src"), - cover: this.$('#blog-cover').attr("src"), email: email, postsPerPage: postsPerPage, activeTheme: this.$('#activeTheme').val() @@ -320,9 +318,7 @@ 'email': userEmail, 'location': userLocation, 'website': userWebsite, - 'bio': userBio, - 'image': this.$('#user-image').attr('src'), - 'cover': this.$('#user-cover').attr('src') + 'bio': userBio }, { success: this.saveSuccess, error: this.saveError diff --git a/core/server/views/partials/navbar.hbs b/core/server/views/partials/navbar.hbs index c882eee895..9351c79557 100644 --- a/core/server/views/partials/navbar.hbs +++ b/core/server/views/partials/navbar.hbs @@ -9,7 +9,7 @@