diff --git a/app/assets/stylesheets/events.sass b/app/assets/stylesheets/events.sass
index 88599525..caf59557 100644
--- a/app/assets/stylesheets/events.sass
+++ b/app/assets/stylesheets/events.sass
@@ -97,9 +97,8 @@ body.events.index table
color: black
font-weight: bolder
-.formats
+.links
float: right
- font-size: smaller
margin-right: 5%
padding-right: 2px
@@ -108,7 +107,7 @@ a#banner
margin-left: 5%
padding-left: 2px
-body.events.show, body.orgas.show, body.tags.show
+body.events.show, body.orgas.show, body.tags.show, body.filter
main
padding: 1em
max-width: 60em
diff --git a/app/assets/stylesheets/mobile.sass b/app/assets/stylesheets/mobile.sass
index f0e3976b..663b3e2b 100644
--- a/app/assets/stylesheets/mobile.sass
+++ b/app/assets/stylesheets/mobile.sass
@@ -14,7 +14,7 @@
form#orga_search
right: 0
- .formats, a#banner
+ .links, a#banner
margin: 0.6em auto
table, table.list, table.dates, table.list.dates
@@ -107,7 +107,7 @@
aside
display: none
- .formats, a#banner
+ .links, a#banner
float: none
padding: 0.4em 0
diff --git a/app/views/application/filter.haml b/app/views/application/filter.haml
new file mode 100644
index 00000000..8c886292
--- /dev/null
+++ b/app/views/application/filter.haml
@@ -0,0 +1,9 @@
+= form_for :event do |f|
+ .field.tag
+ = f.label :tag
+ = f.text_field :tag
+
+ .actions
+ = f.button do
+ %em.fa.fa-check
+ = t '.filter'
diff --git a/app/views/events/index.html.haml b/app/views/events/index.html.haml
index 49e5d607..69b65058 100644
--- a/app/views/events/index.html.haml
+++ b/app/views/events/index.html.haml
@@ -29,8 +29,7 @@
.day_number= date.day
%ul.events.fa-ul= render month_events(@events, date)
-.formats
- %em.fa.fa-rss
+.links
= raw t '.calendar_in',
rss: link_to('RSS', events_path(:rss,
tag: params[:tag], region: params[:region])),
@@ -39,6 +38,12 @@
ical: link_to('iCal', events_path(:rss,
tag: params[:tag], format: :ics, region: params[:region]))
+ \-
+
+ = link_to application_filter_path do
+ %em.fa.fa-filter
+ = t '.filter'
+
%a#banner(href='http://april.org/campagne')
= image_tag 'priorite-logiciel-libre-je-soutiens-april_2_m.png',
width: '374', height: '48',
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 340bd120..fd5f2cb9 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -50,9 +50,6 @@
%em.fa.fa-users
= t '.propose_orga'
%br/
- = link_to regions_path do
- %em.fa.fa-rss
- = t '.feeds'
= link_to maps_path do
%em.fa.fa-map-marker
= t '.map'
diff --git a/config/locales/views/en.yml b/config/locales/views/en.yml
index d2884e93..d16eb7e4 100644
--- a/config/locales/views/en.yml
+++ b/config/locales/views/en.yml
@@ -23,7 +23,6 @@ en:
suisse: Suisse
propose: Propose an event
propose_orga: Propose an organisation
- feeds: Feeds
map: Map
tags: Tags
infos: Infos
@@ -34,8 +33,9 @@ en:
title: Hello,
events:
index:
- calendar_in: This calendar in %{rss}, %{webcal} or %{ical}
+ calendar_in: This calendar in %{rss}, %{webcal} or %{ical}
nb_events: "%{count} events"
+ filter: Advanced filter
show:
orga-list: Region's orgas
add_to_calendar: Add to my calendar
diff --git a/config/locales/views/fr.yml b/config/locales/views/fr.yml
index fd157971..9304b12e 100644
--- a/config/locales/views/fr.yml
+++ b/config/locales/views/fr.yml
@@ -23,7 +23,6 @@ fr:
suisse: Suisse
propose: Proposer un événement
propose_orga: Proposer une organisation
- feeds: Flux
map: Carte
tags: Mots-clés
infos: Infos
@@ -34,8 +33,9 @@ fr:
title: Bonjour,
events:
index:
- calendar_in: Ce calendrier en %{rss}, %{webcal} ou %{ical}
+ calendar_in: Ce calendrier en %{rss}, %{webcal} ou %{ical}
nb_events: "%{count} événements"
+ filter: Filtrage avancé
show:
orga-list: Orgas de la région
add_to_calendar: Ajouter à mon calendrier
diff --git a/config/routes.rb b/config/routes.rb
index 5641272e..132614f2 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -2,6 +2,7 @@ Rails.application.routes.draw do
get 'application/infos'
get 'application/contact'
get 'application/rules'
+ get 'application/filter'
get 'stats', to: 'stats#index'
get 'versions', to: 'versions#index'