From 78d8e34415f9513843d0231c3e48beb70f58a7af Mon Sep 17 00:00:00 2001 From: decabeza Date: Wed, 16 Jan 2019 17:39:24 +0100 Subject: [PATCH] Show following tab on process if there are progress bar Before, this tab only was show if were some milestone --- app/assets/stylesheets/legislation_process.scss | 2 ++ app/views/legislation/processes/_key_dates.html.erb | 6 ++++-- app/views/milestones/_milestones_content.html.erb | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/legislation_process.scss b/app/assets/stylesheets/legislation_process.scss index 990581236..4f7c07dcc 100644 --- a/app/assets/stylesheets/legislation_process.scss +++ b/app/assets/stylesheets/legislation_process.scss @@ -60,7 +60,9 @@ border: 1px solid $border; display: block; margin: rem-calc(-1) 0; + min-height: $line-height * 3; position: relative; + vertical-align: top; @include breakpoint(large down) { diff --git a/app/views/legislation/processes/_key_dates.html.erb b/app/views/legislation/processes/_key_dates.html.erb index 835aeff34..1794b65ee 100644 --- a/app/views/legislation/processes/_key_dates.html.erb +++ b/app/views/legislation/processes/_key_dates.html.erb @@ -42,11 +42,13 @@ <% end %> - <% if process.milestones.any? %> + <% if process.milestones.any? || process.progress_bars.any? %>
  • "> <%= link_to milestones_legislation_process_path(process) do %>

    <%= t("legislation.processes.shared.milestones_date") %>

    - <%= format_date(process.milestones.order_by_publication_date.last.publication_date) %> + <% if process.milestones.any? %> + <%= format_date(process.milestones.order_by_publication_date.last.publication_date) %> + <% end %> <% end %>
  • <% end %> diff --git a/app/views/milestones/_milestones_content.html.erb b/app/views/milestones/_milestones_content.html.erb index dd85cc763..fcc76fadf 100644 --- a/app/views/milestones/_milestones_content.html.erb +++ b/app/views/milestones/_milestones_content.html.erb @@ -3,7 +3,7 @@ <%= render "milestones/progress_bars", milestoneable: milestoneable %> <% if milestoneable.milestones.blank? %> -
    +
    <%= t("milestones.index.no_milestones") %>
    <% end %>