diff --git a/app/admin/region.rb b/app/admin/region.rb index ba6f3a0c..6103eaaf 100644 --- a/app/admin/region.rb +++ b/app/admin/region.rb @@ -1,3 +1,7 @@ ActiveAdmin.register Region do permit_params :name + + after_update do + expire_fragment 'regions' + end end diff --git a/app/assets/stylesheets/region.css.sass b/app/assets/stylesheets/region.css.sass index 5475099d..703c9109 100644 --- a/app/assets/stylesheets/region.css.sass +++ b/app/assets/stylesheets/region.css.sass @@ -11,7 +11,7 @@ display: none position: absolute list-style: none - margin-top: -1.3em + margin-top: -7em background-color: white @include box-shadow(1px 1px 4px gray) @include border-bottom-left-radius(0.4em) diff --git a/app/views/events/index.html.haml b/app/views/events/index.html.haml index 415915fa..50335a0b 100644 --- a/app/views/events/index.html.haml +++ b/app/views/events/index.html.haml @@ -1,9 +1,8 @@ -# Seems necessary, for the time being, to ensure calendar is changing days correctly - Time.zone = 'Paris' -= render '/regions/selector' - -- cache do +- cache 'regions' do + = render '/regions/selector' = render '/lugs/search' - if params[:year] @@ -47,22 +46,21 @@ %strong.city= event.city.gsub '-', ' ' = event.title -- cache do - .formats - %em.fa.fa-rss - =raw t '.calendar_in', - rss: link_to('RSS', events_url(:rss, - tag: params[:tag], region: params[:region])), - webcal: link_to('webcal', events_url(:rss, - tag: params[:tag], protocol: 'webcal', format: :ics, tag: params[:tag], region: params[:region])), - ical: link_to('iCal', events_url(:rss, - tag: params[:tag], format: :ics, tag: params[:tag], region: params[:region])) +.formats + %em.fa.fa-rss + =raw t '.calendar_in', + rss: link_to('RSS', events_url(:rss, + tag: params[:tag], region: params[:region])), + webcal: link_to('webcal', events_url(:rss, + tag: params[:tag], protocol: 'webcal', format: :ics, tag: params[:tag], region: params[:region])), + ical: link_to('iCal', events_url(:rss, + tag: params[:tag], format: :ics, tag: params[:tag], region: params[:region])) - %a#banner(href='http://april.org/campagne') - -#%img(src='http://www.april.org/campagne/images/priorite-logiciel-libre-je-soutiens-april.png' - width='580' height='76' alt='Priorité au Logiciel Libre! Je soutiens l\'April.') - = image_tag 'priorite-logiciel-libre-je-soutiens-april_2_m.png', - width: '374', height: '48', - alt: 'Priorité au Logiciel Libre! Je soutiens l\'April.' +%a#banner(href='http://april.org/campagne') + -#%img(src='http://www.april.org/campagne/images/priorite-logiciel-libre-je-soutiens-april.png' + width='580' height='76' alt='Priorité au Logiciel Libre! Je soutiens l\'April.') + = image_tag 'priorite-logiciel-libre-je-soutiens-april_2_m.png', + width: '374', height: '48', + alt: 'Priorité au Logiciel Libre! Je soutiens l\'April.' - set_events_meta