[phpwiki-checkins] CVS: phpwiki/lib Theme.php,1.47,1.48 display.php,1.31,1.32

[Reini U. <ru...@us...>]

Update of /cvsroot/phpwiki/phpwiki/lib
In directory usw-pr-cvs1:/tmp/cvs-serv20662/lib

Modified Files:
	Theme.php display.php 
Log Message:
New "Today" button if the user has a Calender Page defined. weblog-style.



Index: Theme.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Theme.php,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -2 -b -p -d -r1.47 -r1.48
--- Theme.php	17 Aug 2002 15:52:51 -0000	1.47
+++ Theme.php	17 Aug 2002 17:03:05 -0000	1.48
@@ -34,5 +34,5 @@ function WikiLink ($page_or_rev, $type =
 
     if ($type == 'button') {
-        return $Theme->makeLinkButton($page_or_rev);
+        return $Theme->makeLinkButton($page_or_rev, $label);
     }
 
@@ -85,5 +85,5 @@ function WikiLink ($page_or_rev, $type =
         $exists = true;
     }
-    // Todo: fix ImageLinks images/next.gif semantics
+    // test external ImageLinks http://some/images/next.gif
     //       support "/SubPage" relative link
     if (is_string($page_or_rev) 
@@ -670,10 +670,10 @@ class Theme {
      * @return object A Button object.
      */
-    function makeLinkButton ($page_or_rev) {
+    function makeLinkButton ($page_or_rev, $label = false) {
         extract($this->_get_name_and_rev($page_or_rev));
 
         $args = $version ? array('version' => $version) : false;
 
-        return $this->makeButton($pagename, WikiURL($pagename, $args), 'wiki');
+        return $this->makeButton($label ? $label : $pagename, WikiURL($pagename, $args), 'wiki');
     }
 

Index: display.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/display.php,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -2 -b -p -d -r1.31 -r1.32
--- display.php	17 Aug 2002 15:52:51 -0000	1.31
+++ display.php	17 Aug 2002 17:03:05 -0000	1.32
@@ -55,4 +55,6 @@ function actionPage(&$request, $action) 
     $actionrev = $actionpage->getCurrentRevision();
 
+    // $splitname = split_pagename($pagename);
+
     $pagetitle = HTML(fmt("%s: %s", $actionpage->getName(),
                           $Theme->linkExistingWikiWord($pagename, false, $version)));
@@ -63,5 +65,9 @@ function actionPage(&$request, $action) 
 
     header("Content-Type: text/html; charset=" . CHARSET);
+    if (!defined('DEBUG')) {
     header("Last-Modified: ".Rfc2822DateTime($revision->get('mtime')));
+    }
+
+    // $template = Template('browse', array('CONTENT' => TransformText($actionrev)));
 
     GeneratePage($template, $pagetitle, $revision);
@@ -120,5 +126,5 @@ function displayPage(&$request, $tmpl = 
     header("Content-Type: text/html; charset=" . CHARSET);
     // don't clobber date header given by RC
-    if ( ! ($pagename == _("RecentChanges") || $pagename == _("RecentEdits")) )
+    if ( ! ($pagename == _("RecentChanges") || $pagename == _("RecentEdits") || defined('DEBUG')) )
         header("Last-Modified: ".Rfc2822DateTime($revision->get('mtime')));