move feed browser to subscribe to feed dialog

diff --git a/functions.php b/functions.php
index 881130fc0e96ec9db5c8f5080a6e237fbb377e98..388d71530bb68cef08e58ad1779ccdd0c6abaa80 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -6353,9 +6353,9 @@
 
                        db_query($link, "COMMIT");
 
-                       if (file_exists(ICONS_DIR . "/$id.ico")) {
+/*                     if (file_exists(ICONS_DIR . "/$id.ico")) {
                                unlink(ICONS_DIR . "/$id.ico");
-                       }
+                       } */
 
                        ccache_remove($link, $id, $owner_uid);
 

diff --git a/modules/popup-dialog.php b/modules/popup-dialog.php
index bfc1f248378e2748e83a9b7c5eccba3a3ff936e6..00efdcb74f9b1577fa3397d742c243526bed672f 100644 (file)
--- 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 835b4504170ddb7600c3552ba9ebe84af113b59c..5330a4ffaa8ac3b07c87f08f2ddce33061805668 100644 (file)
--- 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>";
 
 
                                }

diff --git a/tt-rss.php b/tt-rss.php
index 5c216748e628bc88fe2ed4c15a741d2d31c9ddcf..88ab1212846b972901dff0d1d282fd962f9df06d 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -167,11 +167,6 @@
        <div id="dispSwitch"> 
                <a id="dispSwitchPrompt" 
                        href="javascript:toggleTags()"><?php echo __("tag cloud") ?></a>
-               <?php if (!SINGLE_USER_MODE && ENABLE_FEED_BROWSER) { ?>
-               <br/>
-               <a id="feedBrowserPrompt" onclick="return browseFeeds()" href="#"
-                       title="<?php echo __('More feeds...') ?>">+</a>
-               <?php } ?>
        </div>
        <div id="feeds-frame">&nbsp;</div>
 </div>