Calendrier principal: la puce des listes permet de savoir si evt local ou national

This commit is contained in:
echarp 2014-09-27 13:06:11 +02:00
parent 1795ab7e4d
commit 99fb6e2e93
6 changed files with 38 additions and 34 deletions

View File

@ -5,7 +5,6 @@
height: auto height: auto
padding: 0 padding: 0
max-width: 100% max-width: 100%
line-height: 1em
margin-left: auto margin-left: auto
margin-right: auto margin-right: auto
+box-sizing(border-box) +box-sizing(border-box)
@ -13,7 +12,7 @@
html html
color: black color: black
height: 100% height: 100%
line-height: 1.3em text-align: center
font-family: georgia, serif font-family: georgia, serif
background-color: #9CC5EE background-color: #9CC5EE
// Integrating adl in another website // Integrating adl in another website
@ -28,9 +27,8 @@ html
body body
border: 1px solid #68A6E5 border: 1px solid #68A6E5
margin: 0.3em margin: 0.3em
padding: 0 10px 10px 10px padding: 10px
text-align: center padding-top: 0
border-bottom: 0px
background-color: white background-color: white
header, main, footer header, main, footer
* *
@ -71,10 +69,6 @@ h3.warning
+inline-block() +inline-block()
+border-radius(1em) +border-radius(1em)
.fa:before
font-style: normal
font-weight: normal !important
header.top header.top
img.logo img.logo
float: left float: left
@ -84,6 +78,7 @@ header.top
float: right float: right
width: 80px width: 80px
font-size: 0.7em font-size: 0.7em
line-height: 1em
margin-left: 29px margin-left: 29px
margin-right: 11px margin-right: 11px
list-style-type: none list-style-type: none
@ -102,15 +97,14 @@ header.top
content: image-url('suisse.png') content: image-url('suisse.png')
h1 h1
margin: 10px 5px 12px
font-size: 2.1em font-size: 2.1em
padding-top: 10px
letter-spacing: 2px letter-spacing: 2px
h2 h2
font-size: 1.2em font:
font-style: italic size: 1.2em
font-weight: normal style: italic
margin-bottom: 21px weight: normal
margin-top: -0.5em
main, body.mce-content-body main, body.mce-content-body
position: relative position: relative
@ -129,11 +123,8 @@ main, body.mce-content-body
text-align: left text-align: left
li li
margin-left: 2em margin-left: 2em
line-height: 1.3em
p p
margin: 0.95em auto
text-align: justify text-align: justify
line-height: 1.3em
&.label &.label
text-align: center text-align: center
span.label:after span.label:after
@ -143,9 +134,9 @@ main, body.mce-content-body
&.mce-content-body &.mce-content-body
margin: 0 margin: 0
height: 100%
border: solid thin transparent border: solid thin transparent
font-size: initial font-size: initial
min-height: 100%
font-family: georgia, serif font-family: georgia, serif
fieldset fieldset
@ -194,7 +185,6 @@ input, textarea, select, a.button, button, .select2-container ul
cursor: pointer cursor: pointer
padding: 0.2em 0.6em padding: 0.2em 0.6em
font-size: larger font-size: larger
line-height: 1.1em
font-weight: bolder font-weight: bolder
background-color: #9CC5EE background-color: #9CC5EE
+box-shadow(2px 2px 2px gray) +box-shadow(2px 2px 2px gray)

View File

@ -75,14 +75,18 @@ body.events.index table
clear: left clear: left
margin-top: 0 margin-top: 0
margin-left: 0 margin-left: 0
padding-left: 15px padding-left: 0.8em
margin-bottom: 5px margin-bottom: 5px
list-style-type: circle list-style-type: none
li li
color: #444 color: #444
margin: 0 margin: 0
padding: 0 padding: 0
margin-top: 0.38em margin-top: 0.4em
em.fa-li
font-size: smaller
em.fa-li:before
margin-right: -1em
.event .event
font-size: smaller font-size: smaller
@ -135,11 +139,9 @@ aside#lug-list
display: block display: block
ul ul
text-align: left text-align: left
line-height: 1.2em
margin-left: 1em margin-left: 1em
li li
margin-left: 2em margin-left: 2em
line-height: 1.3em
#advises #advises
border: 1px solid #FFB578 border: 1px solid #FFB578
@ -164,7 +166,6 @@ aside#lug-list
.helper p .helper p
color: gray color: gray
margin: 1px 5px 1px 6.6em margin: 1px 5px 1px 6.6em
line-height: 0.9em
label label
width: 6.2em width: 6.2em
+inline-block() +inline-block()

View File

@ -18,6 +18,12 @@
margin: 0 margin: 0
@media all and (max-width: 900px) @media all and (max-width: 900px)
header.top
img.logo
margin-left: 0
ul.countries
margin-right: 0
body body
border: none border: none
margin: 0 margin: 0
@ -35,14 +41,20 @@
border-width: 0 border-width: 0
ul.events ul.events
padding-left: 0 padding-left: 0
li
list-style-type: none
table tr td table tr td
border-width: 0px !important border-width: 0px !important
/* For small screen width */ /* For small screen width */
@media all and (max-width: 34em) @media all and (max-width: 34em)
header.top
img.logo
margin-left: -10px
margin-right: 0
ul.countries
margin-left: 0
margin-right: -10px
form#lug_search form#lug_search
display: none display: none
@ -63,8 +75,6 @@
float: right float: right
ul.events ul.events
margin-left: 1em margin-left: 1em
li
list-style-type: disc
aside aside
display: none display: none

View File

@ -11,7 +11,6 @@
vertical-align: middle vertical-align: middle
.helper p .helper p
margin: 1px 5px 1px 6.6em margin: 1px 5px 1px 6.6em
line-height: 0.9em
label label
width: 8em width: 8em
display: inline-block display: inline-block

View File

@ -36,10 +36,14 @@
next_link: ->(param, date_range) { link_to '>>', next_link: ->(param, date_range) { link_to '>>',
{ param => (date_range.last + 1.day).beginning_of_month, tag: params[:tag], region: params[:region] } } do |date, events| { param => (date_range.last + 1.day).beginning_of_month, tag: params[:tag], region: params[:region] } } do |date, events|
.day_number= date.day .day_number= date.day
%ul.events %ul.events.fa-ul
- events.select { |e| (e.start_time.to_date..e.end_time.to_date).cover? date } - events.select { |e| (e.start_time.to_date..e.end_time.to_date).cover? date }
- .sort_by { |e| e.city }.each do |event| - .sort_by { |e| e.city }.each do |event|
%li.event %li.event
- if event.locality?
%em.fa.fa-li.fa-globe(title="#{Event.human_attribute_name :locality} #{t 'attributes.locality_1'}")
- else
%em.fa.fa-li.fa-shield(title="#{Event.human_attribute_name :locality} #{t 'attributes.locality_0'}")
= link_to event do = link_to event do
%strong.city= event.city %strong.city= event.city
= event.title = event.title

View File

@ -39,7 +39,7 @@ en:
city: City city: City
event: event:
title: Title title: Title
start_time: Beginning start_time: Start
end_time: End end_time: End
description: Description description: Description
address: Address address: Address
@ -66,4 +66,4 @@ en:
event: event:
attributes: attributes:
end_time: end_time:
before_start: can not be before beginning before_start: can not be before start