Changes to the main display: the title is flushed left.

Plus the map footer item is moved to be just below the main calendar view

app/assets/javascripts/tinymce.coffee.erb

@@ -1,7 +1,6 @@
 $(document).on 'turbolinks:load', ->
   # Setup the graphical editor for event's description
   tinyMCE.init
-    width: 'auto',
     schema: 'html5',
     branding: false,
     language: 'fr_FR',

app/assets/stylesheets/all.sass

@@ -76,9 +76,10 @@ h3.warning
   border-radius: 1em
 
 header.top
+  text-align: left
   img.logo
-    left: 2%
+    float: left
-    position: absolute
+    margin-right: 2%
   h1
     margin: 0
     font-size: 2.1em

app/assets/stylesheets/form.sass

@@ -31,6 +31,7 @@
     .mce-tinymce
       display: inline-block
       font-size: inherit
+      max-width: 60em
       font-family: inherit
       border-radius: 0.4em
       border-top-left-radius: 0

app/assets/stylesheets/mobile.sass

@@ -21,10 +21,7 @@
 @media all and (max-width: 900px)
   header.top
     nav
-      top: 0
+      font-size: smaller
-      font-size: x-small
-      margin-top: 0
-      margin-right: 0
     h1
       padding-top: 0.5em
 
@@ -50,12 +47,13 @@
     padding-right: 0.4em
 
   header.top
-    img.logo
+    text-align: center
-      float: left
-      position: inherit
     nav
       display: none
+    img.logo
+      margin-right: 0
     h1
+      padding-top: 0
       letter-spacing: initial
     h2
       font-size: initial

app/assets/stylesheets/region.sass

@@ -1,8 +1,5 @@
 .region_selector
-  top: 0.2em
+  float: right
-  right: 4em
-  position: absolute
-  font-size: smaller
   & > ul > li
     float: left
   ul

app/views/events/index.html.haml

@@ -39,6 +39,8 @@
 
 .links
   = raw t '.calendar_in',
+    map: link_to(t('.map'), maps_path(tag: params[:tag],
+      region: params[:region])),
     rss: link_to('RSS', events_path(:rss,
       tag: params[:tag], region: params[:region])),
     webcal: link_to('webcal', events_path(tag: params[:tag],

app/views/layouts/application.html.haml

@@ -41,9 +41,6 @@
           %em.fa.fa-users
           = t '.propose_orga'
         %br/
-        = link_to maps_path do
-          %em.fa.fa-map-marker
-          = t '.map'
         = link_to tags_path do
           %em.fa.fa-tags
           = t '.tags'

app/views/maps/index.html.haml

@@ -1,5 +1,5 @@
 %h2
-  %em.fa.fa-map-marker
+  %em.fa.fa-map
   = title t '.title'
   - if params[:tag]
     %em.fa.fa-tag

app/views/maps/show.html.haml

@@ -1,5 +1,5 @@
 %h2
-  %em.fa.fa-map-marker
+  %em.fa.fa-map
   = t 'layouts.application.map'
   %em.fa{ class: "fa-#{@kind.icon}" }
   = Kind.human_attribute_name("name_#{@kind.name}")

config/locales/views/en.yml

@@ -33,8 +33,9 @@ en:
       title: Hello,
   events:
     index:
-      calendar_in: This calendar in <em class='fa fa-rss'></em> %{rss}, %{webcal} or %{ical}
+      calendar_in: This calendar in <em class='fa fa-map'></em> %{map}, <em class='fa fa-rss'></em> %{rss}, <em class='fa fa-calendar-o'></em> %{webcal}/%{ical}
       nb_events: "%{count} events"
+      map: Map
       filter: Advanced filter
     show:
       orga-list: Region's orgas

config/locales/views/fr.yml

@@ -33,8 +33,9 @@ fr:
       title: Bonjour,
   events:
     index:
-      calendar_in: Ce calendrier en <em class='fa fa-rss'></em> %{rss}, %{webcal} ou %{ical}
+      calendar_in: Ce calendrier en <em class='fa fa-map'></em> %{map}, <em class='fa fa-rss'></em> %{rss}, <em class='fa fa-calendar-o'></em> %{webcal}/%{ical}
       nb_events: "%{count} événements"
+      map: Carte
       filter: Filtrage avancé
     show:
       orga-list: Orgas de la région

config/locales/views/pt-BR.yml

@@ -33,8 +33,9 @@ pt-BR:
       title: Olá,
   events:
     index:
-      calendar_in: Este calendário em <em class='fa fa-rss'></em> %{rss}, %{webcal} ou %{ical}
+      calendar_in: Este calendário em <em class='fa fa-map'></em> %{map}, <em class='fa fa-rss'></em> %{rss}, <em class='fa fa-calendar-o'></em> %{webcal}/%{ical}
       nb_events: "%{count} eventos"
+      map: Mapa
       filter: Busca avançada
     show:
       orga-list: Organizações no estado

public/assets/tinymce-ef62453d1739a00524ac9e2728c031797437ead9168fd84a798098da8a36119a.js

@@ -0,0 +1,21 @@
+(function() {
+  $(document).on('turbolinks:load', function() {
+    return tinyMCE.init({
+      schema: 'html5',
+      branding: false,
+      language: 'fr_FR',
+      selector: 'textarea.description',
+      content_css: '/assets/application-a733393e38ec45263b01a08184b0be59607f000dfc0086333553b222890f5587.css',
+      entity_encoding: 'raw',
+      add_unload_trigger: true,
+      browser_spellcheck: true,
+      toolbar: [' cut copy paste | undo redo | searchreplace | link image media charmap table | code visualblocks preview fullscreen', ' removeformat | bold italic strikethrough | superscript subscript | bullist numlist | alignleft aligncenter alignright alignjustify alignnone | outdent indent'],
+      plugins: 'lists, advlist, autolink, link, image, charmap, paste, print, preview, table, fullscreen, searchreplace, media, insertdatetime, visualblocks, wordcount, contextmenu, code'
+    });
+  });
+
+  $(document).on('turbolinks:before-cache', function() {
+    return tinymce.remove();
+  });
+
+}).call(this);