From 502920c7f2cdaaeab909935afcbb0a9715c39c13 Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Tue, 11 Aug 2015 19:53:18 +0200
Subject: [PATCH] Improves styles for account page, adds user image

---
 app/assets/images/user_default_big.jpg       | Bin 0 -> 2084 bytes
 app/assets/stylesheets/participacion.scss    |   7 ++++++-
 app/views/account/show.html.erb              |  20 ++++++-------------
 app/views/devise/registrations/edit.html.erb |   2 +-
 config/locales/en.yml                        |   3 +++
 config/locales/es.yml                        |   3 +++
 6 files changed, 19 insertions(+), 16 deletions(-)
 create mode 100644 app/assets/images/user_default_big.jpg

diff --git a/app/assets/images/user_default_big.jpg b/app/assets/images/user_default_big.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d1c5bcea2fbe94ebf3f33971870ae2590cb7609b
GIT binary patch
literal 2084
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
Z#Jk7+>c<~E?v#VL91?Iuk<9;Z0st%4&z=AP

literal 0
HcmV?d00001

diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/participacion.scss
index 7469007b3..2b9cfd983 100644
--- a/app/assets/stylesheets/participacion.scss
+++ b/app/assets/stylesheets/participacion.scss
@@ -370,12 +370,16 @@ form {
     line-height: $line-height;
   }
 
-  input[type]:not([type=submit]) {
+  input[type]:not([type=submit]):not([type=file]) {
     background: $input-bg;
     height: $line-height*2;
     margin-bottom: rem-calc(16);
   }
 
+  input[type=file] {
+    margin: rem-calc(12) 0;
+  }
+
   .note {
     display: block;
     font-size: rem-calc(13);
@@ -390,6 +394,7 @@ form {
   .checkbox {
     display: inline-block;
     font-size: rem-calc(14);
+    font-weight: normal;
     line-height: $line-height*2;
     margin: 0 0 0 rem-calc(6);
     vertical-align: top;
diff --git a/app/views/account/show.html.erb b/app/views/account/show.html.erb
index 6a2d6d416..6d1f4d9cd 100644
--- a/app/views/account/show.html.erb
+++ b/app/views/account/show.html.erb
@@ -1,6 +1,8 @@
 <div class="row account">
-  <div class="small-12 medium-9 column">
-    <h1><%= t("account.show.title") %></h1>
+  <div class="small-12 column">
+    <%= link_to t("account.show.change_credentials_link"), edit_user_registration_path, class: 'button radius small secondary right' %>
+
+    <h1 class="inline-block"><%= t("account.show.title") %></h1>
 
     <%= form_for @account, as: :account, url: account_path do |f| %>
 
@@ -17,16 +19,13 @@
 
       <div class="row">
         <div class="small-12 medium-6 column">
+          <h2><%= t("account.show.personal")%></h2>
           <%= f.label :first_name, t("account.show.first_name_label") %>
           <%= f.text_field :first_name, placeholder: t("account.show.first_name_label") %>
-        </div>
 
-        <div class="small-12 medium-6 column">
           <%= f.label :last_name, t("account.show.last_name_label") %>
           <%= f.text_field :last_name, placeholder:  t("account.show.last_name_label") %>
-        </div>
 
-        <div class="small-12 medium-6 column">
           <%= f.label :nickname, t("account.show.nickname_label") %>
           <%= f.text_field :nickname, placeholder: t("account.show.nickname_label") %>
           <%= f.label :use_nickname do %>
@@ -44,9 +43,6 @@
             <%= f.check_box :email_on_debate_comment %>
             <span class="checkbox"><%= t("account.show.email_on_debate_comment_label") %></span>
           <% end %>
-        </div>
-
-        <div class="small-12 column">
           <%= f.label :email_on_comment_reply do %>
             <%= f.check_box :email_on_comment_reply %>
             <span class="checkbox"><%= t("account.show.email_on_comment_reply_label") %></span>
@@ -59,8 +55,4 @@
       </div>
     <% end %>
   </div>
-
-  <div class="small-12 medium-3 column text-center">
-    <%= link_to t("account.show.change_credentials_link"), edit_user_registration_path, class: 'button radius small secondary' %>
-  </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/app/views/devise/registrations/edit.html.erb b/app/views/devise/registrations/edit.html.erb
index b670b6776..8f328c230 100644
--- a/app/views/devise/registrations/edit.html.erb
+++ b/app/views/devise/registrations/edit.html.erb
@@ -1,5 +1,5 @@
 <div class="row">
-  <div class="account small-12 medium-9 column small-centered">
+  <div class="account small-12 medium-5 column small-centered">
 
     <i class="icon-angle-left left"></i>&nbsp;<%= link_to t("devise_views.registrations.edit.back_link"), :back, class: "left back" %>
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2451745c9..b036f8125 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -71,10 +71,13 @@ en:
       email_on_debate_comment_label: "Receive email when someone comments on my debates"
       email_on_comment_reply_label: "Receive email when someone replies to my comments"
       change_credentials_link: "Change my credentials"
+      avatar: "Avatar"
+      personal: "Personal data"
       first_name_label: "First Name"
       last_name_label: "Last Name"
       use_nickname_label: "Use nickname"
       nickname_label: "Nickname"
+      notifications: Notifications
   simple_captcha:
     placeholder: "Enter the image value"
     label: "Enter the code in the box:"
diff --git a/config/locales/es.yml b/config/locales/es.yml
index da7fe8303..7995483d4 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -71,10 +71,13 @@ es:
       change_credentials_link: "Cambiar mis credenciales"
       email_on_debate_comment_label: "Recibir un email cuando alguien comenta en mis debates"
       email_on_comment_reply_label: "Recibir un email cuando alguien contesta a mis comentarios"
+      avatar: "Avatar"
+      personal: "Datos personales"
       first_name_label: "Nombre"
       last_name_label: "Apellidos"
       use_nickname_label: "Usar pseudónimo"
       nickname_label: "Pseudónimo"
+      notifications: Notificaciones
   simple_captcha:
     placeholder: "Introduce el texto de la imagen"
     label: "Introduce el texto en la caja:"