From c4904f2b5a3b134d35592e08b12d788f97faa690 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Tue, 14 Jun 2011 14:03:21 +0400
Subject: mobile: show originating feed in article view when necessary (closes
 #347)

---
 mobile/functions.php | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

(limited to 'mobile/functions.php')

diff --git a/mobile/functions.php b/mobile/functions.php
index d99a47546..eb523d710 100644
--- a/mobile/functions.php
+++ b/mobile/functions.php
@@ -469,9 +469,18 @@
 				selected=\"true\"
 				myBackLabel='$feed_title' myBackHref='feed.php?id=$feed_id&cat=$cat_id&is_cat=$is_cat'>";
 
-			print "<h2><a target='_blank' href='$article_link'>$title</a></h2>";
+			if ($line['feed_id'] != $feed_id) {
+				$real_feed_title = getFeedTitle($link, $line['feed_id']);
+				$real_feed_id = $line['feed_id'];
+				$feed_link = "(<a href=\"feed.php?id=$real_feed_id\">$real_feed_title</a>)";
+			}
+//			print "<fieldset>";
 
-			print "<fieldset>";
+			print "<div style='float : right'>($updated_fmt)</div>";
+
+			print "<h2><a target='_blank' href='$article_link'>$title</a> $feed_link</h2>";
+
+			print "<hr>";
 
 /*			print "<div class=\"row\">";
 			print "<label id='title'><a target='_blank' href='$article_link'>$title</a></label>";
@@ -480,12 +489,12 @@
 			$is_starred = (sql_bool_to_bool($line["marked"])) ? "true" : "false";
 			$is_published = (sql_bool_to_bool($line["published"])) ? "true" : "false";
 
-			print "<div class=\"row\">";
-			print "<label id='updated'>Updated:</label>";
-			print "<input enabled='false' name='updated' disabled value='$updated_fmt'/>";
-			print "</div>";
+			//print "<div class=\"row\">";
+			//print "<label id='updated'>Updated:</label>";
+			//print "<input enabled='false' name='updated' disabled value='$updated_fmt'/>";
+			//print "</div>";
 
-			print "</fieldset>";
+//			print "</fieldset>";
 
 			$content = sanitize_rss($link, $line["content"]);
 			$content = preg_replace("/href=/i", "target=\"_blank\" href=", $content);
-- 
cgit v1.2.3