mobile: allow showing category content inline (closes #315)

10 files changed, 54 insertions, 13 deletions

diff --git a/mobile/feed.php b/mobile/feed.php
index 966e1b440..bd5804cca 100644
--- a/mobile/feed.php
+++ b/mobile/feed.php
@@ -24,7 +24,8 @@
 	$cat_id = db_escape_string($_REQUEST["cat"]);
 	$offset = (int) db_escape_string($_REQUEST["skip"]);
 	$search = db_escape_string($_REQUEST["search"]);
+	$is_cat = (bool) db_escape_string($_REQUEST["is_cat"]);
 
-  	render_headlines_list($link, $feed_id, $cat_id, $offset, $search);
+  	render_headlines_list($link, $feed_id, $cat_id, $offset, $search, $is_cat);
 ?>
 
diff --git a/mobile/functions.php b/mobile/functions.php
index 7f5dd5c6f..68530cf8f 100644
--- a/mobile/functions.php
+++ b/mobile/functions.php
@@ -100,9 +100,9 @@
 
 	}
 
-	function render_category($link, $cat_id) {
+	function render_category($link, $cat_id, $offset) {
 		$owner_uid = $_SESSION["uid"];
-
+	
 		if ($cat_id >= 0) {
 
 			if ($cat_id != 0) {
@@ -227,10 +227,11 @@
 
 	function render_categories_list($link) {
 		$owner_uid = $_SESSION["uid"];
-  
+
+		$cat_browse = mobile_get_pref($link, "BROWSE_CATS");
+
 		print '<ul id="home" title="'.__('Home').'" selected="true"
 			myBackLabel="'.__('Logout').'" myBackHref="logout.php" myBackTarget="_self">';
-
 		
 //		print "<li><a href='#searchForm'>Search...</a></li>";
 
@@ -244,7 +245,10 @@
 				$class = 'oldItem';
 			}
 
-			print "<li class='$class'><a href='cat.php?id=$id'>$title</a></li>";
+			if ($cat_browse)
+				print "<li class='$class'><a href='cat.php?id=$id'>$title</a></li>";
+			else
+				print "<li class='$class'><a href='feed.php?id=$id&is_cat=true'>$title</a></li>";
 		}
 
 		$result = db_query($link, "SELECT 
@@ -273,8 +277,13 @@
 				}
 
 				if ($unread > 0 || !mobile_get_pref($link, "HIDE_READ")) {
-					print "<li class='$class'><a href='cat.php?id=$id'>" . 
-						$line["title"] . "</a></li>";
+
+					if ($cat_browse) 
+						print "<li class='$class'><a href='cat.php?id=$id'>" . 
+							$line["title"] . "</a></li>";
+					else
+						print "<li class='$class'><a href='feed.php?id=$id&is_cat=true'>".
+							$line["title"] . "</a></li>";
 				}
 			}
 		}
@@ -304,12 +313,12 @@
 		print "</ul>";
 	}
 
-	function render_headlines_list($link, $feed_id, $cat_id, $offset, $search) {
+	function render_headlines_list($link, $feed_id, $cat_id, $offset, $search, 
+		$is_cat = false) {
 
 		$feed_id = $feed_id;
 		$limit = 15;
 		$filter = '';
-		$is_cat = false;
 		$view_mode = 'adaptive';
 
 		if ($search) {
diff --git a/mobile/mobile.css b/mobile/mobile.css
index bbf286b07..8068e3d38 100644
--- a/mobile/mobile.css
+++ b/mobile/mobile.css
@@ -30,3 +30,9 @@ div.nav .button.right {
 ul li a.read {
     color: #666666;
 }
+
+ul li span.browse {
+	color : #909090;
+	text-align : right;
+	float : right;
+}
diff --git a/mobile/mobile.js b/mobile/mobile.js
index 57908bc08..6b5736193 100644
--- a/mobile/mobile.js
+++ b/mobile/mobile.js
@@ -140,3 +140,4 @@ function showRestOfFeed(feed_id) {
         iui.showPage($("home"), true);
     }
 }
+
diff --git a/mobile/prefs.php b/mobile/prefs.php
index 08d6d1b55..e3ccd7db9 100644
--- a/mobile/prefs.php
+++ b/mobile/prefs.php
@@ -32,6 +32,12 @@
 </div>
 
 <div class="row">
+	<label><?php echo __('Browse categories like folders') ?></label>
+	<div class="toggle" id="BROWSE_CATS" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled($link, "BROWSE_CATS") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
+</div>
+
+
+<div class="row">
 	<label><?php echo __('Show images in posts') ?></label>
 	<div class="toggle" id="SHOW_IMAGES" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled($link, "SHOW_IMAGES") ?>"><span class="thumb"></span><span class="toggleOn"><?php echo __('ON') ?></span><span class="toggleOff"><?php echo __('OFF') ?></span></div>
 </div>
diff --git a/sanity_check.php b/sanity_check.php
index d70445e02..ad93b0cc7 100644
--- a/sanity_check.php
+++ b/sanity_check.php
@@ -2,7 +2,7 @@
 	require_once "functions.php";
 
 	define('EXPECTED_CONFIG_VERSION', 21);
-	define('SCHEMA_VERSION', 78);
+	define('SCHEMA_VERSION', 79);
 
 	if (!file_exists("config.php")) {
 		print "<b>Fatal Error</b>: You forgot to copy 
diff --git a/schema/ttrss_schema_mysql.sql b/schema/ttrss_schema_mysql.sql
index 7e9a5e761..c1d080e2e 100644
--- a/schema/ttrss_schema_mysql.sql
+++ b/schema/ttrss_schema_mysql.sql
@@ -258,7 +258,7 @@ create table ttrss_tags (id integer primary key auto_increment,
 
 create table ttrss_version (schema_version int not null) TYPE=InnoDB DEFAULT CHARSET=UTF8;
 
-insert into ttrss_version values (78);
+insert into ttrss_version values (79);
 
 create table ttrss_enclosures (id integer primary key auto_increment,
 	content_url text not null,
@@ -389,6 +389,8 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('SORT_HEADLINES_BY_FEED_DATE', 1, 'true', 'Sort headlines by feed date',3, 'Use feed-specified date to sort headlines instead of local import date.');
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_MOBILE_BROWSE_CATS', 1, 'true', '', 1);
+
 create table ttrss_user_prefs (
    owner_uid integer not null,
    pref_name varchar(250),
diff --git a/schema/ttrss_schema_pgsql.sql b/schema/ttrss_schema_pgsql.sql
index 414fc28ea..e0973bdcc 100644
--- a/schema/ttrss_schema_pgsql.sql
+++ b/schema/ttrss_schema_pgsql.sql
@@ -229,7 +229,7 @@ create index ttrss_tags_post_int_id_idx on ttrss_tags(post_int_id);
 
 create table ttrss_version (schema_version int not null);
 
-insert into ttrss_version values (78);
+insert into ttrss_version values (79);
 
 create table ttrss_enclosures (id serial not null primary key,
 	content_url text not null,
@@ -353,6 +353,8 @@ insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_
 
 insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id,help_text) values('USER_STYLESHEET', 2, '', 'Customize stylesheet', 2, 'Customize CSS stylesheet to your liking');
 
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_MOBILE_BROWSE_CATS', 1, 'true', '', 1);
+
 create table ttrss_user_prefs (
 	owner_uid integer not null references ttrss_users(id) ON DELETE CASCADE,
 	pref_name varchar(250) not null references ttrss_prefs(pref_name) ON DELETE CASCADE,
diff --git a/schema/versions/mysql/79.sql b/schema/versions/mysql/79.sql
new file mode 100644
index 000000000..7e8c31d49
--- /dev/null
+++ b/schema/versions/mysql/79.sql
@@ -0,0 +1,7 @@
+begin;
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_MOBILE_BROWSE_CATS', 1, 'true', '', 1);
+
+update ttrss_version set schema_version = 79;
+
+commit;
diff --git a/schema/versions/pgsql/79.sql b/schema/versions/pgsql/79.sql
new file mode 100644
index 000000000..7e8c31d49
--- /dev/null
+++ b/schema/versions/pgsql/79.sql
@@ -0,0 +1,7 @@
+begin;
+
+insert into ttrss_prefs (pref_name,type_id,def_value,short_desc,section_id) values('_MOBILE_BROWSE_CATS', 1, 'true', '', 1);
+
+update ttrss_version set schema_version = 79;
+
+commit;