Tags page better displayed

app/assets/stylesheets/all.sass

@@ -145,7 +145,9 @@ aside
   width: 16em
   border: 1px solid #96CFFF
   margin: 0 1.2em
+  z-index: 10
   padding: 5px
+  position: relative
   font-size: 0.7em
   box-shadow: 4px 4px 1em gray
   margin-right: -4em

app/assets/stylesheets/events.sass

@@ -108,13 +108,14 @@ a#banner
   margin-left: 5%
   padding-left: 2px
 
-body.events.show main, body.orgas.show main
+body.events.show, body.orgas.show, body.tags.show
-  padding: 1em
+  main
-  max-width: 60em
+    padding: 1em
-  box-shadow: 1px 1px 5px gray
+    max-width: 60em
-  border-radius: 0.4em
+    box-shadow: 1px 1px 5px gray
-  h2
+    border-radius: 0.4em
-    margin-top: 1em
+    h2
+      margin-top: 1em
 
 #advises
   border: 1px solid #FFB578

app/views/maps/index.html.haml

@@ -2,9 +2,8 @@
   %em.fa.fa-map-marker
   = title t '.title'
   - if params[:tag]
-    «
+    %em.fa.fa-tag
     %em= params[:tag]
-    »
 
 %ul.list#map
   %li
@@ -12,13 +11,12 @@
       .awesome-marker.awesome-marker-icon-blue
         %i.icon-white.fa.fa-calendar
       = Event.model_name.human
-  - markerColors = ['blue', 'red', 'darkred', 'orange', 'green', 'darkgreen',
+  - cs = %w(blue red darkred orange green darkgreen purple darkpuple cadetblue)
-    'purple', 'darkpuple', 'cadetblue']
   - idx = 1
   - Kind.all.each do |kind|
     %li
       = link_to map_path kind.name, format: :json do
-        .awesome-marker{ class: "awesome-marker-icon-#{markerColors[idx % markerColors.length]}" }
+        .awesome-marker{ class: "awesome-marker-icon-#{cs[idx % cs.length]}" }
           %i.icon-white.fa{ class: "fa-#{kind.icon}" }
         = Kind.human_attribute_name("name_#{kind.name}")
       - idx += 1

app/views/maps/show.html.haml

@@ -4,11 +4,10 @@
   %em.fa{ class: "fa-#{@kind.icon}" }
   = Kind.human_attribute_name("name_#{@kind.name}")
   - if params[:tag]
-    «
+    %em.fa.fa-tag
     %em= params[:tag]
-    »
 
-%ul#map.list
+%ul.list#map
   %li
     = link_to map_path @kind.name, format: :json do
       %em.fa{ class: "fa-#{@kind.icon}" }

app/views/orgas/show.html.haml

@@ -23,24 +23,20 @@
         = link_to events_path tag: @orga.name_as_tag do
           %em.fa.fa-li.fa-calendar
           Agenda
-
       %li
-        = link_to events_path format: :rss, tag: @orga.name_as_tag  do
+        = link_to events_path format: :rss, tag: @orga.name_as_tag do
           %em.fa.fa-li.fa-rss
           RSS
-
       %li
-        = link_to events_path format: :ics, tag: @orga.name_as_tag  do
+        = link_to events_path format: :ics, tag: @orga.name_as_tag do
           %em.fa.fa-li.fa-th-list
           iCal
-
       %li
-        = link_to maps_path tag: @orga.name_as_tag  do
+        = link_to maps_path tag: @orga.name_as_tag do
           %em.fa.fa-li.fa-map-marker
           OpenStreetMap
-
       %li
-        = link_to maps_path format: :json, tag: @orga.name_as_tag  do
+        = link_to maps_path format: :json, tag: @orga.name_as_tag do
           %em.fa.fa-li.fa-dot-circle-o
           GeoJSON
 

app/views/tags/show.html.haml

@@ -1,65 +1,63 @@
 %h2
-  = t '.title'
+  %em.fa.fa-tag
-  «
+  %em= title params[:id]
-  %em= params[:id]
-  »
 
-%nav
+%aside
-  = link_to tags_path, class: :back do
+  %h1
-    %em.fa.fa-arrow-left
+    %em.fa.fa-link
-    = Event.human_attribute_name(:tag).pluralize
+    = t '.links'
-  \/
+
-  = link_to events_path tag: params[:id] do
+  %ul.fa-ul
-    %em.fa.fa-calendar
+    %li
-    Agenda
+      = link_to tags_path, class: :back do
-  \/
+        %em.fa.fa-li.fa-arrow-left
-  = link_to events_path format: :rss, tag: params[:id] do
+        = Event.human_attribute_name :tags
-    %em.fa.fa-rss
+    %li
-    RSS
+      = link_to events_path tag: params[:id] do
-  \/
+        %em.fa.fa-li.fa-calendar
-  = link_to events_path format: :ics, tag: params[:id] do
+        Agenda
-    %em.fa.fa-th-list
+    %li
-    iCal
+      = link_to events_path format: :rss, tag: params[:id] do
-  \/
+        %em.fa.fa-li.fa-rss
-  = link_to maps_path tag: params[:id] do
+        RSS
-    %em.fa.fa-map-marker
+    %li
-    OpenStreetMap
+      = link_to events_path format: :ics, tag: params[:id] do
-  \/
+        %em.fa.fa-li.fa-th-list
-  = link_to maps_path format: :json, tag: params[:id] do
+        iCal
-    %em.fa.fa-dot-circle-o
+    %li
-    GeoJSON
+      = link_to maps_path tag: params[:id] do
+        %em.fa.fa-li.fa-map-marker
+        OpenStreetMap
+    %li
+      = link_to maps_path format: :json, tag: params[:id] do
+        %em.fa.fa-li.fa-dot-circle-o
+        GeoJSON
 
 - if @events_future.any? || @events_past.any?
-  %fieldset
+  - if @events_future.any?
-    %legend
+    %h3= raw t '.future'
-      %em.fa.fa-calendar
+    %ul.fa-ul
-      = Event.model_name.human.pluralize
+      - @events_future.order('start_time asc').each do |event|
-    - if @events_future.any?
+        %li
-      %h3=raw t 'future', count: @events_future.count
+          = link_to event do
-      %ul.fa-ul
+            - if event.locality?
-        - @events_future.order('start_time asc').each do |event|
+              %em.locality.fa-li.fa.fa-globe
-          %li
+            - else
-            = link_to event do
+              %em.locality.fa-li.fa.fa-shield
-              - if event.locality?
+            %em.city= event.city
-                %em.locality.fa-li.fa.fa-globe(title="#{Event.human_attribute_name :locality} #{t 'attributes.locality_1'}")
+            = event.title
-              - else
+          .date= display_date event
-                %em.locality.fa-li.fa.fa-shield(title="#{Event.human_attribute_name :locality} #{t 'attributes.locality_0'}")
-              %em.city= event.city
-              = event.title
-            .date= display_date event
 
-    - if @events_past.any?
+  - if @events_past.any?
-      %h3=raw t 'past', count: @events_past.count
+    %h3= raw t '.past'
-      %ul.fa-ul
+    %ul.fa-ul
-        - @events_past.order('start_time desc').each do |event|
+      - @events_past.order('start_time desc').each do |event|
-          %li
+        %li
-            = link_to event do
+          = link_to event do
-              - if event.locality?
+            - if event.locality?
-                %em.locality.fa-li.fa.fa-globe(title="#{Event.human_attribute_name :locality} #{t 'attributes.locality_1'}")
+              %em.locality.fa-li.fa.fa-globe
-              - else
+            - else
-                %em.locality.fa-li.fa.fa-shield(title="#{Event.human_attribute_name :locality} #{t 'attributes.locality_0'}")
+              %em.locality.fa-li.fa.fa-shield
-              %em.city= event.city
+            %em.city= event.city
-              = event.title
+            = event.title
-            .date= display_date event
+          .date= display_date event
-
-#map.events(data-url="#{maps_path format: :json, tag: params[:id]}")

config/locales/views/en.yml

@@ -155,7 +155,9 @@ it more readable or agreable.
       title: Tags
       limited: Only tags on more than three events are displayed in this list
     show:
-      title: Events
+      links: See also
+      future: Future
+      past: Past
   moderations:
     index:
       title: Events to moderate
@@ -246,7 +248,7 @@ description."
       title: Organisations
       new: Add an organisation
     show:
-      links: Links
+      links: See also
       actions: Actions
       edit: Edit
       cancel: Delete

config/locales/views/fr.yml

@@ -152,7 +152,9 @@ fr:
       limited: Seuls les mots-clés portants sur plus de trois évènements sont
         affichés dans cette liste
     show:
-      title: Les événements
+      links: Voir aussi
+      future: Prochainement
+      past: Dans le passé
   moderations:
     index:
       title: Événements à modérer
@@ -247,7 +249,7 @@ description plus complète."
       title: Organisations
       new: Ajouter une organisation
     show:
-      links: Liens
+      links: Voir aussi
       actions: Actions
       edit: Éditer
       cancel: Supprimer

public/assets/tinymce-a36e07dc18d23c81ef995801b85eddf709542fbf72f7122fc4775d15af1f5f3e.js

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