From dffb8e8a5eb984b39a2cadca17e519f4220d6fea Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Sat, 22 Aug 2015 10:32:45 +0200
Subject: [PATCH] Adds styles for comment as administrator

---
 app/assets/images/admin_avatar.png        | Bin 0 -> 1867 bytes
 app/assets/stylesheets/debates.scss       |   9 +++++++--
 app/assets/stylesheets/participacion.scss |   2 +-
 app/assets/stylesheets/variables.scss     |   2 +-
 app/views/comments/_comment.html.erb      |  14 +++++++++-----
 app/views/comments/_form.html.erb         |   6 ++++++
 config/locales/en.yml                     |   4 +++-
 config/locales/es.yml                     |   2 ++
 8 files changed, 29 insertions(+), 10 deletions(-)
 create mode 100644 app/assets/images/admin_avatar.png

diff --git a/app/assets/images/admin_avatar.png b/app/assets/images/admin_avatar.png
new file mode 100644
index 0000000000000000000000000000000000000000..28ea4a143f89d279bc28ed689dc229bebf9951f4
GIT binary patch
literal 1867
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
B$!`Dv

literal 0
HcmV?d00001

diff --git a/app/assets/stylesheets/debates.scss b/app/assets/stylesheets/debates.scss
index bbe0d034d..66ea491af 100644
--- a/app/assets/stylesheets/debates.scss
+++ b/app/assets/stylesheets/debates.scss
@@ -249,6 +249,7 @@
 
   .panel {
     border: 0;
+    border-radius: 0;
     margin-bottom: 0;
     min-height: rem-calc(192);
     padding: 0 rem-calc(12) rem-calc(2) rem-calc(12);
@@ -568,10 +569,14 @@
           padding: rem-calc(6) rem-calc(12);
         }
 
-        &.is-moderator {
-          background: $comment-moderator;
+        &.is-admin {
+          background: $comment-admin;
           padding: rem-calc(6) rem-calc(12);
         }
+
+        &.is-moderator {
+          @extend .is-admin;
+        }
       }
     }
 
diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/participacion.scss
index 15becbaf5..485dbfd60 100644
--- a/app/assets/stylesheets/participacion.scss
+++ b/app/assets/stylesheets/participacion.scss
@@ -692,7 +692,7 @@ form {
   }
 }
 
-img.moderator-avatar {
+img.admin-avatar, img.moderator-avatar {
   border-radius: rem-calc(1000);
   position: relative;
 }
diff --git a/app/assets/stylesheets/variables.scss b/app/assets/stylesheets/variables.scss
index 1f06906d6..4be7028e3 100644
--- a/app/assets/stylesheets/variables.scss
+++ b/app/assets/stylesheets/variables.scss
@@ -78,7 +78,7 @@ $association:       #C0392B;
 
 $comment-author:    rgba(45,144,248,.15);
 $comment-level-5:   rgba(255,241,204,1);
-$comment-moderator: rgba(45,144,248,.15);
+$comment-admin:     rgba(45,144,248,.15);
 $comment-official:  rgba(70,219,145,.3);
 
 // 06. Responsive
diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb
index d0d1dcd7c..449619c9d 100644
--- a/app/views/comments/_comment.html.erb
+++ b/app/views/comments/_comment.html.erb
@@ -15,9 +15,9 @@
       <% end %>
 <!--
       <% if comment.user.moderator? %> <!-- AND has activated CHECKBOX comment as moderator ->
-        <%= image_tag('moderator_avatar.png', size: 32, class: "moderator-avatar left") %>
-      <% else %>
-        <%= avatar_image(comment.user, size: 32, class: "left") %>
+        <%= image_tag("moderator_avatar.png", size: 32, class: "moderator-avatar left") %>
+      <% elsif comment.user.administrator? %> <!-- AND has activated CHECKBOX comment as admin ->
+        <%= image_tag("admin_avatar.png", size: 32, class: "admin-avatar left") %>
       <% end %>
 -->
       <div class="comment-body">
@@ -28,7 +28,9 @@
           <% else %>
 
             <% if comment.user.moderator? %> <!-- AND activate moderator CHECKBOX -->
-              <span class="user-name"><%= t("debates.comment.moderator") %></span>
+              <span class="user-name"><%= t("debates.comment.moderator") %> #ID</span> <!-- Add ID to Moderator name -->
+            <% elsif comment.user.administrator? %> <!-- AND activate administrator CHECKBOX -->
+              <span class="user-name"><%= t("debates.comment.admin") %> #ID</span> <!-- Add ID to Admin name -->
             <% else %>
               <span class="user-name"><%= comment.user.name %></span>
             <% end %>
@@ -64,8 +66,10 @@
           <p class="comment-user level-<%= comment.user.official_level %> is-author"><%= comment.body %></p>
         <% elsif comment.user.official? %>
           <p class="comment-user level-<%= comment.user.official_level %>"><%= comment.body %></p>
-        <% elsif comment.user.moderator? %> <!-- AND has activated CHECKBOX comment as moderator & all badges are hidden (100% anonymous) -->
+        <% elsif comment.user.moderator? %> <!-- AND has activated CHECKBOX comment as moderator (all badges are hidden: 100% anonymous) -->
           <p class="comment-user is-moderator"><%= comment.body %></p>
+        <% elsif comment.user.administrator? %> <!-- AND has activated CHECKBOX comment as admin (all badges are hidden: 100% anonymous) -->
+          <p class="comment-user is-admin"><%= comment.body %></p>
         <% elsif comment.user_id == @debate.author_id %>
           <p class="comment-user is-author"><%= comment.body %></p>
         <% else %>
diff --git a/app/views/comments/_form.html.erb b/app/views/comments/_form.html.erb
index 45cdcecab..438537627 100644
--- a/app/views/comments/_form.html.erb
+++ b/app/views/comments/_form.html.erb
@@ -12,5 +12,11 @@
       <%#= f.label :, t("comments.form.comment_as_moderator"), class: "checkbox" %>
     </div>
     end -->
+    <!-- if user is admin
+    <div class="right">
+      <%#= f.check_box :, label: false %>
+      <%#= f.label :, t("comments.form.comment_as_admin"), class: "checkbox" %>
+    </div>
+    end -->
   <% end %>
 </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index ed6f1b2ae..ce3339b25 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -50,6 +50,7 @@ en:
     comment:
       author: Debate's author
       moderator: Moderator
+      admin: Administrator
       deleted: This comment has been deleted
       user_deleted: Deleted user
       responses:
@@ -96,7 +97,8 @@ en:
   comments:
     form:
       leave_comment: Write a comment
-      comment_as_moderator: Comentar como moderador
+      comment_as_moderator: Comment as moderator
+      comment_as_admin: Comment as administrator
   comments_helper:
     comment_link: Comment
     comment_button: Publish comment
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 31be240ba..871cc023c 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -50,6 +50,7 @@ es:
     comment:
       author: Autor del debate
       moderator: Moderador
+      admin: Administrador
       deleted: Este comentario ha sido eliminado
       user_deleted: Usuario eliminado
       responses:
@@ -97,6 +98,7 @@ es:
     form:
       leave_comment: Deja tu comentario
       comment_as_moderator: Comentar como moderador
+      comment_as_admin: Comentar como administrador
   comments_helper:
     comment_link: Comentar
     comment_button: Publicar comentario