basic functionality pass 8

5 files changed, 56 insertions, 15 deletions

diff --git a/functions.php b/functions.php
index b36efe1a7..d49c951fc 100644
--- 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 03cdd4acc..46679b7de 100644
--- 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 9765e14e1..6ec78a5b2 100644
--- 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 f779e0f17..4bde18858 100644
--- 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 ab2d81911..34d99ff45 100644
--- 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>