basic functionality pass 8

diff --git a/functions.php b/functions.php
index b36efe1a709215652d8353b1b54bceba561e8616..d49c951fc5141aeafb6f061df78b8c321a895f87 100644 (file)
--- a/functions.php
+++ b/functions.php
@@ -32,10 +32,15 @@
                                if (!$entry_timestamp) $entry_timestamp = $item["updated"];
        
                                $entry_timestamp = strtotime($entry_timestamp);
-       
+
+                               if (!$entry_timestamp) continue;
+
                                $entry_title = $item["title"];
                                $entry_link = $item["link"];
-       
+
+                               if (!$entry_title) continue;
+                               if (!$entry_link) continue;
+
                                $entry_content = $item["description"];
                                if (!$entry_content) $entry_content = $item["content"];
        

diff --git a/prefs.js b/prefs.js
index 03cdd4accdfb80fd621a03e2f54b0de6add6b267..46679b7de278ecc0f444d23155c825e7f08abc08 100644 (file)
--- a/prefs.js
+++ b/prefs.js
@@ -77,6 +77,18 @@ function toggleSelectRow(sender) {
        }
 }
 
+function addFeed() {
+
+       var link = document.getElementById("fadd_link").value;
+       var title = document.getElementById("fadd_title").value;
+
+       if (link.length == 0 || title.length == 0) {
+               notify("Error: all fields must be filled in.");
+       } else {
+               notify("addFeed : " + link + ", " + title);
+       }
+
+}
 
 function init() {
 

diff --git a/prefs.php b/prefs.php
index 9765e14e14ef3cb7b6b084af0b8a8bb197cccce5..6ec78a5b2167792d50eb22f4c66077748a2968c7 100644 (file)
--- a/prefs.php
+++ b/prefs.php
@@ -10,35 +10,46 @@
 
 <table width="100%" height="100%" cellspacing=0 cellpadding=0 class="main">
 <tr>
-       <td class="header" valign="middle" colspan="1"> 
+       <td class="header" valign="middle" colspan="2"> 
                        Preferences
        </td>
 </tr>
 <tr>
-       <td class="toolbar" valign="middle" colspan="1">        
-               <a class="button">Close</a>
+       <td class="toolbar" valign="middle">
+                <div id="notify">&nbsp;</div>
+       </td>
+       <td class="toolbar" valign="middle" colspan="2" align="right">  
+               <a href="tt-rss.php" class="button">Return to main</a>
        </td>
 </tr>
 </tr>
-       <td class="content" id="content" valign="top">
+       <td class="content" id="content" valign="top" colspan="2">
                <h2>Feed Configuration</h2>
 
-               <table class="prefAddFeed">
+               <!-- <input type="submit" value="Add feed"> -->
+
+               <!-- <table class="prefAddFeed">
                        <tr><td>Title:</td><td><input id="fadd_title"></td></tr>
                        <tr><td>Link:</td><td><input id="fadd_link"></td></tr>
                        <tr><td colspan="2" align="right">
                                <a class="button" href="javascript:addFeed()">Add feed</a></td></tr>
+               </table> -->
+
+               <table class="prefAddFeed">
+                       <tr><td>Title:</td><td><input id="fadd_title"></td>
+                       <td>Link:</td><td><input id="fadd_link"></td></tr>
+                       <tr><td colspan="4" align="right">
+                               <a class="button" href="javascript:addFeed()">Add feed</a></td></tr>
                </table>
 
-               <!-- <input type="submit" value="Add feed"> -->
-               
                <div id="feeds">&nbsp;</div>
 
                <hr>
+
        </td>
 </tr>
 <tr>
-       <td colspan="2" id="notify" class="notify">
+       <td colspan="2" class="notify">
                <a href="">Tiny-Tiny RSS</a> v0.1 &copy; 2005 Andrew Dolgov
        </td>
 </td>

diff --git a/tt-rss.css b/tt-rss.css
index f779e0f1724cb550d053bcf20ad2229d30715c6e..4bde18858146f0531a6362ce6e5d0b9f56d40bb1 100644 (file)
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -103,13 +103,24 @@ table.main td.toolbar {
        /* background-image : url("shadow_top.png");
        background-position : bottom left;
        background-repeat : repeat-x; */
-       padding-right : 5px;
+       padding-right : 10px;
+       padding-left : 10px;
        font-size : small;
-       text-align : right;
+}
+
+#notify {
+       font-weight : bold;
+       border : 1px solid #c0c0c0;
+       font-size : small;
+       display : block;
+       background : white;
+       -moz-border-radius : 5px;
+       padding : 3px 10px 3px 10px;
+       width : 300px;
 }
 
 table.main td.header {
-       font-size : 18pt;
+       font-size : 21pt;
        background-color : #f0f0f0;
        background-image : url("header.png");
        background-position : top left;
@@ -118,6 +129,7 @@ table.main td.header {
        padding-left : 80px;
        padding-top : 30px;
        font-weight : bold;
+       color : black;
 }
 
 table.main td.feeds {
@@ -150,9 +162,10 @@ td.content a {
        text-decoration : none;
 }
 
+/*
 td.content a:hover {
        text-decoration : underline;
-}
+} */
 
 table.main td.notify {
        height : 40px;

diff --git a/tt-rss.php b/tt-rss.php
index ab2d81911f2466274c1bd91bb92411321da33077..34d99ff45a7dbfdd0ce2cba0777e42a9bf666e21 100644 (file)
--- a/tt-rss.php
+++ b/tt-rss.php
@@ -19,7 +19,7 @@
                Search: <input name="q" onclick=\"javascript:search(this);\">
        </td> -->
        <td class="toolbar" valign="middle" colspan="2">        
-               <a class="button">Preferences</a>
+               <a href="prefs.php" class="button">Preferences</a>
                <!-- <a class="button" href="javascript:refresh()">Refresh</a> -->
        </td>
 </tr>