From dd03b96e0c911d92707aca2ed29b0ffca2e41ac7 Mon Sep 17 00:00:00 2001 From: Xavier J Date: Wed, 24 Aug 2016 15:17:40 +0200 Subject: [PATCH 1/3] Disabled link on rich textarea --- app/assets/javascripts/bootstrap_wysihtml5.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/assets/javascripts/bootstrap_wysihtml5.js b/app/assets/javascripts/bootstrap_wysihtml5.js index 7537a1656..479404c3c 100644 --- a/app/assets/javascripts/bootstrap_wysihtml5.js +++ b/app/assets/javascripts/bootstrap_wysihtml5.js @@ -3,6 +3,6 @@ $(document).on('page:load', wysihtml5_active); function wysihtml5_active (){ $('.wysihtml5').each(function(i, elem) { - $(elem).wysihtml5({ toolbar:{ "fa": true } }); + $(elem).wysihtml5({ toolbar:{ "fa": true, "link": false } }); }); } \ No newline at end of file From 3ebdab23a9cb320f15f32a13592ed3190570af22 Mon Sep 17 00:00:00 2001 From: Xavier J Date: Wed, 24 Aug 2016 15:32:41 +0200 Subject: [PATCH 2/3] Enable french local on rich textarea --- app/assets/javascripts/bootstrap_wysihtml5.js | 2 +- app/assets/stylesheets/application.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/bootstrap_wysihtml5.js b/app/assets/javascripts/bootstrap_wysihtml5.js index 479404c3c..4f1ed7bcf 100644 --- a/app/assets/javascripts/bootstrap_wysihtml5.js +++ b/app/assets/javascripts/bootstrap_wysihtml5.js @@ -3,6 +3,6 @@ $(document).on('page:load', wysihtml5_active); function wysihtml5_active (){ $('.wysihtml5').each(function(i, elem) { - $(elem).wysihtml5({ toolbar:{ "fa": true, "link": false } }); + $(elem).wysihtml5({ toolbar:{ "fa": true, "link": false, "color": true }, "locale": "fr-FR" }); }); } \ No newline at end of file diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 8f625624f..cb7b0123c 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -18,10 +18,10 @@ *= require leaflet *= require font-awesome *= require franceconnect + *= require bootstrap-wysihtml5 */ @import "bootstrap-sprockets"; @import "bootstrap"; -@import "bootstrap-wysihtml5/bootstrap3-wysihtml5"; body { background-color: rgb(255, 255, 255); From b16c5d7beaf74557b9a2044efcfa592363915954 Mon Sep 17 00:00:00 2001 From: Xavier J Date: Wed, 24 Aug 2016 15:51:16 +0200 Subject: [PATCH 3/3] Renate site web link on etape 1 page. --- app/views/dossiers/etapes/_etape1.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/dossiers/etapes/_etape1.html.haml b/app/views/dossiers/etapes/_etape1.html.haml index b6353413c..70c1e11fb 100644 --- a/app/views/dossiers/etapes/_etape1.html.haml +++ b/app/views/dossiers/etapes/_etape1.html.haml @@ -21,4 +21,4 @@ - unless @facade.procedure.lien_site_web.blank? .center - =link_to truncate(@facade.procedure.lien_site_web, length: 40), @facade.procedure.lien_site_web, {target: '_blank'} \ No newline at end of file + =link_to 'En savoir plus ...', @facade.procedure.lien_site_web, {target: '_blank'} \ No newline at end of file