php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity NEWS,1.124,1.125 serendipity_functions.inc.php,1.267,1.268 serendipity_plugin_api.php,1.18,1.19

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21886

Modified Files:
	NEWS serendipity_functions.inc.php serendipity_plugin_api.php 
Log Message:
news adjusted to -pl1
added plugin api changes from jonathan arkell


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -d -r1.124 -r1.125
--- NEWS	14 May 2004 19:05:48 -0000	1.124
+++ NEWS	15 May 2004 11:00:16 -0000	1.125
@@ -3,11 +3,16 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Plugin API: Introduced function 'is_event_plugin' for easier
+      integration (Jonathan Arkell)
+
+    * New event hook 'entry_display' inside of serendipity_printEntries().
+      Can be used to force entries not being shown by setting the
+      $eventData['clean_page'] variable to 'true'. (Jonathan Arkell)
+
     * Don't show "expand"/"toggle all" buttons if there are only one section 
       availiable (tomsommer)
 
-    * Fixed trackbacks not associated to the right entry id (garvinhicking)
-
     * Redesigned admin interface for editing entries: Adjust items per
       page, sort order, filter mode, combined EDIT+DELETE interface into
       one. Introduced new css classes "serendipity_admin_list_item_even"
@@ -85,6 +90,13 @@
 
     * Configuration is now language-dependant. (garvinhicking)
 
+Version 0.6-pl1 (May 15th, 2004)
+------------------------------------------------------------------------
+
+    * Fixed trackbacks not associated to the right entry id (garvinhicking)
+
+    * Fixed typo in Creative Common Plugin (Jonathan Arkell)
+
 Version 0.6 (May 12th, 2004)
 ------------------------------------------------------------------------
 

Index: serendipity_plugin_api.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_plugin_api.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- serendipity_plugin_api.php	13 Apr 2004 10:00:36 -0000	1.18
+++ serendipity_plugin_api.php	15 May 2004 11:00:19 -0000	1.19
@@ -145,11 +145,11 @@
                     continue;
                 }
 
-                if ($event_only && strncmp($f, 'serendipity_event_', 18) != 0) {
+                if ($event_only && !serendipity_plugin_api::is_event_plugin($f)) {
                     continue;
                 }
 
-                if (!$event_only && strncmp($f, 'serendipity_event_', 18) == 0) {
+                if (!$event_only && serendipity_plugin_api::is_event_plugin($f)) {
                     continue;
                 }
 
@@ -175,11 +175,11 @@
                         continue;
                     }
 
-                    if ($event_only && strncmp($f, 'serendipity_event_', 18) != 0) {
+                    if ($event_only && !serendipity_plugin_api::is_event_plugin($f)) {
                         continue;
                     }
 
-                    if (!$event_only && strncmp($f, 'serendipity_event_', 18) == 0) {
+                    if (!$event_only && serendipity_plugin_api::is_event_plugin($f)) {
                         continue;
                     }
 
@@ -349,6 +349,12 @@
         return $title;
     }
 
+    /* conditional to see if the named plugin is an event plugin
+        Refactoring: decompose conditional */
+    function is_event_plugin($name) {
+        return (strstr($name, '_event_'));
+    }
+
     function &get_event_plugins($instance = false) {
         global $serendipity;
 
@@ -572,7 +578,7 @@
                 foreach($this->dependencies AS $dependency => $mode) {
                     $exists = serendipity_plugin_api::exists($dependency);
                     if (!$exists) {
-                        if (strncmp($dependency, 'serendipity_event_', 18) == 0) {
+                        if (serendipity_plugin_api::is_event_plugin($dependency)) {
                             $keys[] = serendipity_plugin_api::create_plugin_instance($dependency, null, 'event', $authorid);
                         } else {
                             $keys[] = serendipity_plugin_api::create_plugin_instance($dependency, null, 'right', $authorid);

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -d -r1.267 -r1.268
--- serendipity_functions.inc.php	14 May 2004 08:19:54 -0000	1.267
+++ serendipity_functions.inc.php	15 May 2004 11:00:17 -0000	1.268
@@ -927,6 +927,12 @@
 function serendipity_printEntries($entries, $extended = 0, $preview = false) {
     global $serendipity;
 
+    serendipity_plugin_api::hook_event('entry_display', $entries);
+
+    if (isset($entries['clean_page']) && $entries['clean_page'] === true) {
+        return; // no display of this item
+    }
+
     /* pre-walk the array to collect them keyed by date */
     $bydate = array();
     if (!is_array($entries) || $entries[0] == false) {

[php-blog-cvs] serendipity NEWS,1.103.4.4,1.103.4.5

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21648

Modified Files:
      Tag: branch_0_6
	NEWS 
Log Message:
-pl1


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.103.4.4
retrieving revision 1.103.4.5
diff -u -d -r1.103.4.4 -r1.103.4.5
--- NEWS	14 May 2004 08:29:58 -0000	1.103.4.4
+++ NEWS	15 May 2004 10:57:54 -0000	1.103.4.5
@@ -1,13 +1,13 @@
 # $Id$
 
-Version 0.6-pl1 ()
+Version 0.6-pl1 (May 15th, 2004)
 ------------------------------------------------------------------------
 
     * Fixed trackbacks not associated to the right entry id (garvinhicking)
 
     * Fixed typo in Creative Common Plugin (Jonathan Arkell)
 
-Version 0.6 (May 12h, 2004)
+Version 0.6 (May 12th, 2004)
 ------------------------------------------------------------------------
 
     [changes since 0.6-rc2]

[php-blog-cvs] serendipity serendipity_functions_installer.inc.php,1.9,1.10 NEWS,1.123,1.124

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7891

Modified Files:
	serendipity_functions_installer.inc.php NEWS 
Log Message:
There is no need to show the expand and toggle all buttons when there is only one section to display


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -d -r1.123 -r1.124
--- NEWS	14 May 2004 08:19:54 -0000	1.123
+++ NEWS	14 May 2004 19:05:48 -0000	1.124
@@ -3,6 +3,9 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Don't show "expand"/"toggle all" buttons if there are only one section 
+      availiable (tomsommer)
+
     * Fixed trackbacks not associated to the right entry id (garvinhicking)
 
     * Redesigned admin interface for editing entries: Adjust items per

Index: serendipity_functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_installer.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_functions_installer.inc.php	5 May 2004 11:50:24 -0000	1.9
+++ serendipity_functions_installer.inc.php	14 May 2004 19:05:47 -0000	1.10
@@ -324,21 +324,26 @@
         <input type="hidden" name="serendipity[adminModule]" value="installer" />
         <input type="hidden" name="installAction" value="check" />
         <br />
-<?php   } ?>
+<?php   }
+        if ( sizeof($t['categories']) > 1 ) { ?>
         <div align="right">
             <a style="border:0; text-decoration: none" href="#" onclick="showConfigAll(<?php echo count($t['categories']); ?>)" title="<?php echo TOGGLE_ALL; ?>"><img src="pixel/plus.png" id="optionall" alt="+/-" border="0" />&nbsp;<?php echo TOGGLE_ALL; ?></a></a><br />
         </div>
 <?php
+        }
         $el_count = 0;
         foreach ($t['categories'] as $key => $value) {
             $el_count++;
 ?>
         <table width="100%" cellspacing="2">
+<?php
+        if ( sizeof($t['categories']) > 1 ) { 
+?>
             <tr>
                 <th align="left" colspan="2" style="padding-left: 15px;">
                     <a style="border:0; text-decoration: none" href="#" onclick="showConfig('el<?php echo $el_count; ?>'); return false" title="<?php echo TOGGLE_OPTION; ?>"><img src="pixel/plus.png" id="optionel<?php echo $el_count; ?>" alt="+/-" border="0" />&nbsp;<?php echo $key; ?></a></th>
             </tr>
-
+<?php   } ?>
             <tr>
                 <td>
                     <table width="100%" cellspacing="0" cellpadding="3" style="<?php echo ($folding === true ? 'display: none;' : ''); ?>" id="el<?php echo $el_count; ?>">

[php-blog-cvs] serendipity NEWS,1.103.4.3,1.103.4.4 comment.php,1.30.4.2,1.30.4.3 serendipity_config.inc.php,1.63.2.4,1.63.2.5 serendipity_functions.inc.php,1.248.4.8,1.248.4.9

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3200

Modified Files:
      Tag: branch_0_6
	NEWS comment.php serendipity_config.inc.php 
	serendipity_functions.inc.php 
Log Message:
Seems we need to prepare for a -pl1 release.
MFH.


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.103.4.3
retrieving revision 1.103.4.4
diff -u -d -r1.103.4.3 -r1.103.4.4
--- NEWS	12 May 2004 14:50:35 -0000	1.103.4.3
+++ NEWS	14 May 2004 08:29:58 -0000	1.103.4.4
@@ -1,5 +1,12 @@
 # $Id$
 
+Version 0.6-pl1 ()
+------------------------------------------------------------------------
+
+    * Fixed trackbacks not associated to the right entry id (garvinhicking)
+
+    * Fixed typo in Creative Common Plugin (Jonathan Arkell)
+
 Version 0.6 (May 12h, 2004)
 ------------------------------------------------------------------------
 

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.248.4.8
retrieving revision 1.248.4.9
diff -u -d -r1.248.4.8 -r1.248.4.9
--- serendipity_functions.inc.php	6 May 2004 10:39:59 -0000	1.248.4.8
+++ serendipity_functions.inc.php	14 May 2004 08:29:59 -0000	1.248.4.9
@@ -1627,7 +1627,7 @@
 function serendipity_trackback_is_success($resp)
 {
     if (preg_match('@<error>(\d)+</error>@', $resp, $matches)) {
-        if ((int) $matches[1]) {
+        if ((int) $matches[1] || (string) $matches[1] === "0") {
             return 1;
         } else {
             if (preg_match('@<message>([^<]+)</message>@', $resp, $matches)) {
@@ -1676,7 +1676,7 @@
     global $serendipity;
     $target = parse_url($loc);
     if ($target['query'] != '') {
-        $target['query'] = '?' . $target['query'];
+        $target['query'] = '?' . str_replace('&amp;', '&', $target['query']);
     }
 
     if (!is_numeric($target['port'])) {

Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/comment.php,v
retrieving revision 1.30.4.2
retrieving revision 1.30.4.3
diff -u -d -r1.30.4.2 -r1.30.4.3
--- comment.php	13 Apr 2004 11:09:39 -0000	1.30.4.2
+++ comment.php	14 May 2004 08:29:58 -0000	1.30.4.3
@@ -24,7 +24,7 @@
     $uri = $_SERVER['REQUEST_URI'];
     if (isset($_REQUEST['entry_id'])) {
         $id = $_REQUEST['entry_id'];
-    } else if (preg_match('@\/(\d+)$@', $uri, $matches)) {
+    } else if (preg_match('@/(\d+)_[^/]*$@', $uri, $matches)) {
         $id = $matches[1];
     }
 

Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.63.2.4
retrieving revision 1.63.2.5
diff -u -d -r1.63.2.4 -r1.63.2.5
--- serendipity_config.inc.php	3 May 2004 08:01:31 -0000	1.63.2.4
+++ serendipity_config.inc.php	14 May 2004 08:29:58 -0000	1.63.2.5
@@ -15,7 +15,7 @@
 include_once(S9Y_INCLUDE_PATH . 'compat.php');
 ini_set('session.use_trans_sid', 0);
 
-$serendipity['version']      = '0.6';
+$serendipity['version']      = '0.6-pl1';
 $serendipity['production']   = 1;
 $serendipity['rewrite']      = 'none';
 $serendipity['messagestack'] = array();

[php-blog-cvs] serendipity/plugins/serendipity_event_creativecommons serendipity_event_creativecommons.php,1.4.4.1,1.4.4.2

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_creativecommons
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3200/plugins/serendipity_event_creativecommons

Modified Files:
      Tag: branch_0_6
	serendipity_event_creativecommons.php 
Log Message:
Seems we need to prepare for a -pl1 release.
MFH.


Index: serendipity_event_creativecommons.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_creativecommons/serendipity_event_creativecommons.php,v
retrieving revision 1.4.4.1
retrieving revision 1.4.4.2
diff -u -d -r1.4.4.1 -r1.4.4.2
--- serendipity_event_creativecommons.php	13 Apr 2004 10:01:12 -0000	1.4.4.1
+++ serendipity_event_creativecommons.php	14 May 2004 08:30:00 -0000	1.4.4.2
@@ -134,7 +134,7 @@
                 }
 
                 $eventData['display_dat'] .= '<!-- <rdf:RDF xmlns="http://web.resource.org/cc/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"><Work rdf:about=""><license rdf:resource="'.$license_uri.'"/></Work><License rdf:about="'.$license_uri.'">';
-                if (is_array($df)) {
+                if (is_array($rdf)) {
                     foreach ($rdf as $rdf_t => $rdf_v) {
                         $eventData['display_dat'] .= '  <'.$rdf_v.' rdf:resource="http://web.resource.org/cc/'.$rdf_t.'" />';
                     }

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.266,1.267 comment.php,1.32,1.33 NEWS,1.122,1.123

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1213

Modified Files:
	serendipity_functions.inc.php comment.php NEWS 
Log Message:
fixed trackbacks. Why do we always have to see such things after a release? :-)


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- NEWS	13 May 2004 13:10:51 -0000	1.122
+++ NEWS	14 May 2004 08:19:54 -0000	1.123
@@ -3,6 +3,8 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Fixed trackbacks not associated to the right entry id (garvinhicking)
+
     * Redesigned admin interface for editing entries: Adjust items per
       page, sort order, filter mode, combined EDIT+DELETE interface into
       one. Introduced new css classes "serendipity_admin_list_item_even"

Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/comment.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- comment.php	13 Apr 2004 11:09:42 -0000	1.32
+++ comment.php	14 May 2004 08:19:54 -0000	1.33
@@ -24,7 +24,7 @@
     $uri = $_SERVER['REQUEST_URI'];
     if (isset($_REQUEST['entry_id'])) {
         $id = $_REQUEST['entry_id'];
-    } else if (preg_match('@\/(\d+)$@', $uri, $matches)) {
+    } else if (preg_match('@/(\d+)_[^/]*$@', $uri, $matches)) {
         $id = $matches[1];
     }
 

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -d -r1.266 -r1.267
--- serendipity_functions.inc.php	13 May 2004 13:10:50 -0000	1.266
+++ serendipity_functions.inc.php	14 May 2004 08:19:54 -0000	1.267
@@ -1707,7 +1707,7 @@
 function serendipity_trackback_is_success($resp)
 {
     if (preg_match('@<error>(\d)+</error>@', $resp, $matches)) {
-        if ((int) $matches[1]) {
+        if ((int) $matches[1] || (string) $matches[1] === "0") {
             return 1;
         } else {
             if (preg_match('@<message>([^<]+)</message>@', $resp, $matches)) {
@@ -1756,7 +1756,7 @@
     global $serendipity;
     $target = parse_url($loc);
     if ($target['query'] != '') {
-        $target['query'] = '?' . $target['query'];
+        $target['query'] = '?' . str_replace('&amp;', '&', $target['query']);
     }
 
     if (!is_numeric($target['port'])) {

[php-blog-cvs] serendipity serendipity_admin_entries.inc.php,1.22,1.23

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5374

Modified Files:
	serendipity_admin_entries.inc.php 
Log Message:
Avoid extra space in link


Index: serendipity_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_entries.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- serendipity_admin_entries.inc.php	13 May 2004 17:45:00 -0000	1.22
+++ serendipity_admin_entries.inc.php	13 May 2004 20:29:08 -0000	1.23
@@ -196,8 +196,7 @@
                 <br />
                 <?php if ($entries[$entryIndex]['isdraft'] == 'true') echo DRAFT . ':'; ?>
                 <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=edit&amp;serendipity[id]=<?php echo $entries[$entryIndex]['id']; ?>" title="#<?php echo $entries[$x]['id']; ?>">
-                    <?php echo htmlspecialchars(substr(empty($entries[$entryIndex]['title']) ? (empty($entries[$entryIndex]['body']) ? '---' : $entries[$entryIndex]['body']) : $entries[$entryIndex]['title'], 0, 40)); ?>
-                </a><br />
+                    <?php echo htmlspecialchars(substr(empty($entries[$entryIndex]['title']) ? (empty($entries[$entryIndex]['body']) ? '---' : $entries[$entryIndex]['body']) : $entries[$entryIndex]['title'], 0, 40)); ?></a><br />
                 <?php echo POSTED_BY . ' ' . $entries[$entryIndex]['username'] . ( !empty($entries[$entryIndex]['category_name']) ? ' ' . IN . ' ' . $entries[$entryIndex]['category_name'] :''); ?><br />
             </td>
 <?php

[php-blog-cvs] serendipity serendipity_functions_images.inc.php,1.9,1.10 serendipity_admin_entries.inc.php,1.21,1.22

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32393

Modified Files:
	serendipity_functions_images.inc.php 
	serendipity_admin_entries.inc.php 
Log Message:
Clean up the new layout a little
Fixed bug where it would say "POSTED BY x IN" when there was no category
Added css class to style filter panel


Index: serendipity_functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_images.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_functions_images.inc.php	4 Apr 2004 16:24:47 -0000	1.9
+++ serendipity_functions_images.inc.php	13 May 2004 17:44:58 -0000	1.10
@@ -426,7 +426,7 @@
     </tr>
     
     <tr>
-        <td align="center" colspan="<?php echo $lineBreak; ?>"><?php echo $sort; ?></td>
+        <td align="center" class="serendipity_admin_filters" colspan="<?php echo $lineBreak; ?>"><?php echo $sort; ?></td>
     </tr>
 
     <tr>
@@ -481,7 +481,7 @@
     </tr>
 
     <tr>
-        <td align="center" colspan="<?php echo $lineBreak; ?>"><?php echo $sort; ?></td>
+        <td align="center" class="serendipity_admin_filters" colspan="<?php echo $lineBreak; ?>"><?php echo $sort; ?></td>
     </tr>
 
     <tr>

Index: serendipity_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_entries.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- serendipity_admin_entries.inc.php	13 May 2004 13:10:51 -0000	1.21
+++ serendipity_admin_entries.inc.php	13 May 2004 17:45:00 -0000	1.22
@@ -49,7 +49,7 @@
 function serendipity_drawList_filter() {
     global $serendipity;
 
-    $sort  = FILTER . ' ' . AUTHOR . ' ';
+    $sort  = AUTHOR . ' ';
     $sort .= '<select name="serendipity[filter_author]"><option value="">--</option>';
     $users = serendipity_fetchUsers();
     if (is_array($users)) {
@@ -67,7 +67,7 @@
     }
 
     $sort .= '</select> '
-           . ($serendipity['dbType'] == 'mysql' ? CONTENT . ': <input type="text" name="serendipity[filter_body]" value="' . (isset($serendipity['GET']['filter_body']) ? htmlspecialchars($serendipity['GET']['filter_body']) : '') . '" />' : '')
+           . ($serendipity['dbType'] == 'mysql' ? CONTENT . ': <input size="10" type="text" name="serendipity[filter_body]" value="' . (isset($serendipity['GET']['filter_body']) ? htmlspecialchars($serendipity['GET']['filter_body']) : '') . '" />' : '')
            . ' <input type="submit" name="go" value="' . GO . ' " />';
     return $sort;
 }
@@ -77,7 +77,7 @@
     global $serendipity;
 
     $perPage = (!empty($serendipity['GET']['perPage']) ? $serendipity['GET']['perPage'] : 12);
-    $perRow  = 3;
+    $perRow  = 2;
     $full    = false;
 
     // Prepare variables
@@ -156,20 +156,16 @@
 ?>
         <tr>
             <td colspan="<?php echo $halfRowLeft; ?>">
-<?php if ($serendipity['GET']['offset'] > 0) { ?>
-                <input type="submit" name="serendipity[prevpage]" value="&lt;&lt;&lt;" />
-<?php } ?>
+                <input type="submit" name="serendipity[prevpage]" value="&lt;&lt;&lt;" <?php if ($serendipity['GET']['offset'] <= 0) echo ' disabled' ?> />
             </td>
 
-            <td>
+            <td class="serendipity_admin_filters" align="center">
                 <?php echo serendipity_drawList_sort(); ?><br />
                 <?php echo serendipity_drawList_filter(); ?>
             </td>
 
             <td  colspan="<?php echo $halfRowRight; ?>" align="right">
-<?php if ($count == $perPage) { ?>
-                <input type="submit" name="serendipity[nextpage]" value="&gt;&gt;&gt;" />
-<?php } ?>
+                <input type="submit" name="serendipity[nextpage]" value="&gt;&gt;&gt;" <?php if ($count != $perPage) echo ' disabled' ?> />
             </td>
         </tr>
     </table>
@@ -196,13 +192,13 @@
                 <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=delete&amp;serendipity[id]=<?php echo $entries[$entryIndex]['id']; ?>" title="#<?php echo $entries[$x]['id']; ?>">
                     <img style="float: right" class="serendipityImageButton" title="<?php echo DELETE; ?>" alt="<?php echo DELETE; ?>" src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/delete.png" border="0" />
                 </a>
-                <?php echo serendipity_formatTime(DATE_FORMAT_SHORT, $entries[$entryIndex]['timestamp']); ?>
+                <?php echo serendipity_formatTime(DATE_FORMAT_SHORT, $entries[$entryIndex]['timestamp']) . ' ' .$lm; ?>
                 <br />
                 <?php if ($entries[$entryIndex]['isdraft'] == 'true') echo DRAFT . ':'; ?>
                 <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=edit&amp;serendipity[id]=<?php echo $entries[$entryIndex]['id']; ?>" title="#<?php echo $entries[$x]['id']; ?>">
                     <?php echo htmlspecialchars(substr(empty($entries[$entryIndex]['title']) ? (empty($entries[$entryIndex]['body']) ? '---' : $entries[$entryIndex]['body']) : $entries[$entryIndex]['title'], 0, 40)); ?>
                 </a><br />
-                <?php echo POSTED_BY . ' ' . $entries[$entryIndex]['username'] . ' ' . IN . ' ' . $entries[$entryIndex]['category_name'] . $lm; ?><br />
+                <?php echo POSTED_BY . ' ' . $entries[$entryIndex]['username'] . ( !empty($entries[$entryIndex]['category_name']) ? ' ' . IN . ' ' . $entries[$entryIndex]['category_name'] :''); ?><br />
             </td>
 <?php
                 } else {
@@ -228,7 +224,7 @@
         // We've got nothing
 ?>
         <tr>
-            <td>
+            <td class="serendipity_admin_filters" align="center">
                 <?php echo serendipity_drawList_sort(); ?><br />
                 <?php echo serendipity_drawList_filter(); ?>
             </td>

[php-blog-cvs] serendipity/templates/default style.css,1.19,1.20

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32393/templates/default

Modified Files:
	style.css 
Log Message:
Clean up the new layout a little
Fixed bug where it would say "POSTED BY x IN" when there was no category
Added css class to style filter panel


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/style.css,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- style.css	13 May 2004 13:10:54 -0000	1.19
+++ style.css	13 May 2004 17:45:00 -0000	1.20
@@ -360,3 +360,11 @@
 .serendipity_admin_list_item_uneven {
     background-color: #E0E0E0;
 }
+.serendipity_admin_filters {
+    font-size: 10px;
+}
+
+.serendipity_admin_filters input,
+.serendipity_admin_filters select {
+    font-size: 10px;
+}

[php-blog-cvs] serendipity/templates/moz-modern style.css,1.7,1.8

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/moz-modern
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1850/templates/moz-modern

Modified Files:
	style.css 
Log Message:
Major functional redesign of "Edit entries".


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/moz-modern/style.css,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- style.css	12 May 2004 14:35:23 -0000	1.7
+++ style.css	13 May 2004 13:10:54 -0000	1.8
@@ -420,3 +420,11 @@
     clear: both;
     display: block;
 }
+
+.serendipity_admin_list_item_even {
+    background-color: #ffffff;
+}
+
+.serendipity_admin_list_item_uneven {
+    background-color: #E0E0E0;
+}

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.265,1.266 serendipity_entries.php,1.29,1.30 serendipity_admin_entries.inc.php,1.20,1.21 rss.php,1.24,1.25 NEWS,1.121,1.122

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1850

Modified Files:
	serendipity_functions.inc.php serendipity_entries.php 
	serendipity_admin_entries.inc.php rss.php NEWS 
Log Message:
Major functional redesign of "Edit entries".


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- NEWS	12 May 2004 14:52:48 -0000	1.121
+++ NEWS	13 May 2004 13:10:51 -0000	1.122
@@ -3,6 +3,13 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Redesigned admin interface for editing entries: Adjust items per
+      page, sort order, filter mode, combined EDIT+DELETE interface into
+      one. Introduced new css classes "serendipity_admin_list_item_even"
+      and "serendipity_admin_list_item_uneven" for displaying entries.
+      Can now search for entries in admin panel, can edit entries with
+      empty titles. (garvinhicking)
+
     * Fixed image comment manager's "center" alignment mode and use
       image width/height from the image manager to format the <img>-Tag,
       with regards to Lewe.

Index: serendipity_entries.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_entries.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- serendipity_entries.php	7 Apr 2004 12:42:42 -0000	1.29
+++ serendipity_entries.php	13 May 2004 13:10:51 -0000	1.30
@@ -61,7 +61,6 @@
                     <div class="serendipitySideBarContent">
                         &bull; <a href="?serendipity[adminModule]=entries&amp;serendipity[adminAction]=new"><?php          echo NEW_ENTRY;      ?></a><br />
                         &bull; <a href="?serendipity[adminModule]=entries&amp;serendipity[adminAction]=editSelect"><?php   echo EDIT_ENTRIES;   ?></a><br />
-                        &bull; <a href="?serendipity[adminModule]=entries&amp;serendipity[adminAction]=deleteSelect"><?php echo DELETE_ENTRIES; ?></a><br />
                         <?php serendipity_plugin_api::hook_event('backend_sidebar_entries', $serendipity); ?>
                     </div>
                 </div>

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.265
retrieving revision 1.266
diff -u -d -r1.265 -r1.266
--- serendipity_functions.inc.php	13 May 2004 07:27:46 -0000	1.265
+++ serendipity_functions.inc.php	13 May 2004 13:10:50 -0000	1.266
@@ -527,7 +527,7 @@
 * Give it a range in YYYYMMDD format to gather the desired entries
 * (For february 2002 you would pass 200202 e.g.
 **/
-function serendipity_fetchEntries($range = null, $full = true, $limit = '', $fetchDrafts = false, $modified_since = false, $orderby = 'timestamp') {
+function serendipity_fetchEntries($range = null, $full = true, $limit = '', $fetchDrafts = false, $modified_since = false, $orderby = 'timestamp DESC', $filter_sql = '') {
     global $serendipity;
 
     $and = '';
@@ -573,7 +573,7 @@
                 if (!empty($limit)) {
                     $limit = ($limit > 50 ? $limit : 50);
                 }
-                $orderby = 'last_modified';
+                $orderby = 'last_modified DESC';
             }
         }
 
@@ -623,6 +623,14 @@
         }
     }
 
+    if (!empty($filter_sql)) {
+        if (!empty($and)) {
+            $and .= ' AND ' . $filter_sql;
+        } else {
+            $and = 'WHERE ' . $filter_sql;
+        }
+    }
+
     $query = "SELECT
                     e.id,
                     e.title,
@@ -651,7 +659,7 @@
                     LEFT JOIN {$serendipity['dbPrefix']}authors a
                         ON e.authorid = a.authorid $and
                     ORDER BY
-                        $orderby DESC
+                        $orderby
                     $limit";
 
     $ret = serendipity_db_query($query);
@@ -2204,7 +2212,7 @@
 <?php
         }
 ?>
-                    <b><?php echo CATEGORY; ?></b> <?php echo $cat_list ; ?></td>
+                    <b><?php echo CATEGORY; ?>:</b> <?php echo $cat_list ; ?></td>
             </tr>
             <tr>
 <?php

Index: serendipity_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_entries.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- serendipity_admin_entries.inc.php	7 Apr 2004 12:42:42 -0000	1.20
+++ serendipity_admin_entries.inc.php	13 May 2004 13:10:51 -0000	1.21
@@ -13,105 +13,214 @@
     die ("Don't hack!");
 }
 
+function serendipity_drawList_sort() {
+    global $serendipity;
+
+    $sort  = SORT_ORDER . ': ';
+    $sort .= '<select name="serendipity[order]">';
+
+    $sort_order = array(
+                    'timestamp'     => DATE,
+                    'username'      => AUTHOR,
+                    'category_name' => CATEGORY,
+                    'last_modified' => LAST_UPDATED,
+                    'title'         => TITLE
+    );
+
+    foreach($sort_order AS $so_key => $so_val) {
+        $sort .= '<option value="' . $so_key . '" ' . (isset($serendipity['GET']['order']) && $serendipity['GET']['order'] == $so_key ? 'selected="selected"' : '') . '>' . $so_val . '</option>' . "\n";
+    }
+
+    $sort .= '</select><select name="serendipity[ordermode]">'
+           . '<option value="DESC" ' . (isset($serendipity['GET']['ordermode']) && $serendipity['GET']['ordermode'] == 'DESC' ? 'selected="selected"' : '') . '>' . SORT_ORDER_DESC . '</option>'
+           . '<option value="ASC"  ' . (isset($serendipity['GET']['ordermode']) && $serendipity['GET']['ordermode'] == 'ASC'  ? 'selected="selected"' : '') . '>' . SORT_ORDER_ASC  . '</option>'
+           . '</select>'
+           . '<select name="serendipity[perPage]">';
+
+    $per_page = array('12', '16', '50', '100');
+    foreach($per_page AS $per_page_nr) {
+        $sort .= '<option value="' . $per_page_nr . '"   ' . (isset($serendipity['GET']['perPage']) && $serendipity['GET']['perPage'] == $per_page_nr ? 'selected="selected"' : '') . '>' . $per_page_nr . ' ' . ENTRIES_PER_PAGE . '</option>' . "\n";
+    }
+
+    $sort .= '</select>';
+    return $sort;
+}
+
+function serendipity_drawList_filter() {
+    global $serendipity;
+
+    $sort  = FILTER . ' ' . AUTHOR . ' ';
+    $sort .= '<select name="serendipity[filter_author]"><option value="">--</option>';
+    $users = serendipity_fetchUsers();
+    if (is_array($users)) {
+        foreach ($users AS $row) {
+            $sort .= '<option value="' . $row['authorid'] . '" ' . (isset($serendipity['GET']['filter_author']) && $serendipity['GET']['filter_author'] == $row['authorid'] ? 'selected="selected"' : '') . '>' . $row['username'] . '</option>' . "\n";
+        }
+    }
+
+    $sort .= '</select> ' . CATEGORY . ' <select name="serendipity[filter_category]"><option value="">--</option>';
+    $categories = serendipity_fetchCategories();
+    if (is_array($categories)) {
+        foreach($categories AS $row) {
+            $sort .= '<option value="' . $row['categoryid'] . '" ' . (isset($serendipity['GET']['filter_category']) && $serendipity['GET']['filter_category'] == $row['categoryid'] ? 'selected="selected"' : '') . '>' . $row['category_name'] . '</option>' . "\n";
+        }
+    }
+
+    $sort .= '</select> '
+           . ($serendipity['dbType'] == 'mysql' ? CONTENT . ': <input type="text" name="serendipity[filter_body]" value="' . (isset($serendipity['GET']['filter_body']) ? htmlspecialchars($serendipity['GET']['filter_body']) : '') . '" />' : '')
+           . ' <input type="submit" name="go" value="' . GO . ' " />';
+    return $sort;
+}
+
 // A little helper we don't want in _functions.inc.php
 function serendipity_drawList($action) {
     global $serendipity;
 
+    $perPage = (!empty($serendipity['GET']['perPage']) ? $serendipity['GET']['perPage'] : 12);
+    $perRow  = 3;
+    $full    = false;
+
     // Prepare variables
     if (empty($serendipity['GET']['offset']) || !is_numeric($serendipity['GET']['offset'])) {
         $serendipity['GET']['offset'] = 0;
     }
 
-    $perPage = 12;
+    if (!empty($serendipity['GET']['prevpage'])) {
+        $serendipity['GET']['offset'] = max(0, ($serendipity['GET']['offset'] - $perPage));
+    }
+
+    if (!empty($serendipity['GET']['nextpage'])) {
+        $serendipity['GET']['offset'] = $serendipity['GET']['offset'] + $perPage;
+    }
+
+    if (empty($serendipity['GET']['ordermode'])) {
+        $serendipity['GET']['ordermode'] = 'DESC';
+    }
+
+    if (!empty($serendipity['GET']['order'])) {
+        $orderby = serendipity_db_escape_string($serendipity['GET']['order'] . ' ' . $serendipity['GET']['ordermode']);
+    } else {
+        $orderby = 'timestamp ' . serendipity_db_escape_string($serendipity['GET']['ordermode']);
+    }
+
+    $filter = array();
+    if (!empty($serendipity['GET']['filter_author'])) {
+        $filter[] = "e.authorid = '" . serendipity_db_escape_string($serendipity['GET']['filter_author']) . "'";
+    }
+
+    if (!empty($serendipity['GET']['filter_category'])) {
+        $filter[] = "e.categoryid = '" . serendipity_db_escape_string($serendipity['GET']['filter_category']) . "'";
+    }
+
+    if (!empty($serendipity['GET']['filter_body'])) {
+        if ($serendipity['dbType'] == 'mysql') {
+            $filter[] = "MATCH (title,body,extended) AGAINST ('" . serendipity_db_escape_string($serendipity['GET']['filter_body']) . "')";
+            $full     = true;
+        }
+    }
+
+    $filter_sql = implode(' AND ', $filter);
 
     // Fetch the entries
     $entries = serendipity_fetchEntries(
                  false,
-                 false,
+                 $full,
                  serendipity_db_limit(
                    $serendipity['GET']['offset'],
                    $perPage
                  ),
-                 true
+                 true,
+                 false,
+                 $orderby,
+                 $filter_sql
                );
-    $string_action = ($action == 'delete' ? DELETE_ENTRIES : EDIT_ENTRIES);
 
     // Prepare table
 ?>
+<form action="?" method="get">
 <div class="serendipity_admin_list">
-    <div class="serendipity_admin_list_title"><?php echo $string_action; ?>:</div>
+    <input type="hidden" name="serendipity[action]"      value="admin"      />
+    <input type="hidden" name="serendipity[adminModule]" value="entries"    />
+    <input type="hidden" name="serendipity[adminAction]" value="editSelect" />
+    <input type="hidden" name="serendipity[offset]"      value="<?php echo $serendipity['GET']['offset']; ?>" />
 
-    <table width="100%" class="serendipity_admin_list">
+    <div class="serendipity_admin_list_title"><?php echo EDIT_ENTRIES; ?>:</div>
+    <table class="serendipity_admin_list" cellpadding="5">
 <?php
     if (is_array($entries)) {
-        $half = (int) ((count($entries) + 1)/2);
+        $halfRowLeft  = ceil($perRow/2);
+        $halfRowRight = $perRow - $halfRowLeft;
+        $count = count($entries);
 
         // Print the browse buttons
 ?>
         <tr>
+            <td colspan="<?php echo $halfRowLeft; ?>">
+<?php if ($serendipity['GET']['offset'] > 0) { ?>
+                <input type="submit" name="serendipity[prevpage]" value="&lt;&lt;&lt;" />
+<?php } ?>
+            </td>
+
             <td>
-<?php
-        if ($serendipity['GET']['offset'] > 0) {
-?>
-                <input type="button" value="&lt;&lt;&lt;" onclick="location.href='?serendipity[adminModule]=entries&serendipity[adminAction]=<?php echo $serendipity['GET']['adminAction']; ?>&serendipity[offset]=<?php echo max(0, ($serendipity['GET']['offset'] - $perPage)); ?>';" />
-<?php
-        }
-?>
+                <?php echo serendipity_drawList_sort(); ?><br />
+                <?php echo serendipity_drawList_filter(); ?>
             </td>
 
-            <td align="right">
-<?php
-        if (count($entries) == $perPage) {
-?>
-                <input type="button" value="&gt;&gt;&gt;" onclick="location.href='?serendipity[adminModule]=entries&serendipity[adminAction]=<?php echo $serendipity['GET']['adminAction']; ?>&serendipity[offset]=<?php echo $serendipity['GET']['offset'] + $perPage; ?>';" />
-<?php
-        }
-?>
+            <td  colspan="<?php echo $halfRowRight; ?>" align="right">
+<?php if ($count == $perPage) { ?>
+                <input type="submit" name="serendipity[nextpage]" value="&gt;&gt;&gt;" />
+<?php } ?>
             </td>
         </tr>
+    </table>
+    <table class="serendipity_admin_list" cellpadding="5">
 <?php
         // Print the entries
-        $count = count($entries);
-        for ($x=0; $x < $half; $x++) {
+        $rows = 0;
+        for ($x = 0; $x < $count; $x += $perRow) {
+            $rows++;
 ?>
         <tr>
-            <td class="serendipity_admin_list_item">
-                <?php echo date('d.m.y, H:i', $entries[$x]['timestamp']) . ': '; ?>
-                <br />
-                <?php if ($entries[$x]['isdraft'] == 'true') echo DRAFT . ':'; ?>
-                <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=<?php echo $action; ?>&amp;serendipity[id]=<?php echo $entries[$x]['id']; ?>" title="#<?php echo $entries[$x]['id']; ?>">
-                    <?php echo htmlspecialchars(substr(empty($entries[$x]['title']) ? $entries[$x]['body'] : $entries[$x]['title'], 0, 40)); ?>
+<?php
+            for ($xx = 0; $xx < $perRow; $xx++) {
+                $entryIndex = $x + $xx;
+                if (isset($entries[$entryIndex])) {
+                    // Find out if the entry has been modified later than 30 minutes after creation
+                    if ($entries[$entryIndex]['timestamp'] <= ($entries[$entryIndex]['last_modified'] - 60*30)) {
+                        $lm = '<a href="#" title="' . LAST_UPDATED . ': ' . serendipity_formatTime(DATE_FORMAT_SHORT, $entries[$entryIndex]['last_modified']) . '" onclick="alert(this.title)">*</a>';
+                    } else {
+                        $lm = '';
+                    }
+?>
+            <td class="serendipity_admin_list_item serendipity_admin_list_item_<?php echo ($rows % 2 ? 'even' : 'uneven'); ?>">
+                <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=delete&amp;serendipity[id]=<?php echo $entries[$entryIndex]['id']; ?>" title="#<?php echo $entries[$x]['id']; ?>">
+                    <img style="float: right" class="serendipityImageButton" title="<?php echo DELETE; ?>" alt="<?php echo DELETE; ?>" src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/delete.png" border="0" />
                 </a>
+                <?php echo serendipity_formatTime(DATE_FORMAT_SHORT, $entries[$entryIndex]['timestamp']); ?>
+                <br />
+                <?php if ($entries[$entryIndex]['isdraft'] == 'true') echo DRAFT . ':'; ?>
+                <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=edit&amp;serendipity[id]=<?php echo $entries[$entryIndex]['id']; ?>" title="#<?php echo $entries[$x]['id']; ?>">
+                    <?php echo htmlspecialchars(substr(empty($entries[$entryIndex]['title']) ? (empty($entries[$entryIndex]['body']) ? '---' : $entries[$entryIndex]['body']) : $entries[$entryIndex]['title'], 0, 40)); ?>
+                </a><br />
+                <?php echo POSTED_BY . ' ' . $entries[$entryIndex]['username'] . ' ' . IN . ' ' . $entries[$entryIndex]['category_name'] . $lm; ?><br />
             </td>
-
-            <td class="serendipity_admin_list_item">
 <?php
-            if ($x + $half < $count) {
+                } else {
 ?>
-                <?php echo date('d.m.y, H:i', $entries[$x + $half]['timestamp']) . ': '; ?>
-                <br />
-                <?php if ($entries[$x + $half]['isdraft'] == 'true') echo DRAFT . ':'; ?>
-                <a href="?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=<?php echo $action; ?>&amp;serendipity[id]=<?php echo $entries[$x + $half]['id']; ?>" title="#<?php echo $entries[$x + $half]['id']; ?>">
-                    <?php echo htmlspecialchars(substr(empty($entries[$x + $half]['title']) ? $entries[$x + $half]['body'] : $entries[$x + $half]['title'], 0, 40)); ?>
-                </a>
+            <td class="serendipity_admin_list_item">&nbsp;</td>
 <?php
-            }
+                }
+            } // end perRow output
 ?>
-            </td>
         </tr>
 <?php
-        }
+        } // end entries output
 ?>
+
         <tr>
             <td class="serendipity_admin_list_item">
                 <br />
-                <form action="?" method="get">
-                    <input type="hidden" name="serendipity[action]" value="admin" />
-                    <input type="hidden" name="serendipity[adminModule]" value="entries" />
-                    <input type="hidden" name="serendipity[adminAction]" value="edit" />
-                    <?php echo EDIT_ENTRY . ': #<input type="text" size="3" name="serendipity[id]" /> <input type="submit" name="submit" value="' . GO . '" />'; ?>
-                </form>
-
+                    <?php echo EDIT_ENTRY . ': #<input type="text" size="3" name="serendipity[id]" /> <input type="submit" name="serendipity[editSubmit]" value="' . GO . '" />'; ?>
             </td>
         </tr>
 <?php
@@ -119,8 +228,9 @@
         // We've got nothing
 ?>
         <tr>
-            <td class="serendipity_admin_list_item" colspan="2">
-                <?php echo NO_ENTRIES_TO_PRINT ?>
+            <td>
+                <?php echo serendipity_drawList_sort(); ?><br />
+                <?php echo serendipity_drawList_filter(); ?>
             </td>
         </tr>
 <?php
@@ -128,9 +238,14 @@
 ?>
     </table>
 </div>
+</form>
 <?php
 }
 
+if (!empty($serendipity['GET']['editSubmit'])) {
+    $serendipity['GET']['adminAction'] = 'edit';
+}
+
 switch($serendipity['GET']['adminAction']) {
     case 'save':
         $entry = array(
@@ -187,7 +302,7 @@
             echo '<div style="border:1px solid #000000; padding: 15px;">';
             serendipity_printEntries(array($entry), ($entry['extended'] != '' ? 1 : 0), true);
             echo '</div>';
-            
+
             serendipity_printEntryForm(
                 '?',
                 array(
@@ -206,10 +321,6 @@
         serendipity_drawList('edit');
         break;
 
-    case 'deleteSelect':
-        serendipity_drawList('delete');
-        break;
-
     case 'delete':
         $newLoc = '?serendipity[action]=admin&amp;serendipity[adminModule]=entries&amp;serendipity[adminAction]=doDelete&amp;serendipity[id]=' . $serendipity['GET']['id'];
         printf(DELETE_SURE, $serendipity['GET']['id']);

Index: rss.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/rss.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- rss.php	4 Apr 2004 16:24:46 -0000	1.24
+++ rss.php	13 May 2004 13:10:51 -0000	1.25
@@ -25,15 +25,15 @@
         break;
     case 'content':
     default:
-            $latest_entry = serendipity_fetchEntries(null, false, 1, false, false, 'last_modified');
+            $latest_entry = serendipity_fetchEntries(null, false, 1, false, false, 'last_modified DESC');
         break;
     }
-    
+
     /*
      * Caching logic - Do not send feed if nothing has changed
      * Implementation inspired by Simon Willison [http://simon.incutio.com/archive/2003/04/23/conditionalGet], Thiemo Maettig
      */
-    
+
     // See if the client has provided the required headers.
     // Always convert the provided header into GMT timezone to allow comparing to the server-side last-modified header
     $modified_since = !empty($_SERVER['HTTP_IF_MODIFIED_SINCE'])
@@ -42,14 +42,14 @@
     $none_match     = !empty($_SERVER['HTTP_IF_NONE_MATCH'])
                     ? str_replace('"', '', stripslashes($_SERVER['HTTP_IF_NONE_MATCH']))
                     : false;
-    
+
     if (is_array($latest_entry) && isset($latest_entry[0]['last_modified'])) {
         $last_modified = gmdate('D, d M Y H:i:s \G\M\T', $latest_entry[0]['last_modified']);
         $etag          = '"' . $last_modified . '"';
-    
+
         header('Last-Modified: ' . $last_modified);
         header('ETag: '          . $etag);
-        
+
         if (($none_match == $last_modified && $modified_since == $last_modified) ||
             (!$none_match && $modified_since == $last_modified) ||
             (!$modified_since && $none_match == $last_modified)) {
@@ -125,7 +125,7 @@
     serendipity_plugin_api::hook_event('frontend_display:rss-1.0:namespace', $eventData);
     print <<<HEAD
 <rdf:RDF {$eventData['display_dat']}
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:admin="http://webns.net/mvcb/"
    xmlns:content="http://purl.org/rss/1.0/modules/content/"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
@@ -139,7 +139,7 @@
     <admin:errorReportsTo rdf:resource="mailto:{$serendipity['email']}" />
 
     {$additional_fields['image_rss1.0_channel']}
-    
+
     <items>
       <rdf:Seq>{$rdf_seq_li}</rdf:Seq>
     </items>
@@ -179,7 +179,7 @@
     print <<<HEAD
 <feed version="0.3"
    xmlns="http://purl.org/atom/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:admin="http://webns.net/mvcb/"
    xmlns:slash="http://purl.org/rss/1.0/modules/slash/"
@@ -193,7 +193,7 @@
     <modified>$modified</modified>
     <generator url="http://www.s9y.org/" version="{$serendipity['version']}">Serendipity {$serendipity['version']} - http://www.s9y.org/</generator>
     <dc:language>{$serendipity['lang']}</dc:language>
-    <admin:errorReportsTo rdf:resource="mailto:{$serendipity['email']}" /> 
+    <admin:errorReportsTo rdf:resource="mailto:{$serendipity['email']}" />
     <info mode="xml" type="text/html">
         <div xmlns="http://www.w3.org/1999/xhtml">You are viewing an ATOM formatted XML site feed. Usually this file is inteded to be viewed in an aggregator or syndication software. If you want to know more about ATOM, please visist <a href="http://atomenabled.org/">Atomenabled.org</a></div>
     </info>

[php-blog-cvs] serendipity/templates/newspaper style.css,1.7,1.8

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/newspaper
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1850/templates/newspaper

Modified Files:
	style.css 
Log Message:
Major functional redesign of "Edit entries".


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/newspaper/style.css,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- style.css	12 May 2004 14:35:29 -0000	1.7
+++ style.css	13 May 2004 13:10:55 -0000	1.8
@@ -312,3 +312,11 @@
     clear: both;
     display: block;
 }
+
+.serendipity_admin_list_item_even {
+    background-color: #ffffff;
+}
+
+.serendipity_admin_list_item_uneven {
+    background-color: #E0E0E0;
+}

[php-blog-cvs] serendipity/templates/mt-trendy style.css,1.17,1.18

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/mt-trendy
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1850/templates/mt-trendy

Modified Files:
	style.css 
Log Message:
Major functional redesign of "Edit entries".


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt-trendy/style.css,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- style.css	12 May 2004 14:35:28 -0000	1.17
+++ style.css	13 May 2004 13:10:55 -0000	1.18
@@ -231,3 +231,11 @@
     clear: both;
     display: block;
 }
+
+.serendipity_admin_list_item_even {
+    background-color: #ffffff;
+}
+
+.serendipity_admin_list_item_uneven {
+    background-color: #E0E0E0;
+}

[php-blog-cvs] serendipity/templates/default style.css,1.18,1.19

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1850/templates/default

Modified Files:
	style.css 
Log Message:
Major functional redesign of "Edit entries".


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/style.css,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- style.css	12 May 2004 14:35:22 -0000	1.18
+++ style.css	13 May 2004 13:10:54 -0000	1.19
@@ -352,3 +352,11 @@
     clear: both;
     display: block;
 }
+
+.serendipity_admin_list_item_even {
+    background-color: #ffffff;
+}
+
+.serendipity_admin_list_item_uneven {
+    background-color: #E0E0E0;
+}

[php-blog-cvs] serendipity/templates/blue style.css,1.6,1.7

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/blue
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1850/templates/blue

Modified Files:
	style.css 
Log Message:
Major functional redesign of "Edit entries".


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/blue/style.css,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- style.css	12 May 2004 14:35:20 -0000	1.6
+++ style.css	13 May 2004 13:10:53 -0000	1.7
@@ -283,3 +283,10 @@
     display: block;
 }
 
+.serendipity_admin_list_item_even {
+    background-color: #ffffff;
+}
+
+.serendipity_admin_list_item_uneven {
+    background-color: #E0E0E0;
+}

[php-blog-cvs] serendipity/lang serendipity_lang_cs.inc.php,1.10,1.11 serendipity_lang_cz.inc.php,1.10,1.11 serendipity_lang_da.inc.php,1.26,1.27 serendipity_lang_de.inc.php,1.36,1.37 serendipity_lang_en.inc.php,1.29,1.30 serendipity_lang_es.inc.php,1.29,1.30 serendipity_lang_fr.inc.php,1.8,1.9

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1850/lang

Modified Files:
	serendipity_lang_cs.inc.php serendipity_lang_cz.inc.php 
	serendipity_lang_da.inc.php serendipity_lang_de.inc.php 
	serendipity_lang_en.inc.php serendipity_lang_es.inc.php 
	serendipity_lang_fr.inc.php 
Log Message:
Major functional redesign of "Edit entries".


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serendipity_lang_cs.inc.php	5 May 2004 16:40:11 -0000	1.10
+++ serendipity_lang_cs.inc.php	13 May 2004 13:10:56 -0000	1.11
@@ -12,6 +12,7 @@
 @define('LANG_CHARSET', 'Windows-1250');
 @define('DATE_LOCALES', 'Czech, cs_CZ, cs');
 @define('DATE_FORMAT_ENTRY', '%A, %e. %B %Y');
+@define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M');
 @define('WYSIWYG_LANG', 'cz');
 
 @define('SERENDIPITY_ADMIN_SUITE', 'Administrátorská sekce');
@@ -94,7 +95,7 @@
 @define('CANNOT_EDIT_CATEGORY', 'Kategorie not available');
 @define('ENTRY_BODY', 'Text záznamu');
 @define('EXTENDED_BODY', 'Rozšíøená textová èást');
-@define('CATEGORY', 'Kategorie:');
+@define('CATEGORY', 'Kategorie');
 @define('TEMPLATE_NAME', 'Název vzoru');
 @define('CHOOSE_STYLESHEET', 'Vybrat styl...');
 @define('EDIT', 'Editace');
@@ -369,5 +370,10 @@
 @define('DELETE_USER', 'Chcete vymazat uživatele #%d %s. Myslíte to vážnì? Tato akce znemožní prohlížet jím vytvoøené záznamy na hlavní stránce.');
 @define('DELETED_USER', 'Uživatel #%d %s je vymazán.');
 @define('LIMIT_TO_NUMBER', 'Kolik záznamù by mìlo být zobrazeno?');
+
+// TRANSLATE
+@define('FILTER', 'Filter');
+@define('ENTRIES_PER_PAGE', 'entries per page');
+
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- serendipity_lang_da.inc.php	5 May 2004 16:40:13 -0000	1.26
+++ serendipity_lang_da.inc.php	13 May 2004 13:10:59 -0000	1.27
@@ -11,6 +11,7 @@
 @define('LANG_CHARSET', 'ISO-8859-1');
 @define('DATE_LOCALES', 'danish, da, da_DK');
 @define('DATE_FORMAT_ENTRY', '%A d. %e. %B %Y');
+@define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M');
 @define('WYSIWYG_LANG', 'da');
 
 @define('SERENDIPITY_ADMIN_SUITE', 'Serendipity Administrationssuite');
@@ -92,7 +93,7 @@
 @define('CANNOT_EDIT_CATEGORY', 'Kategori not available');
 @define('ENTRY_BODY', 'Artikel indhold');
 @define('EXTENDED_BODY', 'Udvidet indhold');
-@define('CATEGORY', 'Kategori:');
+@define('CATEGORY', 'Kategori');
 @define('TEMPLATE_NAME', 'Navn på template');
 @define('CHOOSE_STYLESHEET', 'Vælg et stylesheet....');
 @define('EDIT', 'Rediger');
@@ -367,5 +368,8 @@
 @define('DELETE_USER', 'You are about to delete user #%d %s. Are you serious? This will disallow showing any entries written by him on the frontend.');
 @define('DELETED_USER', 'User #%d %s deleted.');
 @define('LIMIT_TO_NUMBER', 'How many items should be displayed?'); /* TRANSLATE */
+@define('FILTER', 'Filter');
+@define('ENTRIES_PER_PAGE', 'entries per page');
+
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_fr.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- serendipity_lang_fr.inc.php	5 May 2004 16:40:15 -0000	1.8
+++ serendipity_lang_fr.inc.php	13 May 2004 13:11:00 -0000	1.9
@@ -12,6 +12,7 @@
 @define('LANG_CHARSET', 'ISO-8859-1');
 @define('DATE_LOCALES', 'french, fr, en_US');
 @define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y');
+@define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M');
 @define('WYSIWYG_LANG', 'fr');
 
 @define('SERENDIPITY_ADMIN_SUITE', 'Serendipity Administration (Suite)');
@@ -94,7 +95,7 @@
 @define('CANNOT_EDIT_CATEGORY', 'Catégorie non disponible');
 @define('ENTRY_BODY', 'Corps de la news');
 @define('EXTENDED_BODY', 'Extension de la news');
-@define('CATEGORY', 'Catégorie:');
+@define('CATEGORY', 'Catégorie');
 @define('TEMPLATE_NAME', 'Nom du thème');
 @define('CHOOSE_STYLESHEET', 'Choisissez un style....');
 @define('EDIT', 'Editer');
@@ -356,5 +357,10 @@
 @define('DELETE_USER', 'Vous allez supprimer l\'utilisateur #%d %s. Etes vous sérieux? Cela empêchera toute visualisation de ses news sur la page principale.');
 @define('DELETED_USER', 'Utilisateur #%d %s supprimé.');
 @define('LIMIT_TO_NUMBER', 'How many items should be displayed?'); /* TRANSLATE */
+
+// TRANSLATE
+@define('FILTER', 'Filter');
+@define('ENTRIES_PER_PAGE', 'entries per page');
+
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_cz.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serendipity_lang_cz.inc.php	5 May 2004 16:40:12 -0000	1.10
+++ serendipity_lang_cz.inc.php	13 May 2004 13:10:57 -0000	1.11
@@ -12,6 +12,7 @@
 @define('LANG_CHARSET', 'ISO-8859-2');
 @define('DATE_LOCALES', 'Czech, cs_CZ, cs');
 @define('DATE_FORMAT_ENTRY', '%A, %e. %B %Y');
+@define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M');
 @define('WYSIWYG_LANG', 'cz');
 
 @define('SERENDIPITY_ADMIN_SUITE', 'Administrátorská sekce');
@@ -94,7 +95,7 @@
 @define('CANNOT_EDIT_CATEGORY', 'Kategorie not available');
 @define('ENTRY_BODY', 'Text záznamu');
 @define('EXTENDED_BODY', 'Roz¹íøená textová èást');
-@define('CATEGORY', 'Kategorie:');
+@define('CATEGORY', 'Kategorie');
 @define('TEMPLATE_NAME', 'Název vzoru');
 @define('CHOOSE_STYLESHEET', 'Vybrat styl...');
 @define('EDIT', 'Editace');
@@ -367,5 +368,10 @@
 @define('DELETE_USER', 'Chcete vymazat u¾ivatele #%d %s. Myslíte to vá¾nì? Tato akce znemo¾ní prohlí¾et jím vytvoøené záznamy na hlavní stránce.');
 @define('DELETED_USER', 'U¾ivatel #%d %s je vymazán.');
 @define('LIMIT_TO_NUMBER', 'Kolik záznamù by mìlo být zobrazeno?');
+
+// TRANSLATE
+@define('FILTER', 'Filter');
+@define('ENTRIES_PER_PAGE', 'entries per page');
+
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- serendipity_lang_en.inc.php	5 May 2004 16:40:14 -0000	1.29
+++ serendipity_lang_en.inc.php	13 May 2004 13:10:59 -0000	1.30
@@ -12,6 +12,7 @@
 @define('LANG_CHARSET', 'ISO-8859-1');
 @define('DATE_LOCALES', 'english, en, en_US');
 @define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y');
+@define('DATE_FORMAT_SHORT', '%Y-%m-%d %H:%M');
 @define('WYSIWYG_LANG', 'en');
 
 @define('SERENDIPITY_ADMIN_SUITE', 'Serendipity Administration Suite');
@@ -94,7 +95,7 @@
 @define('CANNOT_EDIT_CATEGORY', 'Category Not Available');
 @define('ENTRY_BODY', 'Entry Body');
 @define('EXTENDED_BODY', 'Extended Body');
-@define('CATEGORY', 'Category:');
+@define('CATEGORY', 'Category');
 @define('TEMPLATE_NAME', 'template name');
 @define('CHOOSE_STYLESHEET', 'Choose a style sheet....');
 @define('EDIT', 'Edit');
@@ -356,5 +357,7 @@
 @define('DELETE_USER', 'You are about to delete user #%d %s. Are you serious? This will disallow showing any entries written by him on the frontend.');
 @define('DELETED_USER', 'User #%d %s deleted.');
 @define('LIMIT_TO_NUMBER', 'How many items should be displayed?');
+@define('FILTER', 'Filter');
+@define('ENTRIES_PER_PAGE', 'entries per page');
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- serendipity_lang_es.inc.php	5 May 2004 16:40:15 -0000	1.29
+++ serendipity_lang_es.inc.php	13 May 2004 13:11:00 -0000	1.30
@@ -15,6 +15,7 @@
 @define('LANG_CHARSET', 'ISO-8859-1');
 @define('DATE_LOCALES', 'spanish');
 @define('DATE_FORMAT_ENTRY', '%A, %B %e. %Y');
+@define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M');
 @define('WYSIWYG_LANG', 'es');
 
 @define('SERENDIPITY_ADMIN_SUITE', 'Suite de Administración de Serendipity');
@@ -96,7 +97,7 @@
 @define('CANNOT_EDIT_CATEGORY', 'Categoría no disponible');
 @define('ENTRY_BODY', 'Texto del post');
 @define('EXTENDED_BODY', 'Texto ampliado');
-@define('CATEGORY', 'Categoría:');
+@define('CATEGORY', 'Categoría');
 @define('TEMPLATE_NAME', 'Nombre de la plantilla');
 @define('CHOOSE_STYLESHEET', 'Selecciona una hoja de estilo..');
 @define('EDIT', 'Editar');
@@ -351,5 +352,8 @@
 @define('DELETE_USER', 'You are about to delete user #%d %s. Are you serious? This will disallow showing any entries written by him on the frontend.');
 @define('DELETED_USER', 'User #%d %s deleted.');
 @define('LIMIT_TO_NUMBER', 'How many items should be displayed?'); /* TRANSLATE */
+@define('FILTER', 'Filter');
+@define('ENTRIES_PER_PAGE', 'entries per page');
+
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- serendipity_lang_de.inc.php	5 May 2004 16:40:13 -0000	1.36
+++ serendipity_lang_de.inc.php	13 May 2004 13:10:59 -0000	1.37
@@ -12,6 +12,7 @@
 @define('LANG_CHARSET', 'ISO-8859-1');
 @define('DATE_LOCALES', 'german, de_DE, de, de_DE.ISO8859-1');
 @define('DATE_FORMAT_ENTRY', '%A, %e. %B %Y');
+@define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M');
 @define('WYSIWYG_LANG', 'de');
 
 @define('SERENDIPITY_ADMIN_SUITE', 'Serendipity Verwaltungsoberfläche');
@@ -91,7 +92,7 @@
 @define('CANNOT_EDIT_CATEGORY', 'Kategorie nicht vorhanden');
 @define('ENTRY_BODY', 'Eintrag');
 @define('EXTENDED_BODY', 'Erweiterter Eintrag');
-@define('CATEGORY', 'Kategorie:');
+@define('CATEGORY', 'Kategorie');
 @define('TEMPLATE_NAME', 'Template Name');
 @define('CHOOSE_STYLESHEET', 'Bitte ein Stylesheet wählen...');
 @define('EDIT', 'Bearbeiten');
@@ -356,6 +357,8 @@
 @define('DELETE_USER', 'Sie wollen den Benutzer #%d %s löschen. Sind sie sicher? Dadurch werden seine Artikel nicht mehr auf der Oberfläche angezeigt.');
 @define('DELETED_USER', 'Benutzer #%d %s gelöscht.');
 @define('LIMIT_TO_NUMBER', 'Wieviele Elemente sollen angezeigt werden?');
+@define('FILTER', 'Filter');
+@define('ENTRIES_PER_PAGE', 'Artikel pro Seite');
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.264,1.265

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30484

Modified Files:
	serendipity_functions.inc.php 
Log Message:
fix stripping markup from comments (introduced with the comment-url
redirection few days ago)


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.264
retrieving revision 1.265
diff -u -d -r1.264 -r1.265
--- serendipity_functions.inc.php	11 May 2004 12:08:03 -0000	1.264
+++ serendipity_functions.inc.php	13 May 2004 07:27:46 -0000	1.265
@@ -1207,11 +1207,11 @@
     foreach ($comments as $comment) {
         $x++;
 
-        $comment['comment'] = $comment['body'];
+        $comment['comment'] = htmlspecialchars(strip_tags($comment['body']));
         if (!empty($comment['url']) && substr($comment['url'], 0, 7) != 'http://') {
             $comment['url'] = 'http://' . $comment['url'];
         }
-        
+
         serendipity_plugin_api::hook_event('frontend_display', $comment);
 
         /* Protect submitted mails against spam, by replacing @ with [at]*/
@@ -1220,7 +1220,7 @@
         }
 
         $name = empty($comment['author']) ? ANONYMOUS : $comment['author'];
-        $body = htmlspecialchars(strip_tags($comment['comment']));
+        $body = $comment['comment'];
 ?>
     <div class="serendipity_comment">
             <a <?php echo ($serendipity['XHTML11'] ? 'id' : 'name'); ?>="c<?php echo $comment['id']; ?>"></a>

[php-blog-cvs] serendipity NEWS,1.120,1.121

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18010

Modified Files:
	NEWS 
Log Message:
finalized 0.6 release notes


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- NEWS	12 May 2004 14:35:20 -0000	1.120
+++ NEWS	12 May 2004 14:52:48 -0000	1.121
@@ -73,9 +73,73 @@
 
     * Configuration is now language-dependant. (garvinhicking)
 
-Version 0.6 ()
+Version 0.6 (May 12th, 2004)
 ------------------------------------------------------------------------
 
+    [changes since 0.6-rc2]
+    * Creative Commons plugin bugfix (wrong 'non-commercial' case)
+      (garvinhicking)
+
+    * Fixed wrong doctype header (garvinhicking)
+
+    * Fix %e date issue on windows systems. (garvinhicking, tomsommer)
+
+    * Fix serendipity_makefilename() to replace some more foreign
+      characters (garvinhicking)
+
+    * Shoutbox plugin bugfix (errors using '%' in shouts) (garvinhicking)
+
+    * Error with non-absolute image paths in RSS feed (garvinhicking)
+
+    * Fixed installer problems timeouting (garvinhicking)
+
+    * Removed possible error message about session_start for categories
+      admin page (garvinhicking)
+
+    * Fixed postgresql limit error when browsing pages (garvinhicking)
+
+    [changes before 0.6-rc2]
+    * Image upload now strips all characters not suggested for filename
+      use (garvinhicking)
+
+    * Language Charset Header are now used throughout s9y which make it
+      completely foreign-language compatible (garvinhicking)
+
+    * German translation fix (garvinhicking)
+
+    * Upgrader kills the current session for possible changes inside
+      session data on upgrade (garvinhicking)
+
+    * Fixed wrong comparison operator - bug reported by tom, where nl2br
+      plugin has "reversed" logic. (garvinhicking)
+
+    * Fixed textile plugin not enabled by default after adding it as a
+      plugin (garvinhicking)
+
+    * Comments plugin now correctly wordwraps (garvinhicking)
+
+    * Fixed wrong HTML links for WYSIWYG-editor in Internet Explorer
+      (garvinhicking)
+
+    * Fixed htmlentites acceptance for foreign language entry titles
+      (garvinhicking)
+
+    * Relaxed dependency on WIKI plugin, if the inclusion fails.
+      (garvinhicking)
+
+    * PostgreSQL SQL update files (jtate)
+
+    * Better detection of serendipityPath variable (garvinhicking)
+
+    * Adjustable WYSIWYG-language for foreign languages (garvinhicking)
+
+    * Fixed special characters for WYSIWYG-htmlarea.css file
+      (garvinhicking)
+
+    * Fixed WYSIWYG-editing error for HTML Nugget plugin (garvinhicking)
+
+    * newline fixes inside the files (cosmetic issues) (isotopp)
+
     * Fixed losing commenting user details when previewing a comment
      (garvinhicking)
 

[php-blog-cvs] serendipity NEWS,1.103.4.2,1.103.4.3

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17417

Modified Files:
      Tag: branch_0_6
	NEWS 
Log Message:
0.6 release


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.103.4.2
retrieving revision 1.103.4.3
diff -u -d -r1.103.4.2 -r1.103.4.3
--- NEWS	26 Apr 2004 10:56:42 -0000	1.103.4.2
+++ NEWS	12 May 2004 14:50:35 -0000	1.103.4.3
@@ -1,32 +1,71 @@
 # $Id$
 
-Fixes since -rc1:
+Version 0.6 (May 12h, 2004)
 ------------------------------------------------------------------------
 
+    [changes since 0.6-rc2]
+    * Creative Commons plugin bugfix (wrong 'non-commercial' case)
+      (garvinhicking)
+
+    * Fixed wrong doctype header (garvinhicking)
+
+    * Fix %e date issue on windows systems. (garvinhicking, tomsommer)
+
+    * Fix serendipity_makefilename() to replace some more foreign
+      characters (garvinhicking)
+
+    * Shoutbox plugin bugfix (errors using '%' in shouts) (garvinhicking)
+
+    * Error with non-absolute image paths in RSS feed (garvinhicking)
+
+    * Fixed installer problems timeouting (garvinhicking)
+
+    * Removed possible error message about session_start for categories
+      admin page (garvinhicking)
+
+    * Fixed postgresql limit error when browsing pages (garvinhicking)
+
+    [changes before 0.6-rc2]
     * Image upload now strips all characters not suggested for filename
       use (garvinhicking)
+
     * Language Charset Header are now used throughout s9y which make it
-      completely foreign-language compatible
-    * German translation fix
+      completely foreign-language compatible (garvinhicking)
+
+    * German translation fix (garvinhicking)
+
     * Upgrader kills the current session for possible changes inside
-      session data on upgrade
+      session data on upgrade (garvinhicking)
+
     * Fixed wrong comparison operator - bug reported by tom, where nl2br
-      plugin has "reversed" logic.
+      plugin has "reversed" logic. (garvinhicking)
+
     * Fixed textile plugin not enabled by default after adding it as a
-      plugin
-    * Comments plugin now correctly wordwraps
+      plugin (garvinhicking)
+
+    * Comments plugin now correctly wordwraps (garvinhicking)
+
     * Fixed wrong HTML links for WYSIWYG-editor in Internet Explorer
+      (garvinhicking)
+
     * Fixed htmlentites acceptance for foreign language entry titles
+      (garvinhicking)
+
     * Relaxed dependency on WIKI plugin, if the inclusion fails.
-    * PostgreSQL SQL update files
-    * Better detection of serendipityPath variable
-    * Adjustable WYSIWYG-language for foreign languages
+      (garvinhicking)
+
+    * PostgreSQL SQL update files (jtate)
+
+    * Better detection of serendipityPath variable (garvinhicking)
+
+    * Adjustable WYSIWYG-language for foreign languages (garvinhicking)
+
     * Fixed special characters for WYSIWYG-htmlarea.css file
-    * Fixed WYSIWYG-editing error for HTML Nugget plugin
-    * newline fixes inside the files (cosmetic issues)
+      (garvinhicking)
 
-Version 0.6 ()
-------------------------------------------------------------------------
+    * Fixed WYSIWYG-editing error for HTML Nugget plugin (garvinhicking)
+
+    * newline fixes inside the files (cosmetic issues) (isotopp)
 
     * Fixed losing commenting user details when previewing a comment
       (garvinhicking)
@@ -173,7 +212,7 @@
 
     * Renamed "sebastian's weblog" theme to "blue" (sebastianbergmann)
 
-Version 0.5-pl1 (February, 14th 2004)
+Version 0.5-pl1 (February 14th, 2004)
 ------------------------------------------------------------------------
 
     * Fixed XHTML-invalid anchor name (garvinhicking)

[php-blog-cvs] serendipity/templates/blue style.css,1.5,1.6

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/blue
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14208/templates/blue

Modified Files:
	style.css 
Log Message:
fix image comment display


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/blue/style.css,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- style.css	26 Apr 2004 10:33:21 -0000	1.5
+++ style.css	12 May 2004 14:35:20 -0000	1.6
@@ -253,6 +253,7 @@
 }
 
 .serendipity_imageComment_center {
+    margin: 0px;
 }
 
 .serendipity_imageComment_left {
@@ -277,3 +278,8 @@
     font-size: 9pt;
 }
 
+.serendipity_imageCommentClosing_center {
+    clear: both;
+    display: block;
+}
+

[php-blog-cvs] serendipity/templates/default style.css,1.17,1.18

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/default
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14208/templates/default

Modified Files:
	style.css 
Log Message:
fix image comment display


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/style.css,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- style.css	26 Apr 2004 10:33:22 -0000	1.17
+++ style.css	12 May 2004 14:35:22 -0000	1.18
@@ -323,6 +323,7 @@
 }
 
 .serendipity_imageComment_center {
+    margin: 0px;
 }
 
 .serendipity_imageComment_left {
@@ -346,3 +347,8 @@
     clear: both;
     font-size: 9pt;
 }
+
+.serendipity_imageCommentClosing_center {
+    clear: both;
+    display: block;
+}

[php-blog-cvs] serendipity serendipity_editor.js,1.10,1.11 serendipity_admin_image_selector.php,1.21,1.22 NEWS,1.119,1.120

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14208

Modified Files:
	serendipity_editor.js serendipity_admin_image_selector.php 
	NEWS 
Log Message:
fix image comment display


Index: serendipity_editor.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_editor.js,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serendipity_editor.js	4 May 2004 08:57:38 -0000	1.10
+++ serendipity_editor.js	12 May 2004 14:35:20 -0000	1.11
@@ -142,9 +142,13 @@
     var f = document.forms['serendipity[selForm]'].elements;
 
     if (f['serendipity[linkThumbnail]'][0].checked == true) {
-        img = f['thumbName'].value;
+        img       = f['thumbName'].value;
+        imgWidth  = f['imgThumbWidth'].value;
+        imgHeight = f['imgThumbHeight'].value;
     } else {
-        img = f['imgName'].value;
+        img       = f['imgName'].value;
+        imgWidth  = f['imgWidth'].value;
+        imgHeight = f['imgHeight'].value;
     }
 
     if (f['serendipity[filename_only]'] && f['serendipity[filename_only]'].value == 'true') {
@@ -162,22 +166,22 @@
     floating = 'center';
     if (XHTML11) {
         if (f['serendipity[align]'][0].checked == true) {
-            img = "<img " + (styled ? 'style="border: 0px; padding-left: 5px; padding-right: 5px;"' : '') + ' src="' + img + "\" alt=\"\" />\n";
+            img = "<img width='" + imgWidth + "' height='" + imgHeight + "' " + (styled ? 'style="border: 0px; padding-left: 5px; padding-right: 5px;"' : '') + ' src="' + img + "\" alt=\"\" />";
         } else if (f['serendipity[align]'][1].checked == true) {
-            img = "<img " + (styled ? 'style="float: left; border: 0px; padding-left: 5px; padding-right: 5px;"' : '') + ' src="' + img + "\" alt=\"\" />\n";
+            img = "<img width='" + imgWidth + "' height='" + imgHeight + "' " + (styled ? 'style="float: left; border: 0px; padding-left: 5px; padding-right: 5px;"' : '') + ' src="' + img + "\" alt=\"\" />";
             floating = 'left';
         } else if (f['serendipity[align]'][2].checked == true) {
-            img = "<img " + (styled ? 'style="float: right; border: 0px; padding-left: 5px; padding-right: 5px;"' : '') + ' src="' + img + "\" alt=\"\" />\n";
+            img = "<img width='" + imgWidth + "' height='" + imgHeight + "' " + (styled ? 'style="float: right; border: 0px; padding-left: 5px; padding-right: 5px;"' : '') + ' src="' + img + "\" alt=\"\" />";
             floating = 'right';
         }
     } else {
         if (f['serendipity[align]'][0].checked == true) {
-            img = "<img border='0' hspace='5' src='" + img + "' alt='' />\n";
+            img = "<img width='" + imgWidth + "' height='" + imgHeight + "' border='0' hspace='5' src='" + img + "' alt='' />";
         } else if (f['serendipity[align]'][1].checked == true) {
-            img = "<img border='0' hspace='5' align='left' src='" + img + "' alt='' />";
+            img = "<img width='" + imgWidth + "' height='" + imgHeight + "' border='0' hspace='5' align='left' src='" + img + "' alt='' />";
             floating = 'left';
         } else if (f['serendipity[align]'][2].checked == true) {
-            img = "<img border='0' hspace='5' align='right' src='" + img + "' alt='' />";
+            img = "<img width='" + imgWidth + "' height='" + imgHeight + "' border='0' hspace='5' align='right' src='" + img + "' alt='' />";
             floating = 'right';
         }
     }
@@ -190,10 +194,12 @@
 
     if (document.getElementById('serendipity_imagecomment').value != '') {
         comment = f['serendipity[imagecomment]'].value;
-        block = '<div class="serendipity_imageComment_' + floating + '">'
+        block = '<div class="serendipity_imageComment_' + floating + '" style="width: ' + imgWidth + 'px">'
               +     '<div class="serendipity_imageComment_img">' + insert + '</div>'
               +     '<div class="serendipity_imageComment_txt">' + comment.replace("\n", "<br />\n") + '</div>'
-              + '</div>';
+              + '</div>'
+              + '<span class="serendipity_imageCommentClosing_' + floating + '"><span></span></span>';
+
     } else {
         block = insert;
     }

Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.119
retrieving revision 1.120
diff -u -d -r1.119 -r1.120
--- NEWS	11 May 2004 19:39:44 -0000	1.119
+++ NEWS	12 May 2004 14:35:20 -0000	1.120
@@ -3,14 +3,20 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Fixed image comment manager's "center" alignment mode and use
+      image width/height from the image manager to format the <img>-Tag,
+      with regards to Lewe.
+      (garvinhicking)
+
     * Plugin 'serendipity_event_weblogping' now takes manually defined
-      pinging service as parameter.
+      pinging service as parameter. (garvinhicking)
 
     * Modified plugin 'serendipity_event_trackexits': New config
       directive to deflect any links from commenting users using a
       HTTP redirect. This destroys common search engine ranking and
       will not benefit comment spammers. Notice that it also disables
       the common linking to non-spammer authors, so use with caution.
+      (garvinhicking)
 
     * New plugin 'serendipity_plugin_remoterss' - Can display a foreign
       remote feed. Results are cached for a custom period of time.

Index: serendipity_admin_image_selector.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_image_selector.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- serendipity_admin_image_selector.php	26 Apr 2004 10:33:20 -0000	1.21
+++ serendipity_admin_image_selector.php	12 May 2004 14:35:20 -0000	1.22
@@ -35,9 +35,11 @@
 switch ($serendipity['GET']['step']) {
     case '1':
         $file = serendipity_fetchImageFromDatabase($serendipity['GET']['image']);
-        $imgsrc     = $serendipity['serendipityHTTPPath'] . $serendipity['uploadPath'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
-        $imgName    = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['name'] .'.'. $file['extension'];
-        $thumbName  = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
+        $imgsrc        = $serendipity['serendipityHTTPPath'] . $serendipity['uploadPath'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
+        $imgName       = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['name'] .'.'. $file['extension'];
+        $thumbbasename = $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
+        $thumbName     = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $thumbbasename;
+        $thumbsize     = getimagesize($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $thumbbasename);
 ?>
 <script type="text/javascript" language="JavaScript" src="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_define.js.php"></script>
 <script type="text/javascript" language="Javascript" src="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_editor.js"></script>
@@ -48,6 +50,10 @@
     <p>
         <form action="#" method="GET" name="serendipity[selForm]" onSubmit="serendipity_imageSelector_done()">
             <div>
+                <input type="hidden" name="imgThumbWidth"  value="<?php echo $thumbsize[0]; ?>" />
+                <input type="hidden" name="imgThumbHeight" value="<?php echo $thumbsize[1]; ?>" />
+                <input type="hidden" name="imgWidth"  value="<?php echo $file['dimensions_width']; ?>" />
+                <input type="hidden" name="imgHeight" value="<?php echo $file['dimensions_height']; ?>" />
                 <input type="hidden" name="imgName"   value="<?php echo $imgName; ?>" />
                 <input type="hidden" name="thumbName" value="<?php echo $thumbName; ?>" />
                 <?php if (!empty($serendipity['GET']['htmltarget'])) { ?>

[php-blog-cvs] serendipity/templates/mt-trendy style.css,1.16,1.17

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/mt-trendy
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14208/templates/mt-trendy

Modified Files:
	style.css 
Log Message:
fix image comment display


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt-trendy/style.css,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- style.css	26 Apr 2004 10:33:24 -0000	1.16
+++ style.css	12 May 2004 14:35:28 -0000	1.17
@@ -197,6 +197,7 @@
 }
 
 .serendipity_imageComment_center {
+    margin: 0px;
 }
 
 .serendipity_imageComment_left {
@@ -226,3 +227,7 @@
     border: 0px;
 }
 
+.serendipity_imageCommentClosing_center {
+    clear: both;
+    display: block;
+}

[php-blog-cvs] serendipity/deployment serendipity_editor.js,1.4,1.5

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/deployment
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14208/deployment

Modified Files:
	serendipity_editor.js 
Log Message:
fix image comment display


Index: serendipity_editor.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/deployment/serendipity_editor.js,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_editor.js	4 May 2004 08:57:38 -0000	1.4
+++ serendipity_editor.js	12 May 2004 14:35:29 -0000	1.5
@@ -142,9 +142,13 @@
     var f = document.forms['serendipity[selForm]'].elements;
 
     if (f['serendipity[linkThumbnail]'][0].checked == true) {
-        img = f['thumbName'].value;
+        img       = f['thumbName'].value;
+        imgWidth  = f['imgThumbWidth'].value;
+        imgHeight = f['imgThumbHeight'].value;
     } else {
-        img = f['imgName'].value;
+        img       = f['imgName'].value;
+        imgWidth  = f['imgWidth'].value;
+        imgHeight = f['imgHeight'].value;
     }
 
     if (f['serendipity[filename_only]'] && f['serendipity[filename_only]'].value == 'true') {
@@ -162,22 +166,22 @@
     floating = 'center';
     if (XHTML11) {
         if (f['serendipity[align]'][0].checked == true) {
-            img = "<img " + (styled ? 'style="border: 0px; padding-left: 5px; padding-right: 5px;"' : '') + ' src="' + img + "\" alt=\"\" />\n";
+            img = "<img width='" + imgWidth + "' height='" + imgHeight + "' " + (styled ? 'style="border: 0px; padding-left: 5px; padding-right: 5px;"' : '') + ' src="' + img + "\" alt=\"\" />";
         } else if (f['serendipity[align]'][1].checked == true) {
-            img = "<img " + (styled ? 'style="float: left; border: 0px; padding-left: 5px; padding-right: 5px;"' : '') + ' src="' + img + "\" alt=\"\" />\n";
+            img = "<img width='" + imgWidth + "' height='" + imgHeight + "' " + (styled ? 'style="float: left; border: 0px; padding-left: 5px; padding-right: 5px;"' : '') + ' src="' + img + "\" alt=\"\" />";
             floating = 'left';
         } else if (f['serendipity[align]'][2].checked == true) {
-            img = "<img " + (styled ? 'style="float: right; border: 0px; padding-left: 5px; padding-right: 5px;"' : '') + ' src="' + img + "\" alt=\"\" />\n";
+            img = "<img width='" + imgWidth + "' height='" + imgHeight + "' " + (styled ? 'style="float: right; border: 0px; padding-left: 5px; padding-right: 5px;"' : '') + ' src="' + img + "\" alt=\"\" />";
             floating = 'right';
         }
     } else {
         if (f['serendipity[align]'][0].checked == true) {
-            img = "<img border='0' hspace='5' src='" + img + "' alt='' />\n";
+            img = "<img width='" + imgWidth + "' height='" + imgHeight + "' border='0' hspace='5' src='" + img + "' alt='' />";
         } else if (f['serendipity[align]'][1].checked == true) {
-            img = "<img border='0' hspace='5' align='left' src='" + img + "' alt='' />";
+            img = "<img width='" + imgWidth + "' height='" + imgHeight + "' border='0' hspace='5' align='left' src='" + img + "' alt='' />";
             floating = 'left';
         } else if (f['serendipity[align]'][2].checked == true) {
-            img = "<img border='0' hspace='5' align='right' src='" + img + "' alt='' />";
+            img = "<img width='" + imgWidth + "' height='" + imgHeight + "' border='0' hspace='5' align='right' src='" + img + "' alt='' />";
             floating = 'right';
         }
     }
@@ -190,10 +194,12 @@
 
     if (document.getElementById('serendipity_imagecomment').value != '') {
         comment = f['serendipity[imagecomment]'].value;
-        block = '<div class="serendipity_imageComment_' + floating + '">'
+        block = '<div class="serendipity_imageComment_' + floating + '" style="width: ' + imgWidth + 'px">'
               +     '<div class="serendipity_imageComment_img">' + insert + '</div>'
               +     '<div class="serendipity_imageComment_txt">' + comment.replace("\n", "<br />\n") + '</div>'
-              + '</div>';
+              + '</div>'
+              + '<span class="serendipity_imageCommentClosing_' + floating + '"><span></span></span>';
+
     } else {
         block = insert;
     }

[php-blog-cvs] serendipity/templates/newspaper style.css,1.6,1.7

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/newspaper
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14208/templates/newspaper

Modified Files:
	style.css 
Log Message:
fix image comment display


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/newspaper/style.css,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- style.css	26 Apr 2004 10:33:25 -0000	1.6
+++ style.css	12 May 2004 14:35:29 -0000	1.7
@@ -278,6 +278,7 @@
 }
 
 .serendipity_imageComment_center {
+    margin: 0px;
 }
 
 .serendipity_imageComment_left {
@@ -307,3 +308,7 @@
     border: 0px;
 }
 
+.serendipity_imageCommentClosing_center {
+    clear: both;
+    display: block;
+}