Update of /cvsroot/phpwiki/phpwiki/lib/plugin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17442
Modified Files:
BlogArchives.php RecentChanges.php
Log Message:
fix box method
Index: BlogArchives.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/BlogArchives.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -2 -b -p -d -r1.2 -r1.3
--- BlogArchives.php 14 Dec 2004 21:35:15 -0000 1.2
+++ BlogArchives.php 15 Dec 2004 17:45:08 -0000 1.3
@@ -72,8 +72,10 @@ extends WikiPlugin_WikiBlog
function run($dbi, $argstr, &$request, $basepage) {
- if (is_array($argstr)) // can do with array also.
+ if (is_array($argstr)) { // can do with array also.
$args =& $argstr;
- else
+ if (!isset($args['order'])) $args['order'] = 'reverse';
+ } else {
$args = $this->getArgs($argstr, $request);
+ }
if (empty($args['user'])) {
$user = $request->getUser();
@@ -97,4 +99,5 @@ extends WikiPlugin_WikiBlog
// unset($pagelist->_columns['pagename']);
+ $sp = HTML::Raw('· ');
if (!empty($args['month'])) {
$prefix = $parent . $this->_blogPrefix('wikiblog') .
SUBPAGE_SEPARATOR . $args['month'];
@@ -105,5 +108,5 @@ extends WikiPlugin_WikiBlog
if ($rev->get('pagetype') != 'wikiblog') continue;
$blog = $this->_blog($rev);
- $html->pushContent(WikiLink($page, 'known',
$rev->get('summary')));
+ $html->pushContent(HTML::li(WikiLink($page, 'known',
$rev->get('summary'))));
}
if (!$args['noheader'])
@@ -137,7 +140,7 @@ extends WikiPlugin_WikiBlog
}
foreach ($months as $m) {
- $html->pushContent(HTML::a(array('href'=>$m['link'],
+ $html->pushContent(HTML::li(HTML::a(array('href'=>$m['link'],
'class' => 'named-wiki'),
- $m['title'] . " (".$m['num'].")"));
+ $m['title'] . "
(".$m['num'].")")));
}
if (!$args['noheader'])
@@ -159,4 +162,7 @@ extends WikiPlugin_WikiBlog
// $Log$
+// Revision 1.3 2004/12/15 17:45:08 rurban
+// fix box method
+//
// Revision 1.2 2004/12/14 21:35:15 rurban
// support new BLOG_EMPTY_DEFAULT_PREFIX
Index: RecentChanges.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/RecentChanges.php,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -2 -b -p -d -r1.102 -r1.103
--- RecentChanges.php 6 Dec 2004 19:29:24 -0000 1.102
+++ RecentChanges.php 15 Dec 2004 17:45:09 -0000 1.103
@@ -506,5 +506,6 @@ extends _RecentChanges_HtmlFormatter
// enforce view permission
if (mayAccessPage('view',$rev->_pagename)) {
- $html->pushContent($sp,$this->pageLink($rev),HTML::br());
+ if ($link = $this->pageLink($rev)) // some entries may be empty
(/Blog/.. interim pages)
+ $html->pushContent($sp, $link, HTML::br());
if ($first)
$this->setValidators($rev);
@@ -920,4 +921,7 @@ class DayButtonBar extends HtmlElement {
// $Log$
+// Revision 1.103 2004/12/15 17:45:09 rurban
+// fix box method
+//
// Revision 1.102 2004/12/06 19:29:24 rurban
// simplify RSS: add RSS2 link (rss tag only, new content-type)
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
|