Merge branch 'develop' into staging

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" });
     });
 }

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);

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'}
+          =link_to 'En savoir plus ...', @facade.procedure.lien_site_web, {target: '_blank'}