normalize title in front pages, fix filter query in update process

diff --git a/functions.php b/functions.php
index d775abb145df68b0255c71142ee34e946a0f84f3..6b722a7ae7875c3085882bbc6035cf0c1c8602e1 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -380,7 +380,7 @@
 
                        $result = db_query($link, "SELECT reg_exp,
                                ttrss_filter_types.name AS name,
-                               ttrss_filter_actions.name AS action,
+                               ttrss_filter_actions.name AS action
                                FROM ttrss_filters,ttrss_filter_types,ttrss_filter_actions WHERE                                        
                                        enabled = true AND
                                        owner_uid = $owner_uid AND

diff --git a/login.php b/login.php
index 2bf8c7e91f2aca8ed3b919342fff688fdcef77ff..bf5c4ca9375a2b17453785b4bacd7355bd5f0c80 100644 (file)
--- a/login.php
+++ b/login.php
@@ -134,7 +134,7 @@ window.onload = init;
        </td>
 </tr><tr>
        <td align="center" class="loginBottom">
-               <a href="http://tt-rss.spb.ru/">Tiny-Tiny RSS</a> &copy; 2005-2006 Andrew Dolgov
+               <a href="http://tt-rss.spb.ru/">Tiny Tiny RSS</a> &copy; 2005-2006 Andrew Dolgov
                <?php if (WEB_DEMO_MODE) { ?>
                <br>Running in demo mode, some functionality is disabled.
                <?php } ?>

diff --git a/prefs.php b/prefs.php
index 1774bce2d971a4e11ece3b1aaf26cf5401693613..110d373d5bd46c3d25de8b2f298c0f5757812a0d 100644 (file)
--- a/prefs.php
+++ b/prefs.php
@@ -155,7 +155,7 @@ window.onload = init;
 <?php if (get_pref($link, 'DISPLAY_FOOTER')) { ?>
 <tr>
        <td class="footer" colspan="2">
-               <a href="http://tt-rss.spb.ru/">Tiny-Tiny RSS</a> v<?php echo VERSION ?> &copy; 2005-2006 Andrew Dolgov
+               <a href="http://tt-rss.spb.ru/">Tiny Tiny RSS</a> v<?php echo VERSION ?> &copy; 2005-2006 Andrew Dolgov
                <?php if (WEB_DEMO_MODE) { ?>
                <br>Running in demo mode, some functionality is disabled.
                <?php } ?>

diff --git a/tt-rss.css b/tt-rss.css
index bcd2712cbd5de3f4526e3a8bd0b572c849716581..d2a4afadd8cae45be3bdaf9e86613e22b4d12972 100644 (file)
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -62,11 +62,11 @@ table.main td.footer {
        background-position : top left;
        background-repeat : repeat-x; 
        background-color : white;
-       color : black;
+       color : gray;
 }
 
 table.main td.footer a {
-       color : black;
+       color : gray;
 }
 
 table.main td.footer a:hover {
@@ -1198,7 +1198,11 @@ table.loginForm2 .loginBottom {
 }
 
 table.loginForm2 .loginBottom a {
-       color : #909090;
+       color : gray;
+}
+
+table.loginForm2 .loginBottom a:hover {
+       color : #4684ff;
 }
 
 table.loginForm2 .loginError {
@@ -1210,4 +1214,3 @@ table.loginForm2 .innerLoginCell {
        padding-top : 0.5em;
 }
 
-

diff --git a/tt-rss.js b/tt-rss.js
index 9f83cc5be6a4f819c0a4e36b0a47c177bbcd4c47..771114d5b9e07288b5f25945bfc59d3f391e64a3 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -186,6 +186,8 @@ function scheduleFeedUpdate(force) {
                xmlhttp.abort();
        }
 
+       debug("REFETCH query: " + query_str);
+
        if (xmlhttp_ready(xmlhttp)) {
                xmlhttp.open("GET", query_str, true);
                xmlhttp.onreadystatechange=refetch_callback;
@@ -538,7 +540,7 @@ function toggleDispRead() {
 function parse_runtime_info(elem) {
        var param = elem.firstChild;
 
-       debug("parse_runtime_info");
+       debug("parse_runtime_info: " + param);
 
        while (param) {
                var k = param.getAttribute("key");

diff --git a/tt-rss.php b/tt-rss.php
index aa38a0d012e4022048046857d9d6acc1868d55e4..a3459bc347f68d388ecada21587d154a3ca34f5f 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -251,7 +251,7 @@ window.onload = init;
 <?php if (get_pref($link, 'DISPLAY_FOOTER')) { ?>
 <tr>
        <td colspan="2" class="footer" id="mainFooter">
-               <a href="http://tt-rss.spb.ru/">Tiny-Tiny RSS</a> v<?php echo VERSION ?> &copy; 2005-2006 Andrew Dolgov
+               <a href="http://tt-rss.spb.ru/">Tiny Tiny RSS</a> v<?php echo VERSION ?> &copy; 2005-2006 Andrew Dolgov
                <?php if (WEB_DEMO_MODE) { ?>
                <br>Running in demo mode, some functionality is disabled.
                <?php } ?>