decidim-initiatives 0.15.2 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5979e87038225a6d130d039817b1462d36566ac5085c81a7deb2000782fcc36
-  data.tar.gz: 5ccac2eff9e91c1bc02703749da02c44dbcd06401cf7524a979a39e0f1f497bd
+  metadata.gz: 400915f5a9e0d88995d34fed19dc72a1d07b80c4e55e0bf0b1b35df268cdfb24
+  data.tar.gz: 9fa5cf0876f72c3065ec75d57189aa93dd208693f5f8cbd8cb5e2df20639c512
 SHA512:
-  metadata.gz: 38a0ff42ef3d00c861c70531d28fa695f235c037ceddea661194c884ce36b63169a41f16ad2223bac551c993504b99c139c139005f6c5977b27635b1aac7d3f8
-  data.tar.gz: 899b5060e5d0179f0fa49bb6326bf96f6eaf2c78964a0b2bd07e44d1f1a8d7ec5feb70644d807aa53eb06a11760e1da463325c6d9017b2fdf73d71d3a98a8015
+  metadata.gz: 0d7da84292e39c67413482d0019b4b357870fd5b445e80660aa90eba7ccdb89b40cc140887bc6ac66ab5f702cfa8bcfec3ee5d8a072b43aea344252a8b6bdd8c
+  data.tar.gz: 0a6408707f3ebee6f382f74a9f299e693da3a5606f0079736e71d8f85d38c33f67e87bb8d603e96eacd8f10ca79573b4de1b633f39089b7c092c84bcbef26448

data/app/assets/stylesheet/decidim/initiatives/initiatives.scss

@@ -56,26 +56,6 @@
   text-transform: lowercase !important;
 }
 
-.initiative-creation-header__container{
-  position: relative;
-  z-index: 1;
-  padding: 0 0 0 1rem;
-  background: #fafafa;
-
-  .initiative-creation-header__phase{
-    background: #fafafa;
-    color: #fff;
-    text-align: center;
-    padding: 0 1rem;
-    margin-left: -1rem;
-
-    .caption{
-      color: #8c838a;
-      font-size: .9em;
-    }
-  }
-}
-
 .legal_text{
   font-size: 8pt;
 }

data/app/commands/decidim/initiatives/admin/update_initiative.rb

@@ -71,7 +71,7 @@ module Decidim
             event: "decidim.events.initiatives.initiative_extended",
             event_class: Decidim::Initiatives::ExtendInitiativeEvent,
             resource: initiative,
-            recipient_ids: initiative.followers.pluck(:id)
+            followers: initiative.followers - [initiative.author]
           )
         end
       end

data/app/commands/decidim/initiatives/create_initiative.rb

@@ -95,7 +95,7 @@ module Decidim
           event: "decidim.events.initiatives.initiative_created",
           event_class: Decidim::Initiatives::CreateInitiativeEvent,
           resource: initiative,
-          recipient_ids: initiative.author.followers.pluck(:id)
+          followers: initiative.author.followers
         )
       end
 

data/app/commands/decidim/initiatives/vote_initiative.rb

@@ -53,7 +53,7 @@ module Decidim
           event: "decidim.events.initiatives.initiative_endorsed",
           event_class: Decidim::Initiatives::EndorseInitiativeEvent,
           resource: @initiative,
-          recipient_ids: @initiative.author.followers.pluck(:id)
+          followers: @initiative.author.followers
         )
       end
 
@@ -68,7 +68,8 @@ module Decidim
           event: "decidim.events.initiatives.milestone_completed",
           event_class: Decidim::Initiatives::MilestoneCompletedEvent,
           resource: @initiative,
-          recipient_ids: @initiative.followers.pluck(:id),
+          affected_users: [@initiative.author],
+          followers: @initiative.followers - [@initiative.author],
           extra: {
             percentage: percentage
           }

data/app/controllers/decidim/initiatives/initiatives_controller.rb

@@ -15,6 +15,7 @@ module Decidim
       helper Decidim::IconHelper
       helper Decidim::Comments::CommentsHelper
       helper Decidim::Admin::IconLinkHelper
+      helper Decidim::ResourceReferenceHelper
       helper PaginateHelper
       helper InitiativeHelper
       include InitiativeSlug
@@ -55,7 +56,7 @@ module Decidim
       end
 
       def initiatives
-        @initiatives = search.results.includes(:author, :scoped_type)
+        @initiatives = search.results.includes(:scoped_type)
         @initiatives = reorder(@initiatives)
         @initiatives = paginate(@initiatives)
       end

data/app/events/decidim/initiatives/milestone_completed_event.rb

@@ -12,6 +12,10 @@ module Decidim
       def participatory_space
         resource
       end
+
+      def event_has_roles?
+        true
+      end
     end
   end
 end

data/app/models/decidim/initiative.rb

@@ -16,6 +16,7 @@ module Decidim
     include Decidim::Loggable
     include Decidim::Initiatives::InitiativeSlug
     include Decidim::Resourceable
+    include Decidim::HasReference
 
     belongs_to :organization,
                foreign_key: "decidim_organization_id",
@@ -97,6 +98,14 @@ module Decidim
       end
     end
 
+    def self.future_spaces
+      none
+    end
+
+    def self.past_spaces
+      closed
+    end
+
     def self.log_presenter_class_for(_log)
       Decidim::Initiatives::AdminLog::InitiativePresenter
     end

data/app/models/decidim/initiatives_type_scope.rb

@@ -23,5 +23,9 @@ module Decidim
       only_integer: true,
       greater_than: 0
     }
+
+    def scope_name
+      scope&.name.presence || I18n.t("decidim.initiatives.unavailable_scope")
+    end
   end
 end

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

@@ -15,7 +15,7 @@ module Decidim
 
       def base_query
         Decidim::Initiative
-          .includes(:author, scoped_type: [:scope])
+          .includes(scoped_type: [:scope])
           .where(organization: options[:organization])
       end
 
@@ -44,12 +44,9 @@ module Decidim
       def search_type
         return query if type == "all"
 
-        query
-          .joins(:scoped_type)
-          .where(
-            "decidim_initiatives_type_scopes.decidim_initiatives_types_id IN (?)",
-            type
-          )
+        types = InitiativesTypeScope.where(decidim_initiatives_types_id: type).pluck(:id)
+
+        query.where(scoped_type: types)
       end
 
       def search_author

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

@@ -50,6 +50,7 @@
       <table class="table-list">
         <thead>
           <tr>
+            <th><%= t("models.initiatives.fields.id", scope: "decidim.admin") %></th>
             <th><%= t("models.initiatives.fields.title", scope: "decidim.admin") %></th>
             <th><%= t("models.initiatives.fields.state", scope: "decidim.admin") %></th>
             <th><%= t("models.initiatives.fields.supports_count", scope: "decidim.admin") %></th>
@@ -60,6 +61,7 @@
         <tbody>
           <% @initiatives.each do |initiative| %>
           <tr>
+            <td><%= initiative.id %></td>
             <td>
               <% if allowed_to? :edit, :initiative, initiative: initiative %>
                 <%= link_to translated_attribute(initiative.title),

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

@@ -22,7 +22,7 @@
         <tbody>
         <% initiative_type.scopes.each do |s| %>
           <tr>
-            <td><%= translated_attribute(s.scope.name) %></td>
+            <td><%= translated_attribute(s.scope_name) %></td>
             <td class="text-right"><%= s.supports_required %></td>
             <td class="table-list__actions">
               <%= icon_link_to "pencil",

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

@@ -1,5 +1,5 @@
 <% content_for :back_link do %>
-  <%= link_to :back, class: "muted-link" do %>
+  <%= link_to :back do %>
     <%= icon "chevron-left", class: "icon--small" %>
     <%= t(".back") %>
   <% end %>

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

@@ -1,5 +1,5 @@
 <% content_for :back_link do %>
-  <%= link_to :back, class: "muted-link" do %>
+  <%= link_to :back do %>
     <%= icon "chevron-left", class: "icon--small" %>
     <%= t(".back") %>
   <% end %>

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

@@ -1,5 +1,5 @@
 <% content_for :back_link do %>
-  <%= link_to :back, class: "muted-link" do %>
+  <%= link_to :back do %>
     <%= icon "chevron-left", class: "icon--small" %>
     <%= t(".back") %>
   <% end %>

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

@@ -1,5 +1,5 @@
 <% content_for :back_link do %>
-  <%= link_to :back, class: "muted-link" do %>
+  <%= link_to :back do %>
     <%= icon "chevron-left", class: "icon--small" %>
     <%= t(".back") %>
   <% end %>

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

@@ -1,5 +1,5 @@
 <% content_for :back_link do %>
-  <%= link_to initiatives_path, class: "muted-link" do %>
+  <%= link_to initiatives_path do %>
     <%= icon "chevron-left", class: "icon--small" %>
     <%= t(".back") %>
   <% end %>

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

@@ -1,5 +1,5 @@
 <% content_for :back_link do %>
-  <%= link_to :back, class: "muted-link" do %>
+  <%= link_to :back do %>
     <%= icon "chevron-left", class: "icon--small" %>
     <%= t(".back") %>
   <% end %>

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

@@ -7,7 +7,8 @@ edit_link(
 %>
 
 <% provide :meta_title, t("initiatives.index.title", scope: "decidim") %>
-<main class="wrapper">
+
+<%= participatory_space_wrapper do %>
   <div class="row columns">
     <div class="title-action">
       <%= render partial: "index_header" %>
@@ -25,7 +26,7 @@ edit_link(
       <%= render partial: "initiatives" %>
     </div>
   </div>
-</main>
+<% end %>
 
 <%= javascript_include_tag "decidim/filters" %>
 <%= javascript_include_tag "decidim/orders" %>

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

@@ -15,6 +15,8 @@ edit_link(
 )
 %>
 
+<%= participatory_space_floating_help %>
+
 <% add_decidim_page_title(translated_attribute(current_initiative.title)) %>
 <% provide :meta_image_url, current_initiative.type.banner_image.url %>
 <div class="row">
@@ -42,7 +44,7 @@ edit_link(
         <% end %>
 
         <% if current_user %>
-          <%= render partial: "decidim/shared/follow_button", locals: { followable: current_initiative } %>
+          <%= render partial: "decidim/shared/follow_button", locals: { followable: current_initiative, large: false } %>
         <% end %>
       </div>
     </div>
@@ -51,6 +53,7 @@ edit_link(
     <%= embed_modal_for initiative_initiative_widget_url(current_initiative, format: :js) %>
 
     <%= render partial: "statistics" %>
+    <%= resource_reference(current_initiative) %>
   </div>
 
   <div class="columns mediumlarge-8 mediumlarge-pull-4">

data/app/views/layouts/decidim/_initiative_creation_header.html.erb

@@ -1,35 +1,37 @@
-<div class="process-header row column">
-  <div class="row column process-header__main">
-    <div class="initiative-creation-header__container row">
-      <div class="columns mediumlarge-3">
+<div class="process-header">
+  <div class="process-header__inner">
+    <div class="row column process-header__main">
+    </div>
+    <div class="process-header__container initiative-creation-header__container row collapse column">
+      <div class="columns mediumlarge-8 process-header__info">
         <% if content_for? :back_link %>
-            <%= content_for :back_link %>
+          <%= content_for :back_link %>
         <% end %>
 
-        <h2 class="section-heading"><%= t(".#{step}") %></h2>
+        <h1 class="text-highlight heading2"><%= t(".title") %></h1>
       </div>
-      <div class="columns mediumlarge-6">
-        <div class="initiative-creation-header__phase">
+      <div class="columns mediumlarge-4">
+        <div class="process-header__phase initiative-creation-header__phase">
           <div class="process-header__progress show-for-medium">
             <ol>
               <% wizard_steps.each do |wizard_step| %>
                 <% unless future_step? wizard_step %>
                   <li class="phase-item--past">
                     <span></span>
-                    <div class="caption"><%= t ".#{wizard_step}" %></div>
                   </li>
                 <% else %>
                   <li>
                     <span></span>
-                    <div class="caption"><%= t ".#{wizard_step}" %></div>
                   </li>
                 <% end %>
               <% end %>
+              <% step_index = wizard_steps.index(step) %>
             </ol>
+            <span class="phase-current"><%= t(".step", current: (step_index + 1), total: wizard_steps.length) %></span>
+            <span class="phase-title"><%= t(".#{step}") %></span>
           </div>
         </div>
       </div>
-      <div class="columns mediumlarge-3"></div>
     </div>
   </div>
 </div>

data/app/views/layouts/decidim/_initiative_header.html.erb

@@ -1,8 +1,10 @@
-<div class="process-header row column">
-  <div class="row column process-header__main"
-       style="background-image:url(<%= current_participatory_space.type.banner_image.url %>);">
-    <div class="process-header__container row">
-      <div class="columns mediumlarge-9 process-header__info">
+<div class="process-header">
+  <div class="process-header__inner">
+    <div class="row column process-header__main"
+        style="background-image:url(<%= current_participatory_space.type.banner_image.url %>);">
+    </div>
+    <div class="process-header__container row collapse column">
+      <div class="columns mediumlarge-8 process-header__info">
         <div>
           <h1 class="text-highlight heading2">
             <%= participatory_space_helpers.translated_attribute(current_participatory_space.title) %>
@@ -22,44 +24,23 @@
       <%= render partial: "layouts/decidim/initiative_header_steps", locals: { initiative: current_participatory_space } %>
     </div>
   </div>
-  <% if current_participatory_space.components.any? %>
-      <div class="row column">
-        <div class="process-nav">
-          <button class="process-nav__trigger hide-for-medium" data-toggle="process-nav-content">
-            <%= icon "caret-bottom", class: "icon--small process-nav__trigger__icon", aria_label: t(".unfold"), role: "img" %>
-            <div class="process-nav__link">
-              <% if self.try(:current_component) %>
-                <%= component_icon(current_component) %>
-                <%= translated_attribute(current_component.name) %>
-              <% else %>
-                <%= icon "chat" %>
-                <%= t ".initiative_menu_item" %>
-              <% end %>
-            </div>
-          </button>
-          <div class="row column process-nav__content is-active" id="process-nav-content" data-toggler=".is-active">
-            <ul>
-              <li class="<%= "is-active" if is_active_link?(decidim_initiatives.initiative_path(current_participatory_space), :exclusive) %>">
-                <%= active_link_to decidim_initiatives.initiative_path(current_participatory_space), active: :exclusive, class: "process-nav__link", class_active: "is-active" do %>
-                  <%= icon "chat" %>
-                  <%= t ".initiative_menu_item" %>
-                <% end %>
-              </li>
-
-              <% current_participatory_space.components.each do |component| %>
-                  <% if component.published? || component == self.try(:current_component) %>
-                      <li class="<%= "is-active" if is_active_link?(main_component_path(component), :inclusive) %>">
-                        <%= active_link_to main_component_path(component), class: "process-nav__link", active: :inclusive, class_active: "is-active" do %>
-                            <%= component_icon(component) %>
+  <%
+    components = current_participatory_space.components.published.or(Decidim::Component.where(id: self.try(:current_component)))
+  %>
 
-                            <%= translated_attribute(component.name) %>
-                        <% end %>
-                      </li>
-                  <% end %>
-              <% end %>
-            </ul>
-          </div>
-        </div>
-      </div>
-  <% end %>
+  <%=
+    extended_navigation_bar([
+      {
+        name: t(".initiative_menu_item"),
+        url: decidim_initiatives.initiative_path(current_participatory_space),
+        active: is_active_link?(decidim_initiatives.initiative_path(current_participatory_space), :exclusive)
+      }
+    ] + components.map do |component|
+      {
+        name: translated_attribute(component.name),
+        url: main_component_path(component),
+        active: is_active_link?(main_component_path(component), :inclusive)
+      }
+    end)
+  %>
 </div>

data/app/views/layouts/decidim/_initiative_header_steps.html.erb

@@ -1,12 +1,6 @@
 <% if initiative.has_signature_interval_defined? %>
-  <div class="columns mediumlarge-3">
+  <div class="columns mediumlarge-4">
     <div class="process-header__phase">
-      <div class="process-header__progress show-for-medium">
-        <ol>
-          <li><span></span></li>
-        </ol>
-        <span class="phase-current"><!-- Step 1 of 1 --></span>
-      </div>
       <div>
         <span class="phase-title"><!-- Step name --></span>
         <span class="phase-date">

data/app/views/layouts/decidim/initiative.html.erb

@@ -1,15 +1,15 @@
 <%= render "layouts/decidim/application" do %>
-    <div class="wrapper">
-      <%= render partial: "layouts/decidim/initiative_header" %>
-      <%= yield %>
-    </div>
-    <% if content_for? :expanded %>
-        <div class="expanded">
-          <div class="wrapper wrapper--inner">
-            <div class="row">
-              <%= yield :expanded %>
-            </div>
-          </div>
+  <%= render partial: "layouts/decidim/initiative_header" %>
+  <div class="wrapper">
+    <%= yield %>
+  </div>
+  <% if content_for? :expanded %>
+    <div class="expanded">
+      <div class="wrapper wrapper--inner">
+        <div class="row">
+          <%= yield :expanded %>
         </div>
-    <% end %>
+      </div>
+    </div>
+  <% end %>
 <% end %>