valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

move feed browser to subscribe to feed dialog

This commit is contained in:
Andrew Dolgov 2010-01-11 16:42:11 +03:00
parent 84d7198a10
commit 698776460d
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
functions.php
View File

@ -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);

3
modules/popup-dialog.php
View File

@ -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>";

15
modules/pref-feeds.php
View File

@ -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"]);
@ -1534,6 +1534,15 @@
} 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>";
}

5
tt-rss.php
View File

@ -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>