From db54143e8852bd7e428fb82f714cc0d56161be7b Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@bah.org.ru>
Date: Tue, 6 Oct 2009 12:36:31 +0400
Subject: [PATCH] rework article note appearance

---
 functions.php | 16 +++++++++-------
 tt-rss.css    | 10 ++++++++--
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/functions.php b/functions.php
index 3249a5d7..25ff2799 100644
--- a/functions.php
+++ b/functions.php
@@ -3473,9 +3473,9 @@
 	function generate_syndicated_feed($link, $owner_uid, $feed, $is_cat,
 		$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;".
-			"margin-top : 5px; color : #9a8c59;";
+			"margin-bottom : 1em; color : #9a8c59;";
 
 		if (!$limit) $limit = 30;
 
@@ -3516,13 +3516,15 @@
  			print "<title>" . 
  				htmlspecialchars($line["title"]) . "</title>";
   
- 			print "<description><![CDATA[";
-			print sanitize_rss($link, $line["content_preview"]);
+			print "<description><![CDATA[";
+
 			if ($line["note"]) {
 				print "<div style='$note_style'>";
 				print $line["note"];
 				print "</div>";
 			}
+
+			print sanitize_rss($link, $line["content_preview"]);
 			print "]]></description>";
   
  			print "</item>";
@@ -4678,14 +4680,14 @@
 					$article_content);
 			}
 
-			print $article_content;
-
 			print "<div id=\"POSTNOTE-$id\">";
 				if ($line['note']) {
 					print format_article_note($id, $line['note']);
 				}
 			print "</div>";
 
+			print $article_content;
+
 			$result = db_query($link, "SELECT * FROM ttrss_enclosures WHERE
 				post_id = '$id' AND content_url != ''");
 
@@ -6195,11 +6197,11 @@
 		$note_escaped = htmlspecialchars($note, ENT_QUOTES);
 
 		$str = "<div class='articleNote'>";
+		$str .= $note;
 		$str .= "<div class='articleNoteOps'>";
 		$str .= "<a href=\"javascript:publishWithNote($id, '$note_escaped')\">".
 			__('edit note')."</a>";
 		$str .= "</div>";
-		$str .= $note;
 		$str .= "</div>";
 
 		return $str;
diff --git a/tt-rss.css b/tt-rss.css
index d12e286a..697a4680 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -71,8 +71,10 @@ div.postReply img.tagsPic {
 }
 
 div.articleNote div.articleNoteOps {
-	float : right;
+	text-align : center;
 	color : #9a8c59;
+	font-style : italic;
+	margin-top : 5px;
 }
 
 div.articleNote div.articleNoteOps a {
@@ -90,8 +92,12 @@ div.articleNote {
 	border-style : dashed;
 	border-color : #e7d796;
 	font-size : 8px;
-	margin-top : 5px;
+	margin-bottom : 5px;
+	margin-left : 5px;
+	float : right;
 	color : #9a8c59;
+	max-width : 150px;
+	text-align : justify;
 }
 
 div.postReply span.author {