Update of /cvsroot/php-blog/serendipity/templates/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20102/templates/default
Modified Files:
Tag: branch-smarty
index.tpl
Log Message:
- Don't manipulate core configuration variables, like blogTitle
Index: index.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/Attic/index.tpl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -d -r1.1.2.5 -r1.1.2.6
--- index.tpl 30 Sep 2004 17:34:39 -0000 1.1.2.5
+++ index.tpl 30 Sep 2004 18:05:45 -0000 1.1.2.6
@@ -9,7 +9,7 @@
{if $is_embedded != true}
<html>
<head>
- <title>{$head_title}</title>
+ <title>{$head_title|@default:$blogTitle} {if $head_subtitle} - {$head_subtitle}{/if}</title>
<meta http-equiv="Content-Type" content="text/html; charset={$head_charset}" />
<meta name="Powered-By" content="Serendipity v.{$head_version}" />
<link rel="stylesheet" type="text/css" href="{$serendipityHTTPPath}serendipity.css.php" />
@@ -29,12 +29,8 @@
{if $is_raw_mode != true}
<div id="serendipity_banner">
- <h1><a class="homelink1" href="{$serendipityBaseURL}">{$blogTitle}</a></h1>
-{if $blogSubTitle}
- <h2><a class="homelink2" href="{$serendipityBaseURL}">{$blogSubTitle}</a></h2>
-{elseif $blogDescription}
- <h2><a class="homelink2" href="{$serendipityBaseURL}">{$blogDescription}</a></h2>
-{/if}
+ <h1><a class="homelink1" href="{$serendipityBaseURL}">{$head_title|@default:$blogTitle}</a></h1>
+ <h2><a class="homelink2" href="{$serendipityBaseURL}">{$head_subtitle|@default:$blogDescription}</a></h2>
</div>
<table id="mainpane">
|