diff --git a/app/views/cities/index.html.erb b/app/views/cities/index.html.erb index 399d8de..ebabcd8 100644 --- a/app/views/cities/index.html.erb +++ b/app/views/cities/index.html.erb @@ -8,13 +8,12 @@
<%= image_tag featured_art.image, class: "w-full h-full object-cover object-center" %> -
<% end %> -
+

@@ -39,83 +38,87 @@

- -
+ +
-
- -
- <%= link_to cities_path, - class: "btn btn-sm #{'btn-primary' unless @current_region} btn-outline" do %> - - - - All Regions - <% end %> - - <% @regions.each do |region| %> - <%= link_to region.name, - cities_path(region: region.slug), - class: "btn btn-sm #{'btn-primary' if @current_region == region} btn-outline" %> - <% end %> -
- - - <% if @current_region %> -
- <%= link_to cities_path(region: @current_region.slug), - class: "btn btn-sm btn-ghost #{'btn-active' unless @current_country}" do %> - All in <%= @current_region.name %> - <% end %> - - <% @current_region.countries.order(:name).each do |country| %> - <%= link_to country.name, - cities_path(region: @current_region.slug, country: country.slug), - class: "btn btn-sm btn-ghost #{'btn-active' if @current_country == country}" %> - <% end %> -
- <% end %> - - - <% if @current_region || @current_country %> -
-
-
    -
  • - <%= link_to cities_path do %> - - - - Home - <% end %> -
    • - <% if @current_region %> -
  • <%= @current_region.name %>
    • +
    + +
    + +
    + +
      +
    • + <%= link_to cities_path, + class: "#{@current_region ? '' : 'active'}" do %> + All Regions <% end %> - <% if @current_country %> -
    • <%= @current_country.name %>
      • + +
      + <% @regions.each do |region| %> +
    • + <%= link_to region.name, + cities_path(region: region.slug), + class: "#{@current_region == region ? 'active' : ''}" %> +
      • + <% end %> +
    +
    + + + <% if @current_region %> +
    + +
      +
    • + <%= link_to "All in #{@current_region.name}", + cities_path(region: @current_region.slug), + class: "#{@current_country ? '' : 'active'}" %> +
      • +
      + <% @current_region.countries.order(:name).each do |country| %> +
    • + <%= link_to country.name, + cities_path(region: @current_region.slug, country: country.slug), + class: "#{@current_country == country ? 'active' : ''}" %> +
      • <% end %>
    -
    - <% end %> + <% end %> +
    + + +
    + <%= @cities.count %> <%= 'city'.pluralize(@cities.count) %> + <% if @current_country %> + in <%= @current_country.name %> + <% elsif @current_region %> + in <%= @current_region.name %> + <% end %> +
- -
- Showing <%= @cities.count %> <%= 'city'.pluralize(@cities.count) %> - <% if @current_country %> - in <%= @current_country.name %> - <% elsif @current_region %> - in <%= @current_region.name %> - <% end %> -
- -
<%= render partial: 'city', collection: @cities %>