banananetwork
/
tt-rss
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

outputFeedList: fix markup problems

Browse Source
master
Andrew Dolgov 17 years ago
parent 2228d0e4a8
commit 3bd9a780d6
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File

26
functions.php
Unescape Escape View File

@ -2959,15 +2959,15 @@
function outputFeedList($link, $tags = false) { function outputFeedList($link, $tags = false) {
print "<ul class=\"feedList\" id=\"feedList\">\n"; print "<ul class=\"feedList\" id=\"feedList\">";
$owner_uid = $_SESSION["uid"]; $owner_uid = $_SESSION["uid"];
/* virtual feeds */ /* virtual feeds */
if (get_pref($link, 'ENABLE_FEED_CATS')) { if (get_pref($link, 'ENABLE_FEED_CATS')) {
print "<li class=\"feedCat\">".__('Special')."</li>\n"; print "<li class=\"feedCat\">".__('Special')."</li>";
print "<li id=\"feedCatHolder\" class=\"feedCatHolder\"><ul class=\"feedCatList\">\n"; print "<li id=\"feedCatHolder\" class=\"feedCatHolder\"><ul class=\"feedCatList\">";
} }
$num_starred = getFeedUnread($link, -1); $num_starred = getFeedUnread($link, -1);
@ -2980,7 +2980,7 @@
"images/mark_set.png", $link); "images/mark_set.png", $link);
if (get_pref($link, 'ENABLE_FEED_CATS')) { if (get_pref($link, 'ENABLE_FEED_CATS')) {
print "</ul>\n"; print "</ul>";
} }
if (!$tags) { if (!$tags) {
@ -2992,10 +2992,10 @@
if (db_num_rows($result) > 0) { if (db_num_rows($result) > 0) {
if (get_pref($link, 'ENABLE_FEED_CATS')) { if (get_pref($link, 'ENABLE_FEED_CATS')) {
print "<li class=\"feedCat\">".__('Labels')."</li>\n"; print "<li class=\"feedCat\">".__('Labels')."</li>";
print "<li id=\"feedCatHolder\" class=\"feedCatHolder\"><ul class=\"feedCatList\">\n"; print "<li id=\"feedCatHolder\" class=\"feedCatHolder\"><ul class=\"feedCatList\">";
} else { } else {
print "<li><hr></li>\n"; print "<li><hr></li>";
} }
} }
@ -3029,7 +3029,7 @@
} }
if (!get_pref($link, 'ENABLE_FEED_CATS')) { if (!get_pref($link, 'ENABLE_FEED_CATS')) {
print "<li><hr></li>\n"; print "<li><hr></li>";
} }
if (get_pref($link, 'ENABLE_FEED_CATS')) { if (get_pref($link, 'ENABLE_FEED_CATS')) {
@ -3165,16 +3165,16 @@
$catctr_class = ($cat_unread > 0) ? "catCtrHasUnread" : "catCtrNoUnread"; $catctr_class = ($cat_unread > 0) ? "catCtrHasUnread" : "catCtrNoUnread";
print "<li class=\"feedCat\" id=\"FCAT-$cat_id\">\n print "<li class=\"feedCat\" id=\"FCAT-$cat_id\">
<a id=\"FCATN-$cat_id\" href=\"javascript:toggleCollapseCat($cat_id)\">$tmp_category</a> <a id=\"FCATN-$cat_id\" href=\"javascript:toggleCollapseCat($cat_id)\">$tmp_category</a>
<a href=\"#\" onclick=\"javascript:viewCategory($cat_id)\" id=\"FCAP-$cat_id\"> <a href=\"#\" onclick=\"javascript:viewCategory($cat_id)\" id=\"FCAP-$cat_id\">
<span id=\"FCATCTR-$cat_id\" title=\"Click to browse category\" <span id=\"FCATCTR-$cat_id\" title=\"Click to browse category\"
class=\"$catctr_class\">($cat_unread)</span> $ellipsis class=\"$catctr_class\">($cat_unread)</span> $ellipsis
</a></li>\n"; </a></li>";
// !!! NO SPACE before <ul...feedCatList - breaks firstChild DOM function // !!! NO SPACE before <ul...feedCatList - breaks firstChild DOM function
// -> keyboard navigation, etc. // -> keyboard navigation, etc.
print "<li id=\"feedCatHolder\" class=\"$holder_class\"><ul class=\"feedCatList\" id=\"FCATLIST-$cat_id\">\n"; print "<li id=\"feedCatHolder\" class=\"$holder_class\"><ul class=\"feedCatList\" id=\"FCATLIST-$cat_id\">";
} }
printFeedEntry($feed_id, $class, $feed, $unread, printFeedEntry($feed_id, $class, $feed, $unread,
@ -3185,7 +3185,7 @@
} }
if (db_num_rows($result) == 0) { if (db_num_rows($result) == 0) {
print "<li>".__('No feeds to display.')."</li>\n"; print "<li>".__('No feeds to display.')."</li>";
} }
} else { } else {
@ -3236,7 +3236,7 @@
} }
if (get_pref($link, 'ENABLE_FEED_CATS')) { if (get_pref($link, 'ENABLE_FEED_CATS')) {
print "</ul>\n"; print "</ul>";
} }
} }

Write Preview
Loading…
Cancel
Save