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

tag editor

This commit is contained in:
Andrew Dolgov 2006-12-07 08:48:00 +01:00
parent faf40998b3
commit 0b126ac277
6 changed files with 165 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
backend.php
View File

@ -223,7 +223,7 @@
print "<tr><td width='70%'><a $link_target href=\"" . $line["link"] . "\">" .
$line["title"] . "</a>$entry_author</td>";
} else {
print "<tr><td width='30%'>" . $line["title"] . "$entry_author</td>";
print "<tr><td width='70%'>" . $line["title"] . "$entry_author</td>";
}
$parsed_updated = date(get_pref($link, 'LONG_DATE_FORMAT'),
@ -247,9 +247,9 @@
$tag = $tmp_line["tag_name"];
$tag_str = "<a href=\"javascript:parent.viewfeed('$tag')\">$tag</a>, ";
if ($num_tags == 5) {
if ($num_tags == 3) {
$tags_str .= "<a href=\"javascript:showBlockElement('allEntryTags')\">...</a>";
} else if ($num_tags < 5) {
} else if ($num_tags < 3) {
$tags_str .= $tag_str;
}
$f_tags_str .= $tag_str;
@ -260,18 +260,18 @@
// $truncated_link = truncate_string($line["link"], 60);
if ($tags_str || $entry_comments) {
# if ($tags_str || $entry_comments) {
print "<tr><td width='50%'>
$entry_comments</td>
<td align=\"right\">$tags_str</td></tr>";
}
<td align=\"right\">$tags_str <a href=\"javascript:editArticleTags($id, $feed_id)\">(+)</a></td></tr>";
# }
print "</table></div>";
print "<div class=\"postIcon\">" . $feed_icon . "</div>";
print "<div class=\"postContent\">";
if (db_num_rows($tmp_result) > 5) {
if (db_num_rows($tmp_result) > 0) {
print "<div id=\"allEntryTags\">Tags: $f_tags_str</div>";
}

17
functions.php
View File

@ -3009,4 +3009,21 @@
}
function get_article_tags($link, $id) {
$a_id = db_escape_string($id);
$tmp_result = db_query($link, "SELECT DISTINCT tag_name FROM
ttrss_tags WHERE post_int_id = (SELECT int_id FROM ttrss_user_entries WHERE
ref_id = '$a_id' AND owner_uid = '".$_SESSION["uid"]."') ORDER BY tag_name");
$tags = array();
while ($tmp_line = db_fetch_assoc($tmp_result)) {
array_push($tags, $tmp_line["tag_name"]);
}
return $tags;
}
?>

40
modules/backend-rpc.php
View File

@ -202,5 +202,45 @@
<message>$key : $value</message>
</rpc-reply>";
}
if ($subop == "setArticleTags") {
$id = db_escape_string($_GET["id"]);
$tags_str = db_escape_string($_GET["tags_str"]);
$tags = split(",", $tags_str);
db_query($link, "BEGIN");
$result = db_query($link, "SELECT int_id FROM ttrss_user_entries WHERE
ref_id = '$id' AND owner_uid = '".$_SESSION["uid"]."' LIMIT 1");
if (db_num_rows($result) == 1) {
$int_id = db_fetch_result($result, 0, "int_id");
db_query($link, "DELETE FROM ttrss_tags WHERE
post_int_id = $int_id AND owner_uid = '".$_SESSION["uid"]."'");
foreach ($tags as $tag) {
$tag = trim($tag);
if (preg_match("/^[0-9]*$/", $tag)) {
continue;
}
if ($tag != '') {
db_query($link, "INSERT INTO ttrss_tags
(post_int_id, owner_uid, tag_name) VALUES ('$int_id', '".$_SESSION["uid"]."', '$tag')");
}
}
}
db_query($link, "COMMIT");
print "<rpc-reply>
<message>$id</message>
</rpc-reply>";
}
}
?>

36
modules/popup-dialog.php
View File

@ -1,7 +1,7 @@
<?php
function module_popup_dialog($link) {
$id = $_GET["id"];
$param = $_GET["param"];
$param = db_escape_string($_GET["param"]);
if ($id == "quickAddFeed") {
@ -270,6 +270,40 @@
}
if ($id == "editArticleTags") {
print "<div id=\"infoBoxTitle\">Edit Tags</div>";
print "<div class=\"infoBoxContents\">";
print "<form id=\"tag_edit_form\">";
print "Tags for this article (separated by commas):<br>";
$tags = get_article_tags($link, $param);
$tags_str = join(", ", $tags);
print "<input type=\"hidden\" name=\"id\" value=\"$param\">";
print "<textarea rows='4' class='iedit' name='tags_str'>$tags_str</textarea>";
print "</form>";
print "<div align='right'>";
print "<input class=\"button\"
type=\"submit\" onclick=\"return editTagsSave()\"
value=\"Save\"> ";
print "<input class=\"button\"
type=\"submit\" onclick=\"return closeInfoBox()\"
value=\"Cancel\">";
print "</div>";
}
print "</div>";
}
?>

4
tt-rss.js
View File

@ -22,6 +22,10 @@ var init_params = new Object();
var op_history = new Array();
function tagsAreDisplayed() {
return display_tags;
}
function toggleTags() {
display_tags = !display_tags;

63
viewfeed.js
View File

@ -1,6 +1,13 @@
var active_post_id = false;
var _catchup_callback_func = false;
var last_article_view = false;
var active_real_feed_id = false;
var _tag_active_post_id = false;
var _tag_active_feed_id = false;
// FIXME: kludge, needs proper implementation
var _reload_feedlist_after_view = false;
function catchup_callback() {
if (xmlhttp_rpc.readyState == 4) {
@ -47,7 +54,13 @@ function article_callback() {
if (typeof correctPNG != 'undefined') {
correctPNG();
}
update_all_counters();
if (_reload_feedlist_after_view) {
setTimeout('updateFeedList(false, false)', 50);
_reload_feedlist_after_view = false;
} else {
update_all_counters();
}
}
}
@ -56,6 +69,8 @@ function view(id, feed_id, skip_history) {
try {
debug("loading article: " + id + "/" + feed_id);
active_real_feed_id = feed_id;
if (!skip_history) {
history_push("ARTICLE:" + id + ":" + feed_id);
}
@ -427,4 +442,50 @@ function labelFromSearch(search, search_mode, match_on, feed_id, is_cat) {
}
function editArticleTags(id, feed_id) {
_tag_active_post_id = id;
_tag_active_feed_id = feed_id;
displayDlg('editArticleTags', id);
}
function tag_saved_callback() {
if (xmlhttp_rpc.readyState == 4) {
try {
debug("in tag_saved_callback");
closeInfoBox();
notify("");
if (tagsAreDisplayed()) {
_reload_feedlist_after_view = true;
}
if (active_post_id == _tag_active_post_id) {
debug("reloading current article");
view(_tag_active_post_id, _tag_active_feed_id);
}
} catch (e) {
exception_error("catchup_callback", e);
}
}
}
function editTagsSave() {
if (!xmlhttp_ready(xmlhttp_rpc)) {
printLockingError();
}
notify("Saving article tags...");
var form = document.forms["tag_edit_form"];
var query = Form.serialize("tag_edit_form");
xmlhttp_rpc.open("GET", "backend.php?op=rpc&subop=setArticleTags&" + query, true);
xmlhttp_rpc.onreadystatechange=tag_saved_callback;
xmlhttp_rpc.send(null);
}