[Feed-collector-svn] SF.net SVN: feed-collector: [116] trunk
Status: Beta
Brought to you by:
c167
|
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.
|