|
From: <gar...@us...> - 2003-11-11 16:17:09
|
Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv31878
Modified Files:
NEWS serendipity_admin_entries.inc.php
serendipity_admin_image_selector.php
serendipity_admin_images.inc.php
serendipity_admin_installer.inc.php serendipity_entries.php
serendipity_functions.inc.php serendipity_genpage.inc.php
serendipity_sidebar_items.php
Log Message:
XHTML fixes from jedijab79 from the forums.
Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- NEWS 13 Oct 2003 20:07:52 -0000 1.35
+++ NEWS 11 Nov 2003 16:17:03 -0000 1.36
@@ -2,6 +2,9 @@
Version 0.4 ()
------------------------------------
+ * XHTML1 compatibility fixes, missing <tr> from the calendar fixed. Thanks to casper/jedijab79 from the forums (garvinhicking)
+ * Reworked Syndication plugin to allow future embedding of new RSS-fields depending with individual content.
+ First example is the pubDate-field for the 'channel'-context, as suggested by Justin Alcorn (garvinhicking)
* Added ability to close (and re-open) comments for certain entries [needs DB update!] (garvinhicking)
* Fixes for comments-plugin (for 0 comments, dateformat) (tomsommer)
* Fixes for mt-XMLRPC api (gschlossnagle)
Index: serendipity_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_entries.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- serendipity_admin_entries.inc.php 13 Oct 2003 12:15:44 -0000 1.13
+++ serendipity_admin_entries.inc.php 11 Nov 2003 16:17:03 -0000 1.14
@@ -53,7 +53,7 @@
<?php
if ($serendipity['GET']['offset'] > 0) {
?>
- <input type="button" value="<<<" onClick="location.href='?serendipity[adminModule]=entries&serendipity[adminAction]=<?php echo $serendipity['GET']['adminAction']; ?>&serendipity[offset]=<?php echo max(0, ($serendipity['GET']['offset'] - $perPage)); ?>';" />
+ <input type="button" value="<<<" onclick="location.href='?serendipity[adminModule]=entries&serendipity[adminAction]=<?php echo $serendipity['GET']['adminAction']; ?>&serendipity[offset]=<?php echo max(0, ($serendipity['GET']['offset'] - $perPage)); ?>';" />
<?php
}
?>
@@ -63,7 +63,7 @@
<?php
if (count($entries) == $perPage) {
?>
- <input type="button" value=">>>" onClick="location.href='?serendipity[adminModule]=entries&serendipity[adminAction]=<?php echo $serendipity['GET']['adminAction']; ?>&serendipity[offset]=<?php echo $serendipity['GET']['offset'] + $perPage; ?>';" />
+ <input type="button" value=">>>" onclick="location.href='?serendipity[adminModule]=entries&serendipity[adminAction]=<?php echo $serendipity['GET']['adminAction']; ?>&serendipity[offset]=<?php echo $serendipity['GET']['offset'] + $perPage; ?>';" />
<?php
}
?>
@@ -202,9 +202,9 @@
?>
<br />
<div>
- <input type="button" value="<?php echo NOT_REALLY; ?>" onClick="history.go(-1);" />
+ <input type="button" value="<?php echo NOT_REALLY; ?>" onclick="history.go(-1);" />
<span style="width: 50px;"></span>
- <input type="button" value="<?php echo DUMP_IT; ?>" onClick="location.href='<?php echo $newLoc; ?>'" />
+ <input type="button" value="<?php echo DUMP_IT; ?>" onclick="location.href='<?php echo $newLoc; ?>'" />
</div>
<?php
break;
Index: serendipity_admin_image_selector.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_image_selector.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- serendipity_admin_image_selector.php 13 Oct 2003 12:15:44 -0000 1.13
+++ serendipity_admin_image_selector.php 11 Nov 2003 16:17:04 -0000 1.14
@@ -28,11 +28,11 @@
$files = array_slice($serendipity['imageList'], $start, $inc);
if ($start > 0) {
- $left = '<input type="button" value="<<<" onClick="location.href=\'?serendipity[start]=' . max(0, $start - $inc) . '&serendipity[end]=' . $start . '\';">' . "\n";
+ $left = '<input type="button" value="<<<" onclick="location.href=\'?serendipity[start]=' . max(0, $start - $inc) . '&serendipity[end]=' . $start . '\';">' . "\n";
}
if (count($serendipity["imageList"]) > $end) {
- $right = '<input type="button" value=">>>" onClick="location.href=\'?serendipity[start]=' . $end . '&serendipity[end]=' . ($end + $inc) . '\';">' . "\n";
+ $right = '<input type="button" value=">>>" onclick="location.href=\'?serendipity[start]=' . $end . '&serendipity[end]=' . ($end + $inc) . '\';">' . "\n";
}
$lineBreak = floor(750 / ($serendipity['thumbSize'] + 20));
@@ -134,8 +134,8 @@
<input type="text" name="serendipity[url]" size="30" value="<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['uploadPath'] . $serendipity['GET']['image']; ?>" onfocus="value='';" /><br />
<br />
- <input type="button" value="<?php echo BACK; ?>" onClick="history.go(-1);" />
- <input type="button" value="<?php echo DONE; ?>" onClick="serendipity_imageSelector_done()" />
+ <input type="button" value="<?php echo BACK; ?>" onclick="history.go(-1);" />
+ <input type="button" value="<?php echo DONE; ?>" onclick="serendipity_imageSelector_done()" />
</div>
</form>
</p>
Index: serendipity_admin_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_images.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- serendipity_admin_images.inc.php 13 Oct 2003 20:35:34 -0000 1.12
+++ serendipity_admin_images.inc.php 11 Nov 2003 16:17:04 -0000 1.13
@@ -21,11 +21,11 @@
$files = @array_slice($serendipity['imageList'], $start, $inc);
if ($start > 0) {
- $left = '<input type="button" value="<<<" onClick="location.href=\'' . $_SERVER['REQUEST_URI'] . '&start=' . max(0, $start - $inc) . '&end=' . $start . '\';" />' . "\n";
+ $left = '<input type="button" value="<<<" onclick="location.href=\'' . $_SERVER['REQUEST_URI'] . '&start=' . max(0, $start - $inc) . '&end=' . $start . '\';" />' . "\n";
}
-
+
if (count($serendipity["imageList"]) > $end) {
- $right = '<input type="button" value=">>>" onClick="location.href=\'' . $_SERVER['REQUEST_URI'] . '&start=' . $end . '&end=' . ($end + $inc) . '\';" />' . "\n";
+ $right = '<input type="button" value=">>>" onclick="location.href=\'' . $_SERVER['REQUEST_URI'] . '&start=' . $end . '&end=' . ($end + $inc) . '\';" />' . "\n";
}
?>
<script type="text/javascript" language="javascript">
@@ -46,12 +46,12 @@
<td align="left" colspan="2">
<?php echo $left; ?>
</td>
-
+
<td align="right" colspan="2">
<?php echo $right; ?>
</td>
</tr>
-
+
<tr>
<?php
for ($x=0; $x<count($files); $x++) {
@@ -69,17 +69,17 @@
<td class="serendipity_admin_list_item" width="50%" nowrap="nowrap">
<b><?php echo $files[$x]; ?></b>
<br />
-
+
<?php echo $preview; ?>
<br />
<?php echo $i[0] . 'x' . $i[1]; ?>
<br />
- <img class="serendipityImageButton" alt="<?php echo IMAGE_FULLSIZE; ?>" src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/zoom.png" border="0" onClick="F1 = window.open('<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $files[$x]; ?>','Zoom','height=<?php echo ($i[1] + 20); ?>,width=<?php echo ($i[0] + 20); ?>,toolbar=no,menubar=no,location=no');" />
- <img class="serendipityImageButton" alt="<?php echo IMAGE_RENAME; ?>" src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/rename.png" border="0" onClick="rename('<?php echo addslashes($files[$x]); ?>')" />
+ <img class="serendipityImageButton" alt="<?php echo IMAGE_FULLSIZE; ?>" src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/zoom.png" border="0" onclick="F1 = window.open('<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $files[$x]; ?>','Zoom','height=<?php echo ($i[1] + 20); ?>,width=<?php echo ($i[0] + 20); ?>,toolbar=no,menubar=no,location=no');" />
+ <img class="serendipityImageButton" alt="<?php echo IMAGE_RENAME; ?>" src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/rename.png" border="0" onclick="rename('<?php echo addslashes($files[$x]); ?>')" />
<br>
- <img class="serendipityImageButton" alt="<?php echo IMAGE_RESIZE; ?>" src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/scale.png" border="0" onClick="location.href='?serendipity[adminModule]=images&serendipity[adminAction]=scaleSelect&serendipity[fname]=<?php echo rawurlencode($files[$x]); ?>';" />
- <img class="serendipityImageButton" alt="<?php echo IMAGE_DELETE; ?>" src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/delete.png" border="0" onClick="location.href='?serendipity[adminModule]=images&serendipity[adminAction]=delete&serendipity[fname]=<?php echo rawurlencode($files[$x]); ?>';" />
+ <img class="serendipityImageButton" alt="<?php echo IMAGE_RESIZE; ?>" src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/scale.png" border="0" onclick="location.href='?serendipity[adminModule]=images&serendipity[adminAction]=scaleSelect&serendipity[fname]=<?php echo rawurlencode($files[$x]); ?>';" />
+ <img class="serendipityImageButton" alt="<?php echo IMAGE_DELETE; ?>" src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/delete.png" border="0" onclick="location.href='?serendipity[adminModule]=images&serendipity[adminAction]=delete&serendipity[fname]=<?php echo rawurlencode($files[$x]); ?>';" />
</td>
<?php
// Linebreak?
@@ -97,7 +97,7 @@
<td align="left" colspan="2">
<?php echo $left; ?>
</td>
-
+
<td align="right" colspan="2">
<?php echo $right; ?>
</td>
@@ -146,12 +146,12 @@
?>
<form method="get" name="delete_image">
<div>
- <input type="button" value="<?php echo IMAGE_DELETE ?>" onClick="location.href='<?php echo $newLoc; ?>'" />
+ <input type="button" value="<?php echo IMAGE_DELETE ?>" onclick="location.href='<?php echo $newLoc; ?>'" />
- <input type="button" value="<?php echo ABORT_NOW ?>" onClick="location.href='<?php echo $abortLoc; ?>'" />
+ <input type="button" value="<?php echo ABORT_NOW ?>" onclick="location.href='<?php echo $abortLoc; ?>'" />
</div>
</form>
-<?php
+<?php
break;
case 'rename':
@@ -161,16 +161,16 @@
if ($serendipity['GET']['oldname'] != '' && $serendipity['GET']['newname']!= '' &&
file_exists($oldfile) &&
!file_exists($newfile)) {
-
+
// Rename file
rename($oldfile, $newfile);
-
+
// Rename thumbnail
$f = serendipity_parseFileName($serendipity['GET']['oldname']);
$f2= serendipity_parseFileName($serendipity['GET']['newname']);
rename( $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $f[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f[1],
$serendipity['serendipityPath'] . $serendipity['uploadPath'] . $f2[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f2[1]);
-
+
// Forward user to overview (we don't want the user's back button to rename things again)
?>
<script language="javascript" type="text/javascript">
@@ -211,7 +211,7 @@
$fp = fopen($checkfile, 'w');
fwrite($fp, $fContent);
fclose($fp);
-
+
printf(FILE_FETCHED . '<br />', $serendipity['POST']['url']);
// Create thumbnail
@@ -247,22 +247,22 @@
<input type="hidden" name="serendipity[action]" value="admin" />
<input type="hidden" name="serendipity[adminModule]" value="images" />
<input type="hidden" name="serendipity[adminAction]" value="add" />
-
+
<table>
<tr>
<td nowrap="nowrap"><?php echo ENTER_IMAGE_URL; ?></td>
<td><input type="text" name="serendipity[url]" value="" size="40" /></td>
</tr>
-
+
<tr>
<td align="center" colspan="2"><b><?php echo WORD_OR; ?></b></td>
</tr>
-
+
<tr>
<td nowrap='nowrap'><?php echo ENTER_IMAGE_TO_UP; ?></td>
<td><input name="userfile" type="file"/></td>
</tr>
-
+
<tr>
<td align="right" colspan="2"><input type="submit" value="<?php echo GO; ?>" /></td>
</tr>
@@ -275,12 +275,12 @@
case 'scale':
printf(
SCALING_IMAGE . '<br />',
-
+
$serendipity['GET']['fname'],
$serendipity['GET']['width'],
$serendipity['GET']['height']
);
-
+
echo serendipity_scaleImg($serendipity['GET']['fname'], $serendipity['GET']['width'], $serendipity['GET']['height']) . '<br />';
echo DONE . '<br />';
@@ -339,7 +339,7 @@
<?php echo KEEP_PROPORTIONS; ?>:
<!-- <input type='button' value='preview'>-->
<input type="checkbox" name="auto" checked="checked" /><br />
- <input type="button" name="scale" value="<?php echo IMAGE_RESIZE; ?>" onClick="if (confirm('<?php echo REALLY_SCALE_IMAGE; ?>')) document.serendipityScaleForm.submit();" />
+ <input type="button" name="scale" value="<?php echo IMAGE_RESIZE; ?>" onclick="if (confirm('<?php echo REALLY_SCALE_IMAGE; ?>')) document.serendipityScaleForm.submit();" />
</div>
</form>
Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- serendipity_admin_installer.inc.php 13 Oct 2003 12:15:44 -0000 1.45
+++ serendipity_admin_installer.inc.php 11 Nov 2003 16:17:04 -0000 1.46
@@ -197,7 +197,7 @@
</td>
<td style="border-bottom: 1px #000000 solid; font-size: 8pt" align="left" valign="middle" width="25%">
- <nobr><?php echo serendipity_guessInput($value[$x]['type'], $value[$x]['name'], $from[$value[$x]['name']], $value[$x]['default']); ?></nobr>
+ <?php echo ($serendipity['XHTML11'] ? '<span style="white-space: nowrap">' : '<nobr>'); ?><?php echo serendipity_guessInput($value[$x]['type'], $value[$x]['name'], $from[$value[$x]['name']], $value[$x]['default']); ?><?php echo ($serendipity['XHTML11'] ? '</span>' : '</nobr>'); ?>
</td>
</tr>
<?php
Index: serendipity_entries.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_entries.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- serendipity_entries.php 18 Sep 2003 12:58:14 -0000 1.16
+++ serendipity_entries.php 11 Nov 2003 16:17:04 -0000 1.17
@@ -65,7 +65,7 @@
<div class="serendipitySideBarContent">
• <a href="?serendipity[adminModule]=images&serendipity[adminAction]=addSelect"><?php echo ADD_IMAGES; ?></a><br />
• <a href="?serendipity[adminModule]=images"><?php echo MANAGE_IMAGES; ?></a><br />
- • <a href="?serendipity[adminModule]=images&serendipity[adminAction]=genThumbs" onClick="return confirm('<?php echo WARNING_THIS_BLAHBLAH; ?>');"><?php echo CREATE_THUMBS; ?></a><br />
+ • <a href="?serendipity[adminModule]=images&serendipity[adminAction]=genThumbs" onclick="return confirm('<?php echo WARNING_THIS_BLAHBLAH; ?>');"><?php echo CREATE_THUMBS; ?></a><br />
</div>
</div>
Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -d -r1.166 -r1.167
--- serendipity_functions.inc.php 11 Nov 2003 14:11:35 -0000 1.166
+++ serendipity_functions.inc.php 11 Nov 2003 16:17:05 -0000 1.167
@@ -308,7 +308,7 @@
</td>
<td colspan="5" align="center" valign="bottom" class="serendipity_calendarHeader">
- <b><nobr><a href="<?php echo $link; ?>"><?php echo $serendipity["months"][$month] . ' \'' . substr($year, 2); ?></a></nobr></b>
+ <b><?php echo ($serendipity['XHTML11'] ? '<span style="white-space: nowrap">' : '<nobr>'); ?><a href="<?php echo $link; ?>"><?php echo $serendipity["months"][$month] . ' \'' . substr($year, 2); ?></a><?php echo ($serendipity['XHTML11'] ? '</span>' : '</nobr>'); ?></b>
</td>
<td align="right" class="serendipity_calendarHeader">
@@ -333,7 +333,6 @@
?>
</tr>
- <tr class="serendipity_calendar">
<?php
// Print the calendar
$currDay = 1;
@@ -342,7 +341,9 @@
if ($currDay>$nrOfDays) {
break;
}
-
+?>
+ <tr class="serendipity_calendar">
+<?php
// Prepare row
for ($y=0; $y<7; $y++) {
// Be able to print borders nicely
@@ -713,7 +714,7 @@
if (!isset($serendipity['GET']['id'])) {
$label = $entry['comments'] == 1 ? COMMENT : COMMENTS;
echo ' | <a href="' . $serendipity['serendipityHTTPPath'] . 'comment.php?serendipity[entry_id]=' . $entry['id'] . '&serendipity[type]=comments"';
- echo ' onClick="window.open(this.href, \'comments\', \'width=480,height=480,scrollbars=yes\'); return false;">';
+ echo ' onclick="window.open(this.href, \'comments\', \'width=480,height=480,scrollbars=yes\'); return false;">';
echo $label . '(' . $entry['comments'] . ')</a>';
}
}
@@ -721,7 +722,7 @@
if ($entry['allow_comments'] === true || $entry['allow_comments'] == 'true' || !isset($entry['allow_comments']) || $entry['trackbacks'] > 0) {
$label = $entry['trackbacks'] == 1 ? TRACKBACK : TRACKBACKS;
echo ' | <a href="' . $serendipity['serendipityHTTPPath'] . 'comment.php?serendipity[entry_id]=' . $entry['id'] . '&serendipity[type]=trackbacks"';
- echo ' onClick="window.open(this.href, \'comments\', \'width=480,height=480,scrollbars=yes\'); return false;">';
+ echo ' onclick="window.open(this.href, \'comments\', \'width=480,height=480,scrollbars=yes\'); return false;">';
echo $label . ' (' . $entry['trackbacks'] . ')</a>';
}
?>
@@ -1370,7 +1371,7 @@
$url = 'http://' . $buffer[3];
return sprintf(
- '<a%shref="%sexit.php?url=%s%s" title="%s" onMouseOver="window.status=\'%s\';return true;" onMouseOut="window.status=\'\';return true;"',
+ '<a%shref="%sexit.php?url=%s%s" title="%s" onmouseOver="window.status=\'%s\';return true;" onmouseOut="window.status=\'\';return true;"',
$buffer[1],
$serendipity['baseURL'],
base64_encode($url),
@@ -2052,21 +2053,21 @@
/* Since the user has WYSIWYG editor disabled, we want to check if we should use the "better" non-WYSIWYG editor */
if (!$serendipity['wysiwyg'] && eregi($serendipity['EditorBrowsers'], $_SERVER['HTTP_USER_AGENT']) ) {
?>
- <input type="button" name="insI" value="I" accesskey="i" style="font-style: italic" onClick="wrapSelection(document.forms['serendipityEntry']['serendipity[body]'],'<i>','</i>')" />
- <input type="button" name="insB" value="B" accesskey="i" style="font-weight: bold" onClick="wrapSelection(document.forms['serendipityEntry']['serendipity[body]'],'<b>','</b>')" />
- <input type="button" name="insU" value="U" accesskey="u" style="text-decoration: underline;" onClick="wrapSelection(document.forms['serendipityEntry']['serendipity[body]'],'<u>','</u>')" />
- <input type="button" name="insJ" value="img" accesskey="j" onClick="wrapInsImage(document.forms['serendipityEntry']['serendipity[body]'])" />
- <input type="button" name="insImage" value="<?php echo IMAGE ; ?>" style="" onClick="window.open('serendipity_admin_image_selector.php', 'ImageSel', 'width=800, height=600, toolbar=no');" />
- <input type="button" name="insU" value="URL" accesskey="l" style="color: blue; text-decoration: underline;" onClick="wrapSelectionWithLink(document.forms['serendipityEntry']['serendipity[body]'])" />
+ <input type="button" name="insI" value="I" accesskey="i" style="font-style: italic" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[body]'],'<i>','</i>')" />
+ <input type="button" name="insB" value="B" accesskey="i" style="font-weight: bold" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[body]'],'<b>','</b>')" />
+ <input type="button" name="insU" value="U" accesskey="u" style="text-decoration: underline;" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[body]'],'<u>','</u>')" />
+ <input type="button" name="insJ" value="img" accesskey="j" onclick="wrapInsImage(document.forms['serendipityEntry']['serendipity[body]'])" />
+ <input type="button" name="insImage" value="<?php echo IMAGE ; ?>" style="" onclick="window.open('serendipity_admin_image_selector.php', 'ImageSel', 'width=800, height=600, toolbar=no');" />
+ <input type="button" name="insU" value="URL" accesskey="l" style="color: blue; text-decoration: underline;" onclick="wrapSelectionWithLink(document.forms['serendipityEntry']['serendipity[body]'])" />
<?php
/* Do the "old" non-WYSIWYG editor */
} elseif (!$serendipity['wysiwyg']) { ?>
- <input type="button" value=" B " onClick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[body]'], 'b')">
- <input type="button" value=" U " onClick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[body]'], 'u')">
- <input type="button" value=" I " onClick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[body]'], 'i')">
- <input type="button" value="<img>" onClick="serendipity_insImage(document.forms['serendipityEntry']['serendipity[body]'])">
- <input type="button" value="<?php echo IMAGE; ?>" onClick="window.open('serendipity_admin_image_selector.php', 'ImageSel', 'width=800,height=600,toolbar=no');">
- <input type="button" value="Link" onClick="serendipity_insLink(document.forms['serendipityEntry']['serendipity[body]'])">
+ <input type="button" value=" B " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[body]'], 'b')">
+ <input type="button" value=" U " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[body]'], 'u')">
+ <input type="button" value=" I " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[body]'], 'i')">
+ <input type="button" value="<img>" onclick="serendipity_insImage(document.forms['serendipityEntry']['serendipity[body]'])">
+ <input type="button" value="<?php echo IMAGE; ?>" onclick="window.open('serendipity_admin_image_selector.php', 'ImageSel', 'width=800,height=600,toolbar=no');">
+ <input type="button" value="Link" onclick="serendipity_insLink(document.forms['serendipityEntry']['serendipity[body]'])">
<?php }
} else {
?>
@@ -2091,7 +2092,7 @@
</td>
<td align="right">
- <input type="button" value="- <?php echo PREVIEW; ?> -" style="font-weight: bold;" onClick="document.forms['serendipityEntry'].elements['serendipity[preview]'].value='true'; document.forms['serendipityEntry'].submit();" />
+ <input type="button" value="- <?php echo PREVIEW; ?> -" style="font-weight: bold;" onclick="document.forms['serendipityEntry'].elements['serendipity[preview]'].value='true'; document.forms['serendipityEntry'].submit();" />
<input type="submit" value="- <?php echo SAVE; ?> -" style="font-weight: bold;" />
</td>
</tr>
Index: serendipity_genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_genpage.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- serendipity_genpage.inc.php 6 Nov 2003 15:52:29 -0000 1.19
+++ serendipity_genpage.inc.php 11 Nov 2003 16:17:05 -0000 1.20
@@ -1,13 +1,22 @@
<?php # $Id$
if (!$serendipity['embed'] || $serendipity['embed'] === 'false' || $serendipity['embed'] === false) {
// serendipity is embedded into an existing structure. No need to output headers then.
+ if ($serendipity['XHTML11']) {
+?>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/xhtml1-transitional.dtd" />
+<?php
+ } else {
?>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
+<?php
+ }
+?>
<html>
<head>
<title><?php echo htmlentities($serendipity['blogTitle']); ?></title>
- <meta name="Powered-By" content="Serendipity v.<?php echo $serendipity['version'] ?>">
+ <meta name="Powered-By" content="Serendipity v.<?php echo $serendipity['version'] ?>" />
<link rel="stylesheet" type="text/css" href="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.css.php" />
<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>
Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- serendipity_sidebar_items.php 11 Nov 2003 15:38:45 -0000 1.31
+++ serendipity_sidebar_items.php 11 Nov 2003 16:17:05 -0000 1.32
@@ -247,7 +247,7 @@
if ($this->get_config('show_2.0c') != 'false') {
?>
<a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=2.0&type=comments"><img src="<?php echo $serendipity['serendipityHTTPPath']; ?>xml.gif" border="0" alt="XML" /></a>
- <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=2.0&type=comments"><nobr>RSS 2.0 <?php echo COMMENTS; ?></nobr></a>
+ <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=2.0&type=comments"><?php echo ($serendipity['XHTML11'] ? '<span style="white-space: nowrap">' : '<nobr>'); ?>RSS 2.0 <?php echo COMMENTS; ?><?php echo ($serendipity['XHTML11'] ? '</span>' : '</nobr>'); ?></a>
<?php
}
}
|
