From 902fad2cf644925b89a236a33f75607353f7ff97 Mon Sep 17 00:00:00 2001 From: Helmi Akermi Date: Fri, 13 Dec 2024 10:09:03 +0100 Subject: [PATCH] feat: Add note toc plugin styles in generated sources - EXO-75747 - Meeds-io/MIPs#161 Add note toc plugin styles in generated sources --- notes-webapp/pom.xml | 57 +++++++++++++++---- .../eXo/wiki/ckeditor/plugins/toc/toc.css | 3 +- .../notes/components/NotesOverview.vue | 2 + pom.xml | 6 ++ 4 files changed, 56 insertions(+), 12 deletions(-) diff --git a/notes-webapp/pom.xml b/notes-webapp/pom.xml index 1892d67d56..6ade509d67 100644 --- a/notes-webapp/pom.xml +++ b/notes-webapp/pom.xml @@ -40,16 +40,6 @@ com.github.eirslett frontend-maven-plugin - - org.apache.maven.plugins - maven-war-plugin - - - WEB-INF/lib/*.jar - - maven-resources-plugin @@ -85,6 +75,43 @@ true + + c-copy-resources + generate-sources + + copy-resources + + + ${project.build.directory}/src/main/webapp/skin/css/toc + + + src/main/webapp/javascript/eXo/wiki/ckeditor/plugins + + toc/*.css + + + + true + + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-source + generate-sources + + add-source + + + + ${project.build.directory}/src/main/webapp/skin/css/toc + + + @@ -140,6 +167,16 @@ + + org.apache.maven.plugins + maven-war-plugin + + + WEB-INF/lib/*.jar + + diff --git a/notes-webapp/src/main/webapp/javascript/eXo/wiki/ckeditor/plugins/toc/toc.css b/notes-webapp/src/main/webapp/javascript/eXo/wiki/ckeditor/plugins/toc/toc.css index daa22d9b1c..05561f36e0 100644 --- a/notes-webapp/src/main/webapp/javascript/eXo/wiki/ckeditor/plugins/toc/toc.css +++ b/notes-webapp/src/main/webapp/javascript/eXo/wiki/ckeditor/plugins/toc/toc.css @@ -39,8 +39,7 @@ } .navigation-img-wrapper .cke_widget_selectImage { - margin-bottom: 0!important; - margin-right: 4px !important; + margin: 0 0 0 10px !important; } #remove-treeview { diff --git a/notes-webapp/src/main/webapp/vue-app/notes/components/NotesOverview.vue b/notes-webapp/src/main/webapp/vue-app/notes/components/NotesOverview.vue index 39634b330d..60efd90517 100644 --- a/notes-webapp/src/main/webapp/vue-app/notes/components/NotesOverview.vue +++ b/notes-webapp/src/main/webapp/vue-app/notes/components/NotesOverview.vue @@ -685,6 +685,8 @@ export default { noteArticle.published = publicationSettings?.publish; noteArticle.targets = publicationSettings?.selectedTargets; noteArticle.audience = publicationSettings?.selectedAudience; + noteArticle.isHomeDefaultContent = this.isHomeNoteDefaultContent; + noteArticle.hasChildren = this.hasChildren; this.isPublishing = true; if (note) { this.$notesService.updateNoteById(note).then(() => { diff --git a/pom.xml b/pom.xml index e6d8f280de..606552d6b6 100644 --- a/pom.xml +++ b/pom.xml @@ -112,6 +112,12 @@ ${project.version} pom + + ${project.groupId} + notes-webapp + ${project.version} + sources + ${project.groupId} notes-packaging