decidim-initiatives 0.27.10 → 0.28.0.rc4

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

@@ -1,158 +1,161 @@
-<div class="wrapper">
-  <div class="initiative-letterhead">
-    <% if current_organization.logo.present? %>
-      <%= image_tag current_organization.attached_uploader(:logo).path(variant: :medium), title: current_organization.name %>
-    <% end %>
+<%= render layout: "layouts/decidim/shared/layout_center", locals: { columns: 10 } do %>
+  <div class="pt-10">
+    <div class="initiative-letterhead">
+      <% if current_organization.logo.present? %>
+        <%= image_tag current_organization.attached_uploader(:logo).path(variant: :medium), title: current_organization.name %>
+      <% end %>
 
-    <%= current_organization.name %>
-  </div>
-  <h3 class="print-section-title"><%= t ".section" %></h3>
-  <div class="initiative-print-title">
-    <%= t ".general_title" %>
-  </div>
-
-  <div class="print-table">
-    <div class="print-table-header">
-      <%= t ".author_title" %>
+      <%= current_organization.name %>
     </div>
-
-    <div class="print-table-row">
-      <div class="print-table-cell">
-        <div class="cell-header"><%= t ".id_number" %></div>
-        <div class="cell-content"></div>
-      </div>
+    <h3 class="print-section-title"><%= t "section", scope: "decidim.initiatives.initiatives.print" %></h3>
+    <div class="initiative-print-title">
+      <%= t "general_title", scope: "decidim.initiatives.initiatives.print" %>
     </div>
 
-    <div class="print-table-row">
-      <div class="print-table-cell">
-        <div class="cell-header"><%= t ".full_name" %></div>
-        <div class="cell-content"></div>
+    <div class="print-table">
+      <div class="print-table-header">
+        <%= t "author_title", scope: "decidim.initiatives.initiatives.print" %>
       </div>
-    </div>
 
-    <div class="print-table-row">
-      <div class="print-table-cell">
-        <div class="cell-header"><%= t ".address" %></div>
-        <div class="cell-content"></div>
+      <div class="print-table-row">
+        <div class="print-table-cell">
+          <div class="cell-header"><%= t "id_number", scope: "decidim.initiatives.initiatives.print" %></div>
+          <div class="cell-content"></div>
+        </div>
       </div>
-    </div>
 
-    <div class="print-table-row">
-      <div class="print-table-cell w33">
-        <div class="cell-header"><%= t ".city" %></div>
-        <div class="cell-content"></div>
-      </div>
-      <div class="print-table-cell w33">
-        <div class="cell-header"><%= t ".province" %></div>
-        <div class="cell-content"></div>
-      </div>
-      <div class="print-table-cell w33">
-        <div class="cell-header"><%= t ".postal_code" %></div>
-        <div class="cell-content"></div>
+      <div class="print-table-row">
+        <div class="print-table-cell">
+          <div class="cell-header"><%= t "full_name", scope: "decidim.initiatives.initiatives.print" %></div>
+          <div class="cell-content"></div>
+        </div>
       </div>
-    </div>
 
-    <div class="print-table-row">
-      <div class="print-table-cell w33">
-        <div class="cell-header"><%= t ".phone_number" %></div>
-        <div class="cell-content"></div>
+      <div class="print-table-row">
+        <div class="print-table-cell">
+          <div class="cell-header"><%= t "address", scope: "decidim.initiatives.initiatives.print" %></div>
+          <div class="cell-content"></div>
+        </div>
       </div>
 
-      <div class="print-table-cell">
-        <div class="cell-header"><%= t ".email" %></div>
-        <div class="cell-content"></div>
+      <div class="print-table-row">
+        <div class="print-table-cell w33">
+          <div class="cell-header"><%= t "city", scope: "decidim.initiatives.initiatives.print" %></div>
+          <div class="cell-content"></div>
+        </div>
+        <div class="print-table-cell w33">
+          <div class="cell-header"><%= t "province", scope: "decidim.initiatives.initiatives.print" %></div>
+          <div class="cell-content"></div>
+        </div>
+        <div class="print-table-cell w33">
+          <div class="cell-header"><%= t "postal_code", scope: "decidim.initiatives.initiatives.print" %></div>
+          <div class="cell-content"></div>
+        </div>
       </div>
-    </div>
-  </div>
-  <br><br>
-  <div class="print-table">
-    <div class="print-table-header">
-      <%= t ".members_header" %>
-    </div>
 
-    <div class="print-table-row">
-      <div class="print-table-cell w33"><%= t ".full_name" %></div>
-      <div class="print-table-cell w33"><%= t ".id_number" %></div>
-      <div class="print-table-cell w33"><%= t ".address" %></div>
+      <div class="print-table-row">
+        <div class="print-table-cell w33">
+          <div class="cell-header"><%= t "phone_number", scope: "decidim.initiatives.initiatives.print" %></div>
+          <div class="cell-content"></div>
+        </div>
+
+        <div class="print-table-cell">
+          <div class="cell-header"><%= t "email", scope: "decidim.initiatives.initiatives.print" %></div>
+          <div class="cell-content"></div>
+        </div>
+      </div>
     </div>
+    <br><br>
+    <div class="print-table">
+      <div class="print-table-header">
+        <%= t "members_header", scope: "decidim.initiatives.initiatives.print" %>
+      </div>
 
-    <% 4.times do %>
       <div class="print-table-row">
-        <div class="print-table-cell w33"></div>
-        <div class="print-table-cell w33"></div>
-        <div class="print-table-cell w33"></div>
+        <div class="print-table-cell w33"><%= t "full_name", scope: "decidim.initiatives.initiatives.print" %></div>
+        <div class="print-table-cell w33"><%= t "id_number", scope: "decidim.initiatives.initiatives.print" %></div>
+        <div class="print-table-cell w33"><%= t "address", scope: "decidim.initiatives.initiatives.print" %></div>
       </div>
-    <% end %>
-  </div>
 
-  <h2 class="print-section-title"><%= t ".initiative.type" %></h2>
-  <%= translated_attribute(current_initiative.type.title) %>
+      <% 4.times do %>
+        <div class="print-table-row">
+          <div class="print-table-cell w33"></div>
+          <div class="print-table-cell w33"></div>
+          <div class="print-table-cell w33"></div>
+        </div>
+      <% end %>
+    </div>
 
-  <h2 class="print-section-title"><%= t ".initiative.title" %></h2>
-  <%= translated_attribute(current_initiative.title) %>
+    <h2 class="print-section-title"><%= t "initiative.type", scope: "decidim.initiatives.initiatives.print" %></h2>
+    <%= translated_attribute(current_initiative.type.title) %>
 
-  <h2 class="print-section-title"><%= t ".initiative.description" %></h2>
-  <%= decidim_sanitize_editor translated_attribute(current_initiative.description) %>
+    <h2 class="print-section-title"><%= t "initiative.title", scope: "decidim.initiatives.initiatives.print" %></h2>
+    <%= translated_attribute(current_initiative.title) %>
 
-  <div class="print-table">
-    <div class="print-table-header">
-      <%= t ".initiative.attachments" %>
-    </div>
+    <h2 class="print-section-title"><%= t "initiative.description", scope: "decidim.initiatives.initiatives.print" %></h2>
+    <%= decidim_sanitize_editor translated_attribute(current_initiative.description) %>
 
-    <div class="print-table-row">
-      <div class="print-table-cell checkbox-cell"></div>
-      <div class="print-table-cell">
-        <div class="cell-content"></div>
+    <div class="print-table">
+      <div class="print-table-header">
+        <%= t "initiative.attachments", scope: "decidim.initiatives.initiatives.print" %>
       </div>
-    </div>
 
-    <div class="print-table-row">
-      <div class="print-table-cell checkbox-cell"></div>
-      <div class="print-table-cell">
-        <div class="cell-content"><div class="cell-content"></div></div>
+      <div class="print-table-row">
+        <div class="print-table-cell checkbox-cell"></div>
+        <div class="print-table-cell">
+          <div class="cell-content"></div>
+        </div>
       </div>
-    </div>
 
-    <div class="print-table-row">
-      <div class="print-table-cell checkbox-cell"></div>
-      <div class="print-table-cell">
-        <div class="cell-content"></div>
+      <div class="print-table-row">
+        <div class="print-table-cell checkbox-cell"></div>
+        <div class="print-table-cell">
+          <div class="cell-content"><div class="cell-content"></div></div>
+        </div>
       </div>
-    </div>
 
-    <div class="print-table-row">
-      <div class="print-table-cell checkbox-cell"></div>
-      <div class="print-table-cell">
-        <div class="cell-content"></div>
+      <div class="print-table-row">
+        <div class="print-table-cell checkbox-cell"></div>
+        <div class="print-table-cell">
+          <div class="cell-content"></div>
+        </div>
+      </div>
+
+      <div class="print-table-row">
+        <div class="print-table-cell checkbox-cell"></div>
+        <div class="print-table-cell">
+          <div class="cell-content"></div>
+        </div>
       </div>
-    </div>
 
-    <div class="print-table-row">
-      <div class="print-table-cell checkbox-cell"></div>
-      <div class="print-table-cell">
-        <div class="cell-content"></div>
+      <div class="print-table-row">
+        <div class="print-table-cell checkbox-cell"></div>
+        <div class="print-table-cell">
+          <div class="cell-content"></div>
+        </div>
       </div>
-    </div>
 
-    <div class="print-table-row">
-      <div class="print-table-cell checkbox-cell"></div>
-      <div class="print-table-cell">
-        <div class="cell-content"></div>
+      <div class="print-table-row">
+        <div class="print-table-cell checkbox-cell"></div>
+        <div class="print-table-cell">
+          <div class="cell-content"></div>
+        </div>
       </div>
     </div>
-  </div>
-  <br>
-  <div class="print-table no-border">
-    <div class="print-table-row no-border">
-      <div class="print-table-cell w50 no-border" style="font-weight: bold"><%= t ".place_date" %></div>
-      <div class="print-table-cell w50 no-border" style="font-weight: bold"><%= t ".signature" %></div>
+    <br>
+    <div class="print-table no-border">
+      <div class="print-table-row no-border">
+        <div class="print-table-cell w50 no-border" style="font-weight: bold"><%= t "place_date", scope: "decidim.initiatives.initiatives.print" %></div>
+        <div class="print-table-cell w50 no-border" style="font-weight: bold"><%= t "signature", scope: "decidim.initiatives.initiatives.print" %></div>
+      </div>
     </div>
-  </div>
 
-  <p class="print-initiative-legal-text">
-    <%= t ".legal_text" %>
-  </p>
+    <p class="print-initiative-legal-text">
+    <%= t "legal_text", scope: "decidim.initiatives.initiatives.print" %>
+    </p>
 
-  <a href="#" onclick="window.print();return false;" class="button expanded print-button"><%= t ".print" %></a>
-  <%= stylesheet_pack_tag "decidim_initiatives_print", media: "all" %>
-</div>
+    <a href="#" onclick="window.print();return false;" class="button button__lg button__secondary mt-4 print-button"><%= t "print", scope: "decidim.initiatives.initiatives.print" %></a>
+    <%= append_stylesheet_pack_tag "decidim_initiatives_print" %>
+
+  </div>
+<% end %>

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

@@ -1,10 +1,10 @@
 <% add_decidim_meta_tags({
-  image_url: current_initiative.type.attached_uploader(:banner_image).path,
-  description: translated_attribute(current_initiative.description),
-  title: translated_attribute(current_initiative.title),
-  url: initiative_url(current_initiative.id),
-  twitter_handler: current_organization.twitter_handler
-}) %>
+                           image_url: current_initiative.type.attached_uploader(:banner_image).path,
+                           description: translated_attribute(current_initiative.description),
+                           title: translated_attribute(current_initiative.title),
+                           url: initiative_url(current_initiative.id),
+                           twitter_handler: current_organization.twitter_handler
+                         }) %>
 
 <%
 edit_link(
@@ -14,84 +14,200 @@ edit_link(
 )
 %>
 
-<%= participatory_space_floating_help %>
+<%= content_for :aside do %>
+  <section class="initiative__aside">
+    <% if current_initiative.published? || current_initiative.rejected? || current_initiative.accepted? || current_initiative.discarded? %>
+      <% if current_initiative.votes_enabled? %>
+        <section class="layout-aside__section layout-aside__buttons" id="initiative-<%= current_initiative.id %>-vote-cabin">
+          <%= render partial: "vote_cabin", locals: { initiative: current_initiative } %>
+        </section>
+      <% end %>
+    <% else %>
+      <section class="layout-aside__section layout-aside__buttons">
+        <%= link_to t(".edit"),
+                    edit_initiative_path(current_initiative),
+                    class: "button button__xl w-full button__secondary" %>
+        <%= render partial: "send_to_technical_validation", locals: { title: t(".send_to_technical_validation"), confirm: t(".confirm") } %>
+      </section>
+    <% end %>
 
-<% add_decidim_page_title(translated_attribute(current_initiative.title)) %>
-<% provide :meta_image_url, current_initiative.type.attached_uploader(:banner_image).path %>
-<div class="row">
-  <% unless current_initiative.online_signature_type? %>
-    <div class="column">
-      <div class="callout secondary">
-        <p>
-          <%= t ".any_vote_method" if current_initiative.any_signature_type? %>
-          <%= t ".offline_method" if current_initiative.offline_signature_type? %>
-        </p>
-      </div>
-    </div>
-  <% end %>
+    <section class="layout-aside__section">
+      <%= render partial: "progress_bar" %>
+    </section>
 
-  <div class="columns section view-side mediumlarge-4 mediumlarge-push-8 large-3 large-push-9">
-    <div class="card text-center">
-      <div class="card__content">
-        <% if current_initiative.published? || current_initiative.rejected? || current_initiative.accepted? %>
-          <%= 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>
+    <section class="layout-aside__section">
+      <%= cell("decidim/nav_links", initiative_nav_items(current_initiative)) %>
+    </section>
+
+    <% if current_initiative.type.promoting_committee_enabled? && current_user&.admin? %>
+      <div class="layout-aside__section">
+        <div class="initiative__aside__element__committee">
+          <%= icon "account-circle-line", class: "fill-gray inline-block" %>
+          <span class="ml-2 initiative__aside__element-title">
+            <%= t("title", scope: "decidim.initiatives.admin.committee_requests.index") %>
+          </span>
+          <div class="ml-auto fill-secondary inline-block">
+            <input id="urlShareLink-committee" type="text" class="!hidden" value="<%= decidim_initiatives.new_initiative_committee_request_url(current_initiative) %>" readonly>
+            <button type="button" class="button button__sm button__text-secondary" data-clipboard-copy="#urlShareLink-committee">
+              <%= render_committee_tooltip %>
+              <span class="sr-only"><%= t("decidim.shared.share_modal.copy_share_link") %></span>
+            </button>
+          </div>
+        </div>
+          <% if current_initiative.committee_members.empty? %>
+            <span class="initiative__aside__element__data-text">
+              <%= t("no_members_yet", scope: "decidim.initiatives.admin.committee_requests.index") %>
+            </span>
           <% end %>
-          <% if current_initiative.commentable? %>
-            <%= render partial: "interactions" %>
+          <% current_initiative.committee_members.each do |request| %>
+            <div class="author" data-id="<%= request.id %>">
+              <div class="profile__group__list">
+                <%= card_for request.user %>
+              </div>
+            </div>
           <% end %>
-        <% else %>
-          <%= link_to t(".edit"),
-              edit_initiative_path(current_initiative),
-              class: "button expanded" %>
-          <%= render partial: "send_to_technical_validation", locals: {
-                                                                title: t(".send_to_technical_validation"),
-                                                                confirm: t(".confirm")
-                                                              } %>
-          <%= link_to t(".print"), print_initiative_path(current_initiative), class: "link action-print" %>
-        <% end %>
+      </div>
+    <% end %>
 
+    <section class="layout-aside__section">
+      <div class="mb-6">
+        <%= icon "apps-line", class: "fill-gray inline-block" %>
+        <span class="initiative__aside__element-title">
+          <%= t("initiative_data", scope: "decidim.initiatives.initiatives.show") %>
+        </span>
       </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 class="initiative__aside__element__data">
+        <p class="initiative__aside__element__data-title">
+          <%= t("state", scope: "decidim.initiatives.initiatives.show") %>
+        </p>
+        <span class="initiative__aside__element__data-text">
+          <%= render partial: "initiative_badge", locals: { initiative: current_initiative } %>
+        </span>
       </div>
-    <% end %>
-    <%= render partial: "decidim/shared/share_modal" %>
-    <% if allowed_to? :embed, :initiative, initiative: current_initiative %>
-      <%= embed_modal_for initiative_widget_url(current_initiative, format: :js) %>
-    <% end %>
-    <%= resource_reference(current_initiative) %>
-    <%= resource_version(current_initiative, versions_path: initiative_versions_path(current_initiative)) %>
-  </div>
 
-  <div class="columns mediumlarge-8 mediumlarge-pull-4">
-    <div class="section">
-      <div class="row column">
-        <h2 class="heading2">
-          <%= translated_attribute(current_initiative.title) %>
-        </h2>
-        <%= render partial: "author", locals: { initiative: current_initiative } %>
+      <% if current_initiative.offline_signature_type? || current_initiative.online_signature_type? %>
+        <div class="initiative__aside__element__data">
+          <p class="initiative__aside__element__data-title">
+          <%= t("signature_collection", scope: "decidim.initiatives.initiatives.show") %>
+          </p>
+          <span class="initiative__aside__element__data-text">
+            <span class="text-sm font-normal text-gray-2 block">
+              <% if current_initiative.offline_signature_type? %>
+                <%= t("offline", scope: "activemodel.attributes.initiative.signature_type_values") %>
+              <% end %>
+              <% if current_initiative.online_signature_type? %>
+                <%= t("online", scope: "activemodel.attributes.initiative.signature_type_values") %>
+              <% end %>
+            </span>
+          </span>
+        </div>
+      <% end %>
+
+      <div class="initiative__aside__element__data">
+        <p class="initiative__aside__element__data-title">
+          <%= t("scope", scope: "decidim.initiatives.initiatives.show") %>
+        </p>
+        <span class="initiative__aside__element__data-text">
+          <span class="text-sm font-normal text-gray-2 block">
+            <%= link_to translated_attribute(current_initiative.scope_name), initiatives_path(filter: { with_any_scope: [current_initiative.scope&.id] }) %>
+          </span>
+        </span>
       </div>
-      <br>
-      <div class="row column">
-        <%= render partial: "initiative_badge", locals: { initiative: current_initiative } %>
-        <%= decidim_sanitize_editor translated_attribute(current_initiative.description) %>
-        <%= render partial: "tags", locals: { resource: current_initiative } %>
+
+      <div class="initiative__aside__element__data">
+        <p class="initiative__aside__element__data-title">
+          <%= t("type", scope: "decidim.initiatives.initiatives.show") %>
+        </p>
+        <span class="initiative__aside__element__data-text text-gray-2">
+          <%= render partial: "tags_type", locals: { resource: current_initiative } %>
+        </span>
       </div>
 
-      <%= render partial: "result", locals: { initiative: current_initiative } %>
+      <% if current_initiative.area %>
+        <div class="initiative__aside__element__data">
+          <p class="initiative__aside__element__data-title">
+            <%= t("area", scope: "decidim.initiatives.initiatives.show") %>
+          </p>
+          <span class="initiative__aside__element__data-text">
+            <span class="text-sm font-normal text-gray-2 block">
+              <%= link_to translated_attribute(current_initiative.area_name), initiatives_path(filter: { with_any_area: [current_initiative.area.id] }) %>
+            </span>
+          </span>
+        </div>
+      <% end %>
+    </section>
+  </section>
+<% end %>
+
+<%= participatory_space_floating_help %>
+
+<% if current_initiative.created? %>
+  <% if allowed_to? :send_to_technical_validation, :initiative, initiative: current_initiative %>
+    <%= cell("decidim/announcement", t(".send_to_technical_validation_announcement"), callout_class: "success") %>
+  <% else %>
+    <%= cell("decidim/announcement", t(".before_send_to_technical_validation_announcement",
+                                       count: current_initiative.missing_committee_members,
+                                       href: link_to(new_initiative_committee_request_url(current_initiative),
+                                                     new_initiative_committee_request_path(current_initiative))), callout_class: "warning") %>
+  <% end %>
+<% end %>
+
+<% add_decidim_page_title(translated_attribute(current_initiative.title)) %>
+
+<section class="layout-main__section layout-main__heading">
+  <h2 class="h2 decorator">
+    <%= translated_attribute(current_initiative.title) %>
+  </h2>
+</section>
+
+<section class="layout-main__section">
+  <div class="content-block__description">
+    <div class="editor-content">
+      <%= decidim_sanitize_editor translated_attribute(current_initiative.description) %>
     </div>
+  </div>
+</section>
 
-    <%= attachments_for current_initiative %>
+<section class="layout-main__section">
+  <% if tabs.any? %>
+    <div class="mt-8" data-component="accordion" data-multiselectable="false" data-collapsible="false">
+      <ul class="tab-x-container">
+        <% tabs.each_with_index do |tab, i| %>
+          <li>
+            <button id="trigger-<%= tab[:id] %>" class="tab-x" data-controls="panel-<%= tab[:id] %>" data-open="<%= "true" if i.zero? %>">
+              <%= icon tab[:icon], class: "text-gray fill-current" %><%= tab[:text] %>
+            </button>
+          </li>
+        <% end %>
+      </ul>
+
+      <% panels.each do |panel| %>
+        <div id="panel-<%= panel[:id] %>" class="py-8">
+          <%= send(panel[:method], *panel[:args]) %>
+        </div>
+      <% end %>
+    </div>
+  <% end %>
+</section>
+
+<section class="layout-main__section">
+  <%= render partial: "result", locals: { initiative: current_initiative } %>
+</section>
+
+<section class="layout-main__section layout-main__buttons" data-buttons>
+  <% if current_initiative.commentable? && current_initiative.published? %>
+    <%= cell "decidim/comments_button", nil, display: current_initiative.commentable? && current_initiative.published? %>
+  <% end %>
+  <div class="ml-auto">
+    <%= cell "decidim/share_button", nil %>
   </div>
-</div>
+</section>
 
-<%= comments_for current_initiative if current_initiative.commentable? && current_initiative.published? %>
+<section class="layout-main__section layout-item__aside--footer">
+  <%= comments_for current_initiative if current_initiative.commentable? && current_initiative.published? %>
+  <ul class="metadata__container layout-main__section" data-metadata-footer>
+    <%= content_tag :li, resource_reference(current_initiative), class: "metadata__item" %>
+    <%= content_tag :li, resource_version(current_initiative, versions_path: initiative_version_path(current_initiative, current_initiative.versions.count)), class: "metadata__item" %>
+  </ul>
+</section>

data/app/views/decidim/initiatives/initiatives_mailer/notify_creation.html.erb

@@ -6,7 +6,7 @@
 <% if @initiative.promoting_committee_enabled? %>
     <p>
       <%= t "decidim.initiatives.initiatives_mailer.promotal_committee_help",
-           member_count: Decidim::Initiatives.minimum_committee_members %>
+            member_count: Decidim::Initiatives.minimum_committee_members %>
     </p>
     <p>
       <%= link_to decidim_initiatives.new_initiative_committee_request_url(@initiative, host: @organization.host),
@@ -17,6 +17,6 @@
 
 <p>
   <%= t("check_initiative_details", scope: "decidim.initiatives.initiatives_mailer.initiative_link") %>
-  <%= link_to t("here",  scope: "decidim.initiatives.initiatives_mailer.initiative_link"),
+  <%= link_to t("here", scope: "decidim.initiatives.initiatives_mailer.initiative_link"),
               decidim_initiatives.initiative_url(@initiative, host: @organization.host) %>
 </p>

data/app/views/decidim/initiatives/initiatives_type_scopes/search.html.erb

@@ -1 +1,2 @@
-<%= options_for_select scoped_types.map { |s| [translated_attribute(s.scope_name), s&.scope&.id] }, params[:selected] %>
+<% blank = [t("select_scope", scope: "decidim.initiatives.create_initiative.fill_data"), ""] %>
+<%= options_for_select scoped_types.map { |s| [translated_attribute(s.scope_name), s&.scope&.id] }.prepend(blank), params[:selected] %>

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

@@ -1,10 +1,19 @@
-<div class="row">
+<% content_for :aside do %>
+  <%= cell(
+    "decidim/versions_list",
+    versioned_resource,
+    version_path: proc { |version_index| url_for(action: :show, id: version_index) },
+    i18n_scope: "decidim.initiatives.versions.shared"
+  ) %>
+<% end %>
+
+<%= render layout: "layouts/decidim/shared/layout_item" do %>
   <%= cell(
     "decidim/version",
     current_version,
-    index: params[:id].to_i,
-    versioned_resource: versioned_resource,
-    versions_path: proc { url_for(action: :index) },
-    i18n_scope: "decidim.initiatives.versions.shared"
+    index: params[:id],
+    versioned_resource:,
+    path: proc { |extra_params| url_for(action: :show, id: params[:id], **extra_params) },
+    versions_path: proc { url_for(action: :index) }
   ) %>
-</div>
+<% end %>