diff --git a/pom.xml b/pom.xml index 7805105d2..6b5e03f51 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ org.esupportail esup-signature - 1.12.3 + 1.13 esup-signature org.esupportail.esupsignature.EsupSignatureApplication @@ -179,6 +179,16 @@ + + org.webjars.bower + google-code-prettify + 1.0.5 + + + org.webjars + popper.js + 2.5.4 + org.webjars jquery @@ -639,9 +649,9 @@ 2.4.0 - com.github.AgNO3 + eu.agno3.jcifs jcifs-ng - 3db3e62157 + 2.1.6 org.apache.chemistry.opencmis diff --git a/src/main/java/org/esupportail/esupsignature/config/GlobalProperties.java b/src/main/java/org/esupportail/esupsignature/config/GlobalProperties.java index b8301cb37..0bffc5e46 100644 --- a/src/main/java/org/esupportail/esupsignature/config/GlobalProperties.java +++ b/src/main/java/org/esupportail/esupsignature/config/GlobalProperties.java @@ -32,6 +32,7 @@ public class GlobalProperties implements Cloneable { private String applicationEmail = "esup.signature@univ-ville.fr"; private int hoursBeforeRefreshNotif = 24; private Boolean infiniteScrolling = true; + private Boolean returnToHomeAfterSign = true; /** * Choisir le fonctionnement des délégations : * diff --git a/src/main/resources/templates/fragments/new.html b/src/main/resources/templates/fragments/new.html index 3fedc2c8e..85a5a2775 100644 --- a/src/main/resources/templates/fragments/new.html +++ b/src/main/resources/templates/fragments/new.html @@ -7,7 +7,7 @@
Nouveau
-
+
Outils de signature
+
+

Champs

+
+
+ + + +
+
+ + +
+
+
+ + +
+ + diff --git a/src/main/resources/templates/managers/forms/list.html b/src/main/resources/templates/managers/forms/list.html new file mode 100644 index 000000000..47f68a87d --- /dev/null +++ b/src/main/resources/templates/managers/forms/list.html @@ -0,0 +1,188 @@ + + + + + + + +
+
+
+ + +
+
+ + + +
    +
    • +
    • +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + +
TitreNomVersionActifRôleAction
+ + + +
+ +
+
+ + Modifier les paramètres + + + Modifier les champs + + + Exporter les données saisies + + + Supprimer + +
+
+
+ +
+
+
+
+
+ +
+
+
Confirmez-vous la + suppression du formulaire ? +
+
+
+ + +
+
+
+
+
+ +
+
+
+ Aucun formulaire pour le moment +
+
+
+
+
+
+ +
+ + diff --git a/src/main/resources/templates/managers/forms/show.html b/src/main/resources/templates/managers/forms/show.html new file mode 100644 index 000000000..a8754e3e3 --- /dev/null +++ b/src/main/resources/templates/managers/forms/show.html @@ -0,0 +1,128 @@ + + + + + + + + +
+
+
+ + +
+
+ +
+ +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
NomDescriptionTypeFavorisableRequisLecture seulePré-remplissageAuto-completionNom du serviceType de donnéesAttribut retournéÉtapes autorisées
+ + + + + + + + + + + + + + + + + +
+
+
+
+
+
+
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/managers/forms/update.html b/src/main/resources/templates/managers/forms/update.html new file mode 100644 index 000000000..ea2396370 --- /dev/null +++ b/src/main/resources/templates/managers/forms/update.html @@ -0,0 +1,160 @@ + + + + + + +
+
+
+ + +
+
+ + + +
+ +
+
+
+
+
+ Modele actuel : + +
+
+
+ + +
+
+ +
+
+ +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ + +
+ +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ +
+ + +
+
+
+

Champs

+
+
+ + +
+
+
+
+
+
+
+
+
+
+
+ + diff --git a/src/main/resources/templates/managers/managersRoles.html b/src/main/resources/templates/managers/managersRoles.html new file mode 100644 index 000000000..2a51764ae --- /dev/null +++ b/src/main/resources/templates/managers/managersRoles.html @@ -0,0 +1,65 @@ + + + + + +
+
+ + +
+
+ + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + +
RolesManagers
+ + +
+ +
+
+ +
+
+
+
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/managers/workflows/cards/stepscard-light.html b/src/main/resources/templates/managers/workflows/cards/stepscard-light.html new file mode 100644 index 000000000..9dbeca147 --- /dev/null +++ b/src/main/resources/templates/managers/workflows/cards/stepscard-light.html @@ -0,0 +1,44 @@ + + + +
+
+
Etapes du circuit
+
+
+ +
+
+ +
+ +
+ +
    + +
  • + +
    • +     +
+ +
+
+
+
+ + +
+
+
+
+
+
+
+ +
+
+ +
+
+ \ No newline at end of file diff --git a/src/main/resources/templates/managers/workflows/cards/stepscard.html b/src/main/resources/templates/managers/workflows/cards/stepscard.html new file mode 100644 index 000000000..aed1150fa --- /dev/null +++ b/src/main/resources/templates/managers/workflows/cards/stepscard.html @@ -0,0 +1,159 @@ + + + + +
+
+
+ +
+ +
+
+ + +
+
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/managers/workflows/list.html b/src/main/resources/templates/managers/workflows/list.html new file mode 100644 index 000000000..86a46e1d5 --- /dev/null +++ b/src/main/resources/templates/managers/workflows/list.html @@ -0,0 +1,161 @@ + + + + + +
+
+
+ + +
+
+ + + +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + +
NomCréé parDestinatairesSuperviseur(s) du circuitActions
+
    + +
  • + + + + +
    +     +
    • +     +
+ 		+ Aucun + + + + +
+ + 		+
+ +
+
+ + Voir/Modifier les paramètres + + + Voir/Modifier les étapes + + + Scanner la source + + + Supprimer + +
+
+
+ +
+
+
+
+
+ +
+
+
Confirmez-vous la + suppression du circuit ? +
+
+
+ + +
+
+
+
+
+ +
+
+
+
+
+
+ +
+ + diff --git a/src/main/resources/templates/managers/workflows/show-class.html b/src/main/resources/templates/managers/workflows/show-class.html new file mode 100644 index 000000000..95969551a --- /dev/null +++ b/src/main/resources/templates/managers/workflows/show-class.html @@ -0,0 +1,72 @@ + + + + + +
+
+
+ + +
+
+
Circuit :
+
+
+
Description
+
+
+
+
Circuit de signatures
+
+
+
+
Superviseur(s) du circuit
+
+
+ + +
+ +
+
+
+
+
Protocole pour la source des documents
+
+
+
+
+
Lien pour la source des documents
+
+
+
+
+
Protocole pour la destination des documents +
+
+
+
+
+
Lien pour la destination des documents
+
+
+
+
+
+ +
+
+ +
+
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/managers/workflows/show.html b/src/main/resources/templates/managers/workflows/show.html new file mode 100644 index 000000000..abbb28d5d --- /dev/null +++ b/src/main/resources/templates/managers/workflows/show.html @@ -0,0 +1,161 @@ + + + + + + +
+
+
+ + +
+
+ + + + + + +
+ +
+
+
+
Circuit de signatures
+
+
+ Vous pouvez ajouter des étapes +
+
+
+ + +
+
+ +
+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/managers/workflows/update.html b/src/main/resources/templates/managers/workflows/update.html new file mode 100644 index 000000000..ed65ae82a --- /dev/null +++ b/src/main/resources/templates/managers/workflows/update.html @@ -0,0 +1,199 @@ + + + + + + + + + +
+
+ + +
+
+ + + +
+ +
+
+
+
+ +
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+ + +
+ +
+
+ + +
+
+ + +
+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + +
TypeURISupprimer + + +
+ + + + + +
+
+
+
+
+
+
+
+ + +
+ + \ No newline at end of file diff --git a/src/main/resources/templates/user/home/index.html b/src/main/resources/templates/user/home/index.html index 386b9d1a4..08a3b023c 100644 --- a/src/main/resources/templates/user/home/index.html +++ b/src/main/resources/templates/user/home/index.html @@ -16,7 +16,7 @@
- +