diff --git a/app/assets/stylesheets/cclow/_geography-page.scss b/app/assets/stylesheets/cclow/_geography-page.scss index 31791f597..7f74dec89 100644 --- a/app/assets/stylesheets/cclow/_geography-page.scss +++ b/app/assets/stylesheets/cclow/_geography-page.scss @@ -435,3 +435,48 @@ mark { left: 10%; z-index: 35; } + +.sidebar__categories { + margin-top: 30px; + + & > hr { + background-color: $grey-light; + } + + .categories { + &__container { + margin-top: 30px; + + &:first-child { + margin-top: 20px; + } + } + + &__title { + font-size: 0.625rem; + line-height: 0.938rem; + color: $gun-powder; + text-transform: uppercase; + letter-spacing: 1.5px; + } + + &__tags { + display: flex; + } + + &__tag:not(body) { + margin-top: 10px; + border: none; + border-radius: 0; + margin-right: 12px; + background-color: $grey-light; + color: $blue-dark; + font-size: 0.75rem; + line-height: 0.938rem; + + &:last-child { + margin-right: 0; + } + } + } +} diff --git a/app/assets/stylesheets/cclow/_variables.scss b/app/assets/stylesheets/cclow/_variables.scss index 301a7f729..92660ea65 100644 --- a/app/assets/stylesheets/cclow/_variables.scss +++ b/app/assets/stylesheets/cclow/_variables.scss @@ -28,6 +28,7 @@ $navbar-item-color: $grey; // BREADCRUMB $breadcrumb-item-color: $red; $breadcrumb-item-active-color: $grey-text; +$breadcrumb-item-separator-color: $storm-gray; // DIVIDER $hr-background-color: $blue-dark; diff --git a/app/controllers/cclow/geography/legislations_controller.rb b/app/controllers/cclow/geography/legislations_controller.rb index d7e33ed7b..ba7e27efc 100644 --- a/app/controllers/cclow/geography/legislations_controller.rb +++ b/app/controllers/cclow/geography/legislations_controller.rb @@ -20,6 +20,8 @@ def index def show @legislation = CCLOW::LegislationDecorator.new(::Legislation.find(params[:id])) add_breadcrumb(@legislation.title, request.path) + @sectors = @legislation.laws_sectors.order(:name) + @keywords = @legislation.keywords.order(:name) end private diff --git a/app/controllers/cclow/geography/litigation_cases_controller.rb b/app/controllers/cclow/geography/litigation_cases_controller.rb index 13a7a6d82..a17d1e083 100644 --- a/app/controllers/cclow/geography/litigation_cases_controller.rb +++ b/app/controllers/cclow/geography/litigation_cases_controller.rb @@ -14,6 +14,8 @@ def show @legislations = CCLOW::LegislationDecorator.decorate_collection(@litigation.legislations) add_breadcrumb('Litigation cases', cclow_geography_litigation_cases_path(@geography)) add_breadcrumb(@litigation.title, request.path) + @sectors = @litigation.laws_sectors.order(:name) + @keywords = @litigation.keywords.order(:name) end end end diff --git a/app/views/cclow/geography/legislations/show.html.erb b/app/views/cclow/geography/legislations/show.html.erb index 5707ad80b..02527ef46 100644 --- a/app/views/cclow/geography/legislations/show.html.erb +++ b/app/views/cclow/geography/legislations/show.html.erb @@ -1,4 +1,35 @@ <% content_for :page_title, "Climate Laws - #{@geography.name} - #{@legislation.title}" %> + +<% content_for :sidebar do %> + +<% end %> +

<%= @legislation.title %>

diff --git a/app/views/cclow/geography/litigation_cases/show.html.erb b/app/views/cclow/geography/litigation_cases/show.html.erb index 2d2350c07..e39edc606 100644 --- a/app/views/cclow/geography/litigation_cases/show.html.erb +++ b/app/views/cclow/geography/litigation_cases/show.html.erb @@ -1,4 +1,35 @@ <% content_for :page_title, "Climate Laws - #{@geography.name} - #{@litigation.title}" %> + +<% content_for :sidebar do %> + +<% end %> +

<%= @litigation.title %>

diff --git a/app/views/layouts/cclow/geography.html.erb b/app/views/layouts/cclow/geography.html.erb index d95520f9a..a0d930f77 100644 --- a/app/views/layouts/cclow/geography.html.erb +++ b/app/views/layouts/cclow/geography.html.erb @@ -24,6 +24,8 @@
  • <%= active_link_to "#{link[:label]} (#{link[:count]})", link[:path], active: :exclusive %>
  • <% end %> + + <%= yield :sidebar %>
    <%= yield %>