Merge pull request #60 from EsupPortail/testing

Testing
EsupPortail · May 19, 2021 · 9da31fd · 9da31fd
2 parents 3c3785b + 89e0b99
commit 9da31fd
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 10 deletions.
diff --git a/src/main/resources/static/js/modules/ui/forms/FormUi.js b/src/main/resources/static/js/modules/ui/forms/FormUi.js
@@ -32,6 +32,9 @@ export default class FormUi {
         $("#multipartModel").on('change', function () {
             $("#submitModel").removeClass("d-none");
         });
+        $("#saveButton").on("click", function() {
+            $('#formUpdate').submit();}
+        );
     }
 
     toggleSelect(e) {

diff --git a/src/main/resources/templates/admin/forms/update.html b/src/main/resources/templates/admin/forms/update.html
@@ -19,7 +19,7 @@
         </nav>
         <div id="content" class="content">
             <div class="fixed-action-btn" >
-                <a id="saveButton" title="Enregistrer" role="button" class="btn-floating btn-lg bg-success wave-effect" onclick="$('#formUpdate').submit();">
+                <a id="saveButton" title="Enregistrer" role="button" class="btn-floating btn-lg bg-success wave-effect">
                     <i class="fas fa-save"></i>
                 </a>
             </div>
@@ -93,14 +93,14 @@
                             </select>
                         </div>
                         <div class="form-group" id="managers">
-                            <label for="managersSelect"><strong>Gestionnaire(s) du formulaire</strong>
+                            <label for="managersSelect"><strong>Superviseur(s) du formulaire</strong>
                                 <button class="btn btn-sm btn-transparent" data-target="#collapseHelp1" data-toggle="collapse"
                                         type="button">
                                     <span class="fas fa-info-circle text-info"></span>
                                 </button>
                                 <div class="collapse" id="collapseHelp1">
                                     <div class="alert alert-info">
-                                        Liste des personnes pouvant utiliser ce circuit
+                                        Les superviseurs peuvent consulter les demandes et en exporter les données
                                     </div>
                                 </div>
                             </label>

diff --git a/src/main/resources/templates/admin/workflows/list.html b/src/main/resources/templates/admin/workflows/list.html
@@ -38,7 +38,7 @@
                             <th>Nom</th>
                             <th>Créé par</th>
                             <th>Destinataires</th>
-                            <th>Gestionnaire(s) du circuit</th>
+                            <th>Superviseur(s) du circuit</th>
                             <th class="text-center">Actions</th>
                         </tr>
                         </thead>

diff --git a/src/main/resources/templates/admin/workflows/show-class.html b/src/main/resources/templates/admin/workflows/show-class.html
@@ -28,7 +28,7 @@
                         <div th:replace="admin/workflows/cards/stepscard-light :: stepscard-light"></div>
                     </dl>
                     <dl class="row border-bottom m-0">
-                        <dt class="col-lg-5">Gestionnaire(s) du circuit</dt>
+                        <dt class="col-lg-5">Superviseur(s) du circuit</dt>
                         <dd>
                             <div class="alert alert-dark col-12">
                                 <th:block th:each="manager : ${workflow.managers}">

diff --git a/src/main/resources/templates/admin/workflows/update.html b/src/main/resources/templates/admin/workflows/update.html
@@ -69,14 +69,14 @@
                             </select>
                         </div>
                         <div class="form-group" id="managers">
-                            <label for="managersSelect"><strong>Gestionnaire(s) du circuit</strong>
+                            <label for="managersSelect"><strong>Superviseur(s) du circuit</strong>
                                 <button class="btn btn-sm btn-transparent" data-target="#collapseHelp1" data-toggle="collapse"
                                         type="button">
                                     <span class="fas fa-info-circle text-info"></span>
                                 </button>
                                 <div class="collapse" id="collapseHelp1">
                                     <div class="alert alert-info">
-                                        Liste des personnes pouvant utiliser ce circuit
+                                        Les superviseurs peuvent consulter les demandes de ce circuit
                                     </div>
                                 </div>
                             </label>

diff --git a/src/main/resources/templates/fragments/nav.html b/src/main/resources/templates/fragments/nav.html
@@ -57,7 +57,7 @@
                         <a th:if="${managedForms.size() > 0}" th:classappend="${activeMenu == 'manage'} ? 'bg-secondary'"
                            title="Vue manager" href="/user/manage"
                            class="btn text-white btn-transparent text-left m-1" style="width: 250px;" >
-                            <i class="fas fa-tasks"></i> <span class="nav-item-label d-inline">Espace gestionnaire</span>
+                            <i class="fas fa-tasks"></i> <span class="nav-item-label d-inline">Espace superviseur</span>
                         </a>
                         <div th:if="${managedForms.size() > 0}" class="dropdown-divider"></div>
                         <a id="startWizardButton" th:unless="${globalProperties.hideWizard}" role="button" class="btn text-white btn-transparent text-left m-1" data-toggle="modal"

diff --git a/src/main/resources/templates/user/manage/details.html b/src/main/resources/templates/user/manage/details.html
@@ -12,7 +12,7 @@
         <nav th:insert="fragments/side"></nav>
         <nav id="breadcrumb" aria-label="breadcrumb" class="breadcrumb-nav">
             <ol class="breadcrumb">
-                <li class="breadcrumb-item"><a href="/user/manage">Espace gestionnaires</a></li>
+                <li class="breadcrumb-item"><a href="/user/manage">Espace superviseurs</a></li>
                 <li class="breadcrumb-item active" th:text="${form.name}"></li>
             </ol>
         </nav>

diff --git a/src/main/resources/templates/user/manage/list.html b/src/main/resources/templates/user/manage/list.html
@@ -9,7 +9,7 @@
         <nav th:insert="fragments/side"></nav>
         <nav id="breadcrumb" aria-label="breadcrumb" class="breadcrumb-nav">
             <ol class="breadcrumb">
-                <li class="breadcrumb-item">Espace gestionnaires</li>
+                <li class="breadcrumb-item">Espace superviseurs</li>
             </ol>
         </nav>
         <div id="content" class="content">