From 0b68215ca6f739de4895f006dbbc97640e3135cb Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.spb.ru>
Date: Wed, 17 May 2006 05:59:33 +0100
Subject: recolor patch #2 + misc interface improvements

---
 backend.php | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'backend.php')

diff --git a/backend.php b/backend.php
index 081bd7726..f1a9e60bd 100644
--- a/backend.php
+++ b/backend.php
@@ -1812,7 +1812,7 @@
 				<input type=\"submit\" class=\"button\"
 				onclick=\"javascript:addFeed()\" value=\"Add feed\">";
 
-		if (ENABLE_FEED_BROWSER) {
+		if (ENABLE_FEED_BROWSER && !SINGLE_USER_MODE) {
 			print "&nbsp;(<a href='javascript:browseFeeds()'>Top 50</a>)";
 		}
 		
@@ -2065,7 +2065,7 @@
 				</td</tr>";
 
 				print "<tr class=\"title\">
-							<td width=\"5%\"></td><td width=\"80%\">Title</td>
+							<td width=\"5%\">&nbsp;</td><td width=\"80%\">Title</td>
 						</tr>";
 						
 				$lnum = 0;
@@ -3412,7 +3412,7 @@
 
 		print "<tr class=\"title\">
 					<td align='center' width=\"5%\">&nbsp;</td>
-					<td width='20%'>Username</td>
+					<td width='20%'>Login</td>
 					<td width='20%'>E-mail</td>
 					<td width='20%'>Access Level</td>
 					<td width='20%'>Last login</td></tr>";
@@ -3459,6 +3459,8 @@
 				print "<td><a href=\"javascript:editUser($uid);\">" . 
 					$line["login"] . "</td>";		
 
+				if (!$line["email"]) $line["email"] = "&nbsp;";
+
 				print "<td><a href=\"javascript:editUser($uid);\">" . 
 					$line["email"] . "</td>";			
 
@@ -3467,6 +3469,8 @@
 
 			} else if ($uid != $edit_uid) {
 
+				if (!$line["email"]) $line["email"] = "&nbsp;";
+
 				print "<td align='center'><input disabled=\"true\" type=\"checkbox\" 
 					id=\"UMCHK-".$line["id"]."\"></td>";
 
@@ -3746,6 +3750,8 @@
 
 	if ($op == "pref-feed-browser") {
 
+		print "<p>This panel shows feeds subscribed by other users of this system, just in case you are interested in some of them too.</p>";
+
 		if (!ENABLE_FEED_BROWSER) {
 			print "Feed browser is administratively disabled.";
 			return;
@@ -3821,7 +3827,11 @@
 			FROM ttrss_feeds 
 			WHERE auth_login = '' AND auth_pass = '' AND private = false
 			GROUP BY feed_url ORDER BY subscribers DESC LIMIT 100");
-		
+
+		print "<p>Selection: 
+			<input type='submit' class='button' onclick=\"feedBrowserSubscribe()\" 
+			value=\"Subscribe\">";
+
 		print "<ul class='nomarks' id='browseBigFeedList'>";
 
 		$feedctr = 0;
@@ -3878,10 +3888,6 @@
 
 		print "</ul>";
 
-		print "<p>Selection: 
-			<input type='submit' class='button' onclick=\"feedBrowserSubscribe()\" 
-			value=\"Subscribe\"></p>";
-
 		print "</div>";
 
 	}
-- 
cgit v1.2.3-54-g00ecf