Merge branch 'master' of github.com:AyuntamientoMadrid/participacion

2015-08-26 21:40:44 +01:00
parent 4c71577da6 9ab13abf20
commit 3baef4ae79
91 changed files with 1170 additions and 360 deletions
--- a/app/views/account/show.html.erb
+++ b/app/views/account/show.html.erb
@@ -26,7 +26,7 @@

        <div class="small-12 medium-6 column">
          <h2><%= t("account.show.avatar")%></h2>
-          <%= avatar_image(@account, size: 100) %>
+          <%= avatar_image(@account, seed: @account.id, size: 100) %>

          <h2><%= t("account.show.notifications")%></h2>

--- a/app/views/comments/_actions.html.erb
+++ b/app/views/comments/_actions.html.erb
@@ -1,12 +1,16 @@
+<span class="js-flag-as-inappropiate-actions">
+  <%= render 'comments/flag_as_inappropiate_actions', comment: comment %>
+</span>
+
 <span class='js-moderation-actions'>
  <% if can? :hide, comment %>
-    &nbsp;|&nbsp;
+    <span class="divider">&nbsp;&bullet;&nbsp;</span>
    <%= link_to t("admin.actions.hide").capitalize, hide_moderation_comment_path(comment),
                method: :put, remote: true, data: { confirm: t('admin.actions.confirm') } %>
  <% end %>

  <% if can? :hide, comment.user %>
-    &nbsp;|&nbsp;
+    <span class="divider">&nbsp;&bullet;&nbsp;</span>
    <%= link_to t("admin.actions.hide_author").capitalize, hide_moderation_user_path(comment.user_id, debate_id: @debate.id),
                method: :put, data: { confirm: t('admin.actions.confirm') } %>
  <% end %>
--- a/app/views/comments/_comment.html.erb
+++ b/app/views/comments/_comment.html.erb
@@ -14,7 +14,7 @@
        <% if comment.user.organization? %>
          <%= image_tag("collective_avatar.png", size: 32, class: "avatar left") %>
        <% else %>
-          <%= avatar_image(comment.user, size: 32, class: "left") %>
+          <%= avatar_image(comment.user, seed: comment.user_id, size: 32, class: "left") %>
        <% end %>
        <% if comment.user.hidden? %>
          <i class="icon-deleted user-deleted"></i>
@@ -58,10 +58,6 @@
          <% end %>

          &nbsp;&bullet;&nbsp;<%= time_ago_in_words(comment.created_at) %>
-
-          <span class="right js-flag-as-inappropiate-actions">
-            <%= render 'comments/flag_as_inappropiate_actions', comment: comment %>
-          </span>
        </div>

        <% if comment.as_administrator? %>
@@ -81,11 +77,11 @@
          <%= render 'comments/votes', comment: comment %>
        </span>

-        <p class="reply">
+        <div class="reply">
          <%= t("debates.comment.responses", count: comment.children_count) %>

          <% if user_signed_in? %>
-            &nbsp;|&nbsp;
+            <span class="divider">&nbsp;|&nbsp;</span>
            <%= link_to(comment_link_text(comment), "",
                        class: "js-add-comment-link", data: {'id': dom_id(comment)}) %>

@@ -93,13 +89,13 @@

            <%= render 'comments/form', {parent: comment, toggeable: true} %>
          <% end %>
-        </p>
+        </div>
      </div>

    <% end %>

      <div class="comment-children">
-        <%= render comment.children.with_hidden.reorder('id DESC, lft') %>
+        <%= render comment.children.for_render.reorder('id DESC, lft') %>
      </div>
  </div>
 </div>
--- a/app/views/comments/_flag_as_inappropiate_actions.html.erb
+++ b/app/views/comments/_flag_as_inappropiate_actions.html.erb
@@ -1,6 +1,23 @@
 <% if can? :flag_as_inappropiate, comment %>
-  <%= link_to t('shared.flag_as_inappropiate'), flag_as_inappropiate_comment_path(comment), method: :put, remote: true %>
+  <span class="divider">&nbsp;|&nbsp;</span>
+  <a id="flag-expand-comment-<%= comment.id %>" data-dropdown="flag-drop-comment-<%= comment.id %>" aria-controls="flag-drop-comment-<%= comment.id %>" aria-expanded="false" title="<%= t('shared.flag_as_inappropiate') %>">
+    &nbsp;<i class="icon-flag flag-disable"></i>&nbsp;&nbsp;
+  </a>
+  <ul id="flag-drop-comment-<%= comment.id %>" class="f-dropdown" data-dropdown-content aria-hidden="true" tabindex="-1">
+    <li>
+      <%= link_to t("shared.flag_as_inappropiate"), flag_as_inappropiate_comment_path(comment), method: :put, remote: true, id: "flag-comment-#{comment.id}" %>
+    </li>
+  </ul>
 <% end %>
+
 <% if can? :undo_flag_as_inappropiate, comment %>
-  <%= link_to t('shared.undo_flag_as_inappropiate'), undo_flag_as_inappropiate_comment_path(comment), method: :put, remote: true %>
+  <span class="divider">&nbsp;|&nbsp;</span>
+  <a id="unflag-expand-comment-<%= comment.id %>" data-dropdown="unflag-drop-comment-<%= comment.id %>" aria-controls="unflag-drop-comment-<%= comment.id %>" aria-expanded="false" title="<%= t('shared.undo_flag_as_inappropiate') %>">
+    &nbsp;<i class="icon-flag flag-active"></i>&nbsp;&nbsp;
+  </a>
+  <ul id="unflag-drop-comment-<%= comment.id %>" class="f-dropdown" data-dropdown-content aria-hidden="true" tabindex="-1">
+    <li>
+      <%= link_to t("shared.undo_flag_as_inappropiate"), undo_flag_as_inappropiate_comment_path(comment), method: :put, remote: true, id: "unflag-comment-#{comment.id}" %>
+    </li>
+  </ul>
 <% end %>
--- a/app/views/comments/_votes.html.erb
+++ b/app/views/comments/_votes.html.erb
@@ -1,5 +1,4 @@
 <span>
-  <!-- <%= t('debates.comment.votes_weighted_score', score: comment.weighted_score) %> -->
  <%= t('debates.comment.votes', count: comment.total_votes) %>
 </span>
 &nbsp;|&nbsp;
@@ -8,7 +7,7 @@
      method: "post", remote: true do %>
      <i class="icon-angle-up"></i>
  <% end %>
-  <%= comment.get_likes.size %>
+  <%= comment.total_likes %>
 </span>

 <span class="against">
@@ -16,5 +15,5 @@
      method: "post", remote: true do %>
      <i class="icon-angle-down"></i>
  <% end %>
-  <%= comment.get_dislikes.size %>
+  <%= comment.total_dislikes %>
 </span>
--- a/app/views/debates/_debate.html.erb
+++ b/app/views/debates/_debate.html.erb
@@ -9,7 +9,7 @@
          <h3><%= link_to debate.title, debate %></h3>
          <p class="debate-info">
            <i class="icon-comments"></i>&nbsp;
-            <%= link_to t("debates.debate.comments", count: debate.comment_threads.count), debate_path(debate, anchor: "comments") %>
+            <%= link_to t("debates.debate.comments", count: debate.comments_count), debate_path(debate, anchor: "comments") %>
          </p>
          <div class="debate-description">
            <%= link_to debate.description, debate %>
--- a/app/views/debates/_flag_as_inappropiate_actions.html.erb
+++ b/app/views/debates/_flag_as_inappropiate_actions.html.erb
@@ -1,6 +1,21 @@
 <% if can? :flag_as_inappropiate, debate %>
-  <%= link_to t('shared.flag_as_inappropiate'), flag_as_inappropiate_debate_path(debate), method: :put, remote: true %>
+  <a id="flag-expand-debate-<%= debate.id %>" data-dropdown="flag-drop-debate-<%= debate.id %>" aria-controls="flag-drop-debate-<%= debate.id %>" aria-expanded="false" title="<%= t('shared.flag_as_inappropiate') %>">
+    &nbsp;<i class="icon-flag flag-disable"></i>&nbsp;&nbsp;
+  </a>
+  <ul id="flag-drop-debate-<%= debate.id %>" class="f-dropdown" data-dropdown-content aria-hidden="true" tabindex="-1">
+    <li>
+      <%= link_to t('shared.flag_as_inappropiate'), flag_as_inappropiate_debate_path(debate), method: :put, remote: true, id: "flag-debate-#{ debate.id }" %>
+    </li>
+  </ul>
 <% end %>
+
 <% if can? :undo_flag_as_inappropiate, debate %>
-  <%= link_to t('shared.undo_flag_as_inappropiate'), undo_flag_as_inappropiate_debate_path(debate), method: :put, remote: true %>
+  <a id="unflag-expand-debate-<%= debate.id %>" data-dropdown="unflag-drop-debate-<%= debate.id %>" aria-controls="unflag-drop-debate-<%= debate.id %>" aria-expanded="false" title="<%= t('shared.undo_flag_as_inappropiate') %>">
+    &nbsp;<i class="icon-flag flag-active"></i>&nbsp;&nbsp;
+  </a>
+  <ul id="unflag-drop-debate-<%= debate.id %>" class="f-dropdown" data-dropdown-content aria-hidden="true" tabindex="-1">
+    <li>
+      <%= link_to t('shared.undo_flag_as_inappropiate'), undo_flag_as_inappropiate_debate_path(debate), method: :put, remote: true, id: "unflag-debate-#{ debate.id }" %>
+    </li>
+  </ul>
 <% end %>
--- a/app/views/debates/show.html.erb
+++ b/app/views/debates/show.html.erb
@@ -13,7 +13,7 @@
      <h1><%= @debate.title %></h1>

      <div class="debate-info">
-        <%= avatar_image(@debate.author, size: 32, class: 'author-photo') %>
+        <%= avatar_image(@debate.author, seed: @debate.author_id, size: 32, class: 'author-photo') %>
        <% if @debate.author.hidden? %>
          <i class="icon-deleted author-deleted"></i>
          <span class="author">
@@ -40,9 +40,9 @@
        <%= l @debate.created_at.to_date %>
        <span class="bullet">&nbsp;&bullet;&nbsp;</span>
        <i class="icon-comments"></i>&nbsp;
-        <%= link_to t("debates.show.comments", count: @debate.comment_threads.count), "#comments" %>
-
-        <span class='right js-flag-as-inappropiate-actions'>
+        <%= link_to t("debates.show.comments", count: @debate.comments_count), "#comments" %>
+        <span class="bullet">&nbsp;&bullet;&nbsp;</span>
+        <span class="js-flag-as-inappropiate-actions">
          <%= render 'debates/flag_as_inappropiate_actions', debate: @debate %>
        </span>
      </div>
@@ -79,7 +79,7 @@

      <h2>
        <%= t("debates.show.comments_title") %>
-        <span>(<%= @debate.comment_threads.count %>)</span>
+        <span>(<%= @debate.comments_count %>)</span>
      </h2>
      <% if user_signed_in? %>
          <%= render 'comments/form', {parent: @debate, toggeable: false} %>
--- a/app/views/devise/_omniauth_form.html.erb
+++ b/app/views/devise/_omniauth_form.html.erb
@@ -0,0 +1,7 @@
+<br/>
+
+<%= link_to t("omniauth.twitter.sign_in"), user_omniauth_authorize_path(:twitter), class: 'button radius expand' %>
+<%= link_to t("omniauth.facebook.sign_in"), user_omniauth_authorize_path(:facebook), class: 'button radius expand' %>
+<%= link_to t("omniauth.google_oauth2.sign_in"), user_omniauth_authorize_path(:google_oauth2), class: 'button radius expand' %>
+
+<hr/>
--- a/app/views/devise/mailer/confirmation_instructions.html.erb
+++ b/app/views/devise/mailer/confirmation_instructions.html.erb
@@ -1,5 +1,18 @@
-<p><%= t("devise_views.mailer.confirmation_instructions.welcome") %> <%= @email %></p>
+<td style="padding-bottom: 20px; padding-left: 10px;">

-<p><%= t("devise_views.mailer.confirmation_instructions.text") %></p>
+  <h1 style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;">
+    <%= t("devise_views.mailer.confirmation_instructions.title") %>
+  </h1>

-<p><%= link_to t("devise_views.mailer.confirmation_instructions.confirm_link"), confirmation_url(@resource, confirmation_token: @token) %></p>
+  <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-weight: normal;line-height: 24px;">
+    <%= t("devise_views.mailer.confirmation_instructions.welcome") %> <strong><%= @email %></strong>
+  </p>
+
+  <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-weight: normal;line-height: 24px;">
+    <%= t("devise_views.mailer.confirmation_instructions.text") %>
+  </p>
+
+  <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-weight: normal;line-height: 24px;">
+    <%= link_to t("devise_views.mailer.confirmation_instructions.confirm_link"), confirmation_url(@resource, confirmation_token: @token), style: "color: #2895F1; text-decoration:none;" %>
+  </p>
+</td>
--- a/app/views/devise/mailer/reset_password_instructions.html.erb
+++ b/app/views/devise/mailer/reset_password_instructions.html.erb
@@ -1,8 +1,22 @@
-<p><%= t("devise_views.mailer.reset_password_instructions.hello") %> <%= @resource.email %></p>
+<td style="padding-bottom: 20px; padding-left: 10px;">

-<p><%= t("devise_views.mailer.reset_password_instructions.text") %></p>
+  <h1 style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;">
+    <%= t("devise_views.mailer.reset_password_instructions.title") %>
+  </h1>

-<p><%= link_to t("devise_views.mailer.reset_password_instructions.change_link"), edit_password_url(@resource, reset_password_token: @token) %></p>
+  <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-weight: normal;line-height: 24px;">
+    <%= t("devise_views.mailer.reset_password_instructions.hello") %> <strong><%= @resource.email %></strong>
+  </p>

-<p><%= t("devise_views.mailer.reset_password_instructions.ignore_text") %></p>
-<p><%= t("devise_views.mailer.reset_password_instructions.info_text") %></p>
+  <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-weight: normal;line-height: 24px;">
+    <%= t("devise_views.mailer.reset_password_instructions.text") %>
+  </p>
+
+  <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-weight: normal;line-height: 24px;">
+    <%= link_to t("devise_views.mailer.reset_password_instructions.change_link"), edit_password_url(@resource, reset_password_token: @token), style: "color: #2895F1; text-decoration:none;" %>
+  </p>
+
+  <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-weight: normal;line-height: 24px;">
+    <%= t("devise_views.mailer.reset_password_instructions.ignore_text") %> <%= t("devise_views.mailer.reset_password_instructions.info_text") %>
+  </p>
+</td>
--- a/app/views/devise/mailer/unlock_instructions.html.erb
+++ b/app/views/devise/mailer/unlock_instructions.html.erb
@@ -1,7 +1,22 @@
-<p><%= t("devise_views.mailer.unlock_instructions.hello") %> <%= @resource.email %></p>
+<td style="padding-bottom: 20px; padding-left: 10px;">

-<p><%= t("devise_views.mailer.unlock_instructions.info_text") %></p>
+  <h1 style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;">
+    <%= t("devise_views.mailer.unlock_instructions.title") %>
+  </h1>

-<p><%= t("devise_views.mailer.unlock_instructions.instructions_text") %></p>
+  <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-weight: normal;line-height: 24px;">
+    <%= t("devise_views.mailer.unlock_instructions.hello") %> <strong><%= @resource.email %></strong>
+  </p>

-<p><%= link_to t("devise_views.mailer.unlock_instructions.unlock_link"), unlock_url(@resource, unlock_token: @token) %></p>
+  <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-weight: normal;line-height: 24px;">
+    <%= t("devise_views.mailer.unlock_instructions.info_text") %>
+  </p>
+
+  <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-weight: normal;line-height: 24px;">
+    <%= t("devise_views.mailer.unlock_instructions.instructions_text") %>
+  </p>
+
+  <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-weight: normal;line-height: 24px;">
+    <%= link_to t("devise_views.mailer.unlock_instructions.unlock_link"), unlock_url(@resource, unlock_token: @token), style: "color: #2895F1; text-decoration:none;" %>
+  </p>
+</td>
--- a/app/views/devise/menu/_login_items.html.erb
+++ b/app/views/devise/menu/_login_items.html.erb
@@ -7,11 +7,11 @@
      <%= link_to(t("devise_views.menu.login_items.logout"), destroy_user_session_path, method: :delete) %>
    </li>
  <% else %>
-  <li>
-    <%= link_to(t("devise_views.menu.login_items.login"), new_user_session_path)  %>
-  </li>
-  <li>
-    <%= link_to(t("devise_views.menu.login_items.signup"), new_user_registration_path, class: "button radius small") %>
-  </li>
+    <li>
+      <%= link_to(t("devise_views.menu.login_items.login"), new_user_session_path)  %>
+    </li>
+    <li>
+      <%= link_to(t("devise_views.menu.login_items.signup"), new_user_registration_path, class: "button radius small") %>
+    </li>
  <% end %>
-</ul>
+</ul>
--- a/app/views/devise/passwords/new.html.erb
+++ b/app/views/devise/passwords/new.html.erb
@@ -19,4 +19,4 @@
      <%= render "devise/shared/links" %>
    </div>
  </div>
-</div>
+</div>
--- a/app/views/devise/sessions/new.html.erb
+++ b/app/views/devise/sessions/new.html.erb
@@ -3,6 +3,8 @@
    <div class="panel">
      <h2><%= t("devise_views.sessions.new.title") %></h2>

+      <%= render 'devise/omniauth_form' %>
+
      <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %>
        <div class="row">
          <div class="small-12 columns">
@@ -28,4 +30,4 @@
      <%= render "devise/shared/links" %>
    </div>
  </div>
-</div>
+</div>
--- a/app/views/devise/shared/_links.html.erb
+++ b/app/views/devise/shared/_links.html.erb
@@ -25,7 +25,7 @@
 	  <%= link_to t("devise_views.shared.links.new_unlock"), new_unlock_path(resource_name) %><br>
 	<% end -%>

-	<%- if devise_mapping.omniauthable? %>
+	<%- if devise_mapping.omniauthable? && devise_mapping.name == 'user' %>
 	  <%- resource_class.omniauth_providers.each do |provider| %>
 	    <%= link_to t("devise_views.shared.links.signin_with_provider", provider: provider.to_s.titleize), omniauth_authorize_path(resource_name, provider) %><br>
 	  <% end -%>
--- a/app/views/layouts/mailer.html.erb
+++ b/app/views/layouts/mailer.html.erb
@@ -1,5 +1,42 @@
-<html>
-  <body>
-    <%= yield %>
-  </body>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html lang="es">
+<head>
+  <title>Gobierno abierto</title>
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8">
+  <meta name="viewport" id="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0,maximum-scale=10.0"/>
+</head>
+<body style="background: #fff; font-family:font-family: 'Open Sans','Helvetica Neue',arial,sans-serif !important; margin: 0 10px; padding: 0; text-align: left;">
+
+  <table cellpadding="0" cellspacing="0" border="0" style="background: #fff; margin: 0 auto; max-width: 700px; width:100%;">
+    <tr>
+      <td>
+        <table cellpadding="0" cellspacing="0" border="0" style="width: 100%;">
+          <tr>
+            <td style="border-bottom: 1px solid #dadfe1; padding: 20px 0;">
+              <a href="#" target="_blank">
+                <%= image_tag('logo_email_gobierno_abierto.png',  style: "border: 0; display: block; width: 100%;max-width: 370px") %>
+              </a>
+            </td>
+          </tr>
+        </table>
+      </td>
+    </tr>
+    <tr>
+      <%= yield %>
+    </tr>
+  </table>
+
+  <table cellpadding="0" cellspacing="0" border="0" style="margin: 0 auto; max-width: 700px; width:100%; margin-bottom: 40px; padding: 0 20px;">
+    <tbody>
+    <tr>
+      <td style="text-align: center; border-top: 1px solid #dadfe1; padding-top: 20px;">
+        <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; margin: 0;padding: 0;line-height: 1.5em;color: #797f7f; font-size: 12px;">
+          <a href="#" style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;margin: 0;padding: 0;color: #398fd1;text-decoration: none;">Preguntas frecuentes</a>&nbsp;<span style="color:#398fd1;">&bullet;</span>&nbsp;<a href="mailto:#" style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;margin: 0;padding: 0;color: #398fd1;text-decoration: none;">tec.gobiernoabierto@madrid.es</a></p>
+        <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif; margin: 0;padding: 0;line-height: 1.5em;color: #797f7f; font-size: 12px;">
+        &copy; 2015 Ayuntamiento de Madrid</p>
+      </td>
+    </tr>
+    </tbody>
+  </table>
+</body>
 </html>
--- a/app/views/mailer/comment.html.erb
+++ b/app/views/mailer/comment.html.erb
@@ -1,6 +1,18 @@
-<%= t('mailers.comment.hi', recipient: @debate.author.name) %>
+<td style="padding-bottom: 20px; padding-left: 10px;">

-<div><%= link_to @debate.title, debate_url(@debate) %></div>
-<div><%= t('mailers.comment.new_comment_by', commenter: @comment.author.name) %></div>
+  <h1 style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;">
+    <%= t("mailers.comment.title") %>
+  </h1>

-<div><%= @comment.body %></div>
+  <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-weight: normal;line-height: 24px;">
+    <%= t("mailers.comment.hi") %> <strong><%= @debate.author.name %></strong>,
+  </p>
+
+  <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-weight: normal;line-height: 24px;">
+    <%= t("mailers.comment.new_comment_by_html", commenter: @comment.author.name) %> <%= link_to @debate.title, debate_url(@debate), style: "color: #2895F1; text-decoration:none;" %>
+  </p>
+
+  <p style="border-left: 2px solid #DEE0E3;font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-style: italic;font-weight: normal;line-height: 24px;margin-left: 20px;padding: 10px;">
+    <%= @comment.body %>
+  </p>
+</td>
--- a/app/views/mailer/reply.html.erb
+++ b/app/views/mailer/reply.html.erb
@@ -1,6 +1,18 @@
-<%= t('mailers.reply.hi', recipient: @recipient.name) %>
+<td style="padding-bottom: 20px; padding-left: 10px;">

-<div><%= link_to @debate.title, debate_url(@debate) %></div>
-<div><%= t('mailers.reply.new_reply_by', commenter: @reply.author.name) %></div>
+  <h1 style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;">
+    <%= t("mailers.reply.title") %>
+  </h1>

-<div><%= @reply.body %></div>
+  <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-weight: normal;line-height: 24px;">
+    <%= t("mailers.reply.hi") %> <strong><%= @recipient.name %></strong>,
+  </p>
+
+  <p style="font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-weight: normal;line-height: 24px;">
+    <%= t("mailers.reply.new_reply_by_html", commenter: @reply.author.name) %> <%= link_to @debate.title, debate_url(@debate), style: "color: #2895F1; text-decoration:none;" %>
+  </p>
+
+  <p style="border-left: 2px solid #DEE0E3;font-family: 'Open Sans','Helvetica Neue',arial,sans-serif;font-size: 14px;font-style: italic;font-weight: normal;line-height: 24px;margin-left: 20px;padding: 10px;">
+    <%= @reply.body %>
+  </p>
+</td>
--- a/app/views/moderation/_menu.html.erb
+++ b/app/views/moderation/_menu.html.erb
@@ -4,17 +4,17 @@
      <%= t("moderation.dashboard.index.title") %>
    </li>

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

-    <li <%= 'class=active' if controller_name == 'comments' %>>
+    <li <%= "class=active" if controller_name == "comments" %>>
      <%= link_to moderation_comments_path do %>
-        <i class="icon-comment-quotes"></i>
-        <%= t('moderation.menu.flagged_comments') %>
+        <i class="icon-comments"></i>
+        <%= t("moderation.menu.flagged_comments") %>
      <% end %>
    </li>
  </ul>
--- a/app/views/moderation/comments/index.html.erb
+++ b/app/views/moderation/comments/index.html.erb
@@ -1,45 +1,52 @@
-<h2><%= t('moderation.comments.index.title') %></h2>
+<h2><%= t("moderation.comments.index.title") %></h2>
+
+<dl class="sub-nav">
+  <dt><%= t("moderation.comments.index.filter") %>:</dt>

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

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

 <table>
  <tr>
-    <th><%= t('moderation.comments.index.headers.flags') %></th>
-    <th><%= t('moderation.comments.index.headers.updated_at') %></th>
-    <th><%= t('moderation.comments.index.headers.commentable_type') %></th>
-    <th><%= t('moderation.comments.index.headers.commentable') %></th>
-    <th><%= t('moderation.comments.index.headers.comment') %></th>
+    <th>
+      <%= t("moderation.comments.index.headers.commentable") %>&nbsp;|&nbsp;
+      <%= t("moderation.comments.index.headers.commentable_type") %>&nbsp;|&nbsp;
+      <%= t("moderation.comments.index.headers.updated_at") %>
+    </th>
+    <th><%= t("moderation.comments.index.headers.comment") %></th>
+    <th class="text-center"><%= t("moderation.comments.index.headers.flags") %></th>
+    <th class="text-center" colspan="2"><%= t("moderation.debates.index.headers.actions") %></th>
  </tr>
  <% @comments.each do |comment| %>
    <tr id="comment_<%= comment.id %>">
-      <td><%= comment.inappropiate_flags_count %></td>
-      <td><%= l comment.updated_at.to_date %></td>
-      <td><%= comment.commentable_type.constantize.model_name.human %></td>
-      <td><%= link_to comment.commentable.title, comment.commentable %></td>
-      <td><%= comment.body %></td>
      <td>
-        <%= link_to t('moderation.comments.index.hide'), hide_in_moderation_screen_moderation_comment_path(comment, request.query_parameters), method: :put %>
+        <%= link_to comment.commentable.title, comment.commentable %>
+        <br>
+        <%= comment.commentable_type.constantize.model_name.human %>
+        <span class="date"><%= l comment.updated_at.to_date %></span>
      </td>
-      <% if can? :mark_as_reviewed, comment %>
+      <td><%= comment.body %></td>
+      <td class="text-center"><%= comment.inappropiate_flags_count %></td>
+      <td>
+        <%= link_to t("moderation.comments.index.hide"), hide_in_moderation_screen_moderation_comment_path(comment, request.query_parameters), method: :put, class: "delete" %>
+      </td>
+      <% if can? :archive, comment %>
        <td>
-          <%= link_to t('moderation.comments.index.mark_as_reviewed'), mark_as_reviewed_moderation_comment_path(comment, request.query_parameters), method: :put %>
+          <%= link_to t("moderation.comments.index.archive"), archive_moderation_comment_path(comment, request.query_parameters), method: :put, class: "button radius tiny warning" %>
        </td>
      <% end %>
-      <% if comment.reviewed? %>
-        <td>
-          <%= t('moderation.comments.index.reviewed') %>
+      <% if comment.archived? %>
+        <td class="archived">
+          <%= t("moderation.comments.index.archived") %>
        </td>
      <% end %>
    </tr>
@@ -47,4 +54,3 @@
 </table>

 <%= paginate @comments %>
-
--- a/app/views/moderation/dashboard/index.html.erb
+++ b/app/views/moderation/dashboard/index.html.erb
@@ -1 +1,5 @@
-<h1><%= t("moderation.dashboard.index.title") %></h1>
+<h2><%= t("moderation.dashboard.index.title") %></h2>
+
+<p>Lorem ipsum moderator sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p>
+
+<p>Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem.</p>
--- a/app/views/moderation/debates/index.html.erb
+++ b/app/views/moderation/debates/index.html.erb
@@ -1,43 +1,51 @@
-<h2><%= t('moderation.debates.index.title') %></h2>
+<h2><%= t("moderation.debates.index.title") %></h2>
+
+<dl class="sub-nav">
+  <dt><%= t("moderation.debates.index.filter") %>:</dt>

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

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

 <table>
  <tr>
-    <th><%= t('moderation.debates.index.headers.flags') %></th>
-    <th><%= t('moderation.debates.index.headers.updated_at') %></th>
-    <th><%= t('moderation.debates.index.headers.title') %></th>
-    <th><%= t('moderation.debates.index.headers.description') %></th>
+    <th>
+      <%= t("moderation.debates.index.headers.title") %>&nbsp;|&nbsp;
+      <%= t("moderation.debates.index.headers.updated_at") %>&nbsp;|&nbsp;
+      <%= t("moderation.debates.index.headers.description") %>
+    </th>
+    <th class="text-center"><%= t("moderation.debates.index.headers.flags") %></th>
+    <th class="text-center" colspan="2"><%= t("moderation.debates.index.headers.actions") %></th>
  </tr>
  <% @debates.each do |debate| %>
    <tr id="debate_<%= debate.id %>">
-      <td><%= debate.inappropiate_flags_count %></td>
-      <td><%= l debate.updated_at.to_date %></td>
-      <td><%= link_to debate.title, debate %></td>
-      <td><%= debate.description %></td>
      <td>
-        <%= link_to t('moderation.debates.index.hide'), hide_in_moderation_screen_moderation_debate_path(debate, request.query_parameters), method: :put %>
+        <%= link_to debate.title, debate, target: "_blank" %>
+        <br>
+        <span class="date"><%= l debate.updated_at.to_date %></span>
+        <br>
+        <%= debate.description %>
      </td>
-      <% if can? :mark_as_reviewed, debate %>
+      <td class="text-center"><%= debate.inappropiate_flags_count %></td>
+      <td>
+        <%= link_to t("moderation.debates.index.hide"), hide_in_moderation_screen_moderation_debate_path(debate, request.query_parameters), method: :put, class: "delete" %>
+      </td>
+      <% if can? :archive, debate %>
        <td>
-          <%= link_to t('moderation.debates.index.mark_as_reviewed'), mark_as_reviewed_moderation_debate_path(debate, request.query_parameters), method: :put %>
+          <%= link_to t("moderation.debates.index.archive"), archive_moderation_debate_path(debate, request.query_parameters), method: :put, class: "button radius tiny warning" %>
        </td>
      <% end %>
-      <% if debate.reviewed? %>
-        <td>
-          <%= t('moderation.debates.index.reviewed') %>
+      <% if debate.archived? %>
+        <td class="archived">
+          <%= t("moderation.debates.index.archived") %>
        </td>
      <% end %>
    </tr>
@@ -45,4 +53,3 @@
 </table>

 <%= paginate @debates %>
-
--- a/app/views/organizations/registrations/success.html.erb
+++ b/app/views/organizations/registrations/success.html.erb
@@ -0,0 +1,15 @@
+<div class="auth row">
+  <div class="small-12 medium-8 column small-centered">
+    <div class="panel">
+      <h2><%= t("devise_views.organizations.registrations.success.title") %></h2>
+      <p><%= t("devise_views.organizations.registrations.success.thank_you") %></p>
+      <p><%= t("devise_views.organizations.registrations.success.instructions_1_html") %></p>
+      <p><%= t("devise_views.organizations.registrations.success.instructions_2_html") %></p>
+      <p><%= t("devise_views.organizations.registrations.success.instructions_3_html") %></p>
+      <p>
+        <%= link_to t("devise_views.organizations.registrations.success.back_to_index"),
+            root_path, class: "button radius small margin-top" %>
+      </p>
+    </div>
+  </div>
+</div>
--- a/app/views/shared/_tags.html.erb
+++ b/app/views/shared/_tags.html.erb
@@ -10,4 +10,4 @@
      <%= link_to "#{debate.tags_count_out_of_limit(limit)}+", debate_path(debate) %>
    <% end %>
  </span>
-<% end %>
+<% end %>
--- a/app/views/users/registrations/finish_signup.html.erb
+++ b/app/views/users/registrations/finish_signup.html.erb
@@ -0,0 +1,13 @@
+<div class="auth row">
+  <div class="small-12 medium-8 large-5 column small-centered">
+    <div class="panel">
+      <h1><%= t('omniauth.finish_signup.title') %></h1>
+
+      <%= form_for current_user, as: :user, url: do_finish_signup_path, html: { role: 'form'} do |f| %>
+        <%= render 'shared/errors', resource: current_user %>
+        <%= f.email_field :email, placeholder: t("devise_views.users.registrations.new.email_label"), value: nil %>
+        <%= f.submit t("devise_views.users.registrations.new.submit"), class: 'button radius' %>
+      <% end %>
+    </div>
+  </div>
+</div>
--- a/app/views/users/registrations/new.html.erb
+++ b/app/views/users/registrations/new.html.erb
@@ -2,6 +2,9 @@
  <div class="small-12 medium-8 large-5 column small-centered">
    <div class="panel">
      <h2><%= t("devise_views.users.registrations.new.title") %></h2>
+
+      <%= render 'devise/omniauth_form' %>
+
      <%= form_for(resource, as: resource_name, url: registration_path(resource_name)) do |f| %>
        <%= render 'shared/errors', resource: resource %>

--- a/app/views/welcome/_featured_debate.html.erb
+++ b/app/views/welcome/_featured_debate.html.erb
@@ -8,7 +8,7 @@
        <h3><%= link_to featured_debate.title, featured_debate %></h3>
        <p class="debate-info">
          <i class="icon-comments"></i>&nbsp;
-          <%= link_to t("debates.show.comments", count: featured_debate.comment_threads.count), debate_path(featured_debate, anchor: "comments") %>
+          <%= link_to t("debates.show.comments", count: featured_debate.comments_count), debate_path(featured_debate, anchor: "comments") %>
        </p>
        <div class="debate-description">
          <%= link_to featured_debate.description, featured_debate %>