Separate page to manage a complete filter, presenting all available options
This commit is contained in:
parent
bc81a2fb9c
commit
a57b376151
@ -97,9 +97,8 @@ body.events.index table
|
|||||||
color: black
|
color: black
|
||||||
font-weight: bolder
|
font-weight: bolder
|
||||||
|
|
||||||
.formats
|
.links
|
||||||
float: right
|
float: right
|
||||||
font-size: smaller
|
|
||||||
margin-right: 5%
|
margin-right: 5%
|
||||||
padding-right: 2px
|
padding-right: 2px
|
||||||
|
|
||||||
@ -108,7 +107,7 @@ a#banner
|
|||||||
margin-left: 5%
|
margin-left: 5%
|
||||||
padding-left: 2px
|
padding-left: 2px
|
||||||
|
|
||||||
body.events.show, body.orgas.show, body.tags.show
|
body.events.show, body.orgas.show, body.tags.show, body.filter
|
||||||
main
|
main
|
||||||
padding: 1em
|
padding: 1em
|
||||||
max-width: 60em
|
max-width: 60em
|
||||||
|
@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
form#orga_search
|
form#orga_search
|
||||||
right: 0
|
right: 0
|
||||||
.formats, a#banner
|
.links, a#banner
|
||||||
margin: 0.6em auto
|
margin: 0.6em auto
|
||||||
|
|
||||||
table, table.list, table.dates, table.list.dates
|
table, table.list, table.dates, table.list.dates
|
||||||
@ -107,7 +107,7 @@
|
|||||||
aside
|
aside
|
||||||
display: none
|
display: none
|
||||||
|
|
||||||
.formats, a#banner
|
.links, a#banner
|
||||||
float: none
|
float: none
|
||||||
padding: 0.4em 0
|
padding: 0.4em 0
|
||||||
|
|
||||||
|
9
app/views/application/filter.haml
Normal file
9
app/views/application/filter.haml
Normal file
@ -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'
|
@ -29,8 +29,7 @@
|
|||||||
.day_number= date.day
|
.day_number= date.day
|
||||||
%ul.events.fa-ul= render month_events(@events, date)
|
%ul.events.fa-ul= render month_events(@events, date)
|
||||||
|
|
||||||
.formats
|
.links
|
||||||
%em.fa.fa-rss
|
|
||||||
= raw t '.calendar_in',
|
= raw t '.calendar_in',
|
||||||
rss: link_to('RSS', events_path(:rss,
|
rss: link_to('RSS', events_path(:rss,
|
||||||
tag: params[:tag], region: params[:region])),
|
tag: params[:tag], region: params[:region])),
|
||||||
@ -39,6 +38,12 @@
|
|||||||
ical: link_to('iCal', events_path(:rss,
|
ical: link_to('iCal', events_path(:rss,
|
||||||
tag: params[:tag], format: :ics, region: params[:region]))
|
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')
|
%a#banner(href='http://april.org/campagne')
|
||||||
= image_tag 'priorite-logiciel-libre-je-soutiens-april_2_m.png',
|
= image_tag 'priorite-logiciel-libre-je-soutiens-april_2_m.png',
|
||||||
width: '374', height: '48',
|
width: '374', height: '48',
|
||||||
|
@ -50,9 +50,6 @@
|
|||||||
%em.fa.fa-users
|
%em.fa.fa-users
|
||||||
= t '.propose_orga'
|
= t '.propose_orga'
|
||||||
%br/
|
%br/
|
||||||
= link_to regions_path do
|
|
||||||
%em.fa.fa-rss
|
|
||||||
= t '.feeds'
|
|
||||||
= link_to maps_path do
|
= link_to maps_path do
|
||||||
%em.fa.fa-map-marker
|
%em.fa.fa-map-marker
|
||||||
= t '.map'
|
= t '.map'
|
||||||
|
@ -23,7 +23,6 @@ en:
|
|||||||
suisse: Suisse
|
suisse: Suisse
|
||||||
propose: Propose an event
|
propose: Propose an event
|
||||||
propose_orga: Propose an organisation
|
propose_orga: Propose an organisation
|
||||||
feeds: Feeds
|
|
||||||
map: Map
|
map: Map
|
||||||
tags: Tags
|
tags: Tags
|
||||||
infos: Infos
|
infos: Infos
|
||||||
@ -34,8 +33,9 @@ en:
|
|||||||
title: Hello,
|
title: Hello,
|
||||||
events:
|
events:
|
||||||
index:
|
index:
|
||||||
calendar_in: This calendar in %{rss}, %{webcal} or %{ical}
|
calendar_in: This calendar in <em class='fa fa-rss'></em> %{rss}, %{webcal} or %{ical}
|
||||||
nb_events: "%{count} events"
|
nb_events: "%{count} events"
|
||||||
|
filter: Advanced filter
|
||||||
show:
|
show:
|
||||||
orga-list: Region's orgas
|
orga-list: Region's orgas
|
||||||
add_to_calendar: Add to my calendar
|
add_to_calendar: Add to my calendar
|
||||||
|
@ -23,7 +23,6 @@ fr:
|
|||||||
suisse: Suisse
|
suisse: Suisse
|
||||||
propose: Proposer un événement
|
propose: Proposer un événement
|
||||||
propose_orga: Proposer une organisation
|
propose_orga: Proposer une organisation
|
||||||
feeds: Flux
|
|
||||||
map: Carte
|
map: Carte
|
||||||
tags: Mots-clés
|
tags: Mots-clés
|
||||||
infos: Infos
|
infos: Infos
|
||||||
@ -34,8 +33,9 @@ fr:
|
|||||||
title: Bonjour,
|
title: Bonjour,
|
||||||
events:
|
events:
|
||||||
index:
|
index:
|
||||||
calendar_in: Ce calendrier en %{rss}, %{webcal} ou %{ical}
|
calendar_in: Ce calendrier en <em class='fa fa-rss'></em> %{rss}, %{webcal} ou %{ical}
|
||||||
nb_events: "%{count} événements"
|
nb_events: "%{count} événements"
|
||||||
|
filter: Filtrage avancé
|
||||||
show:
|
show:
|
||||||
orga-list: Orgas de la région
|
orga-list: Orgas de la région
|
||||||
add_to_calendar: Ajouter à mon calendrier
|
add_to_calendar: Ajouter à mon calendrier
|
||||||
|
@ -2,6 +2,7 @@ Rails.application.routes.draw do
|
|||||||
get 'application/infos'
|
get 'application/infos'
|
||||||
get 'application/contact'
|
get 'application/contact'
|
||||||
get 'application/rules'
|
get 'application/rules'
|
||||||
|
get 'application/filter'
|
||||||
get 'stats', to: 'stats#index'
|
get 'stats', to: 'stats#index'
|
||||||
get 'versions', to: 'versions#index'
|
get 'versions', to: 'versions#index'
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user