[Fusionforge-commits] r10443 - in trunk/src/plugins/wiki/www/themes: Crao/templates MonoBook/templates Portland/templates Wordpress/templates blog/templates default/templates fusionforge/templates

Marc-Etienne VARGENAU vargenau at libremir.placard.fr.eu.org
Thu Sep 9 21:30:31 CEST 2010


Author: vargenau
Date: 2010-09-09 21:30:31 +0200 (Thu, 09 Sep 2010)
New Revision: 10443

Modified:
   trunk/src/plugins/wiki/www/themes/Crao/templates/editpage.tmpl
   trunk/src/plugins/wiki/www/themes/MonoBook/templates/viewsource.tmpl
   trunk/src/plugins/wiki/www/themes/Portland/templates/editpage.tmpl
   trunk/src/plugins/wiki/www/themes/Portland/templates/viewsource.tmpl
   trunk/src/plugins/wiki/www/themes/Wordpress/templates/viewsource.tmpl
   trunk/src/plugins/wiki/www/themes/blog/templates/viewsource.tmpl
   trunk/src/plugins/wiki/www/themes/default/templates/editpage.tmpl
   trunk/src/plugins/wiki/www/themes/default/templates/viewsource.tmpl
   trunk/src/plugins/wiki/www/themes/fusionforge/templates/actionbar.tmpl
   trunk/src/plugins/wiki/www/themes/fusionforge/templates/editpage.tmpl
Log:
Update Phpwiki templates

Modified: trunk/src/plugins/wiki/www/themes/Crao/templates/editpage.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/Crao/templates/editpage.tmpl	2010-09-09 19:06:18 UTC (rev 10442)
+++ trunk/src/plugins/wiki/www/themes/Crao/templates/editpage.tmpl	2010-09-09 19:30:31 UTC (rev 10443)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: editpage.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// rcs_id('$Id: editpage.tmpl 7675 2010-09-03 13:08:03Z vargenau $');
 ?>
 <?php if (isset($PREVIEW_CONTENT)) { ?>
   <p><strong><?php echo _("Preview only!  Changes not saved.")?></strong>
@@ -16,7 +16,7 @@
 <?php echo $PAGE_LOCKED_MESSAGE ?>
 <?php echo $CONCURRENT_UPDATE_MESSAGE ?>
 <?php if (! $IS_CURRENT) { ?>
-  <p><strong><?php echo _("Warning: You are editing an old revision.")?>
+  <p class="warning_msg"><strong><?php echo _("Warning: You are editing an old revision.")?>
         <?php echo _("Saving this page will overwrite the current version.")?></strong></p>
 <?php } ?>
 <?php /*

Modified: trunk/src/plugins/wiki/www/themes/MonoBook/templates/viewsource.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/MonoBook/templates/viewsource.tmpl	2010-09-09 19:06:18 UTC (rev 10442)
+++ trunk/src/plugins/wiki/www/themes/MonoBook/templates/viewsource.tmpl	2010-09-09 19:30:31 UTC (rev 10443)
@@ -1,24 +1,20 @@
 <?php // -*-php-*-
-// rcs_id('$Id: viewsource.tmpl 7620 2010-07-16 08:01:14Z vargenau $');
+// rcs_id('$Id: viewsource.tmpl 7675 2010-09-03 13:08:03Z vargenau $');
 ?>
 <?php if ($page->get('locked') && !$user->isAdmin()) { ?>
-  <p><strong><?php echo _("Note:")?></strong>
-  <?php echo _("This page has been locked by the administrator and cannot be edited.")?>
+  <p class="warning_msg"><strong><?php echo _("Note:")?></strong>
+  <?php echo _("This page has been locked and cannot be edited.")?>
   </p>
-  <?php } ?>
+<?php } ?>
 <?php if ($revision and !$revision->isCurrent()) { ?>
-  <p><?php echo _("You are viewing an old revision of this page.")?>
-  <?php echo Button('edit', _("View the current version"), $page) ?>.
+  <p class="warning_msg"><?php echo _("You are viewing an old revision of this page.")?>
+  <?php echo Button('edit', _("View the current version."), $page) ?>
   </p>
-  <?php } ?>
-<!-- Dummy form else NS4 does not like the textarea -->
-<form method="post" action="<?php echo $request->getPostURL()?>" accept-charset="<?php echo CHARSET?>">
-<?php /* To clear beyond a larger logo, such as in the Hawaiian theme */ ?>
+<?php } ?>
 <br class="clear-floats" />
 <textarea class="wikiedit"
-name="content"
-rows="<?php echo $request->getPref('editHeight')?>"
-cols="<?php echo $request->getPref('editWidth')?>"
-readonly="readonly"><?php echo $PAGE_SOURCE ?></textarea>
-<?php echo $HIDDEN_INPUTS?>
-</form>
+          name="content"
+          rows="<?php echo $request->getPref('editHeight')?>"
+          cols="<?php echo $request->getPref('editWidth')?>"
+          readonly="readonly"
+><?php echo $PAGE_SOURCE ?></textarea>

Modified: trunk/src/plugins/wiki/www/themes/Portland/templates/editpage.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/Portland/templates/editpage.tmpl	2010-09-09 19:06:18 UTC (rev 10442)
+++ trunk/src/plugins/wiki/www/themes/Portland/templates/editpage.tmpl	2010-09-09 19:30:31 UTC (rev 10443)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: editpage.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// rcs_id('$Id: editpage.tmpl 7675 2010-09-03 13:08:03Z vargenau $');
 ?>
 <?php /*
  * FIXME: Hack!
@@ -20,7 +20,7 @@
     <?php echo $PAGE_LOCKED_MESSAGE ?>
     <?php echo $CONCURRENT_UPDATE_MESSAGE ?>
     <?php if (!$IS_CURRENT) { ?>
-      <p><strong><?php echo _("Warning: You are editing an old revision.")?>
+      <p class="warning_msg"><strong><?php echo _("Warning: You are editing an old revision.")?>
             <?php echo _("Saving this page will overwrite the current version.")?></strong></p>
     <?php } ?>
   </td>

Modified: trunk/src/plugins/wiki/www/themes/Portland/templates/viewsource.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/Portland/templates/viewsource.tmpl	2010-09-09 19:06:18 UTC (rev 10442)
+++ trunk/src/plugins/wiki/www/themes/Portland/templates/viewsource.tmpl	2010-09-09 19:30:31 UTC (rev 10443)
@@ -1,28 +1,21 @@
 <?php // -*-php-*-
-// rcs_id('$Id: viewsource.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// rcs_id('$Id: viewsource.tmpl 7675 2010-09-03 13:08:03Z vargenau $');
 ?>
-
 <?php if ($page->get('locked') && !$user->isAdmin()) { ?>
-  <p><strong><?php echo _("Note:")?></strong>
-  <?php echo _("This page has been locked by the administrator and cannot be edited.")?></p>
+  <p class="warning_msg"><strong><?php echo _("Note:")?></strong>
+  <?php echo _("This page has been locked and cannot be edited.")?></p>
 <?php } ?>
-
 <?php if ($revision and !$revision->isCurrent()) { ?>
-  <p><?php echo _("You are viewing an old revision of this page.")?>
-  <?php echo Button('viewsource', _("View the current version"), $page)?>.</p>
+  <p class="warning_msg"><?php echo _("You are viewing an old revision of this page.")?>
+  <?php echo Button('viewsource', _("View the current version."), $page)?></p>
 <?php } ?>
-
-<!-- Dummy form else NS4 does not like the textarea -->
-<form method="post" action="<?php echo $request->getPostURL()?>" accept-charset="<?php echo CHARSET?>">
 <textarea class="wikiedit"
           name="content"
           rows="<?php echo $request->getPref('editHeight')?>"
           cols="<?php echo $request->getPref('editWidth')?>"
-	  readonly="readonly"
-          ><?php echo $PAGE_SOURCE ?></textarea>
-<?php echo HiddenInputs($request->getArgs()) ?>
-</form>
+          readonly="readonly"
+><?php echo $PAGE_SOURCE ?></textarea>
 <hr />
-<a href="<?php echo WikiURL($page,array('action'=>_("PageHistory")))?>"
-   ><?php echo $WikiTheme->getLastModifiedMessage($revision) ?></a>
+<a href="<?php echo WikiURL($page,array('action'=>_("PageHistory")))?>">
+<?php echo $WikiTheme->getLastModifiedMessage($revision) ?></a>
 <br />

Modified: trunk/src/plugins/wiki/www/themes/Wordpress/templates/viewsource.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/Wordpress/templates/viewsource.tmpl	2010-09-09 19:06:18 UTC (rev 10442)
+++ trunk/src/plugins/wiki/www/themes/Wordpress/templates/viewsource.tmpl	2010-09-09 19:30:31 UTC (rev 10443)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: viewsource.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// rcs_id('$Id: viewsource.tmpl 7675 2010-09-03 13:08:03Z vargenau $');
 ?>
 
 <div class="wikitext" id="viewform">
@@ -7,25 +7,19 @@
 <?php 
 if (empty($revision)) $revision = $page->getCurrentRevision(false);
 if ($page->get('locked') && !$user->isAdmin()) { ?>
-  <p><strong><?php echo _("Note:")?></strong>
-  <?php echo _("This page has been locked by the administrator and cannot be edited.")?></p>
+  <p class="warning_msg"><strong><?php echo _("Note:")?></strong>
+  <?php echo _("This page has been locked and cannot be edited.")?></p>
 <?php } ?>
-
 <?php if (! $revision->isCurrent()) { ?>
-  <p><?php echo _("You are viewing an old revision of this page.")?>
+  <p class="warning_msg"><?php echo _("You are viewing an old revision of this page.")?>
   <?php echo Button('viewsource', _("View the current version"), $page)?>.</p>
 <?php } ?>
-
-<!-- Dummy form else NS4 does not like the textarea -->
-<form method="post" action="<?php echo $request->getPostURL()?>" accept-charset="<?php echo CHARSET?>">
 <textarea class="wikiedit"
           name="content"
           rows="<?php echo $request->getPref('editHeight')?>"
           cols="<?php echo $request->getPref('editWidth')?>"
-	  readonly="readonly"
-          ><?php echo $PAGE_SOURCE ?></textarea>
-<?php echo HiddenInputs($request->getArgs()) ?>
-</form>
+          readonly="readonly"
+><?php echo $PAGE_SOURCE ?></textarea>
 <hr />
 <a href="<?php echo WikiURL($page,array('action'=>_("PageHistory")))?>"
    ><?php echo $WikiTheme->getLastModifiedMessage($revision) ?></a>

Modified: trunk/src/plugins/wiki/www/themes/blog/templates/viewsource.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/blog/templates/viewsource.tmpl	2010-09-09 19:06:18 UTC (rev 10442)
+++ trunk/src/plugins/wiki/www/themes/blog/templates/viewsource.tmpl	2010-09-09 19:30:31 UTC (rev 10443)
@@ -1,27 +1,22 @@
 <?php // -*-php-*-
-// rcs_id('$Id: viewsource.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// rcs_id('$Id: viewsource.tmpl 7675 2010-09-03 13:08:03Z vargenau $');
 ?>
 <?php 
 if (empty($revision)) $revision = $page->getCurrentRevision(false);
 if ($page->get('locked') && !$user->isAdmin()) { ?>
-  <p><strong><?php echo _("Note:")?></strong>
-  <?php echo _("This page has been locked by the administrator and cannot be edited.")?>
+  <p class="warning_msg"><strong><?php echo _("Note:")?></strong>
+  <?php echo _("This page has been locked and cannot be edited.")?>
   </p>
-  <?php } ?>
+<?php } ?>
 <?php if (! $revision->isCurrent()) { ?>
-  <p><?php echo _("You are viewing an old revision of this page.")?>
-  <?php echo Button('edit', _("View the current version"), $page) ?>.
+  <p class="warning_msg"><?php echo _("You are viewing an old revision of this page.")?>
+  <?php echo Button('edit', _("View the current version."), $page) ?>
   </p>
-  <?php } ?>
-<!-- Dummy form else NS4 does not like the textarea -->
-<form method="post" id="editcontent" 
-      action="<?php echo $request->getPostURL()?>" accept-charset="<?php echo CHARSET?>">
+<?php } ?>
 <br class="clear-floats" />
 <textarea class="wikiedit"
-name="content" 
-rows="<?php echo $request->getPref('editHeight')?>"
-cols="<?php echo $request->getPref('editWidth')?>"
-readonly="readonly"
+          name="content" 
+          rows="<?php echo $request->getPref('editHeight')?>"
+          cols="<?php echo $request->getPref('editWidth')?>"
+          readonly="readonly"
 ><?php echo $PAGE_SOURCE ?></textarea>
-<?php echo $HIDDEN_INPUTS?>
-</form>

Modified: trunk/src/plugins/wiki/www/themes/default/templates/editpage.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/default/templates/editpage.tmpl	2010-09-09 19:06:18 UTC (rev 10442)
+++ trunk/src/plugins/wiki/www/themes/default/templates/editpage.tmpl	2010-09-09 19:30:31 UTC (rev 10443)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: editpage.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// rcs_id('$Id: editpage.tmpl 7675 2010-09-03 13:08:03Z vargenau $');
 ?>
 <?php if (isset($PREVIEW_CONTENT)) { ?>
   <p><strong><?php echo _("Preview only!  Changes not saved.")?></strong>
@@ -18,7 +18,7 @@
 <?php echo $CONCURRENT_UPDATE_MESSAGE ?>
 
 <?php if (! $IS_CURRENT) { ?>
-  <p><strong><?php echo _("Warning: You are editing an old revision.")?>
+  <p class="warning_msg"><strong><?php echo _("Warning: You are editing an old revision.")?>
         <?php echo _("Saving this page will overwrite the current version.")?></strong></p>
 <?php } ?>
 <?php /*

Modified: trunk/src/plugins/wiki/www/themes/default/templates/viewsource.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/default/templates/viewsource.tmpl	2010-09-09 19:06:18 UTC (rev 10442)
+++ trunk/src/plugins/wiki/www/themes/default/templates/viewsource.tmpl	2010-09-09 19:30:31 UTC (rev 10443)
@@ -1,29 +1,24 @@
 <?php // -*-php-*-
-// rcs_id('$Id: viewsource.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// rcs_id('$Id: viewsource.tmpl 7675 2010-09-03 13:08:03Z vargenau $');
 ?>
 
 <?php if ($page->get('locked') && !$user->isAdmin()) { ?>
-  <p><strong><?php echo _("Note:")?></strong>
-  <?php echo _("This page has been locked by the administrator and cannot be edited.")?>
+  <p class="warning_msg"><strong><?php echo _("Note:")?></strong>
+  <?php echo _("This page has been locked and cannot be edited.")?>
   </p>
-  <?php } ?>
+<?php } ?>
 <?php if ($revision and !$revision->isCurrent()) { ?>
-  <p><?php echo _("You are viewing an old revision of this page.")?>
-  <?php echo Button('edit', _("View the current version"), $page) ?>.
+  <p class="warning_msg"><?php echo _("You are viewing an old revision of this page.")?>
+  <?php echo Button('edit', _("View the current version."), $page) ?>
   </p>
-  <?php } ?>
-<!-- Dummy form else NS4 does not like the textarea -->
-<form method="post" action="<?php echo $request->getPostURL()?>" accept-charset="<?php echo CHARSET?>">
-<?php /* To clear beyond a larger logo, such as in the Hawaiian theme */ ?>
+<?php } ?>
 <br class="clear-floats" />
 <textarea class="wikiedit"
-name="content"
-rows="<?php echo $request->getPref('editHeight')?>"
-cols="<?php echo $request->getPref('editWidth')?>"
-readonly="readonly"
+          name="content"
+          rows="<?php echo $request->getPref('editHeight')?>"
+          cols="<?php echo $request->getPref('editWidth')?>"
+          readonly="readonly"
 ><?php echo $PAGE_SOURCE ?></textarea>
-<?php echo $HIDDEN_INPUTS?>
-</form>
 
 <div id="footer"><!-- for top & bottom toolbars stylesheet -->
 <?php echo Template('browse-footer')?>

Modified: trunk/src/plugins/wiki/www/themes/fusionforge/templates/actionbar.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/templates/actionbar.tmpl	2010-09-09 19:06:18 UTC (rev 10442)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/templates/actionbar.tmpl	2010-09-09 19:30:31 UTC (rev 10443)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: actionbar.tmpl 7644 2010-08-13 13:34:26Z vargenau $');
+// rcs_id('$Id: actionbar.tmpl 7674 2010-09-03 13:01:27Z vargenau $');
 ?>
 
 <?php 
@@ -50,7 +50,7 @@
     <td class="spacer">&nbsp;</td>
     <td class="spacer">&nbsp;</td>
 
-    <?php if ((mayAccessPage('edit', $page->getName())) and $revision) { ?>
+    <?php if (!($page->get('locked')) and (mayAccessPage('edit', $page->getName())) and $revision) { ?>
       <td class="bold"><?php echo Button("edit", $dbh->isWikiPage($page->getName()) ? ($revision->isCurrent() ? _("Edit") : _("Edit Old Revision")) : _("Create Page")) ?></td>
     <?php } else if ($dbh->isWikiPage($page->getName())) { ?>
       <td><?php echo Button("viewsource", _("View Source")) ?></td>

Modified: trunk/src/plugins/wiki/www/themes/fusionforge/templates/editpage.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/templates/editpage.tmpl	2010-09-09 19:06:18 UTC (rev 10442)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/templates/editpage.tmpl	2010-09-09 19:30:31 UTC (rev 10443)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: editpage.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// rcs_id('$Id: editpage.tmpl 7675 2010-09-03 13:08:03Z vargenau $');
 ?>
 <?php if (isset($PREVIEW_CONTENT)) { ?>
   <p><strong><?php echo _("Preview only!  Changes not saved.")?></strong>
@@ -13,7 +13,7 @@
 <?php echo $CONCURRENT_UPDATE_MESSAGE ?>
 
 <?php if (! $IS_CURRENT) { ?>
-  <p><strong><?php echo _("Warning: You are editing an old revision.")?>
+  <p class="warning_msg"><strong><?php echo _("Warning: You are editing an old revision.")?>
         <?php echo _("Saving this page will overwrite the current version.")?></strong></p>
 <?php } ?>
 <?php /*




More information about the Fusionforge-commits mailing list