mastofe

commit: 7bf7ed6123ad6e29f1356f58be0dbe89deed841b
parent: a390abdefb5d741ba4375858a79fbf3eaf30f06d
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Fri, 21 Jul 2017 05:28:51 +0200

Fix #3220 - Show avatar/header on edit profile page (#4288)


Diffstat:
M
app/javascript/styles/accounts.scss
9
+++++++++
M
app/javascript/styles/forms.scss
4
++++
M
app/views/settings/profiles/show.html.haml
9
++++++++-

3 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/app/javascript/styles/accounts.scss b/app/javascript/styles/accounts.scss
@@ -26,6 +26,15 @@
     z-index: 1;
   }
 
+  &.compact {
+    padding: 30px 0;
+    border-radius: 4px;
+
+    .avatar {
+      margin-bottom: 0;
+    }
+  }
+
   .name {
     display: block;
     font-size: 20px;
diff --git a/app/javascript/styles/forms.scss b/app/javascript/styles/forms.scss
@@ -40,6 +40,10 @@ code {
     }
   }
 
+  .card {
+    margin-bottom: 15px;
+  }
+
   strong {
     font-weight: 500;
   }
diff --git a/app/views/settings/profiles/show.html.haml b/app/views/settings/profiles/show.html.haml
@@ -7,10 +7,17 @@
   .fields-group
     = f.input :display_name, placeholder: t('simple_form.labels.defaults.display_name'), hint: t('simple_form.hints.defaults.display_name', count: 30 - @account.display_name.size).html_safe
     = f.input :note, placeholder: t('simple_form.labels.defaults.note'), hint: t('simple_form.hints.defaults.note', count: 160 - @account.note.size).html_safe
+
+  .card.compact{ style: "background-image: url(#{@account.header.url(:original)})" }
+    .avatar= image_tag @account.avatar.url(:original)
+
+  .fields-group
     = f.input :avatar, wrapper: :with_label, input_html: { accept: AccountAvatar::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.avatar')
+
     = f.input :header, wrapper: :with_label, input_html: { accept: AccountHeader::IMAGE_MIME_TYPES.join(',') }, hint: t('simple_form.hints.defaults.header')
 
-  = f.input :locked, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.locked')
+  .fields-group
+    = f.input :locked, as: :boolean, wrapper: :with_label, hint: t('simple_form.hints.defaults.locked')
 
   .actions
     = f.button :button, t('generic.save_changes'), type: :submit