[Feed-collector-svn] SF.net SVN: feed-collector: [99] trunk

[<c1...@us...>]

Revision: 99
          http://feed-collector.svn.sourceforge.net/feed-collector/?rev=99&view=rev
Author:   c167
Date:     2007-01-10 14:12:47 -0800 (Wed, 10 Jan 2007)

Log Message:
-----------


Modified Paths:
--------------
    trunk/inc/navigation.php
    trunk/page_add_new_feed.php
    trunk/page_add_tag.php
    trunk/page_login.php
    trunk/page_main.php
    trunk/page_personal.php
    trunk/page_register.php
    trunk/page_show_all_feeds.php
    trunk/page_show_feed.php
    trunk/page_show_feed_tag.php
    trunk/styles/default/page_login-screen.css
    trunk/styles/default/page_main-screen.css
    trunk/styles/default/page_personal-screen.css
    trunk/styles/default/page_register-screen.css

Modified: trunk/inc/navigation.php
===================================================================
--- trunk/inc/navigation.php	2007-01-09 21:45:26 UTC (rev 98)
+++ trunk/inc/navigation.php	2007-01-10 22:12:47 UTC (rev 99)
@@ -57,12 +57,12 @@
 "        <a href=\"./page_show_feed_tag.php\"$show_feed_tag>%s</a> |\n" .
 "        <a href=\"./page_add_new_feed.php\"$add_new_feed>%s</a> |\n" .
 "        <a href=\"./page_show_feed.php\"$show_feed>%s</a> |\n" .
-"        <a href=\"./page_add_tag.php?%s\"$add_tag>%s</a> |\n", _("Home"), _("Show all Feeds"), _("Feeds by TAG"), _("Add a Feed"), _("Display a Feed"), !empty($_GET['feed']) ? "feed=" .$_GET['feed'] : "", _("Add a Tag"));
+"        <a href=\"./page_add_tag.php?%s\"$add_tag>%s</a> |\n", dgettext("navigation", "Home"), dgettext("navigation", "Show all Feeds"), dgettext("navigation", "Feeds by TAG"), dgettext("navigation", "Add a Feed"), dgettext("navigation", "Display a Feed"), !empty($_GET['feed']) ? "feed=" .$_GET['feed'] : "", dgettext("navigation", "Add a Tag"));
 if (false === HTTP_Session :: get("logged_in", false)) {
 	$navigation .= sprintf("        <a href=\"./page_login.php\"$login>%s</a> |\n" .
-	"        <a href=\"./page_register.php\"$register>%s</a>", _("Login"), _("Register"));
+	"        <a href=\"./page_register.php\"$register>%s</a>", dgettext("navigation", "Login"), dgettext("navigation", "Register"));
 } else {
 	$navigation .= sprintf("        <a href=\"./page_personal.php\"$personal>%s</a> |\n" .
-	"        <a href=\"./page_logout.php?returnto=page_main.php\">%s</a>", _("Personal Page"), _("LogOut"));
+	"        <a href=\"./page_logout.php?returnto=page_main.php\">%s</a>", dgettext("navigation", "Personal Page"), dgettext("navigation", "LogOut"));
 }
 ?>

Modified: trunk/page_add_new_feed.php
===================================================================
--- trunk/page_add_new_feed.php	2007-01-09 21:45:26 UTC (rev 98)
+++ trunk/page_add_new_feed.php	2007-01-10 22:12:47 UTC (rev 99)
@@ -80,7 +80,7 @@
 $user = new User_manager($db);
 
 if (false === HTTP_Session :: get("logged_in", false)) {
-	//HTTP :: redirect("./page_login.php");
+	HTTP :: redirect("./page_login.php");
 }
 
 $page = "add_new_feed";
@@ -97,15 +97,18 @@
 }
 elseif (isset ($_GET['lang']) and in_array($_GET['lang'], $langs)) {
 	$language = $_GET['lang'];
+	HTTP_Session :: set("lang", $_GET['lang']);
 }
 elseif (!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
 	$language = HTTP_Session :: get("lang");
 } else {
 	$language = "en_EN";
 }
+putenv("LANG=$language");
 setlocale(LC_ALL, $language);
-bindtextdomain("page_$page", "./i18n");
-textdomain("page_$page");
+bindtextdomain("page_main", "./i18n");
+bindtextdomain("navigation", "./i18n");
+textdomain("page_main");
 
 #####################
 # BUILD THE CONTENT #

Modified: trunk/page_add_tag.php
===================================================================
--- trunk/page_add_tag.php	2007-01-09 21:45:26 UTC (rev 98)
+++ trunk/page_add_tag.php	2007-01-10 22:12:47 UTC (rev 99)
@@ -87,19 +87,24 @@
 if (true === HTTP_Session :: get("logged_in", false)) {
 	$user->setUserId(HTTP_Session :: get("uid"));
 	$language = $user->getUserLanguage();
-	if(!in_array($language, $langs)) {
+	if (!in_array($language, $langs)) {
 		$language = "en_EN";
 	}
-} elseif(isset($_GET['lang']) and in_array($_GET['lang'], $langs)) {
+}
+elseif (isset ($_GET['lang']) and in_array($_GET['lang'], $langs)) {
 	$language = $_GET['lang'];
-} elseif(!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
+	HTTP_Session :: set("lang", $_GET['lang']);
+}
+elseif (!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
 	$language = HTTP_Session :: get("lang");
 } else {
 	$language = "en_EN";
 }
+putenv("LANG=$language");
 setlocale(LC_ALL, $language);
-bindtextdomain("page_$page", "./i18n");
-textdomain("page_$page");
+bindtextdomain("page_main", "./i18n");
+bindtextdomain("navigation", "./i18n");
+textdomain("page_main");
 
 $main = "";
 if (isset ($_POST['tag'])) {

Modified: trunk/page_login.php
===================================================================
--- trunk/page_login.php	2007-01-09 21:45:26 UTC (rev 98)
+++ trunk/page_login.php	2007-01-10 22:12:47 UTC (rev 99)
@@ -76,19 +76,24 @@
 if (true === HTTP_Session :: get("logged_in", false)) {
 	$user->setUserId(HTTP_Session :: get("uid"));
 	$language = $user->getUserLanguage();
-	if(!in_array($language, $langs)) {
+	if (!in_array($language, $langs)) {
 		$language = "en_EN";
 	}
-} elseif(isset($_GET['lang']) and in_array($_GET['lang'], $langs)) {
+}
+elseif (isset ($_GET['lang']) and in_array($_GET['lang'], $langs)) {
 	$language = $_GET['lang'];
-} elseif(!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
+	HTTP_Session :: set("lang", $_GET['lang']);
+}
+elseif (!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
 	$language = HTTP_Session :: get("lang");
 } else {
 	$language = "en_EN";
 }
+putenv("LANG=$language");
 setlocale(LC_ALL, $language);
-bindtextdomain("page_$page", "./i18n");
-textdomain("page_$page");
+bindtextdomain("page_main", "./i18n");
+bindtextdomain("navigation", "./i18n");
+textdomain("page_main");
 
 ################
 # User-Manager #
@@ -187,23 +192,15 @@
 	if (!is_null($error)) {
 		switch ($error) {
 			case LOGIN_WRONG_VALUES :
-				$id_username = "error";
-				$id_password = "error";
 				$message = sprintf("              <p>%s</p>\n", _("Unknown username. If you don't have a username then please <a href=\"./page_register.php\">register</a> a new one"));
 				break;
 			case LOGIN_INACTIVE :
-				$id_username = "error";
-				$id_password = "error";
 				$message = sprintf("              <p>%s</p>\n", _("This useraccount is not active. You should have received a mail with an access-key. If not, please look at your spam-folder or send a mail to the site-admin."));
 				break;
 			default :
-				$id_username = "ok";
-				$id_password = "ok";
 				$message = sprintf("              <p>%s</p>\n", _("Please enter your username and your password to login. Cookies have to be enabled from this point."));
 		}
 	} else {
-		$id_username = "ok";
-		$id_password = "ok";
 		$message = sprintf("              <p>%s</p>\n", _("Please enter your username and your password to login. Cookies have to be enabled from this point."));
 
 	}
@@ -215,12 +212,12 @@
 	"                  <th colspan=\"2\">%s</th>\n" .
 	"                </tr>\n" .
 	"                <tr>\n" .
-	"                  <td class=\"left_side\" class=\"formElem_$id_username\">%s</td>\n" .
-	"                  <td class=\"right_side\" class=\"formField_$id_username\"><input type=\"text\" name=\"username\" size=\"30\" maxlength=\"30\" /></td>\n" .	
+	"                  <td class=\"formElem\">%s</td>\n" .
+	"                  <td class=\"formField\"><input type=\"text\" name=\"username\" size=\"30\" maxlength=\"30\" /></td>\n" .	
 	"                </tr>\n" .
 	"                <tr>\n" .
-	"                  <td class=\"left_side\" class=\"formElem_$id_password\">%s</td>\n" .	
-	"                  <td class=\"right_side\" class=\"formField_$id_password\"><input type=\"password\" name=\"passwd\" size=\"30\" maxlength=\"30\" /></td>\n" .
+	"                  <td class=\"formElem\">%s</td>\n" .	
+	"                  <td class=\"formField\"><input type=\"password\" name=\"passwd\" size=\"30\" maxlength=\"30\" /></td>\n" .
 	"                </tr>\n" .
 	"                <tr id=\"formButtons\">\n" .
 	"                  <td colspan=\"2\"><input type=\"submit\" value=\"%s\" name=\"submit\" /><input type=\"reset\" value=\"%s\" /></td>\n" .

Modified: trunk/page_main.php
===================================================================
--- trunk/page_main.php	2007-01-09 21:45:26 UTC (rev 98)
+++ trunk/page_main.php	2007-01-10 22:12:47 UTC (rev 99)
@@ -75,22 +75,23 @@
 if (true === HTTP_Session :: get("logged_in", false)) {
 	$user->setUserId(HTTP_Session :: get("uid"));
 	$language = $user->getUserLanguage();
-	if(!in_array($language, $langs)) {
+	if (!in_array($language, $langs)) {
 		$language = "en_EN";
 	}
-} elseif(isset($_GET['lang']) and in_array($_GET['lang'], $langs)) {
+}
+elseif (isset ($_GET['lang']) and in_array($_GET['lang'], $langs)) {
 	$language = $_GET['lang'];
-} elseif(!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
+	HTTP_Session :: set("lang", $_GET['lang']);
+}
+elseif (!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
 	$language = HTTP_Session :: get("lang");
 } else {
 	$language = "en_EN";
 }
-//echo $language;
 putenv("LANG=$language");
 setlocale(LC_ALL, $language);
-//echo "<br />";
 bindtextdomain("page_main", "./i18n");
-//echo "<br />";
+bindtextdomain("navigation", "./i18n");
 textdomain("page_main");
 
 //
@@ -107,7 +108,13 @@
 
 # body
 // related sites
-$related_sites = sprintf("        <span>%s</span>\n        <a href=\"http://www.oswd.org\" title=\"The host of this base design\">OSWD</a> |\n        <a href=\"http://www.oswd.org/userinfo.phtml?user=haran\" title=\"Other designs by haran\">haran&rsquo;s Designs</a>", _("Related Sites:"));
+if (true === HTTP_Session :: get("logged_in", false)) {
+	$related_sites = sprintf("        <span>%s</span>\n" .
+			"        <a href=\"http://www.oswd.org\" title=\"The host of this base design\">OSWD</a> |\n" .
+			"        <a href=\"http://www.oswd.org/userinfo.phtml?user=haran\" title=\"Other designs by haran\">haran&rsquo;s Designs</a>", _("Related Sites:"));
+} else {
+	$related_sites = sprintf("        <span>%s</span>\n        <a href=\"http://www.oswd.org\" title=\"The host of this base design\">OSWD</a> |\n        <a href=\"http://www.oswd.org/userinfo.phtml?user=haran\" title=\"Other designs by haran\">haran&rsquo;s Designs</a>", _("Related Sites:"));
+}
 $design = str_replace("<!-- related sites -->", $related_sites, $design);
 
 // midHeader title left
@@ -118,7 +125,7 @@
 if (false === HTTP_Session :: get("logged_in", false)) {
 	$midHeader_title_right = sprintf("          <p>%s</p>", _("You are not logged in"));
 } else {
-	if(HTTP_Session :: get("username", false) == false) {
+	if (HTTP_Session :: get("username", false) == false) {
 		$username = $user->getUsername();
 	} else {
 		$username = HTTP_Session :: get("username");

Modified: trunk/page_personal.php
===================================================================
--- trunk/page_personal.php	2007-01-09 21:45:26 UTC (rev 98)
+++ trunk/page_personal.php	2007-01-10 22:12:47 UTC (rev 99)
@@ -79,19 +79,24 @@
 if (true === HTTP_Session :: get("logged_in", false)) {
 	$user->setUserId(HTTP_Session :: get("uid"));
 	$language = $user->getUserLanguage();
-	if(!in_array($language, $langs)) {
+	if (!in_array($language, $langs)) {
 		$language = "en_EN";
 	}
-} elseif(isset($_GET['lang']) and in_array($_GET['lang'], $langs)) {
+}
+elseif (isset ($_GET['lang']) and in_array($_GET['lang'], $langs)) {
 	$language = $_GET['lang'];
-} elseif(!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
+	HTTP_Session :: set("lang", $_GET['lang']);
+}
+elseif (!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
 	$language = HTTP_Session :: get("lang");
 } else {
 	$language = "en_EN";
 }
+putenv("LANG=$language");
 setlocale(LC_ALL, $language);
-bindtextdomain("page_$page", "./i18n");
-textdomain("page_$page");
+bindtextdomain("page_main", "./i18n");
+bindtextdomain("navigation", "./i18n");
+textdomain("page_main");
 
 
 //

Modified: trunk/page_register.php
===================================================================
--- trunk/page_register.php	2007-01-09 21:45:26 UTC (rev 98)
+++ trunk/page_register.php	2007-01-10 22:12:47 UTC (rev 99)
@@ -82,25 +82,31 @@
 $user = new User_manager($db);
 
 $page = "register";
+
 ############
 # LANGUAGE #
 ############
 if (true === HTTP_Session :: get("logged_in", false)) {
 	$user->setUserId(HTTP_Session :: get("uid"));
 	$language = $user->getUserLanguage();
-	if(!in_array($language, $langs)) {
+	if (!in_array($language, $langs)) {
 		$language = "en_EN";
 	}
-} elseif(isset($_GET['lang']) and in_array($_GET['lang'], $langs)) {
+}
+elseif (isset ($_GET['lang']) and in_array($_GET['lang'], $langs)) {
 	$language = $_GET['lang'];
-} elseif(!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
+	HTTP_Session :: set("lang", $_GET['lang']);
+}
+elseif (!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
 	$language = HTTP_Session :: get("lang");
 } else {
 	$language = "en_EN";
 }
+putenv("LANG=$language");
 setlocale(LC_ALL, $language);
-bindtextdomain("page_$page", "./i18n");
-textdomain("page_$page");
+bindtextdomain("page_main", "./i18n");
+bindtextdomain("navigation", "./i18n");
+textdomain("page_main");
 
 
 #####################
@@ -185,7 +191,6 @@
 	"                  <td class=\"formField\">\n" .
 	"                    <select name=\"language\">\n" .
 	"                      <option value=\"en_EN\">%s</option>\n" .
-	//"                      <option value=\"de_DE\" selected=\"selected\">German</option>\n" .
 	"                      <option value=\"de_DE\">%s</option>\n" .
 	"                    </select>\n" .
 	"                  </td>\n" .

Modified: trunk/page_show_all_feeds.php
===================================================================
--- trunk/page_show_all_feeds.php	2007-01-09 21:45:26 UTC (rev 98)
+++ trunk/page_show_all_feeds.php	2007-01-10 22:12:47 UTC (rev 99)
@@ -90,19 +90,24 @@
 if (true === HTTP_Session :: get("logged_in", false)) {
 	$user->setUserId(HTTP_Session :: get("uid"));
 	$language = $user->getUserLanguage();
-	if(!in_array($language, $langs)) {
+	if (!in_array($language, $langs)) {
 		$language = "en_EN";
 	}
-} elseif(isset($_GET['lang']) and in_array($_GET['lang'], $langs)) {
+}
+elseif (isset ($_GET['lang']) and in_array($_GET['lang'], $langs)) {
 	$language = $_GET['lang'];
-} elseif(!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
+	HTTP_Session :: set("lang", $_GET['lang']);
+}
+elseif (!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
 	$language = HTTP_Session :: get("lang");
 } else {
 	$language = "en_EN";
 }
+putenv("LANG=$language");
 setlocale(LC_ALL, $language);
-bindtextdomain("page_$page", "./i18n");
-textdomain("page_$page");
+bindtextdomain("page_main", "./i18n");
+bindtextdomain("navigation", "./i18n");
+textdomain("page_main");
 
 
 //

Modified: trunk/page_show_feed.php
===================================================================
--- trunk/page_show_feed.php	2007-01-09 21:45:26 UTC (rev 98)
+++ trunk/page_show_feed.php	2007-01-10 22:12:47 UTC (rev 99)
@@ -81,19 +81,24 @@
 if (true === HTTP_Session :: get("logged_in", false)) {
 	$user->setUserId(HTTP_Session :: get("uid"));
 	$language = $user->getUserLanguage();
-	if(!in_array($language, $langs)) {
+	if (!in_array($language, $langs)) {
 		$language = "en_EN";
 	}
-} elseif(isset($_GET['lang']) and in_array($_GET['lang'], $langs)) {
+}
+elseif (isset ($_GET['lang']) and in_array($_GET['lang'], $langs)) {
 	$language = $_GET['lang'];
-} elseif(!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
+	HTTP_Session :: set("lang", $_GET['lang']);
+}
+elseif (!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
 	$language = HTTP_Session :: get("lang");
 } else {
 	$language = "en_EN";
 }
+putenv("LANG=$language");
 setlocale(LC_ALL, $language);
-bindtextdomain("page_$page", "./i18n");
-textdomain("page_$page");
+bindtextdomain("page_main", "./i18n");
+bindtextdomain("navigation", "./i18n");
+textdomain("page_main");
 
 
 //

Modified: trunk/page_show_feed_tag.php
===================================================================
--- trunk/page_show_feed_tag.php	2007-01-09 21:45:26 UTC (rev 98)
+++ trunk/page_show_feed_tag.php	2007-01-10 22:12:47 UTC (rev 99)
@@ -81,21 +81,25 @@
 if (true === HTTP_Session :: get("logged_in", false)) {
 	$user->setUserId(HTTP_Session :: get("uid"));
 	$language = $user->getUserLanguage();
-	if(!in_array($language, $langs)) {
+	if (!in_array($language, $langs)) {
 		$language = "en_EN";
 	}
-} elseif(isset($_GET['lang']) and in_array($_GET['lang'], $langs)) {
+}
+elseif (isset ($_GET['lang']) and in_array($_GET['lang'], $langs)) {
 	$language = $_GET['lang'];
-} elseif(!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
+	HTTP_Session :: set("lang", $_GET['lang']);
+}
+elseif (!is_null(HTTP_Session :: get("lang")) and in_array(HTTP_Session :: get("lang"), $langs)) {
 	$language = HTTP_Session :: get("lang");
 } else {
 	$language = "en_EN";
 }
+putenv("LANG=$language");
 setlocale(LC_ALL, $language);
-bindtextdomain("page_$page", "./i18n");
-textdomain("page_$page");
+bindtextdomain("page_main", "./i18n");
+bindtextdomain("navigation", "./i18n");
+textdomain("page_main");
 
-
 // Now we're going to replace the placeholders in the template with the important content
 //
 if (!isset ($_GET['tag'])) {

Modified: trunk/styles/default/page_login-screen.css
===================================================================
--- trunk/styles/default/page_login-screen.css	2007-01-09 21:45:26 UTC (rev 98)
+++ trunk/styles/default/page_login-screen.css	2007-01-10 22:12:47 UTC (rev 99)
@@ -26,50 +26,40 @@
 	border-bottom: 1px solid rgb(204, 204, 204);
 }
 
-.left_side,.right_side {
-	padding-top: 1%;
-	padding-bottom: 1%;
+.formElem {
 	width: 49%;
+	text-align: center;
+	border-bottom: 1px solid rgb(117, 144, 174);
 }
 
-.right_side {
+.formField {
+	padding: 1%;
+	width: 49%;
 	border-left: 1px solid rgb(117, 144, 174);
+	border-bottom: 1px solid rgb(117, 144, 174);
 }
-
-.formElem_ok,.formElem_error {
-	text-align: center;
-}
-
-.formElem_ok input {
+.formField input {
+	margin-left: 2%;
 	background-color: yellow;
 }
 
-.formElem_error input {
-	background-color: red;
+#formButtons {
+	margin-left: 1%;
+	margin-right: 1%;
+	padding-left: 1%;
+	padding-right: 1%;
 }
 
-.formField_ok input {
-	background-color: yellow;
-}
-
-.formField_error input {
-	background-color: red;
-}
-
 #formButtons td {
 	text-align: center;
 	background-color: rgb(117, 144, 174);
 	margin-top: 6em;
 	padding-top: 1em;
 	padding-bottom: 1em;
-/*	border-top: 2px solid rgb(204, 204, 204);*/
 }
 
-#formButtons {
-	margin-left: 1%;
-	margin-right: 1%;
-	padding-left: 1%;
-	padding-right: 1%;
+#formButtons input {
+	margin-left: 1em;
 }
 
 .quarter,.oneThird,.half,.twoThirds,.fullWidth {

Modified: trunk/styles/default/page_main-screen.css
===================================================================
--- trunk/styles/default/page_main-screen.css	2007-01-09 21:45:26 UTC (rev 98)
+++ trunk/styles/default/page_main-screen.css	2007-01-10 22:12:47 UTC (rev 99)
@@ -98,7 +98,7 @@
 	/* use with an empty <p> element to add padding to the end of a text box */
 	border: 1px solid white;
 }
-
+/*
 .noBorderOnLeft {
 	border-left: none;
 }
@@ -106,16 +106,15 @@
 .dividingBorderAbove {
 	border-top: 1px solid rgb(204, 204, 204);
 }
-
+*/
 /* More elegant alternatives to .noBorderOnLeft & .dividingBorderAbove
  * that don't require the creation of new classes - but which are not
  * supported by MSIE - are the following:
- *
- * .rowOfBoxes > div:first-child {
- *   border-left: none;
- * }
- *
- * .rowOfBoxes + .rowOfBoxes {
- *   border-top: 1px solid rgb(204,204,204);
- * }
- */
\ No newline at end of file
+ */
+.rowOfBoxes > div:first-child {
+	border-left: none;
+}
+
+.rowOfBoxes + .rowOfBoxes {
+	border-top: 1px solid rgb(204,204,204);
+}
\ No newline at end of file

Modified: trunk/styles/default/page_personal-screen.css
===================================================================
--- trunk/styles/default/page_personal-screen.css	2007-01-09 21:45:26 UTC (rev 98)
+++ trunk/styles/default/page_personal-screen.css	2007-01-10 22:12:47 UTC (rev 99)
@@ -13,12 +13,20 @@
 	float: left;
 	width: 28%;
 }
+/*
+.column1 {
+	border-right: 1px solid rgb(204, 204, 204);
+}
 
 .column2 { /* Renders the column dividers */
 	border-left: 1px solid rgb(204, 204, 204);
 	border-right: 1px solid rgb(204, 204, 204);
 }
 
+.column3 {
+	border-left: 1px solid rgb(204, 204, 204);
+}*/
+	
 .feed_headline {
 	padding-bottom: 1em;
 	text-align: center;
@@ -31,8 +39,8 @@
 	background-color: rgb(61, 92, 122);
 }
 
-.column1 .feed_headline {
-
+.column1 .feed_headline a {
+	color: white;
 }
 
 .column1 ul {
@@ -40,8 +48,8 @@
 	border: 1px solid rgb(61, 92, 122);
 }
 
-.column2 .feed_headline {
-
+.column2 .feed_headline a {
+	color: white;
 }
 
 .column2 ul {
@@ -49,8 +57,8 @@
 	margin-top: 0;
 }
 
-.column3 .feed_headline {
-
+.column3 .feed_headline a {
+	color: white;
 }
 
 .column3 ul {

Modified: trunk/styles/default/page_register-screen.css
===================================================================
--- trunk/styles/default/page_register-screen.css	2007-01-09 21:45:26 UTC (rev 98)
+++ trunk/styles/default/page_register-screen.css	2007-01-10 22:12:47 UTC (rev 99)
@@ -49,11 +49,30 @@
 	padding-left: 5%;
 	border-left: 1px solid rgb(204, 204, 204);
 }
-
+/*
 #formButtons {
 	text-align: center;
 	background-color: rgb(117, 144, 174);
 	margin-top: 16em;
 	padding: 1ex 10px;
 	border-top: 1px solid rgb(204, 204, 204);
+}*/
+
+#formButtons {
+	margin-left: 1%;
+	margin-right: 1%;
+	padding-left: 1%;
+	padding-right: 1%;
+}
+
+#formButtons td {
+	text-align: center;
+	background-color: rgb(117, 144, 174);
+	margin-top: 6em;
+	padding-top: 1em;
+	padding-bottom: 1em;
+}
+
+#formButtons input {
+	margin-left: 1em;
 }
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.