Merge branch 'master' into configmgr_improvements

1 files changed, 14 insertions, 5 deletions

diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index 445836a50..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);
     }
 
@@ -311,6 +317,9 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
         if($name == 'userpass'){
             $fieldtype = 'password';
             $autocomp  = 'autocomplete="off"';
+        }elseif($name == 'usermail'){
+            $fieldtype = 'email';
+            $autocomp  = '';
         }else{
             $fieldtype = 'text';
             $autocomp  = '';