decidim-initiatives 0.22.0 → 0.23.0

data/app/views/decidim/initiatives/admin/initiatives/_form.html.erb

@@ -3,6 +3,28 @@
     <h2 class="card-title"><%= t ".title" %></h2>
   </div>
 
+  <div class="card-section">
+    <div class="row column">
+      <%= form.translated :text_field, :title, autofocus: true, disabled: !allowed_to?(:update, :initiative, initiative: current_initiative) %>
+    </div>
+
+    <div class="row column">
+      <%= form.translated :editor, :description, toolbar: :full, lines: 8, disabled: !allowed_to?(:update, :initiative, initiative: current_initiative) %>
+    </div>
+
+    <div class="row column">
+      <div class="columns xlarge-6">
+        <%= form.text_field :hashtag, disabled: !allowed_to?(:update, :initiative, initiative: current_initiative) %>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= t ".settings" %></h2>
+  </div>
+
   <div class="card-section">
     <div class="row">
       <div class="columns xlarge-6">
@@ -13,14 +35,6 @@
       </div>
     </div>
 
-    <div class="row column">
-      <%= form.translated :text_field, :title, autofocus: true, disabled: !allowed_to?(:update, :initiative, initiative: current_initiative) %>
-    </div>
-
-    <div class="row column">
-      <%= form.translated :editor, :description, toolbar: :full, lines: 8, disabled: !allowed_to?(:update, :initiative, initiative: current_initiative) %>
-    </div>
-
     <div class="row">
       <% unless single_initiative_type? %>
       <div class="columns xlarge-6">
@@ -30,7 +44,7 @@
                         {
                           disabled: !@form.signature_type_updatable?,
                           "data-scope-selector": "initiative_decidim_scope_id",
-                          "data-scope-id": form.object.decidim_scope_id,
+                          "data-scope-id": form.object.decidim_scope_id.to_s,
                           "data-scope-search-url": decidim_initiatives.initiative_type_scopes_search_url,
                           "data-signature-types-selector": "initiative_signature_type",
                           "data-signature-type": current_initiative.signature_type,
@@ -74,10 +88,6 @@
     <% end %>
 
     <div class="row">
-      <div class="columns xlarge-6">
-        <%= form.text_field :hashtag, disabled: !allowed_to?(:update, :initiative, initiative: current_initiative) %>
-      </div>
-
       <div class="columns xlarge-6">
         <%= form.select :signature_type, [], {}, { disabled: !@form.signature_type_updatable? } %>
       </div>
@@ -86,14 +96,26 @@
     <% if current_initiative.accepts_offline_votes? && current_user.admin? %>
       <div class="row">
         <div class="columns xlarge-6">
-          <%= form.number_field :offline_votes, min: 1 %>
+          <% @form.offline_votes.each do |scope_id, (votes, scope_name)| %>
+            <%= label_tag "initiative_offline_votes_#{scope_id}", t("activemodel.attributes.initiative.offline_votes_for_scope", scope_name: translated_attribute(scope_name)) %>
+            <%= number_field_tag "initiative[offline_votes][#{scope_id}]", votes, min: 0, id: "initiative_offline_votes_#{scope_id}" %>
+          <% end %>
         </div>
       </div>
     <% end %>
+  </div>
+</div>
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= t ".attachments" %></h2>
+  </div>
 
-    <% if allowed_to?(:read, :attachment, initiative: current_participatory_space) %>
-      <%= render partial: "initiative_attachments", locals: { current_initiative: current_initiative, current_participatory_space: current_participatory_space } %>
-    <% end %>
+  <div class="card-section">
+    <div class="row">
+      <% if allowed_to?(:read, :attachment, initiative: current_participatory_space) %>
+        <%= render partial: "initiative_attachments", locals: { current_initiative: current_initiative, current_participatory_space: current_participatory_space } %>
+      <% end %>
+    </div>
   </div>
 </div>
 

data/app/views/decidim/initiatives/admin/initiatives/export_pdf_signatures.pdf.erb

@@ -41,33 +41,36 @@
 <br>
 <div class="initiatives-votes-table" style="width: 100%; display: block; border: 1pt solid black;">
   <div class="initiatives-votes-table-header" style="background-color: lightgray; display: inline-block; width: 100%; font-size: 12pt; font-weight: bold; border-bottom: 1pt solid black;">
-    <div class="initiatives-votes-table-cell w11" style="width: 10.8%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
+    <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
       <%= t("models.initiatives_votes.fields.initiative_id", scope: "decidim.admin") %>
     </div>
-    <div class="initiatives-votes-table-cell w11" style="width: 10.8%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
+    <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
       <%= t("models.initiatives_votes.fields.initiative_title", scope: "decidim.admin") %>
     </div>
-    <div class="initiatives-votes-table-cell w11" style="width: 10.8%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
+    <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
       <%= t("models.initiatives_votes.fields.name_and_surname", scope: "decidim.admin") %>
     </div>
-    <div class="initiatives-votes-table-cell w11" style="width: 10.8%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
+    <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
       <%= t("models.initiatives_votes.fields.document_number", scope: "decidim.admin") %>
     </div>
-    <div class="initiatives-votes-table-cell w11" style="width: 10.8%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
+    <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
       <%= t("models.initiatives_votes.fields.date_of_birth", scope: "decidim.admin") %>
     </div>
-    <div class="initiatives-votes-table-cell w11" style="width: 10.8%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
+    <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
       <%= t("models.initiatives_votes.fields.postal_code", scope: "decidim.admin") %>
     </div>
-    <div class="initiatives-votes-table-cell w11" style="width: 10.8%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
+    <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
       <%= t("models.initiatives_votes.fields.time_and_date", scope: "decidim.admin") %>
     </div>
-    <div class="initiatives-votes-table-cell w11" style="width: 10.8%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
+    <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
       <%= t("models.initiatives_votes.fields.timestamp", scope: "decidim.admin") %>
     </div>
-    <div class="initiatives-votes-table-cell w11" style="width: 10.8%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
+    <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
       <%= t("models.initiatives_votes.fields.hash", scope: "decidim.admin") %>
     </div>
+    <div class="initiatives-votes-table-cell w11" style="width: 9.4%; padding-left: 5pt; word-wrap: break-word; display: inline-block; float: left; min-height: 36pt;">
+      <%= t("models.initiatives_votes.fields.scope", scope: "decidim.admin") %>
+    </div>
   </div>
   <% @votes.each do |vote| %>
     <%= cell "decidim/initiatives_votes/vote", vote %>

data/app/views/decidim/initiatives/admin/initiatives_types/_form.html.erb

@@ -12,6 +12,20 @@
       <%= form.translated :editor, :description, toolbar: :full, lines: 25 %>
     </div>
 
+    <div class="row">
+      <div class="columns xlarge-6">
+        <%= form.upload :banner_image %>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= t ".options" %></h2>
+  </div>
+
+  <div class="card-section">
     <div class="row column">
       <%= form.select :signature_type, form.object.signature_type_options %>
     </div>
@@ -32,6 +46,16 @@
       <%= form.check_box :area_enabled %>
     </div>
 
+    <div class="row column">
+      <%= form.check_box :child_scope_threshold_enabled %>
+      <p class="help-text"><%== t(".child_scope_threshold_enabled_help") %></p>
+    </div>
+
+    <div class="row column">
+      <%= form.check_box :only_global_scope_enabled %>
+      <p class="help-text"><%== t(".only_global_scope_enabled_help") %></p>
+    </div>
+
     <div class="row column" id="promoting-committee-details">
       <%= form.check_box :promoting_committee_enabled %>
 
@@ -47,13 +71,15 @@
     <div class="row column">
       <%= form.translated :editor, :extra_fields_legal_information %>
     </div>
+  </div>
+</div>
 
-    <% if current_organization.available_authorizations.include? "sms" %>
-      <div class="row column">
-        <%= form.check_box :validate_sms_code_on_votes %>
-      </div>
-    <% end %>
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= t ".authorizations" %></h2>
+  </div>
 
+  <div class="card-section">
     <div class="row column">
       <%=
         form.select(
@@ -64,12 +90,11 @@
       %>
     </div>
 
-    <div class="row">
-      <div class="columns xlarge-6">
-        <%= form.upload :banner_image %>
+    <% if current_organization.available_authorizations.include? "sms" %>
+      <div class="row column">
+        <%= form.check_box :validate_sms_code_on_votes %>
       </div>
-    </div>
-
+    <% end %>
   </div>
 </div>
 

data/app/views/decidim/initiatives/admin/initiatives_types/_initiative_type_scopes.html.erb

@@ -7,33 +7,36 @@
                   class: "button tiny button--title" if allowed_to? :create, :initiative_type_scope %>
     </h2>
   </div>
-  <div class="row column">
-    <div class="table-scroll">
-      <table class="table-list">
-        <thead>
-        <tr>
-          <th><%= t("models.initiatives_type_scope.fields.scope", scope: "decidim.admin") %></th>
-          <th class="text-right">
-            <%= t("models.initiatives_type_scope.fields.supports_required", scope: "decidim.admin") %>
-          </th>
-          <th class="actions"></th>
-        </tr>
-        </thead>
-        <tbody>
-        <% initiative_type.scopes.each do |s| %>
+
+  <div class="card-section">
+    <div class="row column">
+      <div class="table-scroll">
+        <table class="table-list">
+          <thead>
           <tr>
-            <td><%= translated_attribute(s.scope_name) %></td>
-            <td class="text-right"><%= s.supports_required %></td>
-            <td class="table-list__actions">
-              <%= icon_link_to "pencil",
-                               decidim_admin_initiatives.edit_initiatives_type_initiatives_type_scope_path(initiative_type, s),
-                               t("actions.configure", scope: "decidim.admin"),
-                               class: "action-icon--new" if allowed_to? :edit, :initiative_type_scope, initiative_type_scope: s %>
-            </td>
+            <th><%= t("models.initiatives_type_scope.fields.scope", scope: "decidim.admin") %></th>
+            <th class="text-right">
+              <%= t("models.initiatives_type_scope.fields.supports_required", scope: "decidim.admin") %>
+            </th>
+            <th class="actions"></th>
           </tr>
-        <% end %>
-        </tbody>
-      </table>
+          </thead>
+          <tbody>
+          <% initiative_type.scopes.each do |s| %>
+            <tr>
+              <td><%= translated_attribute(s.scope_name) %></td>
+              <td class="text-right"><%= s.supports_required %></td>
+              <td class="table-list__actions">
+                <%= icon_link_to "pencil",
+                                decidim_admin_initiatives.edit_initiatives_type_initiatives_type_scope_path(initiative_type, s),
+                                t("actions.configure", scope: "decidim.admin"),
+                                class: "action-icon--new" if allowed_to? :edit, :initiative_type_scope, initiative_type_scope: s %>
+              </td>
+            </tr>
+          <% end %>
+          </tbody>
+        </table>
+      </div>
     </div>
   </div>
 </div>

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

@@ -76,26 +76,28 @@
               </div>
             <% end %>
 
-            <fieldset>
-              <legend><%= t("attachment_legend", scope: "decidim.proposals.proposals.edit") %></legend>
-              <%= f.fields_for :attachment, @form.attachment do |nested_form| %>
-                <div class="field">
-                  <%= nested_form.text_field :title %>
-                </div>
+            <% if initiative_type.attachments_enabled? %>
+              <fieldset>
+                <legend><%= t("attachment_legend", scope: "decidim.proposals.proposals.edit") %></legend>
+                <%= f.fields_for :attachment, @form.attachment do |nested_form| %>
+                  <div class="field">
+                    <%= nested_form.text_field :title %>
+                  </div>
 
-                <div class="field">
-                  <%= nested_form.upload :file, optional: false %>
-                </div>
+                  <div class="field">
+                    <%= nested_form.upload :file, optional: false %>
+                  </div>
 
-                <% if @form.errors[:attachment].present? %>
-                  <% @form.errors[:attachment].each do |message| %>
-                    <small class="form-error is-visible">
-                      <%= message %>
-                    </small>
+                  <% if @form.errors[:attachment].present? %>
+                    <% @form.errors[:attachment].each do |message| %>
+                      <small class="form-error is-visible">
+                        <%= message %>
+                      </small>
+                    <% end %>
                   <% end %>
                 <% end %>
-              <% end %>
-            </fieldset>
+              </fieldset>
+            <% end %>
           </div>
           <div class="actions">
             <%= f.submit t(".continue"), class: "button expanded", data: { disable_with: true } %>

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

@@ -11,7 +11,6 @@
   <div class="card__content">
     <%= decidim_form_for(@form, url: next_wizard_path, method: :put, html: { class: "form user_personal_data_signature_form" }) do |f| %>
       <%= form_required_explanation %>
-      <%= f.hidden_field :group_id %>
       <div>
         <div class="field">
           <%= f.text_field :name_and_surname, autofocus: true, required: true %>

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

@@ -1,7 +1,7 @@
 (function () {
   'use strict';
 
-  var $initiativeVotesCount = $('#initiative-<%= current_initiative.id %>-votes-count'),
+  var $initiativeVotesCount = $('#initiative-<%= current_initiative.id %>-progress-bar'),
       userIdentitiesDialog = $('#user-identities'),
       refreshUrl;
 

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

@@ -1,7 +1,7 @@
 (function () {
   'use strict';
 
-  var $initiativeVotesCount = $('#initiative-<%= current_initiative.id %>-votes-count'),
+  var $initiativeVotesCount = $('#initiative-<%= current_initiative.id %>-progress-bar'),
       userIdentitiesDialog = $('#user-identities'),
       refreshUrl;
 

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

@@ -2,10 +2,44 @@
   <h1 id="initiatives-count" class="title-action__title section-heading">
     <%= render partial: "count" %>
   </h1>
-  <% if allowed_to? :create, :initiative %>
-    <%= link_to create_initiative_path(:select_initiative_type), class: "title-action__action button small" do %>
+  <% if Decidim::Initiatives.creation_enabled %>
+    <% if current_user && allowed_to?(:create, :initiative) %>
+      <%= link_to create_initiative_path(:select_initiative_type), class: "title-action__action button small" do %>
         <%= t(".new_initiative") %>
         <%= icon "plus", role: "img", "aria-hidden": true %>
+      <% end %>
+    <% elsif current_user %>
+      <button type="button" class="title-action__action button small" data-open="not-authorized-modal" aria-controls="not-authorized-modal" aria-haspopup="true" tabindex="0">
+        <%= t(".new_initiative") %>
+        <%= icon "plus", role: "img", "aria-hidden": true %>
+      </button>
+    <% else %>
+      <% content_for(:redirect_after_login) { create_initiative_url(:select_initiative_type) } %>
+      <button type="button" class="title-action__action button small" data-open="loginModal" aria-controls="loginModal" aria-haspopup="true" tabindex="0">
+        <%= t(".new_initiative") %>
+        <%= icon "plus", role: "img", "aria-hidden": true %>
+      </button>
     <% end %>
   <% end %>
 </div>
+
+<div class="reveal not-authorized-reveal" id="not-authorized-modal" aria-hidden="true" role="dialog" aria-labelledby="not-authorized-modal-title" data-reveal data-multiple-opened="true">
+  <div class="reveal__header">
+    <h2 class="reveal__title" id="not-authorized-modal-title"><%= t(".not_authorized.title") %></h2>
+    <button class="close-button" data-close aria-label="<%= t(".not_authorized.close") %>"
+      type="button">
+      <span aria-hidden="true">&times;</span>
+    </button>
+  </div>
+  <div class="not-authhorized-content">
+    <div class="not-authorized-modal-content">
+      <p>
+        <%= t(".not_authorized.explanation") %>
+      </p>
+    </div>
+  </div>
+  <div class="not-authorized-modal-footer reveal__footer">
+    <%= link_to t(".not_authorized.authorizations_page"), decidim_verifications.authorizations_path(redirect_url: create_initiative_url(:select_initiative_type)), class: "button expanded" %>
+  </div>
+  </div>
+</div>

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

@@ -1,3 +1,13 @@
+<% if @forced_closed_initiatives %>
+  <div class="callout warning">
+    <%= t ".closed_initiatives_warning" %>
+  </div>
+<% elsif initiatives.blank? %>
+  <div class="callout warning">
+    <%= t ".no_initiatives_warning" %>
+  </div>
+<% end %>
+
 <div class="collection-sort-controls row small-up-1 medium-up-2 card-grid">
   <div class="column">
     <%= order_selector available_orders, i18n_scope: "decidim.initiatives.initiatives.orders" %>

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

@@ -1,9 +1,24 @@
-<%= 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
-) %>
+<div id="initiative-<%= current_initiative.id %>-progress-bar">
+  <% current_initiative.votable_initiative_type_scopes.each_with_index do |type_scope, index| %>
+    <% if index == 0 %>
+      <%= cell(
+        "decidim/progress_bar",
+        current_initiative.online_votes_count_for(type_scope.scope),
+        total: type_scope.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
+        ) %>
+    <% else %>
+      <%= cell(
+        "decidim/progress_bar",
+        current_initiative.online_votes_count_for(type_scope.scope),
+        total: type_scope.supports_required,
+        subtitle_text: translated_attribute(type_scope.scope_name),
+        element_id: "initiative-scope-#{type_scope.id}-#{current_initiative.id}-votes-count",
+        horizontal: true
+        ) %>
+    <% end %>
+  <% end %>
+</div>

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

@@ -1,14 +1,4 @@
-<% if current_user && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? && allowed_to?(:vote, :initiative, initiative: initiative) %>
-  <button id="select-identity-button"
-          class="button expanded light button--sc">
-    <%= t(".vote") %>
-  </button>
-
-  <div class="reveal"
-       id="user-identities"
-       data-reveal data-refresh-url="<%= signature_identities_initiative_url(slug: initiative.slug) %>">
-  </div>
-<% elsif initiative.accepts_online_votes? %>
+<% if initiative.accepts_online_votes? %>
     <%= render partial: "decidim/initiatives/initiatives/vote_button",
                locals: {
                    initiative: initiative,
@@ -22,5 +12,3 @@
     <%= t(".votes_blocked") %>
   </button>
 <% end %>
-
-<%= javascript_include_tag "decidim/initiatives/identity_selector_dialog" %>