decidim-initiatives 0.23.6 → 0.24.0.rc1

data/app/services/decidim/initiatives/pdf_signature_example.rb

@@ -18,23 +18,23 @@ module Decidim
       # Public: PDF signed using a new certificate generated by the service
       def signed_pdf
         @signed_pdf ||= begin
-                          StringIO.open(pdf) do |stream|
-                            parsed_pdf = Origami::PDF.read(stream)
-                            parsed_pdf.append_page do |page|
-                              page.add_annotation(signature_annotation)
-                              parsed_pdf.sign(
-                                certificate,
-                                key,
-                                method: "adbe.pkcs7.detached",
-                                annotation: signature_annotation,
-                                location: location,
-                                contact: contact,
-                                issuer: issuer
-                              )
-                            end
-                            extract_signed_pdf(parsed_pdf)
-                          end
-                        end
+          StringIO.open(pdf) do |stream|
+            parsed_pdf = Origami::PDF.read(stream)
+            parsed_pdf.append_page do |page|
+              page.add_annotation(signature_annotation)
+              parsed_pdf.sign(
+                certificate,
+                key,
+                method: "adbe.pkcs7.detached",
+                annotation: signature_annotation,
+                location: location,
+                contact: contact,
+                issuer: issuer
+              )
+            end
+            extract_signed_pdf(parsed_pdf)
+          end
+        end
       end
 
       private
@@ -68,15 +68,15 @@ module Decidim
 
       def signature_annotation(options = {})
         @signature_annotation ||= begin
-                                    width = options.fetch(:width, 200.0)
-                                    height = options.fetch(:height, 50.0)
-
-                                    Origami::Annotation::Widget::Signature.new.tap do |annotation|
-                                      annotation.set_indirect(true)
-                                      annotation.Rect = Origami::Rectangle[llx: height, lly: width + height, urx: width + height, ury: width]
-                                      annotation.set_normal_appearance(text_annotation(width: width, height: height))
-                                    end
-                                  end
+          width = options.fetch(:width, 200.0)
+          height = options.fetch(:height, 50.0)
+
+          Origami::Annotation::Widget::Signature.new.tap do |annotation|
+            annotation.set_indirect(true)
+            annotation.Rect = Origami::Rectangle[llx: height, lly: width + height, urx: width + height, ury: width]
+            annotation.set_normal_appearance(text_annotation(width: width, height: height))
+          end
+        end
       end
 
       def certificate
@@ -85,7 +85,7 @@ module Decidim
           cert.not_after = 10.years.from_now
 
           cert.public_key = key.public_key
-          cert.sign(key, OpenSSL::Digest::SHA256.new)
+          cert.sign(key, OpenSSL::Digest.new("SHA256"))
         end
       end
 

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

@@ -7,7 +7,7 @@
       <%= link_to t(".send_to_technical_validation"),
                   send_to_technical_validation_initiative_path(current_initiative),
                   class: "button muted",
-                  data: { confirm: t(".confirm") } %>
+                  data: { confirm: t(".confirm_send_to_technical_validation") } %>
     <% elsif current_initiative.created? %>
       <%= link_to t(".send_to_technical_validation"), "#", class: "button muted disabled" %>
     <% end %>

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

@@ -45,6 +45,8 @@
                                  t(".preview"),
                                  class: "action-icon--preview",
                                  target: "_blank" %>
+              <% else %>
+               <span class="action-space icon"></span>
               <% end %>
 
               <% if allowed_to? :edit, :initiative, initiative: initiative %>
@@ -52,6 +54,8 @@
                                  decidim_admin_initiatives.edit_initiative_path(initiative.to_param),
                                  t("actions.configure", scope: "decidim.admin"),
                                  class: "action-icon--edit" %>
+              <% else %>
+               <span class="action-space icon"></span>
               <% end %>
 
               <% if allowed_to?(:answer, :initiative, initiative: initiative) %>
@@ -65,6 +69,8 @@
                                  decidim_admin_initiatives.initiative_path(initiative.to_param),
                                  t(".print",),
                                  class: "action-icon--print" %>
+              <% else %>
+                <span class="action-space icon"></span>
               <% end %>
             </td>
           <% end %>

data/app/views/decidim/initiatives/admin/initiatives_type_scopes/edit.html.erb

@@ -1,21 +1,28 @@
-<h2 class="process-title-summary">
-  <%= t ".title" %>
-</h2>
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= t ".title" %></h2>
+  </div>
+
+  <div class="card-section">
+    <div class="row column">
 
-<%= decidim_form_for @form,
-                     url: initiatives_type_initiatives_type_scope_path(params[:initiatives_type_id], current_initiative_type_scope),
-                     html: { class: "form edit_initiative_type_scope" } do |f| %>
-  <%= render partial: "form", object: f %>
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".update"), class: "button" %>
+      <%= decidim_form_for @form,
+                           url: initiatives_type_initiatives_type_scope_path(params[:initiatives_type_id], current_initiative_type_scope),
+                           html: { class: "form edit_initiative_type_scope" } do |f| %>
+        <%= render partial: "form", object: f %>
+        <div class="button--double form-general-submit">
+          <%= f.submit t(".update"), class: "button" %>
 
-    <% if allowed_to? :destroy, :initiative_type_scope, initiative_type_scope: current_initiative_type_scope %>
-        <%= link_to t(".destroy"), initiatives_type_initiatives_type_scope_path(params[:initiatives_type_id], current_initiative_type_scope),
-                    method: :delete,
-                    class: "alert button",
-                    data: { confirm: t(".confirm_destroy") } %>
-    <% end %>
+          <% if allowed_to? :destroy, :initiative_type_scope, initiative_type_scope: current_initiative_type_scope %>
+              <%= link_to t(".destroy"), initiatives_type_initiatives_type_scope_path(params[:initiatives_type_id], current_initiative_type_scope),
+                          method: :delete,
+                          class: "alert button",
+                          data: { confirm: t(".confirm_destroy") } %>
+          <% end %>
 
-    <%= link_to t(".back"), edit_initiatives_type_path(params[:initiatives_type_id]), class: "button" %>
+          <%= link_to t(".back"), edit_initiatives_type_path(params[:initiatives_type_id]), class: "button" %>
+        </div>
+      <% end %>
+    </div>
   </div>
-<% end %>
+</div>

data/app/views/decidim/initiatives/admin/initiatives_type_scopes/new.html.erb

@@ -1,14 +1,20 @@
-<h2 class="process-title-summary">
-  <%= t ".title" %>
-</h2>
+<div class="card">
+  <div class="card-divider">
+    <h2 class="card-title"><%= t ".title" %></h2>
+  </div>
 
-<%= decidim_form_for @form,
-                     url: initiatives_type_initiatives_type_scopes_path(params[:initiatives_type_id]),
-                     html: { class: "form new_initiatives_type_scopes" } do |f| %>
-  <%= render partial: "form", object: f %>
+  <div class="card-section">
+    <div class="row column">
+      <%= decidim_form_for @form,
+                           url: initiatives_type_initiatives_type_scopes_path(params[:initiatives_type_id]),
+                           html: { class: "form new_initiatives_type_scopes" } do |f| %>
+        <%= render partial: "form", object: f %>
 
-  <div class="button--double form-general-submit">
-    <%= f.submit t(".create") %>
-    <%= link_to t(".back"), edit_initiatives_type_path(params[:initiatives_type_id]), class: "button" %>
+        <div class="button--double form-general-submit">
+          <%= f.submit t(".create") %>
+          <%= link_to t(".back"), edit_initiatives_type_path(params[:initiatives_type_id]), class: "button" %>
+        </div>
+      <% end %>
+    </div>
   </div>
-<% end %>
+</div>

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

@@ -3,7 +3,7 @@
     <h2 class="card-title">
       <%= t "decidim.admin.titles.initiatives_types" %>
       <%= link_to t("actions.new_initiative_type", scope: "decidim.admin"),
-                  [:new, :initiatives_type],
+                  ["new", "initiatives_type"],
                   class: "button tiny button--title" if allowed_to? :create, :initiative_type %>
     </h2>
   </div>

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

@@ -1,7 +1,2 @@
-<p><%= t ".help_text" %></p>
-<ul>
-  <li><%= t ".help_for_organizations" %></li>
-  <li><%= t ".help_in_person_signatures" %></li>
-</ul>
-<p><%== t ".initiatives_page_link", link: link_to(t(".page"), decidim.page_path("initiatives"), target: "_blank") %></p>
-<p><%= t ".access_reminder" %></p>
+<p><%== t ".publish_helper_text" %>
+<p><%== t ".access_reminder", link: link_to(t("myself", scope: "decidim.initiatives.initiatives.filters"), decidim_initiatives.initiatives_path(filter: { author: "myself", state: "" })) %></p>

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

@@ -78,24 +78,11 @@
 
             <% 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>
+                <legend><%= t("attachment_legend", scope: "decidim.initiatives.form") %></legend>
 
-                  <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>
-                    <% end %>
-                  <% end %>
-                <% end %>
+                <div class="row column">
+                  <%= f.file_field :add_documents, multiple: true, label: t("add_attachments", scope: "decidim.initiatives.form") %>
+                </div>
               </fieldset>
             <% end %>
           </div>

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

@@ -19,18 +19,18 @@
     <div class="card">
       <div class="card__content">
         <%= render partial: "finish_help" %>
-      </div>
 
-      <div class="column actions">
-        <% unless promotal_committee_required? %>
-          <%= link_to t(".send_my_initiative"),
-                      decidim_admin_initiatives.send_to_technical_validation_initiative_path(current_initiative),
-                      class: "button success light expanded",
-                      data: { confirm: t(".confirm") } %>
-        <% end %>
-        <%= link_to t(".edit_my_initiative"), decidim_admin_initiatives.edit_initiative_path(current_initiative), class: "button expanded light secondary" %>
-        <%= link_to t(".go_to_my_initiatives"), decidim_admin_initiatives.initiatives_path, class: "button expanded" %>
-        <%= link_to t(".back_to_initiatives"), initiatives_path, class: "button white-button expanded" %>
+        <div class="actions">
+          <% unless promotal_committee_required? %>
+            <%= link_to t(".send_my_initiative"),
+                        decidim_initiatives.send_to_technical_validation_initiative_path(current_initiative),
+                        class: "button success light expanded",
+                        data: { confirm: t(".confirm") } %>
+          <% end %>
+          <%= link_to t(".edit_my_initiative"), edit_initiative_path(current_initiative), class: "button expanded light secondary" %>
+          <%= link_to t(".go_to_my_initiatives"), decidim_initiatives.initiatives_path(filter: { author: "myself", state: "" }), class: "button expanded" %>
+          <%= link_to t(".back_to_initiatives"), initiatives_path, class: "button white-button expanded" %>
+        </div>
       </div>
     </div>
   </div>

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

@@ -0,0 +1,73 @@
+<fieldset>
+  <legend><%= t ".title" %></legend>
+
+  <div class="card-section">
+    <div class="row column">
+      <%= t ".invite_to_committee_help" %>
+    </div>
+
+    <div class="row column">
+      <div class="card card--list">
+        <div class="card--list__item">
+          <div class="card--list__text">
+            <div>
+              <h6 class="card--list__heading heading6 lowercase" id="committee_link">
+                <%= decidim_initiatives.new_initiative_committee_request_url(current_initiative) %>
+              </h6>
+            </div>
+          </div>
+          <div class="card--list__data">
+            <%= icon_link_to "clipboard", "#", t(".invite_to_committee_help"), class: "card--list__data__icon invite-users-link" %>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <div class="card-section">
+    <div class="table-scroll">
+      <table class="table-list">
+        <thead>
+        <tr>
+          <th><%= t ".title" %></th>
+          <th></th>
+        </tr>
+        </thead>
+        <tbody>
+          <% if current_initiative.committee_members.empty? %>
+          <tr>
+            <td><%= t ".no_members_yet" %></td>
+            <td></td>
+          </tr>
+          <% end %>
+
+          <% current_initiative.committee_members.each do |request| %>
+            <tr data-id="<%= request.id %>">
+              <td>
+                <%= link_to request.user.name, "mailto:#{request.user.email}" %>
+              </td>
+              <td class="table-list__actions">
+                <% if allowed_to? :approve, :initiative_committee_member, initiative: current_initiative, request: request %>
+                  <%= icon_link_to "check",
+                                  approve_initiative_committee_request_path(current_initiative, request),
+                                  t(".approve"),
+                                  class: "action-icon--check" %>
+                <% end %>
+
+                <% if allowed_to? :revoke, :initiative_committee_member, initiative: current_initiative, request: request %>
+                  <%= icon_link_to "circle-x",
+                                  revoke_initiative_committee_request_path(current_initiative, request),
+                                  t(".revoke"),
+                                  class: "action-icon--remove",
+                                  method: :delete,
+                                  data: { confirm: t(".confirm_revoke") } %>
+                <% end %>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</fieldset>
+
+<%= javascript_include_tag "decidim/initiatives/admin/invite_users.js" %>

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

@@ -0,0 +1,112 @@
+<%= form_required_explanation %>
+
+<div class="field">
+  <%= form.text_field :title, autofocus: true, disabled: !allowed_to?(:update, :initiative, initiative: current_initiative), value: translated_attribute(@form.title) %>
+</div>
+
+<div class="field">
+  <%= form.editor :description, toolbar: :full, lines: 8, disabled: !allowed_to?(:update, :initiative, initiative: current_initiative), value: translated_attribute(@form.description) %>
+</div>
+
+<div class="field">
+  <%= form.text_field :hashtag, disabled: !allowed_to?(:update, :initiative, initiative: current_initiative) %>
+</div>
+
+<div class="field">
+  <%= form.select :state,
+                  Decidim::Initiative.states.keys.map { |state| [I18n.t(state, scope: "decidim.initiatives.admin_states"), state] },
+                  {},
+                  { disabled: !@form.state_updatable? } %>
+</div>
+
+<% unless single_initiative_type? %>
+  <div class="field">
+    <%= form.select :type_id,
+                    initiative_type_options,
+                    {},
+                    {
+                      disabled: !@form.signature_type_updatable?,
+                      "data-scope-selector": "initiative_decidim_scope_id",
+                      "data-scope-id": form.object.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,
+                      "data-signature-types-search-url": decidim_initiatives.initiative_type_signature_types_search_url
+                    } %>
+  </div>
+<% end %>
+
+<div class="field">
+  <%= form.select :scope_id,
+                @form.available_scopes.map { |scope| [translated_attribute(scope.scope_name), scope&.scope&.id] },
+                { disabled: !@form.state_updatable? } %>
+</div>
+
+<% if can_edit_custom_signature_end_date?(current_initiative) %>
+  <div class="row column">
+    <%= form.date_field :signature_end_date, disabled: !allowed_to?(:update, :initiative, initiative: current_initiative) %>
+  </div>
+<% end %>
+
+<% if current_initiative.area_enabled? %>
+  <div class="field">
+    <%= form.areas_select :area_id,
+                          areas_for_select(current_organization),
+                          {
+                            selected: current_initiative.decidim_area_id,
+                            include_blank: current_initiative.decidim_area_id.blank? || current_initiative.created?
+                          },
+                          disabled: !@form.area_updatable? %>
+  </div>
+<% end %>
+
+<div class="field">
+  <%= form.select :signature_type, [], {}, { disabled: !@form.signature_type_updatable? } %>
+</div>
+<% if current_initiative.type.attachments_enabled? %>
+  <fieldset>
+    <legend><%= t("attachment_legend", scope: "decidim.initiatives.form") %></legend>
+
+    <% if @form.photos.any? %>
+      <% @form.photos.each do |photo| %>
+        <div class="callout gallery__item" data-closable>
+          <%= image_tag photo.thumbnail_url, class: "thumbnail", alt: photo.file.file.filename %>
+          <%= form.hidden_field :photos, multiple: true, value: photo.id, id: "photo-#{photo.id}" %>
+          <button class="close-button"
+                  aria-label="<%= t("delete_attachment", scope: "decidim.initiatives.form") %>"
+                  title="<%= t("delete_attachment", scope: "decidim.initiatives.form") %>"
+                  type="button"
+                  data-close>
+            <span aria-hidden="true">&times;</span>
+          </button>
+        </div>
+      <% end %>
+    <% end %>
+
+    <% if @form.documents.any? %>
+      <% @form.documents.each do |document| %>
+        <div class="callout" data-closable>
+          <%= link_to translated_attribute(document.title), document.url %>
+          <small><%= document.file_type %> <%= number_to_human_size(document.file_size) %></small>
+          <%= form.hidden_field :documents, multiple: true, value: document.id, id: "document-#{document.id}" %>
+          <button class="close-button"
+                  aria-label="<%= t("delete_attachment", scope: "decidim.initiatives.form") %>"
+                  title="<%= t("delete_attachment", scope: "decidim.initiatives.form") %>"
+                  type="button" data-close>
+            <span aria-hidden="true">&times;</span>
+          </button>
+        </div>
+      <% end %>
+    <% end %>
+
+    <div class="row column">
+      <%= form.file_field :add_documents, multiple: true, label: t("add_attachments", scope: "decidim.initiatives.form") %>
+    </div>
+  </fieldset>
+<% end %>
+
+<% if current_initiative.type.promoting_committee_enabled? %>
+  <%= render partial: "committee_members" %>
+<% end %>
+
+<%= javascript_include_tag "decidim/initiatives/scoped_type" %>

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

@@ -2,7 +2,7 @@
   <br>
   <div class="row column">
     <div class="callout success">
-      <h5><%= t(initiative.state, scope: "decidim.initiatives.initiatives.result.answer_title") %>:</h5>
+      <h5><%= t("decidim.initiatives.initiatives.result.answer_title") %>:</h5>
       <p>
         <% if initiative.answer_url.present? %>
           <a href="<%= initiative.answer_url %>" target="_blank">

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

@@ -0,0 +1,8 @@
+<% if allowed_to? :send_to_technical_validation, :initiative, initiative: current_initiative %>
+  <%= link_to title,
+              send_to_technical_validation_initiative_path(current_initiative),
+              class: "button expanded",
+              data: { confirm: confirm } %>
+<% else %>
+  <%= link_to title, "#", class: "button expanded disabled" %>
+<% end %>

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

@@ -0,0 +1,78 @@
+<% add_decidim_page_title(action_name) %>
+
+<div class="row columns">
+  <%= link_to :back, class: "muted-link" do %>
+    <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
+    <%= t("back", scope: "decidim.initiatives.edit") %>
+  <% end %>
+  <h2 class="section-heading"><%= t("title", scope: "decidim.initiatives.edit") %></h2>
+</div>
+
+<div class="row">
+  <div class="columns large-6 medium-centered">
+    <div class="card">
+      <div class="card__content">
+        <%= decidim_form_for @form, html: { class: "form edit_initiative" } do |f| %>
+          <%= render partial: "form", object: f %>
+          <div class="actions">
+            <%= f.submit t("update", scope: "decidim.initiatives.edit"), class: "button expanded" if allowed_to? :update, :initiative, initiative: current_initiative %>
+
+            <% if allowed_to? :publish, :initiative, initiative: current_initiative %>
+              <%= link_to t("actions.publish", scope: "decidim.admin"),
+                          publish_initiative_path(current_initiative),
+                          method: :post,
+                          class: "button hollow expanded",
+                          data: { confirm: t("confirm", scope: "decidim.initiatives.edit") } %>
+            <% end %>
+
+            <% if allowed_to? :unpublish, :initiative, initiative: current_initiative %>
+              <%= link_to t("actions.unpublish", scope: "decidim.admin"),
+                          unpublish_initiative_path(current_initiative),
+                          method: :delete,
+                          class: "button alert expanded",
+                          data: { confirm: t("confirm", scope: "decidim.initiatives.edit") } %>
+            <% end %>
+
+            <% if allowed_to? :accept, :initiative, initiative: current_initiative %>
+                <%= link_to t("accept", scope: "decidim.initiatives.edit"),
+                            accept_initiative_path(current_initiative),
+                            method: :post,
+                            class: "button hollow expanded",
+                            data: { confirm: t("confirm", scope: "decidim.initiatives.edit") } %>
+            <% end %>
+
+            <% if allowed_to? :reject, :initiative, initiative: current_initiative %>
+                <%= link_to t("reject", scope: "decidim.initiatives.edit"),
+                            reject_initiative_path(current_initiative),
+                            method: :delete,
+                            class: "button alert expanded",
+                            data: { confirm: t("confirm", scope: "decidim.initiatives.edit") } %>
+            <% end %>
+
+            <% if allowed_to? :discard, :initiative, initiative: current_initiative %>
+              <%= link_to t("discard", scope: "decidim.initiatives.edit"),
+                          discard_initiative_path(current_initiative),
+                          method: :delete,
+                          class: "button alert expanded",
+                          data: { confirm: t("confirm", scope: "decidim.initiatives.edit") } %>
+            <% end %>
+
+            <% if allowed_to? :export_votes, :initiative, initiative: current_initiative %>
+              <%= link_to t("export_votes", scope: "decidim.initiatives.edit"),
+                          export_votes_initiative_path(current_initiative, format: :csv),
+                          class: "button alert expanded",
+                          data: { confirm: t("confirm", scope: "decidim.initiatives.edit") } %>
+            <% end %>
+
+            <% if allowed_to? :export_pdf_signatures, :initiative, initiative: current_initiative %>
+              <%= link_to t("export_pdf_signatures", scope: "decidim.initiatives.edit"),
+                          export_pdf_signatures_initiative_path(current_initiative, format: :pdf),
+                          class: "button alert expanded",
+                          data: { confirm: t("confirm", scope: "decidim.initiatives.edit") } %>
+            <% end %>
+          </div>
+        <% end %>
+      </div>
+    </div>
+  </div>
+</div>