diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 1721c53869ef92a27226ff6c84d6b3399c2af374..e670b14f936a420a1919d04382877ea582c02915 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -3,3 +3,4 @@ //= require jquery3 //= require jquery_ujs //= require simple_form_password_with_hints +//= require simple_form_image_fields diff --git a/app/assets/stylesheets/application.sass b/app/assets/stylesheets/application.sass index 7a34d970b827cd180c92a73f7ea223b45eaed9bd..3a8a5e8e45c83528c846835eee821353bfb85eac 100644 --- a/app/assets/stylesheets/application.sass +++ b/app/assets/stylesheets/application.sass @@ -1,5 +1,6 @@ @import 'bootstrap' @import 'appstack/light' @import 'simple_form_password_with_hints' +@import 'simple_form_image_fields' @import 'commons/*' @import 'application/*' diff --git a/app/services/wordpress.rb b/app/services/wordpress.rb index 0276618f24f2748c47cb5089a57ddcaba2fd8293..019d7a9623712b16936a31844a71a329553b32a3 100644 --- a/app/services/wordpress.rb +++ b/app/services/wordpress.rb @@ -9,6 +9,7 @@ class Wordpress # https://github.com/rgrove/sanitize def self.clean(html) Sanitize.fragment html, Sanitize::Config::RELAXED + # html end def initialize(domain) diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index abd775049e0c68f9348567946a205c41ac9f4230..ebf5a05b8937f6a32782b492252ebfbf5aa2bd11 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -1,5 +1,5 @@ <h2><%= t('login.not_registered_yet') %></h2> -<p class="float-start"><%= t('login.not_registered_yet_details') %></p> +<p><%= t('login.not_registered_yet_details') %></p> <div class="form-actions text-end"> <%= link_to t("devise.registrations.new.sign_up"), new_registration_path(resource_name), diff --git a/app/views/layouts/devise.html.erb b/app/views/layouts/devise.html.erb index 83e694682bacf3cddd1e19358dc67a508e3ce2e0..c304e6859e4a7c74abed7cfb01da5c1865c20c18 100644 --- a/app/views/layouts/devise.html.erb +++ b/app/views/layouts/devise.html.erb @@ -17,9 +17,6 @@ <h1 class="my-5 py-5 text-center"><%= current_university %></h1> <div class="card"> <div class="card-body text-start"> - <p class="lead mb-5"> - <%= t('login.subtitle') %> - </p> <% unless notice.blank? %> <div class="alert alert-success mt-2" role="alert"><%= notice.html_safe %></div> <% end %> diff --git a/test/models/wordpress_test.rb b/test/models/wordpress_test.rb index e175c55006d15dc2bcbff5c7549e518a6fef5523..d134c97f4f69668db4a516f5e7068a4e3b26709a 100644 --- a/test/models/wordpress_test.rb +++ b/test/models/wordpress_test.rb @@ -1,8 +1,19 @@ require "test_helper" class WordpressTest < ActiveSupport::TestCase - test "the truth" do - assert_equal Wordpress.clean('test'), - 'test' + test "convert apostroph" do + assert_equal Wordpress.clean('Ouverture du CRM pendant les vacances d’Avril'), 'Ouverture du CRM pendant les vacances d’Avril' + end + + test "convert 3 dots" do + assert_equal Wordpress.clean('Le CRM fait le tri dans ses collections … et vous propose une vente de livres'), 'Le CRM fait le tri dans ses collections … et vous propose une vente de livres' + end + + test "convert double quotation marks" do + assert_equal Wordpress.clean('Conférence Joëlle Zask : “Ecologie de la participation”'), 'Conférence Joëlle Zask : “Ecologie de la participationâ€' + end + + test "convert " do + assert_equal Wordpress.clean('TRAVAILLER DEMAIN, Débat – le 10 mai à 18h30'), 'TRAVAILLER DEMAIN, Débat – le 10 mai à 18h30' end end