From 6aa7c07db9ac88805e7d7e1d5962ef9d3bbb8d4d Mon Sep 17 00:00:00 2001
From: pabois <pierreandre.boissinot@noesya.coop>
Date: Tue, 19 Apr 2022 15:22:51 +0200
Subject: [PATCH] wip
---
app/assets/javascripts/admin/plugins/summernote.js | 2 ++
app/models/administration/qualiopi/indicator.rb | 2 +-
app/models/communication/website.rb | 2 +-
app/models/communication/website/configs/base_url.rb | 2 +-
app/models/communication/website/configs/permalinks.rb | 2 +-
app/models/education/program.rb | 2 +-
app/views/admin/communication/blocks/edit.html.erb | 1 -
config/locales/communication/en.yml | 6 ++++--
config/locales/communication/fr.yml | 6 ++++--
test/fixtures/communication/websites.yml | 2 +-
10 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/app/assets/javascripts/admin/plugins/summernote.js b/app/assets/javascripts/admin/plugins/summernote.js
index 161ca8065..916f2f24c 100644
--- a/app/assets/javascripts/admin/plugins/summernote.js
+++ b/app/assets/javascripts/admin/plugins/summernote.js
@@ -14,6 +14,7 @@ $(function () {
configs['mini-list'] = {
toolbar: [
['font', ['bold', 'italic']],
+ ['position', ['superscript', 'subscript']],
['para', ['ul', 'ol']],
['insert', ['link']],
['view', ['codeview']]
@@ -29,6 +30,7 @@ $(function () {
toolbar: [
['style', ['style']],
['font', ['bold', 'italic']],
+ ['position', ['superscript', 'subscript']],
['para', ['ul', 'ol']],
['table', ['table']],
['insert', ['link', 'picture', 'video']],
diff --git a/app/models/administration/qualiopi/indicator.rb b/app/models/administration/qualiopi/indicator.rb
index 300286f22..6e06a0273 100644
--- a/app/models/administration/qualiopi/indicator.rb
+++ b/app/models/administration/qualiopi/indicator.rb
@@ -20,7 +20,7 @@
#
# Foreign Keys
#
-# fk_rails_31f1a0a2c9 (criterion_id => administration_qualiopi_criterions.id)
+# fk_rails_eed87f7acf (criterion_id => administration_qualiopi_criterions.id)
#
class Administration::Qualiopi::Indicator < ApplicationRecord
include Sanitizable
diff --git a/app/models/communication/website.rb b/app/models/communication/website.rb
index 85b0e5f83..3e972d724 100644
--- a/app/models/communication/website.rb
+++ b/app/models/communication/website.rb
@@ -22,7 +22,7 @@
#
# Foreign Keys
#
-# fk_rails_94b0abd85b (university_id => universities.id)
+# fk_rails_bb6a496c08 (university_id => universities.id)
#
class Communication::Website < ApplicationRecord
include WithUniversity
diff --git a/app/models/communication/website/configs/base_url.rb b/app/models/communication/website/configs/base_url.rb
index a71222014..a2510c716 100644
--- a/app/models/communication/website/configs/base_url.rb
+++ b/app/models/communication/website/configs/base_url.rb
@@ -22,7 +22,7 @@
#
# Foreign Keys
#
-# fk_rails_94b0abd85b (university_id => universities.id)
+# fk_rails_bb6a496c08 (university_id => universities.id)
#
class Communication::Website::Configs::BaseUrl < Communication::Website
diff --git a/app/models/communication/website/configs/permalinks.rb b/app/models/communication/website/configs/permalinks.rb
index 387417dae..04a9cc323 100644
--- a/app/models/communication/website/configs/permalinks.rb
+++ b/app/models/communication/website/configs/permalinks.rb
@@ -22,7 +22,7 @@
#
# Foreign Keys
#
-# fk_rails_94b0abd85b (university_id => universities.id)
+# fk_rails_bb6a496c08 (university_id => universities.id)
#
class Communication::Website::Configs::Permalinks < Communication::Website
diff --git a/app/models/education/program.rb b/app/models/education/program.rb
index f4cf7e331..77e3ae32d 100644
--- a/app/models/education/program.rb
+++ b/app/models/education/program.rb
@@ -40,7 +40,7 @@
#
# Foreign Keys
#
-# fk_rails_6e16107511 (university_id => universities.id)
+# fk_rails_08b351087c (university_id => universities.id)
# fk_rails_ec1f16f607 (parent_id => education_programs.id)
#
class Education::Program < ApplicationRecord
diff --git a/app/views/admin/communication/blocks/edit.html.erb b/app/views/admin/communication/blocks/edit.html.erb
index 769acd97b..bc2ad2ebf 100644
--- a/app/views/admin/communication/blocks/edit.html.erb
+++ b/app/views/admin/communication/blocks/edit.html.erb
@@ -74,7 +74,6 @@
},
handleSummernote() {
var config = this.$refs.summernoteInput.getAttribute('data-summernote-config') || 'default';
-
$(this.$refs.summernoteInput).summernote({
toolbar: window.SUMMERNOTE_CONFIGS[config].toolbar, // Dependent of app/assets/javascripts/admin/plugins/summernote.js
callbacks: {
diff --git a/config/locales/communication/en.yml b/config/locales/communication/en.yml
index dcf5ed340..9d599baa2 100644
--- a/config/locales/communication/en.yml
+++ b/config/locales/communication/en.yml
@@ -86,7 +86,7 @@ en:
breadcrumb_title: Title in breadcrumbs
children: Children pages
description: Meta Description
- description_short: Short description
+ description_short: Lead text
featured_image: Featured image
featured_image_alt: Alt text
header_text: Title displayed in header
@@ -102,7 +102,7 @@ en:
category: Category
categories: Categories
description: Meta Description
- description_short: Short description
+ description_short: Lead text
featured_image: Featured image
featured_image_alt: Alt text
pinned: Pinned?
@@ -118,6 +118,8 @@ en:
template_kinds:
chapter:
edit:
+ notes_label: Notes
+ notes_placeholder: Enter notes
text_label: Text
text_placeholder: Enter text
gallery:
diff --git a/config/locales/communication/fr.yml b/config/locales/communication/fr.yml
index 892c33e79..aaa70471e 100644
--- a/config/locales/communication/fr.yml
+++ b/config/locales/communication/fr.yml
@@ -86,7 +86,7 @@ fr:
breadcrumb_title: Nom affiché dans le fil d'ariane
children: Pages enfants
description: Meta Description
- description_short: Description courte
+ description_short: Chapô
featured_image: Image à la une
featured_image_alt: Texte alternatif
header_text: Titre affiché dans le header
@@ -102,7 +102,7 @@ fr:
category: Catégorie
categories: Catégories
description: Meta Description
- description_short: Description courte
+ description_short: Chapô
featured_image: Image à la une
featured_image_alt: Texte alternatif
pinned: Mis en avant ?
@@ -118,6 +118,8 @@ fr:
templates:
chapter:
edit:
+ notes_label: Notes
+ notes_placeholder: Entrer les notes
text_label: Texte
text_placeholder: Entrer le texte
gallery:
diff --git a/test/fixtures/communication/websites.yml b/test/fixtures/communication/websites.yml
index 44c31f2ca..aea91b89a 100644
--- a/test/fixtures/communication/websites.yml
+++ b/test/fixtures/communication/websites.yml
@@ -22,7 +22,7 @@
#
# Foreign Keys
#
-# fk_rails_94b0abd85b (university_id => universities.id)
+# fk_rails_bb6a496c08 (university_id => universities.id)
#
website_with_github:
university: default_university
--
GitLab