decidim-initiatives 0.16.1 → 0.17.0

data/app/views/decidim/initiatives/create_initiative/select_initiative_type.html.erb

@@ -1,3 +1,4 @@
+<% default_type = available_initiative_types.first %>
 <% content_for :back_link do %>
   <%= link_to initiatives_path do %>
     <%= icon "chevron-left", class: "icon--small" %>
@@ -12,28 +13,42 @@
   </div>
 </div>
 <br />
-<section id="initiative-types-grid" class="section row collapse">
-  <div class="row small-up-1 medium-up-2 large-up-3 card-grid">
-    <% initiative_types_each do |type| %>
-      <div class="column">
-        <article class="card card--initiative-type">
-          <div class="card__content">
-            <div class="card__header">
-              <h5 class="card__title"><%= translated_attribute type.title %></h5>
-            </div>
-            <%= raw translated_attribute type.description %>
-          </div>
-          <div class="card__footer">
-            <div class="card__support">
-              <div class="card__support__data"></div>
-              <%= decidim_form_for(@form, url: next_wizard_path, method: :put, html: { class: "form select-initiative_type-form" }) do |f| %>
-                <%= f.hidden_field :type_id, value: type.id %>
-                <%= f.submit t(".select"), class: "button small secondary card__button" %>
-              <% end %>
-            </div>
+<div class="row column">
+  <div class="main-container">
+    <div class="row collapse main-container--side-panel">
+      <div class="columns medium-4 large-3">
+        <div class="side-panel">
+          <ul class="tabs vertical side-panel__tabs" id="initiatives-tabs" data-tabs>
+            <% initiative_types_each do |type| %>
+              <li class="tabs-title <%= "is-active" if type == default_type %>">
+                <%= link_to "#initiativeType#{type.id}" do %>
+                  <%# Quiero crear un <strong><%= translated_attribute type.title %1></strong> %>
+                  <%= t(".choose_html", title: translated_attribute(type.title)) %>
+                <% end %>
+              </li>
+            <% end %>
+          </ul>
+        </div>
+      </div>
+      <div class="columns medium-8 large-9">
+        <div class="main-container__content">
+          <div class="tabs-content vertical" data-tabs-content="initiatives-tabs">
+            <% initiative_types_each do |type| %>
+              <div class="tabs-panel <%= "is-active" if type == default_type %>" id="<%= "initiativeType#{type.id}" %>">
+                <h2 class="section-heading"><%= translated_attribute(type.title) %></h2>
+                <div>
+                  <%= raw translated_attribute type.description %>
+                </div>
+                <br />
+                <%= decidim_form_for(@form, url: next_wizard_path, method: :put, html: { id: "new_initiative_#{type.id}", class: "form select-initiative_type-form" }) do |f| %>
+                  <%= f.hidden_field :type_id, value: type.id, id: "initiative_type_id_#{ type.id }" %>
+                  <%= f.submit t(".select"), class: "button" %>
+                <% end %>
+              </div>
+            <% end %>
           </div>
-        </article>
+        </div>
       </div>
-    <% end %>
+    </div>
   </div>
-</section>
+</div>

data/app/views/decidim/initiatives/initiative_signatures/_wizard_steps.html.erb

@@ -0,0 +1,19 @@
+<div class="hide-for-large m-bottom">
+  <span class="text-small">
+    <%= t("step", scope: "layouts.decidim.initiative_signature_creation_header", current: (wizard_steps.index(step) + 1), total: wizard_steps.length) %>
+    (<a data-toggle="steps"><%= t("see_steps", scope: "layouts.decidim.initiative_signature_creation_header") %></a>)
+  </span>
+  <ol id="steps" class="wizard__steps steps-toggle is-hidden" data-toggler=".is-hidden">
+    <% wizard_steps.each do |wizard_step| %>
+      <% if step == wizard_step %>
+        <li class="step--active">
+          <%= t(wizard_step, scope: "layouts.decidim.initiative_signature_creation_header") %>
+        </li>
+      <% else %>
+        <li>
+          <%= t(wizard_step, scope: "layouts.decidim.initiative_signature_creation_header") %>
+        </li>
+      <% end %>
+    <% end %>
+  </ol>
+</div>

data/app/views/decidim/initiatives/initiative_signatures/fill_personal_data.html.erb

@@ -0,0 +1,43 @@
+<div class="callout secondary mb-sm">
+  <p>
+<%= t ".help" %>
+  </p>
+</div>
+<h2 class="section-heading"><%= t(step, scope: "layouts.decidim.initiative_signature_creation_header") %></h2>
+
+<%= render partial: "wizard_steps" %>
+
+<div class="card">
+  <div class="card__content">
+    <%= decidim_form_for(@form, url: next_wizard_path, method: :put, html: { class: "form user_personal_data_signature_form" }) do |f| %>
+      <%= f.hidden_field :group_id %>
+      <div>
+        <div class="field">
+          <%= f.text_field :name_and_surname, autofocus: true, required: true %>
+        </div>
+
+        <div class="field">
+          <%= f.text_field :document_number, required: true %>
+        </div>
+
+        <div class="field date">
+          <%= f.date_select :date_of_birth, start_year: 1900, end_year: 16.years.ago.year, default: 35.years.ago, prompt: { day: t(".date_select.day"), month: t(".date_select.month"), year: t(".date_select.year") } %>
+        </div>
+
+        <div class="field">
+          <%= f.text_field :postal_code, required: true %>
+        </div>
+
+        <div class="pb-s">
+          <small class="text-small">
+          <%= strip_tags(translated_attribute(extra_data_legal_information)) %>
+          </small>
+        </div>
+      </div>
+
+      <div class="actions">
+        <%= f.submit t(".continue"), class: "button expanded" %>
+      </div>
+    <% end %>
+  </div>
+</div>

data/app/views/decidim/initiatives/initiative_signatures/finish.html.erb

@@ -0,0 +1,17 @@
+<div class="callout secondary mb-sm">
+  <p>
+    <%= t("create.success_html",
+          scope: "decidim.initiatives.initiative_votes",
+          title: translated_attribute(current_initiative.title)) %>
+  </p>
+</div>
+<h2 class="section-heading"><%= t("finished", scope: "layouts.decidim.initiative_signature_creation_header") %></h2>
+
+<%= render partial: "wizard_steps" %>
+
+<div class="card">
+  <br />
+  <div class="column actions">
+    <%= link_to t(".back_to_initiative"), initiative_path(current_initiative), class: "button white-button expanded" %>
+  </div>
+</div>

data/app/views/decidim/initiatives/initiative_signatures/sms_code.html.erb

@@ -0,0 +1,22 @@
+<div class="callout secondary mb-sm">
+  <p>
+    <%= t ".help" %>
+  </p>
+</div>
+<h2 class="section-heading"><%= t(step, scope: "layouts.decidim.initiative_signature_creation_header") %></h2>
+
+<%= render partial: "wizard_steps" %>
+
+<div class="card">
+  <div class="card__content">
+    <%= decidim_form_for(@form, url: next_wizard_path, method: :put, html: { class: "form sms_code" }) do |f| %>
+      <div class="field">
+        <%= f.text_field :verification_code %>
+      </div>
+
+      <div class="actions">
+        <%= f.submit t(".continue"), class: "button expanded" %>
+       </div>
+    <% end %>
+  </div>
+</div>

data/app/views/decidim/initiatives/initiative_signatures/sms_phone_number.html.erb

@@ -0,0 +1,22 @@
+<div class="callout secondary mb-sm">
+  <p>
+    <%= t ".help" %>
+  </p>
+</div>
+<h2 class="section-heading"><%= t(step, scope: "layouts.decidim.initiative_signature_creation_header") %></h2>
+
+<%= render partial: "wizard_steps" %>
+
+<div class="card">
+  <div class="card__content">
+    <%= decidim_form_for(@form, url: next_wizard_path, method: :put, html: { class: "form mobile_phone_number" }) do |f| %>
+      <div class="field">
+        <%= f.text_field :mobile_phone_number %>
+      </div>
+
+      <div class="actions">
+        <%= f.submit t(".continue"), class: "button expanded" %>
+       </div>
+    <% end %>
+  </div>
+</div>

data/app/views/decidim/initiatives/initiative_signatures/update_buttons_and_counters.js.erb

@@ -0,0 +1,21 @@
+(function () {
+  'use strict';
+
+  var $initiativeVotesCount = $('#initiative-<%= current_initiative.id %>-votes-count'),
+      userIdentitiesDialog = $('#user-identities'),
+      refreshUrl;
+
+  $initiativeVotesCount.html('<%= j(render partial: "decidim/initiatives/initiatives/progress_bar", locals: { initiative: current_initiative }) %>');
+
+  // Update the identities dialog, if exists.
+  if (userIdentitiesDialog.length) {
+    refreshUrl = userIdentitiesDialog.data('refresh-url');
+
+    $.ajax(refreshUrl).done(function(response){
+      userIdentitiesDialog.html(response);
+    });
+  } else {
+    var $initiativeVoteButton = $('#initiative-<%= current_initiative.id %>-vote-cabin');
+    $initiativeVoteButton.html('<%= j(render partial: "decidim/initiatives/initiatives/vote_cabin", locals: { initiative: current_initiative }) %>');
+  }
+}());

data/app/views/decidim/initiatives/initiative_votes/update_buttons_and_counters.js.erb

@@ -5,7 +5,7 @@
       userIdentitiesDialog = $('#user-identities'),
       refreshUrl;
 
-  $initiativeVotesCount.html('<%= j(render partial: "decidim/initiatives/initiatives/votes_count", locals: { initiative: current_initiative }) %>');
+  $initiativeVotesCount.html('<%= j(render partial: "decidim/initiatives/initiatives/progress_bar", locals: { initiative: current_initiative }) %>');
 
   // Update the identities dialog, if exists.
   if (userIdentitiesDialog.length) {

data/app/views/decidim/initiatives/initiatives/_author.html.erb

@@ -15,7 +15,7 @@
       </span>
     </div>
 
-    <% initiative.committee_members.approved.each do |m| %>
+    <% initiative.committee_members.excluding_author.approved.each do |m| %>
       <% unless m.user.deleted? %>
         <div class="author author--inline">
           <span class="author__avatar author__avatar--small">

data/app/views/decidim/initiatives/initiatives/_interactions.html.erb

@@ -0,0 +1,11 @@
+<div class="row collapse buttons__row">
+  <div class="column collapse">
+    <button type="button" name="button" class="button small compact hollow secondary button--nomargin expanded">
+      <%= link_to "#comments" do %>
+        <%= icon "comment-square", class: "icon--small", aria_label: t(".comments_count.count.other"), role: "img" %>
+        <%= stats.comments_count %>
+        <%= t(".comments_count.count", count: stats.comments_count) %>
+      <% end %>
+    </button>
+  </div>
+</div>

data/app/views/decidim/initiatives/initiatives/_progress_bar.html.erb

@@ -0,0 +1,9 @@
+<%= cell(
+  "decidim/progress_bar",
+  current_initiative.supports_count,
+  total: current_initiative.supports_required,
+  units_name: "decidim.initiatives.initiatives.votes_count.count",
+  element_id: "initiative-#{current_initiative.id}-votes-count",
+  subtitle_text: current_initiative.supports_goal_reached? ? t("decidim.initiatives.initiatives.votes_count.most_popular_initiative") : t("decidim.initiatives.initiatives.votes_count.need_more_votes"),
+  small: false
+) %>

data/app/views/decidim/initiatives/initiatives/_result.html.erb

@@ -1,10 +1,10 @@
-<% if initiative.accepted? && initiative.answered? && translated_attribute(initiative.answer).present? %>
+<% if initiative.answered? && translated_attribute(initiative.answer).present? %>
   <br />
   <div class="row column">
     <div class="callout success">
-      <h5><%= t(".initiative_accepted_reason") %>:</h5>
+      <h5><%= t(initiative.state, scope: "decidim.initiatives.initiatives.result.answer_title") %>:</h5>
       <p>
-        <% if initiative.answer_url %>
+        <% if initiative.answer_url.present? %>
           <a href="<%= initiative.answer_url %>" target="_blank">
             <%= decidim_sanitize translated_attribute initiative.answer %>
           </a>

data/app/views/decidim/initiatives/initiatives/_vote_button.html.erb

@@ -1,20 +1,41 @@
 <% if allowed_to? :vote, :initiative, initiative: initiative %>
-  <%= button_to(
-    vote_label,
-    initiative_initiative_vote_path(initiative_slug: current_initiative.slug),
-    remote: true,
-    data: { disable: true },
-    class: "card__button button expanded button--sc"
-  ) %>
-<% end %>
-
-<% if allowed_to? :unvote, :initiative, initiative: initiative %>
-  <%= button_to(
-    vote_label,
-    initiative_initiative_vote_path(initiative_slug: current_initiative.slug),
-    method: :delete,
-    remote: true,
-    data: { disable: true },
-    class: "card__button button expanded button--sc success"
-  ) %>
+  <% if steps %>
+    <%= link_to(
+      vote_label,
+      initiative_initiative_signatures_path(initiative_slug: current_initiative.slug),
+      class: "button expanded light button--sc"
+    ) %>
+  <% else %>
+    <%= button_to(
+      vote_label,
+      initiative_initiative_signatures_path(initiative_slug: current_initiative.slug),
+      remote: true,
+      data: { disable: true },
+      class: "button expanded light button--sc"
+    ) %>
+  <% end %>
+<% else %>
+  <% if initiative.voted_by?(current_user) %>
+    <% if allowed_to? :unvote, :initiative, initiative: initiative %>
+      <%= button_to(
+        initiative_initiative_vote_path(initiative_slug: current_initiative.slug),
+        method: :delete,
+        remote: true,
+        data: { disable: true },
+        class: "button expanded light button--sc success"
+      ) do %>
+        <%= icon("check", class: "icon--small") %>
+        <%= unvote_label %>
+      <% end %>
+    <% else %>
+      <button class='button expanded button--sc success light disabled' disabled>
+        <%= icon("check", class: "icon--small") %>
+        <%= unvote_label %>
+      </button>
+    <% end %>
+  <% else %>
+    <%= authorized_vote_modal_button(initiative, remote: true, class: "button expanded light button--sc") do %>
+      <%= verification_label %>
+    <% end %>
+  <% end %>
 <% end %>

data/app/views/decidim/initiatives/initiatives/_vote_cabin.html.erb

@@ -1,6 +1,6 @@
-<% if current_user && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
+<% if current_user && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? && allowed_to?(:vote, :initiative, initiative: initiative) %>
   <button id="select-identity-button"
-          class="card__button button expanded button--sc">
+          class="button expanded light button--sc">
     <%= t(".vote") %>
   </button>
 
@@ -8,17 +8,17 @@
        id="user-identities"
        data-reveal data-refresh-url="<%= signature_identities_initiative_url(slug: initiative.slug) %>">
   </div>
-<% else %>
+<% elsif initiative.accepts_online_votes? %>
     <%= render partial: "decidim/initiatives/initiatives/vote_button",
                locals: {
                    initiative: initiative,
                    vote_label: t(".vote"),
-                   unvote_label: t(".already_voted")
-               } if Decidim::Initiatives.online_voting_allowed %>
-<% end %>
-
-<% if !allowed_to?(:vote, :initiative, initiative: initiative) && !allowed_to?(:unvote, :initiative, initiative: initiative) %>
-  <button class='card__button button expanded button--sc disabled' disabled>
+                   unvote_label: t(".already_voted"),
+                   verification_label: t(".verification_required"),
+                   steps: signature_has_steps?
+               } %>
+<% else %>
+  <button class='button expanded light button--sc disabled' disabled>
     <%= t(".votes_blocked") %>
   </button>
 <% end %>

data/app/views/decidim/initiatives/initiatives/show.html.erb

@@ -32,27 +32,27 @@ edit_link(
   <% end %>
 
   <div class="columns section view-side mediumlarge-4 mediumlarge-push-8 large-3 large-push-9">
-    <div class="card extra definition-data">
-      <div class="definition-data__item vote-block">
-        <div id="initiative-<%= current_initiative.id %>-votes-count">
-          <%= render partial: "votes_count", locals: { initiative: current_initiative } %>
-        </div>
+    <div class="card">
+      <div class="card__content">
+        <%= render partial: "progress_bar" %>
         <% if current_initiative.votes_enabled? %>
           <div id="initiative-<%= current_initiative.id %>-vote-cabin">
             <%= render partial: "vote_cabin", locals: { initiative: current_initiative } %>
           </div>
         <% end %>
-
-        <% if current_user %>
-          <%= render partial: "decidim/shared/follow_button", locals: { followable: current_initiative, large: false } %>
-        <% end %>
+        <%= render partial: "interactions" %>
       </div>
     </div>
-
+    <% if current_user %>
+      <div class="card text-center">
+        <div class="card__content">
+          <%= cell "decidim/follow_button", current_participatory_space, inline: false, large: true %>
+          <small><%= t(".follow_description") %></small>
+        </div>
+      </div>
+    <% end %>
     <%= render partial: "decidim/shared/share_modal" %>
     <%= embed_modal_for initiative_initiative_widget_url(current_initiative, format: :js) %>
-
-    <%= render partial: "statistics" %>
     <%= resource_reference(current_initiative) %>
   </div>
 

data/app/views/decidim/initiatives/initiatives/signature_identities.html.erb

@@ -6,7 +6,9 @@
            locals: {
                initiative: current_initiative,
                vote_label: current_user.name,
-               unvote_label: current_user.name
+               unvote_label: current_user.name,
+               verification_label: current_user.name,
+               steps: signature_has_steps?
            } unless current_initiative.offline? %>
 
 <% Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.each do |g| %>
@@ -18,15 +20,23 @@
       method: :delete,
       remote: true,
       data: { disable: true },
-      class: "card__button button expanded button--sc success"
+      class: "button expanded light button--sc success"
     ) %>
   <% else %>
-    <%= button_to(
-      g.name,
-      initiative_initiative_vote_path(initiative_slug: current_initiative.slug, group_id: g.id),
-      remote: true,
-      data: { disable: true },
-      class: "card__button button expanded button--sc"
-    ) %>
+    <% if signature_has_steps? %>
+      <%= link_to(
+        g.name,
+        initiative_initiative_signatures_path(initiative_slug: current_initiative.slug, group_id: g.id),
+        class: "button expanded light button--sc"
+      ) %>
+    <% else %>
+      <%= button_to(
+        g.name,
+        initiative_initiative_signatures_path(initiative_slug: current_initiative.slug, group_id: g.id),
+        remote: true,
+        data: { disable: true },
+        class: "button expanded light button--sc"
+      ) %>
+    <% end %>
   <% end %>
 <% end %>