diff --git a/app/assets/javascripts/admin/plugins/summernote.js b/app/assets/javascripts/admin/plugins/summernote.js index 038b6160e95fb8cec6ec566e0dc690c9583ab0e9..161ca8065e560f2fa6ae587c7d7b4de97bfe5304 100644 --- a/app/assets/javascripts/admin/plugins/summernote.js +++ b/app/assets/javascripts/admin/plugins/summernote.js @@ -11,6 +11,15 @@ $(function () { ] }; + configs['mini-list'] = { + toolbar: [ + ['font', ['bold', 'italic']], + ['para', ['ul', 'ol']], + ['insert', ['link']], + ['view', ['codeview']] + ] + }; + configs['default'] = { popover: { image: [ @@ -61,4 +70,6 @@ $(function () { config = config || 'default'; $(this).summernote(configs[config]); }); + + window.SUMMERNOTE_CONFIGS = configs; }); diff --git a/app/models/administration/qualiopi/indicator.rb b/app/models/administration/qualiopi/indicator.rb index 6e06a027333a734dbc6b5b039d18b1b21626969a..300286f22c2b5b35c92568f4cde1b0c4b2bd6691 100644 --- a/app/models/administration/qualiopi/indicator.rb +++ b/app/models/administration/qualiopi/indicator.rb @@ -20,7 +20,7 @@ # # Foreign Keys # -# fk_rails_eed87f7acf (criterion_id => administration_qualiopi_criterions.id) +# fk_rails_31f1a0a2c9 (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 34d1eb1cfc8e8919fe33bde6bf232ffb6adbce3c..a6eca485f7edf2b594ca9785f213c14aa5ea74cc 100644 --- a/app/models/communication/website.rb +++ b/app/models/communication/website.rb @@ -22,7 +22,7 @@ # # Foreign Keys # -# fk_rails_bb6a496c08 (university_id => universities.id) +# fk_rails_94b0abd85b (university_id => universities.id) # class Communication::Website < ApplicationRecord include WithAbouts diff --git a/app/models/communication/website/configs/base_url.rb b/app/models/communication/website/configs/base_url.rb index a2510c716f8662e46e01f66222730e6c680e3505..a712220143d13d8a738a26397046788eaa4154fc 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_bb6a496c08 (university_id => universities.id) +# fk_rails_94b0abd85b (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 04a9cc323c8d694bff15d5cfa331c933edde9025..387417dae992281b04074f4b723cace9a2c19b2a 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_bb6a496c08 (university_id => universities.id) +# fk_rails_94b0abd85b (university_id => universities.id) # class Communication::Website::Configs::Permalinks < Communication::Website diff --git a/app/models/communication/website/git_file.rb b/app/models/communication/website/git_file.rb index e88ce09b89e8803acb9a9df2a071313a3c125800..d58cb468e9d7e08406bc2e7d1127971fcae46ddd 100644 --- a/app/models/communication/website/git_file.rb +++ b/app/models/communication/website/git_file.rb @@ -18,7 +18,7 @@ # # Foreign Keys # -# fk_rails_8505d649e8 (website_id => communication_websites.id) +# fk_rails_b6b8b2cce2 (website_id => communication_websites.id) # class Communication::Website::GitFile < ApplicationRecord belongs_to :website, class_name: 'Communication::Website' diff --git a/app/models/communication/website/page.rb b/app/models/communication/website/page.rb index 74521470c08d82a39f76f5e567b885ee5e874faa..026ccae6ba92b445e3683491b75d5dad8b3d8175 100644 --- a/app/models/communication/website/page.rb +++ b/app/models/communication/website/page.rb @@ -33,8 +33,8 @@ # Foreign Keys # # fk_rails_1a42003f06 (parent_id => communication_website_pages.id) +# fk_rails_2315541232 (related_category_id => communication_website_categories.id) # fk_rails_280107c62b (communication_website_id => communication_websites.id) -# fk_rails_47b37cf8b2 (related_category_id => communication_website_categories.id) # fk_rails_d208d15a73 (university_id => universities.id) # diff --git a/app/models/education/program.rb b/app/models/education/program.rb index 449c1d170691d18078b711e2faee6cab714d1ef4..9144bcae34b7c49c5559c7f715fa5a62c0b56f24 100644 --- a/app/models/education/program.rb +++ b/app/models/education/program.rb @@ -39,7 +39,7 @@ # # Foreign Keys # -# fk_rails_08b351087c (university_id => universities.id) +# fk_rails_6e16107511 (university_id => universities.id) # fk_rails_ec1f16f607 (parent_id => education_programs.id) # class Education::Program < ApplicationRecord diff --git a/app/models/university/person.rb b/app/models/university/person.rb index dd1d4ca904a15750f75738f4c3fcd751d06de721..b93061b39f598d8a433d7682871c39230c7cab09 100644 --- a/app/models/university/person.rb +++ b/app/models/university/person.rb @@ -27,8 +27,8 @@ # # Foreign Keys # -# fk_rails_b47a769440 (user_id => users.id) -# fk_rails_da35e70d61 (university_id => universities.id) +# fk_rails_433744b4e8 (user_id => users.id) +# fk_rails_49ac392937 (university_id => universities.id) # class University::Person < ApplicationRecord include Sanitizable diff --git a/app/models/university/person/administrator.rb b/app/models/university/person/administrator.rb index b7bca44426417b0705317eb94dbdb4af47d11eeb..d11f849b2ce178c8d0c5dd953fbe2d54640c2846 100644 --- a/app/models/university/person/administrator.rb +++ b/app/models/university/person/administrator.rb @@ -27,8 +27,8 @@ # # Foreign Keys # -# fk_rails_b47a769440 (user_id => users.id) -# fk_rails_da35e70d61 (university_id => universities.id) +# fk_rails_433744b4e8 (user_id => users.id) +# fk_rails_49ac392937 (university_id => universities.id) # class University::Person::Administrator < University::Person def self.polymorphic_name diff --git a/app/models/university/person/author.rb b/app/models/university/person/author.rb index 5bf2ee2c4a68b86044a237691a08fd9b4391e150..5c5fb92cc87d8f5011cd93e33aad406c4a772a22 100644 --- a/app/models/university/person/author.rb +++ b/app/models/university/person/author.rb @@ -27,8 +27,8 @@ # # Foreign Keys # -# fk_rails_b47a769440 (user_id => users.id) -# fk_rails_da35e70d61 (university_id => universities.id) +# fk_rails_433744b4e8 (user_id => users.id) +# fk_rails_49ac392937 (university_id => universities.id) # class University::Person::Author < University::Person def self.polymorphic_name diff --git a/app/models/university/person/researcher.rb b/app/models/university/person/researcher.rb index 9ca52242568e5da3fee487a5a4868d3bb28aaa88..989f141a54956e1ead39198db4380378636287c1 100644 --- a/app/models/university/person/researcher.rb +++ b/app/models/university/person/researcher.rb @@ -27,8 +27,8 @@ # # Foreign Keys # -# fk_rails_b47a769440 (user_id => users.id) -# fk_rails_da35e70d61 (university_id => universities.id) +# fk_rails_433744b4e8 (user_id => users.id) +# fk_rails_49ac392937 (university_id => universities.id) # class University::Person::Researcher < University::Person def self.polymorphic_name diff --git a/app/models/university/person/teacher.rb b/app/models/university/person/teacher.rb index 2f75bd1ab96b16846fa83af4670c2724d9d116e4..e83a8b826202f29d4ad9ff7869853e1705f05b6f 100644 --- a/app/models/university/person/teacher.rb +++ b/app/models/university/person/teacher.rb @@ -27,8 +27,8 @@ # # Foreign Keys # -# fk_rails_b47a769440 (user_id => users.id) -# fk_rails_da35e70d61 (university_id => universities.id) +# fk_rails_433744b4e8 (user_id => users.id) +# fk_rails_49ac392937 (university_id => universities.id) # class University::Person::Teacher < University::Person def self.polymorphic_name diff --git a/app/views/admin/communication/blocks/edit.html.erb b/app/views/admin/communication/blocks/edit.html.erb index 35011324ffa923699901bb0df618712f38a9c72e..22de33826d37f5ccbdf7985f6f31a673656e0455 100644 --- a/app/views/admin/communication/blocks/edit.html.erb +++ b/app/views/admin/communication/blocks/edit.html.erb @@ -70,12 +70,10 @@ return this.getFileUrl(data.signed_id, data.filename); }, handleSummernote() { + var config = this.$refs.summernoteInput.getAttribute('data-summernote-config') || 'default'; + $(this.$refs.summernoteInput).summernote({ - toolbar: [ - ['font', ['bold', 'italic']], - ['insert', ['link']], - ['view', ['codeview']] - ], + toolbar: window.SUMMERNOTE_CONFIGS[config].toolbar, // Dependent of app/assets/javascripts/admin/plugins/summernote.js callbacks: { onChange: function(contents, $editable) { this.$refs.summernoteInput.value = contents; diff --git a/app/views/admin/communication/blocks/templates/chapter/_edit.html.erb b/app/views/admin/communication/blocks/templates/chapter/_edit.html.erb index aec413429bb7c8cfea0c25a043144aa9af7b4e59..ff4f0bd69f6ca5dd703d5d9cef9a3c32d049480b 100644 --- a/app/views/admin/communication/blocks/templates/chapter/_edit.html.erb +++ b/app/views/admin/communication/blocks/templates/chapter/_edit.html.erb @@ -9,7 +9,7 @@ class="form-control" v-model="data.text" ref="summernoteInput" - data-summernote-config="mini" + data-summernote-config="mini-list" placeholder="<%= t '.text_placeholder' %>"></textarea> </div> </div> diff --git a/app/views/admin/communication/blocks/templates/chapter/_static.html.erb b/app/views/admin/communication/blocks/templates/chapter/_static.html.erb index 7b1d54858fad912127d3d7ba7c408c0859b01550..cc0e5fda16a48312892d1f7493ad4cf6c440fd79 100644 --- a/app/views/admin/communication/blocks/templates/chapter/_static.html.erb +++ b/app/views/admin/communication/blocks/templates/chapter/_static.html.erb @@ -1,2 +1,2 @@ - text: + text: >- <%= prepare_html_for_static block.data['text'], about.university %> diff --git a/test/fixtures/communication/website/git_files.yml b/test/fixtures/communication/website/git_files.yml index 21a1d16a6c596ec57810e8cf1363d5885ec20579..48c54bdab7a2c536c8c2eaaf6534764a351cf491 100644 --- a/test/fixtures/communication/website/git_files.yml +++ b/test/fixtures/communication/website/git_files.yml @@ -18,7 +18,7 @@ # # Foreign Keys # -# fk_rails_8505d649e8 (website_id => communication_websites.id) +# fk_rails_b6b8b2cce2 (website_id => communication_websites.id) # git_file_1: about: test_post (Communication::Website::Post) diff --git a/test/fixtures/communication/websites.yml b/test/fixtures/communication/websites.yml index aea91b89aedf7bdf88dc35453d5b5aaa4d1d2f25..44c31f2ca94a0d3ec0e718052cc4147f24dabf95 100644 --- a/test/fixtures/communication/websites.yml +++ b/test/fixtures/communication/websites.yml @@ -22,7 +22,7 @@ # # Foreign Keys # -# fk_rails_bb6a496c08 (university_id => universities.id) +# fk_rails_94b0abd85b (university_id => universities.id) # website_with_github: university: default_university diff --git a/test/models/communication/website/git_file_test.rb b/test/models/communication/website/git_file_test.rb index 9bfc4adce11026e10cbe754aaa93fe3093beffc9..4af0292f5c2f33346388fcc31fb214b15d8cc46d 100644 --- a/test/models/communication/website/git_file_test.rb +++ b/test/models/communication/website/git_file_test.rb @@ -18,7 +18,7 @@ # # Foreign Keys # -# fk_rails_8505d649e8 (website_id => communication_websites.id) +# fk_rails_b6b8b2cce2 (website_id => communication_websites.id) # require "test_helper"