From ae449a54a89f72459543c3cbf77c6f4d1575f14c Mon Sep 17 00:00:00 2001 From: Joonas Date: Thu, 5 Dec 2024 15:41:45 +0200 Subject: [PATCH] Update views --- app/cells/decidim/ideas/idea_cell.rb | 2 +- .../decidim/ideas/{idea_m => idea_g}/data.erb | 0 .../ideas/{idea_m => idea_g}/image.erb | 0 .../ideas/{idea_m => idea_g}/inner.erb | 2 - .../decidim/ideas/{idea_m => idea_g}/show.erb | 0 app/cells/decidim/ideas/idea_g/state.erb | 1 + .../decidim/ideas/{idea_m => idea_g}/tags.erb | 0 .../ideas/{idea_m_cell.rb => idea_g_cell.rb} | 5 +- app/cells/decidim/ideas/idea_l/inner.erb | 3 -- app/cells/decidim/ideas/idea_l_cell.rb | 2 +- app/cells/decidim/ideas/idea_m/state.erb | 5 -- app/cells/decidim/ideas/ideas_picker/show.erb | 2 +- .../ideas/ideas_picker_inline/filters.erb | 2 +- .../filters_small_view.erb | 2 +- .../ideas/ideas_picker_inline/ideas.erb | 2 +- .../decidim/ideas/ideas_controller.rb | 1 - .../decidim/ideas/admin/component_settings.rb | 2 +- .../decidim/ideas/admin/ideas/_form.html.erb | 2 +- .../ideas/admin/ideas/_idea-tr.html.erb | 4 +- .../decidim/ideas/admin/ideas/index.html.erb | 2 +- .../decidim/ideas/admin/ideas/show.html.erb | 6 +-- .../decidim/ideas/ideas/_filters.html.erb | 2 +- .../ideas/ideas/_filters_small_view.html.erb | 2 +- app/views/decidim/ideas/ideas/_form.html.erb | 8 +-- .../ideas/ideas/_idea_actions.html.erb | 54 ------------------- .../decidim/ideas/ideas/_idea_aside.html.erb | 42 +++++++++++++++ .../decidim/ideas/ideas/_idea_full.html.erb | 2 +- .../ideas/ideas/_idea_similar.html.erb | 2 +- .../decidim/ideas/ideas/_share_modal.html.erb | 28 ---------- .../ideas/ideas/_wizard_aside.html.erb | 2 +- app/views/decidim/ideas/ideas/edit.html.erb | 2 +- app/views/decidim/ideas/ideas/index.html.erb | 10 ++-- app/views/decidim/ideas/ideas/new.html.erb | 2 +- app/views/decidim/ideas/ideas/show.html.erb | 4 +- app/views/decidim/ideas/info/show.html.erb | 2 +- config/locales/cs.yml | 4 +- config/locales/en.yml | 4 +- config/locales/fi.yml | 4 +- config/locales/sv.yml | 4 +- ...dea_m_cell_spec.rb => idea_g_cell_spec.rb} | 4 +- 40 files changed, 88 insertions(+), 139 deletions(-) rename app/cells/decidim/ideas/{idea_m => idea_g}/data.erb (100%) rename app/cells/decidim/ideas/{idea_m => idea_g}/image.erb (100%) rename app/cells/decidim/ideas/{idea_m => idea_g}/inner.erb (83%) rename app/cells/decidim/ideas/{idea_m => idea_g}/show.erb (100%) create mode 100644 app/cells/decidim/ideas/idea_g/state.erb rename app/cells/decidim/ideas/{idea_m => idea_g}/tags.erb (100%) rename app/cells/decidim/ideas/{idea_m_cell.rb => idea_g_cell.rb} (95%) delete mode 100644 app/cells/decidim/ideas/idea_m/state.erb delete mode 100644 app/views/decidim/ideas/ideas/_idea_actions.html.erb create mode 100644 app/views/decidim/ideas/ideas/_idea_aside.html.erb delete mode 100644 app/views/decidim/ideas/ideas/_share_modal.html.erb rename spec/cells/decidim/ideas/{idea_m_cell_spec.rb => idea_g_cell_spec.rb} (94%) diff --git a/app/cells/decidim/ideas/idea_cell.rb b/app/cells/decidim/ideas/idea_cell.rb index 9533a4e..e72ea91 100644 --- a/app/cells/decidim/ideas/idea_cell.rb +++ b/app/cells/decidim/ideas/idea_cell.rb @@ -18,7 +18,7 @@ def show private def card_size - "decidim/ideas/idea_m" + "decidim/ideas/idea_g" end def resource_path diff --git a/app/cells/decidim/ideas/idea_m/data.erb b/app/cells/decidim/ideas/idea_g/data.erb similarity index 100% rename from app/cells/decidim/ideas/idea_m/data.erb rename to app/cells/decidim/ideas/idea_g/data.erb diff --git a/app/cells/decidim/ideas/idea_m/image.erb b/app/cells/decidim/ideas/idea_g/image.erb similarity index 100% rename from app/cells/decidim/ideas/idea_m/image.erb rename to app/cells/decidim/ideas/idea_g/image.erb diff --git a/app/cells/decidim/ideas/idea_m/inner.erb b/app/cells/decidim/ideas/idea_g/inner.erb similarity index 83% rename from app/cells/decidim/ideas/idea_m/inner.erb rename to app/cells/decidim/ideas/idea_g/inner.erb index fdc9216..3112752 100644 --- a/app/cells/decidim/ideas/idea_m/inner.erb +++ b/app/cells/decidim/ideas/idea_g/inner.erb @@ -1,5 +1,4 @@ <%= card_wrapper do %> - <%= render :top if render_top? %> <%= render :image %>
@@ -14,5 +13,4 @@ <%= render :tags %> <%= render :data %> - <%= render :status %> <% end %> diff --git a/app/cells/decidim/ideas/idea_m/show.erb b/app/cells/decidim/ideas/idea_g/show.erb similarity index 100% rename from app/cells/decidim/ideas/idea_m/show.erb rename to app/cells/decidim/ideas/idea_g/show.erb diff --git a/app/cells/decidim/ideas/idea_g/state.erb b/app/cells/decidim/ideas/idea_g/state.erb new file mode 100644 index 0000000..90b492a --- /dev/null +++ b/app/cells/decidim/ideas/idea_g/state.erb @@ -0,0 +1 @@ +<%= badge_name %> diff --git a/app/cells/decidim/ideas/idea_m/tags.erb b/app/cells/decidim/ideas/idea_g/tags.erb similarity index 100% rename from app/cells/decidim/ideas/idea_m/tags.erb rename to app/cells/decidim/ideas/idea_g/tags.erb diff --git a/app/cells/decidim/ideas/idea_m_cell.rb b/app/cells/decidim/ideas/idea_g_cell.rb similarity index 95% rename from app/cells/decidim/ideas/idea_m_cell.rb rename to app/cells/decidim/ideas/idea_g_cell.rb index 2b3b6d1..eb8e768 100644 --- a/app/cells/decidim/ideas/idea_m_cell.rb +++ b/app/cells/decidim/ideas/idea_g_cell.rb @@ -5,7 +5,7 @@ module Decidim module Ideas # This cell renders a idea with its M-size card. - class IdeaMCell < Decidim::CardMCell + class IdeaGCell < Decidim::CardGCell include IdeaCellsHelper property :area_scope, :answered? @@ -25,8 +25,7 @@ def resource_utm_params private def card_wrapper - cls = card_classes.is_a?(Array) ? card_classes.join(" ") : card_classes - wrapper_options = { class: "card #{cls}", aria: { label: t(".card_label", title: title) } } + wrapper_options = { class: "card", aria: { label: t(".card_label", title:) } } if has_link_to_resource? link_to resource_path, **wrapper_options do yield diff --git a/app/cells/decidim/ideas/idea_l/inner.erb b/app/cells/decidim/ideas/idea_l/inner.erb index 714331a..067c4c6 100644 --- a/app/cells/decidim/ideas/idea_l/inner.erb +++ b/app/cells/decidim/ideas/idea_l/inner.erb @@ -22,8 +22,5 @@
<%= render :data %>
-
- <%= render :status %> -
<% end %> diff --git a/app/cells/decidim/ideas/idea_l_cell.rb b/app/cells/decidim/ideas/idea_l_cell.rb index 9a5db10..6dddffc 100644 --- a/app/cells/decidim/ideas/idea_l_cell.rb +++ b/app/cells/decidim/ideas/idea_l_cell.rb @@ -5,7 +5,7 @@ module Decidim module Ideas # This cell renders an idea with its L-size card. - class IdeaLCell < Decidim::Ideas::IdeaMCell + class IdeaLCell < Decidim::Ideas::IdeaGCell def card_classes classes = super classes = classes.split unless classes.is_a?(Array) diff --git a/app/cells/decidim/ideas/idea_m/state.erb b/app/cells/decidim/ideas/idea_m/state.erb deleted file mode 100644 index 58586b4..0000000 --- a/app/cells/decidim/ideas/idea_m/state.erb +++ /dev/null @@ -1,5 +0,0 @@ -
-
- <%= badge_name %> -
-
diff --git a/app/cells/decidim/ideas/ideas_picker/show.erb b/app/cells/decidim/ideas/ideas_picker/show.erb index bd9d18b..9df7706 100644 --- a/app/cells/decidim/ideas/ideas_picker/show.erb +++ b/app/cells/decidim/ideas/ideas_picker/show.erb @@ -11,4 +11,4 @@ -<%= javascript_pack_tag "decidim_ideas_idea_picker" %> +<%= append_javascript_pack_tag "decidim_ideas_idea_picker" %> diff --git a/app/cells/decidim/ideas/ideas_picker_inline/filters.erb b/app/cells/decidim/ideas/ideas_picker_inline/filters.erb index 134f037..00875b6 100644 --- a/app/cells/decidim/ideas/ideas_picker_inline/filters.erb +++ b/app/cells/decidim/ideas/ideas_picker_inline/filters.erb @@ -58,7 +58,7 @@ <%= form.search_field :search_text, label: false, class: "input-group-field", placeholder: t(".filters.search"), title: t(".filters.search") %>
diff --git a/app/cells/decidim/ideas/ideas_picker_inline/filters_small_view.erb b/app/cells/decidim/ideas/ideas_picker_inline/filters_small_view.erb index 0cad8f6..2a84a53 100644 --- a/app/cells/decidim/ideas/ideas_picker_inline/filters_small_view.erb +++ b/app/cells/decidim/ideas/ideas_picker_inline/filters_small_view.erb @@ -1,7 +1,7 @@
diff --git a/app/cells/decidim/ideas/ideas_picker_inline/ideas.erb b/app/cells/decidim/ideas/ideas_picker_inline/ideas.erb index 4e8c7ee..a458693 100644 --- a/app/cells/decidim/ideas/ideas_picker_inline/ideas.erb +++ b/app/cells/decidim/ideas/ideas_picker_inline/ideas.erb @@ -6,7 +6,7 @@
<%= t(".choose_idea") %>
- <%= icon "check", aria_hidden: true %> + <%= icon "check-line", aria_hidden: true %> <%= t(".chosen_idea") %>
<%= t(".remove_idea") %> diff --git a/app/controllers/decidim/ideas/ideas_controller.rb b/app/controllers/decidim/ideas/ideas_controller.rb index 665372a..f1337b2 100644 --- a/app/controllers/decidim/ideas/ideas_controller.rb +++ b/app/controllers/decidim/ideas/ideas_controller.rb @@ -3,7 +3,6 @@ module Decidim module Ideas class IdeasController < Decidim::Ideas::ApplicationController - helper Decidim::WidgetUrlsHelper helper IdeaWizardHelper helper Decidim::Ideas::IdeasFormHelper diff --git a/app/helpers/concerns/decidim/ideas/admin/component_settings.rb b/app/helpers/concerns/decidim/ideas/admin/component_settings.rb index db65e89..28deb84 100644 --- a/app/helpers/concerns/decidim/ideas/admin/component_settings.rb +++ b/app/helpers/concerns/decidim/ideas/admin/component_settings.rb @@ -58,7 +58,7 @@ def settings_attribute_input(form, attribute, name, i18n_scope, options = {}) "" else @ideas_settings_js_included = true - javascript_pack_tag("decidim_ideas_admin_component_settings") + append_javascript_pack_tag("decidim_ideas_admin_component_settings") end label + coordinates_element + settings_js diff --git a/app/views/decidim/ideas/admin/ideas/_form.html.erb b/app/views/decidim/ideas/admin/ideas/_form.html.erb index 24d94f4..ddc6ffe 100644 --- a/app/views/decidim/ideas/admin/ideas/_form.html.erb +++ b/app/views/decidim/ideas/admin/ideas/_form.html.erb @@ -117,4 +117,4 @@
-<%= javascript_pack_tag "decidim_ideas_admin_ideas_form" %> +<%= append_javascript_pack_tag "decidim_ideas_admin_ideas_form" %> diff --git a/app/views/decidim/ideas/admin/ideas/_idea-tr.html.erb b/app/views/decidim/ideas/admin/ideas/_idea-tr.html.erb index 5ee43bb..1813471 100644 --- a/app/views/decidim/ideas/admin/ideas/_idea-tr.html.erb +++ b/app/views/decidim/ideas/admin/ideas/_idea-tr.html.erb @@ -51,11 +51,11 @@ <% if allowed_to? :edit, :idea, idea: idea %> - <%= icon_link_to "pencil", edit_idea_path(idea), t("actions.edit_idea", scope: "decidim.ideas"), class: "action-icon--edit-idea" %> + <%= icon_link_to "pencil-line", edit_idea_path(idea), t("actions.edit_idea", scope: "decidim.ideas"), class: "action-icon--edit-idea" %> <% end %> <%= icon_with_link_to_idea(idea) %> - <%= icon_link_to "eye", resource_locator(idea).path, t("actions.preview", scope: "decidim.ideas.admin"), class: "action-icon--preview", target: :blank %> + <%= icon_link_to "eye-line", resource_locator(idea).path, t("actions.preview", scope: "decidim.ideas.admin"), class: "action-icon--preview", target: :blank %> diff --git a/app/views/decidim/ideas/admin/ideas/index.html.erb b/app/views/decidim/ideas/admin/ideas/index.html.erb index 0b583e1..4627fc3 100644 --- a/app/views/decidim/ideas/admin/ideas/index.html.erb +++ b/app/views/decidim/ideas/admin/ideas/index.html.erb @@ -63,4 +63,4 @@
-<%= javascript_pack_tag "decidim_ideas_admin_ideas" %> +<%= append_javascript_pack_tag "decidim_ideas_admin_ideas" %> diff --git a/app/views/decidim/ideas/admin/ideas/show.html.erb b/app/views/decidim/ideas/admin/ideas/show.html.erb index 67f3880..70bddaa 100644 --- a/app/views/decidim/ideas/admin/ideas/show.html.erb +++ b/app/views/decidim/ideas/admin/ideas/show.html.erb @@ -5,7 +5,7 @@ <%= decidim_html_escape(present(idea).title).html_safe %> <% if allowed_to? :edit, :idea, idea: idea %> - <%= icon_link_to "pencil", edit_idea_path(idea), t("actions.edit_idea", scope: "decidim.ideas"), class: "action-icon--edit-idea" %> + <%= icon_link_to "pencil-line", edit_idea_path(idea), t("actions.edit_idea", scope: "decidim.ideas"), class: "action-icon--edit-idea" %> <% end %> @@ -27,12 +27,12 @@ target: :blank ) %> <% if presented_author.can_be_contacted? && presented_author.nickname != present(current_user).nickname %> - <%= icon_link_to "envelope-closed", current_or_new_conversation_path_with(presented_author), t("decidim.contact"), class:"action-icon--new" %> + <%= icon_link_to "mail-line", current_or_new_conversation_path_with(presented_author), t("decidim.contact"), class:"action-icon--new" %> <% end %> <% user = presented_author.__getobj__ %> <% if user.respond_to?(:id) && allowed_to?(:show_email, :user, user: user) %> - <%= icon_link_to "envelope-open", decidim_admin.show_email_officialization_path(user_id: user.id), t(".show_email"), class: "action-icon action-icon--show-email", data: { full_name: user.name, toggle: "show-email-modal" } %> + <%= icon_link_to "mail-open-line", decidim_admin.show_email_officialization_path(user_id: user.id), t(".show_email"), class: "action-icon action-icon--show-email", data: { full_name: user.name, toggle: "show-email-modal" } %> <% end %> <% end %> diff --git a/app/views/decidim/ideas/ideas/_filters.html.erb b/app/views/decidim/ideas/ideas/_filters.html.erb index eb0dba9..fb1101a 100644 --- a/app/views/decidim/ideas/ideas/_filters.html.erb +++ b/app/views/decidim/ideas/ideas/_filters.html.erb @@ -41,7 +41,7 @@
diff --git a/app/views/decidim/ideas/ideas/_filters_small_view.html.erb b/app/views/decidim/ideas/ideas/_filters_small_view.html.erb index b009ae0..14eaeb5 100644 --- a/app/views/decidim/ideas/ideas/_filters_small_view.html.erb +++ b/app/views/decidim/ideas/ideas/_filters_small_view.html.erb @@ -1,7 +1,7 @@
diff --git a/app/views/decidim/ideas/ideas/_form.html.erb b/app/views/decidim/ideas/ideas/_form.html.erb index 081919e..f5ce1da 100644 --- a/app/views/decidim/ideas/ideas/_form.html.erb +++ b/app/views/decidim/ideas/ideas/_form.html.erb @@ -36,7 +36,7 @@ <%= form.check_box :terms_agreed, required: true %>
<%= link_to info_path("terms"), class: "info-modal-link" do %> - <%= icon "information", aria_hidden: true %> + <%= icon "information-line", aria_hidden: true %> <%= t(".show_terms_info_text") %> <% end %>
@@ -86,7 +86,7 @@
<%= link_to info_path("areas"), class: "info-modal-link" do %> - <%= icon "information", aria_hidden: true %> + <%= icon "information-line", aria_hidden: true %> <%= t(".show_areas_info_text") %> <% end %>
@@ -138,7 +138,7 @@
<%= link_to info_path("categories"), class: "info-modal-link" do %> - <%= icon "information", aria_hidden: true %> + <%= icon "information-line", aria_hidden: true %> <%= t(".show_categories_info_text") %> <% end %>
@@ -225,7 +225,7 @@
<% end %> -<%= javascript_pack_tag "decidim_ideas_idea_form" %> +<%= append_javascript_pack_tag "decidim_ideas_idea_form" %> <% js_options = { diff --git a/app/views/decidim/ideas/ideas/_idea_actions.html.erb b/app/views/decidim/ideas/ideas/_idea_actions.html.erb deleted file mode 100644 index ba22a60..0000000 --- a/app/views/decidim/ideas/ideas/_idea_actions.html.erb +++ /dev/null @@ -1,54 +0,0 @@ -<% if show_actions %> -
- <%= cell("decidim/favorites/favorite_button", idea, button_class: "link action-link", disable_tooltip: true) %> -
-<% end %> - -<% if component_settings.geocoding_enabled? && idea.address.present? && idea.latitude.present? && idea.longitude.present? %> - -<% end %> - -<% if show_actions %> - <% if idea.commentable? %> -
- <%= link_to "#comments", class: "action-link" do %> - <%= t ".show_comments" %> - <%= icon "comment-square", role: "img", "aria-hidden": true %> - <% end %> -
- <% end %> - -
- -
- - <%= cell("decidim/flag_modal", idea) %> -<% end %> - -<% if show_actions %> -
- -
- - <%= render partial: "share_modal" %> -<% end %> - -<% if false %> -
- -
-<% end %> diff --git a/app/views/decidim/ideas/ideas/_idea_aside.html.erb b/app/views/decidim/ideas/ideas/_idea_aside.html.erb new file mode 100644 index 0000000..4bd4fad --- /dev/null +++ b/app/views/decidim/ideas/ideas/_idea_aside.html.erb @@ -0,0 +1,42 @@ +<% if show_actions %> +
+ <%= cell("decidim/favorites/favorite_button", idea, button_class: "link text-secondary", disable_tooltip: true) %> +
+<% end %> + +<% if component_settings.geocoding_enabled? && idea.address.present? && idea.latitude.present? && idea.longitude.present? %> +
+ + <%= t ".show_on_map" %> + <%= icon "map-pin-line", role: "img", "aria-hidden": true %> + +
+<% end %> + +<% if show_actions %> + <% if idea.commentable? %> +
+ <%= link_to "#comments", class: "text-secondary" do %> + <%= t ".show_comments" %> + <%= icon "question-answer-line", role: "img", "aria-hidden": true %> + <% end %> +
+ <% end %> + +
+ <%= cell "decidim/share_button", nil %> +
+ +
+ <%= cell "decidim/report_button", idea, only_button: true%> +
+<% end %> + +<% if false %> +
+ +
+<% end %> diff --git a/app/views/decidim/ideas/ideas/_idea_full.html.erb b/app/views/decidim/ideas/ideas/_idea_full.html.erb index afbf07a..d1f2cfb 100644 --- a/app/views/decidim/ideas/ideas/_idea_full.html.erb +++ b/app/views/decidim/ideas/ideas/_idea_full.html.erb @@ -23,7 +23,7 @@
- <%= render partial: "idea_actions", locals: { idea: idea, show_actions: show_actions } %> + <%= render partial: "idea_aside", locals: { idea: idea, show_actions: show_actions } %>
<% if show_actions && allowed_to?(:withdraw, :idea, idea: idea) %> diff --git a/app/views/decidim/ideas/ideas/_idea_similar.html.erb b/app/views/decidim/ideas/ideas/_idea_similar.html.erb index 3653d44..a832715 100644 --- a/app/views/decidim/ideas/ideas/_idea_similar.html.erb +++ b/app/views/decidim/ideas/ideas/_idea_similar.html.erb @@ -13,7 +13,7 @@ <%= resource_reference(idea, class: "tech-info--text-left") %>
- <%== cell("decidim/ideas/idea_m", idea).badge %> + <%== cell("decidim/ideas/idea_g", idea).badge %>

<%= truncate(present(idea).body(strip_tags: true), length: 100) %>

<%= cell "decidim/tags", idea, context: { extra_classes: ["tags--idea"] } %> diff --git a/app/views/decidim/ideas/ideas/_share_modal.html.erb b/app/views/decidim/ideas/ideas/_share_modal.html.erb deleted file mode 100644 index 9757617..0000000 --- a/app/views/decidim/ideas/ideas/_share_modal.html.erb +++ /dev/null @@ -1,28 +0,0 @@ -
-
-

<%= t("decidim.shared.share_modal.share") %>:

- -
-
- <%= social_share_button_tag(decidim_page_title, - url: decidim_meta_url, - image: decidim_meta_image_url, - desc: h(decidim_meta_description), - via: decidim_meta_twitter_handler) %> - - <%= icon "link-intact", role: "img", "aria-hidden": true %> - <%= t("decidim.shared.share_modal.share_link") %> - -
-
-
-
-

<%= t("decidim.shared.share_modal.share_link") %>:

- -
- " value="<%= "#{decidim_meta_url}" %>" readonly> -
diff --git a/app/views/decidim/ideas/ideas/_wizard_aside.html.erb b/app/views/decidim/ideas/ideas/_wizard_aside.html.erb index 5707c20..5b59681 100644 --- a/app/views/decidim/ideas/ideas/_wizard_aside.html.erb +++ b/app/views/decidim/ideas/ideas/_wizard_aside.html.erb @@ -2,7 +2,7 @@
<% unless @step == :step_2 %> <%= link_to idea_wizard_aside_link_to_back(@step) do %> - <%= icon "chevron-left", class: "icon--small", role: "img" %> + <%= icon "arrow-left-s-line", class: "icon--small", role: "img" %> <%= wizard_aside_back_text %> <% end %> <% end %> diff --git a/app/views/decidim/ideas/ideas/edit.html.erb b/app/views/decidim/ideas/ideas/edit.html.erb index 55ddb19..a23c63d 100644 --- a/app/views/decidim/ideas/ideas/edit.html.erb +++ b/app/views/decidim/ideas/ideas/edit.html.erb @@ -1,7 +1,7 @@
<%= link_to ideas_path do %> - <%= icon "chevron-left", class: "icon--small", role: "img" %> + <%= icon "arrow-left-s-line", class: "icon--small", role: "img" %> <%= t(".back") %> <% end %>
diff --git a/app/views/decidim/ideas/ideas/index.html.erb b/app/views/decidim/ideas/ideas/index.html.erb index 3dfa974..06d7915 100644 --- a/app/views/decidim/ideas/ideas/index.html.erb +++ b/app/views/decidim/ideas/ideas/index.html.erb @@ -18,20 +18,20 @@ current_component.participatory_space.can_participate?(current_user) && !users_idea_limit_reached? %>
-
+
<% if @draft_idea_link %>

<%= t ".draft_idea_title" %>

<%= link_to @draft_idea_link, class: "action-link" do %> <%= t(".draft_idea_continue") %> - <%= icon("arrow-right", role: "img", "aria-hidden": true) %> + <%= icon("arrow-right-line", role: "img", "aria-hidden": true) %> <% end %> <% else %> <%= link_to new_idea_path, class: "action-link", data: { "redirect_url" => new_idea_path } do %> <%= t(".new_idea") %> - <%= icon("arrow-right", role: "img", "aria-hidden": true) %> + <%= icon("arrow-right-line", role: "img", "aria-hidden": true) %> <% end %> <% end %> -
+
<% end %>
@@ -97,4 +97,4 @@
-<%= javascript_pack_tag "decidim_ideas_ideas_list" %> +<%= append_javascript_pack_tag "decidim_ideas_ideas_list" %> diff --git a/app/views/decidim/ideas/ideas/new.html.erb b/app/views/decidim/ideas/ideas/new.html.erb index f3614e5..cb6385f 100644 --- a/app/views/decidim/ideas/ideas/new.html.erb +++ b/app/views/decidim/ideas/ideas/new.html.erb @@ -1,7 +1,7 @@
<%= link_to ideas_path do %> - <%= icon "chevron-left", class: "icon--small", role: "img", "aria-hidden": true %> + <%= icon "arrow-left-s-line", class: "icon--small", role: "img", "aria-hidden": true %> <%= t(".back") %> <% end %>
diff --git a/app/views/decidim/ideas/ideas/show.html.erb b/app/views/decidim/ideas/ideas/show.html.erb index ea580b7..f0dffc8 100644 --- a/app/views/decidim/ideas/ideas/show.html.erb +++ b/app/views/decidim/ideas/ideas/show.html.erb @@ -19,7 +19,7 @@ extra_admin_link( :create, :idea_answer, { idea: @idea }, - { name: t(".answer"), icon: "comment-square" } + { name: t(".answer"), icon: "question-answer-line" } ) %> @@ -29,7 +29,7 @@ extra_admin_link( diff --git a/app/views/decidim/ideas/info/show.html.erb b/app/views/decidim/ideas/info/show.html.erb index 8a65999..7bab365 100644 --- a/app/views/decidim/ideas/info/show.html.erb +++ b/app/views/decidim/ideas/info/show.html.erb @@ -1,7 +1,7 @@
<%= link_to new_idea_path do %> - <%= icon "chevron-left", class: "icon--small", role: "img" %> + <%= icon "arrow-left-s-line", class: "icon--small", role: "img" %> <%= t(".back") %> <% end %>
diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 4dd5bf9..9f9332a 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -390,7 +390,7 @@ cs: destroy_draft: error: Zničení návrhu selhalo. success: Návrh byl úspěšně zničen. - idea_m: + idea_g: card_label: "Nápad: %{title}" last_activity: idea_updated_html: "Nápad aktualizován na %{link}" @@ -532,7 +532,7 @@ cs: idea: creation_date: 'Vytvoření: %{date}' view_idea: Zobrazit nápad - idea_actions: + idea_aside: share: Sdílet nápad show_comments: Zobrazit komentáře nápadu show_on_map: Zobrazit nápad na mapě diff --git a/config/locales/en.yml b/config/locales/en.yml index 4990522..5281cbe 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -390,7 +390,7 @@ en: success: Draft destroyed successfully. idea_l: card_label: "Idea: %{title}" - idea_m: + idea_g: card_label: "Idea: %{title}" last_activity: idea_updated_html: "Idea updated at %{link}" @@ -538,7 +538,7 @@ en: idea: creation_date: 'Creation: %{date}' view_idea: View idea - idea_actions: + idea_aside: share: Share idea show_comments: Show idea comments show_on_map: Show idea on map diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 1327b7a..61cc860 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -390,7 +390,7 @@ fi: success: Luonnoksen poisto onnistui. idea_l: card_label: "Idea: %{title}" - idea_m: + idea_g: card_label: "Idea: %{title}" last_activity: idea_updated_html: "Idea päivitetty osoitteessa %{link}" @@ -538,7 +538,7 @@ fi: idea: creation_date: 'Julkaisuaika: %{date}' view_idea: Näytä idea - idea_actions: + idea_aside: share: Jaa idea show_comments: Katso idean kommentit show_on_map: Katso idea kartalla diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 0420aa7..b544bbc 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -390,7 +390,7 @@ sv: success: Utkast förstördes framgångsrikt. idea_l: card_label: "Idé: %{title}" - idea_m: + idea_g: card_label: "Idé: %{title}" last_activity: idea_updated_html: "Idé uppdaterad på %{link}" @@ -538,7 +538,7 @@ sv: idea: creation_date: 'Skapat: %{date}' view_idea: Visa idé - idea_actions: + idea_aside: share: Dela idén show_comments: Visa idéens kommentarer show_on_map: Visa idén på kartan diff --git a/spec/cells/decidim/ideas/idea_m_cell_spec.rb b/spec/cells/decidim/ideas/idea_g_cell_spec.rb similarity index 94% rename from spec/cells/decidim/ideas/idea_m_cell_spec.rb rename to spec/cells/decidim/ideas/idea_g_cell_spec.rb index fa512e1..8701852 100644 --- a/spec/cells/decidim/ideas/idea_m_cell_spec.rb +++ b/spec/cells/decidim/ideas/idea_g_cell_spec.rb @@ -8,7 +8,7 @@ module Decidim::Ideas subject { cell_html } - let(:my_cell) { cell("decidim/ideas/idea_m", idea, context: { show_space: show_space }) } + let(:my_cell) { cell("decidim/ideas/idea_g", idea, context: { show_space: show_space }) } let(:cell_html) { my_cell.call } let(:created_at) { 1.month.ago } let(:published_at) { Time.current } @@ -47,7 +47,7 @@ module Decidim::Ideas context "when it is a idea preview" do subject { cell_html } - let(:my_cell) { cell("decidim/ideas/idea_m", model, preview: true) } + let(:my_cell) { cell("decidim/ideas/idea_g", model, preview: true) } let(:cell_html) { my_cell.call } it "renders the card with no status info" do