|
From: <tro...@us...> - 2003-06-29 18:48:52
|
Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv6859
Modified Files:
serendipity_functions.inc.php serendipity_genpage.inc.php
Log Message:
More readable HTML and import stylesheet
Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- serendipity_functions.inc.php 29 Jun 2003 02:40:48 -0000 1.85
+++ serendipity_functions.inc.php 29 Jun 2003 18:48:49 -0000 1.86
@@ -370,7 +370,7 @@
/* pre-walk the array to collect them keyed by date */
$bydate = array();
if (!is_array($entries) || $entries[0] == false) {
- echo "<br />".NO_ENTRIES_TO_PRINT;
+ echo "<br />".NO_ENTRIES_TO_PRINT."\n";
return;
}
@@ -381,20 +381,20 @@
}
if (!$serendipity['GET']['short']) {
foreach ($bydate as $date => $ents) {
- echo "<div class='serendipity_Entry_Date'>";
- echo "<div class='serendipity_date'>$date</div>";
+ echo "\n <div class='serendipity_Entry_Date'>\n";
+ echo " <div class='serendipity_date'>$date</div>\n";
foreach ($ents as $x => $entry) {
$entryLink = $serendipity['serendipityHTTPPath']
. "archives/"
. $entry['id']
. "_".serendipity_makeFilename($entry['title']) .".html";
- echo "<div class='serendipity_title'>";
+ echo "\n <div class='serendipity_title'>";
echo "<a href=\"$entryLink\">";
echo htmlentities($entry['title']);
echo "</a>";
echo "</div>";
- echo "<div class='serendipity_entry'>";
+ echo "\n <div class='serendipity_entry'>";
echo nl2br(serendipity_emoticate(serendipity_markup_text($entry['body'], $entry['id'])));
if ($extended && strlen($entry['extended'])) {
echo '<a name="#extended"></a>';
@@ -404,7 +404,7 @@
echo "<br><a href=\"$entryLink#extended\">View Extended Entry</a><br>";
}
- echo "<div class='serendipity_entryFooter'><br>"
+ echo "\n <div class='serendipity_entryFooter'><br>"
. POSTED_BY." "
. htmlentities($entry['username'])
. ($entry['category_name']?(" in ${entry['category_name']}"):"")
@@ -448,18 +448,18 @@
serendipity_displayCommentForm($entry['id']);
}
- echo "</div>"; // serendipity_entry
+ echo " </div>\n"; // serendipity_entry
}
// Entry_Date
- echo "</div>";
- }
- }
+ echo " </div>\n";
+ }
+ }
else {
$s = &$serendipity['GET']['range'];
echo "<div class='serendipity_date'>".TOPICS_OF." ".
date("m/Y", mktime(0,0,0,substr($s,4,2),1,substr($s, 0, 4)))
- ."</div>";
+ ." </div>\n";
foreach ($bydate as $date => $ents) {
foreach ($ents as $x => $entry) {
echo "<a href=\""
Index: serendipity_genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_genpage.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_genpage.inc.php 27 Jun 2003 13:41:38 -0000 1.5
+++ serendipity_genpage.inc.php 29 Jun 2003 18:48:49 -0000 1.6
@@ -2,16 +2,16 @@
"http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
- <title>
- <?php echo htmlentities($serendipity['blogTitle']); ?>
- </title>
+<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']}'>";
+ if (strtolower($serendipity['extCSS'])!='none') echo "<style type='text/css'>@import \"{$serendipity['extCSS']}\"</style>\n";
?>
<link rel="alternate" type="application/rss+xml" title="RSS" href="<?php echo $serendipity['baseURL']; ?>feeds/index.rss" />
<script language="Javascript" type="text/javascript" src="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.js"></script>
</head>
+
+
<body>
<?php
include_once("serendipity_config.inc.php");
@@ -24,5 +24,6 @@
include ($serendipity['templatePath'] ."default/layout.php");
}
?>
+
</body>
</html>
|
