Thread: [phpwiki-checkins] SF.net SVN: phpwiki:[7019] trunk/themes/default/templates/actionbar.tmpl

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 7019
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7019&view=rev
Author:   vargenau
Date:     2009-07-13 03:14:12 +0000 (Mon, 13 Jul 2009)

Log Message:
-----------
Revert: ActionButton is not defined in default theme

Modified Paths:
--------------
    trunk/themes/default/templates/actionbar.tmpl

Modified: trunk/themes/default/templates/actionbar.tmpl
===================================================================

--- trunk/themes/default/templates/actionbar.tmpl	2009-07-13 03:07:31 UTC (rev 7018)
+++ trunk/themes/default/templates/actionbar.tmpl	2009-07-13 03:14:12 UTC (rev 7019)
@@ -1,71 +1,67 @@
 <?php // -*-php-*-
 rcs_id('$Id$');
 ?>
-<?php
-  $dbh = $request->getDbh();
-  $isAdmin = $user->isAdmin();
-  $pagename = $page->getName();
-  $isActionPage = $request->_isActionPage($pagename, false);
-?>
-<div class="portlet" id="p-cactions">
-  <h5>Views</h5>
-  <ul>
-    <?php if ($request->getArg('action') != "") { ?>
-      <?= ActionButton("browse", _("View Page"), false, array('title' => "View the page [alt-c]")) ?>
-    <?php } else { ?>
-      <li class="selected"><a class="named-wiki" name="browse"><?= _("View Page") ?></a></li>
-    <?php } ?>
-    <?php if (($isAdmin or mayAccessPage('edit', $pagename)) and $revision) {
-            $label = $revision->isCurrent() ? _("Edit") : _("Edit Old Revision"); ?>
-      <?= ActionButton("edit", $revision->isCurrent() ? _("Edit") : _("Edit Old Revision"), 
-		       false, array('id' => 'btn-edit', 'title' => "You can edit this page. Please use the preview button before saving. [alt-e]")) ?>
-      <?php if (ENABLE_WYSIWYG) { ?>
-        <?= ActionButton(array("action" => "edit", "mode"=> "wysiwyg"), "Wysiwyg Editor", false, array('id' => 'btn-wysiwyg-edit')) ?>
+<?php if (!$WikiTheme->DUMP_MODE) { ?>
+<?php /* I would like not to have to use these tables, and managed to
+       * get this stuff to work more or less correctly using
+       * CSSs float:left; and float:right;.  However float:right; seems
+       * to cause MSIE4.01/NT to hang. 
+       * So, we use tables...  */ ?>
+<table summary="Toolbar 1: Page actions and user login."
+       width="100%" cellpadding="0" cellspacing="0" border="0">
+<tr valign="baseline">
+  <td>
+  <div id="actionbuttons">
+    <?php if ((!$page->get('locked') || $user->isAdmin()) and $revision) { ?>
+      <?= Button("edit", $revision->isCurrent() ? _("Edit") : _("Edit Old Revision"), false, array('id'=>'btn-edit')) ?>
+      <? if (ENABLE_WYSIWYG) { ?>
+        <?=$SEP?><?= Button(array("action" => "edit", "mode"=> "wysiwyg"), "Wysiwyg Editor", false, array('id' => 'btn-wysiwyg-edit')) ?>
       <?php } ?>
     <?php } else { ?>
-      <?= ActionButton("viewsource", _("View Source")) ?>
+      <?= Button("viewsource", _("View Source")) ?>
     <?php } ?>
-    <?= ActionButton(_("PageHistory"),_("History"),false,array('title'=>"Past versions of this page. [alt-h]")) ?>
-    <?= ActionButton("diff") ?> 
-    <? if ( $user->isSignedIn() ) { ?>
-      <?= ActionButton("WatchPage", _("Watch"), false, 
-		       array('title'=>"Add/Remove this to/from the list of pages you're monitoring for changes [alt-l]")) ?>
+    <?php if ($user->isAdmin() or mayAccessPage('change', $page->getName())) { ?>
+      <?=$SEP?><?= Button($page->get('locked') ? 'unlock' : 'lock') ?>
+    <?php if (ENABLE_PAGEPERM and mayAccessPage('change', $page->getName())) { ?>
+      <?=$SEP?><?= Button('chown') ?>
+      <?=$SEP?><?= Button('setacl') ?>
+      <?=$SEP?><?= Button('rename') ?>
+    <?php }} ?>
+    <?php if ($revision and ($user->isAdmin() or mayAccessPage('remove', $page->getName()))) { ?>
+      <?=$SEP?><?= Button('revert',_("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?>
+      <?=$SEP?><?= Button('remove') ?>
     <?php } ?>
-  </ul>
-</div>
-
-<?php if ($user->isSignedIn()) { ?>
-<div class="portlet" id="p-tbx">
-  <h5>Special Actions <?= $WikiTheme->folderArrow('p-tbx', 'Closed') ?></h5>
-  <div class="pBody" id="p-tbx-body" style="display:none;">
-  <ul>
-     <?php if ($isAdmin or mayAccessPage('edit', $pagename)) { ?>
-      <?= ActionButton('rename') ?>
-     <?php } ?>
-     <?php if (!empty($revision) and ($isAdmin or mayAccessPage('remove', $pagename))) { ?>
-      <?= ActionButton('remove') ?>
-      <?= ActionButton('revert',_("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?>
-     <?php } ?>
-     <?php if ($isAdmin or mayAccessPage('change', $pagename)) { ?>
-      <?= ActionButton($page->get('locked') ? 'unlock' : 'lock') ?>
-      <?php if (ENABLE_PAGEPERM and mayAccessPage('change', $pagename)) { ?>
-       <?= ActionButton('chown') ?>
-       <?= ActionButton('setacl') ?>
-     <?php }} ?>
-     <?= ActionButton(array('action'=>'PageInfo'), _("PageInfo"),$pagename) ?>
-     <?= ActionButton(_("AuthorHistory")) ?>
-     <?= ActionButton(_("PageHistory")) ?>
-     <?= ActionButton("diff") ?> 
-     <?php if ($isAdmin) { ?>
-      <?= ActionButton(_("PageDump")) ?>
-      <?php if (DEBUG & _DEBUG_SQL and USECACHE) {
-        $PurgeCache = Button(array('nocache' => 'purge'),
-                     _("PurgeHtmlCache"), $pagename);
-        $PurgeCache->addTooltip(_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed.")); ?>
-        <?= $PurgeCache ?>
-      <?php } ?>
-    <?php } // isAdmin ?>
-  </ul>
+    <?=$SEP?><?= Button("PageHistory", _("PageHistory")) ?>
+    <?=$SEP?><?= Button("diff") ?> 
+    <?=$SEP?><?= Button("PageInfo", _("PageInfo")) ?>
+<?php if ((DEBUG and $request->getArg('action') == 'browse') || $user->isAdmin()) { ?> 
+    <!-- Buttons really only for debugging -->
+    <?=$SEP?><?= Button("DebugInfo", _("DebugInfo")) ?>
+    <?=$SEP?><?= Button("PageDump", _("PageDump")) ?>
+<?php
+    if (DEBUG & _DEBUG_SQL and USECACHE) {
+      $PurgeCache = Button(array('nocache' => 'purge'),
+                     _("PurgeHtmlCache"), $page->getName());
+      $PurgeCache->addTooltip(_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."));
+?>
+      <?=$SEP?><?= $PurgeCache ?>
+<?php } ?>
+    <!-- End debugging buttons -->
+<?php } ?>
+<?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { ?> 
+      <?=$SEP?><?= Button("pdf","Pdf",'wikiclear',array('id'=>'btn-pdf')) ?>
+<?php } ?>
   </div>
-</div>
-<?php } //isSignedIn ?>
+  </td>
+<?php if (empty($NOSIGNIN)) { ?>
+<?php
+/* valign="top" is not ideal here but required to get reasonable alignment
+   with the other action buttons in some browsers, like OmniWeb and Safari
+   (therefore probably Konquorer too) */ ?>
+  <td align="right" valign="top">
+    <div id="signin"><?= Template('signin') ?></div>
+  </td>
+<?php } ?>
+</tr>
+</table>
+<?php } ?>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


