diff --git a/TODO b/TODO
index d86acab7..7459b5f8 100644
--- a/TODO
+++ b/TODO
@@ -9,4 +9,4 @@ Mysterious Future
- Gmail-like labels for feed categories (needs UI thinking)
- support for "starred" posts (+ maybe Starred label)
- global search
-
+- optional three column layout
diff --git a/backend.php b/backend.php
index 03c7bb07..89e51716 100644
--- a/backend.php
+++ b/backend.php
@@ -186,11 +186,23 @@
$result = pg_query("UPDATE ttrss_entries SET unread = false,last_read = NOW() WHERE id = '$id'");
+ $addheader = $_GET["addheader"];
+
$result = pg_query("SELECT title,link,content,feed_id,comments,
(SELECT icon_url FROM ttrss_feeds WHERE id = feed_id) as icon_url
FROM ttrss_entries
WHERE id = '$id'");
+ if ($addheader) {
+
+ print "
+
+ Tiny Tiny RSS : Article $id
+
+
+ ";
+ }
+
if ($result) {
$line = pg_fetch_assoc($result);
@@ -226,6 +238,10 @@
print "";
}
+
+ if ($addheader) {
+ print "";
+ }
}
if ($op == "viewfeed") {
diff --git a/config.php-dist b/config.php-dist
index e441a94b..0860c8f7 100644
--- a/config.php-dist
+++ b/config.php-dist
@@ -22,6 +22,9 @@
define(ENABLE_PREFS_CATCHUP_UNCATCHUP, false);
// enable "Mark as read/unread" buttons in preferences dialog
-
+
+ define(ENABLE_CONTENT_IFRAME, true);
+ // show article in an iframe to mitigate scrolling UI issues
+
?>
diff --git a/tt-rss.css b/tt-rss.css
index f2c15c64..3c3dae03 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -375,4 +375,10 @@ div.expPane {
margin : 15px;
}
-
+iframe.contentFrame {
+ width : 100%;
+ border-width : 0px;
+ padding : 0px;
+ margin : 0px;
+ height : 100%;
+}
diff --git a/tt-rss.js b/tt-rss.js
index 53360f81..de262f91 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -423,11 +423,16 @@ function view(id,feed_id) {
active_post_id = id;
- xmlhttp_view.open("GET", "backend.php?op=view&id=" + param_escape(id), true);
- xmlhttp_view.onreadystatechange=view_callback;
- xmlhttp_view.send(null);
-
+ var content = document.getElementById("content-frame");
+ if (content) {
+ content.src = "backend.php?op=view&addheader=true&id=" + param_escape(id);
+ markHeadline(active_post_id);
+ } else {
+ xmlhttp_view.open("GET", "backend.php?op=view&id=" + param_escape(id), true);
+ xmlhttp_view.onreadystatechange=view_callback;
+ xmlhttp_view.send(null);
+ }
}
function timeout() {
@@ -615,4 +620,6 @@ function init() {
updateFeedList(false, false);
document.onkeydown = hotkey_handler;
setTimeout("timeout()", 1800*1000);
+
+ var content = document.getElementById("content");
}
diff --git a/tt-rss.php b/tt-rss.php
index 338b3efc..e4efe330 100644
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -46,7 +46,9 @@
|
-
+
+ |