From 3518718b25d2d7ff540040293b06b5e872f86216 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 17 Dec 2009 19:42:30 +0300 Subject: [PATCH] mobile: add experimental iUI based version --- lib/iui/backButton.png | Bin 0 -> 816 bytes lib/iui/blueButton.png | Bin 0 -> 517 bytes lib/iui/cancel.png | Bin 0 -> 362 bytes lib/iui/grayButton.png | Bin 0 -> 943 bytes lib/iui/iui-logo-touch-icon.png | Bin 0 -> 2887 bytes lib/iui/iui.css | 396 ++++++++++++++ lib/iui/iui.js | 518 +++++++++++++++++++ lib/iui/iuix.css | 1 + lib/iui/iuix.js | 1 + lib/iui/listArrow.png | Bin 0 -> 259 bytes lib/iui/listArrowSel.png | Bin 0 -> 308 bytes lib/iui/listGroup.png | Bin 0 -> 2867 bytes lib/iui/loading.gif | Bin 0 -> 1435 bytes lib/iui/pinstripes.png | Bin 0 -> 117 bytes lib/iui/redButton.png | Bin 0 -> 947 bytes lib/iui/selection.png | Bin 0 -> 159 bytes lib/iui/thumb.png | Bin 0 -> 2835 bytes lib/iui/toggle.png | Bin 0 -> 2815 bytes lib/iui/toggleOn.png | Bin 0 -> 163 bytes lib/iui/toolButton.png | Bin 0 -> 531 bytes lib/iui/toolbar.png | Bin 0 -> 171 bytes lib/iui/whiteButton.png | Bin 0 -> 978 bytes mobile/article.php | 28 + mobile/feed.php | 27 + mobile/functions.php | 882 +++++++------------------------- mobile/index.php | 75 ++- mobile/login_form.php | 86 ++-- mobile/logout.php | 2 +- mobile/mobile.css | 228 --------- mobile/mobile.js | 48 -- mobile/tt-rss.js | 94 ---- mobile/tt-rss.php | 141 ----- 32 files changed, 1251 insertions(+), 1276 deletions(-) create mode 100644 lib/iui/backButton.png create mode 100644 lib/iui/blueButton.png create mode 100644 lib/iui/cancel.png create mode 100644 lib/iui/grayButton.png create mode 100644 lib/iui/iui-logo-touch-icon.png create mode 100644 lib/iui/iui.css create mode 100644 lib/iui/iui.js create mode 100644 lib/iui/iuix.css create mode 100644 lib/iui/iuix.js create mode 100644 lib/iui/listArrow.png create mode 100644 lib/iui/listArrowSel.png create mode 100644 lib/iui/listGroup.png create mode 100644 lib/iui/loading.gif create mode 100644 lib/iui/pinstripes.png create mode 100644 lib/iui/redButton.png create mode 100644 lib/iui/selection.png create mode 100644 lib/iui/thumb.png create mode 100644 lib/iui/toggle.png create mode 100644 lib/iui/toggleOn.png create mode 100644 lib/iui/toolButton.png create mode 100644 lib/iui/toolbar.png create mode 100644 lib/iui/whiteButton.png create mode 100644 mobile/article.php create mode 100644 mobile/feed.php delete mode 100644 mobile/mobile.css delete mode 100644 mobile/mobile.js delete mode 100644 mobile/tt-rss.js delete mode 100644 mobile/tt-rss.php diff --git a/lib/iui/backButton.png b/lib/iui/backButton.png new file mode 100644 index 0000000000000000000000000000000000000000..e27ea8cdf9a4f3b35c78f6bb0a407a4047e72e12 GIT binary patch literal 816 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 literal 0 HcmV?d00001 diff --git a/lib/iui/iui.css b/lib/iui/iui.css new file mode 100644 index 000000000..1b2c58433 --- /dev/null +++ b/lib/iui/iui.css @@ -0,0 +1,396 @@ +/* iui.css (c) 2007-9 by iUI Project Members, see LICENSE.txt for license */ +body { + margin: 0; + font-family: Helvetica; + background: #FFFFFF; + color: #000000; + overflow-x: hidden; + -webkit-user-select: none; + -webkit-text-size-adjust: none; +} + +body > *:not(.toolbar) { + display: none; + position: absolute; + margin: 0; + padding: 0; + left: 0; + top: 45px; + width: 100%; + min-height: 372px; + -webkit-transition-duration: 300ms; + -webkit-transition-property: -webkit-transform; + -webkit-transform: translateX(0%); +} + +body[orient="landscape"] > *:not(.toolbar) { + min-height: 268px; +} + +body > *[selected="true"] { + display: block; +} + +a[selected], a:active { + background-color: #194fdb !important; + background-image: url(listArrowSel.png), url(selection.png) !important; + background-repeat: no-repeat, repeat-x; + background-position: right center, left top; + color: #FFFFFF !important; +} + +a[selected="progress"] { + background-image: url(loading.gif), url(selection.png) !important; +} + +/************************************************************************************************/ + +body > .toolbar { + box-sizing: border-box; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + border-bottom: 1px solid #2d3642; + border-top: 1px solid #6d84a2; + padding: 10px; + height: 45px; + background: url(toolbar.png) #6d84a2 repeat-x; +} + +.toolbar > h1 { + position: absolute; + overflow: hidden; + left: 50%; + margin: 1px 0 0 -75px; + height: 45px; + font-size: 20px; + width: 150px; + font-weight: bold; + text-shadow: rgba(0, 0, 0, 0.4) 0px -1px 0; + text-align: center; + text-overflow: ellipsis; + white-space: nowrap; + color: #FFFFFF; +} + +body[orient="landscape"] > .toolbar > h1 { + margin-left: -125px; + width: 250px; +} + +.button { + position: absolute; + overflow: hidden; + top: 8px; + right: 6px; + margin: 0; + border-width: 0 5px; + padding: 0 3px; + width: auto; + height: 30px; + line-height: 30px; + font-family: inherit; + font-size: 12px; + font-weight: bold; + color: #FFFFFF; + text-shadow: rgba(0, 0, 0, 0.6) 0px -1px 0; + text-overflow: ellipsis; + text-decoration: none; + white-space: nowrap; + background: none; + -webkit-border-image: url(toolButton.png) 0 5 0 5; +} + +.blueButton { + -webkit-border-image: url(blueButton.png) 0 5 0 5; + border-width: 0 5px; +} + +.leftButton { + left: 6px; + right: auto; +} + +#backButton { + display: none; + left: 6px; + right: auto; + padding: 0; + max-width: 55px; + border-width: 0 8px 0 14px; + -webkit-border-image: url(backButton.png) 0 8 0 14; +} + +.whiteButton, +.redButton, +.grayButton { + display: block; + border-width: 0 12px; + padding: 10px; + text-align: center; + font-size: 20px; + font-weight: bold; + text-decoration: inherit; + color: inherit; +} + +.whiteButton { + -webkit-border-image: url(whiteButton.png) 0 12 0 12; + text-shadow: rgba(255, 255, 255, 0.7) 0 1px 0; +} + +.redButton { + -webkit-border-image: url(redButton.png) 0 12 0 12; + color:#fff; + text-shadow: #7a0001 0 -1px 0; +} + +.grayButton { + -webkit-border-image: url(grayButton.png) 0 12 0 12; + color: #FFFFFF; +} + +/************************************************************************************************/ + +body > ul > li { + position: relative; + margin: 0; + border-bottom: 1px solid #E0E0E0; + padding: 8px 0 8px 10px; + font-size: 20px; + font-weight: bold; + list-style: none; +} + +body > ul > li.group { + position: relative; + top: -1px; + margin-bottom: -2px; + border-top: 1px solid #7d7d7d; + border-bottom: 1px solid #999999; + padding: 1px 10px; + background: url(listGroup.png) repeat-x; + font-size: 17px; + font-weight: bold; + text-shadow: rgba(0, 0, 0, 0.4) 0 1px 0; + color: #FFFFFF; +} + +body > ul > li.group:first-child { + top: 0; + border-top: none; +} + +body > ul > li > a { + display: block; + margin: -8px 0 -8px -10px; + padding: 8px 32px 8px 10px; + text-decoration: none; + color: inherit; + background: url(listArrow.png) no-repeat right center; +} + +a[target="_replace"] { + box-sizing: border-box; + -webkit-box-sizing: border-box; + padding-top: 25px; + padding-bottom: 25px; + font-size: 18px; + color: cornflowerblue; + background-color: #FFFFFF; + background-image: none; +} + +/************************************************************************************************/ + +body > .dialog { + top: 0; + width: 100%; + min-height: 417px; + z-index: 2; + background: rgba(0, 0, 0, 0.8); + padding: 0; + text-align: right; +} + +.dialog > fieldset { + box-sizing: border-box; + -webkit-box-sizing: border-box; + width: 100%; + margin: 0; + border: none; + border-top: 1px solid #6d84a2; + padding: 10px 6px; + background: url(toolbar.png) #7388a5 repeat-x; +} + +.dialog > fieldset > h1 { + margin: 0 10px 0 10px; + padding: 0; + font-size: 20px; + font-weight: bold; + color: #FFFFFF; + text-shadow: rgba(0, 0, 0, 0.4) 0px -1px 0; + text-align: center; +} + +.dialog > fieldset > label { + position: absolute; + margin: 16px 0 0 6px; + font-size: 14px; + color: #999999; +} + +input:not(input[type|=radio]):not(input[type|=checkbox]) { + box-sizing: border-box; + -webkit-box-sizing: border-box; + width: 100%; + margin: 8px 0 0 0; + padding: 6px 6px 6px 44px; + font-size: 16px; + font-weight: normal; +} + +/************************************************************************************************/ + +body > .panel { + box-sizing: border-box; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + padding: 10px; + background: #c8c8c8 url(pinstripes.png); +} + +.panel > fieldset { + position: relative; + margin: 0 0 20px 0; + padding: 0; + background: #FFFFFF; + -webkit-border-radius: 10px; + -moz-border-radius: 10px; + border: 1px solid #999999; + text-align: right; + font-size: 16px; +} + +.row { + position: relative; + min-height: 42px; + border-bottom: 1px solid #999999; + -webkit-border-radius: 0; + text-align: right; +} + +fieldset > .row:last-child { + border-bottom: none !important; +} + +.row > input:not(input[type|=radio]):not(input[type|=checkbox]) { + box-sizing: border-box; + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + margin: 0; + border: none; + padding: 12px 10px 0 110px; + height: 42px; + background: none; +} +.row > input[type|=radio], .row > input[type|=checkbox] { + margin: 7px 7px 0 0; + height: 25px; + width: 25px; +} + +.row > label { + position: absolute; + margin: 0 0 0 14px; + line-height: 42px; + font-weight: bold; +} + +.row > span { + position: absolute; + padding: 12px 10px 0 110px; + margin: 0; +} + +.row > .toggle { + position: absolute; + top: 6px; + right: 6px; + width: 100px; + height: 28px; +} + +.toggle { + border: 1px solid #888888; + -webkit-border-radius: 6px; + background: #FFFFFF url(toggle.png) repeat-x; + font-size: 19px; + font-weight: bold; + line-height: 30px; +} + +.toggle[toggled="true"] { + border: 1px solid #143fae; + background: #194fdb url(toggleOn.png) repeat-x; +} + +.toggleOn { + display: none; + position: absolute; + width: 60px; + text-align: center; + left: 0; + top: 0; + color: #FFFFFF; + text-shadow: rgba(0, 0, 0, 0.4) 0px -1px 0; +} + +.toggleOff { + position: absolute; + width: 60px; + text-align: center; + right: 0; + top: 0; + color: #666666; +} + +.toggle[toggled="true"] > .toggleOn { + display: block; +} + +.toggle[toggled="true"] > .toggleOff { + display: none; +} + +.thumb { + position: absolute; + top: -1px; + left: -1px; + width: 40px; + height: 28px; + border: 1px solid #888888; + -webkit-border-radius: 6px; + background: #ffffff url(thumb.png) repeat-x; +} + +.toggle[toggled="true"] > .thumb { + left: auto; + right: -1px; +} + +.panel > h2 { + margin: 0 0 8px 14px; + font-size: inherit; + font-weight: bold; + color: #4d4d70; + text-shadow: rgba(255, 255, 255, 0.75) 2px 2px 0; +} + +/************************************************************************************************/ + +#preloader { + display: none; + background-image: url(loading.gif), url(selection.png), + url(blueButton.png), url(listArrowSel.png), url(listGroup.png); +} diff --git a/lib/iui/iui.js b/lib/iui/iui.js new file mode 100644 index 000000000..6001b27bc --- /dev/null +++ b/lib/iui/iui.js @@ -0,0 +1,518 @@ +/* + Copyright (c) 2007-9, iUI Project Members + See LICENSE.txt for licensing terms + */ + + +(function() { + +var slideSpeed = 20; +var slideInterval = 0; + +var currentPage = null; +var currentDialog = null; +var currentWidth = 0; +var currentHash = location.hash; +var hashPrefix = "#_"; +var pageHistory = []; +var newPageCount = 0; +var checkTimer; +var hasOrientationEvent = false; +var portraitVal = "portrait"; +var landscapeVal = "landscape"; + +// ************************************************************************************************* + +window.iui = +{ + animOn: true, // Slide animation with CSS transition is now enabled by default where supported + + showPage: function(page, backwards) + { + if (page) + { + if (currentDialog) + { + currentDialog.removeAttribute("selected"); + currentDialog = null; + } + + if (hasClass(page, "dialog")) + showDialog(page); + else + { + var fromPage = currentPage; + currentPage = page; + + if (fromPage) + setTimeout(slidePages, 0, fromPage, page, backwards); + else + updatePage(page, fromPage); + } + } + }, + + showPageById: function(pageId) + { + var page = $(pageId); + if (page) + { + var index = pageHistory.indexOf(pageId); + var backwards = index != -1; + if (backwards) + pageHistory.splice(index, pageHistory.length); + + iui.showPage(page, backwards); + } + }, + + showPageByHref: function(href, args, method, replace, cb, backwards) + { + var req = new XMLHttpRequest(); + req.onerror = function() + { + if (cb) + cb(false); + }; + + req.onreadystatechange = function() + { + if (req.readyState == 4) + { + if (replace) + replaceElementWithSource(replace, req.responseText); + else + { + var frag = document.createElement("div"); + frag.innerHTML = req.responseText; + iui.insertPages(frag.childNodes, backwards); + } + if (cb) + setTimeout(cb, 1000, true); + } + }; + + if (args) + { + req.open(method || "GET", href, true); + req.setRequestHeader("Content-Type", "application/x-www-form-urlencoded"); + req.setRequestHeader("Content-Length", args.length); + req.send(args.join("&")); + } + else + { + req.open(method || "GET", href, true); + req.send(null); + } + }, + + insertPages: function(nodes, backwards) + { + var targetPage; + for (var i = 0; i < nodes.length; ++i) + { + var child = nodes[i]; + if (child.nodeType == 1) + { + if (!child.id) + child.id = "__" + (++newPageCount) + "__"; + + var clone = $(child.id); + if (clone) + clone.parentNode.replaceChild(child, clone); + else + document.body.appendChild(child); + + if (child.getAttribute("selected") == "true" || !targetPage) + targetPage = child; + + --i; + } + } + + if (targetPage) + iui.showPage(targetPage, backwards); + }, + + getSelectedPage: function() + { + for (var child = document.body.firstChild; child; child = child.nextSibling) + { + if (child.nodeType == 1 && child.getAttribute("selected") == "true") + return child; + } + }, + isNativeUrl: function(href) + { + for(var i = 0; i < iui.nativeUrlPatterns.length; i++) + { + if(href.match(iui.nativeUrlPatterns[i])) return true; + } + return false; + }, + nativeUrlPatterns: [ + new RegExp("^http:\/\/maps.google.com\/maps\?"), + new RegExp("^mailto:"), + new RegExp("^tel:"), + new RegExp("^http:\/\/www.youtube.com\/watch\\?v="), + new RegExp("^http:\/\/www.youtube.com\/v\/"), + new RegExp("^javascript:"), + + ] +}; + +// ************************************************************************************************* + +addEventListener("load", function(event) +{ + var page = iui.getSelectedPage(); + var locPage = getPageFromLoc(); + + if (page) + iui.showPage(page); + + if (locPage && (locPage != page)) + iui.showPage(locPage); + + setTimeout(preloadImages, 0); + if (typeof window.onorientationchange == "object") + { + window.onorientationchange=orientChangeHandler; + hasOrientationEvent = true; + setTimeout(orientChangeHandler, 0); + } + setTimeout(checkOrientAndLocation, 0); + checkTimer = setInterval(checkOrientAndLocation, 300); +}, false); + +addEventListener("unload", function(event) +{ + return; +}, false); + +addEventListener("click", function(event) +{ + var link = findParent(event.target, "a"); + if (link) + { + function unselect() { link.removeAttribute("selected"); } + + if (link.href && link.hash && link.hash != "#" && !link.target) + { + link.setAttribute("selected", "true"); + iui.showPage($(link.hash.substr(1))); + setTimeout(unselect, 500); + } + else if (link == $("backButton")) { + history.back(); + } else if (link.getAttribute("type") == "submit") + { + var form = findParent(link, "form"); + if (form.target == "_self") + { + form.submit(); + return; // return so we don't preventDefault + } + submitForm(form); + } + else if (link.getAttribute("type") == "cancel") + cancelDialog(findParent(link, "form")); + else if (link.target == "_replace") + { + link.setAttribute("selected", "progress"); + iui.showPageByHref(link.href, null, null, link, unselect); + } + else if (iui.isNativeUrl(link.href)) + { + return; + } + else if (link.target == "_webapp") + { + location.href = link.href; + } + else if (!link.target) + { + link.setAttribute("selected", "progress"); + iui.showPageByHref(link.href, null, null, null, unselect); + } + else + return; + + event.preventDefault(); + } +}, true); + +addEventListener("click", function(event) +{ + var div = findParent(event.target, "div"); + if (div && hasClass(div, "toggle")) + { + div.setAttribute("toggled", div.getAttribute("toggled") != "true"); + event.preventDefault(); + } +}, true); + +function getPageFromLoc() +{ + var page; + var result = location.hash.match(/#_([^\?_]+)/); + if (result) + page = result[1]; + if (page) + page = $(page); + return page; +} + +function orientChangeHandler() +{ + var orientation=window.orientation; + switch(orientation) + { + case 0: + setOrientation(portraitVal); + break; + + case 90: + case -90: + setOrientation(landscapeVal); + break; + } +} + + +function checkOrientAndLocation() +{ + if (!hasOrientationEvent) + { + if (window.innerWidth != currentWidth) + { + currentWidth = window.innerWidth; + var orient = currentWidth == 320 ? portraitVal : landscapeVal; + setOrientation(orient); + } + } + + if (location.hash != currentHash) + { + var pageId = location.hash.substr(hashPrefix.length); + iui.showPageById(pageId); + } +} + +function setOrientation(orient) +{ + document.body.setAttribute("orient", orient); + setTimeout(scrollTo, 100, 0, 1); +} + +function showDialog(page) +{ + currentDialog = page; + page.setAttribute("selected", "true"); + + if (hasClass(page, "dialog") && !page.target) + showForm(page); +} + +function showForm(form) +{ + form.onsubmit = function(event) + { + event.preventDefault(); + submitForm(form); + }; + + form.onclick = function(event) + { + if (event.target == form && hasClass(form, "dialog")) + cancelDialog(form); + }; +} + +function cancelDialog(form) +{ + form.removeAttribute("selected"); +} + +function updatePage(page, fromPage) +{ + if (!page.id) + page.id = "__" + (++newPageCount) + "__"; + + location.hash = currentHash = hashPrefix + page.id; + pageHistory.push(page.id); + + var pageTitle = $("pageTitle"); + if (page.title) + pageTitle.innerHTML = page.title; + + if (page.localName.toLowerCase() == "form" && !page.target) + showForm(page); + + var backButton = $("backButton"); + if (backButton) + { + var prevPage = $(pageHistory[pageHistory.length-2]); + if (prevPage && !page.getAttribute("hideBackButton")) + { + backButton.style.display = "inline"; + backButton.innerHTML = prevPage.title ? prevPage.title : "Back"; + } + else + backButton.style.display = "none"; + } +} + +function slidePages(fromPage, toPage, backwards) +{ + var axis = (backwards ? fromPage : toPage).getAttribute("axis"); + + clearInterval(checkTimer); + + if (canDoSlideAnim() && axis != 'y') + { + slide2(fromPage, toPage, backwards, slideDone); + } + else + { + slide1(fromPage, toPage, backwards, axis, slideDone); + } + + function slideDone() + { + if (!hasClass(toPage, "dialog")) + fromPage.removeAttribute("selected"); + checkTimer = setInterval(checkOrientAndLocation, 300); + setTimeout(updatePage, 0, toPage, fromPage); + fromPage.removeEventListener('webkitTransitionEnd', slideDone, false); + } +} + +function canDoSlideAnim() +{ + return (iui.animOn) && (typeof WebKitCSSMatrix == "object"); +} + +function slide1(fromPage, toPage, backwards, axis, cb) +{ + if (axis == "y") + (backwards ? fromPage : toPage).style.top = "100%"; + else + toPage.style.left = "100%"; + + scrollTo(0, 1); + toPage.setAttribute("selected", "true"); + var percent = 100; + slide(); + var timer = setInterval(slide, slideInterval); + + function slide() + { + percent -= slideSpeed; + if (percent <= 0) + { + percent = 0; + clearInterval(timer); + cb(); + } + + if (axis == "y") + { + backwards + ? fromPage.style.top = (100-percent) + "%" + : toPage.style.top = percent + "%"; + } + else + { + fromPage.style.left = (backwards ? (100-percent) : (percent-100)) + "%"; + toPage.style.left = (backwards ? -percent : percent) + "%"; + } + } +} + + +function slide2(fromPage, toPage, backwards, cb) +{ + toPage.style.webkitTransitionDuration = '0ms'; // Turn off transitions to set toPage start offset + // fromStart is always 0% and toEnd is always 0% + // iPhone won't take % width on toPage + var toStart = 'translateX(' + (backwards ? '-' : '') + window.innerWidth + 'px)'; + var fromEnd = 'translateX(' + (backwards ? '100%' : '-100%') + ')'; + toPage.style.webkitTransform = toStart; + toPage.setAttribute("selected", "true"); + toPage.style.webkitTransitionDuration = ''; // Turn transitions back on + function startTrans() + { + fromPage.style.webkitTransform = fromEnd; + toPage.style.webkitTransform = 'translateX(0%)'; //toEnd + } + fromPage.addEventListener('webkitTransitionEnd', cb, false); + setTimeout(startTrans, 0); +} + +function preloadImages() +{ + var preloader = document.createElement("div"); + preloader.id = "preloader"; + document.body.appendChild(preloader); +} + +function submitForm(form) +{ + iui.showPageByHref(form.action || "POST", encodeForm(form), form.method); +} + +function encodeForm(form) +{ + function encode(inputs) + { + for (var i = 0; i < inputs.length; ++i) + { + if (inputs[i].name) + args.push(inputs[i].name + "=" + escape(inputs[i].value)); + } + } + + var args = []; + encode(form.getElementsByTagName("input")); + encode(form.getElementsByTagName("textarea")); + encode(form.getElementsByTagName("select")); + return args; +} + +function findParent(node, localName) +{ + while (node && (node.nodeType != 1 || node.localName.toLowerCase() != localName)) + node = node.parentNode; + return node; +} + +function hasClass(self, name) +{ + var re = new RegExp("(^|\\s)"+name+"($|\\s)"); + return re.exec(self.getAttribute("class")) != null; +} + +function replaceElementWithSource(replace, source) +{ + var page = replace.parentNode; + var parent = replace; + while (page.parentNode != document.body) + { + page = page.parentNode; + parent = parent.parentNode; + } + + var frag = document.createElement(parent.localName); + frag.innerHTML = source; + + page.removeChild(parent); + + while (frag.firstChild) + page.appendChild(frag.firstChild); +} + +function $(id) { return document.getElementById(id); } +function ddd() { console.log.apply(console, arguments); } + +})(); diff --git a/lib/iui/iuix.css b/lib/iui/iuix.css new file mode 100644 index 000000000..1df7e8a00 --- /dev/null +++ b/lib/iui/iuix.css @@ -0,0 +1 @@ +body{margin:0;font-family:Helvetica;background:#FFF;color:#000;overflow-x:hidden;-webkit-user-select:none;-webkit-text-size-adjust:none;}body>*:not(.toolbar){display:none;position:absolute;margin:0;padding:0;left:0;top:45px;width:100%;min-height:372px;-webkit-transition-duration:300ms;-webkit-transition-property:-webkit-transform;-webkit-transform:translateX(0%);}body[orient="landscape"]>*:not(.toolbar){min-height:268px;}body>*[selected="true"]{display:block;}a[selected],a:active{background-color:#194fdb!important;background-image:url(listArrowSel.png),url(selection.png)!important;background-repeat:no-repeat,repeat-x;background-position:right center,left top;color:#FFF!important;}a[selected="progress"]{background-image:url(loading.gif),url(selection.png)!important;}body>.toolbar{box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;border-bottom:1px solid #2d3642;border-top:1px solid #6d84a2;padding:10px;height:45px;background:url(toolbar.png) #6d84a2 repeat-x;}.toolbar>h1{position:absolute;overflow:hidden;left:50%;margin:1px 0 0 -75px;height:45px;font-size:20px;width:150px;font-weight:bold;text-shadow:rgba(0,0,0,0.4) 0 -1px 0;text-align:center;text-overflow:ellipsis;white-space:nowrap;color:#FFF;}body[orient="landscape"]>.toolbar>h1{margin-left:-125px;width:250px;}.button{position:absolute;overflow:hidden;top:8px;right:6px;margin:0;border-width:0 5px;padding:0 3px;width:auto;height:30px;line-height:30px;font-family:inherit;font-size:12px;font-weight:bold;color:#FFF;text-shadow:rgba(0,0,0,0.6) 0 -1px 0;text-overflow:ellipsis;text-decoration:none;white-space:nowrap;background:none;-webkit-border-image:url(toolButton.png) 0 5 0 5;}.blueButton{-webkit-border-image:url(blueButton.png) 0 5 0 5;border-width:0 5px;}.leftButton{left:6px;right:auto;}#backButton{display:none;left:6px;right:auto;padding:0;max-width:55px;border-width:0 8px 0 14px;-webkit-border-image:url(backButton.png) 0 8 0 14;}.whiteButton,.redButton,.grayButton{display:block;border-width:0 12px;padding:10px;text-align:center;font-size:20px;font-weight:bold;text-decoration:inherit;color:inherit;}.whiteButton{-webkit-border-image:url(whiteButton.png) 0 12 0 12;text-shadow:rgba(255,255,255,0.7) 0 1px 0;}.redButton{-webkit-border-image:url(redButton.png) 0 12 0 12;color:#fff;text-shadow:#7a0001 0 -1px 0;}.grayButton{-webkit-border-image:url(grayButton.png) 0 12 0 12;color:#FFF;}body>ul>li{position:relative;margin:0;border-bottom:1px solid #E0E0E0;padding:8px 0 8px 10px;font-size:20px;font-weight:bold;list-style:none;}body>ul>li.group{position:relative;top:-1px;margin-bottom:-2px;border-top:1px solid #7d7d7d;border-bottom:1px solid #999;padding:1px 10px;background:url(listGroup.png) repeat-x;font-size:17px;font-weight:bold;text-shadow:rgba(0,0,0,0.4) 0 1px 0;color:#FFF;}body>ul>li.group:first-child{top:0;border-top:none;}body>ul>li>a{display:block;margin:-8px 0 -8px -10px;padding:8px 32px 8px 10px;text-decoration:none;color:inherit;background:url(listArrow.png) no-repeat right center;}a[target="_replace"]{box-sizing:border-box;-webkit-box-sizing:border-box;padding-top:25px;padding-bottom:25px;font-size:18px;color:cornflowerblue;background-color:#FFF;background-image:none;}body>.dialog{top:0;width:100%;min-height:417px;z-index:2;background:rgba(0,0,0,0.8);padding:0;text-align:right;}.dialog>fieldset{box-sizing:border-box;-webkit-box-sizing:border-box;width:100%;margin:0;border:none;border-top:1px solid #6d84a2;padding:10px 6px;background:url(toolbar.png) #7388a5 repeat-x;}.dialog>fieldset>h1{margin:0 10px 0 10px;padding:0;font-size:20px;font-weight:bold;color:#FFF;text-shadow:rgba(0,0,0,0.4) 0 -1px 0;text-align:center;}.dialog>fieldset>label{position:absolute;margin:16px 0 0 6px;font-size:14px;color:#999;}input:not(input[type|=radio]):not(input[type|=checkbox]){box-sizing:border-box;-webkit-box-sizing:border-box;width:100%;margin:8px 0 0 0;padding:6px 6px 6px 44px;font-size:16px;font-weight:normal;}body>.panel{box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:10px;background:#c8c8c8 url(pinstripes.png);}.panel>fieldset{position:relative;margin:0 0 20px 0;padding:0;background:#FFF;-webkit-border-radius:10px;-moz-border-radius:10px;border:1px solid #999;text-align:right;font-size:16px;}.row{position:relative;min-height:42px;border-bottom:1px solid #999;-webkit-border-radius:0;text-align:right;}fieldset>.row:last-child{border-bottom:none!important;}.row>input:not(input[type|=radio]):not(input[type|=checkbox]){box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;margin:0;border:none;padding:12px 10px 0 110px;height:42px;background:none;}.row>input[type|=radio],.row>input[type|=checkbox]{margin:7px 7px 0 0;height:25px;width:25px;}.row>label{position:absolute;margin:0 0 0 14px;line-height:42px;font-weight:bold;}.row>span{position:absolute;padding:12px 10px 0 110px;margin:0;}.row>.toggle{position:absolute;top:6px;right:6px;width:100px;height:28px;}.toggle{border:1px solid #888;-webkit-border-radius:6px;background:#FFF url(toggle.png) repeat-x;font-size:19px;font-weight:bold;line-height:30px;}.toggle[toggled="true"]{border:1px solid #143fae;background:#194fdb url(toggleOn.png) repeat-x;}.toggleOn{display:none;position:absolute;width:60px;text-align:center;left:0;top:0;color:#FFF;text-shadow:rgba(0,0,0,0.4) 0 -1px 0;}.toggleOff{position:absolute;width:60px;text-align:center;right:0;top:0;color:#666;}.toggle[toggled="true"]>.toggleOn{display:block;}.toggle[toggled="true"]>.toggleOff{display:none;}.thumb{position:absolute;top:-1px;left:-1px;width:40px;height:28px;border:1px solid #888;-webkit-border-radius:6px;background:#fff url(thumb.png) repeat-x;}.toggle[toggled="true"]>.thumb{left:auto;right:-1px;}.panel>h2{margin:0 0 8px 14px;font-size:inherit;font-weight:bold;color:#4d4d70;text-shadow:rgba(255,255,255,0.75) 2px 2px 0;}#preloader{display:none;background-image:url(loading.gif),url(selection.png),url(blueButton.png),url(listArrowSel.png),url(listGroup.png);} \ No newline at end of file diff --git a/lib/iui/iuix.js b/lib/iui/iuix.js new file mode 100644 index 000000000..09d2eb993 --- /dev/null +++ b/lib/iui/iuix.js @@ -0,0 +1 @@ +(function(){var _1=20;var _2=0;var _3=null;var _4=null;var _5=0;var _6=location.hash;var _7="#_";var _8=[];var _9=0;var _a;var _b=false;var _c="portrait";var _d="landscape";window.iui={animOn:true,showPage:function(_e,_f){if(_e){if(_4){_4.removeAttribute("selected");_4=null;}if(hasClass(_e,"dialog")){showDialog(_e);}else{var _10=_3;_3=_e;if(_10){setTimeout(slidePages,0,_10,_e,_f);}else{updatePage(_e,_10);}}}},showPageById:function(_11){var _12=$(_11);if(_12){var _13=_8.indexOf(_11);var _14=_13!=-1;if(_14){_8.splice(_13,_8.length);}iui.showPage(_12,_14);}},showPageByHref:function(_15,_16,_17,_18,cb){var req=new XMLHttpRequest();req.onerror=function(){if(cb){cb(false);}};req.onreadystatechange=function(){if(req.readyState==4){if(_18){replaceElementWithSource(_18,req.responseText);}else{var _1b=document.createElement("div");_1b.innerHTML=req.responseText;iui.insertPages(_1b.childNodes);}if(cb){setTimeout(cb,1000,true);}}};if(_16){req.open(_17||"GET",_15,true);req.setRequestHeader("Content-Type","application/x-www-form-urlencoded");req.setRequestHeader("Content-Length",_16.length);req.send(_16.join("&"));}else{req.open(_17||"GET",_15,true);req.send(null);}},insertPages:function(_1c){var _1d;for(var i=0;i<_1c.length;++i){var _1f=_1c[i];if(_1f.nodeType==1){if(!_1f.id){_1f.id="__"+(++_9)+"__";}var _20=$(_1f.id);if(_20){_20.parentNode.replaceChild(_1f,_20);}else{document.body.appendChild(_1f);}if(_1f.getAttribute("selected")=="true"||!_1d){_1d=_1f;}--i;}}if(_1d){iui.showPage(_1d);}},getSelectedPage:function(){for(var _21=document.body.firstChild;_21;_21=_21.nextSibling){if(_21.nodeType==1&&_21.getAttribute("selected")=="true"){return _21;}}},isNativeUrl:function(_22){for(var i=0;iCgZF_RMP;g_&g!eAw8+>M~{e^us?&19oxF zesu1f-zQziO$!7&@4IwANODeU)>*x*Rn^qtPS=tAh0|PL2=Z@Q!F+ZRSJaYqUMAhQ zG`Dhu3(aFX@_xb(O9venU+*Q2KNu!0^l!Yucs8g@r!jItQ`$kM_RelF{r G5}E+j-eN=m literal 0 HcmV?d00001 diff --git a/lib/iui/listArrowSel.png b/lib/iui/listArrowSel.png new file mode 100644 index 0000000000000000000000000000000000000000..86832ebc7b961840d95938a98a0905cb09bc84a9 GIT binary patch literal 308 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 Is33zi04%B!Q2+n{ literal 0 HcmV?d00001 diff --git a/lib/iui/pinstripes.png b/lib/iui/pinstripes.png new file mode 100644 index 0000000000000000000000000000000000000000..c99777512fb135af7dcdf4130e5770072cb39241 GIT binary patch literal 117 zcmeAS@N?(olHy`uVBq!ia0vp^>_E)O!2~4dW-8AFQj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS>Jio`u#978H@CD~Lx<6>s|lboE)9K^uL#$fKtT%LaBX8=$M NgQu&X%Q~loCIB>$9?k#& literal 0 HcmV?d00001 diff --git a/lib/iui/redButton.png b/lib/iui/redButton.png new file mode 100644 index 0000000000000000000000000000000000000000..210f156afe6a543a89a54bb98f06dc6a33a37b94 GIT binary patch literal 947 zcmV;k15EshP)`9&$+YG_xX7^jh&sCX!$p4DZIXUSyelG3K&W0DCdwK>s73Fm@mm4+8 zWsu=?=28kf_?#Wj+bk3c_ok<(cWa-?)c4_2GO5VEzu338H)SurMybmi;A&9LskCWciFqCb&|VwVG}w;EuWw|tQ+WF%1f>Y-InG0)SOf}U zY^bvnK3LZH2`FP%DqWP&ivmre)Sl-J*X0dCeP3f7X~Ux&BcMbF5?fO7X>QI9H`@l)R`9+Q$=Y8C5$1)ln7)>G?kav31iB< zxa`$ArcNcMM4-HcD|7!Qk@)N-OkS)QM4-G>;j@<&g+Op|P&I&tWWq97-7*4;L!d`M zt4syfUe?K)<@L%{(6T^Kp995Jgz}cffnpbH1}$!Fg-OJ`D06yy0nYR_oCet*V%vz@ zOKmmo(W+DhlLUfF9I6Vnwj;~pnDVVn!U?t#Ng${sb4(@H>sVO1p4VQcN|b43H6oev z@~Uc>xuF*Y%AXu6@=8MGmG~}G0}~1wiK(iFdsL*n@Jo3`Gvz_$Y9h%3nacl1B2^iR z-7;#FsU(a-vaozPF=LbW! z?H-_MuwfYBy6$FE!7r6cb7p`4E#uIH?p&^|EWaR`uZM^1_5VekDGRb`nsY~%m3cpK z4z@20ft^fNg8!F;VhqjhZumGh25&42_V@QQx~@O3XY<<|H^YmC(UDX>pMRz(%6KZ3 zf^<3!u~-bB(OSzx8KGD#LJk$nX0uQz6c!SR#G_0mlaGMb>~W&&u4P#dD5Y0%T*lGb z85h5gV;#pTE_iWmZEZR7-{8ADw@+T_2!UbSUPd{V*-CBO4p;s=TUl9YInF-?7yv7b V+3MoiUjYCB002ovPDHLkV1ljFu?qkI literal 0 HcmV?d00001 diff --git a/lib/iui/selection.png b/lib/iui/selection.png new file mode 100644 index 0000000000000000000000000000000000000000..537e3f0b13ea422a5ac5487317872414d51574c1 GIT binary patch literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^j6kfy!2~3aiye;!Qj#UE5hcO-X(i=}MX3yqDfvmM z3ZA)%>8U}fi7AzZCsS>JiX1&%978x{Sr2X$Jj5WtvT?p{@1r}0Gc6VGKL6Qv;l%Dc zTgw%X}gxBOXmxAbz1ds%&OUSwBY#<9&n!x%hW{an^L HB{Ts5+CMp^ literal 0 HcmV?d00001 diff --git a/lib/iui/thumb.png b/lib/iui/thumb.png new file mode 100644 index 0000000000000000000000000000000000000000..cefa8fc5e9db724b96d36a8df814ecdf85d05582 GIT binary patch literal 2835 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 literal 0 HcmV?d00001 diff --git a/lib/iui/toggle.png b/lib/iui/toggle.png new file mode 100644 index 0000000000000000000000000000000000000000..3b62ebf26eaf8b21e341d413a6bd7cebcf5e7075 GIT binary patch literal 2815 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 literal 0 HcmV?d00001 diff --git a/lib/iui/whiteButton.png b/lib/iui/whiteButton.png new file mode 100644 index 0000000000000000000000000000000000000000..5514b270053a41039e9e96ef8591796521ee0312 GIT binary patch literal 978 zcmV;@11}R*8aG1*L?d1O->_T@+D~u1Y}!yL0VI=|WL) zUB!jV?nDqFVEqcjNU7Q;7-O1A(q?8dlX-96yZ5-5q-Ly5=jDGlkNe*5{m(h~zIU$B ztvpZh0>hld-kwYNkqy3Ko}K-V%D(G)Z`(9CN35XDjL&xuH$Mh_XF(}UB(Tw%lJL(m|<1LC)=R9eoc+{eJ zNQwFm3ZOo%tAYib`a=Ya6#-N=4JiO(J0G^!!{zGLYx*)_QJi=^gsb6jQm_J=B!6wD zD%0-bC{8`;0(Q9FGD%w0qhLC5rQirtj;nGAUq!X!Dqd2rt6&lNPuJ>g7pqvn zrLC}dJQx&>lhnC-)EE`H)reg0T)izKV$|3W#Z{x-uG+(BCOFiFCeuK~FK_qmdcCS1 z>8qPuMY7^&mwW$}US2j%`m-B`MG8c7zyGk_Te#n^&tIcWp2Z*u%VSYOaGhsH3-(@~ zmGI-aXiXaBcJ0@|xe~1jq8+&sKXGKh9t>WX-&ip>B{%Tf)t#qUx1u_4ei+87UrHDfl6dXpw%k7!k~_oku06C3S8F^@(Qf&-L}LBUh<3`S518 zHslKoXby|rLrF-aMbk8j+ef37#cK7AgI*>xK3*KI+wDGQqnw)Edn!H~2Jv7#l+-p> zSL68q&WJ!JQ!W>a*5>p3XLojzq*mM7in|*4KU7;ZTp6~iyZ`_I07*qoM6N<$f;?{4 AHUIzs literal 0 HcmV?d00001 diff --git a/mobile/article.php b/mobile/article.php new file mode 100644 index 000000000..28fef041f --- /dev/null +++ b/mobile/article.php @@ -0,0 +1,28 @@ + + diff --git a/mobile/feed.php b/mobile/feed.php new file mode 100644 index 000000000..c729cc341 --- /dev/null +++ b/mobile/feed.php @@ -0,0 +1,27 @@ + + diff --git a/mobile/functions.php b/mobile/functions.php index 28463dec6..bc4582134 100644 --- a/mobile/functions.php +++ b/mobile/functions.php @@ -2,811 +2,271 @@ define('MOBILE_FEEDLIST_ENABLE_ICONS', false); define('TTRSS_SESSION_NAME', 'ttrss_m_sid'); - function render_feeds_list($link) { + function mobile_feed_has_icon($id) { + $filename = "../".ICONS_DIR."/$id.ico"; - $tags = $_GET["tags"]; + return file_exists($filename) && filesize($filename) > 0; + } - print "
"; + function render_category($link, $cat_id) { + $owner_uid = $_SESSION["uid"]; - if ($tags) { - print __("Tags")." - (".__("View feeds").", "; + if ($cat_id != 0) { + $cat_query = "cat_id = '$cat_id'"; } else { - print __("Feeds")." - (".__("View tags").", "; + $cat_query = "cat_id IS NULL"; } - print "".__("Search").", "; - - print "".__("Logout").")"; - print "
"; - - print "
    "; - - $owner_uid = $_SESSION["uid"]; - - if (!$tags) { - - /* virtual feeds */ - - if (get_pref($link, 'ENABLE_FEED_CATS')) { - print "
  • ".__("Special")."
  • "; - print "
    • "; - } - - $num_total = getFeedUnread($link, -4); - - $class = "virt"; - - if ($num_total > 0) $class .= "Unread"; - - printMobileFeedEntry(-4, $class, __("All articles"), $num_total, - "../images/fresh.png", $link); - - $num_fresh = getFeedUnread($link, -3); - - $class = "virt"; - - if ($num_fresh > 0) $class .= "Unread"; - - printMobileFeedEntry(-3, $class, __("Fresh articles"), $num_fresh, - "../images/fresh.png", $link); - - $num_starred = getFeedUnread($link, -1); - - $class = "virt"; - - if ($num_starred > 0) $class .= "Unread"; - - printMobileFeedEntry(-1, $class, __("Starred articles"), $num_starred, - "../images/mark_set.png", $link); + $result = db_query($link, "SELECT id, + title, + (SELECT COUNT(id) FROM ttrss_entries,ttrss_user_entries + WHERE feed_id = ttrss_feeds.id AND unread = true + AND ttrss_user_entries.ref_id = ttrss_entries.id + AND owner_uid = '$owner_uid') as unread + FROM ttrss_feeds + WHERE + ttrss_feeds.hidden = false AND + ttrss_feeds.owner_uid = '$owner_uid' AND + parent_feed IS NULL AND + $cat_query + ORDER BY unread DESC,title"); + + $title = getCategoryTitle($link, $cat_id); - $class = "virt"; + print "
        "; - $num_published = getFeedUnread($link, -2); + print "
      • ".__('Actions...')."
      • "; - if ($num_published > 0) $class .= "Unread"; + while ($line = db_fetch_assoc($result)) { + $id = $line["id"]; + $unread = $line["unread"]; - printMobileFeedEntry(-2, $class, __("Published articles"), $num_published, - "../images/pub_set.png", $link); + $unread = rand(0, 100); - if (get_pref($link, 'ENABLE_FEED_CATS')) { - print "
      "; + if ($unread > 0) { + $line["title"] = $line["title"] . " ($unread)"; + $class = ''; + } else { + $class = 'oldItem'; } - - $result = db_query($link, "SELECT id,caption FROM - ttrss_labels2 WHERE owner_uid = '$owner_uid' ORDER by caption"); - - if (db_num_rows($result) > 0) { - if (get_pref($link, 'ENABLE_FEED_CATS')) { - print "
    • ".__("Labels")."
    • "; - print "
      • "; - } else { -// print "

      • "; - } - } - - while ($line = db_fetch_assoc($result)) { - - $count = getFeedUnread($link, -$line["id"]-11); - - $class = "label"; - - if ($count > 0) { - $class .= "Unread"; - } - - printMobileFeedEntry(-$line["id"]-11, - $class, $line["caption"], $count, "../images/label.png", $link); - - } - - if (db_num_rows($result) > 0) { - if (get_pref($link, 'ENABLE_FEED_CATS')) { - print "
      "; - } - } - - - if (get_pref($link, 'ENABLE_FEED_CATS')) { - $order_by_qpart = "category,title"; + if (mobile_feed_has_icon($id)) { + $icon_url = "../".ICONS_URL."/$id.ico"; } else { - $order_by_qpart = "title"; + $icon_url = "../images/blank_icon.gif"; } - $result = db_query($link, "SELECT ttrss_feeds.*, - ".SUBSTRING_FOR_DATE."(last_updated,1,19) AS last_updated_noms, - (SELECT COUNT(id) FROM ttrss_entries,ttrss_user_entries - WHERE feed_id = ttrss_feeds.id AND - ttrss_user_entries.ref_id = ttrss_entries.id AND - owner_uid = '$owner_uid') AS total, - (SELECT COUNT(id) FROM ttrss_entries,ttrss_user_entries - WHERE feed_id = ttrss_feeds.id AND unread = true - AND ttrss_user_entries.ref_id = ttrss_entries.id - AND owner_uid = '$owner_uid') as unread, - cat_id,last_error, - ttrss_feed_categories.title AS category, - ttrss_feed_categories.collapsed - FROM ttrss_feeds LEFT JOIN ttrss_feed_categories - ON (ttrss_feed_categories.id = cat_id) - WHERE - ttrss_feeds.hidden = false AND - ttrss_feeds.owner_uid = '$owner_uid' AND parent_feed IS NULL - ORDER BY $order_by_qpart"); - - $actid = $_GET["actid"]; - - /* real feeds */ - - $lnum = 0; - - $category = ""; - - while ($line = db_fetch_assoc($result)) { - if (get_pref($link, 'HIDE_READ_FEEDS') && (int)$line['unread']==0) { - continue; - } - - $feed = db_unescape_string($line["title"]); - $feed_id = $line["id"]; - - $subop = $_GET["subop"]; - - $total = $line["total"]; - $unread = $line["unread"]; - - $rtl_content = sql_bool_to_bool($line["rtl_content"]); - - if ($rtl_content) { - $rtl_tag = "dir=\"RTL\""; - } else { - $rtl_tag = ""; - } - - $tmp_result = db_query($link, - "SELECT id,COUNT(unread) AS unread - FROM ttrss_feeds LEFT JOIN ttrss_user_entries - ON (ttrss_feeds.id = ttrss_user_entries.feed_id) - WHERE parent_feed = '$feed_id' AND unread = true - GROUP BY ttrss_feeds.id"); - - if (db_num_rows($tmp_result) > 0) { - while ($l = db_fetch_assoc($tmp_result)) { - $unread += $l["unread"]; - } - } - - $cat_id = $line["cat_id"]; - - $tmp_category = $line["category"]; - - if (!$tmp_category) { - $tmp_category = "Uncategorized"; - } - - // $class = ($lnum % 2) ? "even" : "odd"; - - if ($line["last_error"]) { - $class = "error"; - } else { - $class = "feed"; - } - - if ($unread > 0) $class .= "Unread"; - - if ($actid == $feed_id) { - $class .= "Selected"; - } - - if ($category != $tmp_category && get_pref($link, 'ENABLE_FEED_CATS')) { - - if ($category) { - print "
  • "; - } - - $category = $tmp_category; + print "
  • " . + "". + $line["title"] . "
  • "; + } - $collapsed = $line["collapsed"]; + print "
"; - // workaround for NULL category - if ($category == "Uncategorized") { - if ($_COOKIE["ttrss_vf_uclps"] == 1) { - $collapsed = "t"; - } - } + /* print "
    "; - if ($collapsed == "t" || $collapsed == "1") { - $holder_class = "invisible"; - $ellipsis = "..."; - } else { - $holder_class = "feedCatHolder"; - $ellipsis = ""; - } + foreach (array(-4, -1,-2,-3) as $id) { + $title = getFeedTitle($link, $id); + $unread = getFeedUnread($link, $id, false); - if ($cat_id) { - $cat_id_qpart = "cat_id = '$cat_id'"; + if ($unread > 0) { + $title = $title . " ($unread)"; + $class = ''; } else { - $cat_id_qpart = "cat_id IS NULL"; + $class = 'oldItem'; } - $cat_id = sprintf("%d", $cat_id); - $cat_unread = getCategoryUnread($link, $cat_id); - - print "
  • - $tmp_category - - ($cat_unread)$ellipsis -
  • "; - - print "
  • -
      "; - } - - printMobileFeedEntry($feed_id, $class, $feed, $unread, - "../icons/$feed_id.ico", $link, $rtl_content); - - ++$lnum; - } - - } else { - // tags - - $result = db_query($link, "SELECT tag_name,SUM((SELECT COUNT(int_id) - FROM ttrss_user_entries WHERE int_id = post_int_id - AND unread = true)) AS count FROM ttrss_tags - WHERE owner_uid = '".$_SESSION['uid']."' GROUP BY tag_name ORDER BY tag_name"); - - $tags = array(); - - while ($line = db_fetch_assoc($result)) { - $tags[$line["tag_name"]] += $line["count"]; - } - - foreach (array_keys($tags) as $tag) { - - $unread = $tags[$tag]; - - $class = "tag"; - - if ($unread > 0) { - $class .= "Unread"; + print "
    • $title
    • "; } - - printMobileFeedEntry($tag, $class, $tag, $unread, - "../images/tag.png", $link); - - } - - - } - } - - function printMobileFeedEntry($feed_id, $class, $feed_title, $unread, $icon_file, $link, - $rtl_content = false) { - - if (file_exists($icon_file) && filesize($icon_file) > 0) { - $feed_icon = ""; - } else { - $feed_icon = ""; - } - - if ($rtl_content) { - $rtl_tag = "dir=\"rtl\""; - } else { - $rtl_tag = "dir=\"ltr\""; - } - - $feed = "$feed_title"; - - print "
    • "; -# if (get_pref($link, 'ENABLE_FEED_ICONS')) { -# print "$feed_icon"; -# } - print "$feed "; - - if ($unread != 0) { - print "($unread)"; - } - - print "
    • "; + print "
    "; */ } - function render_headlines($link) { - - $feed = db_escape_string($_GET["id"]); - $limit = db_escape_string($_GET["limit"]); - $view_mode = db_escape_string($_GET["viewmode"]); - $cat_view = db_escape_string($_GET["cat"]); - $subop = $_GET["subop"]; - $catchup_op = $_GET["catchup_op"]; - - if (!$view_mode) { - if ($_SESSION["mobile:viewmode"]) { - $view_mode = $_SESSION["mobile:viewmode"]; - } else { - $view_mode = "adaptive"; - } - } - - $_SESSION["mobile:viewmode"] = $view_mode; - - if (!$limit) $limit = 30; - if (!$feed) $feed = 0; - - if (preg_match("/^-?[0-9][0-9]*$/", $feed) != false) { + function render_categories_list($link) { + $owner_uid = $_SESSION["uid"]; - $result = db_query($link, "SELECT rtl_content FROM ttrss_feeds - WHERE id = '$feed' AND owner_uid = " . $_SESSION["uid"]); - if (db_num_rows($result) == 1) { - $rtl_content = sql_bool_to_bool(db_fetch_result($result, 0, "rtl_content")); - } else { - $rtl_content = false; - } + print '
      '; - if ($rtl_content) { - $rtl_tag = "dir=\"RTL\""; + foreach (array(-1, -2) as $id) { + $title = getCategoryTitle($link, $id); + $unread = getFeedUnread($link, $id, true); + if ($unread > 0) { + $title = $title . " ($unread)"; + $class = ''; } else { - $rtl_tag = ""; - } - } else { - $rtl_content = false; - $rtl_tag = ""; - } - - print "
      "; - - if ($subop == "ForceUpdate" && sprintf("%d", $feed) > 0) { - update_generic_feed($link, $feed, $cat_view, true); - } - - if ($subop == "MarkAllRead" || $catchup_op == "feed") { - catchup_feed($link, $feed, $cat_view); - } - - if ($catchup_op == "selection") { - $ids_to_mark = array_keys($_GET["sel_ids"]); - if ($ids_to_mark) { - foreach ($ids_to_mark as $id) { - db_query($link, "UPDATE ttrss_user_entries SET - unread = false,last_read = NOW() - WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]); - } - } - } - - if ($subop == "MarkPageRead" || $catchup_op == "page") { - $ids_to_mark = $_SESSION["last_page_ids.$feed"]; - - if ($ids_to_mark) { - - foreach ($ids_to_mark as $id) { - db_query($link, "UPDATE ttrss_user_entries SET - unread = false,last_read = NOW() - WHERE ref_id = '$id' AND owner_uid = " . $_SESSION["uid"]); - } + $class = 'oldItem'; } - } - - - /// START ///////////////////////////////////////////////////////////////////////////////// - $search = db_escape_string($_GET["query"]); - $search_mode = db_escape_string($_GET["search_mode"]); - $match_on = db_escape_string($_GET["match_on"]); - - if (!$match_on) { - $match_on = "both"; + print "
    • $title
    • "; } - $real_offset = $offset * $limit; - - if ($_GET["debug"]) $timing_info = print_checkpoint("H0", $timing_info); - - $qfh_ret = queryFeedHeadlines($link, $feed, $limit, $view_mode, $cat_view, - $search, $search_mode, $match_on, false, $real_offset); - - if ($_GET["debug"]) $timing_info = print_checkpoint("H1", $timing_info); + $result = db_query($link, "SELECT + ttrss_feed_categories.id, + ttrss_feed_categories.title, + COUNT(ttrss_feeds.id) AS num_feeds + FROM ttrss_feed_categories, ttrss_feeds + WHERE ttrss_feed_categories.owner_uid = $owner_uid + AND ttrss_feed_categories.id = cat_id + AND hidden = false + GROUP BY ttrss_feed_categories.id, + ttrss_feed_categories.title + ORDER BY ttrss_feed_categories.title"); - $result = $qfh_ret[0]; - $feed_title = $qfh_ret[1]; - $feed_site_url = $qfh_ret[2]; - $last_error = $qfh_ret[3]; - - /// STOP ////////////////////////////////////////////////////////////////////////////////// - - if (!$result) { - print "
      ". - __("Could not display feed (query failed). Please check label match syntax or local configuration."). - "
      "; - return; - } - - print "
      "; - # if (!$cat_view && file_exists("../icons/$feed.ico") && filesize("../icons/$feed.ico") > 0) { - # print ""; - # } - - print "$feed_title ("; - print "".__("Back").", "; - print "".__("Search").", "; - print "".__("Update").""; - -# print "Mark as read: "; -# print "Page, "; -# print "Feed"; - - print ")"; - - print " " . __('View:'); - - print "
      "; - - /* print ""; */ - - $sel_values = array( - "adaptive" => __("Adaptive"), - "all_articles" => __("All Articles"), - "unread" => __("Unread"), - "marked" => __("Starred")); - - print_select_hash("viewmode", $view_mode, $sel_values); - - print " - - - "; - print "
      "; - - print "
      "; - - if (db_num_rows($result) > 0) { + $cat_ids = array(); - print "
      "; - print ""; - print ""; - print ""; + while ($line = db_fetch_assoc($result)) { - print "
        "; + if ($line["num_feeds"] > 0) { - $page_art_ids = array(); - - $lnum = 0; - - error_reporting (DEFAULT_ERROR_LEVEL); - - $num_unread = 0; - - while ($line = db_fetch_assoc($result)) { - - $class = ($lnum % 2) ? "even" : "odd"; - + $unread = getFeedUnread($link, $line["id"], true); $id = $line["id"]; - $feed_id = $line["feed_id"]; - - array_push($page_art_ids, $id); - - if ($line["last_read"] == "" && - ($line["unread"] != "t" && $line["unread"] != "1")) { - - $update_pic = "\"".__("Updated")."\""; - } else { - $update_pic = "\"".__("Updated")."\""; - } - - if ($line["unread"] == "t" || $line["unread"] == "1") { - $class .= "Unread"; - ++$num_unread; - $is_unread = true; - } else { - $is_unread = false; - } - - if ($line["marked"] == "t" || $line["marked"] == "1") { - $marked_pic = "\"S\""; - } else { - $marked_pic = "\"s\""; - } - if ($line["published"] == "t" || $line["published"] == "1") { - $published_pic = "\"P\""; + if ($unread > 0) { + $line["title"] = $line["title"] . " ($unread)"; + $class = ''; } else { - $published_pic = "\"p\""; + $class = 'oldItem'; } - - $content_link = "" . - $line["title"] . ""; - - if (get_pref($link, 'HEADLINES_SMART_DATE')) { - $updated_fmt = smart_date_time(strtotime($line["updated"])); - } else { - $short_date = get_pref($link, 'SHORT_DATE_FORMAT'); - $updated_fmt = date($short_date, strtotime($line["updated"])); - } - print "
      • "; - - print ""; - - print "$marked_pic"; - print "$published_pic"; - - print $content_link; - - if ($line["feed_title"]) { - print " (". - $line["feed_title"].")"; - } - print " ($updated_fmt)"; + print "
      • " . + $line["title"] . "
      • "; - print ""; + array_push($cat_ids, $id); - - ++$lnum; } - - print "
      "; - - print "
      "; - - $_SESSION["last_page_ids.$feed"] = $page_art_ids; - -/* print "Page, "; - print "Feed
      "; */ - - print "Select: - ".__("All").", - ".__("Unread").", - ".__("None").", - ".__("Invert").""; - - print " "; - - print " - - "; - - print "
      "; - - } else { - print "
      No articles found.
      "; } - } - function render_article($link) { + $result = db_query($link, "SELECT COUNT(*) AS nf FROM ttrss_feeds WHERE + cat_id IS NULL and owner_uid = '$owner_uid'"); - $id = db_escape_string($_GET["id"]); - $feed_id = db_escape_string($_GET["feed"]); - $ret_feed_id = db_escape_string($_GET["ret_feed"]); - $cat_view = db_escape_string($_GET["cat"]); + $num_feeds = db_fetch_result($result, 0, "nf"); - $result = db_query($link, "SELECT rtl_content FROM ttrss_feeds - WHERE id = '$feed_id' AND owner_uid = " . $_SESSION["uid"]); + if ($num_feeds > 0) { + $unread = getFeedUnread($link, 0, true); + $title = "Uncategorized"; - if (db_num_rows($result) == 1) { - $rtl_content = sql_bool_to_bool(db_fetch_result($result, 0, "rtl_content")); - } else { - $rtl_content = false; - } - - if ($rtl_content) { - $rtl_tag = "dir=\"RTL\""; - $rtl_class = "RTL"; - } else { - $rtl_tag = ""; - $rtl_class = ""; - } - - $result = db_query($link, "UPDATE ttrss_user_entries - SET unread = false,last_read = NOW() - WHERE ref_id = '$id' AND feed_id = '$feed_id' AND owner_uid = " . $_SESSION["uid"]); - - $result = db_query($link, "SELECT title,link,content,feed_id,comments,int_id, - marked,published, - ".SUBSTRING_FOR_DATE."(updated,1,16) as updated, - (SELECT icon_url FROM ttrss_feeds WHERE id = feed_id) as icon_url, - num_comments, - author - FROM ttrss_entries,ttrss_user_entries - WHERE id = '$id' AND ref_id = id"); - - if ($result) { - - $line = db_fetch_assoc($result); - - $num_comments = $line["num_comments"]; - $entry_comments = ""; - - if ($num_comments > 0) { - if ($line["comments"]) { - $comments_url = $line["comments"]; - } else { - $comments_url = $line["link"]; - } - $entry_comments = "$num_comments comments"; + if ($unread > 0) { + $title = "$title ($unread)"; + $class = ''; } else { - if ($line["comments"] && $line["link"] != $line["comments"]) { - $entry_comments = "comments"; - } + $class = 'oldItem'; } - $tmp_result = db_query($link, "SELECT DISTINCT tag_name FROM - ttrss_tags WHERE post_int_id = " . $line["int_id"] . " - ORDER BY tag_name"); - - $tags_str = ""; - $f_tags_str = ""; + array_push($cat_ids, 0); - $num_tags = 0; - - while ($tmp_line = db_fetch_assoc($tmp_result)) { - $num_tags++; - $tag = $tmp_line["tag_name"]; - $tag_str = "$tag, "; - $tags_str .= $tag_str; - } - - $tags_str = preg_replace("/, $/", "", $tags_str); - - $parsed_updated = date(get_pref($link, 'SHORT_DATE_FORMAT'), - strtotime($line["updated"])); + print "
    • $title
    • "; + } - print "
      "; + print "
    "; + } - # if (file_exists("../icons/$feed_id.ico") && filesize("../icons/$feed_id.ico") > 0) { - # print ""; - # } + function render_headlines_list($link, $feed_id, $is_cat = false) { - if (!$cat_view) { - $feed_title = getFeedTitle($link, $ret_feed_id); - } else { - $feed_title = getCategoryTitle($link, $ret_feed_id); - $feed_title_native = getFeedTitle($link, $feed_id); - } + $feed_id = $feed_id; + $limit = 30; + $filter = ''; + $is_cat = $is_cat; + $view_mode = 'adaptive'; - if ($feed_title_native) { - $feed_link = "$feed_title_native"; - $feed_link .= " in - $feed_title"; - } else { - $feed_link = "$feed_title"; - } + /* do not rely on params below */ - $feedlist = "".__('Back to feedlist').""; + $search = ''; + $search_mode = ''; + $match_on = ''; + + $qfh_ret = queryFeedHeadlines($link, $feed_id, $limit, + $view_mode, $is_cat, $search, $search_mode, $match_on); - print "" . - truncate_string($line["title"], 30) . ""; - print " $parsed_updated ($feed_link, $feedlist)"; - print ""; + $result = $qfh_ret[0]; + $feed_title = $qfh_ret[1]; - if ($num_tags > 0) { - print "
    ".__("Tags:")." $tags_str
    "; - } + print "
      "; - if ($line["marked"] == "t" || $line["marked"] == "1") { - $marked_pic = ""; - } else { - $marked_pic = ""; - } + while ($line = db_fetch_assoc($result)) { + $id = $line["id"]; - if ($line["published"] == "t" || $line["published"] == "1") { - $published_pic = ""; + if (sql_bool_to_bool($line["unread"])) { + $class = ''; } else { - $published_pic = ""; + $class = 'oldItem'; } + print "
    • "; + print $line["title"]; + print "
    • "; - print "
      "; - print "$marked_pic"; - print "$published_pic"; - // Mark unread - print ""; - print "
      "; - - print sanitize_rss($link, $line["content"], true);; - } - print ""; + print "
    "; + } - function render_search_form($link, $active_feed_id = false, $is_cat = false) { + function render_article($link, $id, $feed_id) { - print "
    "; + $query = "SELECT title,link,content,feed_id,comments,int_id, + marked,unread,published, + ".SUBSTRING_FOR_DATE."(updated,1,16) as updated, + author + FROM ttrss_entries,ttrss_user_entries + WHERE id = '$id' AND ref_id = id AND owner_uid = " . + $_SESSION["uid"] ; - print __("Search")." - (".__("Go back").")
    "; + $result = db_query($link, $query); - print "
    "; + $line = db_fetch_assoc($result); - print ""; - print ""; - print ""; + if (get_pref($link, 'HEADLINES_SMART_DATE')) { + $updated_fmt = smart_date_time(strtotime($line["updated"])); + } else { + $short_date = get_pref($link, 'SHORT_DATE_FORMAT'); + $updated_fmt = date($short_date, strtotime($line["updated"])); + } - print ""; + $title = $line["title"]; + $link = $line["link"]; - print ""; + $is_starred = (sql_bool_to_bool($line["marked"])) ? "true" : "false"; + $is_published = (sql_bool_to_bool($line["published"])) ? "true" : "false"; - print "
    ".__('Search:').""; - print "
    ".__('Where:').""; - - print "
    ".__('Match on:').""; + print "
    + +
    ONOFF
    +
    "; - $search_fields = array( - "title" => __("Title"), - "content" => __("Content"), - "both" => __("Title or content")); + print "
    + +
    ONOFF
    +
    "; - print_select_hash("match_on", 3, $search_fields); - - print "
    "; - print ""; + print "
    "; + print ""; + print ""; + print "
    "; - print "
    "; + print ""; - print ""; - } + print "

    "; + print $line["content"]; + print "

    "; - function toggleMarked($link, $ts_id) { - $result = db_query($link, "UPDATE ttrss_user_entries SET marked = NOT marked - WHERE ref_id = '$ts_id' AND owner_uid = " . $_SESSION["uid"]); - } - function togglePublished($link, $tp_id) { - $result = db_query($link, "UPDATE ttrss_user_entries SET published = NOT published - WHERE ref_id = '$tp_id' AND owner_uid = " . $_SESSION["uid"]); - } + print ""; - function markUnread($link, $mu_id) { - $result = db_query($link, "UPDATE ttrss_user_entries SET unread = true - WHERE ref_id = '$mu_id' AND owner_uid = " . $_SESSION["uid"]); } - ?> diff --git a/mobile/index.php b/mobile/index.php index 1078eedea..a2c51093c 100644 --- a/mobile/index.php +++ b/mobile/index.php @@ -1 +1,74 @@ - + + + + + +Tiny Tiny RSS + + + + + + + + + + + + + + +
    +

    + + Logout +
    + + + + + diff --git a/mobile/login_form.php b/mobile/login_form.php index 4e414b5a0..cdfa57e57 100644 --- a/mobile/login_form.php +++ b/mobile/login_form.php @@ -1,36 +1,23 @@ - + + + - Tiny Tiny RSS : Login - - - +Tiny Tiny RSS + + + + + + - - - - - - - - - -
    - -
    - - - - - - - - -