From ee9498f56bb996332665780f790257bcd010ac3c Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Fri, 2 Aug 2013 17:28:45 +0200
Subject: usermanager: fix an issue where edit user table would incorrectly
 show the password blank message

---
 lib/plugins/usermanager/admin.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index ca4c6a650..62d3b3e5e 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'];
           }
-- 
cgit v1.2.3


From 45c199029a4e9e615c042ca521c50b5aef6fc3db Mon Sep 17 00:00:00 2001
From: Christopher Smith <chris@jalakai.co.uk>
Date: Fri, 2 Aug 2013 17:29:30 +0200
Subject: improve html structure and styling for add & edit user notes

made necessary by PR#254 which adds content below these notes.
---
 lib/plugins/usermanager/admin.php | 12 ++++++++----
 lib/plugins/usermanager/style.css |  4 ++++
 2 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'lib')

diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index 62d3b3e5e..3c8d38c5e 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -298,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);
     }
 
diff --git a/lib/plugins/usermanager/style.css b/lib/plugins/usermanager/style.css
index ff8e5d9d1..506bd7928 100644
--- a/lib/plugins/usermanager/style.css
+++ b/lib/plugins/usermanager/style.css
@@ -13,6 +13,10 @@
 #user__manager table {
   margin-bottom: 1em;
 }
+#user__manager ul.notes {
+  padding-left: 0;
+  padding-right: 1.4em;
+}
 #user__manager input.button[disabled] {
   color: #ccc!important;
   border-color: #ccc!important;
-- 
cgit v1.2.3