[Feed-collector-svn] SF.net SVN: feed-collector: [81] trunk
Status: Beta
Brought to you by:
c167
Menu
▾
▴
[Feed-collector-svn] SF.net SVN: feed-collector: [81] trunk
|
From: <c1...@us...> - 2006-12-28 21:20:32
|
Revision: 81
http://feed-collector.svn.sourceforge.net/feed-collector/?rev=81&view=rev
Author: c167
Date: 2006-12-28 13:20:31 -0800 (Thu, 28 Dec 2006)
Log Message:
-----------
some changes
Modified Paths:
--------------
trunk/class/Feed_manager.php
trunk/class/Tag_manager.php
trunk/page_main.php
trunk/page_show_feed_tag.php
trunk/styles/default/page_register-screen.css
Modified: trunk/class/Feed_manager.php
===================================================================
--- trunk/class/Feed_manager.php 2006-12-27 23:24:04 UTC (rev 80)
+++ trunk/class/Feed_manager.php 2006-12-28 21:20:31 UTC (rev 81)
@@ -217,19 +217,17 @@
public function getSpecFeeds($feed) {
$i = 0;
foreach ($feed as $oneFeed) {
- $query = $this->mdb->query("SELECT id, feed_name, feed_db_name, feed_lang FROM feeds GROUP BY feed_name ASC;");
+ $query = $this->mdb->query("SELECT id, feed_name, feed_db_name, feed_lang FROM feeds WHERE feed_db_name = '$oneFeed';");
if (PEAR :: isError($query)) {
- return false;
+ continue;
}
- while ($row = $query->fetchRow()) {
- $return[$i]['id'] = $row['id'];
- $return[$i]['feed_name'] = $row['feed_name'];
- $return[$i]['feed_url'] = $row['feed_db_name'];
- $return[$i]['feed_lang'] = $row['feed_lang'];
- $i++;
- }
+ $row = $query->fetchRow();
+ $return[$i]['id'] = $row['id'];
+ $return[$i]['feed_name'] = $row['feed_name'];
+ $return[$i]['feed_url'] = $row['feed_db_name'];
+ $return[$i]['feed_lang'] = $row['feed_lang'];
+ $i++;
}
-
return $return;
}
Modified: trunk/class/Tag_manager.php
===================================================================
--- trunk/class/Tag_manager.php 2006-12-27 23:24:04 UTC (rev 80)
+++ trunk/class/Tag_manager.php 2006-12-28 21:20:31 UTC (rev 81)
@@ -94,7 +94,7 @@
* @access public
*/
public function getFeedsByTag($tag) {
- $query = $this->db->query("SELECT feed FROM tags WHERE tag = '$tag';");
+ $query = $this->db->query(sprintf("SELECT feed FROM tags WHERE tag = '%s';", $tag));
if (PEAR :: isError($query)) {
return false;
}
Modified: trunk/page_main.php
===================================================================
--- trunk/page_main.php 2006-12-27 23:24:04 UTC (rev 80)
+++ trunk/page_main.php 2006-12-28 21:20:31 UTC (rev 81)
@@ -110,7 +110,11 @@
$design = str_replace("<!-- midHeader title right -->", $midHeader_title_right, $design);
// navigation
-$navigation = sprintf(" <a href=\"./page_main.php\" class=\"highlight\">%s</a> |\n <a href=\"./page_show_feeds.php\">%s</a> |\n <a href=\"./page_search.php\">%s</a> |\n <a href=\"./page_show_all_feeds.php\">%s</a> |\n <a href=\"./page_show_feed_tag.php\">%s</a> |\n", _("Home"), _("Show Feeds"), _("Search"), _("Select a Feed"), _("TABs"));
+$navigation = sprintf(" <a href=\"./page_main.php\" class=\"highlight\">%s</a> |\n" .
+ " <a href=\"./page_show_all_feeds.php\">%s</a> |\n" .
+ " <a href=\"./page_show_feed_tag.php\">%s</a> |\n" .
+ " <a href=\"./page_add_new_feed.php\">%s</a> |\n" .
+ " <a href=\"./page_show_all_tags.php\">%s</a> |\n", _("Home"), _("Show Feeds"), _("Feeds by TAG"), _("Add a Feed"), _("Show TAGs"));
if (false === HTTP_Session :: get("logged_in", false)) {
$navigation .= sprintf(" <a href=\"./page_login.php\">%s</a> |\n <a href=\"./page_register.php\">%s</a>", _("Login"), _("Register"));
} else {
Modified: trunk/page_show_feed_tag.php
===================================================================
--- trunk/page_show_feed_tag.php 2006-12-27 23:24:04 UTC (rev 80)
+++ trunk/page_show_feed_tag.php 2006-12-28 21:20:31 UTC (rev 81)
@@ -143,15 +143,16 @@
if (false === $feeds) {
return "error!!!";
}
- $return = sprintf(" <table summary=\"%s\">\n" .
+ $return = sprintf(" <p class=\"tagname\">%s</p>\n", $_GET['tag']);
+ $return .= sprintf(" <table summary=\"%s\">\n" .
" <tr>\n" .
" <th>%s</th>\n" .
- " <th><img src=\"./pic/lang/International.gif\" alt=\"\" /></th>\n" .
- " </tr>\n", $tag, _("Feed"));
+ " <th><img src=\"./pic/lang/International.gif\" alt=\"%s\" /></th>\n" .
+ " </tr>\n", $tag, _("Feed"), _("Language"));
$feeds = $feed_manager->getSpecFeeds($feeds);
for($i = 0; $i < count($feeds); $i++) {
$return .= sprintf(" <tr>\n" .
- " <td><a id=\"n%d\" href=\"%s\">%s</a></td>\n" .
+ " <td><a id=\"n%d\" href=\"./page_show_feed.php?feed=%s\">%s</a></td>\n" .
" <td><img src=\"./pic/lang/%s.gif\" alt=\"%s\" /></td>\n" .
" </tr>\n", $feeds[$i]['id'], $feeds[$i]['feed_url'], $feeds[$i]['feed_name'], $feeds[$i]['feed_lang'], $feeds[$i]['feed_lang']);
Modified: trunk/styles/default/page_register-screen.css
===================================================================
--- trunk/styles/default/page_register-screen.css 2006-12-27 23:24:04 UTC (rev 80)
+++ trunk/styles/default/page_register-screen.css 2006-12-28 21:20:31 UTC (rev 81)
@@ -215,7 +215,10 @@
}
#registration_form {
- margin: 1em 0;
+ /*margin: 1em 0;*/
+ margin-top: 1em;
+ margin-left: 10%;
+ margin-right: 10%;
float: left;
border: 1px solid rgb(204, 204, 204);
}
@@ -232,42 +235,48 @@
}
#left,#right {
- margin: 3em 0;
+ margin: 1em 0;
+ margin-top: 0em;
/* padding: 0 2%;*/
float: left;
- width: 45%;
}
#left {
+ width: 45%;
border-right: 1px solid rgb(204, 204, 204);
}
#right {
-
+ width: 45%;
}
.formElem,.formField {
- margin: 1em 0;
+ /*margin: 1em 0;*/
+ padding-top: 1em;
+ padding-left: 1em;
}
.formElem {
border-bottom: 1px solid rgb(204, 204, 204);
+ padding-top: 7%;
}
.formField {
border-bottom: 1px solid rgb(204, 204, 204);
+ padding-top: 7%;
+
}
#registration_form #formButtons {
text-align: center;
background-color: rgb(117, 144, 174);
- margin: 0;
+ margin-top: 16em;
padding: 1ex 10px;
border-top: 1px solid rgb(204, 204, 204);
}
.quarter,.oneThird,.half,.twoThirds,.fullWidth {
- margin: 1em 0;
+ /*margin: 1em 0;*/
float: left;
border-left: 1px solid rgb(204, 204, 204);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
