Add heading to milestones progress bars

This commit is contained in:
Javi Martín
2019-01-10 21:43:51 +01:00
committed by decabeza
parent e73f3bd97a
commit b552f6e70b
4 changed files with 20 additions and 14 deletions

View File

@@ -7,18 +7,22 @@
<% end %> <% end %>
<% if milestoneable.primary_progress_bar %> <% if milestoneable.primary_progress_bar %>
<%= progress_tag_for(milestoneable.primary_progress_bar) %> <section class="progress-bars">
<h5><%= t("milestones.index.progress") %></h5>
<% if milestoneable.secondary_progress_bars.any? %> <%= progress_tag_for(milestoneable.primary_progress_bar) %>
<ul class="milestone-progress">
<% milestoneable.secondary_progress_bars.each do |progress_bar| %> <% if milestoneable.secondary_progress_bars.any? %>
<li> <ul class="milestone-progress">
<%= progress_bar.title %> <% milestoneable.secondary_progress_bars.each do |progress_bar| %>
<%= progress_tag_for(progress_bar) %> <li>
</li> <%= progress_bar.title %>
<% end %> <%= progress_tag_for(progress_bar) %>
</ul> </li>
<% end %> <% end %>
</ul>
<% end %>
</section>
<% end %> <% end %>
<section class="timeline"> <section class="timeline">

View File

@@ -2,6 +2,7 @@ en:
milestones: milestones:
index: index:
no_milestones: Don't have defined milestones no_milestones: Don't have defined milestones
progress: Progress
show: show:
publication_date: "Published %{publication_date}" publication_date: "Published %{publication_date}"
status_changed: Status changed to status_changed: Status changed to

View File

@@ -2,6 +2,7 @@ es:
milestones: milestones:
index: index:
no_milestones: No hay hitos definidos no_milestones: No hay hitos definidos
progress: Progreso
show: show:
publication_date: "Publicado el %{publication_date}" publication_date: "Publicado el %{publication_date}"
status_changed: El proyecto ha cambiado al estado status_changed: El proyecto ha cambiado al estado

View File

@@ -414,7 +414,7 @@ feature 'Legislation' do
visit milestones_legislation_process_path(process) visit milestones_legislation_process_path(process)
within(".tab-milestones") do within(".tab-milestones") do
expect(page).to have_css "progress" expect(page).to have_content "Progress"
end end
end end
@@ -425,7 +425,7 @@ feature 'Legislation' do
visit milestones_legislation_process_path(process) visit milestones_legislation_process_path(process)
within(".tab-milestones") do within(".tab-milestones") do
expect(page).to have_css "progress" expect(page).to have_content "Progress"
expect(page).to have_content "Build laboratory" expect(page).to have_content "Build laboratory"
end end
end end
@@ -436,7 +436,7 @@ feature 'Legislation' do
visit milestones_legislation_process_path(process) visit milestones_legislation_process_path(process)
within(".tab-milestones") do 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" expect(page).not_to have_content "Defeat Evil Lords"
end end
end end