decidim-proposals 0.28.5 → 0.28.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a1d75f047cf77a3873fed131cdefcd187c822c14f9fedb1b4d5c5d8a006454f
-  data.tar.gz: 825829e1601b57bcb849fd9359190839dc2e8691d4c203377d0cb8d1865c43c2
+  metadata.gz: 63f02eb870fe0f3b26efdfb4b561f9414b69088c57501c8a560836f4580fd587
+  data.tar.gz: 72ab69147738585ed8699e8f037854862d57710efd14da0d5ead38a6ca5ba362
 SHA512:
-  metadata.gz: 56fd50c16ab2a410a880b20896c64c3faf5be9e295223d3a6a42aa5045719057e5ad9effb1511ed953e52c89c270c037dc57100167566cba67e2b04f952e52ef
-  data.tar.gz: 46d01f111fab1ce7ba565990f435027a943dbb75f992f8873eb522739c9454a5a0c5ec3562daa20616ec03cf2ef4366d8ba82fd67dc51234464d262ff3cadbbf
+  metadata.gz: a4101cf611f39a640e9847ef15453ba995ddb961b72f60f64b909227cb3a4e5f93e3eb2012bebfaba9368ec03418e83e60d099dafaab35c93247e8b27a88fafc
+  data.tar.gz: 51125fff4a9d5e07483e6d741388aace1a3c6a719eba50bbe7d157d42124b98b75cc4a338cca0ed4da29f6cfda182199953c47732b068177774a97ac1df3aa13

data/app/cells/decidim/proposals/highlighted_proposals_for_component/show.erb

@@ -10,18 +10,6 @@
     <% end %>
   <% end %>
 </div>
-
-<div class="flex items-center justify-between space-x-6">
-  <span class="content-block__span flex-shrink-0">
-    <%= t("decidim.participatory_spaces.highlighted_proposals.last") %>
-  </span>
-  <% if single_component? %>
-    <%= link_to decidim_proposals.new_proposal_path, class: "button button__xs md:button__lg button__secondary" do %>
-      <span class="text-center"><%= t("decidim.proposals.actions.new") %></span>
-      <%= icon "add-line" %>
-    <% end %>
-  <% end %>
-</div>
 <div class="flex items-start justify-between">
   <div class="grow space-y-6">
     <% proposals_to_render.each do |p| %>

data/app/controllers/decidim/proposals/versions_controller.rb

@@ -11,7 +11,7 @@ module Decidim
       def versioned_resource
         @versioned_resource ||=
           if params[:proposal_id]
-            present(Proposal.where(component: current_component).find(params[:proposal_id]))
+            present(Proposal.not_hidden.published.where(component: current_component).find(params[:proposal_id]))
           else
             CollaborativeDraft.where(component: current_component).find(params[:collaborative_draft_id])
           end

data/app/models/decidim/proposals/collaborative_draft.rb

@@ -45,9 +45,8 @@ module Decidim
         authored_by?(user)
       end
 
-      # Public: Overrides the `reported_content_url` Reportable concern method.
-      def reported_content_url
-        ResourceLocatorPresenter.new(self).url
+      def presenter
+        Decidim::Proposals::CollaborativeDraftPresenter.new(self)
       end
 
       # Public: Overrides the `reported_attributes` Reportable concern method.

data/app/models/decidim/proposals/proposal.rb

@@ -251,11 +251,6 @@ module Decidim
         state == "evaluating"
       end
 
-      # Public: Overrides the `reported_content_url` Reportable concern method.
-      def reported_content_url
-        ResourceLocatorPresenter.new(self).url
-      end
-
       # Returns the presenter for this author, to be used in the views.
       # Required by ResourceRenderer.
       def presenter

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

@@ -20,7 +20,7 @@
         </div>
       <% end %>
       <% if @form.component_suggested_hashtags.any? %>
-        <div class="field">
+        <div class="row column">
           <%= form.label :suggested_hashtags %>
           <div class="checkboxes hashtags">
             <%= form.collection_check_boxes :suggested_hashtags, @form.component_suggested_hashtags.map { |hashtag| [hashtag.downcase, "##{hashtag}"] }, :first, :last do |option|

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

@@ -52,20 +52,20 @@
 
         <% presented_endorsers = endorsers_presenters_for(proposal) %>
         <% if presented_endorsers.any? %>
-          <%= render partial: "endorsers", locals: { presented_endorsers:, proposal: } %>
+          <%= render partial: "decidim/proposals/admin/proposals/endorsers", locals: { presented_endorsers:, proposal: } %>
         <% end %>
 
         <% if proposal.documents.any? %>
-          <%= render partial: "documents", locals: { proposal: } %>
+          <%= render partial: "decidim/proposals/admin/proposals/documents", locals: { proposal: } %>
         <% end %>
 
         <% if proposal.photos.any? %>
-          <%= render partial: "photos", locals: { proposal: } %>
+          <%= render partial: "decidim/proposals/admin/proposals/photos", locals: { proposal: } %>
         <% end %>
 
         <% proposal_meetings = proposal.linked_resources(:meetings, "proposals_from_meeting") %>
         <% if proposal_meetings.any? %>
-          <%= render partial: "meetings", locals: { proposal_meetings: } %>
+          <%= render partial: "decidim/proposals/admin/proposals/meetings", locals: { proposal_meetings: } %>
         <% end %>
 
         <% if allowed_to?(:create, :proposal_note, proposal: proposal) %>

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

@@ -7,7 +7,7 @@
 <% if @proposals.empty? %>
   <%= cell("decidim/announcement", params[:filter].present? ? t(".empty_filters") : t(".empty")) %>
 <% else %>
-  <h2 class="h5 md:h3 decorator"><%= t("count", scope: "decidim.proposals.proposals.index", count: @proposals.total_count) %></h2>
+  <h2 class="h5 md:h3 decorator" aria-live="polite" aria-atomic="true"><%= t("count", scope: "decidim.proposals.proposals.index", count: @proposals.total_count) %></h2>
 
   <%= order_selector available_orders, i18n_scope: "decidim.proposals.proposals.orders" %>
 

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

@@ -1,4 +1,11 @@
-<% add_decidim_page_title(t("name", scope: "decidim.components.proposals")) %>
+<% add_decidim_meta_tags(
+  description: translated_attribute(current_participatory_space.short_description),
+  title: t("decidim.components.pagination.page_title",
+           component_name:,
+           current_page: @proposals.current_page,
+           total_pages: @proposals.total_pages ),
+  url: proposals_url,
+  resource: current_component) %>
 
 <% append_stylesheet_pack_tag "decidim_proposals", media: "all" %>
 <% append_javascript_pack_tag "decidim_proposals" %>

data/config/locales/ar.yml

@@ -12,6 +12,8 @@ ar:
         state: حالة
         title: عنوان
         user_group_id: إنشاء مسودة تعاونية كـ
+      import_participatory_text:
+        document: مستند
       proposal:
         address: عنوان
         answer: إجابة
@@ -21,6 +23,8 @@ ar:
         category_id: الفئة
         decidim_scope_id: النطاق
         has_address: لديه عنوان
+        latitude: خط العرض
+        longitude: خط الطول
         scope_id: نطاق
         state: حالة
         suggested_hashtags: الهاشتاج المقترحة
@@ -33,6 +37,8 @@ ar:
         execution_period: فترة التنفيذ
       proposals_copy:
         origin_component_id: مكون لنسخ المقترحات من
+      proposals_file_import:
+        file: ملف
       proposals_import:
         import_proposals: مقترحات الاستيراد
         keep_answers: الاحتفاظ بالحالة والإجابات
@@ -484,7 +490,6 @@ ar:
           index:
             actions: أفعال
             assign_to_valuator: أسنِده إلى مُقيِّم
-            assign_to_valuator_button: تعيين
             cancel: إلغاء
             change_category: تغيير الفئة
             change_scope: تغيير النطاق
@@ -498,7 +503,6 @@ ar:
             split_button: انشق، مزق
             title: اقتراحات
             unassign_from_valuator: إلغاء الإسناد مِن المُقيِّم
-            unassign_from_valuator_button: إلغاء الإسناد
             update: تحديث
             update_scope_button: تحديث النطاق
           new:
@@ -764,7 +768,6 @@ ar:
           text_banner: أنت تتطلع على قائمة الاقتراحات المسحوبة من قبل مؤلفيها. %{go_back_link}.
         new:
           send: استمر
-          title: إنشاء اقتراحك
         orders:
           label: 'ترتيب المقترحات حسب:'
           most_commented: الأكثر تعليقًا عليها

data/config/locales/bg.yml

@@ -385,7 +385,6 @@ bg:
         title: Подкрепа
     participatory_spaces:
       highlighted_proposals:
-        last: Позледни предложения
         see_all: Виж всички предложения
     proposals:
       actions:
@@ -504,7 +503,6 @@ bg:
           index:
             actions: Активности
             assign_to_valuator: Възлагане на оценител
-            assign_to_valuator_button: Възлагане
             cancel: Отказ
             change_category: Промяна на категория
             change_scope: Промяна на обхвата
@@ -518,7 +516,6 @@ bg:
             split_button: Разделяне
             title: Предложения
             unassign_from_valuator: Отнемане възложеното на оценителя
-            unassign_from_valuator_button: Отнемане на възложеното
             update: Актуализация
             update_scope_button: Актуализиране на обхвата
           new:
@@ -801,7 +798,6 @@ bg:
           text_banner: Разглеждате списъка с предложения, оттеглени от своите автори. %{go_back_link}.
         new:
           send: Продължи
-          title: Създайте Ваше предложение
         orders:
           label: 'Подреждане на предложенията по:'
           most_commented: Най-коментирани

data/config/locales/bs-BA.yml

@@ -51,11 +51,9 @@ bs:
         proposals:
           index:
             assign_to_valuator: Dodeli procenjivaču
-            assign_to_valuator_button: Dodeli
             change_scope: Promeni opseg
             publish_answers: Objavi odgovore
             unassign_from_valuator: Oduzmi od procenjivača
-            unassign_from_valuator_button: Od dodeli
             update_scope_button: Ažuriraj opseg
           show:
             amendments_count: Broj izmena