- <%= render "good_job/shared/navbar" %>
-
-
- <%= render "good_job/shared/alert" %>
-
- <%= yield %>
+ }
+ document.documentElement.setAttribute('data-bs-theme', theme);
+ <% end %>
+
+
+
+ <%= render "good_job/shared/navbar" %>
+ <%= render "good_job/shared/secondary_navbar" %>
+
+ <%= render "good_job/shared/alert" %>
+ <%= yield %>
+
-
- <%= render "good_job/shared/footer" %>
-
-
+
diff --git a/config/locales/de.yml b/config/locales/de.yml
index f373ce3b4..93b6df187 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -219,9 +219,6 @@ de:
placeholder: Suchen Sie nach Klasse, Job-ID, Jobparametern und Fehlertext.
queue_name: Warteschlangenname
search: Suchen
- footer:
- last_update_html: Zuletzt aktualisiert
- wording: Denk daran, auch du machst einen guten Job!
navbar:
batches: Batches
cron_schedules: Cron
@@ -234,6 +231,9 @@ de:
dark: Dunkel
light: Licht
theme: Thema
+ secondary_navbar:
+ inspiration: Denk daran, auch du machst einen guten Job!
+ last_updated: Zuletzt aktualisiert
status:
discarded: Ausrangiert
queued: In der Warteschlange
diff --git a/config/locales/en.yml b/config/locales/en.yml
index fddb7ff56..e9a04bad9 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -219,9 +219,6 @@ en:
placeholder: Search by class, job id, job params, and error text.
queue_name: Queue name
search: Search
- footer:
- last_update_html: Last updated
- wording: Remember, you're doing a Good Job too!
navbar:
batches: Batches
cron_schedules: Cron
@@ -234,6 +231,9 @@ en:
dark: Dark
light: Light
theme: Theme
+ secondary_navbar:
+ inspiration: Remember, you're doing a Good Job too!
+ last_updated: Last updated
status:
discarded: Discarded
queued: Queued
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 0bea78869..e4b67d343 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -217,9 +217,6 @@ es:
placeholder: Buscar por clase, id de tarea, parámetros y mensaje de error.
queue_name: Nombre de la cola
search: Buscar
- footer:
- last_update_html: Última actualización
- wording: "¡Recuerda, también tú estás haciendo un buen trabajo!"
navbar:
batches: Batches
cron_schedules: Cron
@@ -232,6 +229,9 @@ es:
dark: Oscuro
light: Luz
theme: Tema
+ secondary_navbar:
+ inspiration: "¡Recuerda, también tú estás haciendo un buen trabajo!"
+ last_updated: Última actualización
status:
discarded:
one: Descartada
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 77bc378a0..8d8874189 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -219,9 +219,6 @@ fr:
placeholder: Recherche par classe, ID de job, paramètres de job et texte d'erreur.
queue_name: Nom de la file d'attente
search: Recherche
- footer:
- last_update_html: Dernière mise à jour
- wording: N'oublie pas, toi aussi tu fais du bon boulot !
navbar:
batches: Lots
cron_schedules: Cron
@@ -234,6 +231,9 @@ fr:
dark: Sombre
light: Lumière
theme: Thème
+ secondary_navbar:
+ inspiration: N'oublie pas, toi aussi tu fais du bon boulot !
+ last_updated: Dernière mise à jour
status:
discarded: Mis au rebut
queued: À la file
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 9a321431d..abb39a722 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -219,9 +219,6 @@ ja:
placeholder: クラス名、ジョブID、ジョブパラメータ、エラーテキストで検索
queue_name: キュー名
search: 検索
- footer:
- last_update_html: 最終更新
- wording: Remember, you're doing a Good Job too!
navbar:
batches: バッチ
cron_schedules: Cron
@@ -234,6 +231,9 @@ ja:
dark: 暗い
light: ライト
theme: テーマ
+ secondary_navbar:
+ inspiration: 覚えておいてください、あなたも良い仕事をしています！
+ last_updated: 最終更新
status:
discarded: 破棄済み
queued: 処理待ち
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index dff3f2875..a6713a26b 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -219,9 +219,6 @@ nl:
placeholder: Zoek op klasse, taak-ID, taakparameters en fouttekst.
queue_name: Wachtrij naam
search: Zoekopdracht
- footer:
- last_update_html: Laatst bijgewerkt
- wording: 'Onthoud: jij levert ook goed werk!'
navbar:
batches: Batches
cron_schedules: Cron
@@ -234,6 +231,9 @@ nl:
dark: Donker
light: Licht
theme: Thema
+ secondary_navbar:
+ inspiration: 'Onthoud: jij levert ook goed werk!'
+ last_updated: Laatst bijgewerkt
status:
discarded: weggegooid
queued: In de wachtrij
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 7da5104a9..1cff986b9 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -245,9 +245,6 @@ ru:
placeholder: Поиск по классу, идентификатору задания, параметрам задания и тексту ошибки.
queue_name: Имя очереди
search: Поиск
- footer:
- last_update_html: Последнее обновление
- wording: Запомни, ты делаешь Good Job тоже!
navbar:
batches: Batches
cron_schedules: Cron
@@ -260,6 +257,9 @@ ru:
dark: Темный
light: Свет
theme: Тема
+ secondary_navbar:
+ inspiration: Запомни, ты делаешь Good Job тоже!
+ last_updated: Последнее обновление
status:
discarded: Отброшено
queued: В очереди
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index ee4e49f81..022a01e26 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -219,9 +219,6 @@ tr:
placeholder: Sınıfa, iş kimliğine, iş parametrelerine ve hata metnine göre ara.
queue_name: Kuyruk adı
search: Ara
- footer:
- last_update_html: Son güncelleme
- wording: Unutmayın, siz de iyi bir iş yapıyorsunuz!
navbar:
batches: Toplu İşler
cron_schedules: Cron
@@ -234,6 +231,9 @@ tr:
dark: Karanlık
light: Işık
theme: Tema
+ secondary_navbar:
+ inspiration: Unutmayın, siz de iyi bir iş yapıyorsunuz!
+ last_updated: Son güncelleme
status:
discarded: İptal Edildi
queued: Sırada
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index ff3c9a2c7..1ac669b4e 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -245,9 +245,6 @@ uk:
placeholder: Пошук за класом, ідентифікатором роботи, параметрами роботи та текстом помилки.
queue_name: Назва черги
search: Пошук
- footer:
- last_update_html: Останнє оновлення
- wording: Пам'ятайте, ви теж робите хорошу роботу!
navbar:
batches: Batches
cron_schedules: Cron
@@ -260,6 +257,9 @@ uk:
dark: Темний
light: світло
theme: Тема
+ secondary_navbar:
+ inspiration: Пам'ятайте, ви теж робите хорошу роботу!
+ last_updated: Останнє оновлення
status:
discarded: Відхилено
queued: У черзі
diff --git a/spec/system/i18n_spec.rb b/spec/system/i18n_spec.rb
index 3b63d1f4b..5aafff576 100644
--- a/spec/system/i18n_spec.rb
+++ b/spec/system/i18n_spec.rb
@@ -9,7 +9,7 @@
expect(page).to have_content "Processes"
find_by_id('localeOptions').click
- within ".navbar" do
+ within ".navbar.sticky-top" do
click_link "es"
end
expect(page).to have_content "Procesos"
@@ -20,7 +20,7 @@
expect(page).to have_content "Processes"
find_by_id('localeOptions').click
- within ".navbar" do
+ within ".navbar.sticky-top" do
click_link "uk"
end
expect(page).to have_content "Процеси"