[phpwiki-checkins] CVS: phpwiki/themes/MacOSX themeinfo.php,1.54,1.55

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

Update of /cvsroot/phpwiki/phpwiki/themes/MacOSX
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11869/MacOSX

Modified Files:
	themeinfo.php 
Log Message:
renamed global $Theme to $WikiTheme (gforge nameclash)

Index: themeinfo.php
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/MacOSX/themeinfo.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -2 -b -p -d -r1.54 -r1.55
--- themeinfo.php	5 Dec 2003 15:01:49 -0000	1.54
+++ themeinfo.php	14 Jun 2004 11:26:49 -0000	1.55
@@ -88,5 +88,5 @@ class Theme_MacOSX extends Theme {
 }
 
-$Theme = new Theme_MacOSX('MacOSX');
+$WikiTheme = new Theme_MacOSX('MacOSX');
 
 // CSS file defines fonts, colors and background images for this
@@ -96,5 +96,5 @@ $Theme = new Theme_MacOSX('MacOSX');
 // This should result in phpwiki-printer.css being used when
 // printing or print-previewing with style "PhpWiki" or "MacOSX" selected.
-$Theme->setDefaultCSS('MacOSX',
+$WikiTheme->setDefaultCSS('MacOSX',
                        array(''      => 'MacOSX.css',
                              'print' => 'phpwiki-printer.css'));
@@ -102,11 +102,11 @@ $Theme->setDefaultCSS('MacOSX',
 // This allows one to manually select "Printer" style (when browsing page)
 // to see what the printer style looks like.
-$Theme->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen');
-$Theme->addAlternateCSS(_("Top & bottom toolbars"), 'MacOSX-topbottombars.css');
+$WikiTheme->addAlternateCSS(_("Printer"), 'phpwiki-printer.css', 'print, screen');
+$WikiTheme->addAlternateCSS(_("Top & bottom toolbars"), 'MacOSX-topbottombars.css');
 
 /**
  * The logo image appears on every page and links to the HomePage.
  */
-$Theme->addImageAlias('logo', WIKI_NAME . 'Logo.png');
+$WikiTheme->addImageAlias('logo', WIKI_NAME . 'Logo.png');
 
 /**
@@ -115,26 +115,26 @@ $Theme->addImageAlias('logo', WIKI_NAME 
  * be omitted.
  */
-$Theme->addImageAlias('signature', WIKI_NAME . "Signature.png");
+$WikiTheme->addImageAlias('signature', WIKI_NAME . "Signature.png");
 // Uncomment this next line to disable the signature.
-//$Theme->addImageAlias('signature', false);
+//$WikiTheme->addImageAlias('signature', false);
 
 /*
  * Link icons.
  */
-$Theme->setLinkIcon('http');
-$Theme->setLinkIcon('https');
-$Theme->setLinkIcon('ftp');
-$Theme->setLinkIcon('mailto');
-$Theme->setLinkIcon('interwiki');
-$Theme->setLinkIcon('wikiuser');
-$Theme->setLinkIcon('*', 'url');
+$WikiTheme->setLinkIcon('http');
+$WikiTheme->setLinkIcon('https');
+$WikiTheme->setLinkIcon('ftp');
+$WikiTheme->setLinkIcon('mailto');
+$WikiTheme->setLinkIcon('interwiki');
+$WikiTheme->setLinkIcon('wikiuser');
+$WikiTheme->setLinkIcon('*', 'url');
 
-$Theme->setButtonSeparator(""); //use no separator instead of default
+$WikiTheme->setButtonSeparator(""); //use no separator instead of default
 
-$Theme->addButtonAlias('?', 'uww');
-$Theme->addButtonAlias(_("Lock Page"), "Lock Page");
-$Theme->addButtonAlias(_("Unlock Page"), "Unlock Page");
-$Theme->addButtonAlias(_("Page Locked"), "Page Locked");
-$Theme->addButtonAlias("...", "alltime");
+$WikiTheme->addButtonAlias('?', 'uww');
+$WikiTheme->addButtonAlias(_("Lock Page"), "Lock Page");
+$WikiTheme->addButtonAlias(_("Unlock Page"), "Unlock Page");
+$WikiTheme->addButtonAlias(_("Page Locked"), "Page Locked");
+$WikiTheme->addButtonAlias("...", "alltime");
 
 /**
@@ -142,5 +142,5 @@ $Theme->addButtonAlias("...", "alltime")
  * the words. The default is to leave WordsSmashedTogetherLikeSo.
  */
-//$Theme->setAutosplitWikiWords(false);
+//$WikiTheme->setAutosplitWikiWords(false);
 
 /*
@@ -152,6 +152,6 @@ $Theme->addButtonAlias("...", "alltime")
  * user's time zone.
  */
-$Theme->setDateFormat("%A, %B %d, %Y"); // must not contain time
-$Theme->setTimeFormat("%I:%M:%S %p");
+$WikiTheme->setDateFormat("%A, %B %d, %Y"); // must not contain time
+$WikiTheme->setTimeFormat("%I:%M:%S %p");
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -