From b920fa6eccb82606eb319b7bc665552fffa3a454 Mon Sep 17 00:00:00 2001 From: Luca Guindani Date: Thu, 25 Apr 2024 15:13:31 +0200 Subject: [PATCH] Add documentation link in users & groups setup view --- app/views/catalog_admin/fields/index.html.erb | 2 +- app/views/catalog_admin/users/index.html.erb | 11 +++++++++-- app/views/layouts/catalog_admin/setup.html.erb | 5 ++++- config/locales/app/de.yml | 1 + config/locales/app/en.yml | 1 + config/locales/app/fr.yml | 1 + config/locales/app/it.yml | 1 + 7 files changed, 18 insertions(+), 4 deletions(-) diff --git a/app/views/catalog_admin/fields/index.html.erb b/app/views/catalog_admin/fields/index.html.erb index 9a817c714..e1767ad4b 100644 --- a/app/views/catalog_admin/fields/index.html.erb +++ b/app/views/catalog_admin/fields/index.html.erb @@ -22,7 +22,7 @@ <% end %> -<% provide(:extra_setup) do %> +<% provide(:extra_setup_bottom) do %> <% if @field_set.class == ItemType && current_user.system_admin? %>

<%= t('item_views') %>

diff --git a/app/views/catalog_admin/users/index.html.erb b/app/views/catalog_admin/users/index.html.erb index d27a58357..4189394a2 100644 --- a/app/views/catalog_admin/users/index.html.erb +++ b/app/views/catalog_admin/users/index.html.erb @@ -1,3 +1,10 @@ +<% provide(:extra_setup_top) do %> + +
+<% end %> + <% provide(:title, t('.groups')) %> <% provide(:actions) do %> @@ -72,8 +79,8 @@ } -<% provide(:extra_setup) do %> -
+<% provide(:extra_setup_bottom) do %> +
<% if @users %>
diff --git a/app/views/layouts/catalog_admin/setup.html.erb b/app/views/layouts/catalog_admin/setup.html.erb index b70f7e752..e7e38993f 100644 --- a/app/views/layouts/catalog_admin/setup.html.erb +++ b/app/views/layouts/catalog_admin/setup.html.erb @@ -36,6 +36,8 @@
+ <%= yield(:extra_setup_top) %> +
<% if content_for?(:actions) %> @@ -43,10 +45,11 @@ <% end %> <%= content_for(:title) %>
+ <%= yield %>
- <%= yield(:extra_setup) %> + <%= yield(:extra_setup_bottom) %>
diff --git a/config/locales/app/de.yml b/config/locales/app/de.yml index 5833ddd75..d4af0d325 100644 --- a/config/locales/app/de.yml +++ b/config/locales/app/de.yml @@ -731,6 +731,7 @@ de: new_group: Neue Gruppe no_groups_for_catalog_warning: Es gibt keine Gruppen für diesen Katalog. search: Suche nach Benutzern + documentation_url_html: "A detailed documentation on the operation and configuration of users and groups is available at: %{url}." catalog_users: group_role: Gruppe edit: diff --git a/config/locales/app/en.yml b/config/locales/app/en.yml index f4e703f97..bcf631382 100644 --- a/config/locales/app/en.yml +++ b/config/locales/app/en.yml @@ -940,6 +940,7 @@ en: new_group: Create group no_groups_for_catalog_warning: There are no groups for this catalog. search: Search for users + documentation_url_html: "A detailed documentation on the operation and configuration of users and groups is available at: %{url}." catalog_users: group_role: Group edit: diff --git a/config/locales/app/fr.yml b/config/locales/app/fr.yml index 259b7699d..c4fa10b07 100644 --- a/config/locales/app/fr.yml +++ b/config/locales/app/fr.yml @@ -939,6 +939,7 @@ fr: new_group: Nouveau groupe no_groups_for_catalog_warning: Il n'y a pas de groupes pour ce catalogue. search: Rechercher des utilisateurs + documentation_url_html: "Une documentation détaillée sur le fonctionnement et la configuration des utilisateurs et groupes est disponible à l'url suivante: %{url}." catalog_users: group_role: Groupe edit: diff --git a/config/locales/app/it.yml b/config/locales/app/it.yml index e49a56480..b8a8bc322 100644 --- a/config/locales/app/it.yml +++ b/config/locales/app/it.yml @@ -578,6 +578,7 @@ it: new_group: Nuovo gruppo no_groups_for_catalog_warning: Non ci sono gruppi per questo catalogo. search: Cerca utenti + documentation_url_html: "A detailed documentation on the operation and configuration of users and groups is available at: %{url}." catalog_users: group_role: Gruppo edit: