mirror of
https://git.tt-rss.org/git/tt-rss.git
synced 2025-12-14 14:25:56 +00:00
CDM tweaks, mark article as unread when using 'v' in CDM
This commit is contained in:
@@ -70,9 +70,17 @@ function open_article_callback() {
|
|||||||
|
|
||||||
if (xmlhttp_rpc.responseXML) {
|
if (xmlhttp_rpc.responseXML) {
|
||||||
var link = xmlhttp_rpc.responseXML.getElementsByTagName("link")[0];
|
var link = xmlhttp_rpc.responseXML.getElementsByTagName("link")[0];
|
||||||
|
var id = xmlhttp_rpc.responseXML.getElementsByTagName("id")[0];
|
||||||
|
|
||||||
if (link) {
|
if (link) {
|
||||||
window.open(link.firstChild.nodeValue, "_blank");
|
window.open(link.firstChild.nodeValue, "_blank");
|
||||||
|
|
||||||
|
if (id) {
|
||||||
|
id = id.firstChild.nodeValue;
|
||||||
|
if (!document.getElementById("headlinesList")) {
|
||||||
|
window.setTimeout("toggleUnread(" + id + ", 0)", 100);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3943,13 +3943,16 @@
|
|||||||
|
|
||||||
print "<div class=\"cdmContent\">" . $line["content_preview"] . "</div><br clear=\"all\">";
|
print "<div class=\"cdmContent\">" . $line["content_preview"] . "</div><br clear=\"all\">";
|
||||||
|
|
||||||
print "<div class=\"cdmFooter\">";
|
print "<div class=\"cdmFooter\"><span class='s0'>";
|
||||||
|
|
||||||
print "$marked_pic";
|
/* print "<div class=\"markedPic\">Star it: $marked_pic</div>"; */
|
||||||
|
|
||||||
print "<input type=\"checkbox\" onclick=\"toggleSelectRowById(this,
|
print __("Select:").
|
||||||
|
" <input type=\"checkbox\" onclick=\"toggleSelectRowById(this,
|
||||||
'RROW-$id')\" class=\"feedCheckBox\" id=\"RCHK-$id\">";
|
'RROW-$id')\" class=\"feedCheckBox\" id=\"RCHK-$id\">";
|
||||||
|
|
||||||
|
print "</span><span class='s1'>$marked_pic</span> ";
|
||||||
|
|
||||||
$tags = get_article_tags($link, $id);
|
$tags = get_article_tags($link, $id);
|
||||||
|
|
||||||
$tags_str = "";
|
$tags_str = "";
|
||||||
@@ -3962,16 +3965,19 @@
|
|||||||
$tags_str = preg_replace("/, $/", "", $tags_str);
|
$tags_str = preg_replace("/, $/", "", $tags_str);
|
||||||
|
|
||||||
if ($tags_str == "") $tags_str = "no tags";
|
if ($tags_str == "") $tags_str = "no tags";
|
||||||
|
|
||||||
print " $tags_str <a title=\"Edit tags for this article\"
|
// print "<img src='images/tag.png' class='markedPic'>";
|
||||||
|
|
||||||
|
print "<span class='s1'>Tags: $tags_str <a title=\"Edit tags for this article\"
|
||||||
href=\"javascript:editArticleTags($id, $feed_id, true)\">(+)</a>";
|
href=\"javascript:editArticleTags($id, $feed_id, true)\">(+)</a>";
|
||||||
|
|
||||||
|
print "</span>";
|
||||||
|
|
||||||
|
print "<span class='s2'>Toggle: <a class=\"cdmToggleLink\"
|
||||||
|
href=\"javascript:toggleUnread($id)\">
|
||||||
|
Unread</a></span>";
|
||||||
|
|
||||||
print "</div>";
|
print "</div>";
|
||||||
|
|
||||||
# print "<div align=\"center\"><a class=\"cdmToggleLink\"
|
|
||||||
# href=\"javascript:toggleUnread($id)\">
|
|
||||||
# Toggle unread</a></div>";
|
|
||||||
|
|
||||||
print "</div>";
|
print "</div>";
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -210,7 +210,7 @@
|
|||||||
|
|
||||||
if (db_num_rows($result) == 1) {
|
if (db_num_rows($result) == 1) {
|
||||||
$link = strip_tags(db_fetch_result($result, 0, "link"));
|
$link = strip_tags(db_fetch_result($result, 0, "link"));
|
||||||
print "<rpc-reply><link>$link</link></rpc-reply>";
|
print "<rpc-reply><link>$link</link><id>$id</id></rpc-reply>";
|
||||||
} else {
|
} else {
|
||||||
print "<rpc-reply><error>Article not found</error></rpc-reply>";
|
print "<rpc-reply><error>Article not found</error></rpc-reply>";
|
||||||
}
|
}
|
||||||
|
|||||||
49
tt-rss.css
49
tt-rss.css
@@ -845,30 +845,30 @@ td.hlFeed {
|
|||||||
text-align : right;
|
text-align : right;
|
||||||
}
|
}
|
||||||
|
|
||||||
div.cdmArticle:hover {
|
/* div.cdmArticle:hover {
|
||||||
background-color : white;
|
background-color : white;
|
||||||
}
|
} */
|
||||||
|
|
||||||
div.cdmArticle {
|
div.cdmArticle {
|
||||||
border-color : #c0c0c0;
|
border-color : #a0a0a0;
|
||||||
border-width : 0px 0px 1px 0px;
|
border-width : 0px 0px 1px 0px;
|
||||||
border-style : solid;
|
border-style : solid;
|
||||||
background-color : #fafafa;
|
background-color : #fafafa;
|
||||||
margin : 0px;
|
margin : 0px;
|
||||||
padding : 10px;
|
/* padding : 10px; */
|
||||||
}
|
}
|
||||||
|
|
||||||
div.cdmArticleUnread:hover {
|
/* div.cdmArticleUnread:hover {
|
||||||
background-color : white;
|
background-color : white;
|
||||||
}
|
} */
|
||||||
|
|
||||||
div.cdmArticleUnread {
|
div.cdmArticleUnread {
|
||||||
border-color : #c0c0c0;
|
border-color : #a0a0a0;
|
||||||
border-width : 0px 0px 1px 0px;
|
border-width : 0px 0px 1px 0px;
|
||||||
border-style : solid;
|
border-style : solid;
|
||||||
background-color : #fafeff;
|
background-color : #fafeff;
|
||||||
margin : 0px;
|
margin : 0px;
|
||||||
padding : 10px;
|
/* padding : 10px; */
|
||||||
}
|
}
|
||||||
|
|
||||||
div.cdmArticleSelected, div.cdmArticleUnreadSelected {
|
div.cdmArticleSelected, div.cdmArticleUnreadSelected {
|
||||||
@@ -886,7 +886,7 @@ div.cdmArticleUnreadSelected div.cdmHeader a.title {
|
|||||||
}
|
}
|
||||||
|
|
||||||
div.cdmHeader {
|
div.cdmHeader {
|
||||||
padding-bottom : 5px;
|
padding : 5px 5px 10px 5px;
|
||||||
}
|
}
|
||||||
|
|
||||||
div.cdmArticleUnread div.cdmHeader a {
|
div.cdmArticleUnread div.cdmHeader a {
|
||||||
@@ -895,16 +895,40 @@ div.cdmArticleUnread div.cdmHeader a {
|
|||||||
|
|
||||||
div.cdmFooter {
|
div.cdmFooter {
|
||||||
font-size : 9pt;
|
font-size : 9pt;
|
||||||
|
color : black;
|
||||||
|
padding : 5px;
|
||||||
color : gray;
|
color : gray;
|
||||||
padding-top : 5px;
|
background-color : white;
|
||||||
|
border-width : 1px 0px 0px 0px;
|
||||||
|
border-color : #c0c0c0;
|
||||||
|
border-style : dotted;
|
||||||
|
}
|
||||||
|
|
||||||
|
div.cdmFooter span.s0 {
|
||||||
|
border-width : 0px 1px 0px 0px;
|
||||||
|
border-color : #c0c0c0;
|
||||||
|
border-style : dotted;
|
||||||
|
padding : 0px 10px 0px 0px;
|
||||||
|
}
|
||||||
|
|
||||||
|
div.cdmFooter span.s1 {
|
||||||
|
border-width : 0px 1px 0px 0px;
|
||||||
|
border-color : #c0c0c0;
|
||||||
|
border-style : dotted;
|
||||||
|
padding : 0px 10px 0px 10px;
|
||||||
|
}
|
||||||
|
|
||||||
|
div.cdmFooter span.s2 {
|
||||||
|
padding : 0px 10px 0px 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
div.cdmFooter img.markedPic {
|
div.cdmFooter img.markedPic {
|
||||||
width : 16px;
|
width : 16px;
|
||||||
height : 16px;
|
height : 16px;
|
||||||
float : right;
|
vertical-align : middle;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
div.cdmHeader div.articleUpdated {
|
div.cdmHeader div.articleUpdated {
|
||||||
float : right;
|
float : right;
|
||||||
}
|
}
|
||||||
@@ -923,7 +947,8 @@ div.cdmHeader a:hover {
|
|||||||
}
|
}
|
||||||
|
|
||||||
div.cdmContent {
|
div.cdmContent {
|
||||||
margin-bottom : 5px;
|
margin : 5px 15px 0px 15px;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
a.warning {
|
a.warning {
|
||||||
|
|||||||
Reference in New Issue
Block a user