Merge pull request #223 from AyuntamientoMadrid/improve_admin

Improve admin
2015-08-23 12:11:14 +02:00
parent 752c8f6651 908d19e2e7
commit 8f2cec60bf
18 changed files with 218 additions and 59 deletions
--- a/app/assets/fonts/icons.eot
+++ b/app/assets/fonts/icons.eot
--- a/app/assets/fonts/icons.svg
+++ b/app/assets/fonts/icons.svg
@@ -20,11 +20,13 @@
 <glyph unicode="&#108;" d="M477 350c0-7-2-14-8-19l-206-207-39-39c-6-5-12-8-20-8-7 0-14 3-19 8l-142 142c-6 6-8 12-8 20 0 7 2 14 8 19l38 39c6 5 12 8 20 8 7 0 14-3 19-8l84-84 188 188c5 5 12 8 19 8 8 0 14-3 20-8l38-39c6-6 8-12 8-20z"/>
 <glyph unicode="&#109;" d="M140 73l26 26-67 67-26-26 0-30 37 0 0-37z m150 265c0 4-2 7-7 7-1 0-3-1-4-2l-155-155c-2-2-2-3-2-5 0-4 2-6 6-6 2 0 4 0 5 2l155 154c1 2 2 3 2 5z m-16 55l119-119-238-237-118 0 0 118z m195-27c0-10-3-19-10-26l-48-47-118 118 47 48c7 7 15 10 26 10 10 0 18-3 26-10l67-67c7-8 10-16 10-26z"/>
 <glyph unicode="&#110;" d="M494 327c0-4-3-9-8-14l-103-101 24-143c0-1 0-3 0-5 0-4-1-8-3-10-2-3-4-5-8-5-4 0-8 2-12 4l-128 67-128-67c-4-2-8-4-12-4-4 0-7 2-9 5-2 2-3 6-3 10 0 1 0 3 1 5l24 143-104 101c-4 6-7 10-7 14 0 7 6 12 16 13l144 21 64 130c4 8 8 12 14 12 6 0 10-4 14-12l64-130 144-21c10-1 16-6 16-13z"/>
-<glyph unicode="&#112;" d="M256 448c-96 0-208-64-256-192 48-96 144-160 256-160 112 0 208 64 256 160-48 128-160 192-256 192z m0-320c-96 0-176 64-192 128 16 64 96 128 192 128 96 0 176-64 192-128-16-64-96-128-192-128z m0 224c-10 0-19-2-28-5 17-7 28-24 28-43 0-27-21-48-48-48-19 0-36 11-43 28-3-9-5-18-5-28 0-53 43-96 96-96 53 0 96 43 96 96 0 53-43 96-96 96z"/>
 <glyph unicode="&#111;" d="M410 203l-80 38-34 16c15 9 27 24 35 41 6 14 10 29 10 46 0 9-1 18-4 27-10 41-42 72-81 72-38 0-70-30-81-70-2-9-4-19-4-29 0-18 4-34 11-49 8-16 20-30 35-39l-32-15-83-38c-7-4-12-12-12-21l0-91c0-12 8-22 19-22l294 0c11 0 19 10 19 22l0 91c0 9-4 17-12 21z"/>
 <glyph unicode="&#113;" d="M329 256c0 20-7 37-21 52-15 14-32 21-52 21-20 0-37-7-52-21-14-15-21-32-21-52 0-20 7-37 21-52 15-14 32-21 52-21 20 0 37 7 52 21 14 15 21 32 21 52z m146 31l0-63c0-3 0-5-2-7-1-2-3-3-6-4l-52-8c-4-10-8-19-12-26 7-9 17-22 31-39 2-2 3-5 3-7 0-3-1-5-3-7-5-7-14-17-28-31-14-13-23-20-27-20-2 0-5 1-7 3l-40 31c-8-5-17-8-26-11-3-26-6-44-8-53-1-6-5-8-10-8l-64 0c-2 0-5 0-7 2-2 2-3 4-3 6l-8 53c-9 3-18 6-26 10l-40-30c-2-2-4-3-7-3-3 0-5 1-7 3-24 22-40 38-47 48-2 2-2 4-2 7 0 2 0 4 2 6 3 4 8 11 14 19 7 9 12 16 16 21-5 9-9 19-12 28l-52 8c-3 0-5 1-6 3-2 2-2 4-2 7l0 63c0 3 0 5 2 7 1 2 3 3 5 4l53 8c3 8 7 17 12 26-8 11-18 24-31 39-2 3-3 5-3 7 0 2 1 4 3 7 5 7 14 17 28 30 14 14 23 21 27 21 2 0 5-1 7-3l40-31c8 5 17 8 26 11 3 26 6 44 8 53 1 6 5 8 10 8l64 0c2 0 5 0 7-2 2-2 3-4 3-6l8-53c9-3 18-6 26-10l40 30c2 2 4 3 7 3 3 0 5-1 7-3 25-23 41-39 47-49 2-1 2-3 2-6 0-2 0-4-2-6-3-4-8-11-14-19-7-9-12-16-16-21 5-9 9-18 12-28l52-8c3 0 5-1 6-3 2-2 2-4 2-7z"/>
 <glyph unicode="&#114;" d="M17 222c-14 4-20 13-16 29 3 14 12 20 27 16 0 0 50-12 50-12 0 0-26-41-26-41 0 0-35 8-35 8m455-6c4 4 10 6 16 6 7-1 12-3 16-8 11-11 11-22-1-33 0 0-128-115-128-115-5-4-10-6-16-6-5 0-9 2-14 5 0 0-146 112-146 112 0 0-28 8-28 8 0 0 26 40 26 40 0 0 18-4 18-4 4-1 7-2 8-4 0 0 135-104 135-104 0 0 114 103 114 103m-251 112c0 0-178-280-178-280-4-8-11-12-20-12-4 0-8 2-12 5-5 3-9 8-10 14-1 7 0 12 3 17 0 0 191 300 191 300 3 6 7 9 14 11 6 2 12 1 19-3 0 0 125-80 125-80 0 0 115 166 115 166 4 6 9 9 15 10 6 1 12-1 17-5 13-8 15-18 6-31 0 0-128-185-128-185-9-12-19-14-32-6 0 0-125 79-125 79"/>
 <glyph unicode="&#104;" d="M411 415l0 0 0 0c3 3 3 8 0 11l-10 10c-3 3-8 3-11 0l0 0-45-45c-3-3-3-7 0-10l11-11 0 0c2-3 7-3 10 0z m-162-2l0 0 14 0 0 0c4 0 8 3 8 7l0 0 0 64c0 5-3 8-8 8l0 0-14 0 0 0c-5 0-8-3-8-8l0-64 0 0c0-4 4-7 8-7z m220-106c0 4-3 7-7 8l0 0-64 0c-4 0-8-4-8-8l0-15c0-4 4-7 8-7l64 0 0 0c4 0 7 3 7 7z m-213 81c-60 0-109-49-109-109 0-23 8-45 20-63l0 0c17-25 27-59 27-96 2-2 4-4 7-4 0 0 0 0 1 0l0 0 108 0 0 0c0 0 1 0 1 0 3 0 5 2 7 5 0 38 12 73 29 99 11 17 18 37 18 59 0 60-49 109-109 109z m55-336c0 0-1 0-1 0l0 0-108 0 0 0c-1 0-1 0-1 0-4 0-8-3-8-7l0-17c0-5 4-8 8-8 0 0 0 0 1 0l0 0 108 0 0 0c0 0 1 0 1 0 4 0 7 3 7 8l0 17c0 4-3 7-7 7z m0 49c0 0-1 0-1 0l0 0-108 0 0 0c-1 0-1 0-1 0-4 0-7-4-8-8 0 0 0 0 0 0l0-17c0-4 4-8 8-8 0 0 0 0 1 1l0-1 108 0 0 1c0-1 1-1 1-1 4 0 7 4 7 8l0 17c0 4-3 8-7 8z m-197 208l0 0-64 0c-4 0-7-3-7-8l0-14c0-5 3-8 7-8l64 0 0 0c4 0 8 4 8 8l0 14c0 4-4 8-8 8z m-11 109l46-46 0 0c3-2 7-2 10 1l0 0 11 10c2 3 2 8 0 10l0 0-46 46c-2 3-7 3-10 0l-11-11c-2-3-2-7 0-10z"/>
 <glyph unicode="&#115;" d="M492 217l-83 40c20 12 33 36 33 63 0 40-28 72-62 72-12 0-23-4-32-11 6-14 9-29 9-46 0-24-7-48-20-67 4-5 9-9 15-12l0 0 53-25c15-8 25-24 25-41l0-70 57 0c7 0 14 7 14 16l0 66c0 7-4 13-9 15z m-330 40c4 3 8 6 12 10-13 19-21 43-21 68 0 17 4 33 10 47-10 6-20 10-31 10-34 0-62-32-62-72 0-28 14-52 34-64l-84-39c-5-2-9-8-9-15l0-66c0-9 7-16 14-16l55 0 0 70c0 17 10 34 26 41z m232-49l-72 34-31 15c14 8 25 21 32 37 5 12 9 26 9 41 0 9-2 17-4 24-9 38-38 65-73 65-34 0-63-26-73-63-2-8-3-17-3-26 0-16 3-31 10-44 7-14 18-27 31-35l-29-13-75-35c-6-3-10-10-10-18l0-82c0-11 7-20 17-20l264 0c10 0 18 9 18 20l0 82c0 8-5 15-11 18z"/>
 <glyph unicode="&#116;" d="M256 448c-106 0-192-86-192-192 0-106 86-192 192-192 106 0 192 86 192 192 0 106-86 192-192 192z m0-333c-78 0-141 63-141 141 0 34 12 66 33 90l198-198c-24-21-56-33-90-33z m108 51l-198 198c24 21 56 33 90 33 78 0 141-63 141-141 0-34-12-66-33-90z"/>
+<glyph unicode="&#117;" d="M165 384c0 10-4 19-11 26-7 7-16 11-26 11-10 0-19-4-26-11-7-7-11-16-11-26 0-10 4-19 11-26 7-7 16-11 26-11 10 0 19 4 26 11 7 7 11 16 11 26z m304-165c0-10-3-18-10-25l-140-141c-8-7-17-10-26-10-11 0-19 3-26 10l-204 205c-8 7-14 16-19 29-5 12-7 23-7 33l0 119c0 10 3 18 10 26 8 7 16 10 26 10l119 0c10 0 21-2 33-7 13-5 22-11 30-19l204-204c7-7 10-16 10-26z"/>
+<glyph unicode="&#112;" d="M475 238c-29 45-65 78-108 101 11-20 17-42 17-65 0-35-13-65-38-90-25-25-55-38-90-38-35 0-65 13-90 38-25 25-38 55-38 90 0 23 6 45 17 65-43-23-79-56-108-101 25-39 57-70 95-94 38-23 79-34 124-34 45 0 86 11 124 34 38 24 70 55 95 94z m-205 109c0 4-2 7-4 10-3 3-6 4-10 4-24 0-44-8-61-25-17-17-26-38-26-62 0-4 1-7 4-9 3-3 6-4 10-4 4 0 7 1 10 4 2 2 4 5 4 9 0 17 5 31 17 42 12 12 26 18 42 18 4 0 7 1 10 4 2 2 4 6 4 9z m242-109c0-7-2-13-6-20-26-44-62-79-107-105-45-27-93-40-143-40-50 0-98 13-143 40-45 26-81 61-107 105-4 7-6 13-6 20 0 6 2 13 6 19 26 44 62 79 107 106 45 26 93 39 143 39 50 0 98-13 143-39 45-27 81-62 107-106 4-6 6-13 6-19z"/>
+<glyph unicode="&#118;" d="M426 134c0-7-3-14-8-19l-39-39c-5-5-12-8-20-8-7 0-14 3-19 8l-84 84-84-84c-5-5-12-8-19-8-8 0-15 3-20 8l-39 39c-5 5-8 12-8 19 0 8 3 14 8 20l84 84-84 84c-5 5-8 12-8 19 0 8 3 14 8 20l39 38c5 6 12 8 20 8 7 0 14-2 19-8l84-84 84 84c5 6 12 8 19 8 8 0 15-2 20-8l39-38c5-6 8-12 8-20 0-7-3-14-8-19l-84-84 84-84c5-6 8-12 8-20z"/>
 </font></defs></svg>
--- a/app/assets/fonts/icons.ttf
+++ b/app/assets/fonts/icons.ttf
--- a/app/assets/fonts/icons.woff
+++ b/app/assets/fonts/icons.woff
--- a/app/assets/stylesheets/admin.scss
+++ b/app/assets/stylesheets/admin.scss
@@ -149,6 +149,20 @@ body.admin {
  }
 }

+.verified {
+  color: $check;
+}
+
+.verified a {
+  border-bottom: 1px dotted $check;
+  color: $check;
+  font-size: rem-calc(12);
+}
+
+.rejected {
+  color: #F04124;
+}
+
 .level {
  font-size: rem-calc(12);
 }
@@ -161,6 +175,10 @@ body.admin {
  padding: rem-calc(6) rem-calc(12);
 }

+.button.tiny.success {
+  margin-left: rem-calc(12);
+}
+
 // 04. Stats
 // - - - - - - - - - - - - - - - - - - - - - - - - -

--- a/app/assets/stylesheets/debates.scss
+++ b/app/assets/stylesheets/debates.scss
@@ -163,7 +163,7 @@
      padding-top: 0;
    }

-    .icon-comment-quotes {
+    .icon-debates {
      color: $debates;
      font-size: rem-calc(36);
      line-height: $line-height;
@@ -191,7 +191,7 @@
      font-weight: lighter;
      margin-bottom: 0;

-      .icon-chat-bubble-two {
+      .icon-comments {
        font-size: rem-calc(16);
        vertical-align: top;
      }
@@ -280,7 +280,7 @@
      }
    }

-    .icon-comment-quotes {
+    .icon-debates {
      font-size: rem-calc(18);
      left: rem-calc(60);
      top: 0;
@@ -450,7 +450,7 @@
    margin-bottom: rem-calc(24);
  }

-  .icon-comment-quotes {
+  .icon-debates {
    color: $debates;
    font-size: rem-calc(60);
    line-height: $line-height;
--- a/app/assets/stylesheets/icons.scss
+++ b/app/assets/stylesheets/icons.scss
@@ -49,7 +49,7 @@
 .icon-angle-up:before {
  content: "d";
 }
-.icon-chat-bubble-two:before {
+.icon-comments:before {
  content: "e";
 }
 .icon-twitter:before {
@@ -58,7 +58,7 @@
 .icon-calendar:before {
  content: "g";
 }
-.icon-comment-quotes:before {
+.icon-debates:before {
  content: "i";
 }
 .icon-unlike:before {
@@ -76,9 +76,6 @@
 .icon-star:before {
  content: "n";
 }
-.icon-eye:before {
-  content: "p";
-}
 .icon-user:before {
  content: "o";
 }
@@ -97,3 +94,12 @@
 .icon-deleted:before {
  content: "t";
 }
+.icon-tag:before {
+  content: "u";
+}
+.icon-eye:before {
+  content: "p";
+}
+.icon-x:before {
+  content: "v";
+}
--- a/app/assets/stylesheets/participacion.scss
+++ b/app/assets/stylesheets/participacion.scss
@@ -13,6 +13,7 @@
 // 11. Filters
 // 12. Official levels
 // 13. Pagination
+// 14. Tables
 //

 // 01. Variables
@@ -126,6 +127,29 @@ h1, h2, h3, h4, h5, h6 {
  }
 }

+.sub-nav {
+  background-color: #f2f2f2;
+  border-radius: rem-calc(3);
+  padding: rem-calc(10) rem-calc(10) rem-calc(10) 0;
+  margin: rem-calc(12) 0;
+}
+
+.sub-nav dt, .sub-nav dd, .sub-nav li {
+
+  &.active {
+    background: #008CBA;
+    border-radius: rem-calc(3);
+    color: white;
+    cursor: default;
+    font-weight: normal;
+    padding: 0.16667rem 0.88889rem;
+
+    a:hover {
+      color: #737373;
+    }
+  }
+}
+
 // 04. Header
 // - - - - - - - - - - - - - - - - - - - - - - - - -

@@ -614,7 +638,7 @@ form {
    margin-bottom: rem-calc(24);
  }

-  .icon-comment-quotes {
+  .icon-debates {
    color: $debates;
    font-size: rem-calc(60);
    line-height: $line-height;
@@ -762,3 +786,30 @@ ul.pagination {
    color: $text-medium;
  }
 }
+
+// 14. Tables
+// - - - - - - - - - - - - - - - - - - - - - - - - -
+
+table {
+  border-collapse: collapse;
+  border-spacing: 0;
+  width: 100%;
+
+  tr {
+
+    td {
+      line-height: $line-height;
+      padding: rem-calc(12) rem-calc(6);
+    }
+
+    &:nth-child(odd) {
+      background: #F0F2F6;
+    }
+  }
+
+  .button {
+    margin: 0;
+  }
+}
+
+
--- a/app/views/admin/_menu.html.erb
+++ b/app/views/admin/_menu.html.erb
@@ -4,59 +4,59 @@
      <%= t("admin.dashboard.index.title") %>
    </li>

-    <li <%= 'class=active' if controller_name == 'tags' %>>
+    <li <%= "class=active" if controller_name == "tags" %>>
      <%= link_to admin_tags_path do %>
-        <i class="icon-comment-quotes"></i>
-        <%= t('admin.menu.debate_topics') %>
+        <i class="icon-tag"></i>
+        <%= t("admin.menu.debate_topics") %>
      <% end %>
    </li>

-    <li <%= 'class=active' if controller_name == 'debates' %>>
+    <li <%= "class=active" if controller_name == "debates" %>>
      <%= link_to admin_debates_path do %>
-        <i class="icon-eye"></i>
-        <%= t('admin.menu.hidden_debates') %>
+        <i class="icon-debates"></i>
+        <%= t("admin.menu.hidden_debates") %>
      <% end %>
    </li>

-    <li <%= 'class=active' if controller_name == 'comments' %>>
+    <li <%= "class=active" if controller_name == "comments" %>>
      <%= link_to admin_comments_path do %>
-        <i class="icon-chat-bubble-two"></i>
-        <%= t('admin.menu.hidden_comments') %>
+        <i class="icon-comments"></i>
+        <%= t("admin.menu.hidden_comments") %>
      <% end %>
    </li>

-    <li <%= 'class=active' if controller_name == 'users' %>>
+    <li <%= "class=active" if controller_name == "users" %>>
      <%= link_to admin_users_path do %>
-        <i class="icon-user"></i>
-        <%= t('admin.menu.hidden_users') %>
+        <i class="icon-eye"></i>
+        <%= t("admin.menu.hidden_users") %>
      <% end %>
    </li>

-    <li <%= 'class=active' if controller_name == 'organizations' %>>
+    <li <%= "class=active" if controller_name == "organizations" %>>
      <%= link_to admin_organizations_path do %>
-        <i class="icon-comment-quotes"></i>
-        <%= t('admin.menu.organizations') %>
+        <i class="icon-organizations"></i>
+        <%= t("admin.menu.organizations") %>
      <% end %>
    </li>

-    <li <%= 'class=active' if controller_name == 'officials' %>>
+    <li <%= "class=active" if controller_name == "officials" %>>
      <%= link_to admin_officials_path do %>
        <i class="icon-user"></i>
-        <%= t('admin.menu.officials') %>
+        <%= t("admin.menu.officials") %>
      <% end %>
    </li>

-    <li <%= 'class=active' if controller_name == 'settings' %>>
+    <li <%= "class=active" if controller_name == "settings" %>>
      <%= link_to admin_settings_path do %>
        <i class="icon-settings"></i>
-        <%= t('admin.menu.settings') %>
+        <%= t("admin.menu.settings") %>
      <% end %>
    </li>

-    <li <%= 'class=active' if controller_name == 'stats' %>>
+    <li <%= "class=active" if controller_name == "stats" %>>
      <%= link_to stats_path do %>
        <i class="icon-stats"></i>
-        <%= t('admin.menu.stats') %>
+        <%= t("admin.menu.stats") %>
      <% end %>
    </li>
  </ul>
--- a/app/views/admin/comments/index.html.erb
+++ b/app/views/admin/comments/index.html.erb
@@ -1,18 +1,33 @@
 <h2><%= t("admin.comments.index.title") %></h2>

+<!-- Filters for pending and archived comments (example on "/admin/organizations/index.html.erb")-->
+<dl class="sub-nav">
+  <dt><%= t("admin.comments.index.filter") %>:</dt>
+  <dd class="active"><%= t("admin.comments.filters.all") %></dd>
+  <dd><%= t("admin.comments.filters.pending") %></dd>
+  <dd><%= t("admin.comments.filters.archived") %></dd>
+</dl>
+<!-- Filters for pending and archived comments (example on "/admin/organizations/index.html.erb")-->
+
 <h3><%= page_entries_info @comments %></h3>

 <ul class="admin-list">
  <% @comments.each do |comment| %>
    <li id="<%= dom_id(comment) %>">
      <div class="row">
-        <div class="small-12 medium-10 column">
+        <div class="small-12 medium-8 column">
          <%= comment.body %>
+          <!-- Link to debate of this comment -->
+          <%= link_to t("admin.comments.index.show_debate"), "#" %>
+          <!-- /. Link to debate of this comment -->
        </div>
-        <div class="small-12 medium-2 column">
+        <div class="small-6 medium-4 column text-right">
+          <!-- Link to archive this comment -->
+          <%= link_to t("admin.actions.archive"), "#", class: "button radius tiny warning" %>
+          <!-- /. Link to archive this comment -->
          <%= link_to t("admin.actions.restore"), restore_admin_comment_path(comment),
                      method: :put, data: { confirm: t("admin.actions.confirm") },
-                      class: "button radius small success right" %>
+                      class: "button radius tiny success" %>
        </div>
      </div>
    </li>
--- a/app/views/admin/debates/index.html.erb
+++ b/app/views/admin/debates/index.html.erb
@@ -1,5 +1,14 @@
 <h2><%= t("admin.debates.index.title") %></h2>

+<!-- Filters for pending and archived debates (example on "/admin/organizations/index.html.erb")-->
+<dl class="sub-nav">
+  <dt><%= t("admin.debates.index.filter") %>:</dt>
+  <dd class="active"><%= t("admin.debates.filters.all") %></dd>
+  <dd><%= t("admin.debates.filters.pending") %></dd>
+  <dd><%= t("admin.debates.filters.archived") %></dd>
+</dl>
+<!-- Filters for pending and archived debates (example on "/admin/organizations/index.html.erb")-->
+
 <h3><%= page_entries_info @debates %></h3>

 <ul class="admin-list">
@@ -10,6 +19,10 @@
      <%= link_to t("admin.actions.restore"), restore_admin_debate_path(debate),
            method: :put, data: { confirm: t("admin.actions.confirm") },
            class: "button radius tiny success right" %>
+
+       <!-- Link to archive this debate -->
+          <%= link_to t("admin.actions.archive"), "#", class: "button radius tiny warning right" %>
+      <!-- /. Link to archive this debate -->
    </li>
  <% end %>
 </ul>
--- a/app/views/admin/organizations/index.html.erb
+++ b/app/views/admin/organizations/index.html.erb
@@ -1,17 +1,30 @@
-<h2><%= t('admin.organizations.index.title') %></h2>
+<h2><%= t("admin.organizations.index.title") %></h2>

-<p>
-  <%= t('admin.organizations.index.filter') %>:
+<!-- Search organizations -->
+<%= form_for(User.new, url: search_admin_officials_path, as: :user, method: :get) do |f| %>
+  <div class="row">
+    <div class="small-12 medium-6 column">
+      <%= text_field_tag :email, "", placeholder: t("admin.officials.index.search_email_placeholder") %>
+    </div>
+    <div class="form-inline small-12 medium-6 column">
+      <%= f.submit t("admin.officials.index.search"), class: "button radius success" %>
+    </div>
+  </div>
+<% end %>
+<!-- /. Search organizations -->
+
+<dl class="sub-nav">
+  <dt><%= t("admin.organizations.index.filter") %>:</dt>

  <% @valid_filters.each do |filter| %>
    <% if @filter == filter %>
-      <%= t("admin.organizations.index.filters.#{filter}") %>
+      <dd class="active"><%= t("admin.organizations.index.filters.#{filter}") %></dd>
    <% else %>
-      <%= link_to t("admin.organizations.index.filters.#{filter}"),
-        admin_organizations_path(filter: filter) %>
+      <dd><%= link_to t("admin.organizations.index.filters.#{filter}"),
+        admin_organizations_path(filter: filter) %></dd>
    <% end %>
  <% end %>
-</p>
+</dl>

 <h3><%= page_entries_info @organizations %></h3>

@@ -21,23 +34,38 @@
    <td><%= organization.name %></td>
    <td><%= organization.email %></td>
    <td><%= organization.phone_number %></td>
+    <!-- Badge collective name, "collective" by default -->
+    <td>Colectivo</td>
+    <!-- /. Badge collective name, "collective" by default -->
    <% if organization.verified? %>
-      <td><%= t('admin.organizations.index.verified') %></td>
-    <% end %>
-    <% if can? :verify, organization %>
-      <td><%= link_to t('admin.organizations.index.verify'),
-                verify_admin_organization_path(organization, request.query_parameters),
-                method: :put
-          %>
+      <td class="verified">
+        <i class="icon-check"></i>
+        <%= t("admin.organizations.index.verified") %>
      </td>
    <% end %>
    <% if organization.rejected? %>
-      <td><%= t('admin.organizations.index.rejected') %></td>
+      <td class="rejected">
+        <i class="icon-x"></i>
+        <%= t("admin.organizations.index.rejected") %>
+      </td>
+    <% end %>
+    <td>
+    <!-- Edit collective bagde, "collective" by default -->
+      <%= link_to t("admin.organizations.index.edit"), "", class: "button radius tiny secondary" %>
+    <!-- /. Edit collective bagde, "collective" by default -->
+    </td>
+    <% if can? :verify, organization %>
+      <td>
+        <%= link_to t("admin.organizations.index.verify"),
+                verify_admin_organization_path(organization, request.query_parameters),
+                method: :put, class: "button radius tiny success"
+        %>
+      </td>
    <% end %>
    <% if can? :reject, organization %>
-      <td><%= link_to t('admin.organizations.index.reject'),
+      <td><%= link_to t("admin.organizations.index.reject"),
                reject_admin_organization_path(organization, request.query_parameters),
-                method: :put
+                method: :put, class: "button radius tiny alert"
          %>
      </td>
    <% end %>
--- a/app/views/debates/_debate.html.erb
+++ b/app/views/debates/_debate.html.erb
@@ -5,10 +5,10 @@
      <div class="small-12 medium-9 column">
        <div class="debate-content">
          <span class="label left"><%= t("debates.debate.debate") %></span>
-          <i class="icon-comment-quotes"></i>
+          <i class="icon-debates"></i>
          <h3><%= link_to debate.title, debate %></h3>
          <p class="debate-info">
-            <i class="icon-chat-bubble-two"></i>&nbsp;
+            <i class="icon-comments"></i>&nbsp;
            <%= link_to t("debates.debate.comments", count: debate.comment_threads.count), debate_path(debate, anchor: "comments") %>
          </p>
          <div class="debate-description">
--- a/app/views/debates/new.html.erb
+++ b/app/views/debates/new.html.erb
@@ -10,7 +10,7 @@
  </div>

  <div class="small-12 medium-3 column">
-    <i class="icon-comment-quotes right"></i>
+    <i class="icon-debates right"></i>
    <h2><%= t("debates.new.recommendations_title") %></h2>
    <ul class="recommendations">
      <li><%= t("debates.new.recommendation_one") %></li>
--- a/app/views/debates/show.html.erb
+++ b/app/views/debates/show.html.erb
@@ -39,7 +39,7 @@
        <span class="bullet">&nbsp;&bullet;&nbsp;</span>
        <%= l @debate.created_at.to_date %>
        <span class="bullet">&nbsp;&bullet;&nbsp;</span>
-        <i class="icon-chat-bubble-two"></i>&nbsp;
+        <i class="icon-comments"></i>&nbsp;
        <%= link_to t("debates.show.comments", count: @debate.comment_threads.count), "#comments" %>
      </div>

--- a/app/views/welcome/_featured_debate.html.erb
+++ b/app/views/welcome/_featured_debate.html.erb
@@ -4,10 +4,10 @@

      <div class="debate-content">
        <span class="label left"><%= t("debates.debate.debate") %></span>
-        <i class="icon-comment-quotes right"></i>
+        <i class="icon-debates right"></i>
        <h3><%= link_to featured_debate.title, featured_debate %></h3>
        <p class="debate-info">
-          <i class="icon-chat-bubble-two"></i>&nbsp;
+          <i class="icon-comments"></i>&nbsp;
          <%= link_to t("debates.show.comments", count: featured_debate.comment_threads.count), debate_path(featured_debate, anchor: "comments") %>
        </p>
        <div class="debate-description">
--- a/config/locales/admin.en.yml
+++ b/config/locales/admin.en.yml
@@ -25,6 +25,7 @@ en:
        verified: Verified
        rejected: Rejected
        filter: Filter
+        edit: Edit
        filters:
          all: All
          pending: Pending
@@ -35,6 +36,7 @@ en:
      hide_author: Ban author
      restore: Restore
      confirm: 'Are you sure?'
+      archive: Archive
    tags:
      index:
        title: 'Debate topics'
@@ -46,15 +48,26 @@ en:
    comments:
      index:
        title: Hidden comments
+        show_debate: Show debate
+        filter: Filter
      restore:
        success: The comment has been restored
+      filters:
+        all: All
+        pending: Pending
+        archived: Archived
    debates:
      index:
        title: Hidden debates
+        filter: Filter
      show:
        back: Back
      restore:
        success: The debate has been restored
+      filters:
+        all: All
+        pending: Pending
+        archived: Archived
    users:
      index:
        title: Banned users
--- a/config/locales/admin.es.yml
+++ b/config/locales/admin.es.yml
@@ -25,6 +25,7 @@ es:
        verified: Verificada
        rejected: Rechazada
        filter: Filtro
+        edit: Editar
        filters:
          all: Todas
          pending: Pendientes
@@ -35,26 +36,38 @@ es:
      hide_author: Bloquear al autor
      restore: Volver a mostrar
      confirm: '¿Estás seguro?'
+      archive: Archivar
    tags:
      index:
        title: 'Temas de debate'
        add_tag: 'Añade un nuevo tema de debate'
-      mark_as_featured: 'Proponer etiqueta al crear debate'
+      mark_as_featured: 'Proponer tema al crear debate'
      name:
        placeholder: 'Escribe el nombre del tema'
      destroy: Elimina la etiqueta
    comments:
      index:
        title: Comentarios ocultos
+        show_debate: Ver debate
+        filter: Filtro
      restore:
        success: El comentario ha sido permitido
+      filters:
+        all: Todos
+        pending: Pendientes
+        archived: Archivados
    debates:
      index:
        title: Debates ocultos
+        filter: Filtro
      show:
        back: Volver
      restore:
        success: El debate ha sido permitido
+      filters:
+        all: Todos
+        pending: Pendientes
+        archived: Archivados
    users:
      index:
        title: Usuarios bloqueados