From 121b78ec2a85451aba38f5edb5877e910951dca2 Mon Sep 17 00:00:00 2001
From: Benoit Alessandroni <benoit@happy-dev.fr>
Date: Sat, 21 Sep 2019 18:21:09 +0200
Subject: [PATCH] Adding proper saved modifications on profile confirmation
page
---
src/includes/entrepreneur/components/menu.pug | 2 +-
src/includes/entrepreneur/dashboard.pug | 3 +++
src/includes/entrepreneur/profile/confirmation.pug | 9 +++++++++
src/includes/entrepreneur/profile/edit.pug | 4 ++--
src/includes/mentor/components/menu.pug | 3 ++-
src/includes/mentor/dashboard.pug | 3 +++
src/includes/mentor/profile/confirmation.pug | 9 +++++++++
src/includes/mentor/profile/edit.pug | 4 ++--
src/scripts/coopstarter.js | 8 +++++---
9 files changed, 36 insertions(+), 9 deletions(-)
create mode 100644 src/includes/entrepreneur/profile/confirmation.pug
create mode 100644 src/includes/mentor/profile/confirmation.pug
diff --git a/src/includes/entrepreneur/components/menu.pug b/src/includes/entrepreneur/components/menu.pug
index b69341d1..c37f5312 100644
--- a/src/includes/entrepreneur/components/menu.pug
+++ b/src/includes/entrepreneur/components/menu.pug
@@ -2,4 +2,4 @@ sib-router(default-route='entrepreneur-resource-list')
sib-route(name='entrepreneur-resource-list')
sib-route(name='entrepreneur-account', id-prefix=`${endpoints.users}`, use-id)
sib-route(name='entrepreneur-account-edit', id-prefix=`${endpoints.users}`, use-id)
-
\ No newline at end of file
+ sib-route(name='entrepreneur-account-edit-confirmation')
\ No newline at end of file
diff --git a/src/includes/entrepreneur/dashboard.pug b/src/includes/entrepreneur/dashboard.pug
index 16075cd2..5c795315 100644
--- a/src/includes/entrepreneur/dashboard.pug
+++ b/src/includes/entrepreneur/dashboard.pug
@@ -40,3 +40,6 @@ section#home
#entrepreneur-account-edit(hidden).no-sidebar.container
include profile/edit.pug
+
+ #entrepreneur-account-edit-confirmation(hidden).no-sidebar.container
+ include profile/confirmation.pug
diff --git a/src/includes/entrepreneur/profile/confirmation.pug b/src/includes/entrepreneur/profile/confirmation.pug
new file mode 100644
index 00000000..69a6c69c
--- /dev/null
+++ b/src/includes/entrepreneur/profile/confirmation.pug
@@ -0,0 +1,9 @@
+div.container_min
+ h2.title_lead.fd_bleu Edit your account
+
+p.p_entete Your modifications have properly been saved.
+
+div
+ div.flex
+ h3.button_base
+ sib-link(next='entrepreneur-resource-list') -> Back to the database
\ No newline at end of file
diff --git a/src/includes/entrepreneur/profile/edit.pug b/src/includes/entrepreneur/profile/edit.pug
index a783c832..a437cc5d 100644
--- a/src/includes/entrepreneur/profile/edit.pug
+++ b/src/includes/entrepreneur/profile/edit.pug
@@ -11,7 +11,7 @@ sib-form#entrepreneur_profile_edition.block_log.block_creat_count(
label-last_name="Name"
label-username="Username"
label-entrepreneur_profile.organisation="Organisation"
-
+ label-account.picture="Profile picture"
widget-username="sib-form-hidden"
class-last_name='form-label is-dark input_big'
@@ -28,7 +28,7 @@ sib-form#entrepreneur_profile_edition.block_log.block_creat_count(
class-account.picture='input_photo w_25'
submit-button="Save modifications"
- next='entrepreneur-resource-list'
+ next='entrepreneur-account-edit-confirmation'
)
sib-link(class="backlink", next="entrepreneur-resource-list") Back to the dashboard
\ No newline at end of file
diff --git a/src/includes/mentor/components/menu.pug b/src/includes/mentor/components/menu.pug
index f52aa70c..fbf8d640 100644
--- a/src/includes/mentor/components/menu.pug
+++ b/src/includes/mentor/components/menu.pug
@@ -7,4 +7,5 @@ sib-router(default-route='mentor-resource-list')
sib-ac-checker(permission="acl:Write" bind-resources)
sib-route(id-prefix=`${endpoints.resources}`, name='mentor-resource-edit', use-id)
sib-route(name='resource-creation-confirmation')
- sib-route(name='mentor-database')
\ No newline at end of file
+ sib-route(name='mentor-database')
+ sib-route(name='mentor-account-edit-confirmation')
\ No newline at end of file
diff --git a/src/includes/mentor/dashboard.pug b/src/includes/mentor/dashboard.pug
index 03508e4e..252cb167 100644
--- a/src/includes/mentor/dashboard.pug
+++ b/src/includes/mentor/dashboard.pug
@@ -49,3 +49,6 @@ section#home
#mentor-account-edit(hidden).no-sidebar.container
include profile/edit.pug
+
+ #mentor-account-edit-confirmation(hidden).no-sidebar.container
+ include profile/confirmation.pug
diff --git a/src/includes/mentor/profile/confirmation.pug b/src/includes/mentor/profile/confirmation.pug
new file mode 100644
index 00000000..d6b54388
--- /dev/null
+++ b/src/includes/mentor/profile/confirmation.pug
@@ -0,0 +1,9 @@
+div.container_min
+ h2.title_lead.fd_bleu Edit your account
+
+p.p_entete Your modifications have properly been saved.
+
+div
+ div.flex
+ h3.button_base
+ sib-link(next='mentor-resource-list') -> Back to dashboard
\ No newline at end of file
diff --git a/src/includes/mentor/profile/edit.pug b/src/includes/mentor/profile/edit.pug
index d5b10e3b..3d2d1626 100644
--- a/src/includes/mentor/profile/edit.pug
+++ b/src/includes/mentor/profile/edit.pug
@@ -58,8 +58,8 @@ sib-form#mentor_profile_edition.block_log.block_creat_count(
class-headline='w_75'
submit-button="Save modifications"
- next='mentor-resource-list'
+ next="mentor-account-edit-confirmation"
)
+sib-link(class="backlink", next="mentor-account") Back to my account
sib-link(class="backlink", next="mentor-resource-list") Back to the dashboard
-sib-link(class="backlink", next="mentor-account") Back to the profile
diff --git a/src/scripts/coopstarter.js b/src/scripts/coopstarter.js
index 31f9a80f..11d9757d 100644
--- a/src/scripts/coopstarter.js
+++ b/src/scripts/coopstarter.js
@@ -54,14 +54,16 @@ function refreshPagination() {
var resources_containers = document.querySelectorAll(
".resource_by_step sib-form+div"
);
+
for (let resources_container of resources_containers) {
if (
- resources_container.childElementCount < 5 ||
- resources_container.nextSibling.querySelector("nav span span+span")
+ resources_container.childElementCount < 5 || (
+ resources_container.nextSibling &&
+ resources_container.nextSibling.querySelector("nav span span+span"))
.textContent == 1
) {
resources_container.nextSibling.setAttribute("style", "display:none");
- } else {
+ } else if (resources_container.nextSibling) {
resources_container.nextSibling.setAttribute("style", "display:block");
}
}
--
GitLab