From 8c4541d50f7551d68961710459ed86516c7f34b6 Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Tue, 31 Jan 2017 21:08:03 +0100
Subject: [PATCH] shows always questions lists and button to participate on
 poll index

---
 app/assets/stylesheets/participation.scss | 12 +++++++++++-
 app/views/polls/index.html.erb            | 17 ++++++++++-------
 config/locales/en.yml                     |  3 ++-
 config/locales/es.yml                     |  3 ++-
 4 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/app/assets/stylesheets/participation.scss b/app/assets/stylesheets/participation.scss
index 3f5daf8e2..8c1529531 100644
--- a/app/assets/stylesheets/participation.scss
+++ b/app/assets/stylesheets/participation.scss
@@ -1372,9 +1372,13 @@ ul.ballot-list {
   .dates {
     color: $text-medium;
     font-size: $small-font-size;
+
+    @include breakpoint(medium) {
+      float: right;
+    }
   }
 
-  h3 a {
+  h4 a {
     color: $text;
   }
 }
@@ -1383,6 +1387,12 @@ h2.questions-callout {
   font-size: $base-font-size;
 }
 
+h3.section-title-divider {
+  border-bottom: 2px solid $brand;
+  color: $brand;
+  margin-bottom: $line-height;
+}
+
 .poll-question {
   padding: 0 $line-height;
 
diff --git a/app/views/polls/index.html.erb b/app/views/polls/index.html.erb
index 0d278a8ba..9b490f3e2 100644
--- a/app/views/polls/index.html.erb
+++ b/app/views/polls/index.html.erb
@@ -15,12 +15,19 @@
   </div>
 
   <div class="small-12 medium-9 column margin-top">
+    <h3 class="section-title-divider"><%= t("polls.index.no_geozone_restricted") %></h3>
+    <h3 class="section-title-divider"><%= t("polls.index.geozone_restricted") %></h3>
     <% @polls.each do |poll| %>
       <div class="poll">
         <div class="row">
           <div class="small-12 column">
-            <h3><%= link_to poll.name, poll %></h3>
-            <p class="dates"><%= poll_dates(poll) %></p>
+            <div class="dates"><%= poll_dates(poll) %></div>
+            <h4 class="inline-block"><%= link_to poll.name, poll %></h4>
+            <ul>
+              <% poll.questions.each do |question| %>
+                <li><%= link_to question.title, question_path(question) %></li>
+              <% end %>
+            </ul>
             <ul class="no-bullet margin-top tags">
               <% poll.geozones.each do |g| %>
                 <li class="inline-block"><span><%= g.name %></span></li>
@@ -28,11 +35,7 @@
             </ul>
           </div>
           <div class="small-12 column">
-            <% if can? :answer, poll %>
-              <%= link_to t("polls.index.participate_button"), poll, class: "button" %>
-            <% else %>
-              <%= link_to t("polls.index.view_button"), poll %>
-            <% end %>
+            <%= link_to t("polls.index.participate_button"), poll, class: "button" %>
           </div>
         </div>
       </div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index edf96a210..a28a93598 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -403,7 +403,8 @@ en:
         expired: "Expired"
       title: "Polls"
       participate_button: "Participate in this poll"
-      view_button: "View details about this poll"
+      no_geozone_restricted: "All city"
+      geozone_restricted: "Districts"
     show:
       dates_title: "Participation dates"
       cant_answer_not_logged_in: "You must %{signin} or %{signup} to participate."
diff --git a/config/locales/es.yml b/config/locales/es.yml
index ce5d328c5..d6d819fe8 100755
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -403,7 +403,8 @@ es:
         expired: "Terminadas"
       title: "Votaciones"
       participate_button: "Participar en esta votación"
-      view_button: "Ver detalles de la votación"
+      no_geozone_restricted: "Toda la ciudad"
+      geozone_restricted: "Distritos"
     show:
       dates_title: "Fechas de participación"
       cant_answer_not_logged_in: "Necesitas %{signin} o %{signup} para participar."