From f9baa980a37e10746f0ed400ae5132c8dfb89266 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Sun, 7 Sep 2014 12:26:25 +0200
Subject: [PATCH 1/4] Web: make the banner logo a link to home

---
 webskins/_default_/pub/_default_.css | 5 +++++
 webskins/_default_/tmpl/Banner.tmpl  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/webskins/_default_/pub/_default_.css b/webskins/_default_/pub/_default_.css
index 53258955..c49b63af 100644
--- a/webskins/_default_/pub/_default_.css
+++ b/webskins/_default_/pub/_default_.css
@@ -48,6 +48,11 @@ a:hover {
 	background-color: #ccc;
 }
 
+#banner_top a {
+	color: #000;
+	text-decoration: none;
+}
+
 h1 {
 	line-height: 37px;
 	padding: 0 0.9em 0 0.6em;
diff --git a/webskins/_default_/tmpl/Banner.tmpl b/webskins/_default_/tmpl/Banner.tmpl
index 24a4bba4..85a063e2 100644
--- a/webskins/_default_/tmpl/Banner.tmpl
+++ b/webskins/_default_/tmpl/Banner.tmpl
@@ -1 +1 @@
-<div id="banner_top"><h1>ZNC</h1></div>
\ No newline at end of file
+<div id="banner_top"><h1><a href="<? VAR URIPrefix TOP ?>/">ZNC</a></h1></div>
\ No newline at end of file

From 22d0fc4759600056919a8f31cda77d1679733a68 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Sun, 7 Sep 2014 12:39:00 +0200
Subject: [PATCH 2/4] webadmin: cleanup unused variables

---
 modules/webadmin.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp
index 08b66d51..5298050e 100644
--- a/modules/webadmin.cpp
+++ b/modules/webadmin.cpp
@@ -1078,8 +1078,6 @@ public:
 		Tmpl.SetFile("add_edit_user.tmpl");
 
 		if (!WebSock.GetParam("submitted").ToUInt()) {
-			CString sAllowedHosts, sServers, sChans, sCTCPReplies;
-
 			if (pUser) {
 				Tmpl["Action"] = "edituser";
 				Tmpl["Title"] = "Edit User [" + pUser->GetUserName() + "]";
@@ -1407,7 +1405,6 @@ public:
 	}
 
 	bool TrafficPage(CWebSock& WebSock, CTemplate& Tmpl) {
-		CSmartPtr<CWebSession> spSession = WebSock.GetSession();
 		Tmpl["Uptime"] = CZNC::Get().GetUptime();
 
 		const map<CString,CUser*>& msUsers = CZNC::Get().GetUserMap();
@@ -1566,7 +1563,6 @@ public:
 	bool SettingsPage(CWebSock& WebSock, CTemplate& Tmpl) {
 		Tmpl.SetFile("settings.tmpl");
 		if (!WebSock.GetParam("submitted").ToUInt()) {
-			CString sBindHosts, sMotd;
 			Tmpl["Action"] = "settings";
 			Tmpl["Title"] = "Settings";
 			Tmpl["StatusPrefix"] = CZNC::Get().GetStatusPrefix();

From 713082ac3ec8489f67e8d76b4b58cabcf85f4880 Mon Sep 17 00:00:00 2001
From: J-P Nurmi <jpnurmi@gmail.com>
Date: Sun, 7 Sep 2014 12:58:33 +0200
Subject: [PATCH 3/4] webadmin: add missing page title

Makes sure "Traffic Info" shows up in the breadcrumbs.
---
 modules/webadmin.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp
index 5298050e..0dc3b1e0 100644
--- a/modules/webadmin.cpp
+++ b/modules/webadmin.cpp
@@ -1405,6 +1405,7 @@ public:
 	}
 
 	bool TrafficPage(CWebSock& WebSock, CTemplate& Tmpl) {
+		Tmpl["Title"] = "Traffic Info";
 		Tmpl["Uptime"] = CZNC::Get().GetUptime();
 
 		const map<CString,CUser*>& msUsers = CZNC::Get().GetUserMap();

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 4/4] 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;