decidim-proposals 0.27.5 → 0.28.0.rc4

data/app/views/decidim/proposals/proposals/participatory_texts/participatory_text.html.erb

@@ -1,15 +1,32 @@
-<%= render partial: "decidim/shared/component_announcement" %>
-
-<div class="row view-header">
-  <div class="column medium-9">
-    <h2 class="heading2"><%= render_participatory_text_title(@participatory_text) %></h2>
-  </div>
-  <div class="column medium-3 pull-right">
-    <%= render partial: "decidim/proposals/proposals/participatory_texts/view_index" %>
-  </div>
-</div>
-<div class="row columns" id="proposals">
-  <% @proposals.each do |proposal| %>
-    <%= cell("decidim/proposals/participatory_text_proposal", proposal, context: { current_user: current_user }) %>
-  <% end %>
-</div>
+<%= append_stylesheet_pack_tag "decidim_proposals" %>
+<%= append_javascript_pack_tag "decidim_proposals" %>
+
+<% content_for :aside do %>
+  <h1 class="title-decorator">
+    <%= translated_attribute(current_component.name) %>
+  </h1>
+
+  <%= render partial: "decidim/proposals/proposals/participatory_texts/view_index" %>
+<% end %>
+
+<%= render layout: "layouts/decidim/shared/layout_two_col" do %>
+
+  <%= render partial: "decidim/shared/component_announcement" %>
+
+  <section class="layout-main__section">
+    <% if @participatory_text.nil? %>
+      <%= cell("decidim/announcement", t("alternative_title", scope: "decidim.proposals.participatory_text_proposal")) %>
+    <% else %>
+      <h2 class="proposal-participatory__heading">
+        <%= translated_attribute(@participatory_text.title) %>
+      </h2>
+    <% end %>
+  </section>
+
+  <section id="proposals" class="layout-main__section">
+    <% @proposals.each do |proposal| %>
+      <%= cell("decidim/proposals/participatory_text_proposal", proposal, context: { current_user: }) %>
+    <% end %>
+  </section>
+
+<% end %>

data/app/views/decidim/proposals/proposals/preview.html.erb

@@ -1,41 +1,44 @@
 <% add_decidim_page_title(proposal_wizard_step_title(action_name)) %>
 
-<div class="row">
-  <%= render partial: "wizard_aside" %>
-
-  <div class="columns large-9">
-    <%= render partial: "wizard_header", locals: { callout_help_text_class: "warning" } %>
-    <div class="card card__content">
-      <div class="row column view-header">
-        <h3 class="heading3"><%= present(@proposal).title(links: true, html_escape: true) %></h3>
-        <% unless component_settings.participatory_texts_enabled? %>
-          <%= cell("decidim/coauthorships", @proposal, has_actions: false, size: 3, context: { current_user: current_user }) %>
-        <% end %>
-
-        <%= render_proposal_body(@proposal) %>
-      </div>
-      <div class="row column">
-        <%= cell "decidim/proposals/proposal_tags", @proposal %>
-      </div>
-    </div>
-    <% if component_settings.geocoding_enabled? %>
-      <% if has_position?(@proposal) %>
-      <div class="row column">
-        <h3 class="section-heading"><%= t("decidim.application.geocoding.geocoded_address") %></h3>
-            <%= render partial: "decidim/shared/static_map", locals: { icon_name: "proposals", geolocalizable: @proposal } %>
-      </div>
-      <% end %>
+<% append_stylesheet_pack_tag "decidim_proposals", media: "all" %>
+<% append_javascript_pack_tag "decidim_proposals" %>
+
+<%= render layout: "layouts/decidim/shared/layout_center" do %>
+
+  <%= render partial: "wizard_header", locals: { callout_help_text_class: "warning" } %>
+
+  <div class="proposal__container my-10">
+    <h2 class="h3 text-secondary"><%= present(@proposal).title(links: true, html_escape: true) %></h2>
+
+    <% unless component_settings.participatory_texts_enabled? %>
+      <%= cell "decidim/coauthorships", @proposal %>
     <% end %>
-    <div class="row column">
-      <%= attachments_for @proposal %>
+
+    <div class="editor-content">
+      <%= render_proposal_body(@proposal) %>
     </div>
 
-    <div class="p-l">
-      <div class="row column flex-center">
-        <%= link_to t(".modify"), edit_draft_proposal_path(@proposal) %>
-        <%= button_to t(".publish"), publish_proposal_path(@proposal), method: :post, class: "button button--nomargin small" %>
+    <% if component_settings.geocoding_enabled? && has_position?(@proposal) %>
+      <div class="static-map__container">
+        <%= render partial: "decidim/shared/static_map", locals: { icon_name: "proposals", geolocalizable: @proposal } %>
       </div>
-    </div>
+    <% end %>
+
+    <%= cell "decidim/tab_panels", tab_panel_items %>
+    <%= cell "decidim/tags", @proposal %>
+  </div>
+
+  <div class="form__wrapper-block flex-col-reverse md:flex-row justify-between">
+    <%= link_to destroy_draft_proposal_path(@proposal), method: :delete, class: "button button__sm md:button__lg button__text-secondary", data: { confirm: t("discard_confirmation", scope: "decidim.proposals.proposals.edit_draft") } do %>
+      <%= icon "arrow-left-line" %>
+      <span><%= t("discard", scope: "decidim.proposals.proposals.edit_draft") %></span>
+    <% end %>
+
+    <%= link_to t("modify", scope: "decidim.proposals.proposals.preview"), edit_draft_proposal_path(@proposal), class: "button button__sm md:button__lg button__transparent-secondary md:ml-auto" %>
+
+    <%= button_to publish_proposal_path(@proposal), method: :post, class: "button button__sm md:button__lg button__secondary w-full md:w-fit" do %>
+      <span><%= t("publish", scope: "decidim.proposals.proposals.preview") %></span>
+      <%= icon "arrow-right-line" %>
+    <% end %>
   </div>
-  <div class="columns large-3"></div>
-</div>
+<% end %>

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

@@ -1,8 +1,8 @@
 <% add_decidim_meta_tags({
-  description: present(@proposal).body,
-  title: present(@proposal).title,
-  url: proposal_url(@proposal.id)
-}) %>
+                           description: present(@proposal).body,
+                           title: present(@proposal).title,
+                           url: proposal_url(@proposal.id)
+                         }) %>
 
 <%
 edit_link(
@@ -19,123 +19,107 @@ extra_admin_link(
   :create,
   :proposal_answer,
   { proposal: @proposal },
-  { name: t(".answer"), icon: "comment-square" }
+  { name: t("answer", scope: "decidim.proposals.proposals.show"), icon: "question-answer-line" }
 )
 %>
 
-<%= render partial: "voting_rules" %>
-<% if component_settings.participatory_texts_enabled? %>
-  <div class="row column">
-    <div class="section text-medium">
-      <%= t(".back_to") %> <u><%= link_to translated_attribute(@participatory_text.title), main_component_path(current_component) %></u>
-    </div>
-  </div>
+<% append_stylesheet_pack_tag "decidim_proposals", media: "all" %>
+<% append_javascript_pack_tag "decidim_proposals" %>
+
+<% content_for :aside do %>
+  <%= render partial: "proposal_aside" %>
 <% end %>
-<%= emendation_announcement_for @proposal %>
-<div class="row column view-header">
 
-  <div class="m-bottom">
-    <%= link_to proposals_path, class: "small hollow js-back-to-list" do %>
-      <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %>
-      <%= t(".back_to_list") %>
-    <% end %>
-  </div>
+<%= render layout: "layouts/decidim/shared/layout_item", locals: { back_path: component_settings.participatory_texts_enabled? ? main_component_path(current_component) : proposals_path } do %>
 
-  <% if @proposal.emendation? %>
-    <h2 class="heading3"><%= t(".changes_at_title", title: present(@proposal.amendable).title(links: true, html_escape: true)) %></h2>
-  <% else %>
-    <h2 class="heading3"><%= present(@proposal).title(links: true, html_escape: true) %></h2>
-  <% end %>
-  <% unless component_settings.participatory_texts_enabled? %>
-    <%= cell("decidim/coauthorships", @proposal, has_actions: true, size: 3, context: { current_user: current_user }) %>
-  <% end %>
-</div>
-<div class="row">
-  <div class="columns mediumlarge-8 large-9">
-    <div class="section">
-      <% if @proposal.emendation? %>
-        <%= cell("decidim/diff", proposal_presenter.versions.last) %>
-      <% elsif not ["section","subsection"].include? @proposal.participatory_text_level %>
-        <%== cell("decidim/proposals/proposal_m", @proposal, full_badge: true).badge %>
-        <%= render_proposal_body(@proposal) %>
-      <% end %>
-      <% if component_settings.geocoding_enabled? %>
-        <%= render partial: "decidim/shared/static_map", locals: { icon_name: "proposals", geolocalizable: @proposal } %>
-      <% end %>
-      <% if proposal_has_costs? && current_settings.answers_with_costs? %>
-        <%= cell("decidim/proposals/cost_report", @proposal) %>
-      <% end %>
-      <%= cell "decidim/proposals/proposal_tags", @proposal %>
-    </div>
+  <section class="layout-main__section layout-main__heading">
+    <%= render partial: "voting_rules" %>
 
     <%= cell("decidim/announcement", proposal_reason_callout_announcement, callout_class: proposal_reason_callout_class) if @proposal.answered? && @proposal.published_state? %>
 
-    <%= linked_resources_for @proposal, :results, "included_proposals" %>
-    <%= linked_resources_for @proposal, :projects, "included_proposals" %>
-    <%= linked_resources_for @proposal, :meetings, "proposals_from_meeting" %>
-    <%= linked_resources_for @proposal, :proposals, "copied_from_component" %>
-
-    <%= cell "decidim/endorsers_list", @proposal %>
-    <%= amendments_for @proposal %>
-  </div>
-  <div class="columns section view-side mediumlarge-4 large-3">
-    <% if @proposal.amendable? && allowed_to?(:edit, :proposal, proposal: @proposal) %>
-      <%= link_to t(".edit_proposal"), edit_proposal_path(@proposal), class: "button hollow expanded button--sc" %>
+    <%= emendation_announcement_for @proposal %>
+
+    <% if @proposal.emendation? %>
+      <h1 class="h2 decorator"><%= t("changes_at_title", scope: "decidim.proposals.proposals.show", title: present(@proposal.amendable).title(links: true, html_escape: true)) %></h1>
     <% else %>
-      <%= amend_button_for @proposal %>
+      <h1 class="h2 decorator"><%= present(@proposal).title(links: true, html_escape: true) %></h1>
     <% end %>
 
-    <%= emendation_actions_for @proposal %>
+    <% unless component_settings.participatory_texts_enabled? %>
+      <div class="layout-author">
+        <%= cell "decidim/coauthorships", @proposal %>
 
-    <% if current_settings.votes_enabled? || show_endorsements_card? || current_user %>
-      <% if @proposal.withdrawn? %>
-        <div class="card">
-          <div class="card__content">
-            <% if current_settings.votes_enabled? %>
-              <%= render partial: "votes_count", locals: { proposal: @proposal, from_proposals_list: false } %>
-            <% end %>
-          </div>
-        </div>
-      <% else %>
-        <div class="card">
-          <div class="card__content">
-            <% if current_settings.votes_enabled? %>
-              <%= render partial: "votes_count", locals: { proposal: @proposal, from_proposals_list: false } %>
-              <%= render partial: "vote_button", locals: { proposal: @proposal, from_proposals_list: false } %>
-            <% end %>
-            <div class="row collapse buttons__row">
-              <% if endorsements_enabled? %>
-                <div class="column small-9 collapse">
-                  <%= endorsement_buttons_cell(@proposal) %>
-                </div>
-              <% end %>
-              <div class="column collapse <%= endorsements_enabled? ? "small-3" : "" %>">
-                <%= link_to "#comments", class: "button small compact hollow secondary button--nomargin expanded" do %>
-                    <span class="show-for-sr"><%= present(@proposal).title(html_escape: true) %></span>
-                    <%= icon "comment-square", class: "icon--small", aria_label: t(".comments"), role: "img" %> <%= @proposal.comments_count %>
-                <% end %>
-              </div>
-            </div>
-            <br>
-            <%= follow_button_for(@proposal) %>
-          </div>
-        </div>
-      <% end %>
+        <% if not ["section","subsection"].include? @proposal.participatory_text_level %>
+          <%== cell("decidim/proposals/proposal_metadata", @proposal).state_item&.dig(:text)&.html_safe %>
+        <% end %>
+      </div>
     <% end %>
+  </section>
 
-    <%= amenders_list_for(@proposal) %>
+  <section class="layout-main__section">
+    <% if @proposal.emendation? %>
+      <%= cell(
+            "decidim/diff",
+            proposal_presenter.versions.last,
+            path: proc { |extra_params| url_for(action: :show, id: params[:id], **extra_params) }
+          ) %>
+    <% elsif not ["section","subsection"].include? @proposal.participatory_text_level %>
+      <div class="editor-content">
+        <%= render_proposal_body(@proposal) %>
+      </div>
+    <% end %>
+  </section>
 
-    <%= resource_reference(@proposal) %>
-    <%= resource_version(proposal_presenter, versions_path: proposal_versions_path(@proposal)) %>
-    <%= cell("decidim/fingerprint", @proposal) %>
-    <%= render partial: "decidim/shared/share_modal", locals: { resource: @proposal } %>
-    <%= embed_modal_for proposal_widget_url(@proposal, format: :js) %>
-    <%= cell "decidim/proposals/proposal_link_to_collaborative_draft", @proposal %>
-    <%= cell "decidim/proposals/proposal_link_to_rejected_emendation", @proposal %>
-  </div>
-</div>
-<%= attachments_for @proposal %>
+  <% if proposal_has_costs? && current_settings.answers_with_costs? %>
+    <section class="layout-main__section">
+      <%= cell("decidim/proposals/cost_report", @proposal) %>
+    </section>
+  <% end %>
 
-<%= comments_for @proposal %>
+  <% if component_settings.geocoding_enabled? && @proposal.geocoded? %>
+    <div class="static-map__container">
+      <%= render partial: "decidim/shared/static_map", locals: { icon_name: "proposals", geolocalizable: @proposal } %>
+    </div>
+  <% end %>
+
+  <%= cell "decidim/tab_panels", tab_panel_items %>
+
+  <section class="layout-main__section">
+    <%= cell "decidim/amendable/amendments", @proposal %>
+  </section>
+
+  <%= render partial: "actions" %>
+
+  <% content_for :item_footer do %>
+    <%= comments_for @proposal %>
+
+     <ul class="metadata__container layout-main__section" data-metadata-footer>
+       <%= content_tag :li, resource_reference(@proposal), class: "metadata__item" %>
+       <%= content_tag :li, resource_version(proposal_presenter, versions_path: proposal_version_path(@proposal, @proposal.versions.count)), class: "metadata__item" %>
 
-<%= cell("decidim/flag_modal", @proposal) %>
+       <% fingerprint_id = dom_id(@proposal, :fingerprint_dialog) %>
+       <%= content_tag :li, class: "metadata__item" do %>
+         <%= content_tag :button, t("decidim.fingerprint.check"), data: { dialog_open: fingerprint_id } %>
+       <% end %>
+    </ul>
+    <%= decidim_modal id: fingerprint_id, class: "fingerprint-modal" do %>
+      <div data-dialog-container>
+        <%= icon "fingerprint-line" %>
+        <h2 id="dialog-title-<%= fingerprint_id %>" tabindex="-1" data-dialog-title><%= t "decidim.fingerprint.title" %></h2>
+        <div class="fingerprint-modal__container">
+          <p id="dialog-desc-<%= fingerprint_id %>"><%= t "decidim.fingerprint.explanation" %></p>
+          <div>
+            <span class="fingerprint-modal__span"><%= t "decidim.fingerprint.value" %>:</span>
+            <code class="fingerprint-modal__code"><%= decidim_html_escape @proposal.fingerprint.value %></code>
+          </div>
+          <div>
+            <span class="fingerprint-modal__span"><%= t "decidim.fingerprint.source" %>:</span>
+            <code class="fingerprint-modal__code"><%= @proposal.fingerprint.source %></code>
+          </div>
+          <p><%= t("decidim.fingerprint.replicate_help", online_calculator_link: link_to(t("decidim.fingerprint.online_calculator_name"), "http://www.md5calc.com/sha256", target: "_blank", rel: "noopener")).html_safe %></p>
+        </div>
+      </div>
+    <% end %>
+  <% end %>
+
+<% end %>

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

@@ -6,13 +6,21 @@ if versioned_resource.is_a?(Decidim::Proposals::CollaborativeDraft)
 end
 %>
 
-<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) }
+  ) %>
+<% end %>
+
+<%= render layout: "layouts/decidim/shared/layout_item" do %>
   <%= cell(
     "decidim/version",
     current_version,
     index: params[:id],
-    versioned_resource: versioned_resource,
-    versions_path: proc { url_for(action: :index) },
-    i18n_scope: "decidim.proposals.versions.#{item_name.to_s.pluralize}"
+    versioned_resource:,
+    path: proc { |extra_params| url_for(action: :show, id: params[:id], **extra_params) },
+    versions_path: proc { url_for(action: :index) }
   ) %>
-</div>
+<% end %>

data/config/assets.rb

@@ -7,4 +7,3 @@ Decidim::Webpacker.register_entrypoints(
   decidim_proposals: "#{base_path}/app/packs/entrypoints/decidim_proposals.js",
   decidim_proposals_admin: "#{base_path}/app/packs/entrypoints/decidim_proposals_admin.js"
 )
-Decidim::Webpacker.register_stylesheet_import("stylesheets/decidim/proposals/proposals")

data/config/brakeman.ignore

@@ -1,21 +1,44 @@
 {
   "ignored_warnings": [
+    {
+      "warning_type": "Mass Assignment",
+      "warning_code": 70,
+      "fingerprint": "8eeee9ad33162a80c7cf7a87d597f4cc108b0874d40ddabd1f5241f460a9519a",
+      "check_name": "MassAssignment",
+      "message": "Specify exact keys allowed for mass assignment instead of using `permit!` which allows any keys",
+      "file": "app/controllers/decidim/proposals/admin/participatory_texts_controller.rb",
+      "line": 50,
+      "link": "https://brakemanscanner.org/docs/warning_types/mass_assignment/",
+      "code": "params.require(:preview_participatory_text).permit!",
+      "render_path": null,
+      "location": {
+        "type": "method",
+        "class": "Decidim::Proposals::Admin::ParticipatoryTextsController",
+        "method": "update"
+      },
+      "user_input": null,
+      "confidence": "Medium",
+      "cwe_id": [
+        915
+      ],
+      "note": ""
+    },
     {
       "warning_type": "Cross-Site Scripting",
       "warning_code": 2,
-      "fingerprint": "7568599cc8af59b10939f6617f52763f2df32bba7474f9df063d71c803e95e32",
+      "fingerprint": "ee8cfc06595219681fe264fb8977fb9b0bab6750e694ec9dea82324c02fbc5f4",
       "check_name": "CrossSiteScripting",
       "message": "Unescaped parameter value",
       "file": "app/views/decidim/proposals/proposals/show.html.erb",
-      "line": 59,
+      "line": 53,
       "link": "https://brakemanscanner.org/docs/warning_types/cross_site_scripting",
-      "code": "cell(\"decidim/proposals/proposal_m\", Proposal.published.not_hidden.where(:component => current_component).find_by(:id => params[:id]), :full_badge => true).badge",
+      "code": "cell(\"decidim/proposals/proposal_metadata\", Proposal.published.not_hidden.where(:component => current_component).find_by(:id => params[:id])).state_item.dig(:text).html_safe",
       "render_path": [
         {
           "type": "controller",
           "class": "Decidim::Proposals::ProposalsController",
           "method": "show",
-          "line": 62,
+          "line": 69,
           "file": "app/controllers/decidim/proposals/proposals_controller.rb",
           "rendered": {
             "name": "decidim/proposals/proposals/show",
@@ -29,60 +52,12 @@
       },
       "user_input": "params[:id]",
       "confidence": "Weak",
-      "note": ""
-    },
-    {
-      "warning_type": "Cross-Site Scripting",
-      "warning_code": 2,
-      "fingerprint": "7d03debd980da201727e8648772750aab0445ea0eb5426f1aea2c8e560e5c458",
-      "check_name": "CrossSiteScripting",
-      "message": "Unescaped parameter value",
-      "file": "app/views/decidim/proposals/collaborative_drafts/show.html.erb",
-      "line": 34,
-      "link": "https://brakemanscanner.org/docs/warning_types/cross_site_scripting",
-      "code": "cell(\"decidim/proposals/collaborative_draft_m\", CollaborativeDraft.not_hidden.where(:component => current_component).find_by(:id => params[:id]), :full_badge => true).badge",
-      "render_path": [
-        {
-          "type": "controller",
-          "class": "Decidim::Proposals::CollaborativeDraftsController",
-          "method": "show",
-          "line": 43,
-          "file": "app/controllers/decidim/proposals/collaborative_drafts_controller.rb",
-          "rendered": {
-            "name": "decidim/proposals/collaborative_drafts/show",
-            "file": "app/views/decidim/proposals/collaborative_drafts/show.html.erb"
-          }
-        }
+      "cwe_id": [
+        79
       ],
-      "location": {
-        "type": "template",
-        "template": "decidim/proposals/collaborative_drafts/show"
-      },
-      "user_input": "params[:id]",
-      "confidence": "Weak",
-      "note": ""
-    },
-    {
-      "warning_type": "Mass Assignment",
-      "warning_code": 70,
-      "fingerprint": "8eeee9ad33162a80c7cf7a87d597f4cc108b0874d40ddabd1f5241f460a9519a",
-      "check_name": "MassAssignment",
-      "message": "Specify exact keys allowed for mass assignment instead of using `permit!` which allows any keys",
-      "file": "app/controllers/decidim/proposals/admin/participatory_texts_controller.rb",
-      "line": 50,
-      "link": "https://brakemanscanner.org/docs/warning_types/mass_assignment/",
-      "code": "params.require(:preview_participatory_text).permit!",
-      "render_path": null,
-      "location": {
-        "type": "method",
-        "class": "Decidim::Proposals::Admin::ParticipatoryTextsController",
-        "method": "update"
-      },
-      "user_input": null,
-      "confidence": "Medium",
       "note": ""
     }
   ],
-  "updated": "2021-10-05 05:32:00 +0000",
-  "brakeman_version": "5.1.1"
+  "updated": "2023-07-27 19:05:49 +0200",
+  "brakeman_version": "5.4.1"
 }