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

La liste des lug est une sidebar html5

This commit is contained in:
echarp 2014-07-07 22:32:26 +02:00
parent 9f425d9fe4
commit 4cec615f14
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/stylesheets/all.css.sass
View File

@ -111,8 +111,8 @@ main
line-height: 1.3em line-height: 1.3em
p p
margin: 0.95em 0 margin: 0.95em 0
line-height: 1.3em
text-align: justify text-align: justify
line-height: 1.3em
&.label &.label
text-align: center text-align: center
span.label:after span.label:after

11
app/assets/stylesheets/events.css.sass
View File

@ -28,6 +28,11 @@ header.calendar-header
&.year_selector &.year_selector
margin: 0 margin: 0
.events, .event
.city:after
content: ':'
margin-right: -1px
body.events.index table body.events.index table
width: 90% width: 90%
margin-top: 3.5em margin-top: 3.5em
@ -96,9 +101,6 @@ body.events.index table
.event .event
font-size: smaller font-size: smaller
line-height: 1.1em line-height: 1.1em
strong:after
content: ':'
margin-right: -1px
a:link, a:visited a:link, a:visited
color: #111 color: #111
font-weight: normal font-weight: normal
@ -111,7 +113,7 @@ body.events.index table
font-size: smaller font-size: smaller
text-align: right text-align: right
#lug-list sidebar#lug-list
float: right float: right
width: 15em width: 15em
border: 1px solid #96CFFF border: 1px solid #96CFFF
@ -119,6 +121,7 @@ body.events.index table
padding: 5px padding: 5px
font-size: 0.7em font-size: 0.7em
background-color: #D6ECFF background-color: #D6ECFF
@include box-shadow(4px 4px 1em gray)
@include border-radius(10px) @include border-radius(10px)
h1 h1
font-size: 1.22em font-size: 1.22em

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

@ -29,7 +29,7 @@
- events.select { |e| e.start_time.to_date <= date and date <= e.end_time.to_date }.sort_by { |e| e.city }.each do |event| - events.select { |e| e.start_time.to_date <= date and date <= e.end_time.to_date }.sort_by { |e| e.city }.each do |event|
%li.event %li.event
= link_to event do = link_to event do
%strong= event.city.gsub '-', ' ' %strong.city= event.city.gsub '-', ' '
= event.title = event.title
- else - else
@ -42,7 +42,7 @@
- events.select { |e| e.start_time.to_date <= date and date <= e.end_time.to_date }.sort_by { |e| e.city }.each do |event| - events.select { |e| e.start_time.to_date <= date and date <= e.end_time.to_date }.sort_by { |e| e.city }.each do |event|
%li.event %li.event
= link_to event do = link_to event do
%strong= event.city.gsub '-', ' ' %strong.city= event.city.gsub '-', ' '
= event.title = event.title
.formats .formats

3
app/views/events/show.html.haml
View File

@ -1,5 +1,5 @@
%h2 %h2
%em= @event.city + ':' %em.city= @event.city
= @event.title = @event.title
- if @event.persisted? && request.format == 'text/html' && controller.controller_name != 'moderations' && controller.controller_name != 'notes' && controller.action_name != 'edit' && controller.action_name != 'cancel' - if @event.persisted? && request.format == 'text/html' && controller.controller_name != 'moderations' && controller.controller_name != 'notes' && controller.action_name != 'edit' && controller.action_name != 'cancel'
@ -17,6 +17,7 @@
%em.fa.fa-calendar %em.fa.fa-calendar
=t '.add_to_calendar' =t '.add_to_calendar'
- if user_signed_in? - if user_signed_in?
%br/
= link_to edit_moderation_path @event do = link_to edit_moderation_path @event do
%em.fa.fa-pencil %em.fa.fa-pencil
=t '.edit' =t '.edit'