diff --git a/Gemfile.lock b/Gemfile.lock
index 460669c3d914c470dd87d4c097aebfb98db767b4..c5d305cc298cdbb20bae089fde0b67bcd9fa6b23 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -12,60 +12,60 @@ GIT
GEM
remote: https://rubygems.org/
specs:
- actioncable (6.1.4.1)
- actionpack (= 6.1.4.1)
- activesupport (= 6.1.4.1)
+ actioncable (6.1.4.4)
+ actionpack (= 6.1.4.4)
+ activesupport (= 6.1.4.4)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
- actionmailbox (6.1.4.1)
- actionpack (= 6.1.4.1)
- activejob (= 6.1.4.1)
- activerecord (= 6.1.4.1)
- activestorage (= 6.1.4.1)
- activesupport (= 6.1.4.1)
+ actionmailbox (6.1.4.4)
+ actionpack (= 6.1.4.4)
+ activejob (= 6.1.4.4)
+ activerecord (= 6.1.4.4)
+ activestorage (= 6.1.4.4)
+ activesupport (= 6.1.4.4)
mail (>= 2.7.1)
- actionmailer (6.1.4.1)
- actionpack (= 6.1.4.1)
- actionview (= 6.1.4.1)
- activejob (= 6.1.4.1)
- activesupport (= 6.1.4.1)
+ actionmailer (6.1.4.4)
+ actionpack (= 6.1.4.4)
+ actionview (= 6.1.4.4)
+ activejob (= 6.1.4.4)
+ activesupport (= 6.1.4.4)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
- actionpack (6.1.4.1)
- actionview (= 6.1.4.1)
- activesupport (= 6.1.4.1)
+ actionpack (6.1.4.4)
+ actionview (= 6.1.4.4)
+ activesupport (= 6.1.4.4)
rack (~> 2.0, >= 2.0.9)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0)
- actiontext (6.1.4.1)
- actionpack (= 6.1.4.1)
- activerecord (= 6.1.4.1)
- activestorage (= 6.1.4.1)
- activesupport (= 6.1.4.1)
+ actiontext (6.1.4.4)
+ actionpack (= 6.1.4.4)
+ activerecord (= 6.1.4.4)
+ activestorage (= 6.1.4.4)
+ activesupport (= 6.1.4.4)
nokogiri (>= 1.8.5)
- actionview (6.1.4.1)
- activesupport (= 6.1.4.1)
+ actionview (6.1.4.4)
+ activesupport (= 6.1.4.4)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0)
- activejob (6.1.4.1)
- activesupport (= 6.1.4.1)
+ activejob (6.1.4.4)
+ activesupport (= 6.1.4.4)
globalid (>= 0.3.6)
- activemodel (6.1.4.1)
- activesupport (= 6.1.4.1)
- activerecord (6.1.4.1)
- activemodel (= 6.1.4.1)
- activesupport (= 6.1.4.1)
- activestorage (6.1.4.1)
- actionpack (= 6.1.4.1)
- activejob (= 6.1.4.1)
- activerecord (= 6.1.4.1)
- activesupport (= 6.1.4.1)
+ activemodel (6.1.4.4)
+ activesupport (= 6.1.4.4)
+ activerecord (6.1.4.4)
+ activemodel (= 6.1.4.4)
+ activesupport (= 6.1.4.4)
+ activestorage (6.1.4.4)
+ actionpack (= 6.1.4.4)
+ activejob (= 6.1.4.4)
+ activerecord (= 6.1.4.4)
+ activesupport (= 6.1.4.4)
marcel (~> 1.0.0)
mini_mime (>= 1.1.0)
- activesupport (6.1.4.1)
+ activesupport (6.1.4.4)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
@@ -79,16 +79,16 @@ GEM
autoprefixer-rails (10.3.3.0)
execjs (~> 2)
aws-eventstream (1.2.0)
- aws-partitions (1.525.0)
- aws-sdk-core (3.122.0)
+ aws-partitions (1.541.0)
+ aws-sdk-core (3.124.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.525.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
- aws-sdk-kms (1.51.0)
+ aws-sdk-kms (1.52.0)
aws-sdk-core (~> 3, >= 3.122.0)
aws-sigv4 (~> 1.1)
- aws-sdk-s3 (1.105.1)
+ aws-sdk-s3 (1.109.0)
aws-sdk-core (~> 3, >= 3.122.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.4)
@@ -96,7 +96,7 @@ GEM
aws-eventstream (~> 1, >= 1.0.2)
bcrypt (3.1.16)
bindex (0.8.1)
- bootsnap (1.9.1)
+ bootsnap (1.9.3)
msgpack (~> 1.0)
bootstrap (5.1.3)
autoprefixer-rails (>= 9.1.0)
@@ -107,7 +107,7 @@ GEM
rails (>= 3.1)
breadcrumbs_on_rails (4.1.0)
railties (>= 5.0)
- bugsnag (6.24.0)
+ bugsnag (6.24.1)
concurrent-ruby (~> 1.0)
builder (3.2.4)
byebug (11.1.3)
@@ -123,8 +123,8 @@ GEM
xpath (~> 3.2)
childprocess (4.1.0)
concurrent-ruby (1.1.9)
- countries (4.0.1)
- i18n_data (~> 0.13.0)
+ countries (4.1.1)
+ i18n_data (~> 0.13.1)
sixarm_ruby_unaccent (~> 1.1)
country_select (6.0.0)
countries (~> 4.0)
@@ -143,7 +143,7 @@ GEM
delayed_job (> 2.0.3)
rack-protection (>= 1.5.5)
sinatra (>= 1.4.4)
- devise (4.8.0)
+ devise (4.8.1)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 4.1.0)
@@ -190,7 +190,7 @@ GEM
faraday-rack (1.0.0)
faraday_middleware (1.2.0)
faraday (~> 1.0)
- fastimage (2.2.5)
+ fastimage (2.2.6)
ffi (1.15.4)
figaro (1.2.0)
thor (>= 0.14.0, < 2)
@@ -199,17 +199,17 @@ GEM
js_cookie_rails
rails
sassc-rails
- globalid (0.5.2)
+ globalid (1.0.0)
activesupport (>= 5.0)
http-cookie (1.0.4)
domain_name (~> 0.5)
i18n (1.8.11)
concurrent-ruby (~> 1.0)
- i18n_data (0.13.0)
+ i18n_data (0.13.1)
image_processing (1.12.1)
mini_magick (>= 4.9.5, < 5)
ruby-vips (>= 2.0.17, < 3)
- jbuilder (2.11.2)
+ jbuilder (2.11.4)
activesupport (>= 5.0.0)
jmespath (1.4.0)
jquery-rails (4.4.0)
@@ -219,7 +219,7 @@ GEM
js_cookie_rails (2.2.0)
railties (>= 3.1)
json (2.6.1)
- kamifusen (1.10.1)
+ kamifusen (1.10.6)
image_processing
rails
kaminari (1.2.1)
@@ -237,7 +237,7 @@ GEM
listen (3.7.0)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
- loofah (2.12.0)
+ loofah (2.13.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
@@ -258,7 +258,7 @@ GEM
mini_magick (4.11.0)
mini_mime (1.1.2)
mini_portile2 (2.6.1)
- minitest (5.14.4)
+ minitest (5.15.0)
msgpack (1.4.2)
multipart-post (2.1.1)
mustermann (1.1.1)
@@ -285,20 +285,20 @@ GEM
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
- rails (6.1.4.1)
- actioncable (= 6.1.4.1)
- actionmailbox (= 6.1.4.1)
- actionmailer (= 6.1.4.1)
- actionpack (= 6.1.4.1)
- actiontext (= 6.1.4.1)
- actionview (= 6.1.4.1)
- activejob (= 6.1.4.1)
- activemodel (= 6.1.4.1)
- activerecord (= 6.1.4.1)
- activestorage (= 6.1.4.1)
- activesupport (= 6.1.4.1)
+ rails (6.1.4.4)
+ actioncable (= 6.1.4.4)
+ actionmailbox (= 6.1.4.4)
+ actionmailer (= 6.1.4.4)
+ actionpack (= 6.1.4.4)
+ actiontext (= 6.1.4.4)
+ actionview (= 6.1.4.4)
+ activejob (= 6.1.4.4)
+ activemodel (= 6.1.4.4)
+ activerecord (= 6.1.4.4)
+ activestorage (= 6.1.4.4)
+ activesupport (= 6.1.4.4)
bundler (>= 1.15.0)
- railties (= 6.1.4.1)
+ railties (= 6.1.4.4)
sprockets-rails (>= 2.0.0)
rails-dom-testing (2.0.3)
activesupport (>= 4.2.0)
@@ -308,9 +308,9 @@ GEM
rails-i18n (6.0.0)
i18n (>= 0.7, < 2)
railties (>= 6.0.0, < 7)
- railties (6.1.4.1)
- actionpack (= 6.1.4.1)
- activesupport (= 6.1.4.1)
+ railties (6.1.4.4)
+ actionpack (= 6.1.4.4)
+ activesupport (= 6.1.4.4)
method_source
rake (>= 0.13)
thor (~> 1.0)
@@ -319,13 +319,13 @@ GEM
rb-fsevent (0.11.0)
rb-inotify (0.10.1)
ffi (~> 1.0)
- regexp_parser (2.1.1)
+ regexp_parser (2.2.0)
responders (3.0.1)
actionpack (>= 5.0)
railties (>= 5.0)
rexml (3.2.5)
rotp (6.2.0)
- ruby-vips (2.1.3)
+ ruby-vips (2.1.4)
ffi (~> 1.12)
ruby2_keywords (0.0.5)
rubyzip (2.3.2)
@@ -343,7 +343,7 @@ GEM
sawyer (0.8.2)
addressable (>= 2.3.5)
faraday (> 0.8, < 2.0)
- selenium-webdriver (4.0.3)
+ selenium-webdriver (4.1.0)
childprocess (>= 0.5, < 5.0)
rexml (~> 3.2, >= 3.2.5)
rubyzip (>= 1.2.2)
@@ -369,13 +369,13 @@ GEM
sixarm_ruby_unaccent (1.2.0)
sort_alphabetical (1.1.0)
unicode_utils (>= 1.2.2)
- spring (3.0.0)
+ spring (4.0.0)
sprockets (4.0.2)
concurrent-ruby (~> 1.0)
rack (> 1, < 3)
- sprockets-rails (3.2.2)
- actionpack (>= 4.0)
- activesupport (>= 4.0)
+ sprockets-rails (3.4.2)
+ actionpack (>= 5.2)
+ activesupport (>= 5.2)
sprockets (>= 3.0.0)
thor (1.1.0)
tilt (2.0.10)
@@ -389,7 +389,7 @@ GEM
unicode_utils (1.4.0)
warden (1.2.9)
rack (>= 2.0.9)
- web-console (4.1.0)
+ web-console (4.2.0)
actionview (>= 6.0.0)
activemodel (>= 6.0.0)
bindex (>= 0.4.0)
@@ -461,4 +461,4 @@ RUBY VERSION
ruby 2.7.5p203
BUNDLED WITH
- 2.2.32
+ 2.2.33
diff --git a/app/controllers/users/registrations_controller.rb b/app/controllers/users/registrations_controller.rb
index d0eb01033367647e06e9620c41b84761865b3d5e..61a6626ebf865c13ad4cd93a8809fc11a18d2353 100644
--- a/app/controllers/users/registrations_controller.rb
+++ b/app/controllers/users/registrations_controller.rb
@@ -7,6 +7,13 @@ class Users::RegistrationsController < Devise::RegistrationsController
before_action :configure_sign_up_params, only: :create
before_action :configure_account_update_params, only: :update
+ def edit
+ add_breadcrumb t('admin.dashboard'), :admin_root_path
+ add_breadcrumb User.model_name.human(count: 2), admin_users_path
+ add_breadcrumb @user, [:admin, @user]
+ add_breadcrumb t('edit')
+ end
+
def update
# to prevent cognitive complexity (the bottom block should be in an if condition where password present)
# Password not provided when user from sso
diff --git a/app/views/admin/education/programs/_form.html.erb b/app/views/admin/education/programs/_form.html.erb
index 274caa93f6a02f76e9afffe81b01e6c9bb1b605d..20e7879e6d86591efb8676ad9d02e5d84f589e99 100644
--- a/app/views/admin/education/programs/_form.html.erb
+++ b/app/views/admin/education/programs/_form.html.erb
@@ -21,7 +21,18 @@
<%= f.association :schools,
as: :check_boxes,
collection: current_university.education_schools.ordered %>
- <%= f.association :parent, collection: program.persisted? ? program.list_of_other_programs : current_university.list_of_programs, label_method: ->(p) { sanitize p[:label] }, value_method: ->(p) { p[:id] } %>
+ <%= f.association :parent,
+ collection: program.persisted? ? program.list_of_other_programs : current_university.list_of_programs,
+ label_method: ->(p) { sanitize p[:label] },
+ value_method: ->(p) { p[:id] } %>
+ </div>
+ </div>
+ <div class="card flex-fill w-100">
+ <div class="card-header">
+ <h5 class="card-title mb-0"><%= t('activerecord.attributes.education/program.contacts') %></h5>
+ </div>
+ <div class="card-body">
+ <%= f.input :contacts, as: :rich_text_area %>
</div>
</div>
<div class="card flex-fill w-100">
@@ -49,7 +60,6 @@
<%= f.input :registration, as: :rich_text_area %>
<%= f.input :pricing, as: :rich_text_area %>
<%= f.input :duration, as: :rich_text_area %>
- <%= f.input :contacts, as: :rich_text_area %>
<%= f.input :accessibility, as: :rich_text_area %>
<%= f.input :other, as: :rich_text_area %>
</div>
diff --git a/config/locales/education/en.yml b/config/locales/education/en.yml
index 7c0cd5413d5caf4c415dfbde612bace3a257c175..760d5faf057b490de5ef973d83d75f7e80f17cb5 100644
--- a/config/locales/education/en.yml
+++ b/config/locales/education/en.yml
@@ -74,3 +74,4 @@ en:
pedagogy: Modalités pédagogiques et/ou moyens et/ou outils utilisés pour mener à bien la prestation dispensée.
evaluation: Moyens mobilisés pour me- surer à l'aide de critères objectifs les acquis du bénéficiaire en cours et/ou à la fin de la prestation.
accessibility: Conditions d'accueil et d’accès des publics en situation de handicap (locaux, adaptation des moyens de la prestation).
+ description: Plain text without HTML, dedicated to SEO
diff --git a/config/locales/education/fr.yml b/config/locales/education/fr.yml
index 509c363e7f7491be56d547555157f368a9b89fb4..68d4d892cad88f1becb2254096fb263bdd8e8578 100644
--- a/config/locales/education/fr.yml
+++ b/config/locales/education/fr.yml
@@ -74,3 +74,4 @@ fr:
pedagogy: Modalités pédagogiques et/ou moyens et/ou outils utilisés pour mener à bien la prestation dispensée.
evaluation: Moyens mobilisés pour me- surer à l'aide de critères objectifs les acquis du bénéficiaire en cours et/ou à la fin de la prestation.
accessibility: Conditions d'accueil et d’accès des publics en situation de handicap (locaux, adaptation des moyens de la prestation).
+ description: Texte simple, sans HTML, pour le SEO
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 63a99d4280fc5b80ae95774fdbd0c1a7eaf1a4bb..0cfcfdfea20a380af4adf181f5a705d58f77eb95 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -105,7 +105,7 @@ en:
subtitle: Sign in to your account to continue
menu:
admin: Admin
- profile: Profil
+ profile: Profile
server_admin: Admin server
sign_out: Log out
metadata: Metadata