From 7d9f0680c6206daf3419f5629d60f99cdf3d7375 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Sun, 7 Sep 2014 12:37:27 +0200
Subject: [PATCH] webadmin: combine "List Users" & "Add User"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Let add users via the list of users in the similar manner it’s
done for networks. It’s evidently an extra step to add a user,
but on the other hand it gives a nice overview of the users
when adding new ones, and leads to less clutter in the sidebar.
---
 modules/data/webadmin/tmpl/listusers.tmpl | 2 +-
 modules/webadmin.cpp                      | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/data/webadmin/tmpl/listusers.tmpl b/modules/data/webadmin/tmpl/listusers.tmpl
index 7d4f30ae..5bdd9cf3 100644
--- a/modules/data/webadmin/tmpl/listusers.tmpl
+++ b/modules/data/webadmin/tmpl/listusers.tmpl
@@ -9,7 +9,7 @@
 				<table>
 					<thead>
 					<tr>
-						<td>Action</td>
+						<td>[<a href="<? VAR URIPrefix TOP ?><? VAR ModPath TOP ?>adduser">Add</a>]</td>
 						<td>Username</td>
                         <td>Networks</td>
 						<td>Clients</td>
diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp
index 0dc3b1e0..f575e76c 100644
--- a/modules/webadmin.cpp
+++ b/modules/webadmin.cpp
@@ -79,8 +79,7 @@ public:
 		AddSubPage(new CWebSubPage("settings", "Global Settings", CWebSubPage::F_ADMIN));
 		AddSubPage(new CWebSubPage("edituser", "Your Settings", vParams));
 		AddSubPage(new CWebSubPage("traffic", "Traffic Info", CWebSubPage::F_ADMIN));
-		AddSubPage(new CWebSubPage("listusers", "List Users", CWebSubPage::F_ADMIN));
-		AddSubPage(new CWebSubPage("adduser", "Add User", CWebSubPage::F_ADMIN));
+		AddSubPage(new CWebSubPage("listusers", "Manage Users", CWebSubPage::F_ADMIN));
 	}
 
 	virtual ~CWebAdminMod() {
@@ -1383,7 +1382,7 @@ public:
 	bool ListUsersPage(CWebSock& WebSock, CTemplate& Tmpl) {
 		CSmartPtr<CWebSession> spSession = WebSock.GetSession();
 		const map<CString,CUser*>& msUsers = CZNC::Get().GetUserMap();
-		Tmpl["Title"] = "List Users";
+		Tmpl["Title"] = "Manage Users";
 		Tmpl["Action"] = "listusers";
 
 		unsigned int a = 0;