public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2026-02-10 16:01:33 +00:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andrew Dolgov
2011-03-04 17:53:02 +03:00
parent a3ef7d106a
commit cfad9259a6
10 changed files with 54 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/feed.php
+2 -1
View File
@@ -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);
?>
mobile/functions.php
+18 -9
View File
@@ -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) {
mobile/mobile.css
+6
View File
@@ -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;
}
mobile/mobile.js
+1
View File
@@ -140,3 +140,4 @@ function showRestOfFeed(feed_id) {
iui.showPage($("home"), true);
}
}
mobile/prefs.php
+6
View File
@@ -31,6 +31,12 @@
<div class="toggle" id="ENABLE_CATS" onclick="setPref(this)" toggled="<?php echo mobile_pref_toggled($link, "ENABLE_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 __('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>