From 7c8833aa96565598a6e39c8efaa33cc971091ba8 Mon Sep 17 00:00:00 2001 From: Antti Hukkanen Date: Mon, 4 Sep 2023 11:46:47 +0300 Subject: [PATCH 1/2] Layout updates for the new round --- .../favorites/favorite_button/icon_fill.erb | 2 +- .../favorites/favorite_button/icon_hollow.erb | 2 +- .../favorites/favorite_button/show.erb | 39 +++++++------------ .../decidim/favorites/favorite_button_cell.rb | 2 +- .../favorites/favoriting_count/show.erb | 2 +- .../favorites/favorites/_side_panel.html.erb | 16 ++++---- .../decidim/favorites/favorites/show.html.erb | 37 ++++++++---------- config/locales/en.yml | 2 +- config/locales/fi.yml | 2 +- config/locales/sv.yml | 2 +- 10 files changed, 44 insertions(+), 62 deletions(-) diff --git a/app/cells/decidim/favorites/favorite_button/icon_fill.erb b/app/cells/decidim/favorites/favorite_button/icon_fill.erb index cb82e59..35a168b 100644 --- a/app/cells/decidim/favorites/favorite_button/icon_fill.erb +++ b/app/cells/decidim/favorites/favorite_button/icon_fill.erb @@ -1 +1 @@ - +<%= icon("heart", role: "img", "aria-hidden": true) %> diff --git a/app/cells/decidim/favorites/favorite_button/icon_hollow.erb b/app/cells/decidim/favorites/favorite_button/icon_hollow.erb index 15c8534..68a174c 100644 --- a/app/cells/decidim/favorites/favorite_button/icon_hollow.erb +++ b/app/cells/decidim/favorites/favorite_button/icon_hollow.erb @@ -1 +1 @@ - +<%= icon("heart-line", role: "img", "aria-hidden": true) %> diff --git a/app/cells/decidim/favorites/favorite_button/show.erb b/app/cells/decidim/favorites/favorite_button/show.erb index c98922c..3003e4e 100644 --- a/app/cells/decidim/favorites/favorite_button/show.erb +++ b/app/cells/decidim/favorites/favorite_button/show.erb @@ -2,29 +2,21 @@ <% if current_user %> <% if current_user_favoriting? %> <%= button(t("decidim.favorites.favorite_button.remove_from_favorites"), decidim_favorites.favorite_path(model.to_sgid.to_s, button_params), :delete) do %> - - - <%= t("decidim.favorites.favorite_button.remove_from_favorites") %> - - <% if display_text? %> - <%= t("decidim.favorites.favorite_button.remove_from_favorites") %> + <%= t("decidim.favorites.favorite_button.remove_from_favorites") %> + <% else %> + <%= t("decidim.favorites.favorite_button.remove_from_favorites") %> <% end %> + <%= render :icon_fill %> <% end %> <% else %> <%= button(t("decidim.favorites.favorite_button.add_to_favorites"), decidim_favorites.favorites_path(button_params), :post) do %> - - - <%= t("decidim.favorites.favorite_button.add_to_favorites") %> - - <% if display_text? %> - <%= t("decidim.favorites.favorite_button.add_to_favorites") %> + <%= t("decidim.favorites.favorite_button.add_to_favorites") %> + <% else %> + <%= t("decidim.favorites.favorite_button.add_to_favorites") %> <% end %> + <%= render :icon_hollow %> <% end %> <% end %> <% else %> @@ -37,17 +29,14 @@ data: tooltip_data(true), :'aria-haspopup' => true, title: t("decidim.favorites.favorite_button.sign_in_before_favorite"), - remote: true) do %> - - - <%= t("decidim.favorites.favorite_button.add_to_favorites") %> - - + remote: true) do + %> <% if display_text? %> - <%= t("decidim.favorites.favorite_button.add_to_favorites") %> + <%= t("decidim.favorites.favorite_button.add_to_favorites") %> + <% else %> + <%= t("decidim.favorites.favorite_button.add_to_favorites") %> <% end %> + <%= render :icon_hollow %> <% end %> <% end %> diff --git a/app/cells/decidim/favorites/favorite_button_cell.rb b/app/cells/decidim/favorites/favorite_button_cell.rb index ae60a91..f695f7b 100644 --- a/app/cells/decidim/favorites/favorite_button_cell.rb +++ b/app/cells/decidim/favorites/favorite_button_cell.rb @@ -75,7 +75,7 @@ def button_classes extra_classes = "" extra_classes += " active" if current_user_favoriting? - button_class = options[:button_class] || "button clear button--icon" + button_class = options[:button_class] || "link action-link" "#{button_class} favorite-button #{extra_classes}" end diff --git a/app/cells/decidim/favorites/favoriting_count/show.erb b/app/cells/decidim/favorites/favoriting_count/show.erb index b25d451..41c3204 100644 --- a/app/cells/decidim/favorites/favoriting_count/show.erb +++ b/app/cells/decidim/favorites/favoriting_count/show.erb @@ -1,6 +1,6 @@
<%= content_tag(:span, title: t("decidim.favorites.favoriting_count.times_added_to_favorites", count: favoriting_count), data: tooltip_data) do %> - <%= icon("heart", class: "icon--before", aria_hidden: true) %> + <%= icon("heart-line", class: "icon--before", aria_hidden: true) %> <%= t("decidim.favorites.favoriting_count.times_added_to_favorites", count: favoriting_count) %> <% end %> diff --git a/app/views/decidim/favorites/favorites/_side_panel.html.erb b/app/views/decidim/favorites/favorites/_side_panel.html.erb index cad6d56..e0b6f24 100644 --- a/app/views/decidim/favorites/favorites/_side_panel.html.erb +++ b/app/views/decidim/favorites/favorites/_side_panel.html.erb @@ -1,14 +1,12 @@ -
-
- -
    +
    +
    +
+ diff --git a/app/views/decidim/favorites/favorites/show.html.erb b/app/views/decidim/favorites/favorites/show.html.erb index fef5cec..5adbaa7 100644 --- a/app/views/decidim/favorites/favorites/show.html.erb +++ b/app/views/decidim/favorites/favorites/show.html.erb @@ -9,34 +9,29 @@ edit_link( <%= render partial: "layouts/decidim/breadcrumbs" rescue nil %> -
+
-
-
+
+

<%= t ".title" %>

+
+ +
+
<%= render "side_panel" %>
-
-
-
-
-

- <%= t ".title" %> -

- <%= t(".description_html") %> +
+ <%= t(".description_html") %> -

<%= @type[:name] %>

+

<%= @type[:name] %>

-
-
-
- <% @resources.each do |resource| %> - <%= card_for(resource) %> - <% end %> -
-
-
+
+
+
+ <% @resources.each do |resource| %> + <%= card_for(resource) %> + <% end %>
diff --git a/config/locales/en.yml b/config/locales/en.yml index 24f06f4..dd083b7 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -19,4 +19,4 @@ en: title: Favourites description_html:

Here you can see all favourites you have added in different phases of the process. From the side navigation you can choose which favourites you want to see.

side_panel: - show_navigation: Show navigation + nav_label: Sub navigation diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 48b9ccf..4e29ed8 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -19,4 +19,4 @@ fi: title: Suosikit description_html:

Täällä näet kaikki omat suosikit, joita olet lisännyt prosessin eri vaiheissa. Sivupalkista voit valita, mitä suosikkeja haluat selata.

side_panel: - show_navigation: Näytä navigaatio + nav_label: Alanavigaatio diff --git a/config/locales/sv.yml b/config/locales/sv.yml index a4079f6..cbb1970 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -19,4 +19,4 @@ sv: title: Favoriter description_html:

Här kan du se alla favoriter du har lagt till i olika faser av processen. Från sidnavigeringen kan du välja vilka favoriter du vill se.

side_panel: - show_navigation: Visa navigering + nav_label: Undernavigering From a4e289d4d85acd3296566a118cc4593729d8806a Mon Sep 17 00:00:00 2001 From: Antti Hukkanen Date: Thu, 14 Sep 2023 17:58:54 +0300 Subject: [PATCH 2/2] Remove rendering the breadcrumbs as this was moved to the layout --- app/views/decidim/favorites/favorites/index.html.erb | 2 -- app/views/decidim/favorites/favorites/show.html.erb | 2 -- 2 files changed, 4 deletions(-) diff --git a/app/views/decidim/favorites/favorites/index.html.erb b/app/views/decidim/favorites/favorites/index.html.erb index d14a452..14c5ea6 100644 --- a/app/views/decidim/favorites/favorites/index.html.erb +++ b/app/views/decidim/favorites/favorites/index.html.erb @@ -7,8 +7,6 @@ edit_link( ) %> -<%= render partial: "layouts/decidim/breadcrumbs" rescue nil %> -
diff --git a/app/views/decidim/favorites/favorites/show.html.erb b/app/views/decidim/favorites/favorites/show.html.erb index 5adbaa7..e126095 100644 --- a/app/views/decidim/favorites/favorites/show.html.erb +++ b/app/views/decidim/favorites/favorites/show.html.erb @@ -7,8 +7,6 @@ edit_link( ) %> -<%= render partial: "layouts/decidim/breadcrumbs" rescue nil %> -