From d24c1abeb504ecca83e080b42ce6c91df496af20 Mon Sep 17 00:00:00 2001 From: Xavier J Date: Wed, 24 Aug 2016 15:51:40 +0200 Subject: [PATCH] Merge branch 'develop' into staging --- app/assets/javascripts/bootstrap_wysihtml5.js | 2 +- app/assets/stylesheets/application.scss | 2 +- app/views/dossiers/etapes/_etape1.html.haml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/bootstrap_wysihtml5.js b/app/assets/javascripts/bootstrap_wysihtml5.js index 7537a1656..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 } }); + $(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 dd36af17e..8776fbc1f 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); 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