From 698776460d3cd7075024b8795dbbaf7132415890 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Mon, 11 Jan 2010 16:42:11 +0300
Subject: move feed browser to subscribe to feed dialog

---
 modules/popup-dialog.php |  3 +++
 modules/pref-feeds.php   | 15 ++++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

(limited to 'modules')

diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index bfc1f2483..00efdcb74 100644
--- a/modules/popup-dialog.php
+++ b/modules/popup-dialog.php
@@ -128,6 +128,9 @@
 				<input class=\"button\"
 					id=\"fadd_submit_btn\" disabled=\"true\"
 					type=\"submit\" onclick=\"return subscribeToFeed()\" value=\"".__('Subscribe')."\">
+				<input class=\"button\"					
+					type=\"submit\" onclick=\"return browseFeeds()\" value=\"".__('More feeds')."\">
+
 				<input class=\"button\"
 					type=\"submit\" onclick=\"return closeInfoBox()\" 
 					value=\"".__('Cancel')."\"></div>";
diff --git a/modules/pref-feeds.php b/modules/pref-feeds.php
index 835b45041..5330a4ffa 100644
--- a/modules/pref-feeds.php
+++ b/modules/pref-feeds.php
@@ -1135,11 +1135,11 @@
 			type=\"submit\" id=\"subscribe_to_feed_btn\" 
 			class=\"button\" value=\"".__('Subscribe to feed')."\">"; 
 
-		if (ENABLE_FEED_BROWSER && !SINGLE_USER_MODE) {
+/*		if (ENABLE_FEED_BROWSER && !SINGLE_USER_MODE) {
 			print " <input type=\"submit\" class=\"button\"
 				id=\"top25_feeds_btn\"
 				onclick=\"javascript:browseFeeds()\" value=\"".__('More feeds')."\">";
-		}
+		} */
 
 		$feeds_sort = db_escape_string($_REQUEST["sort"]);
 
@@ -1533,7 +1533,16 @@
 	
 				} else if ($mode == 2) {
 					$feed_url = $line["feed_url"];
+
+					$icon_file = ICONS_DIR . "/" . $line["id"] . ".ico";
 	
+					if (file_exists($icon_file) && filesize($icon_file) > 0) {
+							$feed_icon = "<img class=\"tinyFeedIcon\"	src=\"" . ICONS_URL . 
+								"/".$line["id"].".ico\">";
+					} else {
+						$feed_icon = "<img class=\"tinyFeedIcon\" src=\"images/blank_icon.gif\">";
+					}
+
 					$check_box = "<input onclick='toggleSelectListRow(this)' class='feedBrowseCB' 
 						type=\"checkbox\" id=\"FBCHK-" . $line["id"] . "\">";
 	
@@ -1547,7 +1556,7 @@
 					}
 	
 					print "<li class='$class' id=\"FBROW-".$line["id"]."\">$check_box".
-						$line["title"] . $site_url . "</li>";
+						"$feed_icon " . $line["title"] . $site_url . "</li>";
 
 
 				}
-- 
cgit v1.2.3