From b552f6e70ba7702139ebaa1f65f671a9002f8c49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javi=20Mart=C3=ADn?= Date: Thu, 10 Jan 2019 21:43:51 +0100 Subject: [PATCH] Add heading to milestones progress bars --- .../milestones/_milestones_content.html.erb | 26 +++++++++++-------- config/locales/en/milestones.yml | 1 + config/locales/es/milestones.yml | 1 + spec/features/legislation/processes_spec.rb | 6 ++--- 4 files changed, 20 insertions(+), 14 deletions(-) diff --git a/app/views/milestones/_milestones_content.html.erb b/app/views/milestones/_milestones_content.html.erb index 338eae449..92c46884f 100644 --- a/app/views/milestones/_milestones_content.html.erb +++ b/app/views/milestones/_milestones_content.html.erb @@ -7,18 +7,22 @@ <% end %> <% if milestoneable.primary_progress_bar %> - <%= progress_tag_for(milestoneable.primary_progress_bar) %> +
+
<%= t("milestones.index.progress") %>
- <% if milestoneable.secondary_progress_bars.any? %> - - <% end %> + <%= progress_tag_for(milestoneable.primary_progress_bar) %> + + <% if milestoneable.secondary_progress_bars.any? %> + + <% end %> +
<% end %>
diff --git a/config/locales/en/milestones.yml b/config/locales/en/milestones.yml index f660f82e6..79e38f6c6 100644 --- a/config/locales/en/milestones.yml +++ b/config/locales/en/milestones.yml @@ -2,6 +2,7 @@ en: milestones: index: no_milestones: Don't have defined milestones + progress: Progress show: publication_date: "Published %{publication_date}" status_changed: Status changed to diff --git a/config/locales/es/milestones.yml b/config/locales/es/milestones.yml index 406a2ea89..3e5432519 100644 --- a/config/locales/es/milestones.yml +++ b/config/locales/es/milestones.yml @@ -2,6 +2,7 @@ es: milestones: index: no_milestones: No hay hitos definidos + progress: Progreso show: publication_date: "Publicado el %{publication_date}" status_changed: El proyecto ha cambiado al estado diff --git a/spec/features/legislation/processes_spec.rb b/spec/features/legislation/processes_spec.rb index d0b65efe9..e4930fb1c 100644 --- a/spec/features/legislation/processes_spec.rb +++ b/spec/features/legislation/processes_spec.rb @@ -414,7 +414,7 @@ feature 'Legislation' do visit milestones_legislation_process_path(process) within(".tab-milestones") do - expect(page).to have_css "progress" + expect(page).to have_content "Progress" end end @@ -425,7 +425,7 @@ feature 'Legislation' do visit milestones_legislation_process_path(process) within(".tab-milestones") do - expect(page).to have_css "progress" + expect(page).to have_content "Progress" expect(page).to have_content "Build laboratory" end end @@ -436,7 +436,7 @@ feature 'Legislation' do visit milestones_legislation_process_path(process) within(".tab-milestones") do - expect(page).not_to have_css "progress" + expect(page).not_to have_content "Progress" expect(page).not_to have_content "Defeat Evil Lords" end end