From 7793de5e3499d4ac869b2dc82d3a51bf3a4f90fa Mon Sep 17 00:00:00 2001 From: echarp Date: Thu, 16 Jan 2020 21:08:48 +0100 Subject: [PATCH] Moved orga flag after its region --- app/views/orgas/_orga.html.haml | 2 +- app/views/orgas/index.html.haml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/views/orgas/_orga.html.haml b/app/views/orgas/_orga.html.haml index ce4aca25..03586ed4 100644 --- a/app/views/orgas/_orga.html.haml +++ b/app/views/orgas/_orga.html.haml @@ -1,5 +1,4 @@ %tr{ class: orga.active ? 'active' : 'inactive' } - %td.flag= flag_icon orga.region.flag %td.kind - if orga.kind %em.fa{ class: "fa-#{orga.kind.icon}", @@ -9,6 +8,7 @@ = render partial: '/orgas/favicon', locals: { orga: orga } %td.city= orga.city %td.region= orga.region + %td.flag= flag_icon orga.region.flag %td.updated_at - if orga.updated_at.present? = l orga.updated_at.to_date diff --git a/app/views/orgas/index.html.haml b/app/views/orgas/index.html.haml index bdd05e4f..4d8914c0 100644 --- a/app/views/orgas/index.html.haml +++ b/app/views/orgas/index.html.haml @@ -8,10 +8,9 @@ %table.list.autopagerize_page_element %thead - %th.flag %th.name(colspan='2')= sort_link @search, :name %th.city= sort_link @search, :city - %th.region= sort_link @search, + %th.region(colspan='2')= sort_link @search, :region_name, Orga.human_attribute_name(:region) %th.updated_at= sort_link @search, :updated_at