Sidebar slightly reorganised, to contain links' list

This commit is contained in:
echarp 2018-10-01 14:30:27 +02:00
parent a372b962ab
commit 901de334ef
4 changed files with 48 additions and 57 deletions

View File

@ -104,26 +104,20 @@ main, body.mce-content-body
aside aside
float: right float: right
width: 16em
border: 1px solid #96CFFF border: 1px solid #96CFFF
margin: 0 1.2em margin: 0 1.2em
z-index: 10 z-index: 10
padding: 5px padding: 5px
position: relative position: relative
font-size: smaller
box-shadow: 4px 4px 1em gray box-shadow: 4px 4px 1em gray
margin-right: -4em margin-right: -4em
border-radius: 1em border-radius: 1em
background-color: #D6ECFF background-color: #D6ECFF
h1 h2
font-weight: normal
border-bottom: 1px black solid border-bottom: 1px black solid
padding-bottom: 0.3em padding-bottom: 0.3em
h2 ul a
margin: 0 padding: 0.5em 1em 0.5em 0
font-size: larger
a
padding: 0.5em 0
display: block display: block
fieldset fieldset

View File

@ -111,8 +111,5 @@
body body
font-size: larger font-size: larger
aside#orga-list
width: auto
#advises #advises
max-width: 60em max-width: 60em

View File

@ -1,6 +1,6 @@
%aside#orga-list %aside#orga-list
- if @event.region.present? && @event.region.orgas.present? - if @event.region.present? && @event.region.orgas.present?
%h1{ title: @event.region } %h2
= link_to orgas_path region: @event.region do = link_to orgas_path region: @event.region do
%em.fa.fa-users %em.fa.fa-users
= t '.orga-list' = t '.orga-list'
@ -14,14 +14,15 @@
= orga.name = orga.name
= image_tag orga.url + '/favicon.ico', alt: '', class: :favicon = image_tag orga.url + '/favicon.ico', alt: '', class: :favicon
%h1 %h2
%em.fa.fa-wrench %em.fa.fa-wrench
= t '.actions' = t '.actions'
%h2 %ul.fa-ul
%li
= link_to event_path @event, protocol: :webcal, format: :ics do = link_to event_path @event, protocol: :webcal, format: :ics do
%em.fa.fa-lg.fa-calendar %em.fa.fa-li.fa-calendar
= t '.add_to_calendar' = t '.add_to_calendar'
%h2 %li
= link_to preview_events_path(event: { title: @event.title, = link_to preview_events_path(event: { title: @event.title,
start_time: @event.start_time + 1.month, start_time: @event.start_time + 1.month,
end_time: @event.end_time + 1.month, end_time: @event.end_time + 1.month,
@ -34,14 +35,14 @@
url: @event.url, url: @event.url,
tag_list: @event.tag_list.to_s }), tag_list: @event.tag_list.to_s }),
method: :post do method: :post do
%em.fa.fa-copy %em.fa.fa-li.fa-copy
= t '.copy' = t '.copy'
- if user_signed_in? - if user_signed_in?
%h2 %li
= link_to edit_moderation_path @event do = link_to edit_moderation_path @event do
%em.fa.fa-lg.fa-edit %em.fa.fa-li.fa-edit
= t '.edit' = t '.edit'
%h2 %li
= link_to cancel_event_path @event, secret: @event.secret do = link_to cancel_event_path @event, secret: @event.secret do
%em.fa.fa-lg.fa-thumbs-down %em.fa.fa-li.fa-thumbs-down
= t '.cancel' = t '.cancel'

View File

@ -1,12 +1,11 @@
%aside %aside
%h1 %h2
%em.fa.fa-link %em.fa.fa-link
= t '.links' = t '.links'
%ul.fa-ul %ul.fa-ul
%li %li
= link_to orgas_path(q: params[:q], page: params[:page]), = link_to orgas_path q: params[:q], page: params[:page] do
class: :back do
%em.fa.fa-li.fa-arrow-left %em.fa.fa-li.fa-arrow-left
= Orga.model_name.human.pluralize = Orga.model_name.human.pluralize
%li %li
@ -35,16 +34,16 @@
GeoJSON GeoJSON
- if @orga.secret.nil? || user_signed_in? - if @orga.secret.nil? || user_signed_in?
%h1 %h2
%em.fa.fa-wrench %em.fa.fa-wrench
= t '.actions' = t '.actions'
%h2 %ul.fa-ul
%li
= link_to edit_orga_path @orga do = link_to edit_orga_path @orga do
%em.fa.fa-lg.fa-edit %em.fa.fa-li.fa-edit
= t '.edit' = t '.edit'
- if user_signed_in? - if user_signed_in?
%h2 %li
= link_to cancel_orga_path @orga do = link_to cancel_orga_path @orga do
%em.fa.fa-lg.fa-thumbs-down %em.fa.fa-li.fa-thumbs-down
= t '.cancel' = t '.cancel'