It is now possible to deselect a filtering region

rails5
echarp 5 years ago
parent 85b4ac888f
commit 0c2c80fc32

@ -32,8 +32,8 @@ html
body
border: 1px solid #68A6E5
margin: 0.3em
padding: 2%
margin: 0.2%
padding: 1%
position: relative
background-color: white
header, main, footer
@ -77,11 +77,13 @@ h3.warning
header.top
text-align: left
margin-bottom: 2em
img.logo
float: left
margin-right: 2%
h1
margin: 0
margin-top: 0
margin-bottom: 0.2em
h2
font:
size: inherit

@ -7,18 +7,21 @@
%small
%em.fa.fa-external-link
- else
= link_to region: filter_region.id,
= link_to tag: params[:tag],
region: params[:region].to_i == filter_region.id ? :all : filter_region,
start_date: params[:start_date],
year: params[:year],
tag: params[:tag] do
year: params[:year] do
- if filter_region.code.present?
= flag_icon filter_region.code.downcase
- else
%em.fa.fa-map
%em.fa.fa-shield
= filter_region.name
- if filter_region.regions.present?
- if params[:region].to_i == filter_region.id
%em.fa.fa-close
- elsif filter_region.regions.present?
%small
%em.fa.fa-chevron-down
%ul
= render partial: '/regions/filter_region',
collection: filter_region.regions

File diff suppressed because one or more lines are too long

@ -0,0 +1,23 @@
(function() {
$(document).on('turbolinks:load', function() {
return tinyMCE.init({
schema: 'html5',
height: '40em',
menubar: false,
branding: false,
language: 'fr_FR',
selector: 'input.description',
content_css: '/assets/application-ba1c3eda80784b6eec3860ce601adf04370c8c8b17855bd3438a42dc8a69cfa2.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);
Loading…
Cancel
Save