summaryrefslogtreecommitdiff
path: root/lib/plugins/usermanager/admin.php
diff options
context:
space:
mode:
authorAnika Henke <anika@selfthinker.org>2013-08-04 10:41:00 +0100
committerAnika Henke <anika@selfthinker.org>2013-08-04 10:41:00 +0100
commit71c1143e8785954ea00a62aeb755ca7d8fa47e56 (patch)
treec813b1fe3590314fcb1f20a30811d5de92871583 /lib/plugins/usermanager/admin.php
parentd637819dca760b20f6e53e5847a92d08d8d15b8c (diff)
parent90d5fa676926189b265430239dca3b7ba668b30b (diff)
downloadrpg-71c1143e8785954ea00a62aeb755ca7d8fa47e56.tar.gz
rpg-71c1143e8785954ea00a62aeb755ca7d8fa47e56.tar.bz2
Merge remote-tracking branch 'origin/master' into video-audio
Diffstat (limited to 'lib/plugins/usermanager/admin.php')
-rw-r--r--lib/plugins/usermanager/admin.php16
1 files changed, 11 insertions, 5 deletions
diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index ca4c6a650..3c8d38c5e 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -270,7 +270,9 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
$this->_htmlInputField($cmd."_usergroups","usergroups",$this->lang["user_groups"],$groups,$this->_auth->canDo("modGroups"),$indent+6);
if ($this->_auth->canDo("modPass")) {
- $notes[] = $this->lang['note_pass'];
+ if ($cmd == 'add') {
+ $notes[] = $this->lang['note_pass'];
+ }
if ($user) {
$notes[] = $this->lang['note_notify'];
}
@@ -296,11 +298,15 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
ptln(" </tr>",$indent);
ptln(" </tbody>",$indent);
ptln(" </table>",$indent);
- ptln(" </div>",$indent);
-
- foreach ($notes as $note)
- ptln("<div class=\"fn\">".$note."</div>",$indent);
+ if ($notes) {
+ ptln(" <ul class=\"notes\">");
+ foreach ($notes as $note) {
+ ptln(" <li><span class=\"li\">".$note."</span></li>",$indent);
+ }
+ ptln(" </ul>");
+ }
+ ptln(" </div>",$indent);
ptln("</form>",$indent);
}