[phpwiki-checkins] CVS: phpwiki/themes/Portland/templates actionbar.tmpl,1.19,1.20 body.tmpl,1.16,1.17 editpage.tmpl,1.20,1.21 navbar.tmpl,1.9,1.10 viewsource.tmpl,1.14,1.15

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

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

Modified Files:
	actionbar.tmpl body.tmpl editpage.tmpl navbar.tmpl 
	viewsource.tmpl 
Log Message:
renamed global $Theme to $WikiTheme (gforge nameclash)

Index: actionbar.tmpl
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/Portland/templates/actionbar.tmpl,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -2 -b -p -d -r1.19 -r1.20
--- actionbar.tmpl	20 Nov 2003 19:52:36 -0000	1.19
+++ actionbar.tmpl	14 Jun 2004 11:26:50 -0000	1.20
@@ -2,5 +2,5 @@
 <!-- $Id$ -->
 <?php
-  $Sep = $Theme->getButtonSeparator();
+  $Sep = $WikiTheme->getButtonSeparator();
 
   if (!$page->get('locked') || $user->isAdmin())
@@ -15,5 +15,5 @@
 <?= $EditB ?> 
 <a href="<?=WikiURL($revision,array('action'=>'diff'))?>"
-   ><?= $Theme->getLastModifiedMessage($revision) ?></a>
+   ><?= $WikiTheme->getLastModifiedMessage($revision) ?></a>
 	<?=$Sep?><?= Button("PageHistory", _("PageHistory")) ?>
     <?=$Sep?><?= Button("PageInfo", _("PageInfo")) ?>

Index: body.tmpl
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/Portland/templates/body.tmpl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -2 -b -p -d -r1.16 -r1.17
--- body.tmpl	5 May 2004 13:38:09 -0000	1.16
+++ body.tmpl	14 Jun 2004 11:26:50 -0000	1.17
@@ -1,9 +1,9 @@
 <?php // -*-html-*- ?>
 <!-- $Id$ -->
-<body<?= $Theme->getMoreAttr('body') ?>>
+<body<?= $WikiTheme->getMoreAttr('body') ?>>
 <!-- Page title and logo -->
 <h1><a class="wikilink" 
        href="<?=WikiURL(HOME_PAGE)?>"
-       ><img src="<?=$Theme->getImageURL('logo')?>"
+       ><img src="<?=$WikiTheme->getImageURL('logo')?>"
              border="0" alt="<?=fmt(_("%s: %s"), WIKI_NAME, HOME_PAGE) ?>" 
              align="bottom" /></a> <?=$HEADER?></h1>

Index: editpage.tmpl
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/Portland/templates/editpage.tmpl,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -2 -b -p -d -r1.20 -r1.21
--- editpage.tmpl	26 Feb 2003 01:56:53 -0000	1.20
+++ editpage.tmpl	14 Jun 2004 11:26:50 -0000	1.21
@@ -19,5 +19,5 @@ $HeightI = HTML::input(array('type' => '
                              'onchange' => 'this.form.submit();'));
 
-$s = $Theme->getButtonSeparator();
+$s = $WikiTheme->getButtonSeparator();
 ?>
 

Index: navbar.tmpl
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/Portland/templates/navbar.tmpl,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -2 -b -p -d -r1.9 -r1.10
--- navbar.tmpl	18 Sep 2002 19:29:43 -0000	1.9
+++ navbar.tmpl	14 Jun 2004 11:26:50 -0000	1.10
@@ -2,5 +2,5 @@
 <!-- $Id$ -->
 <?php
-  $Sep = $Theme->getButtonSeparator();
+  $Sep = $WikiTheme->getButtonSeparator();
 ?>
 <!-- The bottom navigation/search bar -->

Index: viewsource.tmpl
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/themes/Portland/templates/viewsource.tmpl,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -2 -b -p -d -r1.14 -r1.15
--- viewsource.tmpl	26 Feb 2003 01:56:53 -0000	1.14
+++ viewsource.tmpl	14 Jun 2004 11:26:50 -0000	1.15
@@ -25,4 +25,4 @@
 <hr />
 <a href="<?=WikiURL($page,array('action'=>_("PageHistory")))?>"
-   ><?= $Theme->getLastModifiedMessage($revision) ?></a>
+   ><?= $WikiTheme->getLastModifiedMessage($revision) ?></a>
 <br />