From 2eccd30effeec93fdb6e9605ae9b742906fb06ea Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Wed, 19 Aug 2015 15:01:10 +0200
Subject: [PATCH] Adds styles for deleted users, improves previous

---
 app/assets/stylesheets/debates.scss       | 17 +++++++++++++----
 app/assets/stylesheets/participacion.scss | 15 +++++++++++++++
 app/assets/stylesheets/variables.scss     |  3 ++-
 app/views/comments/_comment.html.erb      | 12 ++++++++++--
 app/views/debates/show.html.erb           | 19 +++++++++++++++++++
 config/locales/en.yml                     |  2 ++
 config/locales/es.yml                     |  2 ++
 7 files changed, 63 insertions(+), 7 deletions(-)

diff --git a/app/assets/stylesheets/debates.scss b/app/assets/stylesheets/debates.scss
index 939373e57..2ee296f70 100644
--- a/app/assets/stylesheets/debates.scss
+++ b/app/assets/stylesheets/debates.scss
@@ -544,14 +544,24 @@
 
       .comment-user {
         margin-top: rem-calc(6);
-        padding: rem-calc(6) rem-calc(12);
+        padding: rem-calc(6) 0;
 
-        &.is-official {
-          background: $comment-official;
+        @each $n in ("1", "2", "3","4", "5") {
+          &.level-#{$n} {
+            @if $n == "5" {
+              background: $comment-level-5;
+              padding: rem-calc(6) rem-calc(12);
+            }
+            @else {
+              background: $comment-official;
+              padding: rem-calc(6) rem-calc(12);
+            }
+          }
         }
 
         &.is-author {
           background: $comment-author;
+          padding: rem-calc(6) rem-calc(12);
         }
       }
     }
@@ -579,7 +589,6 @@
       }
     }
   }
-
 }
 
 .faded {
diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/participacion.scss
index 81e6a2481..00028ac56 100644
--- a/app/assets/stylesheets/participacion.scss
+++ b/app/assets/stylesheets/participacion.scss
@@ -589,6 +589,21 @@ form {
 
 img.initialjs-avatar {
   border-radius: rem-calc(1000);
+  position: relative;
+}
+
+.author-deleted {
+  background-color: rgba(255,255,255,.5);
+  color: rgba(0,0,0,.4);
+  font-size: rem-calc(40);
+  left: 11px;
+  position: absolute;
+  top: 63px;
+}
+
+.user-deleted {
+  @extend .author-deleted;
+  top: -9px;
 }
 
 // 11. Filters
diff --git a/app/assets/stylesheets/variables.scss b/app/assets/stylesheets/variables.scss
index 95fad743c..0c0942d99 100644
--- a/app/assets/stylesheets/variables.scss
+++ b/app/assets/stylesheets/variables.scss
@@ -76,4 +76,5 @@ $author:            #008CCF;
 $association:       #222222;
 
 $comment-author:    rgba(45,144,248,.15);
-$comment-official:  rgba(255,241,204,1);
+$comment-official:  rgba(70,219,145,.3);
+$comment-level-5:   rgba(255,241,204,1);
diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb
index c71cac18c..ecbb0b694 100644
--- a/app/views/comments/_comment.html.erb
+++ b/app/views/comments/_comment.html.erb
@@ -6,10 +6,18 @@
     <% else %>
 
       <%= avatar_image(comment.user, size: 32, class: 'left') %>
+      <!-- if user deleted -->
+        <i class="icon-deleted user-deleted"></i>
+      <!-- end -->
 
       <div class="comment-body">
         <div class="comment-info">
-          <span class="user-name"><%= comment.user.name %></span>
+
+          <!-- if user deleted -->
+            <span class="user-name"><%= t("debates.comment.user_deleted") %></span>
+          <!-- else -->
+            <span class="user-name"><%= comment.user.name %></span>
+          <!-- end -->
           &nbsp;&bullet;&nbsp;<%= time_ago_in_words(comment.created_at) %>
           <% if comment.user.official? %>
             &nbsp;&bullet;&nbsp;
@@ -32,7 +40,7 @@
         </div>
 
         <% if comment.user.official? %>
-          <p class="comment-user is-official"><%= comment.body %></p>
+          <p class="comment-user level-<%= comment.user.official_level %>"><%= comment.body %></p>
         <% elsif comment.user == @debate.author %>
           <p class="comment-user is-author"><%= comment.body %></p>
         <% else %>
diff --git a/app/views/debates/show.html.erb b/app/views/debates/show.html.erb
index ca664cccd..db8cbdc14 100644
--- a/app/views/debates/show.html.erb
+++ b/app/views/debates/show.html.erb
@@ -14,9 +14,28 @@
 
       <div class="debate-info">
         <%= avatar_image(@debate.author, size: 32, class: 'author-photo') %>
+        <!-- if user deleted -->
+        <i class="icon-deleted author-deleted"></i>
+        <span class="author">
+            <%= t("debates.show.author_deleted") %>
+        </span>
+        <!-- else -->
         <span class="author">
             <%= @debate.author.name %>
         </span>
+        <!-- end -->
+        <% if @debate.author.official? %>
+          &nbsp;&bullet;&nbsp;
+          <span class="label round level-<%= @debate.author.official_level %>">
+            <%= @debate.author.official_position %>
+          </span>
+        <% end %>
+        <% if @debate.author.verified_organization? %>
+          &nbsp;&bullet;&nbsp;
+          <span class="label round is-association">
+            <%= t("shared.organization") %>
+          </span>
+        <% end %>
         <span class="bullet">&nbsp;&bullet;&nbsp;</span>
         <%= l @debate.created_at.to_date %>
         <span class="bullet">&nbsp;&bullet;&nbsp;</span>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9d89b5ec7..a739a2c34 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -52,6 +52,7 @@ en:
     comment:
       author: Debate's author
       deleted: This comment has been deleted
+      user_deleted: Deleted user
       responses:
         zero: No Responses
         one: 1 Response
@@ -73,6 +74,7 @@ en:
         Some suggestions:
     show:
       back_link: Back
+      author_deleted: Deleted user
       comments_title: Comments
       comments:
         zero: No comments
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 87afd21a6..96284a743 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -52,6 +52,7 @@ es:
     comment:
       author: Autor del debate
       deleted: Este comentario ha sido eliminado
+      user_deleted: Usuario eliminado
       responses:
         zero: Sin respuestas
         one: 1 Respuesta
@@ -73,6 +74,7 @@ es:
         Algunas recomendaciones:
     show:
       back_link: Volver
+      author_deleted: Usuario eliminado
       comments_title: Comentarios
       comments:
         zero: Sin comentarios