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

Affichage de la sidebar des evts un peu plus travaillé

Browse Source
This commit is contained in:
echarp 2014-07-20 18:25:16 +02:00
parent 21976ed56b
commit 98e79698a0
2 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,7 +115,7 @@ body.events.index table
sidebar#lug-list sidebar#lug-list
float: right float: right
width: 15em width: 16em
border: 1px solid #96CFFF border: 1px solid #96CFFF
margin: 0 1.2em margin: 0 1.2em
padding: 5px padding: 5px
@ -124,11 +124,15 @@ sidebar#lug-list
@include box-shadow(4px 4px 1em gray) @include box-shadow(4px 4px 1em gray)
@include border-radius(10px) @include border-radius(10px)
h1 h1
font-size: 1.22em
line-height: 1.1em
font-weight: normal font-weight: normal
border-bottom: 1px black solid border-bottom: 1px black solid
padding-bottom: 4px padding-bottom: 0.3em
h2
margin: 0
font-size: larger
a
padding: 0.5em 0
display: block
ul ul
text-align: left text-align: left
line-height: 1.2em line-height: 1.2em

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

@ -4,26 +4,28 @@
- if @event.persisted? && request.format == 'text/html' && controller.controller_name == 'events' && controller.action_name == 'show' - if @event.persisted? && request.format == 'text/html' && controller.controller_name == 'events' && controller.action_name == 'show'
%sidebar#lug-list %sidebar#lug-list
%h1=t '.lug-list' - if @event.related_region.lugs.present?
- if @event.related_region %h1=t '.lug-list'
%ul - if @event.related_region
- @event.related_region.lugs.order(department: :asc).each do |lug| %ul
%li - @event.related_region.lugs.order(department: :asc).each do |lug|
= link_to lug.name, lug.url %li
(#{lug.department}) = link_to lug.name, lug.url
(#{lug.department})
%h1=t '.actions' %h1=t '.actions'
= link_to event_path(@event, protocol: :webcal, format: :ics) do %h2
%em.fa.fa-calendar = link_to event_path @event, protocol: :webcal, format: :ics do
=t '.add_to_calendar' %em.fa.fa-lg.fa-calendar
- if user_signed_in? =t '.add_to_calendar'
%br/ - if user_signed_in?
%h2
= link_to edit_moderation_path @event do = link_to edit_moderation_path @event do
%em.fa.fa-pencil %em.fa.fa-lg.fa-pencil
=t '.edit' =t '.edit'
%br/ %h2
= link_to cancel_event_path @event, secret: @event.secret do = link_to cancel_event_path @event, secret: @event.secret do
%em.fa.fa-thumbs-down %em.fa.fa-lg.fa-thumbs-down
=t '.cancel' =t '.cancel'
%h3=t '.dateAndPlace' %h3=t '.dateAndPlace'