headlines toolbar: code cleanup
This commit is contained in:
Andrew Dolgov
parent
b62f6ff448
commit
d75ed3eba5
142
functions.php
142
functions.php
|
|
@ -3978,115 +3978,65 @@
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
print "<td class=\"headlineActions$rtl_cpart\">";
|
print "<td class=\"headlineActions$rtl_cpart\">";
|
||||||
|
|
||||||
|
|
||||||
/* print"<ul class=\"headlineDropdownMenu\">
|
print __('Select:')."
|
||||||
<li class=\"top2\">
|
<a href=\"$sel_all_link\">".__('All')."</a>,
|
||||||
".__('Select:')."
|
<a href=\"$sel_unread_link\">".__('Unread')."</a>,
|
||||||
<a href=\"$sel_all_link\">".__('All')."</a>,
|
<a href=\"$sel_inv_link\">".__('Invert')."</a>,
|
||||||
<a href=\"$sel_unread_link\">".__('Unread')."</a>,
|
<a href=\"$sel_none_link\">".__('None')."</a></li>";
|
||||||
<a href=\"$sel_inv_link\">".__('Invert')."</a>,
|
|
||||||
<a href=\"$sel_none_link\">".__('None')."</a></li>
|
|
||||||
<li class=\"vsep\"> </li>
|
|
||||||
<li class=\"top\">".__('Actions...')."<ul>
|
|
||||||
<li><span class=\"insensitive\">".__('Selection toggle:')."</span></li>
|
|
||||||
<li onclick=\"$tog_unread_link\"> ".__('Unread')."</li>
|
|
||||||
<li onclick=\"$tog_marked_link\"> ".__('Starred')."</li>
|
|
||||||
<li onclick=\"$tog_published_link\"> ".__('Published')."</li>
|
|
||||||
<!-- <li><span class=\"insensitive\">--------</span></li> -->
|
|
||||||
<li><span class=\"insensitive\">".__('Mark as read:')."</span></li>
|
|
||||||
<li onclick=\"$catchup_sel_link\"> ".__('Selection')."</li>";
|
|
||||||
|
|
||||||
print "<li onclick=\"$catchup_feed_link\"> ".__('Entire feed')."</li>";
|
print " ";
|
||||||
|
|
||||||
//print "<li><span class=\"insensitive\">--------</span></li>";
|
print "<span
|
||||||
print "<li><span class=\"insensitive\">".__('Assign label:')."</span></li>";
|
onmouseover=\"enable_selection(false)\"
|
||||||
|
onmouseout=\"enable_selection(true)\"
|
||||||
|
onclick=\"toggleHeadlineActions()\" id=\"headlineActionsDrop\">".
|
||||||
|
__("Actions...") . " <img src=\"images/down_arrow.png\">
|
||||||
|
</span>";
|
||||||
|
|
||||||
$result = db_query($link, "SELECT id, caption FROM ttrss_labels2 WHERE
|
print "<ul id=\"headlineActionsBody\" style=\"display : none\">";
|
||||||
owner_uid = '".$_SESSION["uid"]."' ORDER BY caption");
|
|
||||||
|
|
||||||
while ($line = db_fetch_assoc($result)) {
|
print "<li class=\"insensitive\">".__('Selection toggle:')."</li>
|
||||||
|
<li onclick=\"$tog_unread_link\"> ".__('Unread')."</li>
|
||||||
|
<li onclick=\"$tog_marked_link\"> ".__('Starred')."</li>
|
||||||
|
<li onclick=\"$tog_published_link\"> ".__('Published')."</li>
|
||||||
|
<!-- <li><span class=\"insensitive\">--------</span></li> -->
|
||||||
|
<li class=\"insensitive\">".__('Mark as read:')."</li>
|
||||||
|
<li onclick=\"$catchup_sel_link\"> ".__('Selection')."</li>";
|
||||||
|
|
||||||
$label_id = $line["id"];
|
print "<li onclick=\"$catchup_feed_link\"> ".__('Entire feed').
|
||||||
$label_caption = $line["caption"];
|
"</li>";
|
||||||
|
|
||||||
if ($feed_id < -10 && $feed_id == -11-$label_id) {
|
//print "<li><span class=\"insensitive\">--------</span></li>";
|
||||||
print "<li onclick=\"javascript:selectionRemoveLabel($label_id)\">
|
print "<li class=\"insensitive\">".__('Assign label:')."</li>";
|
||||||
$label_caption ".__('(remove)')."</li>";
|
|
||||||
} else {
|
print "<li onclick=\"javascript:addLabel()\">
|
||||||
print "<li onclick=\"javascript:selectionAssignLabel($label_id)\">
|
".__("Create label...")."</li>";
|
||||||
$label_caption</li>";
|
|
||||||
}
|
$result = db_query($link, "SELECT id, caption FROM ttrss_labels2 WHERE
|
||||||
|
owner_uid = '".$_SESSION["uid"]."' ORDER BY caption");
|
||||||
|
|
||||||
|
while ($line = db_fetch_assoc($result)) {
|
||||||
|
|
||||||
|
$label_id = $line["id"];
|
||||||
|
$label_caption = $line["caption"];
|
||||||
|
|
||||||
|
if ($feed_id < -10 && $feed_id == -11-$label_id) {
|
||||||
|
print "<li onclick=\"javascript:selectionRemoveLabel($label_id)\">
|
||||||
|
$label_caption ".__('(remove)')."</li>";
|
||||||
|
} else {
|
||||||
|
print "<li onclick=\"javascript:selectionAssignLabel($label_id)\">
|
||||||
|
$label_caption</li>";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
print "</ul></li></ul>"; */
|
print "</ul>";
|
||||||
|
print "</td>";
|
||||||
print __('Select:')."
|
|
||||||
<a href=\"$sel_all_link\">".__('All')."</a>,
|
|
||||||
<a href=\"$sel_unread_link\">".__('Unread')."</a>,
|
|
||||||
<a href=\"$sel_inv_link\">".__('Invert')."</a>,
|
|
||||||
<a href=\"$sel_none_link\">".__('None')."</a></li>";
|
|
||||||
|
|
||||||
print " ";
|
|
||||||
|
|
||||||
print "<span
|
|
||||||
onmouseover=\"enable_selection(false)\"
|
|
||||||
onmouseout=\"enable_selection(true)\"
|
|
||||||
onclick=\"toggleHeadlineActions()\" id=\"headlineActionsDrop\">".
|
|
||||||
__("Actions...") . " <img src=\"images/down_arrow.png\">
|
|
||||||
</span>";
|
|
||||||
|
|
||||||
print "<ul id=\"headlineActionsBody\" style=\"display : none\">";
|
|
||||||
|
|
||||||
print "<li class=\"insensitive\">".__('Selection toggle:')."</li>
|
|
||||||
<li onclick=\"$tog_unread_link\"> ".__('Unread')."</li>
|
|
||||||
<li onclick=\"$tog_marked_link\"> ".__('Starred')."</li>
|
|
||||||
<li onclick=\"$tog_published_link\"> ".__('Published')."</li>
|
|
||||||
<!-- <li><span class=\"insensitive\">--------</span></li> -->
|
|
||||||
<li class=\"insensitive\">".__('Mark as read:')."</li>
|
|
||||||
<li onclick=\"$catchup_sel_link\"> ".__('Selection')."</li>";
|
|
||||||
|
|
||||||
print "<li onclick=\"$catchup_feed_link\"> ".__('Entire feed').
|
|
||||||
"</li>";
|
|
||||||
|
|
||||||
//print "<li><span class=\"insensitive\">--------</span></li>";
|
|
||||||
print "<li class=\"insensitive\">".__('Assign label:')."</li>";
|
|
||||||
|
|
||||||
print "<li onclick=\"javascript:addLabel()\">
|
|
||||||
".__("Create label...")."</li>";
|
|
||||||
|
|
||||||
$result = db_query($link, "SELECT id, caption FROM ttrss_labels2 WHERE
|
|
||||||
owner_uid = '".$_SESSION["uid"]."' ORDER BY caption");
|
|
||||||
|
|
||||||
while ($line = db_fetch_assoc($result)) {
|
|
||||||
|
|
||||||
$label_id = $line["id"];
|
|
||||||
$label_caption = $line["caption"];
|
|
||||||
|
|
||||||
if ($feed_id < -10 && $feed_id == -11-$label_id) {
|
|
||||||
print "<li onclick=\"javascript:selectionRemoveLabel($label_id)\">
|
|
||||||
$label_caption ".__('(remove)')."</li>";
|
|
||||||
} else {
|
|
||||||
print "<li onclick=\"javascript:selectionAssignLabel($label_id)\">
|
|
||||||
$label_caption</li>";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
print "</ul>";
|
|
||||||
|
|
||||||
print "</td>";
|
|
||||||
|
|
||||||
print "<td class=\"headlineTitle$rtl_cpart\">";
|
print "<td class=\"headlineTitle$rtl_cpart\">";
|
||||||
|
|
||||||
print "<span id=\"subtoolbar_search\"
|
|
||||||
style=\"display : none\"><input
|
|
||||||
id=\"subtoolbar_search_box\"
|
|
||||||
onblur=\"javascript:enableHotkeys();\"
|
|
||||||
onfocus=\"javascript:disableHotkeys();\"
|
|
||||||
onchange=\"subtoolbarSearch()\"
|
|
||||||
onkeyup=\"subtoolbarSearch()\" type=\"search\"></span>";
|
|
||||||
|
|
||||||
print "<span id=\"subtoolbar_ftitle\">";
|
print "<span id=\"subtoolbar_ftitle\">";
|
||||||
|
|
||||||
if ($feed_site_url) {
|
if ($feed_site_url) {
|
||||||
|
|
|
||||||
13
tt-rss.js
13
tt-rss.js
|
|
@ -1202,19 +1202,6 @@ function hotkey_handler(e) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (keycode == 220 && shift_key) { // shift + |
|
|
||||||
if (document.getElementById("subtoolbar_search")) {
|
|
||||||
if (Element.visible("subtoolbar_search")) {
|
|
||||||
Element.hide("subtoolbar_search");
|
|
||||||
Element.show("subtoolbar_ftitle");
|
|
||||||
setTimeout("Element.focus('subtoolbar_search_box')", 100);
|
|
||||||
} else {
|
|
||||||
Element.show("subtoolbar_search");
|
|
||||||
Element.hide("subtoolbar_ftitle");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (keycode == 88) { // x
|
if (keycode == 88) { // x
|
||||||
if (activeFeedIsCat()) {
|
if (activeFeedIsCat()) {
|
||||||
toggleCollapseCat(getActiveFeedId());
|
toggleCollapseCat(getActiveFeedId());
|
||||||
|
|
|
||||||
40
viewfeed.js
40
viewfeed.js
|
|
@ -177,8 +177,6 @@ function headlines_callback2(transport, feed_cur_page) {
|
||||||
markHeadline(ids[i]);
|
markHeadline(ids[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
subtoolbarSearch();
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
debug("no new headlines received");
|
debug("no new headlines received");
|
||||||
}
|
}
|
||||||
|
|
@ -1822,44 +1820,6 @@ function fixHeadlinesOrder(ids) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function subtoolbarSearch() {
|
|
||||||
try {
|
|
||||||
|
|
||||||
var q = document.getElementById("subtoolbar_search_box");
|
|
||||||
|
|
||||||
if (!q) return;
|
|
||||||
|
|
||||||
q = q.value.toUpperCase();
|
|
||||||
|
|
||||||
var ids = false;
|
|
||||||
var vis_ids = new Array();
|
|
||||||
|
|
||||||
if (document.getElementById("headlinesList")) {
|
|
||||||
ids = getVisibleHeadlineIds();
|
|
||||||
} else {
|
|
||||||
ids = cdmGetVisibleArticles();
|
|
||||||
}
|
|
||||||
|
|
||||||
for (var i = 0; i < ids.length; i++) {
|
|
||||||
var title = document.getElementById("RTITLE-" + ids[i]);
|
|
||||||
|
|
||||||
if (title) {
|
|
||||||
if (!title.innerHTML.toUpperCase().match(q)) {
|
|
||||||
Element.hide(document.getElementById("RROW-" + ids[i]));
|
|
||||||
} else {
|
|
||||||
Element.show(document.getElementById("RROW-" + ids[i]));
|
|
||||||
vis_ids.push(ids[i]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fixHeadlinesOrder(vis_ids);
|
|
||||||
|
|
||||||
} catch (e) {
|
|
||||||
exception_error("subtoolbarSearch", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function hideReadHeadlines() {
|
function hideReadHeadlines() {
|
||||||
try {
|
try {
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue