phpwiki-checkins — Automatic notification of CVS checkins on PhpWiki.

[phpwiki-checkins] CVS: phpwiki/lib savepage.php,1.24,1.25

[Carsten K. <car...@us...>]

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

Modified Files:
	savepage.php 
Log Message:
New template token: ${EDIT_FAIL_MESSAGES} so that NoChangesMade() and ConcurrentUpdates() errors can be displayed on the browse template. Expanded save error message "page has been locked by the admin...".

Index: savepage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/savepage.php,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -r1.24 -r1.25
*** savepage.php	2002/01/08 00:31:24	1.24
--- savepage.php	2002/01/08 06:46:58	1.25
***************
*** 24,33 ****
  
  function ConcurrentUpdates($pagename) {
!    /* xgettext only knows about c/c++ line-continuation strings
       it does not know about php's dot operator.
       We want to translate this entire paragraph as one string, of course.
     */
      $html = "<p>";
!     $html .= "<h1>" .sprintf (_("Problem while updating %s"), $pagename) ."</h1>";
      $html .= _("PhpWiki is unable to save your changes, because another user edited and saved the page while you were editing the page too. If saving proceeded now changes from the previous author would be lost.");
      $html .= "</p>\n<p>";
--- 24,34 ----
  
  function ConcurrentUpdates($pagename) {
!    /*
!      xgettext only knows about c/c++ line-continuation strings
       it does not know about php's dot operator.
       We want to translate this entire paragraph as one string, of course.
     */
      $html = "<p>";
!     $html = QElement('h1', __sprintf("Problem while updating %s", $pagename));
      $html .= _("PhpWiki is unable to save your changes, because another user edited and saved the page while you were editing the page too. If saving proceeded now changes from the previous author would be lost.");
      $html .= "</p>\n<p>";
***************
*** 51,58 ****
  function PageIsLocked($pagename) {
      $html = QElement('p',
!                      _("This page has been locked by the administrator and cannot be edited."));
      $html .= QElement('p',
                        _("Sorry for the inconvenience."));
! 
      echo GeneratePage('MESSAGE', $html,
                        sprintf (_("Problem while editing %s"), $pagename));
--- 52,62 ----
  function PageIsLocked($pagename) {
      $html = QElement('p',
!                      _("This page has been locked by the administrator so your changes could not be saved."));
!     $html .= '<p>' ._("Use your browser's <b>Back</b> button to go back to the edit page.");
!     $html .= _("Copy your changes to the clipboard. You can try editing a different page or save your text in a text editor.");
!     $html .= '</p>';
      $html .= QElement('p',
                        _("Sorry for the inconvenience."));
!     
      echo GeneratePage('MESSAGE', $html,
                        sprintf (_("Problem while editing %s"), $pagename));
***************
*** 61,69 ****
  
  function NoChangesMade($pagename) {
!     $html = QElement('p', _("You have not made any changes."));
      $html .= QElement('p', _("New version not saved."));
!     echo GeneratePage('MESSAGE', $html,
!                       sprintf(_("Edit aborted: %s"), $pagename));
!     ExitWiki ("");
  }
  
--- 65,75 ----
  
  function NoChangesMade($pagename) {
!     $html = "<p>";
!     $html .= QElement('h1', __sprintf("Edit aborted: %s.", $pagename));
!     
!     $html .= QElement('p', _("You have not made any changes."));
      $html .= QElement('p', _("New version not saved."));
!     
!     return $html;
  }
  
***************
*** 75,86 ****
      ExitWiki ("");
  }
!     
  function savePreview($dbi, $request) {
      $pagename = $request->getArg('pagename');
      $version = $request->getArg('version');
! 
      $page = $dbi->getPage($pagename);
      $selected = $page->getRevision($version);
! 
      // FIXME: sanity checking about posted variables
      // FIXME: check for simultaneous edits.
--- 81,92 ----
      ExitWiki ("");
  }
! 
  function savePreview($dbi, $request) {
      $pagename = $request->getArg('pagename');
      $version = $request->getArg('version');
!     
      $page = $dbi->getPage($pagename);
      $selected = $page->getRevision($version);
!     
      // FIXME: sanity checking about posted variables
      // FIXME: check for simultaneous edits.
***************
*** 90,98 ****
                     'version') as $key)
          @$formvars[$key] = htmlspecialchars($request->getArg($key));
! 
      $template = new WikiTemplate('EDITPAGE');
      $template->setPageRevisionTokens($selected);
      $template->replace('FORMVARS', $formvars);
! 
      $PREVIEW_CONTENT= do_transform($request->getArg('content'));
      $template->replace('PREVIEW_CONTENT',$PREVIEW_CONTENT);
--- 96,104 ----
                     'version') as $key)
          @$formvars[$key] = htmlspecialchars($request->getArg($key));
!     
      $template = new WikiTemplate('EDITPAGE');
      $template->setPageRevisionTokens($selected);
      $template->replace('FORMVARS', $formvars);
!     
      $PREVIEW_CONTENT= do_transform($request->getArg('content'));
      $template->replace('PREVIEW_CONTENT',$PREVIEW_CONTENT);
***************
*** 100,104 ****
                         toolbar_Warnings_Edit(!empty($PREVIEW_CONTENT),
                                               $version == $request->getArg('editversion')));
! 
      echo $template->getExpansion();
  }
--- 106,110 ----
                         toolbar_Warnings_Edit(!empty($PREVIEW_CONTENT),
                                               $version == $request->getArg('editversion')));
!     
      echo $template->getExpansion();
  }
***************
*** 106,110 ****
  function savePage ($dbi, $request) {
      global $user;
! 
      // FIXME: fail if this check fails?
      assert($request->get('REQUEST_METHOD') == 'POST');
--- 112,116 ----
  function savePage ($dbi, $request) {
      global $user;
!     
      // FIXME: fail if this check fails?
      assert($request->get('REQUEST_METHOD') == 'POST');
***************
*** 115,122 ****
      $pagename = $request->getArg('pagename');
      $version = $request->getArg('version');
! 
      $page = $dbi->getPage($pagename);
      $current = $page->getCurrentRevision();
! 
      $content = $request->getArg('content');
      $editversion = $request->getArg('editversion');
--- 121,128 ----
      $pagename = $request->getArg('pagename');
      $version = $request->getArg('version');
!     
      $page = $dbi->getPage($pagename);
      $current = $page->getCurrentRevision();
!     
      $content = $request->getArg('content');
      $editversion = $request->getArg('editversion');
***************
*** 138,184 ****
  
      if ($content == $current->getPackedContent()) {
!         NoChangesMade($pagename); // noreturn
!     }
  
!     ////////////////////////////////////////////////////////////////
!     //
!     // From here on, we're actually saving.
!     //
!     $newrevision = $page->createRevision($editversion + 1,
!                                          $content, $meta,
!                                          ExtractWikiPageLinks($content));
! 
!     $template = new WikiTemplate('BROWSE');
!     $template->replace('TITLE', $pagename);
! 
!     if (is_object($newrevision)) {
!         // New contents successfully saved...
! 
!         // Clean out archived versions of this page.
!         $cleaner = new ArchiveCleaner($GLOBALS['ExpireParams']);
!         $cleaner->cleanPageRevisions($page);
          
!         $warnings = $dbi->GenericWarnings();
!         global $SignatureImg;
!         if (empty($warnings)) {
!             if (empty($SignatureImg)){
!                 // Do redirect to browse page if no signature has been defined.
!                 // In this case, the user will most likely not see the rest of
!                 // the HTML we generate (below).
!                 $request->redirect(WikiURL($pagename, false, 'absolute_url'));
              }
          }
-         
-         $template->replace('THANK_YOU',
-                            toolbar_Info_ThankYou($pagename, $warnings));
-     } else {
-         // Save failed.
-         // (This is a bit kludgy...)
-         $template->replace('THANK_YOU',
-                            ConcurrentUpdates($pagename)
-                            . "<hr noshade=\"noshade\" />");
-         $newrevision = $current;
      }
! 
      $template->setPageRevisionTokens($newrevision);
      $template->replace('CONTENT', do_transform($newrevision->getContent()));
--- 144,201 ----
  
      if ($content == $current->getPackedContent()) {
!         // Save failed.
!         // (This is a bit kludgy...)
!         $template = new WikiTemplate('BROWSE');
!         $template->replace('TITLE', $pagename);
!         $template->replace('EDIT_FAIL_MESSAGES',
!                            NoChangesMade($pagename)
!                            . QElement('hr', array('noshade' => 'noshade')));
!         $newrevision = $current;
!     } else {
  
!         ////////////////////////////////////////////////////////////////
!         //
!         // From here on, we're actually saving.
!         //
!         $newrevision = $page->createRevision($editversion + 1,
!                                              $content, $meta,
!                                              ExtractWikiPageLinks($content));
          
!         $template = new WikiTemplate('BROWSE');
!         $template->replace('TITLE', $pagename);
!         
!         if (is_object($newrevision)) {
!             // New contents successfully saved...
!             
!             // Clean out archived versions of this page.
!             $cleaner = new ArchiveCleaner($GLOBALS['ExpireParams']);
!             $cleaner->cleanPageRevisions($page);
!             
!             $warnings = $dbi->GenericWarnings();
!             global $SignatureImg;
!             if (empty($warnings)) {
!                 if (empty($SignatureImg)){
!                     // Do redirect to browse page if no signature has
!                     // been defined.  In this case, the user will most
!                     // likely not see the rest of the HTML we generate
!                     // (below).
!                     $request->redirect(WikiURL($pagename, false,
!                                                'absolute_url'));
!                 }
              }
+             
+             $template->replace('THANK_YOU',
+                                toolbar_Info_ThankYou($pagename, $warnings));
+         } else {
+             // Save failed.
+             // (This is a bit kludgy...)
+             $template->replace('EDIT_FAIL_MESSAGES',
+                                ConcurrentUpdates($pagename)
+                                . QElement('hr',
+                                           array('noshade' => 'noshade')));
+             $newrevision = $current;
          }
      }
!     
      $template->setPageRevisionTokens($newrevision);
      $template->replace('CONTENT', do_transform($newrevision->getContent()));
***************
*** 186,190 ****
  }
  
!     
  // Local Variables:
  // mode: php
--- 203,207 ----
  }
  
! 
  // Local Variables:
  // mode: php

[phpwiki-checkins] CVS: phpwiki/themes/MacOSX/templates browse.html,1.4,1.5

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/themes/MacOSX/templates
In directory usw-pr-cvs1:/tmp/cvs-serv3019

Modified Files:
	browse.html 
Log Message:
New template token: ${EDIT_FAIL_MESSAGES} so that NoChangesMade() and ConcurrentUpdates() errors can be displayed on the browse template. Expanded save error message "page has been locked by the admin...".

Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/MacOSX/templates/browse.html,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** browse.html	2002/01/08 00:05:34	1.4
--- browse.html	2002/01/08 06:46:58	1.5
***************
*** 22,26 ****
  </head>
  <body background="themes/MacOSX/bgpaper8.png">
! ${THANK_YOU}<div>${LOGO}</div>
  <h1><?plugin-link BackLinks page="[pagename]" class="backlinks" linktext="${SPLIT_PAGE}" ?></h1>
  <div class="br"><br clear="all" class="ignore" /></div>
--- 22,26 ----
  </head>
  <body background="themes/MacOSX/bgpaper8.png">
! ${EDIT_FAIL_MESSAGES}${THANK_YOU}<div>${LOGO}</div>
  <h1><?plugin-link BackLinks page="[pagename]" class="backlinks" linktext="${SPLIT_PAGE}" ?></h1>
  <div class="br"><br clear="all" class="ignore" /></div>

[phpwiki-checkins] CVS: phpwiki/templates browse.html,1.40,1.41

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/templates
In directory usw-pr-cvs1:/tmp/cvs-serv3021

Modified Files:
	browse.html 
Log Message:
New template token: ${EDIT_FAIL_MESSAGES} so that NoChangesMade() and ConcurrentUpdates() errors can be displayed on the browse template. Expanded save error message "page has been locked by the admin...".

Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/browse.html,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** browse.html	2002/01/08 00:05:34	1.40
--- browse.html	2002/01/08 06:46:58	1.41
***************
*** 22,26 ****
  </head>
  <body>
! ${THANK_YOU}<div>${LOGO}</div>
  <h1><?plugin-link BackLinks page="[pagename]" class="backlinks" linktext="${SPLIT_PAGE}" ?></h1>
  <div class="br"><br clear="all" class="ignore" /></div>
--- 22,26 ----
  </head>
  <body>
! ${EDIT_FAIL_MESSAGES}${THANK_YOU}<div>${LOGO}</div>
  <h1><?plugin-link BackLinks page="[pagename]" class="backlinks" linktext="${SPLIT_PAGE}" ?></h1>
  <div class="br"><br clear="all" class="ignore" /></div>

[phpwiki-checkins] CVS: phpwiki/lib stdlib.php,1.69,1.70

[Carsten K. <car...@us...>]

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

Modified Files:
	stdlib.php 
Log Message:
Cleanup: updated function list, reindending, rewrapping in emacs.

Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -r1.69 -r1.70
*** stdlib.php	2002/01/08 02:11:32	1.69
--- stdlib.php	2002/01/08 03:17:41	1.70
***************
*** 1,32 ****
  <?php rcs_id('$Id$');
  
!    /*
!       Standard functions for Wiki functionality
!          WikiURL($pagename, $args, $abs)
!          CSS_URL($CSS_URLS, $CSS_DEFAULT)
!          LinkWikiWord($wikiword, $linktext) 
!          LinkExistingWikiWord($wikiword, $linktext) 
!          LinkUnknownWikiWord($wikiword, $linktext) 
!          LinkURL($url, $linktext)
[...1118 lines suppressed...]
!             // literal variable name substitution only to keep locale
!             // strings uncluttered
!             trigger_error(sprintf(_("Can't mix '%s' with '%s' type format strings"),
!                                   '%1\$s','%s'), E_USER_WARNING);
!         
          $fmt = preg_replace('/(?<!%)%\d+\$/x', '%', $fmt);
          $newargs = array();
!         
          // Reorder arguments appropriately.
          foreach($m[1] as $argnum) {
              if ($argnum < 1 || $argnum > count($args))
!                 trigger_error(sprintf(_("%s: argument index out of range"), 
!                                       $argnum), E_USER_WARNING);
              $newargs[] = $args[$argnum - 1];
          }
          $args = $newargs;
      }
!     
      // Not all PHP's have vsprintf, so...
      array_unshift($args, $fmt);

[phpwiki-checkins] CVS: phpwiki/lib stdlib.php,1.68,1.69

[Carsten K. <car...@us...>]

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

Modified Files:
	stdlib.php 
Log Message:
minor gettext fix

Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.68
retrieving revision 1.69
diff -C2 -r1.68 -r1.69
*** stdlib.php	2002/01/07 18:42:40	1.68
--- stdlib.php	2002/01/08 02:11:32	1.69
***************
*** 66,70 ****
                            array('rel'   => (($CSS_DEFAULT == $key) ?
                                              'stylesheet' : 'alternate stylesheet'),
!                                 'title' => _(htmlspecialchars($key)),
                                  'href'  => DataURL(htmlspecialchars($val)),
                                  'type'  => 'text/css'))."\n";
--- 66,70 ----
                            array('rel'   => (($CSS_DEFAULT == $key) ?
                                              'stylesheet' : 'alternate stylesheet'),
!                                 'title' => htmlspecialchars(_($key)),
                                  'href'  => DataURL(htmlspecialchars($val)),
                                  'type'  => 'text/css'))."\n";

[phpwiki-checkins] CVS: phpwiki.pbproj project.pbxproj,1.18,1.19

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki.pbproj
In directory usw-pr-cvs1:/tmp/cvs-serv4429

Modified Files:
	project.pbxproj 
Log Message:
new file Toolbar.php added to PB project file

Index: project.pbxproj
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki.pbproj/project.pbxproj,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** project.pbxproj	2002/01/05 06:23:59	1.18
--- project.pbxproj	2002/01/08 01:36:26	1.19
***************
*** 56,60 ****
  				F579EFF901E542C80165507D,
  				F579EFFA01E542C80165507D,
- 				F579EFFB01E542C80165507D,
  				F579EFFC01E542C80165507D,
  				F579EFFD01E542C80165507D,
--- 56,59 ----
***************
*** 210,213 ****
--- 209,213 ----
  				F52903FE01E4192C0165507D,
  				F52903FF01E4192C0165507D,
+ 				F59EC9A901E71A880165507D,
  				F579EFF301E542740165507D,
  				F52903F301E417B60165507D,
***************
*** 226,229 ****
--- 226,237 ----
  			refType = 2;
  		};
+ 		F556EF4E01E95CA70165507D = {
+ 			fileEncoding = 5;
+ 			isa = PBXFileReference;
+ 			lineEnding = 0;
+ 			name = Toolbar.php;
+ 			path = phpwiki/lib/plugin/Toolbar.php;
+ 			refType = 2;
+ 		};
  		F56A40EC01E2994B0165507D = {
  			isa = PBXFileReference;
***************
*** 301,310 ****
  			refType = 2;
  		};
- 		F579EFFB01E542C80165507D = {
- 			isa = PBXFileReference;
- 			name = RSS.png;
- 			path = phpwiki/themes/MacOSX/locale/en/buttons/RSS.png;
- 			refType = 2;
- 		};
  		F579EFFC01E542C80165507D = {
  			isa = PBXFileReference;
--- 309,312 ----
***************
*** 789,792 ****
--- 791,795 ----
  				F57D440301DB11970165507D,
  				F57D440401DB11970165507D,
+ 				F556EF4E01E95CA70165507D,
  				F57D440501DB11970165507D,
  				F529C07301DC22D80165507D,
***************
*** 2980,2983 ****
--- 2983,2991 ----
  			path = phpwiki/UPGRADING;
  			refType = 2;
+ 		};
+ 		F59EC9A901E71A880165507D = {
+ 			isa = PBXFileReference;
+ 			path = RSS.png;
+ 			refType = 4;
  		};
  		F5A3126601E03A750165507D = {

[phpwiki-checkins] CVS: phpwiki/lib Template.php,1.15,1.16 savepage.php,1.23,1.24

[Geoffrey T. D. <da...@us...>]

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

Modified Files:
	Template.php savepage.php 
Log Message:
Refactor to eliminate global $thankyou.


Index: Template.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Template.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** Template.php	2002/01/08 00:06:45	1.15
--- Template.php	2002/01/08 00:31:24	1.16
***************
*** 339,345 ****
      if ($page_revision)
          $t->setPageRevisionTokens($page_revision);
-     global $thankyou;
-     if ($thankyou)
-         $t->replace('THANK_YOU', $thankyou);
      $t->replace('CONTENT', $content);
      $t->replace('TITLE', $title);
--- 339,342 ----

Index: savepage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/savepage.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** savepage.php	2002/01/08 00:12:26	1.23
--- savepage.php	2002/01/08 00:31:24	1.24
***************
*** 149,166 ****
                                           ExtractWikiPageLinks($content));
  
!     // This should be refactored to avoid a global, for now it allows
!     // the actual messages to be moved away from this page. $thankyou is
!     // required in the GeneratePage() function.
!     global $thankyou;
  
!     if (!is_object($newrevision)) {
!         // Save failed.
!         $thankyou = ConcurrentUpdates($pagename);
!         $thankyou .= "<hr noshade=\"noshade\" />";
!         $html = do_transform($current->getContent());
!         echo GeneratePage('BROWSE', $html, $pagename, $current);
  
-     } else {
-     
          // Clean out archived versions of this page.
          $cleaner = new ArchiveCleaner($GLOBALS['ExpireParams']);
--- 149,158 ----
                                           ExtractWikiPageLinks($content));
  
!     $template = new WikiTemplate('BROWSE');
!     $template->replace('TITLE', $pagename);
  
!     if (is_object($newrevision)) {
!         // New contents successfully saved...
  
          // Clean out archived versions of this page.
          $cleaner = new ArchiveCleaner($GLOBALS['ExpireParams']);
***************
*** 177,186 ****
              }
          }
!         $thankyou = toolbar_Info_ThankYou($pagename, $warnings);
!         $html = do_transform($newrevision->getContent());
!         echo GeneratePage('BROWSE', $html, $pagename, $newrevision);
      }
- 
  
  }
  
--- 169,187 ----
              }
          }
!         
!         $template->replace('THANK_YOU',
!                            toolbar_Info_ThankYou($pagename, $warnings));
!     } else {
!         // Save failed.
!         // (This is a bit kludgy...)
!         $template->replace('THANK_YOU',
!                            ConcurrentUpdates($pagename)
!                            . "<hr noshade=\"noshade\" />");
!         $newrevision = $current;
      }
  
+     $template->setPageRevisionTokens($newrevision);
+     $template->replace('CONTENT', do_transform($newrevision->getContent()));
+     echo $template->getExpansion();
  }
  

[phpwiki-checkins] CVS: phpwiki/lib savepage.php,1.22,1.23

[Carsten K. <car...@us...>]

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

Modified Files:
	savepage.php 
Log Message:
Changed ConcurrentUpdates--it works ok, but not sure if I like this though. Please try it out, is it too confusing?
Moved the Thank You... message into lib/Toolbar.php. I'm thinking these kind of static (non-clickable) messages should be moved out of lib/Toolbar.php into a page all their own.
New template token ${THANK_YOU} for post-edit messages (for lack of a better name). The thank you or other messages can now easily be repositioned anywhere on the html template.
Minor text reflowing.

Index: savepage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/savepage.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** savepage.php	2002/01/07 21:09:11	1.22
--- savepage.php	2002/01/08 00:12:26	1.23
***************
*** 11,17 ****
  */
  
- // FIXME: some links so that it's easy to get back to someplace useful from these
- // error pages.
  
  function ConcurrentUpdates($pagename) {
     /* xgettext only knows about c/c++ line-continuation strings
--- 11,26 ----
  */
  
  
+ // Changed ConcurrentUpdates--it works ok, but not sure if I like this
+ // though. Please try it out, is it too confusing?
+ //
+ // Moved the Thank You... message into lib/Toolbar.php. I'm thinking
+ // these kind of static (non-clickable) messages should be moved out
+ // of lib/Toolbar.php into a page all their own. --Carsten
+ 
+ 
+ // FIXME: some links so that it's easy to get back to someplace useful
+ // from these error pages.
+ 
  function ConcurrentUpdates($pagename) {
     /* xgettext only knows about c/c++ line-continuation strings
***************
*** 20,23 ****
--- 29,33 ----
     */
      $html = "<p>";
+     $html .= "<h1>" .sprintf (_("Problem while updating %s"), $pagename) ."</h1>";
      $html .= _("PhpWiki is unable to save your changes, because another user edited and saved the page while you were editing the page too. If saving proceeded now changes from the previous author would be lost.");
      $html .= "</p>\n<p>";
***************
*** 36,42 ****
      $html .= QElement('p', _("Sorry for the inconvenience."));
  
!     echo GeneratePage('MESSAGE', $html,
!                       sprintf (_("Problem while updating %s"), $pagename));
!     ExitWiki();
  }
  
--- 46,50 ----
      $html .= QElement('p', _("Sorry for the inconvenience."));
  
!     return $html;
  }
  
***************
*** 79,83 ****
      foreach (array('minor_edit', 'convert') as $key)
          $formvars[$key] = $request->getArg($key) ? 'checked' : '';
!     foreach (array('content', 'editversion', 'summary', 'pagename', 'version') as $key)
          @$formvars[$key] = htmlspecialchars($request->getArg($key));
  
--- 87,92 ----
      foreach (array('minor_edit', 'convert') as $key)
          $formvars[$key] = $request->getArg($key) ? 'checked' : '';
!     foreach (array('content', 'editversion', 'summary', 'pagename',
!                    'version') as $key)
          @$formvars[$key] = htmlspecialchars($request->getArg($key));
  
***************
*** 139,184 ****
                                           $content, $meta,
                                           ExtractWikiPageLinks($content));
      if (!is_object($newrevision)) {
          // Save failed.
!         ConcurrentUpdates($pagename);
!     }
! 
!     // Clean out archived versions of this page.
!     $cleaner = new ArchiveCleaner($GLOBALS['ExpireParams']);
!     $cleaner->cleanPageRevisions($page);
!     
!     $warnings = $dbi->GenericWarnings();
!     global $SignatureImg;
!     if (empty($warnings)) {
!         if (empty($SignatureImg)){
!             // Do redirect to browse page if no signature has been defined.
!             // In this case, the user will most likely not see the rest of
!             // the HTML we generate (below).
!             $request->redirect(WikiURL($pagename, false, 'absolute_url'));
          }
      }
  
-     $html = sprintf(_("Thank you for editing %s."),
-                     LinkExistingWikiWord($pagename));
-     $html .= "<br>\n";
-     $html .= _("Your careful attention to detail is much appreciated.");
-     $html .= "\n";
- 
-     if ($warnings) {
-         $html .= Element('p', QElement('strong',_("Warning!")) ." "
-                          . htmlspecialchars($warnings)
-                          . QElement('br') ."\n");
-     }
- 
-     if (!empty($SignatureImg)) {
-         $html .= Element('p', 
-                          QElement('img', array('alt' => $SignatureImg,
-                                                'src' => DataURL($SignatureImg))));
-     }
  
-     
-     $html .= QElement('hr', array('noshade' => 'noshade'));
-     $html .= do_transform($newrevision->getContent());
-     echo GeneratePage('BROWSE', $html, $pagename, $newrevision);
  }
  
--- 148,186 ----
                                           $content, $meta,
                                           ExtractWikiPageLinks($content));
+ 
+     // This should be refactored to avoid a global, for now it allows
+     // the actual messages to be moved away from this page. $thankyou is
+     // required in the GeneratePage() function.
+     global $thankyou;
+ 
      if (!is_object($newrevision)) {
          // Save failed.
!         $thankyou = ConcurrentUpdates($pagename);
!         $thankyou .= "<hr noshade=\"noshade\" />";
!         $html = do_transform($current->getContent());
!         echo GeneratePage('BROWSE', $html, $pagename, $current);
! 
!     } else {
!     
!         // Clean out archived versions of this page.
!         $cleaner = new ArchiveCleaner($GLOBALS['ExpireParams']);
!         $cleaner->cleanPageRevisions($page);
!         
!         $warnings = $dbi->GenericWarnings();
!         global $SignatureImg;
!         if (empty($warnings)) {
!             if (empty($SignatureImg)){
!                 // Do redirect to browse page if no signature has been defined.
!                 // In this case, the user will most likely not see the rest of
!                 // the HTML we generate (below).
!                 $request->redirect(WikiURL($pagename, false, 'absolute_url'));
!             }
          }
+         $thankyou = toolbar_Info_ThankYou($pagename, $warnings);
+         $html = do_transform($newrevision->getContent());
+         echo GeneratePage('BROWSE', $html, $pagename, $newrevision);
      }
  
  
  }
  

[phpwiki-checkins] CVS: phpwiki/lib Template.php,1.14,1.15 Toolbar.php,1.9,1.10

[Carsten K. <car...@us...>]

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

Modified Files:
	Template.php Toolbar.php 
Log Message:
New template token ${THANK_YOU} for post-edit messages (for lack of a better name). The thank you or other messages can now easily be repositioned anywhere on the html template.

Index: Template.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Template.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** Template.php	2002/01/05 10:17:07	1.14
--- Template.php	2002/01/08 00:06:45	1.15
***************
*** 339,342 ****
--- 339,345 ----
      if ($page_revision)
          $t->setPageRevisionTokens($page_revision);
+     global $thankyou;
+     if ($thankyou)
+         $t->replace('THANK_YOU', $thankyou);
      $t->replace('CONTENT', $content);
      $t->replace('TITLE', $title);

Index: Toolbar.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/Toolbar.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** Toolbar.php	2002/01/05 10:32:16	1.9
--- Toolbar.php	2002/01/08 00:06:45	1.10
***************
*** 335,338 ****
--- 335,372 ----
  }
  
+ // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ // Template token: ${THANK_YOU}
+ 
+ // Requires:
+ // $pagename (from savepage.php)
+ // $warnings (from savepage.php)
+ // global $SignatureImg
+ 
+ function toolbar_Info_ThankYou($pagename, $warnings) {
+     $html = "";
+     $html .= sprintf(_("Thank you for editing %s."),
+                     LinkExistingWikiWord($pagename));
+     $html .= "<br>\n";
+     $html .= _("Your careful attention to detail is much appreciated.");
+     $html .= "\n";
+ 
+     if ($warnings) {
+         $html .= Element('p', QElement('strong',_("Warning!")) ." "
+                          . htmlspecialchars($warnings))
+                          . QElement('br') ."\n";
+     }
+ 
+     global $SignatureImg;
+     if (!empty($SignatureImg)) {
+         $html .= Element('p', 
+                          QElement('img', array('alt' => $SignatureImg,
+                                                'src' => DataURL($SignatureImg))));
+     }
+ 
+     
+     $html .= QElement('hr', array('noshade' => 'noshade'));
+     return $html;
+ }
+ 
  
  /////////////////////////////////////////////////////////////////////

[phpwiki-checkins] CVS: phpwiki/themes/MacOSX/templates browse.html,1.3,1.4

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/themes/MacOSX/templates
In directory usw-pr-cvs1:/tmp/cvs-serv16796

Modified Files:
	browse.html 
Log Message:
New template token ${THANK_YOU} for post-edit messages (for lack of a better name)

Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/MacOSX/templates/browse.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** browse.html	2002/01/05 09:40:55	1.3
--- browse.html	2002/01/08 00:05:34	1.4
***************
*** 22,26 ****
  </head>
  <body background="themes/MacOSX/bgpaper8.png">
! <div>${LOGO}</div>
  <h1><?plugin-link BackLinks page="[pagename]" class="backlinks" linktext="${SPLIT_PAGE}" ?></h1>
  <div class="br"><br clear="all" class="ignore" /></div>
--- 22,26 ----
  </head>
  <body background="themes/MacOSX/bgpaper8.png">
! ${THANK_YOU}<div>${LOGO}</div>
  <h1><?plugin-link BackLinks page="[pagename]" class="backlinks" linktext="${SPLIT_PAGE}" ?></h1>
  <div class="br"><br clear="all" class="ignore" /></div>

[phpwiki-checkins] CVS: phpwiki/templates browse.html,1.39,1.40

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/templates
In directory usw-pr-cvs1:/tmp/cvs-serv16794

Modified Files:
	browse.html 
Log Message:
New template token ${THANK_YOU} for post-edit messages (for lack of a better name)

Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/browse.html,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -r1.39 -r1.40
*** browse.html	2002/01/05 09:19:54	1.39
--- browse.html	2002/01/08 00:05:34	1.40
***************
*** 22,26 ****
  </head>
  <body>
! <div>${LOGO}</div>
  <h1><?plugin-link BackLinks page="[pagename]" class="backlinks" linktext="${SPLIT_PAGE}" ?></h1>
  <div class="br"><br clear="all" class="ignore" /></div>
--- 22,26 ----
  </head>
  <body>
! ${THANK_YOU}<div>${LOGO}</div>
  <h1><?plugin-link BackLinks page="[pagename]" class="backlinks" linktext="${SPLIT_PAGE}" ?></h1>
  <div class="br"><br clear="all" class="ignore" /></div>

[phpwiki-checkins] CVS: phpwiki/lib/plugin ViewMarkup.php,1.4,1.5

[Geoffrey T. D. <da...@us...>]

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

Modified Files:
	ViewMarkup.php 
Log Message:
Wups.  Forgot to save the file before the previous checkin.  Here's
the new comments alluded to in the last checkin.


Index: ViewMarkup.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/ViewMarkup.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** ViewMarkup.php	2002/01/07 23:26:25	1.4
--- ViewMarkup.php	2002/01/07 23:28:19	1.5
***************
*** 3,8 ****
  require_once('lib/Template.php');
  /**
!  * A handy plugin for viewing the WikiMarkup of locked pages.
!  * based on _BackendInfo.php, v 1.4
   */
  class WikiPlugin_ViewMarkup
--- 3,17 ----
  require_once('lib/Template.php');
  /**
!  * A handy plugin for viewing the WikiMarkup of locked (and unlocked) pages.
!  *
!  * Comments/Discussion:
!  *
!  *  I don't like the name ViewMarkup.  I'd prefer ViewSource.
!  *  No big deal though. --JeffDairiki
!  *
!  *  In the long run, it may be cleaner to include this functionality
!  *  in with the EditPage code.  (I.e. if you try to edit locked pages,
!  *  you get a slightly modified version of the normal page editing
!  *  form.  Mostly: no save button.)  --JeffDairiki
   */
  class WikiPlugin_ViewMarkup

[phpwiki-checkins] CVS: phpwiki/lib/plugin ViewMarkup.php,1.3,1.4

[Geoffrey T. D. <da...@us...>]

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

Modified Files:
	ViewMarkup.php 
Log Message:
Display page source in a <textarea>.  This make for easy cutting/pasting,
and also displays the source in a format identical to that seen
when editing the page.

Also other minor cleanups and changes:
  No need to talk to backend directly, just use the WikiDB API.
  Support for viewing source of previous revisions.
  Added a couple points of discussion to the comments:
    * I don't like the name ViewMarkup.
    * This code could be merged with the EditPage code.



Index: ViewMarkup.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/ViewMarkup.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** ViewMarkup.php	2001/12/31 08:30:36	1.3
--- ViewMarkup.php	2002/01/07 23:26:25	1.4
***************
*** 21,25 ****
  
      function getDefaultArguments() {
!         return array('page'	=> false);
          
      }
--- 21,26 ----
  
      function getDefaultArguments() {
!         return array('page' => false,
!                      'rev'  => false);
          
      }
***************
*** 27,61 ****
      function run($dbi, $argstr, $request) {
          $args = $this->getArgs($argstr, $request);
!         extract($args);
!         if (empty($page))
              return '';
          
          //fetch the latest version of the page. Should this be made to
          //work when viewing an old revision of a page too?
!         $backend = &$dbi->_backend;
!         $version = $backend->get_latest_version($page);
!         $vdata = $backend->get_versiondata($page, $version, true);
  
!         $content = &$vdata['%content'];
  
-         $html = QElement('h2',
-                  sprintf(_("Revealing WikiMarkup for page '%s':"), urlencode($page)));
- 
-         /* only good for WikiMarkup with few newlines */
-         //$html .= Element('pre', nl2br($content) );
- 
-         /* only good for WikiMarkup with lots of newlines */
-         //$html .= Element('pre', $content );
- 
-         /* good for any WikiMarkup
-            but probably will not appear monospaced */
-         //$html .= nl2br($content);
- 
          /* <tt> seems to be a good compromise in IE and OmniWeb
             it doesn't combine newlines and <br>, and renders monospaced */
!         $html .= Element('tt', nl2br($content));
  
!         return $html;
  
      }
  };
--- 28,81 ----
      function run($dbi, $argstr, $request) {
          $args = $this->getArgs($argstr, $request);
!         if (empty($args['page']))
              return '';
          
          //fetch the latest version of the page. Should this be made to
          //work when viewing an old revision of a page too?
!         $page = $dbi->getPage($args['page']);
!         if (empty($args['rev'])) {
!             $rev = $page->getCurrentRevision();
!             $link = QElement('a',
!                              array('href' => WikiURL($args['page'])),
!                              $args['page']);
!         }
!         else {
!             $rev = $page->getRevision($args['rev']);
!             
!             if (!$rev) {
!                 return QElement('p', array('class' => 'error'),
!                                 __sprintf("I'm sorry.  Version %d of %s is not in my database.",
!                                           $args['rev'], $args['page']));
!             }
!             $link = QElement('a',
!                              array('href' =>
!                                    WikiURL($args['page'],
!                                            array('version' => $args['rev']))),
!                              __sprintf("version %d of %s",
!                                        $args['rev'], $args['page']));
!         }
  
!         $html = Element('h2', __sprintf("Page source for %s", $link));
  
          /* <tt> seems to be a good compromise in IE and OmniWeb
             it doesn't combine newlines and <br>, and renders monospaced */
!         //$html .= Element('tt', nl2br(htmlspecialchars($rev->getPackedContent())));
  
!         /* Display page source in a <textarea>:
!          *  o Same appearance as when editing page.
!          *  o Easiest to cut and paste from.
!          */
!         global $user;
!         $prefs = $user->getPreferences();
!         $html .= Element('p',
!                          QElement('textarea',
!                                   array('class' => 'wikiedit',
!                                         'rows' => $prefs['edit_area.height'],
!                                         'cols' => $prefs['edit_area.width'],
!                                         'wrap' => 'virtual',
!                                         'readonly' => true),
!                                   $rev->getPackedContent()));
  
+         return $html;
      }
  };

[phpwiki-checkins] CVS: phpwiki/lib savepage.php,1.21,1.22

[Carsten K. <car...@us...>]

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

Modified Files:
	savepage.php 
Log Message:
Bugfix for savepage error introduced in 1.21:
Parse error: parse error in /home/groups/p/ph/phpwiki/htdocs/alpha/lib/savepage.php on line 180


Index: savepage.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/savepage.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** savepage.php	2002/01/05 13:39:54	1.21
--- savepage.php	2002/01/07 21:09:11	1.22
***************
*** 178,182 ****
  
      
!     $html .= QElement('hr', array('noshade' => 'noshade');
      $html .= do_transform($newrevision->getContent());
      echo GeneratePage('BROWSE', $html, $pagename, $newrevision);
--- 178,182 ----
  
      
!     $html .= QElement('hr', array('noshade' => 'noshade'));
      $html .= do_transform($newrevision->getContent());
      echo GeneratePage('BROWSE', $html, $pagename, $newrevision);

[phpwiki-checkins] CVS: phpwiki/lib stdlib.php,1.67,1.68

[Carsten K. <car...@us...>]

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

Modified Files:
	stdlib.php 
Log Message:
Minor text reformatting.

Index: stdlib.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/stdlib.php,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -r1.67 -r1.68
*** stdlib.php	2002/01/05 15:15:26	1.67
--- stdlib.php	2002/01/07 18:42:40	1.68
***************
*** 29,33 ****
        return SERVER_URL . DATA_PATH . "/";
     }
! 	  
  function WikiURL($pagename, $args = '', $get_abs_url = false) {
      if (is_array($args)) {
--- 29,33 ----
        return SERVER_URL . DATA_PATH . "/";
     }
! 
  function WikiURL($pagename, $args = '', $get_abs_url = false) {
      if (is_array($args)) {

[phpwiki-checkins] CVS: phpwiki/lib prepend.php,1.7,1.8

[Carsten K. <car...@us...>]

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

Modified Files:
	prepend.php 
Log Message:
Minor html reformatting.

Index: prepend.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/prepend.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** prepend.php	2001/12/28 09:46:00	1.7
--- prepend.php	2002/01/07 18:41:44	1.8
***************
*** 29,34 ****
     
      if(!empty($errormsg)) {
!         print "<p /><hr /><h2>" . _("WikiFatalError") . "</h2>\n";
!         
          if (is_string($errormsg))
              print $errormsg;
--- 29,34 ----
     
      if(!empty($errormsg)) {
!         print "<br /><hr /><h2>" . _("WikiFatalError") . "</h2>\n";
! 
          if (is_string($errormsg))
              print $errormsg;

[phpwiki-checkins] CVS: phpwiki/templates editpage.html,1.40,1.41

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/templates
In directory usw-pr-cvs1:/tmp/cvs-serv14038

Modified Files:
	editpage.html 
Log Message:
Removed apostrophe in html comments to prevent warning while running locale/Makefile.

Index: editpage.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/editpage.html,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -r1.40 -r1.41
*** editpage.html	2002/01/05 10:17:07	1.40
--- editpage.html	2002/01/07 18:40:06	1.41
***************
*** 18,22 ****
  <!--This hack allows the h1 to be localised. FIXME: move out of html template into php-->
  <h1><?php printf(_("Edit: %s"),"<a class=\"backlinks\" href=\"${BROWSE}"._("BackLinks")."?page=${PAGE}\">${PAGE}</a>"); ?></h1>
! <!--=this line=<?php $bl='<plugin-link BackLinks page="[pagename]" class="backlinks" linktext="${SPLIT_PAGE}" ?>';printf(_("Edit: %s"),"$bl"); ?>=doesn't work=-->
  ${EDIT_WARNINGS}
  <?php if (!empty($PREVIEW_CONTENT)) { ?>
--- 18,22 ----
  <!--This hack allows the h1 to be localised. FIXME: move out of html template into php-->
  <h1><?php printf(_("Edit: %s"),"<a class=\"backlinks\" href=\"${BROWSE}"._("BackLinks")."?page=${PAGE}\">${PAGE}</a>"); ?></h1>
! <!--=this line=<?php $bl='<plugin-link BackLinks page="[pagename]" class="backlinks" linktext="${SPLIT_PAGE}" ?>';printf(_("Edit: %s"),"$bl"); ?>=does not work=-->
  ${EDIT_WARNINGS}
  <?php if (!empty($PREVIEW_CONTENT)) { ?>

[phpwiki-checkins] CVS: phpwiki/themes/Hawaiian Hawaiian.css,1.3,1.4

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/themes/Hawaiian
In directory usw-pr-cvs1:/tmp/cvs-serv13020

Modified Files:
	Hawaiian.css 
Log Message:
Removed: make wikiaction links look like buttons.

Index: Hawaiian.css
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/Hawaiian/Hawaiian.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** Hawaiian.css	2002/01/05 06:17:02	1.3
--- Hawaiian.css	2002/01/07 18:37:04	1.4
***************
*** 166,172 ****
   */
  A.wikiaction, A.wikiadmin       { text-decoration: none; }
! A.wikiaction, .wikiaction TABLE, SPAN.wikiaction  { background-color: #ddd; }
! A.wikiadmin, .wikiadmin TABLE   { background-color: #fdd; }
! .wikiunsafe                     { background-color: #ccc; }
  
  /*
--- 166,172 ----
   */
  A.wikiaction, A.wikiadmin       { text-decoration: none; }
! A.wikiaction, .wikiaction TABLE, SPAN.wikiaction  { background-color: inherit; }
! A.wikiadmin, .wikiadmin TABLE   { background-color: inherit ; }
! .wikiunsafe                     { background-color: inherit; }
  
  /*
***************
*** 180,194 ****
  
   
! /*
!  * Put a border around wikiaction forms:
!  * This doesn't work for NS4.
!  */
! .wikiaction TABLE, .wikiadmin TABLE
! {
!   border-style: ridge;
!   border-width: medium;
! }
! .wikiaction TABLE { border-color: #9cf; }
! .wikiadmin TABLE  { border-color: #f99; }
  
  /* Backlinks */
--- 180,185 ----
  
   
! .wikiaction TABLE { border-color: inherit; }
! .wikiadmin TABLE  { border-color: inherit; }
  
  /* Backlinks */

[phpwiki-checkins] CVS: phpwiki/themes/Hawaiian Hawaiian-heavy.css,1.2,1.3

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/themes/Hawaiian
In directory usw-pr-cvs1:/tmp/cvs-serv12458

Modified Files:
	Hawaiian-heavy.css 
Log Message:
Removed: make wikiaction links look like buttons.

Index: Hawaiian-heavy.css
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/Hawaiian/Hawaiian-heavy.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Hawaiian-heavy.css	2002/01/05 06:17:02	1.2
--- Hawaiian-heavy.css	2002/01/07 18:35:10	1.3
***************
*** 28,44 ****
  */
  
- 
- /* Make wikiaction links look like buttons */ 
- A.wikiaction, A.wikiadmin, INPUT.button
- {
-  border-style: outset;
-  border-width: thin;
-  color: #006;
-  padding-top: 0ex;
-  padding-bottom: 0ex;
-  padding-left: 0.2em;
-  padding-right: 0.2em;
- }
- 
  /* Link icons */
  img.linkicon        { vertical-align: middle; }
--- 28,31 ----

[phpwiki-checkins] CVS: phpwiki/lib/plugin Toolbar.php,1.2,1.3

[Carsten K. <car...@us...>]

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

Modified Files:
	Toolbar.php 
Log Message:
bugfix to prevent MacOSX themed RecentChanges buttons from appearing on wikis not using that theme

Index: Toolbar.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/lib/plugin/Toolbar.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Toolbar.php	2002/01/07 08:07:44	1.2
--- Toolbar.php	2002/01/07 09:04:41	1.3
***************
*** 39,43 ****
                       'go'	=> false,
                       'style'	=> 'text',
!                      'name'	=> false
                       // TODO: new 'image' style for use with themes
                       // which have graphic buttons
--- 39,43 ----
                       'go'	=> false,
                       'style'	=> 'text',
!                      'name'	=> ''
                       // TODO: new 'image' style for use with themes
                       // which have graphic buttons
***************
*** 68,76 ****
              return $html;
          }
!         //begin oops: this is isn't supposed to work, but it does!
!         if ($name = "RecentChanges") {
!         //end oops
! //            global $ToolbarImages, $theme;
!             global $theme;
                  $ToolbarImages = array(
                  'RecentChanges' => array(
--- 68,76 ----
              return $html;
          }
!         global $theme;
! //$name="RecentChanges";
!         if ($theme == "MacOSX" && $name=="RecentChanges") {
!             global $ToolbarImages;
! /*
                  $ToolbarImages = array(
                  'RecentChanges' => array(
***************
*** 82,86 ****
                  '...'		=> "themes/$theme/locale/en/toolbars/RecentChanges/alltime.png")
                  );
!                 
                  $ToolbarURLs = array(
                  //'RecentChanges' => array(
--- 82,86 ----
                  '...'		=> "themes/$theme/locale/en/toolbars/RecentChanges/alltime.png")
                  );
! */                
                  $ToolbarURLs = array(
                  //'RecentChanges' => array(

[phpwiki-checkins] CVS: phpwiki/pgsrc RecentChanges,1.18,1.19

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/pgsrc
In directory usw-pr-cvs1:/tmp/cvs-serv1751

Modified Files:
	RecentChanges 
Log Message:
bugfix to prevent MacOSX themed RecentChanges buttons from appearing on wikis not using that theme

Index: RecentChanges
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/pgsrc/RecentChanges,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** RecentChanges	2002/01/07 04:39:59	1.18
--- RecentChanges	2002/01/07 09:07:02	1.19
***************
*** 1,6 ****
! From hos...@da...  Sun Jan 6 22:07:14 2002
  Subject: RecentChanges
  From: hos...@da... (PhpWiki)
! Date: Sun, 6 Jan 2002 22:07:14 -0500
  Mime-Version: 1.0
  Content-Type: application/x-phpwiki;
--- 1,6 ----
! From hos...@da...  Sun Jan 6 22:07:15 2002
  Subject: RecentChanges
  From: hos...@da... (PhpWiki)
! Date: Sun, 6 Jan 2002 22:07:15 -0500
  Mime-Version: 1.0
  Content-Type: application/x-phpwiki;
***************
*** 11,15 ****
  Here's a list of recently changed pages on this wiki. (See RecentEdits for all recent minor edits and changes).
  
! <?plugin Toolbar label="Show changes for: %s" sep=| go="1 day|phpwiki:?days=1,3 days|phpwiki:?days=3,7 days|phpwiki:?days=7,30 days|phpwiki:?days=30,90 days|phpwiki:?days=90,...|phpwiki:?days=-1" ?>
  --------
  <?plugin RecentChanges days||=30?>
--- 11,15 ----
  Here's a list of recently changed pages on this wiki. (See RecentEdits for all recent minor edits and changes).
  
! <?plugin Toolbar name="RecentChanges" label="Show changes for: %s" sep=| go="1 day|phpwiki:?days=1,3 days|phpwiki:?days=3,7 days|phpwiki:?days=7,30 days|phpwiki:?days=30,90 days|phpwiki:?days=90,...|phpwiki:?days=-1" ?>
  --------
  <?plugin RecentChanges days||=30?>

[phpwiki-checkins] CVS: phpwiki/themes/MacOSX themeinfo.php,1.9,1.10

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/themes/MacOSX
In directory usw-pr-cvs1:/tmp/cvs-serv1443

Modified Files:
	themeinfo.php 
Log Message:
bugfix to prevent MacOSX themed RecentChanges buttons from appearing on wikis not using that theme

Index: themeinfo.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/MacOSX/themeinfo.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** themeinfo.php	2002/01/05 16:12:19	1.9
--- themeinfo.php	2002/01/07 09:05:46	1.10
***************
*** 108,111 ****
--- 108,121 ----
  */
  
+ $ToolbarImages = array(
+ 'RecentChanges' => array(
+ '1 day'		=> "themes/$theme/locale/en/toolbars/RecentChanges/1day.png",
+ '3 days'	=> "themes/$theme/locale/en/toolbars/RecentChanges/3days.png",
+ '7 days'	=> "themes/$theme/locale/en/toolbars/RecentChanges/7days.png",
+ '30 days'	=> "themes/$theme/locale/en/toolbars/RecentChanges/30days.png",
+ '90 days'	=> "themes/$theme/locale/en/toolbars/RecentChanges/90days.png",
+ '...'		=> "themes/$theme/locale/en/toolbars/RecentChanges/alltime.png")
+ );
+ 
  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  // (c-file-style: "gnu")

[phpwiki-checkins] CVS: phpwiki/themes/MacOSX/locale/en/toolbars/RecentChanges 1day.png,NONE,1.1 30days.png,NONE,1.1 3days.png,NONE,1.1 7days.png,NONE,1.1 90days.png,NONE,1.1 alltime.png,NONE,1.1

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/themes/MacOSX/locale/en/toolbars/RecentChanges
In directory usw-pr-cvs1:/tmp/cvs-serv19943

Added Files:
	1day.png 30days.png 3days.png 7days.png 90days.png alltime.png 
Log Message:
New toolbar images for RecentChanges page.

--- NEW FILE ---
‰PNG


3Ùè—4½»Ð/Ms-DhÄ!º {ŽZ
¡Ó£VS
ÕJÝvC´‚GŽj5„½°o§ %û´9…B
¢Bážó€Ç8yt/caK¦wʍç
ñ˜&Cï2F!oÛ^Ÿ6K‘à!~ÂQ2&›Gd³Ñé¸ÚXFAõ8%ÖËpòS” %dS™L¡ÂAAªuÆ2C:c,›³yŠ8ÓÉdò…^®Ç<{+dû}*UDm

--- NEW FILE ---
‰PNG


ÌeJÚ2¸ÜÔ+‡/34›‚l	ÙGw(%Ž4/Z#S!,Š#Þ`¬1`ÃAá‰(æÃøaȘŒÅ1xj¶JÉnòVsuñtœE㔏ҙ=o¥s>³GøpÖâé«ÚuàäTål
‹e¾—Ô.ËÖ—‹÷Q«ht¶àJ“mg,7êøãià\Çá†èºæ®`ú5:oU"N ®

--- NEW FILE ---
‰PNG



--- NEW FILE ---
‰PNG


)C8W‰•/&•´,_=&ÏFÕÁTÂ"ߌ褄‘c*ŌÒIg¯zI©˜N‡Eñ"g9DyÆ"ˆÈX\0Vä¿é%Žöt·š¸»¯¯½¤T]M¦‡ÇyÀzG©ø*œÖVTuí©LØTm[™Øù	SÉâ¿Y{UüFÑJ§?)Ko

--- NEW FILE ---
‰PNG



--- NEW FILE ---
‰PNG


[phpwiki-checkins] CVS: phpwiki/themes/MacOSX/locale/en/toolbars/RecentChanges - New directory

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/themes/MacOSX/locale/en/toolbars/RecentChanges
In directory usw-pr-cvs1:/tmp/cvs-serv19743/RecentChanges

Log Message:
Directory /cvsroot/phpwiki/phpwiki/themes/MacOSX/locale/en/toolbars/RecentChanges added to the repository

[phpwiki-checkins] CVS: phpwiki/themes/MacOSX/locale/en/toolbars - New directory

[Carsten K. <car...@us...>]

Update of /cvsroot/phpwiki/phpwiki/themes/MacOSX/locale/en/toolbars
In directory usw-pr-cvs1:/tmp/cvs-serv19619/toolbars

Log Message:
Directory /cvsroot/phpwiki/phpwiki/themes/MacOSX/locale/en/toolbars added to the repository