agenda-libre/agenda-libre-ruby
agenda-libre/agenda-libre-ruby
2
1
Fork 0
Code Issues Pull Requests Releases Activity

Separate page to manage a complete filter, presenting all available options

Browse Source
This commit is contained in:
echarp 2016-10-21 13:46:32 +02:00
parent bc81a2fb9c
commit a57b376151
8 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/stylesheets/events.sass
View File

@ -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

4
app/assets/stylesheets/mobile.sass
View File

@ -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

9
app/views/application/filter.haml Normal file
View 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'

9
app/views/events/index.html.haml
View File

@ -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',

3
app/views/layouts/application.html.haml
View File

@ -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'

4
config/locales/views/en.yml
View File

@ -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 <em class='fa fa-rss'></em> %{rss}, %{webcal} or %{ical}
nb_events: "%{count} events"
filter: Advanced filter
show:
orga-list: Region's orgas
add_to_calendar: Add to my calendar

4
config/locales/views/fr.yml
View File

@ -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 <em class='fa fa-rss'></em> %{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

1
config/routes.rb
View File

@ -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'