feed-collector-svn Mailing List for news collector and viewer
Status: Beta
Brought to you by:
c167
You can subscribe to this list here.
2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(1) |
Oct
(5) |
Nov
(9) |
Dec
(23) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2007 |
Jan
(22) |
Feb
(1) |
Mar
|
Apr
|
May
(7) |
Jun
(15) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <C1...@us...> - 2007-06-06 17:30:24
|
Revision: 127 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=127&view=rev Author: C167 Date: 2007-06-06 10:27:50 -0700 (Wed, 06 Jun 2007) Log Message: ----------- show_feed_tag now working Modified Paths: -------------- trunk/page_show_feed_tag.php trunk/styles/default/page_show_feed_tag.tpl Modified: trunk/page_show_feed_tag.php =================================================================== --- trunk/page_show_feed_tag.php 2007-06-06 16:54:31 UTC (rev 126) +++ trunk/page_show_feed_tag.php 2007-06-06 17:27:50 UTC (rev 127) @@ -78,13 +78,16 @@ $feed_list = array (); foreach ($feed_manager->getSpecFeeds($feeds) as $list) { $feed_list[$i] = $list; + $feed_list[$i]['site_lang'] = "pic/lang/".$list['site_lang'].".gif"; if( true === $tag_manager->hasTags($list['feed_url'])) { $feed_list[$i]['has_tags'] = true; $feed_list[$i]['tag_list'] = $tag_manager->getTags($list['feed_url']); } else { $feed_list[$i]['hast_tags'] = false; } + $i++; } + $smarty->assign('feed_list', $feed_list); } } Modified: trunk/styles/default/page_show_feed_tag.tpl =================================================================== --- trunk/styles/default/page_show_feed_tag.tpl 2007-06-06 16:54:31 UTC (rev 126) +++ trunk/styles/default/page_show_feed_tag.tpl 2007-06-06 17:27:50 UTC (rev 127) @@ -42,7 +42,7 @@ {/foreach} </td> {/if} - <td class="right_side">{html_image file="pic/lang/{$i.site_lang}.gif alt=$i.site_lang}</td> + <td class="right_side">{html_image file=$i.site_lang alt=$i.site_lang}</td> </tr> {/foreach} </tbody> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <C1...@us...> - 2007-06-06 17:02:58
|
Revision: 126 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=126&view=rev Author: C167 Date: 2007-06-06 09:54:31 -0700 (Wed, 06 Jun 2007) Log Message: ----------- some changes Modified Paths: -------------- trunk/page_add_tag.php trunk/page_show_feed_tag.php trunk/styles/default/page_show_feed_tag.tpl Modified: trunk/page_add_tag.php =================================================================== --- trunk/page_add_tag.php 2007-06-06 10:30:11 UTC (rev 125) +++ trunk/page_add_tag.php 2007-06-06 16:54:31 UTC (rev 126) @@ -11,48 +11,41 @@ require_once "inc/config.php"; error_reporting(E_ALL); -############ -# DATABASE # -############ + +/* DATABASE */ require_once "./inc/database.php"; -########### -# SESSION # -########### +/* SESSION */ require_once "./inc/session.php"; -################ -# FEED-Manager # -################ +/* FEED-Manager */ require_once "class/Feed_manager.php"; $feed = new Feed_manager($db); -############## -# HTTP-Class # -############## +/* HTTP-Class */ require_once "HTTP.php"; -############### -# Tag-Manager # -############### +/* Tag-Manager */ require_once "class/Tag_manager.php"; $tag_manager = new Tag_Manager($db); -################ -# User-Manager # -################ +/* User-Manager */ require_once "class/User_manager.php"; $user = new User_manager($db); if (false === HTTP_Session :: get("logged_in", false)) { - HTTP :: redirect("./page_login.php?cameFrom=page_add_tag.php"); + //HTTP :: redirect("./page_login.php?cameFrom=page_add_tag.php"); } $page = "add_tag"; -############ -# LANGUAGE # -############ +/* STYLE */ +require_once "inc/styles.php"; + +/* SMARTY */ +require_once "inc/smarty.php"; + +/* LANGUAGE */ require_once "./inc/language.php"; if(empty($_GET['feed'])) { @@ -64,61 +57,41 @@ $tag_manager->addTag($_POST['tag'], HTTP_Session :: get("username"), $_GET['feed']); } if (!$tag_manager->hasTags($_GET['feed'])) { - $main .= sprintf(" <p>%s</p\n", _("There are no tags yet!")); + $smarty->assign('has_tags', false); + $smarty->assign('no_tags_message', _("There are no tags yet!")); } else { - $main .= sprintf(" <div id=\"tags\">\n" . - " <div id=\"tags_title\">%s</div>\n", _("Tags")); - $tags = $tag_manager->getTags($_GET['feed']); - if (count($tags) == 1) { - $main .= sprintf(" <a href=\"./page_show_feed_tag.php?tag=%s\">%s</a>", $tags[0], $tags[0]); - } else { - foreach ($tags as $id => $tag) { - $main .= " <a href=\"./page_show_feed_tag.php?tag=$tag\">$tag</a>"; - if ($id !== (count($tags) - 1)) { - $main .= ", "; - } - $main .= "\n"; - } - } - $main .= " </div>\n"; + $smarty->assign('has_tags', true); + $smarty->assign('tags_title', _("Tags")); + $smarty->assign('tags_list', $tag_manager->getTags($_GET['feed'])); } -$main .= displayAddForm(); -##################### -# BUILD THE CONTENT # -##################### -// get the design -$design = file_get_contents("styles/default/page_add_tag.tpl", "r"); - # Header // title -$title = "Feed-Collector"; -$design = str_replace("<!-- title -->", $title, $design); +$smarty->assign('title', "Feed-Collector"); // related sites require_once "./inc/upperBar.php"; -$design = str_replace("<!-- related sites -->", $related_sites, $design); // midHeader title left -$midHeader_title_left = sprintf(" <h1 class=\"headerTitle\">%s</h1>\n <div class=\"headerSubTitle\" title=\"Message'\">\n %s\n </div>", _("Feed-Collector"), _("{ stay up to date with all your news feeds! }")); -$design = str_replace("<!-- midHeader title left -->", $midHeader_title_left, $design); +$smarty->assign('page_title', _("Feed-Collector")); +$smarty->assign('sub_title', _("{ stay up to date with all your news feeds! }")); // midHeader title right require_once "./inc/userstatus_display.php"; -$design = str_replace("<!-- midHeader title right -->", $midHeader_title_right, $design); // navigation require_once "inc/navigation.php"; -$design = str_replace("<!-- navigation -->", $navigation, $design); // main -$design = str_replace("<!-- main -->", $main, $design); +$smarty->assign('formtitle', _("Add Tag")); +$smarty->assign('tag_name', _("tag name")); +$smarty->assign('submit', _("Submit!")); -# footer -require_once "./inc/footer.php"; -$design = str_replace("<!-- footer -->", $footer, $design); +# Footer +$smarty->assign('admin_email', $admin['email']); +$smarty->assign('updated', _("Updated")); -echo $design; +$smarty->display("page_add_tag.tpl"); function displayAddForm() { $form = sprintf(" <div id=\"addTags_form\">\n" . @@ -139,4 +112,4 @@ " </div>\n", $_SERVER['PHP_SELF'] . "?feed=" . $_GET['feed'], _("Add Tag"), _("tag name"), _("Submit!")); return $form; } -?> \ No newline at end of file +?> Modified: trunk/page_show_feed_tag.php =================================================================== --- trunk/page_show_feed_tag.php 2007-06-06 10:30:11 UTC (rev 125) +++ trunk/page_show_feed_tag.php 2007-06-06 16:54:31 UTC (rev 126) @@ -10,155 +10,93 @@ require_once "inc/config.php"; error_reporting(E_ALL); -############ -# DATABASE # -############ + +/* DATABASE */ require_once "./inc/database.php"; -########### -# SESSION # -########### +/* SESSION */ require_once "./inc/session.php"; -################ -# Feed-Manager # -################ +/* Feed-Manager */ require_once "class/Feed_manager.php"; -$feed = new Feed_manager($db); +$feed_manager = new Feed_manager($db); -################ -# User-Manager # -################ +/* User-Manager */ require_once "class/User_manager.php"; $user = new User_manager($db); -############### -# Tag-Manager # -############### +/* Tag-Manager */ require_once "class/Tag_manager.php"; $tag_manager = new Tag_Manager($db); -############## -# HTTP-Class # -############## +/* HTTP-Class */ require_once "HTTP.php"; $page = "show_feed_tag"; -############ -# LANGUAGE # -############ -require_once "./inc/language.php"; +/* STYLES */ +require_once "inc/styles.php"; -// Now we're going to replace the placeholders in the template with the important content -// -if (!isset ($_GET['tag'])) { - $form = displaySearchForm(); - $main = sprintf(" <p class=\"space\">%s<br /><br /><br /><br /></p>", _("You did not select a tag, please select one on the input-field on the right side of the site... -->")); -} else { - $form = displaySearchForm(); - //$main = createFeedsTable($_GET['tag'], $tag_manager, $feed); - $main = createSelectionTable($_GET['tag'], $tag_manager, $feed); -} +/* SMARTY */ +require_once "inc/smarty.php"; -$design = file_get_contents("styles/default/page_show_feed_tag.tpl", "r"); +/* LANGUAGE */ +require_once "./inc/language.php"; # Header // title -$title = "Feed-Collector"; -$design = str_replace("<!-- title -->", $title, $design); +$smarty->assign('title', "Feed-Collector"); // related sites require_once "./inc/upperBar.php"; -$design = str_replace("<!-- related sites -->", $related_sites, $design); // midHeader title left -$midHeader_title_left = sprintf(" <h1 class=\"headerTitle\">%s</h1>\n <div class=\"headerSubTitle\" title=\"Message'\">\n %s\n </div>", _("Feed-Collector"), _("{ stay up to date with all your news feeds! }")); -$design = str_replace("<!-- midHeader title left -->", $midHeader_title_left, $design); +$smarty->assign('page_title', _("Feed-Collector")); +$smarty->assign('sub_title', _("{ stay up to date with all your news feeds! }")); // midHeader title right require_once "./inc/userstatus_display.php"; -$design = str_replace("<!-- midHeader title right -->", $midHeader_title_right, $design); // navigation require_once "inc/navigation.php"; -$design = str_replace("<!-- navigation -->", $navigation, $design); # Main copy // main -$design = str_replace("<!-- main -->", $main, $design); - -# sideBar -// rightSideBar -$design = str_replace("<!-- rightSideBar -->", $form, $design); - -# footer -require_once "./inc/footer.php"; -$design = str_replace("<!-- footer -->", $footer, $design); - -echo $design; - -function createSelectionTable($tag, $tag_manager, $feed_manager) { - $feeds = $tag_manager->getFeedsByTag($tag); +$smarty->assign('no_tag_str', _("You did not select a tag, please select one on the input-field on the right side of the site... -->")); +$smarty->assign('table_summary', "Feed List"); +$smarty->assign('feed_list_str', _("Feed List")); +$smarty->assign('site_str', _("Site")); +$smarty->assign('feed_str', _("Feed")); +$smarty->assign('tags_str', _("Tags")); +$smarty->assign('languages_str', _("Languages")); +if (isset ($_GET['tag'])) { + $feeds = $tag_manager->getFeedsByTag($_GET['tag']); if (false === $feeds) { - return "error!!!"; - } - $return = sprintf(" <p class=\"tagname\">%s</p>\n", $_GET['tag']); - $return .= sprintf(" <table summary=\"\">\n" . - " <tr>\n" . - " <th>%s</th>\n" . - " <th>%s</th>\n" . - " <th>%s</th>\n" . - " <th class=\"language_flag\"><img src=\"pic/lang/International.gif\" alt=\"%s\" /></th>\n" . - " </tr>\n", _("Feed List"), _("Site"), _("Feed"), _("Tags"), _("Languages")); - $items = $feed_manager->getSpecFeeds($feeds); - foreach ($items as $list) { - $return .= sprintf(" <tr>\n" . - " <td><a href=\"./page_show_feed?feed=%s\">%s</a></td>\n" . - " <td><a href=\"%s\">%s</a></td>\n", $list['feed_url'], $list['feed_name'], $list['site_url'], $list['site_name']); - if (false === $tag_manager->hasTags($list['feed_url'])) { - $return .= " <td> </td>\n"; - } else { - $tags = $tag_manager->getTags($list['feed_url']); - if (count($tags) == 1) { - $return .= sprintf(" <td><a href=\"./page_show_feed_tag.php?tag=%s\">%s</a></td>\n", $tags[0], $tags[0]); + $smarty->assign('error', true); + } else { + $i = 0; + $feed_list = array (); + foreach ($feed_manager->getSpecFeeds($feeds) as $list) { + $feed_list[$i] = $list; + if( true === $tag_manager->hasTags($list['feed_url'])) { + $feed_list[$i]['has_tags'] = true; + $feed_list[$i]['tag_list'] = $tag_manager->getTags($list['feed_url']); } else { - $return .= " <td>\n"; - foreach ($tags as $id => $tag) { - $taglink = str_replace(" ", "%20", $tag); - $return .= "<a href=\"./page_show_feed_tag.php?tag=$taglink\">$tag</a>"; - if ($id !== (count($tags) - 1)) { - $return .= ", "; - } - } - $return .= " </td>\n"; + $feed_list[$i]['hast_tags'] = false; } } - $return .= sprintf(" <td class=\"right_side\"><img src=\"pic/lang/%s.gif\" alt=\"%s\" /></td>\n" . - " </tr>\n", $list['site_lang'], $list['site_lang']); } - - $return .= " </table>"; - return $return; } +# sideBar +// rightSideBar +$smarty->assign('tags_str', _("Tags")); +$smarty->assign('formtitle', _("Select a Tag")); +$smarty->assign('submit', _("Submit!")); -function displaySearchForm() { +# footer +$smarty->assign('admin_email', $admin['email']); +$smarty->assign('updated', _("Updated")); +$smarty->display("page_show_feed_tag.tpl"); - $rightSideBar = sprintf(" <p class=\"sideBarTitle\">%s</p>\n\n", _("Tags")); - $rightSideBar .= sprintf(" <div id=\"searchTag_form\">\n" . - " <form action=\"%s\" method=\"get\" accept-charset=\"UTF-8\">\n" . - " <div id=\"formtitle\">%s</div>\n" . - " <div class=\"left\">\n" . - " </div>\n" . - " <div class=\"right\">\n" . - " <div class=\"formField\" ><input type=\"text\" name=\"tag\" size=\"10\" maxlength=\"20\" /></div>\n" . - " </div>\n" . - " <div id=\"formButtons\">\n" . - " <input type=\"submit\" value=\"%s\" name=\"submit\" />\n" . - " </div>\n" . - " </form>\n" . - " </div>\n", $_SERVER['PHP_SELF'], _("Select a Tag"), _("Submit!")); - return $rightSideBar; -} -?> \ No newline at end of file +?> Modified: trunk/styles/default/page_show_feed_tag.tpl =================================================================== --- trunk/styles/default/page_show_feed_tag.tpl 2007-06-06 10:30:11 UTC (rev 125) +++ trunk/styles/default/page_show_feed_tag.tpl 2007-06-06 16:54:31 UTC (rev 126) @@ -1,60 +1,58 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" - "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" > - <head> - <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8" /> - <meta name="author" content="haran" /> - <meta name="generator" content="haran" /> +{include file="html_header.tpl"} +{include file="page_header.tpl"} - <link rel="stylesheet" type="text/css" href="./styles/default/page_show_feed_tag-screen.css" media="screen, tv, projection" title="Default" /> - <link rel="stylesheet" type="text/css" href="./styles/default/common-screen.css" media="screen, tv, projection" title="Default" /> - <link rel="stylesheet" type="text/css" href="./styles/default/header-screen.css" media="screen, tv, projection" title="Default" /> - <link rel="stylesheet" type="text/css" href="./styles/default/main_copy-screen.css" media="screen, tv, projection" title="Default" /> - <link rel="stylesheet" type="text/css" href="./styles/default/footer-screen.css" media="screen, tv, projection" title="Default" /> - - <title><!-- title --></title> - </head> - - <body> - <!-- For non-visual user agents: --> - <div id="top"><a href="#main-copy" class="doNotDisplay doNotPrint">Skip to main content.</a></div> - - <!-- ##### Header ##### --> - - <div id="header"> - <div class="superHeader"> -<!-- related sites --> - </div> - - <div class="midHeader"> -<!-- midHeader title left --> - - <br class="doNotDisplay doNotPrint" /> - - <div class="headerLogin"> -<!-- midHeader title right --> - </div> - </div> - - <div class="subHeader"> -<!-- navigation --> - </div> - </div> - <!-- ##### Main Copy ##### --> <div class="rightSideBar"> -<!-- rightSideBar --> + <p class="sideBarTitle">{$tags_str}</p> + <div id="searchTag_form"> + <form action="{$smarty.server.PHP_SELF}" method="get" accept-charset="UTF-8"> + <div id="formtitle">{$formtitle}</div> + <div class="left"></div> + <div class="right"> + <div class="formField"><input type="text" name="tag" size="10" maxlength="20" /></div> + </div> + <div id="formButtons"> + <input type="submit" value="{$submit}" name="submit" /> + </div> + </form> + </div> </div> + <div id="main-copy"> - -<!-- main --> +{if isset($smarty.get.tag) and !$error} + <p class="tagname">{$smarty.get.tag}</p> + <table summary="{$table_summary|default:""}"> + <thead> + <tr> + <th>{$feed_list_str}</th> + <th>{$site_str}</th> + <th>{$feed_str}</th> + <th class="language_flag">{html_image file="pic/lang/International.gif" alt=$languages_str}</th> + </tr> + </thead> + <tbody> + {foreach from=$feed_list item=i name="feed_list"} + <tr> + <td><a href="./page_show_feed?feed={$i.feed_url|escape:"url"}">{$i.feed_name}</a></td> + <td><a href="{$i.site_url|escape:"url"}">{$i.site_name}</a></td> + {if $i.has_tags} + <td> + {foreach from=$i.tag_list item=j name="tag_list"} + <a href="./page_show_feed_tag.php?tag={$j|escape:"url"}">{$j}</a> + {/foreach} + </td> + {/if} + <td class="right_side">{html_image file="pic/lang/{$i.site_lang}.gif alt=$i.site_lang}</td> + </tr> + {/foreach} + </tbody> + </table> + +{elseif $error} + <p>ERROR</p> +{else} + <p class="space">{$no_tag_str}<br /><br /><br /><br /></p> +{/if} </div> - <!-- ##### Footer ##### --> - - <div id="footer"> -<!-- footer --> - </div> - </body> -</html> +{include file="page_footer.tpl"} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <C1...@us...> - 2007-06-06 10:30:12
|
Revision: 125 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=125&view=rev Author: C167 Date: 2007-06-06 03:30:11 -0700 (Wed, 06 Jun 2007) Log Message: ----------- add_tag works... html-code generated by {foreach} doesn't look nice, need to check that Modified Paths: -------------- trunk/styles/default/page_add_new_feed.tpl trunk/styles/default/page_add_tag.tpl Modified: trunk/styles/default/page_add_new_feed.tpl =================================================================== --- trunk/styles/default/page_add_new_feed.tpl 2007-06-06 09:27:22 UTC (rev 124) +++ trunk/styles/default/page_add_new_feed.tpl 2007-06-06 10:30:11 UTC (rev 125) @@ -1,31 +1,36 @@ - <body> - <!-- For non-visual user agents: --> - <div id="top"><a href="#main-copy" class="doNotDisplay doNotPrint">Skip to main content.</a></div> - <!-- ##### Header ##### --> + <!-- ##### Main Copy ##### --> - <div id="header"> - <div class="superHeader"> -<!-- related sites --> + <div id="main-copy"> +{if $has_tags} + <div id="tags"> + <div id="tags_title">{$tags_title}</div> +$tags = $tag_manager->getTags($_GET['feed']); + {foreach from=$tags_list item=i name="tags_list"} + <a href="./page_show_feed_tag.php?tag={$i}">{$i}</a> + {if !$smarty.foreach.tags_list.last} +, + {/else} + {/foreach} </div> - <div class="midHeader"> -<!-- midHeader title left --> - - <br class="doNotDisplay doNotPrint" /> - - <div class="headerLogin"> -<!-- midHeader title right --> - </div> +{else} + <p>{$no_tags_message}</p> +{/if} + <div id=\"addTags_form\">\n" . + <form action='{$smarty.server.PHP_SELF}?feed="{$smarty.get.feed}"' method="post" accept-charset="UTF-8"> + <table summary="{$table_summary|default:""}"> + <tr> + <td colspan=2 id="formtitle">{$formtitle}</td> + </tr> + <tr> + <td class="formElem">{$tag_name}</td> + <td class="formField"><input type="text" name="tag" size="30" maxlength="30" /></td> + </tr> + <tr> + <td colspan=2 id="formButtons"><input type="submit" value="{$submit}" name="submit" /></td> + </tr> + </table> + </form> </div> - - <div class="subHeader"> -<!-- navigation --> - </div> </div> - - <!-- ##### Main Copy ##### --> - - <div id="main-copy"> -<!-- main --> - </div> Modified: trunk/styles/default/page_add_tag.tpl =================================================================== --- trunk/styles/default/page_add_tag.tpl 2007-06-06 09:27:22 UTC (rev 124) +++ trunk/styles/default/page_add_tag.tpl 2007-06-06 10:30:11 UTC (rev 125) @@ -1,31 +1,39 @@ - <body> - <!-- For non-visual user agents: --> - <div id="top"><a href="#main-copy" class="doNotDisplay doNotPrint">Skip to main content.</a></div> +{include file="html_header.tpl"} +{include file="page_header.tpl"} - <!-- ##### Header ##### --> + <!-- ##### Main Copy ##### --> - <div id="header"> - <div class="superHeader"> -<!-- related sites --> + <div id="main-copy"> +{if $has_tags} + <div id="tags"> + <div id="tags_title">{$tags_title}</div> + {foreach from=$tags_list item=i name="tags_list"} +<a href="./page_show_feed_tag.php?tag={$i|escape:"url"}">{$i}</a> + {if !$smarty.foreach.tags_list.last} +, + {/if} + {/foreach} </div> - <div class="midHeader"> -<!-- midHeader title left --> - - <br class="doNotDisplay doNotPrint" /> - - <div class="headerLogin"> -<!-- midHeader title right --> - </div> +{else} + <p>{$no_tags_message}</p> +{/if} + <div id="addTags_form"> + <form action='{$smarty.server.PHP_SELF}?feed="{$smarty.get.feed}"' method="post" accept-charset="UTF-8"> + <table summary="{$table_summary|default:""}"> + <tr> + <td colspan=2 id="formtitle">{$formtitle}</td> + </tr> + <tr> + <td class="formElem">{$tag_name}</td> + <td class="formField"><input type="text" name="tag" size="30" maxlength="30" /></td> + </tr> + <tr> + <td colspan=2 id="formButtons"><input type="submit" value="{$submit}" name="submit" /></td> + </tr> + </table> + </form> </div> - - <div class="subHeader"> -<!-- navigation --> - </div> </div> - <!-- ##### Main Copy ##### --> - - <div id="main-copy"> -<!-- main --> - </div> +{include file="page_footer.tpl"} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <C1...@us...> - 2007-06-06 09:27:41
|
Revision: 124 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=124&view=rev Author: C167 Date: 2007-06-06 02:27:22 -0700 (Wed, 06 Jun 2007) Log Message: ----------- Login works, simple change in html_header: now the page-style changes automaticaly Modified Paths: -------------- trunk/inc/smarty.php trunk/page_login.php trunk/styles/default/html_header.tpl trunk/styles/default/page_login.tpl Modified: trunk/inc/smarty.php =================================================================== --- trunk/inc/smarty.php 2007-06-05 18:05:20 UTC (rev 123) +++ trunk/inc/smarty.php 2007-06-06 09:27:22 UTC (rev 124) @@ -15,3 +15,6 @@ $smarty->compile_dir = $sm['compile_dir']; $smarty->config_dir = $sm['config_dir']; $smarty->cache_dir = $sm['cache_dir']; + +$smarty->assign('page', $page); +?> Modified: trunk/page_login.php =================================================================== --- trunk/page_login.php 2007-06-05 18:05:20 UTC (rev 123) +++ trunk/page_login.php 2007-06-06 09:27:22 UTC (rev 124) @@ -12,44 +12,40 @@ require_once "inc/config.php"; error_reporting(E_ALL); -############### -# DEFINITIONS # -############### +/* DEFINITIONS */ define('FC_PASS_OK', 0); define('FC_PASS_TOO_SHORT', 1); -############ -# DATABASE # -############ +/* DATABASE */ require_once "./inc/database.php"; -########### -# SESSION # -########### +/* SESSION */ require_once "./inc/session.php"; -############## -# HTTP-Class # -############## +/* HTTP-Class */ require_once "HTTP.php"; +/* STYLE */ +require_once "inc/styles.php"; + $page = "login"; -############ -# LANGUAGE # -############ +/* LANGUAGE */ require_once "./inc/language.php"; -################ -# User-Manager # -################ +/* SMARTY */ +require_once "inc/smarty.php"; + +/* User-Manager */ require_once "class/User_manager.php"; $user = new User_manager($db); +$error = LOGIN_SUCCESSFULL; + if (false === HTTP_Session :: get("logged_in", false)) { if (isset ($_POST['submit'])) { if (empty ($_POST['username']) or empty ($_POST['passwd'])) { - $main = displayLoginForm(LOGIN_WRONG_VALUES); + $error = LOGIN_WRONG_VALUES; } else { $login = $user->loginUser($_POST['username'], md5($_POST['passwd'])); switch ($login['state']) { @@ -68,115 +64,61 @@ } break; case LOGIN_WRONG_VALUES : - $main = displayLoginForm(LOGIN_WRONG_VALUES); + $error = LOGIN_WRONG_VALUES; HTTP_Session :: set("logged_in", false); break; case LOGIN_INACTIVE : - $main = displayLoginForm(LOGIN_INACTIVE); + $error = LOGIN_INACTIVE; HTTP_Session :: set("logged_in", false); break; default : - $main = displayLoginForm(LOGIN_WRONG_VALUES); + $error = LOGIN_WRONG_VALUES; } } - } else { - $main = displayLoginForm(); } } else { HTTP :: redirect("./page_main.php"); } -##################### -# BUILD THE CONTENT # -##################### -// get the design -$design = file_get_contents("styles/default/page_login.tpl", "r"); - # Header // title -$title = "Feed-Collector"; -$design = str_replace("<!-- title -->", $title, $design); +$smarty->assign('title', "Feed-Collector"); // related sites require_once "./inc/upperBar.php"; -$design = str_replace("<!-- related sites -->", $related_sites, $design); // midHeader title left -$midHeader_title_left = sprintf(" <h1 class=\"headerTitle\">%s</h1>\n <div class=\"headerSubTitle\" title=\"Message'\">\n %s\n </div>", _("Feed-Collector"), _("{ stay up to date with all your news feeds! }")); -$design = str_replace("<!-- midHeader title left -->", $midHeader_title_left, $design); +$smarty->assign('page_title', _("Feed-Collector")); +$smarty->assign('sub_title', _("{ stay up to date with all your news feeds! }")); // midHeader title right require_once "./inc/userstatus_display.php"; -$design = str_replace("<!-- midHeader title right -->", $midHeader_title_right, $design); // navigation require_once "inc/navigation.php"; -$design = str_replace("<!-- navigation -->", $navigation, $design); // main -$design = str_replace("<!-- main -->", $main, $design); +switch ($error) { + case LOGIN_WRONG_VALUES : + $smarty->assign('message', _("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 : + $smarty->assign('message', _("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 : + $smarty->assign('message', _("Please enter your username and your password to login. Cookies have to be enabled from this point.")); +} +$smarty->assign('login', _("Login")); +$smarty->assign('username', _("Username")); +$smarty->assign('password', _("Password")); +$smarty->assign('submit', _("Submit!")); +$smarty->assign('reset', _("Reset!")); # footer -require_once "./inc/footer.php"; -$design = str_replace("<!-- footer -->", $footer, $design); +$smarty->assign('admin_email', $admin['email']); +$smarty->assign('updated', _("Updated")); -echo $design; - -function displayLoginForm($error = null) { - if (!is_null($error)) { - switch ($error) { - case LOGIN_WRONG_VALUES : - $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 : - $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 : - $message = sprintf(" <p>%s</p>\n", _("Please enter your username and your password to login. Cookies have to be enabled from this point.")); - } - } else { - $message = sprintf(" <p>%s</p>\n", _("Please enter your username and your password to login. Cookies have to be enabled from this point.")); - - } - $form = sprintf(" <div id=\"registration_form\">\n" . - " <form action=\"%s\" method=\"post\" accept-charset=\"UTF-8\">\n" . - "$message" . - " <table summary=\"\">\n" . - " <tr id=\"formtitle\">\n" . - " <th colspan=\"2\">%s</th>\n" . - " </tr>\n" . - " <tr>\n" . - " <td class=\"formElem\">%s</td>\n" . - " <td class=\"formField\"><input type=\"text\" name=\"username\" size=\"30\" maxlength=\"30\" onfocus=\"if (this.value=='Login') this.value=''\" /></td>\n" . - " </tr>\n" . - " <tr>\n" . - " <td class=\"formElem\">%s</td>\n" . - " <td class=\"formField\"><input type=\"password\" name=\"passwd\" size=\"30\" maxlength=\"30\" onfocus=\"if (this.value=='Passwordezz') this.value=''\" /></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" . - " </tr>\n" . - " </table>\n" . - " <input type=\"hidden\" name=\"cameFrom\" value=\"%s\" />\n" . - " </form>\n" . - " </div>\n", $_SERVER['PHP_SELF'], _("Login"), _("Username"), _("Password"), _("Submit!"), _("Reset!"), !empty ($_GET['cameFrom']) ? $_GET['cameFrom'] : ""); - return $form; -} - -function filterInput($input, $type) { - $inhalt = trim($inhalt); - $inhalt = htmlspecialchars($inhalt); - switch ($type) { - case "username" : - - break; - case "mail" : - - break; - } - - return $inhalt; -} +$smarty->display('page_login.tpl'); ?> Modified: trunk/styles/default/html_header.tpl =================================================================== --- trunk/styles/default/html_header.tpl 2007-06-05 18:05:20 UTC (rev 123) +++ trunk/styles/default/html_header.tpl 2007-06-06 09:27:22 UTC (rev 124) @@ -7,7 +7,7 @@ <meta name="author" content="haran" /> <meta name="generator" content="haran" /> - <link rel="stylesheet" type="text/css" href="./styles/default/css/page_main-screen.css" media="screen, tv, projection" title="Default" /> + <link rel="stylesheet" type="text/css" href="./styles/default/css/page_{$page}-screen.css" media="screen, tv, projection" title="Default" /> <link rel="stylesheet" type="text/css" href="./styles/default/css/common-screen.css" media="screen, tv, projection" title="Default" /> <link rel="stylesheet" type="text/css" href="./styles/default/css/header-screen.css" media="screen, tv, projection" title="Default" /> <link rel="stylesheet" type="text/css" href="./styles/default/css/main_copy-screen.css" media="screen, tv, projection" title="Default" /> Modified: trunk/styles/default/page_login.tpl =================================================================== --- trunk/styles/default/page_login.tpl 2007-06-05 18:05:20 UTC (rev 123) +++ trunk/styles/default/page_login.tpl 2007-06-06 09:27:22 UTC (rev 124) @@ -1,31 +1,31 @@ - <body> - <!-- For non-visual user agents: --> - <div id="top"><a href="#main-copy" class="doNotDisplay doNotPrint">Skip to main content.</a></div> +{include file="html_header.tpl"} +{include file="page_header.tpl"} - <!-- ##### Header ##### --> + <!-- ##### Main Copy ##### --> - <div id="header"> - <div class="superHeader"> -<!-- related sites --> + <div id="main-copy"> + <div id="registration_form"> + <form action="{$smarty.server.PHP_SELF}" method="post" accept-charset="UTF-8"> + <p>{$message}</p> + <table summary="{$table_summary|default:""}"> + <tr id="formtitle"> + <th colspan="2">{$login}</th> + </tr> + <tr> + <td class="formElem">{$username}</td> + <td class="formField"><input type="text" name="username" size="30" maxlength="30" onfocus="if (this.value=='Login') this.value=''" /></td> + </tr> + <tr> + <td class="formElem">{$password}</td> + <td class="formField"><input type="password" name="passwd" size="30" maxlength="30" onfocus="if (this.value=='Passwordezz') this.value=''" /></td> + </tr> + <tr id="formButtons"> + <td colspan="2"><input type="submit" value="{$submit}" name="submit" /><input type="reset" value="{$reset}" /></td> + </tr> + </table> + <input type="hidden" name="cameFrom" value="{$smarty.get.cameFrom|default:""}" /> + </form> </div> - - <div class="midHeader"> -<!-- midHeader title left --> - - <br class="doNotDisplay doNotPrint" /> - - <div class="headerLogin"> -<!-- midHeader title right --> - </div> - </div> - - <div class="subHeader"> -<!-- navigation --> - </div> </div> - <!-- ##### Main Copy ##### --> - - <div id="main-copy"> -<!-- main --> - </div> +{include file="page_footer.tpl} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <C1...@us...> - 2007-06-05 18:05:19
|
Revision: 123 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=123&view=rev Author: C167 Date: 2007-06-05 11:05:20 -0700 (Tue, 05 Jun 2007) Log Message: ----------- some changes, still page_show_all_feeds.php not working Modified Paths: -------------- trunk/page_main.php trunk/page_show_all_feeds.php trunk/styles/default/page_footer.tpl trunk/styles/default/page_header.tpl trunk/styles/default/page_show_all_feeds.tpl Modified: trunk/page_main.php =================================================================== --- trunk/page_main.php 2007-06-04 22:54:40 UTC (rev 122) +++ trunk/page_main.php 2007-06-05 18:05:20 UTC (rev 123) @@ -11,6 +11,7 @@ require_once "inc/config.php"; error_reporting(E_ALL); + /* DATABASE */ require_once "./inc/database.php"; @@ -43,13 +44,9 @@ // Now we're going to replace the placeholders in the template with the important content // -// get the design -$design = "styles/$style/page_$page.tpl"; - # header // title $smarty->assign('title', "Feed-Collector"); -//$design = str_replace("<!-- title -->", $title, $design); # body // related sites Modified: trunk/page_show_all_feeds.php =================================================================== --- trunk/page_show_all_feeds.php 2007-06-04 22:54:40 UTC (rev 122) +++ trunk/page_show_all_feeds.php 2007-06-05 18:05:20 UTC (rev 123) @@ -11,135 +11,118 @@ require_once "inc/config.php"; error_reporting(E_ALL); -############ -# DATABASE # -############ + +/* DATABASE */ require_once "./inc/database.php"; -########### -# SESSION # -########### +/* SESSION */ require_once "./inc/session.php"; -######### -# FEEDS # -######### +/* FEEDS */ require_once "class/Feed_manager.php"; $feed = new Feed_manager($db); -############ -# LANGUAGE # -############ +/* HTTP-Basis */ require_once "HTTP.php"; -$language = HTTP :: negotiateLanguage($langs, "en_EN"); +//$language = HTTP :: negotiateLanguage($langs, "en_EN"); -################ -# User-Manager # -################ +/* User-Manager */ require_once "class/User_manager.php"; -$user = new User_manager($db); +$user_manager = new User_manager($db); -############### -# Tag-Manager # -############### +/* Tag-Manager */ require_once "class/Tag_manager.php"; $tag_manager = new Tag_Manager($db); -#################################### -# Working with the users feed-list # -#################################### +/* Working with the users feed-list */ if(isset($_POST) and isset($_POST['feed'])) { $_POST['feed'] = $user->createColumnString($_POST['feed']); $user->updateUserCols(HTTP_Session :: get("uid"), $_POST['feed']); } +/* STYLE */ +require_once "inc/styles.php"; + $page = "show_all_feeds"; -############ -# LANGUAGE # -############ +/* LANGUAGE */ require_once "./inc/language.php"; +/* SMARTY */ +require_once "inc/smarty.php"; + // // Now we're going to replace the placeholders in the template with the important content // -// get the design -$design = file_get_contents("styles/default/page_show_all_feeds.tpl", 'r'); - # header // title -$title = "Feed-Collector"; -$design = str_replace("<!-- title -->", $title, $design); +$smarty->assign('title', "Feed-Collector"); # body // related sites require_once "./inc/upperBar.php"; -$design = str_replace("<!-- related sites -->", $related_sites, $design); // midHeader title left -$midHeader_title_left = sprintf(" <h1 class=\"headerTitle\">%s</h1>\n <div class=\"headerSubTitle\" title=\"Message'\">\n %s\n </div>", _("Feed-Collector"), _("{ stay up to date with all your news feeds! }")); -$design = str_replace("<!-- midHeader title left -->", $midHeader_title_left, $design); +$smarty->assign('page_title', _("Feed-Collector")); +$smarty->assign('sub_title', _("{ stay up to date with all your news feeds! }")); // midHeader title right require_once "./inc/userstatus_display.php"; -$design = str_replace("<!-- midHeader title right -->", $midHeader_title_right, $design); // navigation require_once "inc/navigation.php"; -$design = str_replace("<!-- navigation -->", $navigation, $design); # Main copy // main -if (true === HTTP_Session :: get("logged_in", false)) { - $main = createSelectionForm($feed, $tag_manager, $user); +$feeds = $feed->getFeeds(); +if(false !== $feeds) { + $n_cols = 4; + if (true === HTTP_Session :: get("logged_in", false)) { + $n_cols = 5; + $user_cols = $user_manager->getUserCols(HTTP_Session :: get("uid")); + } + $smarty->assign('cb_name', "feed[]"); + $smarty->assign('feed_list_str', _("Feed list")); + $smarty->assign('site_str', _("Site")); + $smarty->assign('tags_str', _("Tags")); + $smarty->assign('language', _("Language")); + $smarty->assign('n_cols', $n_cols); + $feed_list = array(); + $i = 0; + foreach($feeds as $list) { + $feed_list[$i] = $list; + if(true === HTTP_Session :: get("logged_in", false) and in_array($list['feed_url'], $user_cols)) { + $feed_list[$i]['checked'] = true; + } + if(false === $tag_manager->hasTags($list['feed_url'])) { + $feed_list['has_tags'] = false; + } else { + $feed_list[$i]['tag_list'] = $tag_manager->getTags($list['feed_url']); + } + } + $smarty->assign('feed_list', $feed_list); } else { - $main = createSelectionTable($feed, $tag_manager); + $smarty->assign('error', true); } -$design = str_replace("<!-- main -->", $main, $design); // page-navigation //$page_navigation = displayPageNavi($maxpages, detectActualPage($maxpages)); //$design = str_replace("<!-- page-navigation -->", $page_navigation, $design); # footer -require_once "./inc/footer.php"; -$design = str_replace("<!-- footer -->", $footer, $design); +$smarty->assign('admin_email', $admin['email']); +$smarty->assign('updated', _("Updated")); -echo $design; +$smarty->display("page_show_all_feeds.tpl"); -function createSelectionForm($feed, $tag_manager, $user_manager) { - $feeds = $feed->getFeeds(); - if (false === $feeds) { - return "error!!!"; - } - $return = sprintf(" <form action=\"%s\" method=\"post\">\n", $_SERVER['PHP_SELF']); - $return .= sprintf(" <table summary=\"\" >\n" . - " <tr>\n" . - " <th colspan=\"5\" class=\"submit\"><input type=\"submit\" name=\"Submit\" value=\"%s\" /></th>\n" . - " </tr>\n" . - " <tr>\n" . - " <th> </th>\n" . - " <th>%s</th>\n" . - " <th>%s</th>\n" . - " <th>%s</th>\n" . - " <th class=\"language_flag\"><img src=\"pic/lang/International.gif\" alt=\"%s\" /></th>\n" . - " </tr>\n", _("Submit"), _("Feed List"), _("Site"), _("Tags"), _("Languages")); + +//---------------------------- foreach ($feeds as $list) { + $return = ""; $user_cols = $user_manager->getUserCols(HTTP_Session :: get("uid")); - - $return .= " <tr>\n"; - if(in_array($list['feed_url'], $user_cols)) { - $return .= sprintf(" <td class=\"checked\"><input type=\"checkbox\" name=\"feed[]\" value=\"%s\" checked=\"checked\" /></td>\n", $list['feed_url']); - } else { - $return .= sprintf(" <td><input type=\"checkbox\" name=\"feed[]\" value=\"%s\" /></td>\n", $list['feed_url']); - } - - $return .= sprintf( - " <td><a href=\"./page_show_feed?feed=%s\">%s</a></td>\n" . - " <td><a href=\"%s\">%s</a></td>\n", $list['feed_url'], $list['feed_name'], $list['site_url'], $list['site_name']); + if(in_array($list['feed_url'], $user_cols)) {} if (false === $tag_manager->hasTags($list['feed_url'])) { - $return .= " <td> </td>\n"; } else { $tags = $tag_manager->getTags($list['feed_url']); if (count($tags) == 1) { @@ -164,9 +147,8 @@ " <th colspan=\"5\" class=\"submit\"><input type=\"submit\" name=\"Submit\" value=\"%s\" /></th>\n" . " </tr>\n" . " </table>\n </form>", _("Submit")); - return $return; -} + function createSelectionTable($feed, $tag_manager) { $items = $feed->getFeeds(); if (false === $items) { @@ -241,4 +223,4 @@ settype($page, 'int'); return $page; } -?> \ No newline at end of file +?> Modified: trunk/styles/default/page_footer.tpl =================================================================== --- trunk/styles/default/page_footer.tpl 2007-06-04 22:54:40 UTC (rev 122) +++ trunk/styles/default/page_footer.tpl 2007-06-05 18:05:20 UTC (rev 123) @@ -7,8 +7,8 @@ </span> • <strong>{$updated} »</strong> {$smarty.now|date_format:"%Y-%m-%d"}<br /> <span class="doNotPrint"> - <a href="http://validator.w3.org/check?uri=referer"><img src="styles/default/images/valid-xhtml11-blue.png" alt="Valid XHTML 1.1" /></a> - <a href="http://jigsaw.w3.org/css-validator/"><img src="styles/default/images/valid-css2-blue.png" alt="Valid CSS 2" /></a> + {html_image file="styles/default/images/valid-xhtml11-blue.png" alt="Valid XHTML 1.1" href="http://validator.w3.org/check?uri=referer"} + {html_image file="styles/default/images/valid-css2-blue.png" alt="Valid CSS 2" href="http://jigsaw.w3.org/css-validator/"} </span> </div> </body> Modified: trunk/styles/default/page_header.tpl =================================================================== --- trunk/styles/default/page_header.tpl 2007-06-04 22:54:40 UTC (rev 122) +++ trunk/styles/default/page_header.tpl 2007-06-05 18:05:20 UTC (rev 123) @@ -1,3 +1,4 @@ + <body> <!-- For non-visual user agents: --> <div id="top"><a href="#main-copy" class="doNotDisplay doNotPrint">Skip to main content.</a></div> Modified: trunk/styles/default/page_show_all_feeds.tpl =================================================================== --- trunk/styles/default/page_show_all_feeds.tpl 2007-06-04 22:54:40 UTC (rev 122) +++ trunk/styles/default/page_show_all_feeds.tpl 2007-06-05 18:05:20 UTC (rev 123) @@ -1,66 +1,77 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" - "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" > - <head> - <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8" /> - <meta name="author" content="haran" /> - <meta name="generator" content="haran" /> +{include file="html_header.tpl"} +{include file="page_header.tpl"} + + <!-- ##### Main Copy ##### --> - <link rel="stylesheet" type="text/css" href="./styles/default/page_show_all_feeds-screen.css" media="screen, tv, projection" title="Default" /> - <link rel="stylesheet" type="text/css" href="./styles/default/common-screen.css" media="screen, tv, projection" title="Default" /> - <link rel="stylesheet" type="text/css" href="./styles/default/header-screen.css" media="screen, tv, projection" title="Default" /> - <link rel="stylesheet" type="text/css" href="./styles/default/main_copy-screen.css" media="screen, tv, projection" title="Default" /> - <link rel="stylesheet" type="text/css" href="./styles/default/footer-screen.css" media="screen, tv, projection" title="Default" /> - - <title><!-- title --></title> - </head> - - <body> - <!-- For non-visual user agents: --> - <div id="top"><a href="#main-copy" class="doNotDisplay doNotPrint">Skip to main content.</a></div> - - <!-- ##### Header ##### --> - - <div id="header"> - <div class="superHeader"> -<!-- related sites --> - </div> - - <div class="midHeader"> -<!-- midHeader title left --> - - <br class="doNotDisplay doNotPrint" /> - - <div class="headerLogin"> -<!-- midHeader title right --> - </div> - </div> - - <div class="subHeader"> - <span class="doNotDisplay">Navigation:</span> -<!-- navigation --> - </div> - </div> - - <!-- ##### Main Copy ##### --> - <div id="main-copy"> <div class="rowOfBoxes"> +{if !$error} <div id="feed_form"> -<!-- main --> - </div> + {assign var="n_cols" value=3} + {if true === $smarty.session.logged_in} + {assign var="n_cols" value=4} + {/if} + <form action="{$smarty.server.PHP_SELF}" method="post"> + <table summary="{$feeds_table_summary|default:"feed form"}" > + <thead> + {if $smarty.session.logged_in} + <tr> + <th colspan="{$n_cols}" class="submit"><input type="submit" name="Submit" value="{$submit}" /></th> + </tr> + {/if} + <tr> + {if $smarty.session.logged_in === true} + <th> </th> + {/if} + <th>{$feed_list_str}</th> + <th>{$site_str}</th> + <th>{$tags_str}</th> + <th class="language_flag">{html_image file="pic/lang/International.gif" alt=$languages}</th> + </tr> + </thead> + {if $smarty.session.logged_in} + <tfoot> + <tr> + <th colspan="{$n_cols}" class="submit"><input type="submit" name="Submit" value="{$submit}" /></th> + </tr> + </tfoot> + {/if} + <tbody> +{foreach from=$feed_list item=i name="feed_list"} + <tr> + {if $smarty.session.logged_in == false} + {if $i.checked === true} + <td class="checked"><input type="checkbox" name="{$cb_name}" value="{$i.feed_url}" checked="checked" /></td> + {else} + <td><input type="checkbox" name="{$cb_name}" value="{$i.feed_url}" /></td> + {/if} + {/if} + <td><a href="./page_show_feed?feed={$i.feed_url}">{$i.feed_name}</a></td> + <td><a href="{$i.site_url}">{$i.site_name}</a></td> + {if $i.has_tags === true} + <td> + {foreach from=$i.tag_list item=j name="tag_list"} + <a href="./page_show_feed_tag.php?tag={$j|escape:"url"}">{$j}</a></td> + {/foreach} + </td> + {else} + <td> </td> + {/if} + </tr> +{/foreach} + </tbody> + </table> + </form> + </div> </div> <div id="page-navigation"> -<!-- page-navigation --> +{foreach from=$navigation_list item=i name="navi_list"} + +{/foreach} </div> - </div> +{else} - <!-- ##### Footer ##### --> - - <div id="footer"> -<!-- footer --> +{/if} </div> - </body> -</html> +{include file="page_footer.tpl"} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <C1...@us...> - 2007-06-04 22:54:49
|
Revision: 122 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=122&view=rev Author: C167 Date: 2007-06-04 15:54:40 -0700 (Mon, 04 Jun 2007) Log Message: ----------- page_main.php working again, smarty working... Modified Paths: -------------- trunk/inc/config.php trunk/page_main.php trunk/styles/default/page_header.tpl trunk/styles/default/page_main.tpl Added Paths: ----------- trunk/styles/default/page_footer.tpl Removed Paths: ------------- trunk/styles/default/footer.tpl trunk/styles/default/header.tpl Modified: trunk/inc/config.php =================================================================== --- trunk/inc/config.php 2007-06-04 18:04:39 UTC (rev 121) +++ trunk/inc/config.php 2007-06-04 22:54:40 UTC (rev 122) @@ -20,6 +20,8 @@ $db['passwd'] = "feed-collector"; // The password of this user $db['database'] = "feed-collector"; // The name of the database +// admin-values +$admin['email'] = "ex...@do...d"; // Session-configuration $session['time']['expire'] = 60 * 60 * 24; $session['time']['idle'] = 60 * 60; Modified: trunk/page_main.php =================================================================== --- trunk/page_main.php 2007-06-04 18:04:39 UTC (rev 121) +++ trunk/page_main.php 2007-06-04 22:54:40 UTC (rev 122) @@ -76,53 +76,57 @@ if (PEAR :: isError($latestnews)) { echo $latestnews->getMessage(); } -$latest_news = sprintf(" <h1>%s</h1>\n", _("Latest News")); +$smarty->assign('latest_news_str', _("Latest News")); +$i = 0; while ($news = $latestnews->fetchRow()) { - $latest_news .= sprintf(" <a href=\"./page_news.php?newsid=%d\" class=\"newsHeading\">%s</a>\n" . - " <p class=\"newsDate\">%s</p>\n" . - " <p class=\"newsSummary\">%s</p>\n\n", $news['id'], $news['headline'], date("D, d.m.Y - H:i", $news['published']), $news['summary']); + $latest_news_list[$i]['id'] = $news['id']; + $latest_news_list[$i]['headline'] = $news['headline']; + $latest_news_list[$i]['published'] = $news['published']; + $latest_news_list[$i]['summary'] = $news['summary']; + $i++; } -$latest_news .= sprintf(//" <div class=\"more\"><a href=\"./page_news.php\">%s</a></div>\n\n" . -" <p class=\"filler\"><!-- Filler para to extend left vertical line --></p>", _("More News »")); +$smarty->assign('latest_news_list', $latest_news_list); +$smarty->assign('more_news', _("More News")); -$design = str_replace("<!-- latest news -->", $latest_news, $design); +// area 1 +$smarty->assign('statistic', _("Statistic")); +$smarty->assign('feeds_in_db', _("Feeds in the Database")); +$smarty->assign('val_feeds_in_db', $feed->stat_countFeeds()); +$smarty->assign('items_over_all', _("Items over all")); +$smarty->assign('val_items_over_all', $feed->stat_countAllItems()); +$smarty->assign('avg_items_per_feed', _("Average items per feed")); +$smarty->assign('val_avg_items_per_feed', $feed->stat_avgItemsPerFeed()); +$smarty->assign('atom10', _("[ATOM 1.0] feeds")); +$smarty->assign('val_atom10', $feed->stat_countFeedTypes("ATOM 1.0")); +$smarty->assign('rdf09', _("[RDF 0.9] feeds")); +$smarty->assign('val_rdf09', $feed->stat_countFeedTypes("RDF 0.9")); +$smarty->assign('rss20', _("[RSS 2.0] feeds")); +$smarty->assign('val_rss20', $feed->stat_countFeedTypes("RSS 2.0")); +$smarty->assign('rss10', _("[RSS 1.0] feeds")); +$smarty->assign('val_rss10', $feed->stat_countFeedTypes("RSS 1.0")); -// box 1 -$box_1 = sprintf(" <h1>%s</h1>\n <p>%s %d<br />\n %s %d<br />\n %s %d<br />\n </p>\n <p>\n %s %d<br />\n %s %d<br />\n %s %d<br />\n %s %d</p>", _("Statistic"), _("Fedds in the Database: "), $feed->stat_countFeeds(), _("Items over all:"), $feed->stat_countAllItems(), _("Average items per feed:"), $feed->stat_avgItemsPerFeed(), _("[ATOM 1.0] feeds:"), $feed->stat_countFeedTypes("ATOM 1.0"), _("[RDF 0.9] feeds:"), $feed->stat_countFeedTypes("RDF 0.9"), _("[RSS 2.0] feeds:"), $feed->stat_countFeedTypes("RSS 2.0"), _("[RSS 1.0] feeds"), $feed->stat_countFeedTypes("RSS 1.0")); -$design = str_replace("<!-- box 1 -->", $box_1, $design); +// area 2 +$biggest_feeds = 10; +$smarty->assign('val_biggest_feeds', $biggest_feeds); +$smarty->assign('biggest_feeds', _("biggest feeds")); +$smarty->assign('biggest_feeds_list', $feed->getBiggestFeeds($biggest_feeds)); +$smarty->assign('items_str', _("Items")); -// box 2 -$biggestfeeds = 10; -$box_2 = sprintf(" <h1>%d %s</h1>\n <ul>\n", $biggestfeeds, _("biggest feeds")); -$biggest_feeds = $feed->getBiggestFeeds($biggestfeeds); -foreach ($biggest_feeds as $biggest) { - $box_2 .= sprintf(" <li><a href=\"./page_show_feed.php?feed=%s\">%s (%d%s)</a> </li>\n", $biggest['feed_db_name'], $biggest['feed_name'], $biggest['items'], _(" Items")); -} -$box_2 .= " </ul>\n"; -$design = str_replace("<!-- box 2 -->", $box_2, $design); +// area 3 +$random_feeds = 10; +$smarty->assign('val_rand_feeds', $random_feeds); +$smarty->assign('rand_feeds', _("random feeds")); +$smarty->assign('random_feeds_list', $feed->getRandomFeeds($random_feeds)); -// box 3 -$newestfeeds = 10; -$box_3 = sprintf(" <h1>%d %s</h1>\n <ul>\n", $newestfeeds, _("random feeds")); -$random_feeds = $feed->getRandomFeeds($newestfeeds); -foreach ($random_feeds as $randfeed) { - $box_3 .= sprintf(" <li><a href=\"./page_show_feed.php?feed=%s\">%s (%d%s)</a> </li>\n", $randfeed['feed_db_name'], $randfeed['feed_name'], $randfeed['items'], _(" Items")); -} -$box_3 .= " </ul>\n"; +// area 4 +$newest_feeds = 6; +$smarty->assign('val_newest_feeds', $newest_feeds); +$smarty->assign('newest_feeds', _("Newest feeds")); +$smarty->assign('newest_feeds_list', $feed->getNewestFeeds($newest_feeds)); -$design = str_replace("<!-- box 3 -->", $box_3, $design); - -// box 4 -$box_4 = sprintf(" <h1>%s</h1>\n <ul>\n", _("Newest feeds")); -$newest_feeds = $feed->getNewestFeeds(6); -foreach ($newest_feeds as $newest) { - $box_4 .= sprintf(" <li><a href=\"./page_show_feed.php?feed=%s\"><!--•-->%s</a> %s (%d%s)</li>\n", $newest['feed_db_name'], $newest['feed_name'], date(("d.m.y H:m:s"), $newest['added']), $newest['items'], _(" Items")); -} -$box_4 .= " </ul>"; -$design = str_replace("<!-- box 4 -->", $box_4, $design); - # footer +$smarty->assign('admin_email', $admin['email']); +$smarty->assign('updated', _("Updated")); -//echo $design; $smarty->display("page_main.tpl"); ?> Deleted: trunk/styles/default/footer.tpl =================================================================== --- trunk/styles/default/footer.tpl 2007-06-04 18:04:39 UTC (rev 121) +++ trunk/styles/default/footer.tpl 2007-06-04 22:54:40 UTC (rev 122) @@ -1,15 +0,0 @@ - <!-- ##### Footer ##### --> - - <div id="footer"> - <span class="doNotPrint"> - For comments or questions about this website, please - {mailto address=$admin_email encode="javascript" title=$admin_email_title text="email the webmaster"} - </span> - • <strong>{$updated} »</strong> {$smarty.now|date_format:"%Y-%m-%d"} - <span class="doNotPrint"> - <a href="http://validator.w3.org/check?uri=referer"><img src="styles/default/images/valid-xhtml11-blue.png" alt="Valid XHTML 1.1" /></a> - <a href="http://jigsaw.w3.org/css-validator/"><img src="styles/default/images/valid-css2-blue.png" alt="Valid CSS 2" /></a> - </span> - </div> - </body> -</html> Deleted: trunk/styles/default/header.tpl =================================================================== --- trunk/styles/default/header.tpl 2007-06-04 18:04:39 UTC (rev 121) +++ trunk/styles/default/header.tpl 2007-06-04 22:54:40 UTC (rev 122) @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" - "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" > - <head> - <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8" /> - <meta name="author" content="haran" /> - <meta name="generator" content="haran" /> - - <link rel="stylesheet" type="text/css" href="./styles/default/css/page_main-screen.css" media="screen, tv, projection" title="Default" /> - <link rel="stylesheet" type="text/css" href="./styles/default/css/common-screen.css" media="screen, tv, projection" title="Default" /> - <link rel="stylesheet" type="text/css" href="./styles/default/css/header-screen.css" media="screen, tv, projection" title="Default" /> - <link rel="stylesheet" type="text/css" href="./styles/default/css/main_copy-screen.css" media="screen, tv, projection" title="Default" /> - <link rel="stylesheet" type="text/css" href="./styles/default/css/footer-screen.css" media="screen, tv, projection" title="Default" /> - - <title>{$title}</title> - </head> Copied: trunk/styles/default/page_footer.tpl (from rev 119, trunk/styles/default/footer.tpl) =================================================================== --- trunk/styles/default/page_footer.tpl (rev 0) +++ trunk/styles/default/page_footer.tpl 2007-06-04 22:54:40 UTC (rev 122) @@ -0,0 +1,15 @@ + <!-- ##### Footer ##### --> + + <div id="footer"> + <span class="doNotPrint"> + For comments or questions about this website, please + {mailto address=$admin_email encode="javascript" title=$admin_email_title text="email the webmaster"}<br /> + </span> + • <strong>{$updated} »</strong> {$smarty.now|date_format:"%Y-%m-%d"}<br /> + <span class="doNotPrint"> + <a href="http://validator.w3.org/check?uri=referer"><img src="styles/default/images/valid-xhtml11-blue.png" alt="Valid XHTML 1.1" /></a> + <a href="http://jigsaw.w3.org/css-validator/"><img src="styles/default/images/valid-css2-blue.png" alt="Valid CSS 2" /></a> + </span> + </div> + </body> +</html> Modified: trunk/styles/default/page_header.tpl =================================================================== --- trunk/styles/default/page_header.tpl 2007-06-04 18:04:39 UTC (rev 121) +++ trunk/styles/default/page_header.tpl 2007-06-04 22:54:40 UTC (rev 122) @@ -9,16 +9,16 @@ <span>{$related_sites_str}</span> {foreach from=$related_sites_list item=i name="related_sites"} {if $smarty.foreach.related_sites.last == 0 } - <a href="{$i.href|escape}" title="{$i.title}">{$i.text}</a> | + <a href="{$i.href|escape}" title="{$i.title}">{$i.text}</a> | {else} - <a href="{$i.href|escape}" title="{$i.title}">{$i.text}</a> +<a href="{$i.href|escape}" title="{$i.title}">{$i.text}</a> {/if} {/foreach} </div> <div class="midHeader"> <h1 class="headerTitle">{$page_title}</h1> - <div class="headerSubTitle" title=\"Message'\"> + <div class="headerSubTitle" title="Message"> {$sub_title} </div> Modified: trunk/styles/default/page_main.tpl =================================================================== --- trunk/styles/default/page_main.tpl 2007-06-04 18:04:39 UTC (rev 121) +++ trunk/styles/default/page_main.tpl 2007-06-04 22:54:40 UTC (rev 122) @@ -12,29 +12,59 @@ </div> <div class="oneThird"> -{foreach from=$related_sites_list item=i name="related_sites"} - + <h1>{$latest_news_str}</h1> +{foreach from=$latest_news_list item=i name="latest_news"} + <a href="./page_news.php?newsid={$i.id}" class="newsHeading">{$i.headline}</a> + <p class="newsDate">{$i.published|date_format:"%a, %d.%m.%Y - %H:%M"}</p> + <p class="newsSummary">{$i.summary}</p> {/foreach} - - <!-- latest news --> + <div class="more"><a href="./page_news.php">{$more_news} »</a></div> + <p class="filler"><!-- Filler para to extend left vertical line --></p> </div> </div> <div class="rowOfBoxes dividingBorderAbove"> <div class="quarter noBorderOnLeft"> -<!-- box 1 --> + <h1>{$statistic}</h1> + <p> + {$feeds_in_db}: {$val_feeds_in_db}<br /> + {$items_over_all}: {$val_items_over_all}<br /> + {$avg_items_per_feed}: {$val_avg_items_per_feed}<br /> + </p> + <p> + {$atom10}: {$val_atom10}<br /> + {$rdf09}: {$val_rdf09}<br /> + {$rss20}: {$val_rss20}<br /> + {$rss10}: {$val_rss10} + </p> </div> <div class="quarter"> -<!-- box 2 --> + <h1>{$val_biggest_feeds} {$biggest_feeds}</h1> + <ul> +{foreach from=$biggest_feeds_list item=i name="biggest_feeds"} + <li><a href="./page_show_feed.php?feed={$i.feed_db_name}">{$i.feed_name} ({$i.items} {$items_str})</a></li> +{/foreach} + </ul> </div> <div class="quarter"> -<!-- box 3 --> - </div> + <h1>{$val_rand_feeds} {$rand_feeds}</h1> + <ul> +{foreach from=$random_feeds_list item=i name="random_feeds"} + <li><a href="./page_show_feed.php?feed={$i.feed_db_name}">{$i.feed_name} ({$i.items} {$items_str})</a></li> +{/foreach} + </ul> + </div> <div class="quarter"> -<!-- box 4 --> + <h1>{$val_newest_feeds} {$newest_feeds}</h1> + <ul> +{foreach from=$newest_feeds_list item=i name="newest_feeds"} + <li><a href="./page_show_feed.php?feed={$i.feed_db_name}">{$i.feed_name}</a> {$i.added|date_format:"%d.%m.%y %H:%M:%S"} ({$i.items} {$items_str})</li> +{/foreach} + </ul> </div> </div> </div> +{include file="page_footer.tpl"} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <C1...@us...> - 2007-06-04 18:06:42
|
Revision: 121 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=121&view=rev Author: C167 Date: 2007-06-04 11:04:39 -0700 (Mon, 04 Jun 2007) Log Message: ----------- some changes Modified Paths: -------------- trunk/inc/upperBar.php trunk/page_main.php trunk/styles/default/page_header.tpl trunk/styles/default/page_main.tpl Modified: trunk/inc/upperBar.php =================================================================== --- trunk/inc/upperBar.php 2007-06-04 16:08:57 UTC (rev 120) +++ trunk/inc/upperBar.php 2007-06-04 18:04:39 UTC (rev 121) @@ -7,14 +7,24 @@ * @author C167 <c1...@us...> * @package feed-collector */ -if (false === HTTP_Session :: get("logged_in", false)) { - $related_sites = sprintf(" <span>%s</span>\n" . - " <a href=\"http://validator.w3.org/check?uri=referer\" title=\"Validate XHTML\">Validate XHTML</a> |\n" . - " <a href=\"http://www.oswd.org/userinfo.phtml?user=haran\" title=\"Other designs by haran\">haran’s Designs</a> |\n" . - " <a href=\"http://validator.w3.org/check?uri=referer\" title=\"Validate\">Validate</a>\n", _("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’s Designs</a>", _("Related Sites:")); -} + +$smarty->assign('related_sites_str', _("Related Sites:")); +$related_sites_list = array ( + array ( + "text" => "Validate XHTML", + "title" => "Validate XHTML", + "href" => "http://validator.w3.org/check?uri=referer" + ), + array ( + "text" => "haran's Designs", + "title" => "Other designs by haran", + "href" => "http://www.oswd.org/designs/search/designer/id/3013/" + ), + array ( + "text" =>"Validate CSS", + "title" => "Validate CSS", + "href" => "http://validator.w3.org/check?uri=referer" + ) +); +$smarty->assign('related_sites_list', $related_sites_list); ?> Modified: trunk/page_main.php =================================================================== --- trunk/page_main.php 2007-06-04 16:08:57 UTC (rev 120) +++ trunk/page_main.php 2007-06-04 18:04:39 UTC (rev 121) @@ -28,7 +28,7 @@ require_once "class/User_manager.php"; $user = new User_manager($db); -/* Style-Chooser */ +/* STYLE */ require_once "inc/styles.php"; $page = "main"; @@ -37,9 +37,7 @@ require_once "./inc/language.php"; // SMARTY -define('SMARTY_DIR', '/usr/share/php/smarty/libs/'); -require_once "smarty/libs/Smarty.class.php"; -$smarty = new Smarty(); +require_once "inc/smarty.php"; // // Now we're going to replace the placeholders in the template with the important content @@ -56,24 +54,22 @@ # body // related sites require_once "./inc/upperBar.php"; -$design = str_replace("<!-- related sites -->", $related_sites, $design); -// midHeader title left -$midHeader_title_left = sprintf(" <h1 class=\"headerTitle\">%s</h1>\n <div class=\"headerSubTitle\" title=\"Message'\">\n %s\n </div>", _("Feed-Collector"), _("{ stay up to date with all your news feeds! }")); -$design = str_replace("<!-- midHeader title left -->", $midHeader_title_left, $design); +// midHeader title +$smarty->assign('page_title', _("Feed-Collector")); +$smarty->assign('sub_title', _("{ stay up to date with all your news feeds! }")); // midHeader title right require_once "./inc/userstatus_display.php"; -$design = str_replace("<!-- midHeader title right -->", $midHeader_title_right, $design); // navigation require_once "inc/navigation.php"; -$design = str_replace("<!-- navigation -->", $navigation, $design); # Main copy -// main -$main = sprintf(" <h1>%s</h1>\n %s", _("Welcome!"), _("<p>This is the home of Feed-Collector, an database-driven news-reader.\n It is written to automaticaly collect news from other websites \n <acronym title=\"Resource Description Framework\">RDF</acronym>-, \n <acronym title=\"Really Simple Syndication\">RSS</acronym>- and \n <acronym title=\"Atom Syndication Formats\">ATOM</acronym>-newsfeeds \n and to display them to a user. There is no need to delete \"older news\", \n so you can come here anytime and search in the database</p>\n <p>Users can register to this site. If they do so, they get a personal page \n displaying the news they are interested in. Once a user is logged in, he can \n modify his page by adding and removing news feeds. To do so, just go to the \n <a href=\"./page_select_feeds.php\">feed-overview-page</a> and select/deselect \n news feeds.</p>")); -$design = str_replace("<!-- main -->", $main, $design); +// main wordwrap 85 +$smarty->assign('greeting', _("Welcome!")); +$smarty->assign('block1', _("This is the home of Feed-Collector, an database-driven news-reader. It is written to automaticaly collect news from other websites <acronym title=\"Resource Description Framework\">RDF</acronym>-, <acronym title=\"Really Simple Syndication\">RSS</acronym>- and <acronym title=\"Atom Syndication Formats\">ATOM</acronym>-newsfeeds and to display them to a user. There is no need to delete \"older news\", so you can come here anytime and search in the database")); +$smarty->assign('block2', _("Users can register to this site. If they do so, they get a personal page displaying the news they are interested in. Once a user is logged in, he can modify his page by adding and removing news feeds. To do so, just go to the <a href=\"./page_select_feeds.php\">feed-overview-page</a> and select/deselect news feeds.")); // latest news $latestnews = & $db->query("SELECT *, MAX( published ) AS published FROM news GROUP BY published DESC LIMIT 0 , 2;"); @@ -126,8 +122,7 @@ $design = str_replace("<!-- box 4 -->", $box_4, $design); # footer -require_once "./inc/footer.php"; -$design = str_replace("<!-- footer -->", $footer, $design); -echo $design; +//echo $design; +$smarty->display("page_main.tpl"); ?> Modified: trunk/styles/default/page_header.tpl =================================================================== --- trunk/styles/default/page_header.tpl 2007-06-04 16:08:57 UTC (rev 120) +++ trunk/styles/default/page_header.tpl 2007-06-04 18:04:39 UTC (rev 121) @@ -7,17 +7,18 @@ <div id="header"> <div class="superHeader"> <span>{$related_sites_str}</span> -{foreach from=$related_sites_list key=title item=i name="related_sites"} - <a href="{$i.href|escape:"url"}" title="{$title}">{$i.text}</a> - {if $smarty.foreach.related_sites.last == 1 } - | +{foreach from=$related_sites_list item=i name="related_sites"} + {if $smarty.foreach.related_sites.last == 0 } + <a href="{$i.href|escape}" title="{$i.title}">{$i.text}</a> | + {else} + <a href="{$i.href|escape}" title="{$i.title}">{$i.text}</a> {/if} {/foreach} </div> <div class="midHeader"> - <h1 class=\"headerTitle\">{$page_title}</h1> - <div class=\"headerSubTitle\" title=\"Message'\"> + <h1 class="headerTitle">{$page_title}</h1> + <div class="headerSubTitle" title=\"Message'\"> {$sub_title} </div> @@ -30,14 +31,14 @@ <div class="subHeader"> <span class="doNotDisplay">Navigation:</span> - <a href="./page_main.php" {$hl_page_main}>{$navi_home}</a> | + <a href="./page_main.php" {$hl_main}>{$navi_home}</a> | <a href="./page_show_all_feeds.php" {$hl_show_all_feeds|default:""}>{$navi_show_all_feeds}</a> | <a href="./page_show_feed_tag.php" {$hl_show_feed_tag|default:""}>{$navi_feeds_by_tag}</a> | <a href="./page_add_new_feed.php" {$hl_add_new_feed|default:""}>{$navi_add_new_feed}</a> | <a href="./page_show_feed.php" {$hl_show_feed|default:""}>{$navi_show_feed}</a> | <a href="./page_add_tag.php?{$smarty.get.feed}" {$hl_add_tag|default:""}>{$navi_add_tag}</a> | {if false == $smarty.session.logged_in|default:"false"} - <a href="./page_login.php" {hl_$login}>{$navi_login}</a> | + <a href="./page_login.php" {$hl_login}>{$navi_login}</a> | <a href="./page_register.php" {$hl_register}>{$navi_register}</a> {else} <a href="./page_personal.php" {$hl_personal}>{$navi_personal}</a> | Modified: trunk/styles/default/page_main.tpl =================================================================== --- trunk/styles/default/page_main.tpl 2007-06-04 16:08:57 UTC (rev 120) +++ trunk/styles/default/page_main.tpl 2007-06-04 18:04:39 UTC (rev 121) @@ -1,49 +1,21 @@ - <body> - <!-- For non-visual user agents: --> - <div id="top"><a href="#main-copy" class="doNotDisplay doNotPrint">Skip to main content.</a></div> +{include file="html_header.tpl"} +{include file="page_header.tpl"} - <!-- ##### Header ##### --> - - <div id="header"> - <div class="superHeader"> - <span>{$related_sites_str}</span> -{foreach from=$related_sites_list key=title item=i name="related_sites"} - <a href="{$i.href|escape:"url"}" title="{$title}">{$i.text}</a> - {if $smarty.foreach.related_sites.last == 1 } - | - {/if} -{/foreach} - </div> - - <div class="midHeader"> - <h1 class=\"headerTitle\">{$page_title}</h1> - <div class=\"headerSubTitle\" title=\"Message'\"> - {$sub_title} - </div> - - <br class="doNotDisplay doNotPrint" /> - - <div class="headerLogin"> - <p>{$userstatus}</p> - </div> - </div> - - <div class="subHeader"> - <span class="doNotDisplay">Navigation:</span> - -<!-- navigation --> - </div> - </div> - <!-- ##### Main Copy ##### --> <div id="main-copy"> <div class="rowOfBoxes"> <div class="twoThirds noBorderOnLeft"> -<!-- main --> + <h1>{$greeting}</h1> + <p>{$block1}</p> + <p>{$block2}</p> </div> <div class="oneThird"> +{foreach from=$related_sites_list item=i name="related_sites"} + +{/foreach} + <!-- latest news --> </div> </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <C1...@us...> - 2007-06-04 16:09:23
|
Revision: 120 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=120&view=rev Author: C167 Date: 2007-06-04 09:08:57 -0700 (Mon, 04 Jun 2007) Log Message: ----------- big changes, page_main.php working partially Modified Paths: -------------- trunk/inc/config.php trunk/inc/navigation.php trunk/inc/smarty.php trunk/inc/userstatus_display.php Modified: trunk/inc/config.php =================================================================== --- trunk/inc/config.php 2007-06-04 14:43:21 UTC (rev 119) +++ trunk/inc/config.php 2007-06-04 16:08:57 UTC (rev 120) @@ -34,8 +34,8 @@ // Smarty settings define('SMARTY_DIR', '/usr/share/php/smarty/libs/'); // these folders should be outside the document root -$sm['template_dir'] = "./styles/$style/"; -$sm['compile_dir'] = "./smarty/emplates_c/"; +$sm['template_dir'] = "./styles/"; +$sm['compile_dir'] = "./smarty/templates_c/"; $sm['config_dir'] = "./inc/"; $sm['cache_dir'] = "./smarty/cache/"; Modified: trunk/inc/navigation.php =================================================================== --- trunk/inc/navigation.php 2007-06-04 14:43:21 UTC (rev 119) +++ trunk/inc/navigation.php 2007-06-04 16:08:57 UTC (rev 120) @@ -14,62 +14,43 @@ } switch ($page) { case "main" : - $page_main = $hl; - $show_all_feeds = $show_feed_tag = $add_new_feed = $show_feed = $add_tag = $login = $register = $personal = ""; + $smarty->assign('hl_main', $hl); break; case "show_all_feeds" : - $show_all_feeds = $hl; - $page_main = $show_feed_tag = $add_new_feed = $show_feed = $add_tag = $login = $register = $personal = ""; + $smarty->assign('hl_show_all_feeds', $hl); break; case "show_feed_tag" : - $show_feed_tag = $hl; - $page_main = $show_all_feeds = $add_new_feed = $show_feed = $add_tag = $login = $register = $personal = ""; + $smarty->assign('hl_show_feed_tag', $hl); break; case "add_new_feed" : - $add_new_feed = $hl; - $page_main = $show_all_feeds = $show_feed_tag = $show_feed = $add_tag = $login = $register = $personal = ""; + $smarty->assign('hl_add_new_feed', $hl); break; case "show_feed" : - $show_feed = $hl; - $page_main = $show_all_feeds = $show_feed_tag = $add_new_feed = $add_tag = $login = $register = $personal = ""; + $smarty->assign('hl_show_feed', $hl); break; case "add_tag" : - $add_tag = $hl; - $page_main = $show_all_feeds = $show_feed_tag = $add_new_feed = $show_feed = $register = $personal = ""; + $smarty->assign('hl_add_tag', $hl); break; case "login" : - $login = $hl; - $page_main = $show_all_feeds = $show_feed_tag = $add_new_feed = $show_feed = $add_tag = $register = $personal = ""; + $smarty->assign('hl_login', $hl); break; case "register" : - $register = $hl; - $page_main = $show_all_feeds = $show_feed_tag = $add_new_feed = $show_feed = $add_tag = $login = $personal = ""; + $smarty->assign('hl_register', $hl); break; case "personal" : - $personal = $hl; - $page_main = $show_all_feeds = $show_feed_tag = $add_new_feed = $show_feed = $add_tag = $login = $register = ""; + $smarty->assign('hl_personal', $hl); break; default : - $page_main = $show_all_feeds = $show_feed_tag = $add_new_feed = $show_feed = $add_tag = $login = $register = $personal = ""; + break; } -$navigation = sprintf(" <a href=\"./page_main.php\"$page_main>%s</a> |\n" . -" <a href=\"./page_show_all_feeds.php\"$show_all_feeds>%s</a> |\n" . -" <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", - 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>", 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>", dgettext("navigation", "Personal Page"), dgettext("navigation", "LogOut")); -} +$smarty->assign('navi_home', dgettext("navigation", "Home")); +$smarty->assign('navi_show_all_feeds', dgettext("navigation", "Show all Feeds")); +$smarty->assign('navi_feeds_by_tag', dgettext("navigation", "Feeds by TAG")); +$smarty->assign('navi_add_new_feed', dgettext("navigation", "Add a Feed")); +$smarty->assign('navi_show_feed', dgettext("navigation", "Display a Feed")); +$smarty->assign('navi_add_tag', dgettext("navigation", "Add a Tag")); +$smarty->assign('navi_login' , dgettext("navigation", "Login")); +$smarty->assign('navi_register', dgettext("navigation", "Register")); +$smarty->assign('navi_personal', dgettext("navigation", "Personal Page")); +$smarty->assign('navi_logout', dgettext("navigation", "LogOut")); ?> Modified: trunk/inc/smarty.php =================================================================== --- trunk/inc/smarty.php 2007-06-04 14:43:21 UTC (rev 119) +++ trunk/inc/smarty.php 2007-06-04 16:08:57 UTC (rev 120) @@ -11,7 +11,7 @@ require_once "smarty/libs/Smarty.class.php"; $smarty = new Smarty(); -$smarty->template_dir = $sm['template_dir']; +$smarty->template_dir = $sm['template_dir'].$style; $smarty->compile_dir = $sm['compile_dir']; $smarty->config_dir = $sm['config_dir']; $smarty->cache_dir = $sm['cache_dir']; Modified: trunk/inc/userstatus_display.php =================================================================== --- trunk/inc/userstatus_display.php 2007-06-04 14:43:21 UTC (rev 119) +++ trunk/inc/userstatus_display.php 2007-06-04 16:08:57 UTC (rev 120) @@ -8,14 +8,14 @@ * @package feed-collector */ if (false === HTTP_Session :: get("logged_in", false)) { - $midHeader_title_right = sprintf(" <p>%s</p>", dgettext("userstatus_display", "You are not logged in")); + $smarty->assign('userstatus', dgettext("userstatus_display", "You are not logged in")); } else { if (HTTP_Session :: get("username", false) == false) { $username = $user->getUsername(); } else { $username = HTTP_Session :: get("username"); } - $midHeader_title_right = sprintf(" <p>%s %s</p>", dgettext("userstatus_display", "Hello"), $username); + $smarty->assign('userstatus', dgettext("userstatus_display", "Hello")." ".$username); HTTP_Session::updateIdle(); } ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <C1...@us...> - 2007-06-04 14:43:23
|
Revision: 119 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=119&view=rev Author: C167 Date: 2007-06-04 07:43:21 -0700 (Mon, 04 Jun 2007) Log Message: ----------- removed old validation-pics Removed Paths: ------------- trunk/styles/default/images/valid-css trunk/styles/default/images/valid-markup Deleted: trunk/styles/default/images/valid-css =================================================================== (Binary files differ) Deleted: trunk/styles/default/images/valid-markup =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <C1...@us...> - 2007-06-04 14:41:44
|
Revision: 118 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=118&view=rev Author: C167 Date: 2007-06-04 07:41:40 -0700 (Mon, 04 Jun 2007) Log Message: ----------- some changes the third Modified Paths: -------------- trunk/inc/config.php Added Paths: ----------- trunk/inc/smarty.php Modified: trunk/inc/config.php =================================================================== --- trunk/inc/config.php 2007-06-04 14:26:40 UTC (rev 117) +++ trunk/inc/config.php 2007-06-04 14:41:40 UTC (rev 118) @@ -13,31 +13,31 @@ */ // Database-configuration -$db['type'] = "mysql"; // SQL_DB-Type -$db['host'] = "localhost"; // The hostname -$db['port'] = ""; // The Port. Nomally, the default port is right. -$db['user'] = "feed-collector"; // The User that has access to the DB -$db['passwd'] = "feed-collector"; // The password of this user +$db['type'] = "mysql"; // SQL_DB-Type +$db['host'] = "localhost"; // The hostname +$db['port'] = "3306"; // The Port. Nomally, the default port is right. +$db['user'] = "feed-collector"; // The User that has access to the DB +$db['passwd'] = "feed-collector"; // The password of this user $db['database'] = "feed-collector"; // The name of the database // Session-configuration -$session['time']['expire'] = 60 * 60 * 24; -$session['time']['idle'] = 60 * 60; -$session['container']['tablename'] = "sessiondata"; +$session['time']['expire'] = 60 * 60 * 24; +$session['time']['idle'] = 60 * 60; +$session['container']['tablename'] = "sessiondata"; $session['container']['autooptimisation_allowed'] = true; // Update-configuration -$update['enabled'] = true; +$update['enabled'] = true; $update['difference'] = 1800; -$update['loglevel'] = PEAR_LOG_NOTICE; +$update['loglevel'] = PEAR_LOG_NOTICE; // Smarty settings define('SMARTY_DIR', '/usr/share/php/smarty/libs/'); // these folders should be outside the document root $sm['template_dir'] = "./styles/$style/"; -$sm['compile_dir'] = "./templates_c/"; +$sm['compile_dir'] = "./smarty/emplates_c/"; $sm['config_dir'] = "./inc/"; -$sm['cache_dir'] = "./cache/"; +$sm['cache_dir'] = "./smarty/cache/"; // Valid pages $validPages = array ( @@ -63,7 +63,7 @@ */ // Database-configuration -$db['dsn'] = $db['type'] . "://" . $db['user'] . ":" . $db['passwd'] . "@" . $db['host'] . "/" . $db['database']; +$db['dsn'] = sprintf("%s://%s:%s@%s:%d/%s", $db['type'], $db['user'], $db['passwd'], $db['host'], $db['port'], $db['database']); // Session-configuration if (($db['type'] == "mysql" or $db['type'] == "postgresql") and $session['container']['autooptimisation_allowed']) { Added: trunk/inc/smarty.php =================================================================== --- trunk/inc/smarty.php (rev 0) +++ trunk/inc/smarty.php 2007-06-04 14:41:40 UTC (rev 118) @@ -0,0 +1,17 @@ +<?php +/* + * Created on 04.06.2007 + * This file contains the smarty-options + * @since 115 - 04.06.2007 + * @author C167 <c1...@us...> + * @package feed-collector + */ + + +require_once "smarty/libs/Smarty.class.php"; +$smarty = new Smarty(); + +$smarty->template_dir = $sm['template_dir']; +$smarty->compile_dir = $sm['compile_dir']; +$smarty->config_dir = $sm['config_dir']; +$smarty->cache_dir = $sm['cache_dir']; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <C1...@us...> - 2007-06-04 14:26:46
|
Revision: 117 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=117&view=rev Author: C167 Date: 2007-06-04 07:26:40 -0700 (Mon, 04 Jun 2007) Log Message: ----------- some changes ones more Added Paths: ----------- trunk/styles/default/html_header.tpl trunk/styles/default/images/valid-css2-blue.png trunk/styles/default/images/valid-xhtml11-blue.png trunk/styles/default/page_header.tpl Added: trunk/styles/default/html_header.tpl =================================================================== --- trunk/styles/default/html_header.tpl (rev 0) +++ trunk/styles/default/html_header.tpl 2007-06-04 14:26:40 UTC (rev 117) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" + "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" > + <head> + <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8" /> + <meta name="author" content="haran" /> + <meta name="generator" content="haran" /> + + <link rel="stylesheet" type="text/css" href="./styles/default/css/page_main-screen.css" media="screen, tv, projection" title="Default" /> + <link rel="stylesheet" type="text/css" href="./styles/default/css/common-screen.css" media="screen, tv, projection" title="Default" /> + <link rel="stylesheet" type="text/css" href="./styles/default/css/header-screen.css" media="screen, tv, projection" title="Default" /> + <link rel="stylesheet" type="text/css" href="./styles/default/css/main_copy-screen.css" media="screen, tv, projection" title="Default" /> + <link rel="stylesheet" type="text/css" href="./styles/default/css/footer-screen.css" media="screen, tv, projection" title="Default" /> + + <title>{$title}</title> + </head> Property changes on: trunk/styles/default/html_header.tpl ___________________________________________________________________ Name: svn:executable + * Added: trunk/styles/default/images/valid-css2-blue.png =================================================================== (Binary files differ) Property changes on: trunk/styles/default/images/valid-css2-blue.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: trunk/styles/default/images/valid-xhtml11-blue.png =================================================================== (Binary files differ) Property changes on: trunk/styles/default/images/valid-xhtml11-blue.png ___________________________________________________________________ Name: svn:mime-type + image/png Added: trunk/styles/default/page_header.tpl =================================================================== --- trunk/styles/default/page_header.tpl (rev 0) +++ trunk/styles/default/page_header.tpl 2007-06-04 14:26:40 UTC (rev 117) @@ -0,0 +1,48 @@ + <body> + <!-- For non-visual user agents: --> + <div id="top"><a href="#main-copy" class="doNotDisplay doNotPrint">Skip to main content.</a></div> + + <!-- ##### Header ##### --> + + <div id="header"> + <div class="superHeader"> + <span>{$related_sites_str}</span> +{foreach from=$related_sites_list key=title item=i name="related_sites"} + <a href="{$i.href|escape:"url"}" title="{$title}">{$i.text}</a> + {if $smarty.foreach.related_sites.last == 1 } + | + {/if} +{/foreach} + </div> + + <div class="midHeader"> + <h1 class=\"headerTitle\">{$page_title}</h1> + <div class=\"headerSubTitle\" title=\"Message'\"> + {$sub_title} + </div> + + <br class="doNotDisplay doNotPrint" /> + + <div class="headerLogin"> + <p>{$userstatus}</p> + </div> + </div> + + <div class="subHeader"> + <span class="doNotDisplay">Navigation:</span> + <a href="./page_main.php" {$hl_page_main}>{$navi_home}</a> | + <a href="./page_show_all_feeds.php" {$hl_show_all_feeds|default:""}>{$navi_show_all_feeds}</a> | + <a href="./page_show_feed_tag.php" {$hl_show_feed_tag|default:""}>{$navi_feeds_by_tag}</a> | + <a href="./page_add_new_feed.php" {$hl_add_new_feed|default:""}>{$navi_add_new_feed}</a> | + <a href="./page_show_feed.php" {$hl_show_feed|default:""}>{$navi_show_feed}</a> | + <a href="./page_add_tag.php?{$smarty.get.feed}" {$hl_add_tag|default:""}>{$navi_add_tag}</a> | +{if false == $smarty.session.logged_in|default:"false"} + <a href="./page_login.php" {hl_$login}>{$navi_login}</a> | + <a href="./page_register.php" {$hl_register}>{$navi_register}</a> +{else} + <a href="./page_personal.php" {$hl_personal}>{$navi_personal}</a> | + <a href="./page_logout.php?returnto=page_main.php">{$navi_logout}</a> +{/if} + + </div> + </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <C1...@us...> - 2007-06-04 14:25:34
|
Revision: 116 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=116&view=rev Author: C167 Date: 2007-06-04 07:25:36 -0700 (Mon, 04 Jun 2007) Log Message: ----------- some changes Modified Paths: -------------- trunk/inc/config.php trunk/inc/navigation.php trunk/page_main.php trunk/styles/default/footer.tpl trunk/styles/default/page_main.tpl Added Paths: ----------- trunk/smarty/ trunk/smarty/cache/ trunk/smarty/templates_c/ Removed Paths: ------------- trunk/inc/footer.php Modified: trunk/inc/config.php =================================================================== --- trunk/inc/config.php 2007-06-04 12:11:09 UTC (rev 115) +++ trunk/inc/config.php 2007-06-04 14:25:36 UTC (rev 116) @@ -32,7 +32,12 @@ $update['loglevel'] = PEAR_LOG_NOTICE; // Smarty settings -$smarty['folder'] = "smarty/libs"; +define('SMARTY_DIR', '/usr/share/php/smarty/libs/'); + // these folders should be outside the document root +$sm['template_dir'] = "./styles/$style/"; +$sm['compile_dir'] = "./templates_c/"; +$sm['config_dir'] = "./inc/"; +$sm['cache_dir'] = "./cache/"; // Valid pages $validPages = array ( Deleted: trunk/inc/footer.php =================================================================== --- trunk/inc/footer.php 2007-06-04 12:11:09 UTC (rev 115) +++ trunk/inc/footer.php 2007-06-04 14:25:36 UTC (rev 116) @@ -1,25 +0,0 @@ -<?php - - -/** - * Created on 12.01.2007 - * This file contains the footer - * @since 100 - 12.01.2007 - * @author C167 <c1...@us...> - * @package feed-collector - */ - -// footer -$footer = sprintf(" <span class=\"doNotPrint\">\n" . -" For comments or questions about this website, please\n" . -" <a href=\"mailto:c1...@us...\" title=\"the developsers email adress\">email the Webmaster</a><br />\n" . -" </span>\n\n" . -" <!-- <strong>URI »</strong> http://domain.is.invalid/prosimii/index.html -->\n" . -" • <strong>Updated »</strong> %s •", date("r", time()), file_exists("styles/default/images/valid-css") ? "<img src=\"styles/default/images/valid-css\" alt=\"valid-css\" />":""); -if(file_exists("styles/default/images/valid-css") or file_exists("styles/default/images/valid-markup")) { - $footer .= " <div class=\"right\">\n"; - $footer .= file_exists("styles/default/images/valid-markup") ? " <img src=\"styles/default/images/valid-markup\" alt=\"Valid Markup\" />\n" : ""; - $footer .= file_exists("styles/default/images/valid-css") ? " <img src=\"styles/default/images/valid-css\" alt=\"Valid CSS\" />\n" : ""; - $footer .= " </div>\n"; -} -?> Modified: trunk/inc/navigation.php =================================================================== --- trunk/inc/navigation.php 2007-06-04 12:11:09 UTC (rev 115) +++ trunk/inc/navigation.php 2007-06-04 14:25:36 UTC (rev 116) @@ -57,7 +57,14 @@ " <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", 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")); +" <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>", dgettext("navigation", "Login"), dgettext("navigation", "Register")); Modified: trunk/page_main.php =================================================================== --- trunk/page_main.php 2007-06-04 12:11:09 UTC (rev 115) +++ trunk/page_main.php 2007-06-04 14:25:36 UTC (rev 116) @@ -36,17 +36,22 @@ /* LANGUAGE */ require_once "./inc/language.php"; +// SMARTY +define('SMARTY_DIR', '/usr/share/php/smarty/libs/'); +require_once "smarty/libs/Smarty.class.php"; +$smarty = new Smarty(); + // // Now we're going to replace the placeholders in the template with the important content // // get the design -$design = file_get_contents("styles/$style/page_$page.tpl", 'r'); +$design = "styles/$style/page_$page.tpl"; # header // title -$title = "Feed-Collector"; -$design = str_replace("<!-- title -->", $title, $design); +$smarty->assign('title', "Feed-Collector"); +//$design = str_replace("<!-- title -->", $title, $design); # body // related sites Modified: trunk/styles/default/footer.tpl =================================================================== --- trunk/styles/default/footer.tpl 2007-06-04 12:11:09 UTC (rev 115) +++ trunk/styles/default/footer.tpl 2007-06-04 14:25:36 UTC (rev 116) @@ -1,7 +1,15 @@ <!-- ##### Footer ##### --> <div id="footer"> -{$footer} + <span class="doNotPrint"> + For comments or questions about this website, please + {mailto address=$admin_email encode="javascript" title=$admin_email_title text="email the webmaster"} + </span> + • <strong>{$updated} »</strong> {$smarty.now|date_format:"%Y-%m-%d"} + <span class="doNotPrint"> + <a href="http://validator.w3.org/check?uri=referer"><img src="styles/default/images/valid-xhtml11-blue.png" alt="Valid XHTML 1.1" /></a> + <a href="http://jigsaw.w3.org/css-validator/"><img src="styles/default/images/valid-css2-blue.png" alt="Valid CSS 2" /></a> + </span> </div> </body> </html> Modified: trunk/styles/default/page_main.tpl =================================================================== --- trunk/styles/default/page_main.tpl 2007-06-04 12:11:09 UTC (rev 115) +++ trunk/styles/default/page_main.tpl 2007-06-04 14:25:36 UTC (rev 116) @@ -6,21 +6,31 @@ <div id="header"> <div class="superHeader"> -<!-- related sites --> + <span>{$related_sites_str}</span> +{foreach from=$related_sites_list key=title item=i name="related_sites"} + <a href="{$i.href|escape:"url"}" title="{$title}">{$i.text}</a> + {if $smarty.foreach.related_sites.last == 1 } + | + {/if} +{/foreach} </div> <div class="midHeader"> -<!-- midHeader title left --> + <h1 class=\"headerTitle\">{$page_title}</h1> + <div class=\"headerSubTitle\" title=\"Message'\"> + {$sub_title} + </div> <br class="doNotDisplay doNotPrint" /> <div class="headerLogin"> -<!-- midHeader title right --> + <p>{$userstatus}</p> </div> </div> <div class="subHeader"> <span class="doNotDisplay">Navigation:</span> + <!-- navigation --> </div> </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <C1...@us...> - 2007-06-04 12:11:08
|
Revision: 115 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=115&view=rev Author: C167 Date: 2007-06-04 05:11:09 -0700 (Mon, 04 Jun 2007) Log Message: ----------- working towards use of smarty as template engine... Modified Paths: -------------- trunk/styles/default/page_add_new_feed.tpl trunk/styles/default/page_add_tag.tpl trunk/styles/default/page_login.tpl trunk/styles/default/page_main.tpl Added Paths: ----------- trunk/styles/default/css/ trunk/styles/default/css/common-screen.css trunk/styles/default/css/footer-screen.css trunk/styles/default/css/header-screen.css trunk/styles/default/css/main_copy-screen.css trunk/styles/default/css/page_add_new_feed-screen.css trunk/styles/default/css/page_add_tag-screen.css trunk/styles/default/css/page_login-screen.css trunk/styles/default/css/page_main-screen.css trunk/styles/default/css/page_personal-screen.css trunk/styles/default/css/page_register-screen.css trunk/styles/default/css/page_show_all_feeds-screen.css trunk/styles/default/css/page_show_feed-screen.css trunk/styles/default/css/page_show_feed_tag-screen.css trunk/styles/default/footer.tpl trunk/styles/default/header.tpl Removed Paths: ------------- trunk/styles/default/common-screen.css trunk/styles/default/footer-screen.css trunk/styles/default/header-screen.css trunk/styles/default/main_copy-screen.css trunk/styles/default/page_add_new_feed-screen.css trunk/styles/default/page_add_tag-screen.css 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 trunk/styles/default/page_show_all_feeds-screen.css trunk/styles/default/page_show_feed-screen.css trunk/styles/default/page_show_feed_tag-screen.css Deleted: trunk/styles/default/common-screen.css =================================================================== --- trunk/styles/default/common-screen.css 2007-06-04 11:56:11 UTC (rev 114) +++ trunk/styles/default/common-screen.css 2007-06-04 12:11:09 UTC (rev 115) @@ -1,159 +0,0 @@ -/***************************************** - * TITLE: Common Screen Stylesheet * - * URI: styles/default/common-screen.css * - * MODIF: 2007-Jan-09 18:06 +0100 * - *****************************************/ -/*@CHARSET "UTF-8";*/ - -/* ##### Common Styles ##### */ -.headerLogin { - border: 1px solid rgb(255, 255, 255); - text-align: right; - padding: 1ex; - position: absolute; - right: 1.5em; - top: 3.5em; -} - -.headerLogin { - border: 1px solid rgb(255, 255, 255); - text-align: right; - margin: 0; - /* padding: 0 0 2ex 0;*/ - padding-bottom: 1ex; - position: absolute; - right: 1.5em; - top: 3.5em; - /* margin-left: 1em; - margin-right: 1em;*/ -} - -.headerLogin a { - color: white; - background-color: transparent; - text-decoration: none; - margin: 0; - padding: 0 0 0.5ex 0; - display: block; -} - -.headerLogin span { - -} - -#userinfo p { - color: white; - background-color: transparent; - margin: 0; - display: block; -} - -.headerLogin input:hover { /* color: rgb(195,196,210);*/ - color: black; - /* background-color: transparent;*/ - background-color: rgb(117, 144, 174); - text-decoration: underline; -} - -.subHeader { - color: white; - background-color: rgb(117, 144, 174); - margin: 0; - padding: 0.5ex 10px; -} - -.subHeader a,.subHeader .highlight { - color: white; - background-color: transparent; - font-size: 110%; - font-weight: bold; - text-decoration: none; - margin: 0; - padding: 0 0.25ex 0 0; -} - -.subHeader a:hover,.subHeader .highlight { - color: rgb(255, 204, 0); - background-color: transparent; - text-decoration: none; -} - -body { - font-family: verdana, helvetica, arial, sans-serif; - font-size: 73%; /* Enables font size scaling in MSIE */ - margin: 0; - padding: 0; -} - -html>body { - font-size: 9pt; -} - -acronym,.titleTip { - border-bottom: 1px dotted rgb(61, 92, 122); - cursor: help; - margin: 0; - padding: 0 0 0.4px 0; -} - -a { - color: rgb(61, 92, 122); - background-color: transparent; - text-decoration: underline; - margin: 0; - padding: 0 1px 2px 1px; -} - -a:hover { - color: rgb(117, 144, 174); - text-decoration: none; -} - -ol { - margin: 1em 0 1.5em 0; - padding: 0; -} - -ul { - list-style-type: square; - margin: 1em 0 1.5em 0; - padding: 0; -} - -dl { - margin: 1em 0 0.5em 0; - padding: 0; -} - -ul li { - line-height: 1.5em; - margin: 1.25ex 0 0 1.5em; - padding: 0; -} - -ol li { - line-height: 1.5em; - margin: 1.25ex 0 0 2em; - padding: 0; -} - -dt { - font-weight: bold; - margin: 0; - padding: 0 0 1ex 0; -} - -dd { - line-height: 1.75em; - margin: 0 0 1.5em 1.5em; - padding: 0; -} - -.doNotDisplay { - display: none !important; -} - -.smallCaps { - font-size: 117%; - font-variant: small-caps; -} Copied: trunk/styles/default/css/common-screen.css (from rev 106, trunk/styles/default/common-screen.css) =================================================================== --- trunk/styles/default/css/common-screen.css (rev 0) +++ trunk/styles/default/css/common-screen.css 2007-06-04 12:11:09 UTC (rev 115) @@ -0,0 +1,159 @@ +/***************************************** + * TITLE: Common Screen Stylesheet * + * URI: styles/default/common-screen.css * + * MODIF: 2007-Jan-09 18:06 +0100 * + *****************************************/ +/*@CHARSET "UTF-8";*/ + +/* ##### Common Styles ##### */ +.headerLogin { + border: 1px solid rgb(255, 255, 255); + text-align: right; + padding: 1ex; + position: absolute; + right: 1.5em; + top: 3.5em; +} + +.headerLogin { + border: 1px solid rgb(255, 255, 255); + text-align: right; + margin: 0; + /* padding: 0 0 2ex 0;*/ + padding-bottom: 1ex; + position: absolute; + right: 1.5em; + top: 3.5em; + /* margin-left: 1em; + margin-right: 1em;*/ +} + +.headerLogin a { + color: white; + background-color: transparent; + text-decoration: none; + margin: 0; + padding: 0 0 0.5ex 0; + display: block; +} + +.headerLogin span { + +} + +#userinfo p { + color: white; + background-color: transparent; + margin: 0; + display: block; +} + +.headerLogin input:hover { /* color: rgb(195,196,210);*/ + color: black; + /* background-color: transparent;*/ + background-color: rgb(117, 144, 174); + text-decoration: underline; +} + +.subHeader { + color: white; + background-color: rgb(117, 144, 174); + margin: 0; + padding: 0.5ex 10px; +} + +.subHeader a,.subHeader .highlight { + color: white; + background-color: transparent; + font-size: 110%; + font-weight: bold; + text-decoration: none; + margin: 0; + padding: 0 0.25ex 0 0; +} + +.subHeader a:hover,.subHeader .highlight { + color: rgb(255, 204, 0); + background-color: transparent; + text-decoration: none; +} + +body { + font-family: verdana, helvetica, arial, sans-serif; + font-size: 73%; /* Enables font size scaling in MSIE */ + margin: 0; + padding: 0; +} + +html>body { + font-size: 9pt; +} + +acronym,.titleTip { + border-bottom: 1px dotted rgb(61, 92, 122); + cursor: help; + margin: 0; + padding: 0 0 0.4px 0; +} + +a { + color: rgb(61, 92, 122); + background-color: transparent; + text-decoration: underline; + margin: 0; + padding: 0 1px 2px 1px; +} + +a:hover { + color: rgb(117, 144, 174); + text-decoration: none; +} + +ol { + margin: 1em 0 1.5em 0; + padding: 0; +} + +ul { + list-style-type: square; + margin: 1em 0 1.5em 0; + padding: 0; +} + +dl { + margin: 1em 0 0.5em 0; + padding: 0; +} + +ul li { + line-height: 1.5em; + margin: 1.25ex 0 0 1.5em; + padding: 0; +} + +ol li { + line-height: 1.5em; + margin: 1.25ex 0 0 2em; + padding: 0; +} + +dt { + font-weight: bold; + margin: 0; + padding: 0 0 1ex 0; +} + +dd { + line-height: 1.75em; + margin: 0 0 1.5em 1.5em; + padding: 0; +} + +.doNotDisplay { + display: none !important; +} + +.smallCaps { + font-size: 117%; + font-variant: small-caps; +} Copied: trunk/styles/default/css/footer-screen.css (from rev 106, trunk/styles/default/footer-screen.css) =================================================================== --- trunk/styles/default/css/footer-screen.css (rev 0) +++ trunk/styles/default/css/footer-screen.css 2007-06-04 12:11:09 UTC (rev 115) @@ -0,0 +1,30 @@ +/***************************************** + * TITLE: Footer Screen Stylesheet * + * URI: styles/default/footer-screen.css * + * MODIF: 2007-Jan-09 18:06 +0100 * + *****************************************/ +/*@CHARSET "UTF-8";*/ + + +/* ##### Footer ##### */ + +#footer { + color: rgb(51,51,102); + background-color: rgb(239,239,239); + font-size: 87%; + text-align: center; + line-height: 1.25em; + margin: 2em 0 0 0; + padding: 1ex 10px; + clear: left; +} + +#footer a { + color: rgb(0,68,204); + background-color: transparent; + text-decoration: underline; +} + +#footer a:hover { + text-decoration: none; +} Copied: trunk/styles/default/css/header-screen.css (from rev 106, trunk/styles/default/header-screen.css) =================================================================== --- trunk/styles/default/css/header-screen.css (rev 0) +++ trunk/styles/default/css/header-screen.css 2007-06-04 12:11:09 UTC (rev 115) @@ -0,0 +1,90 @@ +/***************************************** + * TITLE: Header Screen Stylesheet * + * URI: styles/default/header-screen.css * + * MODIF: 2007-Jan-09 18:06 +0100 * + *****************************************/ +/*@CHARSET "UTF-8";*/ + +/* ##### Header ##### */ +.superHeader { + color: rgb(130, 128, 154); + background-color: rgb(33, 50, 66); + text-align: right; + margin: 0; + padding: 0.5ex 10px; +} + + +.superHeader span { + color: rgb(195, 196, 210); + background-color: transparent; + font-weight: bold; + text-transform: uppercase; +} + +.superHeader a { + color: rgb(195, 196, 210); + background-color: transparent; + text-decoration: none; + margin: 0; + padding: 0 0.25ex 0 0; +} + +.superHeader a:hover { + color: rgb(193, 102, 90); + background-color: transparent; + text-decoration: none; +} + +.midHeader { + color: white; + background-color: rgb(61, 92, 122); + margin: 0; + padding: 0.26ex 10px; +} + +.headerTitle { + font-size: 300%; + margin: 0; + padding: 0; +} + +.headerSubTitle { + font-size: 151%; + font-weight: normal; + font-style: italic; + margin: 0 0 1ex 0; + padding: 0; +} + +.headerLogin { + border: 1px solid rgb(255, 255, 255); + text-align: right; + padding: 1ex; + position: absolute; + right: 1.5em; + top: 3.5em; +} + +.subHeader { + color: white; + background-color: rgb(117, 144, 174); + margin: 0; + padding: 0.5ex 10px; +} + +.subHeader a,.subHeader .highlight { + color: white; + background-color: transparent; + font-size: 110%; + font-weight: bold; + text-decoration: none; + margin: 0; + padding: 0 0.25ex 0 0; +} + +.subHeader a:hover,.subHeader .highlight { + color: rgb(255, 204, 0); + background-color: transparent; + text-decoration: none; +} Copied: trunk/styles/default/css/main_copy-screen.css (from rev 106, trunk/styles/default/main_copy-screen.css) =================================================================== --- trunk/styles/default/css/main_copy-screen.css (rev 0) +++ trunk/styles/default/css/main_copy-screen.css 2007-06-04 12:11:09 UTC (rev 115) @@ -0,0 +1,52 @@ +/******************************************** + * TITLE: Main Copy Screen Stylesheet * + * URI: styles/default/main_copy-screen.css * + * MODIF: 2007-Jan-09 18:06 +0100 * + ********************************************/ +/*@CHARSET "UTF-8";*/ + +/* ##### Main Copy ##### */ + +#main-copy { + margin: 0; + padding: 0.5em 10px; + clear: left; +} + +#main-copy h1 { + color: rgb(117,144,174); + background-color: transparent; + font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; + font-size: 200%; + margin: 0; + padding: 0; +} + +#main-copy h2 { + color: rgb(61,92,122); + background-color: transparent; + font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; + font-weight: normal; + font-size: 151%; + margin: 0; + padding: 1ex 0 0 0; +} + +#main-copy p { + line-height: 1.75em; + margin: 1em 0 1.5em 0; + padding: 0; +} + +/* 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); + * } + */ Copied: trunk/styles/default/css/page_add_new_feed-screen.css (from rev 105, trunk/styles/default/page_add_new_feed-screen.css) =================================================================== --- trunk/styles/default/css/page_add_new_feed-screen.css (rev 0) +++ trunk/styles/default/css/page_add_new_feed-screen.css 2007-06-04 12:11:09 UTC (rev 115) @@ -0,0 +1,62 @@ +/****************************************************** + * TITLE: Add New Feed Screen Stylesheet * + * URI: styles/default/page_add_new_feed-screen.css * + * MODIF: 2006-Nov-16 18:06 +0100 * + ******************************************************/ + /* ##### Main Copy ##### */ +#add_form { /*margin: 1em 0;*/ + margin-top: 1em; + margin-left: 10%; + margin-right: 10%; + float: left; + border: 1px solid rgb(204, 204, 204); +} + +#formtitle { + text-align: center; + color: white; + background-color: rgb(117, 144, 174); + font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; + font-size: 200%; + margin: 0; + padding: 0.5ex 10px; + border-bottom: 1px solid rgb(204, 204, 204); +} + +table { + width: 100%; +} + +.required .formElem { + background-color: rgb(204, 204, 204); +} + +.required .formField { + background-color: rgb(204, 204, 204); +} + +.formElem,.formField { + padding-top: 0em; + padding-left: 1em; +} + +.formElem { + border-bottom: 1px solid rgb(204, 204, 204); + padding-top: 2%; + padding-left: 5%; +} + +.formField { + border-bottom: 1px solid rgb(204, 204, 204); + padding-top: 2%; + 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); +} \ No newline at end of file Copied: trunk/styles/default/css/page_add_tag-screen.css (from rev 105, trunk/styles/default/page_add_tag-screen.css) =================================================================== --- trunk/styles/default/css/page_add_tag-screen.css (rev 0) +++ trunk/styles/default/css/page_add_tag-screen.css 2007-06-04 12:11:09 UTC (rev 115) @@ -0,0 +1,48 @@ +/************************************************** + * TITLE: Add Tag Screen Stylesheet * + * URI: styles/default/page_login-screen.css * + * MODIF: 2006-Nov-16 18:06 +0100 * + **************************************************/ + + +/* ##### Main Copy ##### */ + +#formtitle { + text-align: center; + color: white; + background-color: rgb(117, 144, 174); + font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; + font-size: 180%; +/* margin: 0;*/ + padding: 0.5ex 10px; + border-bottom: 1px solid rgb(204, 204, 204); +} + +#addTags_form table { + width: 40%; + margin-left: 29%; + border: 1px solid rgb(204, 204, 204); +} + +.formElem { + width: 49%; + text-align: center; +} + +.formField { + +} + +#formButtons { + text-align: center; + background-color: rgb(117, 144, 174); + margin-top: 6em; + padding-top: 1.5%; + padding-bottom: 1.5%; + border-top: 1px solid rgb(204, 204, 204); +} + +.filler { + /* use with an empty <p> element to add padding to the end of a text box */ + border: 1px solid white; +} \ No newline at end of file Copied: trunk/styles/default/css/page_login-screen.css (from rev 105, trunk/styles/default/page_login-screen.css) =================================================================== --- trunk/styles/default/css/page_login-screen.css (rev 0) +++ trunk/styles/default/css/page_login-screen.css 2007-06-04 12:11:09 UTC (rev 115) @@ -0,0 +1,69 @@ +/************************************************** + * TITLE: Login Screen Stylesheet * + * URI: styles/default/page_login-screen.css * + * MODIF: 2006-Nov-16 18:06 +0100 * + **************************************************/ + + +/* ##### Main Copy ##### */ + +#registration_form table { + float: left; + border: 1px solid rgb(204, 204, 204); + width: 60%; + margin-top: 1em; + margin-left: 20%; + +} + +#formtitle { + text-align: center; + color: white; + background-color: rgb(117, 144, 174); + font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; + font-size: 200%; + padding: 0.5ex 10px; + border-bottom: 1px solid rgb(204, 204, 204); +} + +.formElem { + width: 49%; + text-align: center; + border-bottom: 1px solid rgb(117, 144, 174); +} + +.formField { + padding: 1%; + width: 49%; + border-left: 1px solid rgb(117, 144, 174); + border-bottom: 1px solid rgb(117, 144, 174); +} +.formField input { + margin-left: 2%; + background-color: yellow; +} + +#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; +} + +.quarter,.oneThird,.half,.twoThirds,.fullWidth { + margin: 1em 0; + float: left; + border-left: 1px solid rgb(204, 204, 204); +} \ No newline at end of file Copied: trunk/styles/default/css/page_main-screen.css (from rev 105, trunk/styles/default/page_main-screen.css) =================================================================== --- trunk/styles/default/css/page_main-screen.css (rev 0) +++ trunk/styles/default/css/page_main-screen.css 2007-06-04 12:11:09 UTC (rev 115) @@ -0,0 +1,120 @@ +/********************************************** + * TITLE: Main Page Print Stylesheet * + * URI : styles/default/page_main-screen.css * + * MODIF: 2006-Nov-11 23:09 +0100 * + **********************************************/ + + +/* ##### Main Copy ##### */ + +.newsHeading { + color: rgb(61, 92, 122); + background-color: transparent; + font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; + font-size: 145%; + text-decoration: none; + margin: 0; + padding: 1ex 0 0 0; + display: block; +} + +.newsHeading:hover { + color: rgb(117, 144, 174); + background-color: transparent; + text-decoration: underline; +} + +.newsDate { + font-style: italic; + margin: 0 !important; + padding: 0; +} + +.newsSummary { + margin: 1.5ex 0 2.5ex 0.75ex !important; + padding: 0; +} + +.more { + text-align: right; + margin: 0; + padding: 0.5em 0; +} + +.more a { + color: rgb(61, 92, 122); + background-color: transparent; + font-size: 92%; + text-decoration: underline; + margin: 0; + padding: 0.25ex 0.75ex; +} + +.more a:hover { + color: rgb(117, 144, 174); + text-decoration: none; +} + +.rowOfBoxes { + clear: both; +} + +.quarter,.oneThird,.half,.twoThirds,.fullWidth { + margin: 1em 0; + float: left; + border-left: 1px solid rgb(204, 204, 204); +} + +.quarter { + width: 21%; + padding: 0 1.9%; +} + +.oneThird { + width: 28%; + padding: 0 1.9%; +} + +.half { + text-align: justify; + width: 46%; + padding: 0 1.9%; +} + +.twoThirds { + text-align: justify; + width: 63%; + padding: 0 1.9%; +} + +.fullWidth { + text-align: justify; + width: 96%; + padding: 0 1.2em; + border-left: none; +} + +.filler { + /* use with an empty <p> element to add padding to the end of a text box */ + border: 1px solid white; +} +/* +.noBorderOnLeft { + border-left: none; +} + +.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 Copied: trunk/styles/default/css/page_personal-screen.css (from rev 105, trunk/styles/default/page_personal-screen.css) =================================================================== --- trunk/styles/default/css/page_personal-screen.css (rev 0) +++ trunk/styles/default/css/page_personal-screen.css 2007-06-04 12:11:09 UTC (rev 115) @@ -0,0 +1,119 @@ +/************************************************** + * TITLE: Personal Screen Stylesheet * + * URI: styles/default/page_show_feeds-screen.css * + * MODIF: 2006-Nov-16 18:06 +0100 * + **************************************************/ + + +/* ##### Main Copy ##### */ + +.column1,.column2,.column3 { + margin: 1em 0; + padding: 0 2.5%; + 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; + font-weight: bold; + font-size: 120%; + border-left: 1px solid; + border-right: 1px solid; + border-top: 1px solid; + border-color: rgb(61, 92, 122); + background-color: rgb(61, 92, 122); +} + +.column1 .feed_headline a { + color: white; +} + +.column1 ul { + margin-top: 0em; + border: 1px solid rgb(61, 92, 122); +} + +.column2 .feed_headline a { + color: white; +} + +.column2 ul { + border: 1px solid rgb(61, 92, 122); + margin-top: 0; +} + +.column3 .feed_headline a { + color: white; +} + +.column3 ul { + border: 1px solid rgb(61, 92, 122); + margin-top: 0; +} + +.rowOfBoxes { + clear: both; +} + +.quarter,.oneThird,.half,.twoThirds,.fullWidth { + margin: 1em 0; + float: left; + border-left: 1px solid rgb(204, 204, 204); +} + +.quarter { + width: 21%; + padding: 0 1.9%; +} + +.oneThird { + width: 28%; + padding: 0 1.9%; +} + +.half { + text-align: justify; + width: 46%; + padding: 0 1.9%; +} + +.twoThirds { + text-align: justify; + width: 63%; + padding: 0 1.9%; +} + +.fullWidth { + text-align: justify; + width: 96%; + padding: 0 1.2em; + border-left: none; +} + +.filler { + /* use with an empty <p> element to add padding to the end of a text box */ + border: 1px solid white; +} + +.noBorderOnLeft { + border-left: none; +} + +.dividingBorderAbove { + border-top: 1px solid rgb(204, 204, 204); +} \ No newline at end of file Copied: trunk/styles/default/css/page_register-screen.css (from rev 105, trunk/styles/default/page_register-screen.css) =================================================================== --- trunk/styles/default/css/page_register-screen.css (rev 0) +++ trunk/styles/default/css/page_register-screen.css 2007-06-04 12:11:09 UTC (rev 115) @@ -0,0 +1,78 @@ +/************************************************** + * TITLE: Register Screen Stylesheet * + * URI: styles/default/page_register-screen.css * + * MODIF: 2006-Nov-16 18:06 +0100 * + **************************************************/ + + +/* ##### Main Copy ##### */ + +#registration_form { + /*margin: 1em 0;*/ + margin-top: 1em; + margin-left: 10%; + margin-right: 10%; + float: left; + border: 1px solid rgb(204, 204, 204); +} + +#formtitle { + text-align: center; + color: white; + background-color: rgb(117, 144, 174); + font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; + font-size: 200%; + margin: 0; + padding: 0.5ex 10px; + border-bottom: 1px solid rgb(204, 204, 204); +} + +table { + width: 100%; +} + +.formElem,.formField { + padding-top: 0em; + padding-left: 1em; + +} + +.formElem { + border-bottom: 1px solid rgb(204, 204, 204); + padding-top: 2%; + padding-left: 5%; +} + +.formField { + border-bottom: 1px solid rgb(204, 204, 204); + padding-top: 2%; + 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 Copied: trunk/styles/default/css/page_show_all_feeds-screen.css (from rev 105, trunk/styles/default/page_show_all_feeds-screen.css) =================================================================== --- trunk/styles/default/css/page_show_all_feeds-screen.css (rev 0) +++ trunk/styles/default/css/page_show_all_feeds-screen.css 2007-06-04 12:11:09 UTC (rev 115) @@ -0,0 +1,28 @@ +/******************************************************** + * TITLE: Show All Feeds Screen Stylesheet * + * URI : styles/default/page_show_all_feeds-screen.css * + * MODIF: 2006-Dez-01 17:24 +0100 * + ********************************************************/ + + +/* ##### Main Copy ##### */ + +table { + width: 100%; +} + +th { + text-align: left; + border-left: 1px solid rgb(204, 204, 204); + border-top: 1px solid rgb(204, 204, 204); + border-bottom: 1px solid rgb(204, 204, 204); +} + +td { + border-bottom: 1px solid rgb(204, 204, 204); + border-left: 1px solid rgb(204, 204, 204); +} + +.checked { + background-color: yellow; +} \ No newline at end of file Copied: trunk/styles/default/css/page_show_feed-screen.css (from rev 105, trunk/styles/default/page_show_feed-screen.css) =================================================================== --- trunk/styles/default/css/page_show_feed-screen.css (rev 0) +++ trunk/styles/default/css/page_show_feed-screen.css 2007-06-04 12:11:09 UTC (rev 115) @@ -0,0 +1,57 @@ +/************************************************** + * TITLE: Show Feeds Screen Stylesheet * + * URI: styles/default/page_show_feeds-screen.css * + * MODIF: 2006-Nov-16 18:06 +0100 * + **************************************************/ + +/* ##### Right Side Bar ##### */ + +.rightSideBar { + width: 13em; + margin: 2ex 0.75ex 0 0; + padding: 0; + float: right; + clear: right; + border: 1px solid rgb(216,210,195); +} + +[class~="rightSideBar"] { + margin-right: 1.5ex; +} + +.rightSideBar .sideBarTitle { + color: black; + background-color: rgb(230,223,207); + font-weight: bold; + margin: 1.25ex 1ex; + padding: 0.9ex 1ex; +} + +.rightSideBar a { + color: rgb(166,140,83); + background-color: transparent; + text-decoration: underline; + font-weight: bold; +} + +.rightSideBar a:hover { + text-decoration: none; +} + +.rightSideBar .sideBarText { + line-height: 1.5em; + margin: 0; + padding: 0 2ex 1em 2ex; +} + +.rightSideBar .more { + text-decoration: none; + text-align: right; + margin: 0; + padding: 0 2ex 1em 2ex; + display: block; +} + +.rightSideBar .more:hover { + text-decoration: underline; +} \ No newline at end of file Copied: trunk/styles/default/css/page_show_feed_tag-screen.css (from rev 105, trunk/styles/default/page_show_feed_tag-screen.css) =================================================================== --- trunk/styles/default/css/page_show_feed_tag-screen.css (rev 0) +++ trunk/styles/default/css/page_show_feed_tag-screen.css 2007-06-04 12:11:09 UTC (rev 115) @@ -0,0 +1,88 @@ +/***************************************************** + * TITLE: Show Feed Tag Screen Stylesheet * + * URI: styles/default/page_show_feed_tag-screen.css * + * MODIF: 2006-Nov-16 18:06 +0100 * + *****************************************************/ + + +/* ##### Right Side Bar ##### */ + +.rightSideBar { + width: 13em; + margin: 1.2ex 0.75ex 0 0; + padding: 0; + float: right; + clear: right; + border: 1px solid rgb(216,210,195); +} + +[class~="rightSideBar"] { + margin-right: 1.5ex; +} + +.rightSideBar .sideBarTitle { + color: black; + background-color: rgb(230,223,207); + font-weight: bold; + margin: 1.25ex 1ex; + padding: 0.9ex 1ex; +} + +.rightSideBar a { + color: rgb(166,140,83); + background-color: transparent; + text-decoration: underline; + font-weight: bold; +} + +.rightSideBar a:hover { + text-decoration: none; +} + +.rightSideBar .sideBarText { + line-height: 1.5em; + margin: 0; + padding: 0 2ex 1em 2ex; +} + +.rightSideBar .more { + text-decoration: none; + text-align: right; + margin: 0; + padding: 0 2ex 1em 2ex; + display: block; +} + +.rightSideBar .more:hover { + text-decoration: underline; +} + +/* ##### Main Copy ##### */ + +p .space { + margin-top: 4em; +} + +.tagname { + border: 1px solid grey; +} + +table { + width: 85%; +} + +th { + text-align: left; + border-left: 1px solid rgb(204, 204, 204); + border-top: 1px solid rgb(204, 204, 204); + border-bottom: 1px solid rgb(204, 204, 204); +} + +td { + border-bottom: 1px solid rgb(204, 204, 204); + border-left: 1px solid rgb(204, 204, 204); +} + +.right_side,.language_flag { + border-right: 1px solid rgb(204, 204, 204); +} \ No newline at end of file Deleted: trunk/styles/default/footer-screen.css =================================================================== --- trunk/styles/default/footer-screen.css 2007-06-04 11:56:11 UTC (rev 114) +++ trunk/styles/default/footer-screen.css 2007-06-04 12:11:09 UTC (rev 115) @@ -1,30 +0,0 @@ -/***************************************** - * TITLE: Footer Screen Stylesheet * - * URI: styles/default/footer-screen.css * - * MODIF: 2007-Jan-09 18:06 +0100 * - *****************************************/ -/*@CHARSET "UTF-8";*/ - - -/* ##### Footer ##### */ - -#footer { - color: rgb(51,51,102); - background-color: rgb(239,239,239); - font-size: 87%; - text-align: center; - line-height: 1.25em; - margin: 2em 0 0 0; - padding: 1ex 10px; - clear: left; -} - -#footer a { - color: rgb(0,68,204); - background-color: transparent; - text-decoration: underline; -} - -#footer a:hover { - text-decoration: none; -} Added: trunk/styles/default/footer.tpl =================================================================== --- trunk/styles/default/footer.tpl (rev 0) +++ trunk/styles/default/footer.tpl 2007-06-04 12:11:09 UTC (rev 115) @@ -0,0 +1,7 @@ + <!-- ##### Footer ##### --> + + <div id="footer"> +{$footer} + </div> + </body> +</html> Property changes on: trunk/styles/default/footer.tpl ___________________________________________________________________ Name: svn:executable + * Deleted: trunk/styles/default/header-screen.css =================================================================== --- trunk/styles/default/header-screen.css 2007-06-04 11:56:11 UTC (rev 114) +++ trunk/styles/default/header-screen.css 2007-06-04 12:11:09 UTC (rev 115) @@ -1,90 +0,0 @@ -/***************************************** - * TITLE: Header Screen Stylesheet * - * URI: styles/default/header-screen.css * - * MODIF: 2007-Jan-09 18:06 +0100 * - *****************************************/ -/*@CHARSET "UTF-8";*/ - -/* ##### Header ##### */ -.superHeader { - color: rgb(130, 128, 154); - background-color: rgb(33, 50, 66); - text-align: right; - margin: 0; - padding: 0.5ex 10px; -} - - -.superHeader span { - color: rgb(195, 196, 210); - background-color: transparent; - font-weight: bold; - text-transform: uppercase; -} - -.superHeader a { - color: rgb(195, 196, 210); - background-color: transparent; - text-decoration: none; - margin: 0; - padding: 0 0.25ex 0 0; -} - -.superHeader a:hover { - color: rgb(193, 102, 90); - background-color: transparent; - text-decoration: none; -} - -.midHeader { - color: white; - background-color: rgb(61, 92, 122); - margin: 0; - padding: 0.26ex 10px; -} - -.headerTitle { - font-size: 300%; - margin: 0; - padding: 0; -} - -.headerSubTitle { - font-size: 151%; - font-weight: normal; - font-style: italic; - margin: 0 0 1ex 0; - padding: 0; -} - -.headerLogin { - border: 1px solid rgb(255, 255, 255); - text-align: right; - padding: 1ex; - position: absolute; - right: 1.5em; - top: 3.5em; -} - -.subHeader { - color: white; - background-color: rgb(117, 144, 174); - margin: 0; - padding: 0.5ex 10px; -} - -.subHeader a,.subHeader .highlight { - color: white; - background-color: transparent; - font-size: 110%; - font-weight: bold; - text-decoration: none; - margin: 0; - padding: 0 0.25ex 0 0; -} - -.subHeader a:hover,.subHeader .highlight { - color: rgb(255, 204, 0); - background-color: transparent; - text-decoration: none; -} Added: trunk/styles/default/header.tpl =================================================================== --- trunk/styles/default/header.tpl (rev 0) +++ trunk/styles/default/header.tpl 2007-06-04 12:11:09 UTC (rev 115) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" + "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" > + <head> + <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8" /> + <meta name="author" content="haran" /> + <meta name="generator" content="haran" /> + + <link rel="stylesheet" type="text/css" href="./styles/default/css/page_main-screen.css" media="screen, tv, projection" title="Default" /> + <link rel="stylesheet" type="text/css" href="./styles/default/css/common-screen.css" media="screen, tv, projection" title="Default" /> + <link rel="stylesheet" type="text/css" href="./styles/default/css/header-screen.css" media="screen, tv, projection" title="Default" /> + <link rel="stylesheet" type="text/css" href="./styles/default/css/main_copy-screen.css" media="screen, tv, projection" title="Default" /> + <link rel="stylesheet" type="text/css" href="./styles/default/css/footer-screen.css" media="screen, tv, projection" title="Default" /> + + <title>{$title}</title> + </head> Property changes on: trunk/styles/default/header.tpl ___________________________________________________________________ Name: svn:executable + * Deleted: trunk/styles/default/main_copy-screen.css =================================================================== --- trunk/styles/default/main_copy-screen.css 2007-06-04 11:56:11 UTC (rev 114) +++ trunk/styles/default/main_copy-screen.css 2007-06-04 12:11:09 UTC (rev 115) @@ -1,52 +0,0 @@ -/******************************************** - * TITLE: Main Copy Screen Stylesheet * - * URI: styles/default/main_copy-screen.css * - * MODIF: 2007-Jan-09 18:06 +0100 * - ********************************************/ -/*@CHARSET "UTF-8";*/ - -/* ##### Main Copy ##### */ - -#main-copy { - margin: 0; - padding: 0.5em 10px; - clear: left; -} - -#main-copy h1 { - color: rgb(117,144,174); - background-color: transparent; - font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; - font-size: 200%; - margin: 0; - padding: 0; -} - -#main-copy h2 { - color: rgb(61,92,122); - background-color: transparent; - font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; - font-weight: normal; - font-size: 151%; - margin: 0; - padding: 1ex 0 0 0; -} - -#main-copy p { - line-height: 1.75em; - margin: 1em 0 1.5em 0; - padding: 0; -} - -/* 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); - * } - */ Deleted: trunk/styles/default/page_add_new_feed-screen.css =================================================================== --- trunk/styles/default/page_add_new_feed-screen.css 2007-06-04 11:56:11 UTC (rev 114) +++ trunk/styles/default/page_add_new_feed-screen.css 2007-06-04 12:11:09 UTC (rev 115) @@ -1,62 +0,0 @@ -/****************************************************** - * TITLE: Add New Feed Screen Stylesheet * - * URI: styles/default/page_add_new_feed-screen.css * - * MODIF: 2006-Nov-16 18:06 +0100 * - ******************************************************/ - /* ##### Main Copy ##### */ -#add_form { /*margin: 1em 0;*/ - margin-top: 1em; - margin-left: 10%; - margin-right: 10%; - float: left; - border: 1px solid rgb(204, 204, 204); -} - -#formtitle { - text-align: center; - color: white; - background-color: rgb(117, 144, 174); - font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; - font-size: 200%; - margin: 0; - padding: 0.5ex 10px; - border-bottom: 1px solid rgb(204, 204, 204); -} - -table { - width: 100%; -} - -.required .formElem { - background-color: rgb(204, 204, 204); -} - -.required .formField { - background-color: rgb(204, 204, 204); -} - -.formElem,.formField { - padding-top: 0em; - padding-left: 1em; -} - -.formElem { - border-bottom: 1px solid rgb(204, 204, 204); - padding-top: 2%; - padding-left: 5%; -} - -.formField { - border-bottom: 1px solid rgb(204, 204, 204); - padding-top: 2%; - 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); -} \ No newline at end of file Modified: trunk/styles/default/page_add_new_feed.tpl =================================================================== --- trunk/styles/default/page_add_new_feed.tpl 2007-06-04 11:56:11 UTC (rev 114) +++ trunk/styles/default/page_add_new_feed.tpl 2007-06-04 12:11:09 UTC (rev 115) @@ -1,21 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" - "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" > - <head> - <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8" /> - <meta name="author" content="haran" /> - <meta name="generator" content="haran" /> - - <link rel="stylesheet" type="text/css" href="./styles/default/page_add_new_feed-screen.css" media="screen, tv, projection" title="Default" /> - <link rel="stylesheet" type="text/css" href="./styles/default/common-screen.css" media="screen, tv, projection" title="Default" /> - <link rel="stylesheet" type="text/css" href="./styles/default/header-screen.css" media="screen, tv, projection" title="Default" /> - <link rel="stylesheet" type="text/css" href="./styles/default/main_copy-screen.css" media="screen, tv, projection" title="Default" /> - <link rel="stylesheet" type="text/css" href="./styles/default/footer-screen.css" media="screen, tv, projection" title="Default" /> - - <title><!-- title --></title> - </head> - <body> <!-- For non-visual user agents: --> <div id="top"><a href="#main-copy" class="doNotDisplay doNotPrint">Skip to main content.</a></div> @@ -47,11 +29,3 @@ <div id="main-copy"> <!-- main --> </div> - - <!-- ##### Footer ##### --> - - <div id="footer"> -<!-- footer --> - </div> - </body> -</html> Deleted: trunk/styles/default/page_add_tag-screen.css =================================================================== --- trunk/styles/default/page_add_tag-screen.css 2007-06-04 11:56:11 UTC (rev 114) +++ trunk/styles/default/page_add_tag-screen.css 2007-06-04 12:11:09 UTC (rev 115) @@ -1,48 +0,0 @@ -/************************************************** - * TITLE: Add Tag Screen Stylesheet * - * URI: styles/default/page_login-screen.css * - * MODIF: 2006-Nov-16 18:06 +0100 * - **************************************************/ - - -/* ##### Main Copy ##### */ - -#formtitle { - text-align: center; - color: white; - background-color: rgb(117, 144, 174); - font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; - font-size: 180%; -/* margin: 0;*/ - padding: 0.5ex 10px; - border-bottom: 1px solid rgb(204, 204, 204); -} - -#addTags_form table { - width: 40%; - margin-left: 29%; - border: 1px solid rgb(204, 204, 204); -} - -.formElem { - width: 49%; - text-align: center; -} - -.formField { - -} - -#formButtons { - text-align: center; - background-color: rgb(117, 144, 174); - margin-top: 6em; - padding-top: 1.5%; - padding-bottom: 1.5%; - border-top: 1px solid rgb(204, 204, 204); -} - -.filler { - /* use with an empty <p> element to add padding to the end of a text box */ - border: 1px solid white; -} \ No newline at end of file Modified: trunk/styles/default/page_add_tag.tpl =================================================================== --- trunk/styles/default/page_add_tag.tpl 2007-06-04 11:56:11 UTC (rev 114) +++ trunk/styles/default/page_add_tag.tpl 2007-06-04 12:11:09 UTC (rev 115) @@ -1,21 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" - "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" > - <head> - <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8" /> - <meta name="author" content="haran" /> - <meta name="generator" content="haran" /> - - <link rel="stylesheet" type="text/css" href="./styles/default/page_add_tag-screen.css" media="screen, tv, projection" title="Default" /> - <link rel="stylesheet" type="text/css" href="./styles/default/common-screen.css" media="screen, tv, projection" title="Default" /> - <link rel="stylesheet" type="text/css" href="./styles/default/header-screen.css" media="screen, tv, projection" title="Default" /> - <link rel="stylesheet" type="text/css" href="./styles/default/main_copy-screen.css" media="screen, tv, projection" title="Default" /> - <link rel="stylesheet" type="text/css" href="./styles/default/footer-screen.css" media="screen, tv, projection" title="Default" /> - - <title><!-- title --></title> - </head> - <body> <!-- For non-visual user agents: --> <div id="top"><a href="#main-copy" class="doNotDisplay doNotPrint">Skip to main content.</a></div> @@ -47,11 +29,3 @@ <div id="main-copy"> <!-- main --> </div> - - <!-- ##### Footer ##### --> - - <div id="footer"> -<!-- footer --> - </div> - </body> -</html> Deleted: trunk/styles/default/page_login-screen.css =================================================================== --- trunk/styles/default/page_login-screen.css 2007-06-04 11:56:11 UTC (rev 114) +++ trunk/styles/default/page_login-screen.css 2007-06-04 12:11:09 UTC (rev 115) @@ -1,69 +0,0 @@ -/************************************************** - * TITLE: Login Screen Stylesheet * - * URI: styles/default/page_login-screen.css * - * MODIF: 2006-Nov-16 18:06 +0100 * - **************************************************/ - - -/* ##### Main Copy ##### */ - -#registration_form table { - float: left; - border: 1px solid rgb(204, 204, 204); - width: 60%; - margin-top: 1em; - margin-left: 20%; - -} - -#formtitle { - text-align: center; - color: white; - background-color: rgb(117, 144, 174); - font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; - font-size: 200%; - padding: 0.5ex 10px; - border-bottom: 1px solid rgb(204, 204, 204); -} - -.formElem { - width: 49%; - text-align: center; - border-bottom: 1px solid rgb(117, 144, 174); -} - -.formField { - padding: 1%; - width: 49%; - border-left: 1px solid rgb(117, 144, 174); - border-bottom: 1px solid rgb(117, 144, 174); -} -.formField input { - margin-left: 2%; - background-color: yellow; -} - -#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; -} - -.quarter,.oneThird,.half,.twoThirds,.fullWidth { - margin: 1em 0; - float: left; - border-left: 1px solid rgb(204, 204, 204); -} \ No newline at end of file Modified: trunk/styles/default/page_login.tpl =================================================================== --- trunk/styles/default/page_login.tpl 2007-06-04 11:56:11 UTC (rev 114) +++ trunk/styles/default/page_login.tpl 2007-06-04 12:11:09 UTC (rev 115) @@ -1,21 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" - "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" > - <head> - <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8" /> - <meta name="author" content="haran" /> - <meta name="generator" content="haran" /> - - <link rel="stylesheet" type="text/css" href="./styles/default/page_login-screen.css" media="screen, tv, projection" title="Default" /> - <link rel="stylesheet" type="text/css" href="./styles/default/common-screen.css" media="screen, tv, projection" title="Default" /> - <link rel="stylesheet" type="text/css" href="./styles/default/header-screen.css" media="screen, tv, projection" title="Default" /> - <link rel="stylesheet" type="text/css" href="./styles/default/main_copy-screen.css" media="screen, tv, projection" title="Default" /> - <link rel="stylesheet" type="text/css" href="./styles/default/footer-screen.css" media="screen, tv, projection" title="Default" /> - - <title><!-- title --></title> - </head> - <body> <!-- For non-visual user agents: --> <div id="top"><a href="#main-copy" class="doNotDisplay doNotPrint">Skip to main content.</a></div> @@ -47,11 +29,3 @@ <div id="main-copy"> <!-- main --> </div> - - <!-- ##### Footer ##### --> - - <div id="footer"> -<!-- footer --> - </div> - </body> -</html> Deleted: trunk/styles/default/page_main-screen.css =================================================================== --- trunk/styles/default/page_main-screen.css 2007-06-04 11:56:11 UTC (rev 114) +++ trunk/styles/default/page_main-screen.css 2007-06-04 12:11:09 UTC (rev 115) @@ -1,120 +0,0 @@ -/********************************************** - * TITLE: Main Page Print Stylesheet * - * URI : styles/default/page_main-screen.css * - * MODIF: 2006-Nov-11 23:09 +0100 * - **********************************************/ - - -/* ##### Main Copy ##### */ - -.newsHeading { - color: rgb(61, 92, 122); - background-color: transparent; - font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; - font-size: 145%; - text-decoration: none; - margin: 0; - padding: 1ex 0 0 0; - display: block; -} - -.newsHeading:hover { - color: rgb(117, 144, 174); - background-color: transparent; - text-decoration: underline; -} - -.newsDate { - font-style: italic; - margin: 0 !important; - padding: 0; -} - -.newsSummary { - margin: 1.5ex 0 2.5ex 0.75ex !important; - padding: 0; -} - -.more { - text-align: right; - margin: 0; - padding: 0.5em 0; -} - -.more a { - color: rgb(61, 92, 122); - background-color: transparent; - font-size: 92%; - text-decoration: underline; - margin: 0; - padding: 0.25ex 0.75ex; -} - -.more a:hover { - color: rgb(117, 144, 174); - text-decoration: none; -} - -.rowOfBoxes { - clear: both; -} - -.quarter,.oneThird,.half,.twoThirds,.fullWidth { - margin: 1em 0; - float: left; - border-left: 1px solid rgb(204, 204, 204); -} - -.quarter { - width: 21%; - padding: 0 1.9%; -} - -.oneThird { - width: 28%; - padding: 0 1.9%; -} - -.half { - text-align: justify; - width: 46%; - padding: 0 1.9%; -} - -.twoThirds { - text-align: justify; - width: 63%; - padding: 0 1.9%; -} - -.fullWidth { - text-align: justify; - width: 96%; - padding: 0 1.2em; - border-left: none; -} - -.filler { - /* use with an empty <p> element to add padding to the end of a text box */ - border: 1px solid white; -} -/* -.noBorderOnLeft { - border-left: none; -} - -.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 Modified: trunk/styles/default/page_main.tpl =================================================================== --- trunk/styles/default/page_main.tpl 2007-06-04 11:56:11 UTC (rev 114) +++ trunk/styles/default/page_main.tpl 2007-06-04 12:11:09 UTC (rev 115) @@ -1,21 +1,3 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" - "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" > - <head> - <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8" /> - <meta name="author" content="haran" /> - <meta name="generator" content="haran" /> - - <link rel="stylesheet" type="text/css" href="./styles/default/page_main-screen.css" media="screen, tv, projection" title="Default" /> - <link rel="stylesheet" type="text/css" href="./styles/default/common-screen.css" media="screen, tv, projection" title="Default" /> - <link rel="stylesheet" type="text/css" href="./styles/default/header-screen.css" media="screen, tv, projection" title="Default" /> - <link rel="stylesheet" type="text/css" href="./styles/default/main_copy-screen.css" media="screen, tv, projection" title="Default" /> - <link rel="stylesheet" type="text/css" href="./styles/default/footer-screen.css" media="screen, tv, projection" title="Default" /> - - <title><!-- title --></title> - </head> - <body> <!-- For non-visual user agents: --> <div id="top"><a href="#main-copy" class="doNotDisplay doNotPrint">Skip to main content.</a></div> @@ -74,11 +56,3 @@ </div> </div> </div> - - <!-- ##### Footer ##### --> - - <div id="footer"> -<!-- footer --> - </div> - </body> -</html> Deleted: trunk/styles/default/page_personal-screen.css =================================================================== --- trunk/styles/default/page_personal-screen.css 2007-06-04 11:56:11 UTC (rev 114) +++ trunk/styles/default/page_personal-screen.css 2007-06-04 12:11:09 UTC (rev 115) @@ -1,119 +0,0 @@ -/************************************************** - * TITLE: Personal Screen Stylesheet * - * URI: styles/default/page_show_feeds-screen.css * - * MODIF: 2006-Nov-16 18:06 +0100 * - **************************************************/ - - -/* ##### Main Copy ##### */ - -.column1,.column2,.column3 { - margin: 1em 0; - padding: 0 2.5%; - 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; - font-weight: bold; - font-size: 120%; - border-left: 1px solid; - border-right: 1px solid; - border-top: 1px solid; - border-color: rgb(61, 92, 122); - background-color: rgb(61, 92, 122); -} - -.column1 .feed_headline a { - color: white; -} - -.column1 ul { - margin-top: 0em; - border: 1px solid rgb(61, 92, 122); -} - -.column2 .feed_headline a { - color: white; -} - -.column2 ul { - border: 1px solid rgb(61, 92, 122); - margin-top: 0; -} - -.column3 .feed_headline a { - color: white; -} - -.column3 ul { - border: 1px solid rgb(61, 92, 122); - margin-top: 0; -} - -.rowOfBoxes { - clear: both; -} - -.quarter,.oneThird,.half,.twoThirds,.fullWidth { - margin: 1em 0; - float: left; - border-left: 1px solid rgb(204, 204, 204); -} - -.quarter { - width: 21%; - padding: 0 1.9%; -} - -.oneThird { - width: 28%; - padding: 0 1.9%; -} - -.half { - text-align: justify; - width: 46%; - padding: 0 1.9%; -} - -.twoThirds { - text-align: justify; - width: 63%; - padding: 0 1.9%; -} - -.fullWidth { - text-align: justify; - width: 96%; - padding: 0 1.2em; - border-left: none; -} - -.filler { - /* use with an empty <p> element to add padding to the end of a text box */ - border: 1px solid white; -} - -.noBorderOnLeft { - border-left: none; -} - -.dividingBorderAbove { - border-top: 1px solid rgb(204, 204, 204); -} \ No newline at end of file Deleted: trunk/styles/default/page_register-screen.css =================================================================== --- trunk/styles/default/page_register-screen.css 2007-06-04 11:56:11 UTC (rev 114) +++ trunk/styles/default/page_register-screen.css 2007-06-04 12:11:09 UTC (rev 115) @@ -1,78 +0,0 @@ -/************************************************** - * TITLE: Register Screen Stylesheet * - * URI: styles/default/page_register-screen.css * - * MODIF: 2006-Nov-16 18:06 +0100 * - **************************************************/ - - -/* ##### Main Copy ##### */ - -#registration_form { - /*margin: 1em 0;*/ - margin-top: 1em; - margin-left: 10%; - margin-right: 10%; - float: left; - border: 1px solid rgb(204, 204, 204); -} - -#formtitle { - text-align: center; - color: white; - background-color: rgb(117, 144, 174); - font-family: "trebuchet ms", verdana, helvetica, arial, sans-serif; - font-size: 200%; - margin: 0; - padding: 0.5ex 10px; - border-bottom: 1px solid rgb(204, 204, 204); -} - -table { - width: 100%; -} - -.formElem,.formField { - padding-top: 0em; - padding-left: 1em; - -} - -.formElem { - border-bottom: 1px solid rgb(204, 204, 204); - padding-top: 2%; - padding-left: 5%; -} - -.formField { - border-bottom: 1px solid rgb(204, 204, 204); - padding-top: 2%; - 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 Deleted: trunk/styles/default/page_show_all_feeds-screen.css =================================================================== --- trunk/styles/default/page_show_all_feeds-screen.css 2007-06-04 11:56:11 UTC (rev 114) +++ trunk/styles/default/page_show_all_feeds-screen.css 2007-06-04 12:11:09 UTC (rev 115) @@ -1,28 +0,0 @@ -/******************************************************** - * TITLE: Show All Feeds Screen Stylesheet * - * URI : styles/default/page_show_all_feeds-screen.css * - * MODIF: 2006-Dez-01 17:24 +0100 * - ********************************************************/ - - -/* ##### Main Copy ##### */ - -table { - width: 100%; -} - -th { - text-align: left; - border-left: 1px solid rgb(204, 204, 204); - border-top: 1px solid rgb(204, 204, 204); - border-bottom: 1px solid rgb(204, 204, 204); -} - -td { - border-bottom: 1px solid rgb(204, 204, 204); - border-left: 1px solid rgb(204, 204, 204); -} - -.checked { - background-color: yellow; -} \ No newline at end of file Deleted: trunk/styles/default/page_show_feed-screen.css =================================================================== --- trunk/styles/default/page_show_feed-screen.css 2007-06-04 11:56:11 UTC (rev 114) +++ trunk/styles/default/page_show_feed-screen.css 2007-06-04 12:11:09 UTC (rev 115) @@ -1,57 +0,0 @@ -/************************************************** - * TITLE: Show Feeds Screen Stylesheet * - * URI: styles/default/page_show_feeds-screen.css * - * MODIF: 2006-Nov-16 18:06 +0100 * - **************************************************/ - -/* ##### Right Side Bar ##### */ - -.rightSideBar { - width: 13em; - margin: 2ex 0.75ex 0 0; - padding: 0; - float: right; - clear: right; - border: 1px solid rgb(216,210,195); -} - -[class~="rightSideBar"] { - margin-right: 1.5ex; -} - -.rightSideBar .sideBarTitle { - color: black; - background-color: rgb(230,223,207); - font-weight: bold; - margin: 1.25ex 1ex; - padding: 0.9ex 1ex; -} - -.rightSideBar a { - color: rgb(166,140,83); - background-color: transparent; - text-decoration: underline; - font-weight: bold; -} - -.rightSideBar a:hover { - text-decoration: none; -} - -.rightSideBar .sideBarText { - line-height: 1.5em; - margin: 0; - padding: 0 2ex 1em 2ex; -} - -.rightSideBar .more { - text-decoration: none; - text-align: right; - margin: 0; - padding: 0 2ex 1em 2ex; - display: block; -} - -.rightSideBar .more:hover { - text-decoration: underline; -} \ No newline at end of file Deleted: trunk/styles/default/page_show_feed_tag-screen.css =================================================================== --- trunk/styles/default/page_show_feed_tag-screen.css 2007-06-04 11:56:11 UTC (rev 114) +++ trunk/styles/default/page_show_feed_tag-screen.css 2007-06-04 12:11:09 UTC (rev 115) @@ -1,88 +0,0 @@ -/***************************************************** - * TITLE: Show Feed Tag Screen Stylesheet * - * URI: styles/default/page_show_feed_tag-screen.css * - * MODIF: 2006-Nov-16 18:06 +0100 * - *****************************************************/ - - -/* ##### Right Side Bar ##### */ - -.rightSideBar { - width: 13em; - margin: 1.2ex 0.75ex 0 0; - padding: 0; - float: right; - clear: right; - border: 1px solid rgb(216,210,195); -} - -[class~="rightSideBar"] { - margin-right: 1.5ex; -} - -.rightSideBar .sideBarTitle { - color: black; - background-color: rgb(230,223,207); - font-weight: bold; - margin: 1.25ex 1ex; - padding: 0.9ex 1ex; -} - -.rightSideBar a { - color: rgb(166,140,83); - background-color: transparent; - text-decoration: underline; - font-weight: bold; -} - -.rightSideBar a:hover { - text-decoration: none; -} - -.rightSideBar .sideBarText { - line-height: 1.5em; - margin: 0; - padding: 0 2ex 1em 2ex; -} - -.rightSideBar .more { - text-decoration: none; - text-align: right; - margin: 0; - padding: 0 2ex 1em 2ex; - display: block; -} - -.rightSideBar .more:hover { - text-decoration: underline; -} - -/* ##### Main Copy ##### */ - -p .space { - margin-top: 4em; -} - -.tagname { - border: 1px solid grey; -} - -table { - width: 85%; -} - -th { - text-align: left; - border-left: 1px solid rgb(204, 204, 204); - border-top: 1px solid rgb(204, 204, 204); - border-bottom: 1px solid rgb(204, 204, 204); -} - -td { - border-bottom: 1px solid rgb(204, 204, 204); - border-left: 1px solid rgb(204, 204, 204); -} - -.right_side,.language_flag { - border-right: 1px solid rgb(204, 204, 204); -} \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <C1...@us...> - 2007-06-04 11:56:09
|
Revision: 114 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=114&view=rev Author: C167 Date: 2007-06-04 04:56:11 -0700 (Mon, 04 Jun 2007) Log Message: ----------- removed smarty-dir, smarty stuff resides under /usr/share/php/smarty... Modified Paths: -------------- trunk/inc/config.php Removed Paths: ------------- trunk/smarty/ Modified: trunk/inc/config.php =================================================================== --- trunk/inc/config.php 2007-06-04 09:41:54 UTC (rev 113) +++ trunk/inc/config.php 2007-06-04 11:56:11 UTC (rev 114) @@ -1,5 +1,5 @@ <?php - +// vim: set expandtab tabstop=4 shiftwidth=4 fdm=marker softtabstop=4: /* * This is the main configuration-file * It will store the basic information @@ -31,6 +31,9 @@ $update['difference'] = 1800; $update['loglevel'] = PEAR_LOG_NOTICE; +// Smarty settings +$smarty['folder'] = "smarty/libs"; + // Valid pages $validPages = array ( "page_add_new_feed.php", @@ -68,4 +71,4 @@ 'table' => $session['container']['tablename'], 'autooptimize' => $session['container']['autooptimize'] ); -?> \ No newline at end of file +?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <C1...@us...> - 2007-06-04 09:42:06
|
Revision: 113 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=113&view=rev Author: C167 Date: 2007-06-04 02:41:54 -0700 (Mon, 04 Jun 2007) Log Message: ----------- added smarty-folder Added Paths: ----------- trunk/smarty/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <C1...@us...> - 2007-05-20 11:42:49
|
Revision: 112 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=112&view=rev Author: C167 Date: 2007-05-20 04:42:45 -0700 (Sun, 20 May 2007) Log Message: ----------- added default-entrys to login-fields and changed the style-detection Modified Paths: -------------- trunk/inc/styles.php trunk/page_login.php Modified: trunk/inc/styles.php =================================================================== --- trunk/inc/styles.php 2007-05-20 10:42:07 UTC (rev 111) +++ trunk/inc/styles.php 2007-05-20 11:42:45 UTC (rev 112) @@ -1,14 +1,14 @@ <?php if(!empty($_GET['style'])) { $style_prop = $_GET['style']; -} elseif(!empty(HTTP_Session :: get('style'))) { +} elseif(!is_null(HTTP_Session :: get('style', null))) { $style_prop = HTTP_Session :: get('style'); } elseif(!empty($_POST['style'])) { $style_prop = $_POST['style']; } else { $style_prop = "default"; } -if(true === is_valid_design($style_prop])) { +if(true === is_valid_design($style_prop)) { $style= $style_prop; } else { $style = "default"; Modified: trunk/page_login.php =================================================================== --- trunk/page_login.php 2007-05-20 10:42:07 UTC (rev 111) +++ trunk/page_login.php 2007-05-20 11:42:45 UTC (rev 112) @@ -149,11 +149,11 @@ " </tr>\n" . " <tr>\n" . " <td class=\"formElem\">%s</td>\n" . - " <td class=\"formField\"><input type=\"text\" name=\"username\" size=\"30\" maxlength=\"30\" /></td>\n" . + " <td class=\"formField\"><input type=\"text\" name=\"username\" size=\"30\" maxlength=\"30\" onfocus=\"if (this.value=='Login') this.value=''\" /></td>\n" . " </tr>\n" . " <tr>\n" . " <td class=\"formElem\">%s</td>\n" . - " <td class=\"formField\"><input type=\"password\" name=\"passwd\" size=\"30\" maxlength=\"30\" /></td>\n" . + " <td class=\"formField\"><input type=\"password\" name=\"passwd\" size=\"30\" maxlength=\"30\" onfocus=\"if (this.value=='Passwordezz') this.value=''\" /></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" . @@ -179,4 +179,4 @@ return $inhalt; } -?> \ No newline at end of file +?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <C1...@us...> - 2007-05-20 10:42:15
|
Revision: 111 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=111&view=rev Author: C167 Date: 2007-05-20 03:42:07 -0700 (Sun, 20 May 2007) Log Message: ----------- implemented style-chooser, first test Modified Paths: -------------- trunk/inc/styles.php trunk/page_main.php Modified: trunk/inc/styles.php =================================================================== --- trunk/inc/styles.php 2007-05-15 21:34:20 UTC (rev 110) +++ trunk/inc/styles.php 2007-05-20 10:42:07 UTC (rev 111) @@ -9,9 +9,9 @@ $style_prop = "default"; } if(true === is_valid_design($style_prop])) { - $design = $style_prop; + $style= $style_prop; } else { - $design = "default"; + $style = "default"; } /* @@ -19,7 +19,7 @@ * @param String $design * @return boolean */ -function is_valid_design($design) { +function is_valid_design($style) { return true; } ?> Modified: trunk/page_main.php =================================================================== --- trunk/page_main.php 2007-05-15 21:34:20 UTC (rev 110) +++ trunk/page_main.php 2007-05-20 10:42:07 UTC (rev 111) @@ -11,38 +11,29 @@ require_once "inc/config.php"; error_reporting(E_ALL); -############ -# DATABASE # -############ +/* DATABASE */ require_once "./inc/database.php"; -########### -# SESSION # -########### +/* SESSION */ require_once "./inc/session.php"; -######### -# FEEDS # -######### +/* FEEDS */ require_once "class/Feed_manager.php"; $feed = new Feed_manager($db); -############## -# HTTP-BASIS # -############## +/* HTTP-BASIS */ require_once "HTTP.php"; -################ -# User-Manager # -################ +/* User-Manager */ require_once "class/User_manager.php"; $user = new User_manager($db); +/* Style-Chooser */ +require_once "inc/styles.php"; + $page = "main"; -############ -# LANGUAGE # -############ +/* LANGUAGE */ require_once "./inc/language.php"; // @@ -50,7 +41,7 @@ // // get the design -$design = file_get_contents("styles/default/page_main.tpl", 'r'); +$design = file_get_contents("styles/$style/page_$page.tpl", 'r'); # header // title @@ -134,4 +125,4 @@ $design = str_replace("<!-- footer -->", $footer, $design); echo $design; -?> \ No newline at end of file +?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <C1...@us...> - 2007-05-15 21:34:25
|
Revision: 110 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=110&view=rev Author: C167 Date: 2007-05-15 14:34:20 -0700 (Tue, 15 May 2007) Log Message: ----------- deleted unused file Removed Paths: ------------- trunk/statistics.php Deleted: trunk/statistics.php =================================================================== --- trunk/statistics.php 2007-05-15 21:32:46 UTC (rev 109) +++ trunk/statistics.php 2007-05-15 21:34:20 UTC (rev 110) @@ -1,46 +0,0 @@ -<?php - - -/** -* This file is the main-control for the statistics. -* It is optional, so there is no need to make it work ;) -*/ -echo date("d.m.y H:m:s", 1168190812); -require_once "MDB2.php"; - -require_once "Log.php"; // Logger - -// some other stuff -require_once "inc/config.php"; -$conf = array ( - 'error_prepend' => "<tt>", - 'error_append' => "</tt>", - 'linebreak' => "<br />\n" -); -$log = & Log :: singleton('display', '', '', $conf, $update['loglevel']); -$dsn = array ( - 'phptype' => DB_TYPE, - 'username' => DB_LOGIN, - 'password' => DB_PASSWD, - 'hostspec' => DB_HOST, - 'database' => DB_DATABASE -); -$options = array ( - 'debug' => 2, - 'result_buffering' => true, - 'portability' => MDB2_PORTABILITY_ALL -); - -$db = & MDB2 :: factory($dsn, $options); -if (PEAR :: isError($db)) { - $log->log($db->getMessage(), PEAR_LOG_ALERT); - $log->log(sprintf(_("Script ended with error at %d"), time()), PEAR_LOG_NOTICE); - die(); -} else { - $log->log(_("Successfully connected to the database"), PEAR_LOG_NOTICE); -} -$db->setFetchMode(MDB2_FETCHMODE_ASSOC); -$db->loadModule('Extended', null, false); - - -?> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <C1...@us...> - 2007-05-15 21:32:48
|
Revision: 109 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=109&view=rev Author: C167 Date: 2007-05-15 14:32:46 -0700 (Tue, 15 May 2007) Log Message: ----------- added design Modified Paths: -------------- trunk/inc/footer.php Added Paths: ----------- trunk/inc/styles.php Modified: trunk/inc/footer.php =================================================================== --- trunk/inc/footer.php 2007-05-15 20:05:02 UTC (rev 108) +++ trunk/inc/footer.php 2007-05-15 21:32:46 UTC (rev 109) @@ -15,6 +15,11 @@ " <a href=\"mailto:c1...@us...\" title=\"the developsers email adress\">email the Webmaster</a><br />\n" . " </span>\n\n" . " <!-- <strong>URI »</strong> http://domain.is.invalid/prosimii/index.html -->\n" . -//" • <strong>Updated »</strong> 2006-Oct-25 18:42 +1000 •"); -" • <strong>Updated »</strong> %s •", date("r", time())); +" • <strong>Updated »</strong> %s •", date("r", time()), file_exists("styles/default/images/valid-css") ? "<img src=\"styles/default/images/valid-css\" alt=\"valid-css\" />":""); +if(file_exists("styles/default/images/valid-css") or file_exists("styles/default/images/valid-markup")) { + $footer .= " <div class=\"right\">\n"; + $footer .= file_exists("styles/default/images/valid-markup") ? " <img src=\"styles/default/images/valid-markup\" alt=\"Valid Markup\" />\n" : ""; + $footer .= file_exists("styles/default/images/valid-css") ? " <img src=\"styles/default/images/valid-css\" alt=\"Valid CSS\" />\n" : ""; + $footer .= " </div>\n"; +} ?> Added: trunk/inc/styles.php =================================================================== --- trunk/inc/styles.php (rev 0) +++ trunk/inc/styles.php 2007-05-15 21:32:46 UTC (rev 109) @@ -0,0 +1,25 @@ +<?php +if(!empty($_GET['style'])) { + $style_prop = $_GET['style']; +} elseif(!empty(HTTP_Session :: get('style'))) { + $style_prop = HTTP_Session :: get('style'); +} elseif(!empty($_POST['style'])) { + $style_prop = $_POST['style']; +} else { + $style_prop = "default"; +} +if(true === is_valid_design($style_prop])) { + $design = $style_prop; +} else { + $design = "default"; +} + +/* + * + * @param String $design + * @return boolean + */ +function is_valid_design($design) { + return true; +} +?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <C1...@us...> - 2007-05-15 20:05:07
|
Revision: 108 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=108&view=rev Author: C167 Date: 2007-05-15 13:05:02 -0700 (Tue, 15 May 2007) Log Message: ----------- changed dtd to be fully XHTML1.1 valid Modified Paths: -------------- trunk/styles/default/page_add_new_feed.tpl trunk/styles/default/page_add_tag.tpl trunk/styles/default/page_login.tpl trunk/styles/default/page_main.tpl trunk/styles/default/page_personal.tpl trunk/styles/default/page_register.tpl trunk/styles/default/page_show_all_feeds.tpl trunk/styles/default/page_show_feed.tpl trunk/styles/default/page_show_feed_tag.tpl Modified: trunk/styles/default/page_add_new_feed.tpl =================================================================== --- trunk/styles/default/page_add_new_feed.tpl 2007-05-07 13:13:07 UTC (rev 107) +++ trunk/styles/default/page_add_new_feed.tpl 2007-05-15 20:05:02 UTC (rev 108) @@ -1,7 +1,7 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-AU"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" + "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" > <head> <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8" /> <meta name="author" content="haran" /> @@ -54,4 +54,4 @@ <!-- footer --> </div> </body> -</html> \ No newline at end of file +</html> Modified: trunk/styles/default/page_add_tag.tpl =================================================================== --- trunk/styles/default/page_add_tag.tpl 2007-05-07 13:13:07 UTC (rev 107) +++ trunk/styles/default/page_add_tag.tpl 2007-05-15 20:05:02 UTC (rev 108) @@ -1,7 +1,7 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-AU"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" + "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" > <head> <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8" /> <meta name="author" content="haran" /> @@ -54,4 +54,4 @@ <!-- footer --> </div> </body> -</html> \ No newline at end of file +</html> Modified: trunk/styles/default/page_login.tpl =================================================================== --- trunk/styles/default/page_login.tpl 2007-05-07 13:13:07 UTC (rev 107) +++ trunk/styles/default/page_login.tpl 2007-05-15 20:05:02 UTC (rev 108) @@ -1,7 +1,7 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-AU"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" + "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" > <head> <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8" /> <meta name="author" content="haran" /> @@ -54,4 +54,4 @@ <!-- footer --> </div> </body> -</html> \ No newline at end of file +</html> Modified: trunk/styles/default/page_main.tpl =================================================================== --- trunk/styles/default/page_main.tpl 2007-05-07 13:13:07 UTC (rev 107) +++ trunk/styles/default/page_main.tpl 2007-05-15 20:05:02 UTC (rev 108) @@ -1,12 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> - <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" > -<!--<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-AU"> ---> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" > <head> <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8" /> <meta name="author" content="haran" /> Modified: trunk/styles/default/page_personal.tpl =================================================================== --- trunk/styles/default/page_personal.tpl 2007-05-07 13:13:07 UTC (rev 107) +++ trunk/styles/default/page_personal.tpl 2007-05-15 20:05:02 UTC (rev 108) @@ -1,7 +1,7 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-AU"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" + "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" > <head> <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8" /> <meta name="author" content="haran" /> @@ -59,4 +59,4 @@ <!-- footer --> </div> </body> -</html> \ No newline at end of file +</html> Modified: trunk/styles/default/page_register.tpl =================================================================== --- trunk/styles/default/page_register.tpl 2007-05-07 13:13:07 UTC (rev 107) +++ trunk/styles/default/page_register.tpl 2007-05-15 20:05:02 UTC (rev 108) @@ -1,7 +1,7 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-AU"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" + "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" > <head> <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8" /> <meta name="author" content="haran" /> @@ -49,4 +49,4 @@ <!-- footer --> </div> </body> -</html> \ No newline at end of file +</html> Modified: trunk/styles/default/page_show_all_feeds.tpl =================================================================== --- trunk/styles/default/page_show_all_feeds.tpl 2007-05-07 13:13:07 UTC (rev 107) +++ trunk/styles/default/page_show_all_feeds.tpl 2007-05-15 20:05:02 UTC (rev 108) @@ -1,7 +1,7 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-AU"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" + "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" > <head> <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8" /> <meta name="author" content="haran" /> Modified: trunk/styles/default/page_show_feed.tpl =================================================================== --- trunk/styles/default/page_show_feed.tpl 2007-05-07 13:13:07 UTC (rev 107) +++ trunk/styles/default/page_show_feed.tpl 2007-05-15 20:05:02 UTC (rev 108) @@ -1,7 +1,7 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-AU"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" + "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" > <head> <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8" /> <meta name="author" content="haran" /> @@ -63,4 +63,4 @@ <!-- footer --> </div> </body> -</html> \ No newline at end of file +</html> Modified: trunk/styles/default/page_show_feed_tag.tpl =================================================================== --- trunk/styles/default/page_show_feed_tag.tpl 2007-05-07 13:13:07 UTC (rev 107) +++ trunk/styles/default/page_show_feed_tag.tpl 2007-05-15 20:05:02 UTC (rev 108) @@ -1,7 +1,7 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-AU"> +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" + "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" > <head> <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8" /> <meta name="author" content="haran" /> @@ -57,4 +57,4 @@ <!-- footer --> </div> </body> -</html> \ No newline at end of file +</html> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <C1...@us...> - 2007-05-07 13:14:05
|
Revision: 107 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=107&view=rev Author: C167 Date: 2007-05-07 06:13:07 -0700 (Mon, 07 May 2007) Log Message: ----------- q Added Paths: ----------- trunk/styles/default/images/valid-css trunk/styles/default/images/valid-markup Added: trunk/styles/default/images/valid-css =================================================================== (Binary files differ) Property changes on: trunk/styles/default/images/valid-css ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/styles/default/images/valid-markup =================================================================== (Binary files differ) Property changes on: trunk/styles/default/images/valid-markup ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <C1...@us...> - 2007-05-06 14:22:50
|
Revision: 106 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=106&view=rev Author: C167 Date: 2007-05-06 07:22:41 -0700 (Sun, 06 May 2007) Log Message: ----------- some changes Modified Paths: -------------- trunk/class/Feed_manager.php trunk/inc/upperBar.php trunk/styles/default/common-screen.css trunk/styles/default/footer-screen.css trunk/styles/default/header-screen.css trunk/styles/default/main_copy-screen.css trunk/styles/default/page_main.tpl Added Paths: ----------- trunk/styles/default/images/ Modified: trunk/class/Feed_manager.php =================================================================== --- trunk/class/Feed_manager.php 2007-02-25 17:01:16 UTC (rev 105) +++ trunk/class/Feed_manager.php 2007-05-06 14:22:41 UTC (rev 106) @@ -159,7 +159,7 @@ /** * Get some feeds, pageable - * @param int $count number of feeds to get (should alsways be the same!) + * @param int $count number of feeds to get (should always be the same!) * @param int $page the number of the page to get. * @return mixed */ @@ -276,18 +276,13 @@ * @return Array An assoc array */ public function getRandomFeeds($count = 5) { - $count_feeds = $this->stat_countFeeds(); - $rand = array (); - $rand = $this->generateRandomNumbers($count_feeds, 0, $count); - for ($i = 0; $i < $count; $i++) { - - $feeds = $this->mdb->query(sprintf("SELECT feed_db_name, feed_name, items FROM feeds WHERE ID = %d;", $rand[$i])); - while ($row = $feeds->fetchRow()) { - $return[$i]['feed_name'] = $row['feed_name']; - $return[$i]['feed_db_name'] = $row['feed_db_name']; - $return[$i]['items'] = $row['items']; - } - + $feeds = $this->mdb->query(sprintf("SELECT feed_db_name, feed_name, items FROM feeds ORDER BY RAND() LIMIT %d", $count)); + $i = 0; + while ($row = $feeds->fetchRow()) { + $return[$i]['feed_name'] = $row['feed_name']; + $return[$i]['feed_db_name'] = $row['feed_db_name']; + $return[$i]['items'] = $row['items']; + $i++; } return $return; } Modified: trunk/inc/upperBar.php =================================================================== --- trunk/inc/upperBar.php 2007-02-25 17:01:16 UTC (rev 105) +++ trunk/inc/upperBar.php 2007-05-06 14:22:41 UTC (rev 106) @@ -9,8 +9,9 @@ */ if (false === 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’s Designs</a>\n", _("Related Sites:")); + " <a href=\"http://validator.w3.org/check?uri=referer\" title=\"Validate XHTML\">Validate XHTML</a> |\n" . + " <a href=\"http://www.oswd.org/userinfo.phtml?user=haran\" title=\"Other designs by haran\">haran’s Designs</a> |\n" . + " <a href=\"http://validator.w3.org/check?uri=referer\" title=\"Validate\">Validate</a>\n", _("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" . Modified: trunk/styles/default/common-screen.css =================================================================== --- trunk/styles/default/common-screen.css 2007-02-25 17:01:16 UTC (rev 105) +++ trunk/styles/default/common-screen.css 2007-05-06 14:22:41 UTC (rev 106) @@ -3,7 +3,7 @@ * URI: styles/default/common-screen.css * * MODIF: 2007-Jan-09 18:06 +0100 * *****************************************/ - @CHARSET "UTF-8"; +/*@CHARSET "UTF-8";*/ /* ##### Common Styles ##### */ .headerLogin { @@ -156,4 +156,4 @@ .smallCaps { font-size: 117%; font-variant: small-caps; -} \ No newline at end of file +} Modified: trunk/styles/default/footer-screen.css =================================================================== --- trunk/styles/default/footer-screen.css 2007-02-25 17:01:16 UTC (rev 105) +++ trunk/styles/default/footer-screen.css 2007-05-06 14:22:41 UTC (rev 106) @@ -3,7 +3,7 @@ * URI: styles/default/footer-screen.css * * MODIF: 2007-Jan-09 18:06 +0100 * *****************************************/ - @CHARSET "UTF-8"; +/*@CHARSET "UTF-8";*/ /* ##### Footer ##### */ @@ -27,4 +27,4 @@ #footer a:hover { text-decoration: none; -} \ No newline at end of file +} Modified: trunk/styles/default/header-screen.css =================================================================== --- trunk/styles/default/header-screen.css 2007-02-25 17:01:16 UTC (rev 105) +++ trunk/styles/default/header-screen.css 2007-05-06 14:22:41 UTC (rev 106) @@ -3,7 +3,7 @@ * URI: styles/default/header-screen.css * * MODIF: 2007-Jan-09 18:06 +0100 * *****************************************/ - @CHARSET "UTF-8"; +/*@CHARSET "UTF-8";*/ /* ##### Header ##### */ .superHeader { @@ -87,4 +87,4 @@ color: rgb(255, 204, 0); background-color: transparent; text-decoration: none; -} \ No newline at end of file +} Modified: trunk/styles/default/main_copy-screen.css =================================================================== --- trunk/styles/default/main_copy-screen.css 2007-02-25 17:01:16 UTC (rev 105) +++ trunk/styles/default/main_copy-screen.css 2007-05-06 14:22:41 UTC (rev 106) @@ -3,7 +3,7 @@ * URI: styles/default/main_copy-screen.css * * MODIF: 2007-Jan-09 18:06 +0100 * ********************************************/ - @CHARSET "UTF-8"; +/*@CHARSET "UTF-8";*/ /* ##### Main Copy ##### */ @@ -49,4 +49,4 @@ * .rowOfBoxes + .rowOfBoxes { * border-top: 1px solid rgb(204,204,204); * } - */ \ No newline at end of file + */ Modified: trunk/styles/default/page_main.tpl =================================================================== --- trunk/styles/default/page_main.tpl 2007-02-25 17:01:16 UTC (rev 105) +++ trunk/styles/default/page_main.tpl 2007-05-06 14:22:41 UTC (rev 106) @@ -1,7 +1,12 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" + "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> + <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" > +<!--<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en-AU"> +--> <head> <meta http-equiv="content-type" content="application/xhtml+xml; charset=UTF-8" /> <meta name="author" content="haran" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <C1...@us...> - 2007-02-25 17:01:17
|
Revision: 105 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=105&view=rev Author: C167 Date: 2007-02-25 09:01:16 -0800 (Sun, 25 Feb 2007) Log Message: ----------- Modified Paths: -------------- trunk/inc/database.php trunk/page_personal.php trunk/styles/default/page_personal.tpl Added Paths: ----------- trunk/ajax/ trunk/ajax/page_personal.js Added: trunk/ajax/page_personal.js =================================================================== --- trunk/ajax/page_personal.js (rev 0) +++ trunk/ajax/page_personal.js 2007-02-25 17:01:16 UTC (rev 105) @@ -0,0 +1,56 @@ + +var news_feeds = new Array(); + +function detectFeeds() { + var feed_class_name = "news_feed"; + var name = document.getElementsByClassName(feed_class_name); + //alert(name); + for(var i = 0; i < name.length; i++) { + var reg = Ajax.Request(); + } +} + + +/* +var hover=false; +var c=1; +var delta=1; +var s2='m3d14.73rr0r15m'; +var interval = window.setInterval("rndStr()",100); + +function setHover(x) { + hover=x; +} + +function rndStr() { + var s=""; + var s1=""; + var n=0; + var d=0; + + for(n=0; n<=15; n++) { + if(n==5) + s1=s1+"."; + else + s1 = s1 + String.fromCharCode(Math.floor(48+Math.random()*74)); + } + + if(hover) { + c=c+1; + d=Math.abs(Math.floor(c/4)); + if(c==60) c=c-1; + // c=c % 60; + document.getElementById('caption').style.color="rgb(" + Math.floor(Math.random()*255) + "," + Math.floor(Math.random()*255) + "," + Math.floor(Math.random()*255) + ")"; + } else { + c=(c-1); + d=Math.abs(Math.floor(c/4)); + if(c==0) c=c+1; + document.getElementById('caption').style.color="rgb(255,255,255)"; + } + + s=s2.substr(0,d)+s1.substr(d,15-d); + + document.getElementById('caption').firstChild.data =s; + document.getElementById('caption').attributes['href'].nodeValue= (s==s2) ? "blog/" : "/"; +} +*/ \ No newline at end of file Modified: trunk/inc/database.php =================================================================== --- trunk/inc/database.php 2007-01-18 18:23:45 UTC (rev 104) +++ trunk/inc/database.php 2007-02-25 17:01:16 UTC (rev 105) @@ -28,4 +28,17 @@ } else { } $db->setFetchMode(MDB2_FETCHMODE_ASSOC); + +/* + * Now we get the configuration from the database + */ +$database_config = $db->query("SELECT * FROM config;"); +if(PEAR :: isError($database_config)) { + +} else { + $data = $database_config->fetchRow(); + if(!empty($data[''])) { + + } +} ?> Modified: trunk/page_personal.php =================================================================== --- trunk/page_personal.php 2007-01-18 18:23:45 UTC (rev 104) +++ trunk/page_personal.php 2007-02-25 17:01:16 UTC (rev 105) @@ -125,7 +125,7 @@ function createColumn($column, $number, $feed) { $return = " <div class=\"column$number\">\n"; foreach ($column as $col) { - $return .= " <div id=\"$col\">\n"; + $return .= " <div class=\"news_feed\" id=\"$col\" >\n"; $feed_info = $feed->getFeedInfo($col); $return .= sprintf(" <div class=\"feed_headline\">\n <a href=\"%s\">%s</a>\n </div>\n <ul>\n", $feed_info['site_url'], $feed_info['feed_name']); $items = $feed->getNewestItems($col, 10); Modified: trunk/styles/default/page_personal.tpl =================================================================== --- trunk/styles/default/page_personal.tpl 2007-01-18 18:23:45 UTC (rev 104) +++ trunk/styles/default/page_personal.tpl 2007-02-25 17:01:16 UTC (rev 105) @@ -13,10 +13,15 @@ <link rel="stylesheet" type="text/css" href="./styles/default/main_copy-screen.css" media="screen, tv, projection" title="Default" /> <link rel="stylesheet" type="text/css" href="./styles/default/footer-screen.css" media="screen, tv, projection" title="Default" /> + <script language="JavaScript" type="text/javascript" src="./ajax/init.js" /> + <script language="JavaScript" type="text/javascript" src="./ajax/page_personal.js" /> + + <script language="JavaScript" type="text/javascript" src="./ajax/prototype.js" /> + <title><!-- title --></title> </head> - <body> + <body onload="init()"> <!-- For non-visual user agents: --> <div id="top"><a href="#main-copy" class="doNotDisplay doNotPrint">Skip to main content.</a></div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <c1...@us...> - 2007-01-18 18:23:46
|
Revision: 104 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=104&view=rev Author: c167 Date: 2007-01-18 10:23:45 -0800 (Thu, 18 Jan 2007) Log Message: ----------- Removed Paths: ------------- branches/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <c1...@us...> - 2007-01-18 18:22:34
|
Revision: 103 http://feed-collector.svn.sourceforge.net/feed-collector/?rev=103&view=rev Author: c167 Date: 2007-01-18 10:22:26 -0800 (Thu, 18 Jan 2007) Log Message: ----------- Version 1.0 Added Paths: ----------- branches/ Copied: branches (from rev 102, trunk) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |