diff --git a/build/lemonldap-ng/doc/media/screenshots/1.1/mailreset/mailreset_step1.png b/build/lemonldap-ng/doc/media/screenshots/1.1/mailreset/mailreset_step1.png new file mode 100644 index 000000000..c9c80d3f1 Binary files /dev/null and b/build/lemonldap-ng/doc/media/screenshots/1.1/mailreset/mailreset_step1.png differ diff --git a/build/lemonldap-ng/doc/media/screenshots/1.1/mailreset/mailreset_step2.png b/build/lemonldap-ng/doc/media/screenshots/1.1/mailreset/mailreset_step2.png new file mode 100644 index 000000000..9791c4e18 Binary files /dev/null and b/build/lemonldap-ng/doc/media/screenshots/1.1/mailreset/mailreset_step2.png differ diff --git a/build/lemonldap-ng/doc/media/screenshots/1.1/mailreset/mailreset_step3.png b/build/lemonldap-ng/doc/media/screenshots/1.1/mailreset/mailreset_step3.png new file mode 100644 index 000000000..e85a849c0 Binary files /dev/null and b/build/lemonldap-ng/doc/media/screenshots/1.1/mailreset/mailreset_step3.png differ diff --git a/build/lemonldap-ng/doc/media/screenshots/1.1/mailreset/mailreset_step4.png b/build/lemonldap-ng/doc/media/screenshots/1.1/mailreset/mailreset_step4.png new file mode 100644 index 000000000..3161da08f Binary files /dev/null and b/build/lemonldap-ng/doc/media/screenshots/1.1/mailreset/mailreset_step4.png differ diff --git a/build/lemonldap-ng/doc/media/screenshots/1.1/mailreset/mailreset_step5.png b/build/lemonldap-ng/doc/media/screenshots/1.1/mailreset/mailreset_step5.png new file mode 100644 index 000000000..99443d325 Binary files /dev/null and b/build/lemonldap-ng/doc/media/screenshots/1.1/mailreset/mailreset_step5.png differ diff --git a/build/lemonldap-ng/doc/media/screenshots/1.1/manager/notifications_explorer_create.png b/build/lemonldap-ng/doc/media/screenshots/1.1/manager/notifications_explorer_create.png new file mode 100644 index 000000000..88319178b Binary files /dev/null and b/build/lemonldap-ng/doc/media/screenshots/1.1/manager/notifications_explorer_create.png differ diff --git a/build/lemonldap-ng/doc/media/screenshots/1.1/notifications/sample_notification.png b/build/lemonldap-ng/doc/media/screenshots/1.1/notifications/sample_notification.png new file mode 100644 index 000000000..18f47148b Binary files /dev/null and b/build/lemonldap-ng/doc/media/screenshots/1.1/notifications/sample_notification.png differ diff --git a/build/lemonldap-ng/doc/pages/documentation.html b/build/lemonldap-ng/doc/pages/documentation.html index 6953e5db8..8fecbaa1f 100644 --- a/build/lemonldap-ng/doc/pages/documentation.html +++ b/build/lemonldap-ng/doc/pages/documentation.html @@ -60,7 +60,7 @@
-
-When the user accept the notification, the reference is stored in his persistent session. +Since 1.1.0, a notification explorer is available in Manager, and notifications can be done for all users, with the possibility to display conditions. When the user accept the notification, the reference is stored in his persistent session.
- +@@ -139,47 +139,32 @@ The notifications module uses a wildcard to manage notifications for all users.
-To change it, edit lemonldap-ng.ini:
-
+To change it, go in General Parameters > Advanced Parameters > Notifications > Wildcard for all users, and set for example alluserscustom
.
[all] -notificationWilcard = alluserscustom
Then creating a notification for alluserscustom
will display the notification for all users.
-New notifications can be insert using SOAP request (described in the WSDL file generated by buildPortalWSDL tool). To activate SOAP on the portal:
+The transformation between notification XML content and HTML display is done with XSLT. The default XSLT file is in portal/skins/common/notification.xsl. You can create your own XSLT file and store in another place, for example /etc/lemonldap-ng. Then just configure the new XSLT file path in Manager, go in General Parameters > Advanced Parameters > Notifications > Custom XSLT file and set for example /etc/lemonldap-ng/notification.xsl
.
# SOAP functions for notification insertion (disabled by default) -<Location /index.pl/notification> - Order deny,allow - Deny from all - Allow from 192.168.2.0/24 -</Location>
@@ -254,6 +239,50 @@ Example : </notification> </root> +
+
+In Manager, click on notifications explorer
and then on the Create
button.
+
+Then fill all inputs to create the notification. Only the condition is not mandatory. +
+ +
+When all is ok, click on Create
.
+
+ +New notifications can be insert using SOAP request (described in the WSDL file generated by buildPortalWSDL tool). To activate SOAP on the portal: +
+# SOAP functions for notification insertion (disabled by default) +<Location /index.pl/notification> + Order deny,allow + Deny from all + Allow from 192.168.2.0/24 +</Location>+
Try also to create a global notification (to the uid “allusers”), and connect with any user, the message will be prompted.
Kinematics:
-Reset my password
+ +