subtoolbar is now sticky
This commit is contained in:
Andrew Dolgov
parent
9105d72816
commit
11befbb22f
94
backend.php
94
backend.php
|
|
@ -799,98 +799,14 @@
|
||||||
Could not display feed (query failed). Please check label match syntax or local configuration.</div>";
|
Could not display feed (query failed). Please check label match syntax or local configuration.</div>";
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
function print_headline_subtoolbar($link, $feed_site_url, $feed_title,
|
|
||||||
$bottom = false, $rtl_content = false, $feed_id = 0,
|
|
||||||
$is_cat = false, $search = false, $match_on = false,
|
|
||||||
$search_mode = false) {
|
|
||||||
|
|
||||||
if (!$bottom) {
|
|
||||||
$class = "headlinesSubToolbar";
|
|
||||||
$tid = "headlineActionsTop";
|
|
||||||
} else {
|
|
||||||
$class = "headlinesSubToolbar";
|
|
||||||
$tid = "headlineActionsBottom";
|
|
||||||
}
|
|
||||||
|
|
||||||
print "<table class=\"$class\" id=\"$tid\"
|
|
||||||
width=\"100%\" cellspacing=\"0\" cellpadding=\"0\"><tr>";
|
|
||||||
|
|
||||||
if ($rtl_content) {
|
|
||||||
$rtl_cpart = "RTL";
|
|
||||||
} else {
|
|
||||||
$rtl_cpart = "";
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) {
|
|
||||||
|
|
||||||
print "<td class=\"headlineActions$rtl_cpart\">
|
|
||||||
Select:
|
|
||||||
<a href=\"javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', true, '', true)\">All</a>,
|
|
||||||
<a href=\"javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', true, 'Unread', true)\">Unread</a>,
|
|
||||||
<a href=\"javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false)\">None</a>
|
|
||||||
|
|
||||||
Toggle: <a href=\"javascript:selectionToggleUnread()\">Unread</a>,
|
|
||||||
<a href=\"javascript:selectionToggleMarked()\">Starred</a>";
|
|
||||||
|
|
||||||
print "</td>";
|
|
||||||
|
|
||||||
if ($search && $feed_id > 0 && get_pref($link, 'ENABLE_LABELS') && GLOBAL_ENABLE_LABELS) {
|
|
||||||
print "<td class=\"headlineActions$rtl_cpart\">
|
|
||||||
<a href=\"javascript:labelFromSearch('$search', '$search_mode',
|
|
||||||
'$match_on', '$feed_id', '$is_cat');\">
|
|
||||||
Convert this search to label</a></td>";
|
|
||||||
}
|
|
||||||
|
|
||||||
} else {
|
|
||||||
|
|
||||||
print "<td class=\"headlineActions$rtl_cpart\">
|
|
||||||
Select:
|
|
||||||
<a href=\"javascript:cdmSelectArticles('all')\">All</a>,
|
|
||||||
<a href=\"javascript:cdmSelectArticles('unread')\">Unread</a>,
|
|
||||||
<a href=\"javascript:cdmSelectArticles('none')\">None</a>
|
|
||||||
|
|
||||||
Toggle: <a href=\"javascript:selectionToggleUnread(true)\">Unread</a>,
|
|
||||||
<a href=\"javascript:selectionToggleMarked(true)\">Starred</a>";
|
|
||||||
|
|
||||||
print "</td>";
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
print "<td class=\"headlineTitle$rtl_cpart\">";
|
|
||||||
|
|
||||||
if ($feed_site_url) {
|
|
||||||
if (!$bottom) {
|
|
||||||
$target = "target=\"_blank\"";
|
|
||||||
}
|
|
||||||
print "<a $target href=\"$feed_site_url\">$feed_title</a>";
|
|
||||||
} else {
|
|
||||||
print $feed_title;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($search) {
|
|
||||||
$search_q = "&q=$search&m=$match_on&smode=$search_mode";
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!$bottom) {
|
|
||||||
print "
|
|
||||||
<a target=\"_new\"
|
|
||||||
href=\"backend.php?op=rss&id=$feed_id&is_cat=$is_cat$search_q\">
|
|
||||||
<img class=\"noborder\"
|
|
||||||
alt=\"Generated feed\" src=\"images/feed-icon-12x12.png\">
|
|
||||||
</a>";
|
|
||||||
}
|
|
||||||
|
|
||||||
print "</td>";
|
|
||||||
print "</tr></table>";
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
if (db_num_rows($result) > 0) {
|
if (db_num_rows($result) > 0) {
|
||||||
|
|
||||||
print_headline_subtoolbar($link, $feed_site_url, $feed_title, false,
|
print_headline_subtoolbar($link, $feed_site_url, $feed_title, false,
|
||||||
$rtl_content, $feed, $cat_view, $search, $match_on, $search_mode);
|
$rtl_content, $feed, $cat_view, $search, $match_on, $search_mode);
|
||||||
|
|
||||||
|
print "<div id=\"headlinesInnerContainer\">";
|
||||||
|
|
||||||
if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) {
|
if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) {
|
||||||
print "<table class=\"headlinesList\" id=\"headlinesList\"
|
print "<table class=\"headlinesList\" id=\"headlinesList\"
|
||||||
cellspacing=\"0\" width=\"100%\">";
|
cellspacing=\"0\" width=\"100%\">";
|
||||||
|
|
@ -1043,8 +959,10 @@
|
||||||
print "</table>";
|
print "</table>";
|
||||||
}
|
}
|
||||||
|
|
||||||
print_headline_subtoolbar($link,
|
print "</div>";
|
||||||
"javascript:catchupPage()", "Mark page as read", true, $rtl_content);
|
|
||||||
|
// print_headline_subtoolbar($link,
|
||||||
|
// "javascript:catchupPage()", "Mark page as read", true, $rtl_content);
|
||||||
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
|
|
@ -2597,4 +2597,93 @@
|
||||||
mb_strtolower(strip_tags($title)));
|
mb_strtolower(strip_tags($title)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function print_headline_subtoolbar($link, $feed_site_url, $feed_title,
|
||||||
|
$bottom = false, $rtl_content = false, $feed_id = 0,
|
||||||
|
$is_cat = false, $search = false, $match_on = false,
|
||||||
|
$search_mode = false) {
|
||||||
|
|
||||||
|
if (!$bottom) {
|
||||||
|
$class = "headlinesSubToolbar";
|
||||||
|
$tid = "headlineActionsTop";
|
||||||
|
} else {
|
||||||
|
$class = "headlinesSubToolbar";
|
||||||
|
$tid = "headlineActionsBottom";
|
||||||
|
}
|
||||||
|
|
||||||
|
print "<table class=\"$class\" id=\"$tid\"
|
||||||
|
width=\"100%\" cellspacing=\"0\" cellpadding=\"0\"><tr>";
|
||||||
|
|
||||||
|
if ($rtl_content) {
|
||||||
|
$rtl_cpart = "RTL";
|
||||||
|
} else {
|
||||||
|
$rtl_cpart = "";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!get_pref($link, 'COMBINED_DISPLAY_MODE')) {
|
||||||
|
|
||||||
|
print "<td class=\"headlineActions$rtl_cpart\">
|
||||||
|
Select:
|
||||||
|
<a href=\"javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', true, '', true)\">All</a>,
|
||||||
|
<a href=\"javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', true, 'Unread', true)\">Unread</a>,
|
||||||
|
<a href=\"javascript:selectTableRowsByIdPrefix('headlinesList', 'RROW-', 'RCHK-', false)\">None</a>
|
||||||
|
|
||||||
|
Toggle: <a href=\"javascript:selectionToggleUnread()\">Unread</a>,
|
||||||
|
<a href=\"javascript:selectionToggleMarked()\">Starred</a>
|
||||||
|
|
||||||
|
Mark as read:
|
||||||
|
<a href=\"#\" onclick=\"catchupPage()\">Page</a>,
|
||||||
|
<a href=\"#\" onclick=\"catchupCurrentFeed()\">Feed</a>";
|
||||||
|
print "</td>";
|
||||||
|
|
||||||
|
if ($search && $feed_id > 0 && get_pref($link, 'ENABLE_LABELS') && GLOBAL_ENABLE_LABELS) {
|
||||||
|
print "<td class=\"headlineActions$rtl_cpart\">
|
||||||
|
<a href=\"javascript:labelFromSearch('$search', '$search_mode',
|
||||||
|
'$match_on', '$feed_id', '$is_cat');\">
|
||||||
|
Convert this search to label</a></td>";
|
||||||
|
}
|
||||||
|
|
||||||
|
} else {
|
||||||
|
|
||||||
|
print "<td class=\"headlineActions$rtl_cpart\">
|
||||||
|
Select:
|
||||||
|
<a href=\"javascript:cdmSelectArticles('all')\">All</a>,
|
||||||
|
<a href=\"javascript:cdmSelectArticles('unread')\">Unread</a>,
|
||||||
|
<a href=\"javascript:cdmSelectArticles('none')\">None</a>
|
||||||
|
|
||||||
|
Toggle: <a href=\"javascript:selectionToggleUnread(true)\">Unread</a>,
|
||||||
|
<a href=\"javascript:selectionToggleMarked(true)\">Starred</a>";
|
||||||
|
|
||||||
|
print "</td>";
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
print "<td class=\"headlineTitle$rtl_cpart\">";
|
||||||
|
|
||||||
|
if ($feed_site_url) {
|
||||||
|
if (!$bottom) {
|
||||||
|
$target = "target=\"_blank\"";
|
||||||
|
}
|
||||||
|
print "<a $target href=\"$feed_site_url\">$feed_title</a>";
|
||||||
|
} else {
|
||||||
|
print $feed_title;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($search) {
|
||||||
|
$search_q = "&q=$search&m=$match_on&smode=$search_mode";
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!$bottom) {
|
||||||
|
print "
|
||||||
|
<a target=\"_new\"
|
||||||
|
href=\"backend.php?op=rss&id=$feed_id&is_cat=$is_cat$search_q\">
|
||||||
|
<img class=\"noborder\"
|
||||||
|
alt=\"Generated feed\" src=\"images/feed-icon-12x12.png\">
|
||||||
|
</a>";
|
||||||
|
}
|
||||||
|
|
||||||
|
print "</td>";
|
||||||
|
print "</tr></table>";
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
|
||||||
15
tt-rss.css
15
tt-rss.css
|
|
@ -1285,7 +1285,7 @@ div.headlines_normal {
|
||||||
height : 305px;
|
height : 305px;
|
||||||
top : 85px;
|
top : 85px;
|
||||||
right : 0px;
|
right : 0px;
|
||||||
overflow : auto;
|
overflow : hidden;
|
||||||
font-size : small;
|
font-size : small;
|
||||||
border-collapse : collapse;
|
border-collapse : collapse;
|
||||||
}
|
}
|
||||||
|
|
@ -1337,3 +1337,16 @@ div.headlines_cdm {
|
||||||
margin-left : 1px;
|
margin-left : 1px;
|
||||||
background-color : white;
|
background-color : white;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#headlineActionsTop {
|
||||||
|
/* border-width : 0px 0px 1px 0px;
|
||||||
|
border-style : solid;
|
||||||
|
border-color : #c0c0c0;
|
||||||
|
background-color : #fafafa; */
|
||||||
|
font-size : x-small;
|
||||||
|
}
|
||||||
|
|
||||||
|
#headlinesInnerContainer {
|
||||||
|
height : 280px;
|
||||||
|
overflow : auto;
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -199,8 +199,8 @@ window.onload = init;
|
||||||
<input class="button" type="submit"
|
<input class="button" type="submit"
|
||||||
onclick="viewCurrentFeed('ForceUpdate')" value="Update">
|
onclick="viewCurrentFeed('ForceUpdate')" value="Update">
|
||||||
|
|
||||||
<input class="button" type="submit"
|
<!-- <input class="button" type="submit"
|
||||||
onclick="catchupCurrentFeed()" value="Mark as read">
|
onclick="catchupCurrentFeed()" value="Mark as read"> -->
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue