Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv17316
Modified Files:
index.php serendipity.css.php serendipity_admin.php
serendipity_entries.php serendipity_genpage.inc.php
Log Message:
Couldn't leave it fcked up. Template is fixed. Anything to be done, or can we release a beta now? Any complaints?
Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- index.php 25 Jun 2003 22:04:30 -0000 1.12
+++ index.php 27 Jun 2003 13:41:37 -0000 1.13
@@ -2,6 +2,7 @@
// We need to set this to return a 200 since we use .htaccess ErrorDocument
// rules to handle archives.
header("HTTP/1.0 200\r\n");
+header("Content-Type: text/html; charset=ISO-8859-2");
include_once("serendipity_config.inc.php");
$track_referer = true;
$uri = $_SERVER['REQUEST_URI'];
Index: serendipity.css.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity.css.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- serendipity.css.php 25 Jun 2003 20:44:40 -0000 1.8
+++ serendipity.css.php 27 Jun 2003 13:41:38 -0000 1.9
@@ -4,7 +4,8 @@
readfile('serendipity.css');
}
else if (file_exists($serendipity['serendipityPath'] . $serendipity['templatePath'] . serendipity_get_config_var('template', 'default') ."/style.css") ) {
- readfile ($serendipity['templatePath'] . serendipity_get_config_var('template', 'default') ."/style.css");
+ $tmp = implode("", file ($serendipity['templatePath'] . serendipity_get_config_var('template', 'default') ."/style.css"));
+ echo str_replace("{TEMPLATE_PATH}", $serendipity['baseURL']."/templates/".serendipity_get_config_var('template', 'default')."/", $tmp);
} else if ( file_exists($serendipity['templatePath'] ."default/style.css")) {
readfile ($serendipity['templatePath'] ."default/style.css");
} else {
Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- serendipity_admin.php 25 Jun 2003 22:04:30 -0000 1.12
+++ serendipity_admin.php 27 Jun 2003 13:41:38 -0000 1.13
@@ -77,7 +77,8 @@
</div>
• <a href='<?php echo $serendipity['serendipityHTTPPath']; ?>entries'><?php echo AUTHOR_SUITE; ?></a><br />
• <a href='<?php echo $serendipity['serendipityHTTPPath'] ; ?>'><?php echo BACK_TO_BLOG; ?></a><br />
- • <a href='?serendipity[adminModule]=logout'><?php echo LOGOUT; ?></a>
+ • <a href='?serendipity[adminModule]=logout'><?php echo LOGOUT; ?></a><br />
+ <img src="<?php echo $serendipity[baseURL]."templates/default/img/leer.png"?>" height="1" width="130" />
</td>
<td class="serendipity_admin">
<div class="serendipity_admin_title"><?php echo SERENDIPITY_ADMIN_SUITE; ?></div>
Index: serendipity_entries.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_entries.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_entries.php 25 Jun 2003 22:04:30 -0000 1.9
+++ serendipity_entries.php 27 Jun 2003 13:41:38 -0000 1.10
@@ -81,7 +81,8 @@
</div>
• <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_admin.php"><?php echo ADMIN_INTERFACE; ?></a><br />
• <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>"><?php echo BACK_TO_BLOG; ?></a><br />
- • <a href="?serendipity[adminModule]=logout"><?php echo LOGOUT; ?></a>
+ • <a href="?serendipity[adminModule]=logout"><?php echo LOGOUT; ?></a><br />
+ <img src="<?php echo $serendipity[baseURL]."templates/default/img/leer.png"?>" height="1" width="130" />
</td>
<td class="serendipity_admin">
<div class="serendipity_admin_title"><?php echo SERENDIPITY_AUTHORING_SUITE; ?></div>
Index: serendipity_genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_genpage.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_genpage.inc.php 25 Jun 2003 22:04:30 -0000 1.4
+++ serendipity_genpage.inc.php 27 Jun 2003 13:41:38 -0000 1.5
@@ -1,10 +1,16 @@
-<html><head><title><?php echo htmlentities($serendipity['blogTitle']); ?></title>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+ "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+ <title>
+ <?php echo htmlentities($serendipity['blogTitle']); ?>
+ </title>
<link rel="stylesheet" type="text/css" href="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.css.php" />
<?php
if (strtolower($serendipity['extCSS'])!='none') echo "<link rel='stylesheet' type='text/css' href='{$serendipity['extCSS']}'>";
?>
<link rel="alternate" type="application/rss+xml" title="RSS" href="<?php echo $serendipity['baseURL']; ?>feeds/index.rss" />
-<script language="Javascript" src="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.js"></script>
+<script language="Javascript" type="text/javascript" src="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.js"></script>
</head>
<body>
<?php
|
