From ed1c1d6ed0dc74515fa4b8df2b0cdcefe9a3ba3e Mon Sep 17 00:00:00 2001 From: echarp Date: Sun, 14 Dec 2014 11:36:56 +0100 Subject: [PATCH] Cleaning main layout --- app/views/layouts/application.html.haml | 32 +++++++++++++------------ 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index f934cfde..83111668 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -1,6 +1,6 @@ !!! 5 /[if IE] -%html.no-js(lang="#{I18n.locale}") +%html.no-js{ lang: I18n.locale } %head %meta(charset='utf-8') %meta(name='viewport' content='width=device-width, initial-scale=1.0') @@ -9,13 +9,15 @@ = display_meta_tags site: t('.title') = favicon_link_tag '/favicon.ico' - = auto_discovery_link_tag :rss, { controller: '/events', format: :rss } + = auto_discovery_link_tag :rss, controller: '/events', format: :rss - = stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true - = javascript_include_tag 'application', 'data-turbolinks-track' => true + = stylesheet_link_tag 'application', media: 'all', + 'data-turbolinks-track' => true + = javascript_include_tag 'application', 'data-turbolinks-track' => true, + type: 'text/javascript' = csrf_meta_tags - %body(class = "#{controller.controller_name} #{controller.action_name}") + %body{ class: controller.controller_name + ' ' + controller.action_name } %header.top = image_tag 'baby_gnu_adl.png', alt: 'Baby GNU', class: :logo, width: 100, height: 83 @@ -31,7 +33,7 @@ = link_to t('.suisse'), 'http://www.agendadulibre.ch' %h1= link_to t('.title'), root_path - %h2=t '.subtitle' + %h2= t '.subtitle' = render 'layouts/flash', flash: flash if flash.present? @@ -41,30 +43,30 @@ %nav = link_to new_event_path do %em.fa.fa-pencil - =t '.propose' + = t '.propose' = link_to regions_path do %em.fa.fa-rss - =t '.feeds' + = t '.feeds' = link_to maps_path do %em.fa.fa-map-marker - =t '.map' + = t '.map' = link_to tags_path do %em.fa.fa-tags - =t '.tags' + = t '.tags' = link_to lugs_path do %em.fa.fa-users = Lug.model_name.human.pluralize = link_to application_infos_path do %em.fa.fa-info - =t '.infos' + = t '.infos' = link_to stats_path do %em.fa.fa-signal - =t '.stats' + = t '.stats' = link_to application_contact_path do %em.fa.fa-envelope - =t '.contact' + = t '.contact' = link_to moderations_path do %em.fa.fa-gavel - =t '.moderation' + = t '.moderation' - %em#loading.fa.fa-spin.fa-circle-o-notch + %em.fa.fa-spin.fa-circle-o-notch#loading