Merge pull request #240 from medialab-prado/issue_238

Fixes #238

.travis.yml

@@ -22,10 +22,12 @@ env:
   global:
   - KNAPSACK_PRO_FIXED_QUEUE_SPLIT=true
   - KNAPSACK_PRO_LOG_LEVEL=info
-  - KNAPSACK_PRO_CI_NODE_TOTAL=2
+  - KNAPSACK_PRO_CI_NODE_TOTAL=4
   matrix:
   - KNAPSACK_PRO_CI_NODE_INDEX=0
   - KNAPSACK_PRO_CI_NODE_INDEX=1
+  - KNAPSACK_PRO_CI_NODE_INDEX=2
+  - KNAPSACK_PRO_CI_NODE_INDEX=3
 notifications:
   slack:
     secure: 18E9SU0SR/9knRvCMYwVqFCqVTBT6qJtZQ/gadpheqUPPlcLoQfnlIzJkLIYqkE0sn1nkBE5Bt2I90FU53p0NkrTEmSGlQXcN1vEXM8EXMaoVf3NBsIJeleMwt9VTojzo81EgIi6x7q3fDiFORJ4rqOGd9XkeLn5yrAtIkdaenVs0bhS5s24FP76hKqO37IFLG2v3EEqxg5k31oW6yhyP35Mxns+AGbfaZbxEy4XbCoU65KFuYhBsVZ/y1evOl/wcre2fCAoT2uKeqUWGEcDzH7oSCz7vfk7iO9BZnO++v7oj8mr/nrZL1KMFt77eqtdT51XQoJcchgJC/R9km5hRGkQqFCHhqPcBxo5c3p+jauL0kLaqTggeLDv2FQ2huJ8FSJ4ADac+n3g7wT7BX7HJlCvK0nbooY1JtBlk7+6/pw6ksSFIOo0FHg5gXN9IlG1tQQuENzzsXULNc6s4nPeT+n78uOp1b0N/Gn06moEBaKgXqqx1yV1XeJ02X8n3uDZxPuX3n2bJ4DMIrBjeWApxHAgyOraOzQHNQgJoj4tHlWutF33ApV2tcIMefIzvjM4tIYwIkpfGgohGaTf8eU5X9pqiMgwlDpJHVBsSvpk/Z/Nj7evYznjBiDYqOcXoztsqHrS0C91MaT+eExDfd9HDmThsE07RT7zcP9aElFZA/k=

app/assets/stylesheets/poll.scss

@@ -1,14 +1,12 @@
 .poll-card {
+
   .card {
     background-color: #e7f3fd;
   }
 
   .clipboard-btn {
-    border-radius: 12pt;
+    border-radius: rem-calc(12);
-    padding: 0;
+    padding: rem-calc(5) rem-calc(10) rem-calc(10) rem-calc(10);
-    width: 24pt;
+    height: rem-calc(24);
-    height: 24pt;
-    padding-top: 5pt;
-    padding-left: 1pt;
   }
 }

app/helpers/admin_helper.rb

@@ -45,7 +45,7 @@ module AdminHelper
   end
 
   def menu_proposals_dashboard?
-    ["proposal_dashboard_actions", "administrator_tasks"].include?(controller_name)
+    ["actions", "administrator_tasks"].include?(controller_name)
   end
 
   def official_level_options

app/views/admin/_menu.html.erb

@@ -57,7 +57,7 @@
 
     <% if feature?(:budgets) %>
       <li class="section-title <%= "is-active" if controller_name == "budgets" ||
-                                                                     "budget_investment_statuses" %>">
+                                                  controller_name == "budget_investment_statuses" %>">
         <%= link_to admin_budgets_path do %>
           <span class="icon-budget"></span>
           <strong><%= t("admin.menu.budgets") %></strong>
@@ -240,7 +240,7 @@
         <strong><%= t("admin.menu.proposals_dashboard") %></strong>
       </a>
       <ul <%= "class=is-active" if menu_proposals_dashboard? %>>
-        <li <%= "class=is-active" if controller_name == "proposal_dashboard_actions" %>>
+        <li <%= "class=is-active" if controller_name == "actions" %>>
           <%= link_to ProposalDashboardAction.model_name.human(count: 2), admin_proposal_dashboard_actions_path %>
         </li>
 

app/views/dashboard/polls/_poll.html.erb

@@ -1,15 +1,14 @@
 <div class="column poll-card" id="<%= dom_id(poll) %>">
   <div class="card">
     <div class="card-section">
-      <p class="text-right">
+      <p class="text-center">
         <a href='#' class="button round hollow clipboard-btn" data-clipboard-text="<%= poll_url(poll) %>">
-          <i class="fi-clipboard-notes"></i>
+          <i class="fi-clipboard-notes"></i> <%= t("dashboard.polls.poll.copy_link") %>
         </a>
       </p>
-      <h4 class="text-center"><%= poll.title %></h4>
+      <h4 class="text-center"><%= link_to poll.title, poll %></h4>
       <p class="text-center">
-        <%= t("dashboard.polls.poll.published_on") %>
+        <%= l(poll.starts_at.to_date) %> - <%= l(poll.ends_at.to_date) %>
-        <%= l(poll.starts_at.to_date) %>
       </p>
     </div>
 

config/locales/en/general.yml

@@ -572,7 +572,7 @@ en:
         links: Links
         additiontal_information: Additional information
       poll:
-        published_on: Published on
+        copy_link: Copy link
         responses:
           one: "%{count} response"
           other: "%{count} responses"

config/locales/es/general.yml

@@ -572,7 +572,7 @@ es:
         links: Enlaces
         additiontal_information: Información adicional
       poll:
-        published_on: Publicada
+        copy_link: Copiar enlace
         responses:
           one: "%{count} respuesta"
           other: "%{count} respuestas"

spec/features/dashboard/polls_spec.rb

@@ -120,4 +120,16 @@ feature 'Polls' do
       expect(page.current_path).to eq(results_poll_path(poll))
     end
   end
+
+  scenario 'Poll card' do
+     poll = create(:poll, :expired, related: proposal)
+    
+    visit proposal_dashboard_polls_path(proposal)
+
+    within "div#poll_#{poll.id}" do
+      expect(page).to have_content(I18n.l(poll.starts_at.to_date))
+      expect(page).to have_content(I18n.l(poll.ends_at.to_date))
+      expect(page).to have_link(poll.title)
+    end
+  end
 end