[TASK] User settings: move flashMessage notice
authorFelix Kopp <felix-source@phorax.com>
Sat, 31 Dec 2011 13:19:14 +0000 (14:19 +0100)
committerSteffen Ritter <info@rs-websystems.de>
Tue, 17 Jan 2012 07:40:20 +0000 (08:40 +0100)
There is a permanent flashMessage in user settings module to indicate
the possible necessity to reload the whole backend after changing
settings.
Move the reload notice in user settings module to the top and display
it only after saving.

Change-Id: I3189e8b4fc47e5bf22c23aa7e02ee9b04abd2705
Resolves: #32891
Releases: 4.7
Reviewed-on: http://review.typo3.org/7639
Reviewed-by: Philipp Gampe
Tested-by: Philipp Gampe
Reviewed-by: Wouter Wolters
Tested-by: Wouter Wolters
Reviewed-by: Oliver Klee
Reviewed-by: Tolleiv Nietsch
Tested-by: Tolleiv Nietsch
Reviewed-by: Steffen Ritter
Tested-by: Steffen Ritter
typo3/sysext/setup/mod/index.php

index d0d935b..5eaee8e 100755 (executable)
@@ -402,6 +402,18 @@ class SC_mod_user_setup_index {
                        );
                        $this->content .= $flashMessage->render();
                }
+
+                       // Notice
+               if ($this->setupIsUpdated || $this->settingsAreResetToDefault) {
+                       $flashMessage = t3lib_div::makeInstance(
+                               't3lib_FlashMessage',
+                               $LANG->getLL('activateChanges'),
+                               '',
+                               t3lib_FlashMessage::INFO
+                       );
+                       $this->content .= $flashMessage->render();
+               }
+
                        // If password is updated, output whether it failed or was OK.
                if ($this->passwordIsSubmitted) {
                        if ($this->passwordIsUpdated) {
@@ -444,15 +456,6 @@ class SC_mod_user_setup_index {
                        <input type="hidden" name="data[clearSessionVars]" value="0" id="clearSessionVars" />'
                );
 
-                       // Notice
-               $this->content .= $this->doc->spacer(30);
-               $flashMessage = t3lib_div::makeInstance(
-                       't3lib_FlashMessage',
-                       $LANG->getLL('activateChanges'),
-                       '',
-                       t3lib_FlashMessage::INFO
-               );
-               $this->content .= $flashMessage->render();
                        // end of wrapper div
                $this->content .= '</div>';