diff --git a/decidim-assemblies/app/views/decidim/assemblies/assemblies/show.html.erb b/decidim-assemblies/app/views/decidim/assemblies/assemblies/show.html.erb index 6b9799c119e63..fbc902c147981 100644 --- a/decidim-assemblies/app/views/decidim/assemblies/assemblies/show.html.erb +++ b/decidim-assemblies/app/views/decidim/assemblies/assemblies/show.html.erb @@ -34,6 +34,6 @@ edit_link(
- <%= resource_reference(current_participatory_space) %> +

<%= resource_reference(current_participatory_space) %>

diff --git a/decidim-comments/app/cells/decidim/comments/comment/alignment_badge.erb b/decidim-comments/app/cells/decidim/comments/comment/alignment_badge.erb index 9f11f2a607000..a8197fb093859 100644 --- a/decidim-comments/app/cells/decidim/comments/comment/alignment_badge.erb +++ b/decidim-comments/app/cells/decidim/comments/comment/alignment_badge.erb @@ -1 +1 @@ -<%= alignment_badge_label %> +

<%= alignment_badge_label %>

diff --git a/decidim-core/app/cells/decidim/content_blocks/participatory_space_metadata/content.erb b/decidim-core/app/cells/decidim/content_blocks/participatory_space_metadata/content.erb index 54b23bfe7bd43..0c1da81bef8d9 100644 --- a/decidim-core/app/cells/decidim/content_blocks/participatory_space_metadata/content.erb +++ b/decidim-core/app/cells/decidim/content_blocks/participatory_space_metadata/content.erb @@ -2,9 +2,9 @@ <% metadata_valued_items.each do |item| %>
- <%= item[:title] %> +

<%= item[:title] %>

- <%= item[:value] %> +

<%= item[:value] %>

<% end %> diff --git a/decidim-core/app/cells/decidim/statistic/show.erb b/decidim-core/app/cells/decidim/statistic/show.erb index 31ba229089d2b..9bb0bb460dabf 100644 --- a/decidim-core/app/cells/decidim/statistic/show.erb +++ b/decidim-core/app/cells/decidim/statistic/show.erb @@ -1,9 +1,9 @@
-
+

<%= stat_title %> -

+

<%= information_tooltip %>
@@ -13,14 +13,14 @@
<% if second_stat_number %> -
+

<%= stat_sub_title %> <%= second_stat_number %> -

+

<% else %>

<% end %> -
+

<%= stat_number %> -

+

diff --git a/decidim-core/app/cells/decidim/upload_modal/files.erb b/decidim-core/app/cells/decidim/upload_modal/files.erb index d56cabe7df66b..78913c4883ee7 100644 --- a/decidim-core/app/cells/decidim/upload_modal/files.erb +++ b/decidim-core/app/cells/decidim/upload_modal/files.erb @@ -1,9 +1,10 @@
- <%= label %> + <%# proposals option is only set in proposals and collaborative_drafts edit_form_fields partials %> + <%= options[:proposals] == true ? paragraph : label %> <% if options[:help_text].present? %> - <%= options[:help_text] %> +

<%= options[:help_text] %>

<% end %> <%# NOTE: this block is about wrapping a default image for the avatar with the new styles, @@ -31,11 +32,11 @@ <% end %> <% if has_title? %> - <%= title_for(attachment) %> +

<%= title_for(attachment) %>

<%= form.hidden_field attribute, multiple: true, value: attachment.id, id: attachment.id %> <% else %> <% if blob(attachment).image? %> - <%= title_for(attachment) %> +

<%= title_for(attachment) %>

<% else %> <%= link_to title_for(attachment), file_attachment_path(attachment), class: "w-full break-all mb-2" %> <% end %> diff --git a/decidim-core/app/cells/decidim/upload_modal_cell.rb b/decidim-core/app/cells/decidim/upload_modal_cell.rb index 6f743d00ae465..1d088a79df3d6 100644 --- a/decidim-core/app/cells/decidim/upload_modal_cell.rb +++ b/decidim-core/app/cells/decidim/upload_modal_cell.rb @@ -30,6 +30,10 @@ def label form.send(:custom_label, attribute, options[:label], { required: required?, for: nil }) end + def paragraph + form.send(:custom_paragraph, attribute, options[:label], { required: required? }) + end + def button_label return button_edit_label if attachments.count.positive? diff --git a/decidim-core/app/packs/src/decidim/direct_uploads/upload_field.js b/decidim-core/app/packs/src/decidim/direct_uploads/upload_field.js index 02027cac228b0..8f4fd49f81b4d 100644 --- a/decidim-core/app/packs/src/decidim/direct_uploads/upload_field.js +++ b/decidim-core/app/packs/src/decidim/direct_uploads/upload_field.js @@ -79,7 +79,7 @@ const updateActiveUploads = (modal) => { const template = `
${(/image/).test(file.type) && "
" || ""} - ${escapeHtml(title)} +

${escapeHtml(title)}

${hidden}
` diff --git a/decidim-core/app/packs/stylesheets/decidim/_modal_update.scss b/decidim-core/app/packs/stylesheets/decidim/_modal_update.scss index e60887cb602dd..4fdb0c7779d99 100644 --- a/decidim-core/app/packs/stylesheets/decidim/_modal_update.scss +++ b/decidim-core/app/packs/stylesheets/decidim/_modal_update.scss @@ -127,7 +127,7 @@ @apply w-full rounded bg-background flex items-center justify-center py-4 [&_img]:object-cover [&_img]:h-[200px]; } - span { + p { @apply text-sm text-gray-2 mx-auto w-full break-all mb-2; } } diff --git a/decidim-core/lib/decidim/form_builder.rb b/decidim-core/lib/decidim/form_builder.rb index 43ce2905e5302..c74b0e0079bc4 100644 --- a/decidim-core/lib/decidim/form_builder.rb +++ b/decidim-core/lib/decidim/form_builder.rb @@ -615,9 +615,33 @@ def custom_label(attribute, text, options, field_before_label: false, show_requi else text end - label(attribute, text, options || {}) end + + # render p tag instead of label for proposals "add a document" + def custom_paragraph(attribute, text, options, field_before_label: false, show_required: true) + return "".html_safe if text == false + + required = options.is_a?(Hash) && options.delete(:required) + text = attribute.to_s.humanize if text.nil? || text == true + if show_required + text += + if required + required_indicator + else + required_for_attribute(attribute) + end + end + + text = if field_before_label && block_given? + safe_join([yield, text.html_safe]) + elsif block_given? + safe_join([text.html_safe, yield]) + else + text + end + "

#{text}

".html_safe + end # rubocop:enable Metrics/PerceivedComplexity # rubocop:enable Metrics/CyclomaticComplexity diff --git a/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_processes/show.html.erb b/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_processes/show.html.erb index fc7df00685eb6..fb0b5987bfec6 100644 --- a/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_processes/show.html.erb +++ b/decidim-participatory_processes/app/views/decidim/participatory_processes/participatory_processes/show.html.erb @@ -38,6 +38,6 @@
- <%= resource_reference(current_participatory_space) %> +

<%= resource_reference(current_participatory_space) %>

diff --git a/decidim-proposals/app/views/decidim/proposals/collaborative_drafts/_edit_form_fields.html.erb b/decidim-proposals/app/views/decidim/proposals/collaborative_drafts/_edit_form_fields.html.erb index a01db0fd69890..3bfb0af82a6fa 100644 --- a/decidim-proposals/app/views/decidim/proposals/collaborative_drafts/_edit_form_fields.html.erb +++ b/decidim-proposals/app/views/decidim/proposals/collaborative_drafts/_edit_form_fields.html.erb @@ -21,5 +21,6 @@ button_edit_label: t("decidim.proposals.collaborative_drafts.new.edit_file"), button_class: "button button__lg button__transparent-secondary w-full", help_text: t("attachment_legend", scope: "decidim.proposals.collaborative_drafts.edit"), - help_i18n_scope: "decidim.forms.file_help.file" %> + help_i18n_scope: "decidim.forms.file_help.file", + proposals: true %> <% end %> diff --git a/decidim-proposals/app/views/decidim/proposals/proposals/_edit_form_fields.html.erb b/decidim-proposals/app/views/decidim/proposals/proposals/_edit_form_fields.html.erb index df4e316399256..5838b4536aa3c 100644 --- a/decidim-proposals/app/views/decidim/proposals/proposals/_edit_form_fields.html.erb +++ b/decidim-proposals/app/views/decidim/proposals/proposals/_edit_form_fields.html.erb @@ -22,7 +22,6 @@ <%= filter_taxonomy_items_select_field form, :taxonomies, filter %> <% end %> <% end %> - <% if component_settings.attachments_allowed? && (new_proposal || @proposal) %> <%= form.attachment :documents, multiple: true, @@ -31,5 +30,6 @@ button_edit_label: t("decidim.proposals.proposals.edit.edit_attachments"), button_class: "button button__lg button__transparent-secondary w-full", help_i18n_scope: "decidim.forms.file_help.file", - help_text: t("attachment_legend", scope: "decidim.proposals.proposals.edit") %> + help_text: t("attachment_legend", scope: "decidim.proposals.proposals.edit"), + proposals: true %> <% end %>