public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-20 20:51:29 +00:00
Code Issues Releases Wiki Activity

rework article note appearance

Browse Source
This commit is contained in:
Andrew Dolgov
2009-10-06 12:36:31 +04:00
parent c9efd838a9
commit db54143e88
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
functions.php
View File

@@ -3473,9 +3473,9 @@
function generate_syndicated_feed($link, $owner_uid, $feed, $is_cat, function generate_syndicated_feed($link, $owner_uid, $feed, $is_cat,
$limit, $search, $search_mode, $match_on) { $limit, $search, $search_mode, $match_on) {
$note_style = "background-color : #fff7d5; border-width : 1px; ". $note_style = "float : right; background-color : #fff7d5; border-width : 1px; ".
"padding : 5px; border-style : dashed; border-color : #e7d796;". "padding : 5px; border-style : dashed; border-color : #e7d796;".
"margin-top : 5px; color : #9a8c59;"; "margin-bottom : 1em; color : #9a8c59;";
if (!$limit) $limit = 30; if (!$limit) $limit = 30;
@@ -3517,12 +3517,14 @@
htmlspecialchars($line["title"]) . "</title>"; htmlspecialchars($line["title"]) . "</title>";
print "<description><![CDATA["; print "<description><![CDATA[";
print sanitize_rss($link, $line["content_preview"]);
if ($line["note"]) { if ($line["note"]) {
print "<div style='$note_style'>"; print "<div style='$note_style'>";
print $line["note"]; print $line["note"];
print "</div>"; print "</div>";
} }
print sanitize_rss($link, $line["content_preview"]);
print "]]></description>"; print "]]></description>";
print "</item>"; print "</item>";
@@ -4678,14 +4680,14 @@
$article_content); $article_content);
} }
print $article_content;
print "<div id=\"POSTNOTE-$id\">"; print "<div id=\"POSTNOTE-$id\">";
if ($line['note']) { if ($line['note']) {
print format_article_note($id, $line['note']); print format_article_note($id, $line['note']);
} }
print "</div>"; print "</div>";
print $article_content;
$result = db_query($link, "SELECT * FROM ttrss_enclosures WHERE $result = db_query($link, "SELECT * FROM ttrss_enclosures WHERE
post_id = '$id' AND content_url != ''"); post_id = '$id' AND content_url != ''");
@@ -6195,11 +6197,11 @@
$note_escaped = htmlspecialchars($note, ENT_QUOTES); $note_escaped = htmlspecialchars($note, ENT_QUOTES);
$str = "<div class='articleNote'>"; $str = "<div class='articleNote'>";
$str .= $note;
$str .= "<div class='articleNoteOps'>"; $str .= "<div class='articleNoteOps'>";
$str .= "<a href=\"javascript:publishWithNote($id, '$note_escaped')\">". $str .= "<a href=\"javascript:publishWithNote($id, '$note_escaped')\">".
__('edit note')."</a>"; __('edit note')."</a>";
$str .= "</div>"; $str .= "</div>";
$str .= $note;
$str .= "</div>"; $str .= "</div>";
return $str; return $str;

10
tt-rss.css
View File

@@ -71,8 +71,10 @@ div.postReply img.tagsPic {
} }
div.articleNote div.articleNoteOps { div.articleNote div.articleNoteOps {
float : right; text-align : center;
color : #9a8c59; color : #9a8c59;
font-style : italic;
margin-top : 5px;
} }
div.articleNote div.articleNoteOps a { div.articleNote div.articleNoteOps a {
@@ -90,8 +92,12 @@ div.articleNote {
border-style : dashed; border-style : dashed;
border-color : #e7d796; border-color : #e7d796;
font-size : 8px; font-size : 8px;
margin-top : 5px; margin-bottom : 5px;
margin-left : 5px;
float : right;
color : #9a8c59; color : #9a8c59;
max-width : 150px;
text-align : justify;
} }
div.postReply span.author { div.postReply span.author {