From ccb4fb1ad79f26fa1d2ac7f4e49844bbb0f9f7c6 Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Fri, 8 Apr 2005 05:28:54 +0000
Subject: [PATCH] IE size fixes, template perm checks

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@4663 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 themes/smaller/IEFixes.css              |  7 ++++
 themes/smaller/phpwiki.css              | 12 +++++-
 themes/smaller/templates/actionbar.tmpl | 55 +++++++++++++------------
 themes/smaller/templates/info.tmpl      | 12 +++---
 4 files changed, 52 insertions(+), 34 deletions(-)
 create mode 100644 themes/smaller/IEFixes.css

diff --git a/themes/smaller/IEFixes.css b/themes/smaller/IEFixes.css
new file mode 100644
index 000000000..502bc9b2b
--- /dev/null
+++ b/themes/smaller/IEFixes.css
@@ -0,0 +1,7 @@
+/*
+** IE Fixes (5.0, 5.5, 6.0)
+*/
+
+#actionbuttons { font-size: 80% }
+
+td, .hint { font-size: 90% }
diff --git a/themes/smaller/phpwiki.css b/themes/smaller/phpwiki.css
index e19dcabe3..cff1323f9 100644
--- a/themes/smaller/phpwiki.css
+++ b/themes/smaller/phpwiki.css
@@ -1,5 +1,5 @@
 /**
- * $Id: phpwiki.css,v 1.1 2004-06-08 13:15:23 rurban Exp $
+ * $Id: phpwiki.css,v 1.2 2005-04-08 05:28:54 rurban Exp $
  * We have two possibilities to override the default:
  * 1. import is ns4 incompatible
  * 2. add a 2nd css in themeinfo.php
@@ -28,6 +28,16 @@ body {
 
 h1 { margin: 0; font-size: 140% }
 
+/* IE5.0 */
+@media tty { 
+    i{content:"\";/*" "*/}}; @import 'IEFixes.css'; {;}/*";} 
+}
+
+/* IE5.5 */
+@media tty {
+    i{content:"\";/*" "*/}}@m; @import 'IEFixes.css'; /*";}
+}
+
 /* For emacs users
  *
  * Local Variables:
diff --git a/themes/smaller/templates/actionbar.tmpl b/themes/smaller/templates/actionbar.tmpl
index 6bd95ad3e..c67be7e74 100644
--- a/themes/smaller/templates/actionbar.tmpl
+++ b/themes/smaller/templates/actionbar.tmpl
@@ -1,19 +1,16 @@
-<?php // -*-php-*- ?>
-<!-- $Id: actionbar.tmpl,v 1.4 2004-06-14 11:26:53 rurban Exp $ -->
-<?php
-  if (!$page->get('locked') || $user->isAdmin())
-      $EditB = Button("edit",
-                      $revision->isCurrent() ? _("Edit") : _("Edit Old Revision"));
-  else
-      $EditB = Button("viewsource", _("View Source"));
-
-  $Sep = $WikiTheme->getButtonSeparator();
+<?php // -*-php-*-
+rcs_id('$Id: actionbar.tmpl,v 1.5 2005-04-08 05:28:54 rurban Exp $');
+if (!$page->get('locked') || $user->isAdmin())
+    $EditB = Button("edit",
+                    $revision->isCurrent() ? _("Edit") : _("Edit Old Revision"));
+else
+    $EditB = Button("viewsource", _("View Source"));
 ?>
-<!-- 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...  -->
+<?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">
@@ -21,30 +18,34 @@
   <div id="actionbuttons">
     <? if ( $user->isSignedIn()) { ?>
      <?= $EditB ?>
-     <?php if ($user->isAdmin() or mayAccessPage('change',$page->getName())) { ?>
-      <?=$Sep?><?= Button($page->get('locked') ? 'unlock' : 'lock') ?>
-      <?php if (ENABLE_PAGEPERM) { ?>
-        <?=$Sep?><?= Button('chown') ?>
-        <?=$Sep?><?= Button('setacl') ?>
+     <?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') ?>
      <?php }} ?>
-     <?php if ($user->isAdmin() or mayAccessPage('remove',$page->getName())) { ?>
-      <?=$Sep?><?= Button('remove') ?>
+     <?php if ($user->isAdmin() or mayAccessPage('remove', $page->getName())) { ?>
+      <?=$SEP?><?= Button('remove') ?>
      <?php } ?>
+     <?=$SEP?>
     <?php } ?>
-    <?=$Sep?><?= Button(array('action'=>'PageInfo'),_("Info"),$page->getName()) ?>
+   <?= Button(array('action'=>'PageInfo'),_("Info"), $page->getName()) ?>
 <?php if (((defined('DEBUG') and DEBUG and $request->getArg('action') == 'browse')) || $user->isAdmin()) { ?>
       <!-- Buttons really only for debugging -->
-      <?=$Sep?><?= Button(_("PageHistory")) ?>
-      <?=$Sep?><?= Button("diff") ?>
-      <?=$Sep?><?= Button(_("PageDump")) ?>
+      <?=$SEP?><?= Button(_("PageHistory")) ?>
+      <?=$SEP?><?= Button("diff") ?>
+      <?=$SEP?><?= Button(_("PageDump")) ?>
 <?php
      $PurgeCache = Button(array('nocache' => 'purge'),
                      _("PurgeHtmlCache"), $page->getName());
      $PurgeCache->addTooltip(_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."));
 ?>
-    <?=$Sep?><?= $PurgeCache ?>
+    <?=$SEP?><?= $PurgeCache ?>
     <!-- End debugging buttons -->
     <?php } ?>
+<?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { ?> 
+    <?=$SEP?><?= Button("pdf") ?>
+<?php } ?>
   </div>
   </td>
 <?php if (empty($NOSIGNIN)) { ?>
diff --git a/themes/smaller/templates/info.tmpl b/themes/smaller/templates/info.tmpl
index 225d051c0..2c442c7ce 100644
--- a/themes/smaller/templates/info.tmpl
+++ b/themes/smaller/templates/info.tmpl
@@ -1,5 +1,6 @@
 <?php // -*-php-*- ?>
 <?= Template("default/info") ?>
+
 <div id="actionbuttons">
     <?= Button("viewsource", _("View Source")) ?>
     <?=$SEP?><?= Button("PageHistory", _("PageHistory")) ?>
@@ -7,16 +8,15 @@
     <?=$SEP?><?= Button("Diff") ?>
     <?=$SEP?><?= Button(array('action'=>'diff','previous' => 'minor'),_("Diff previous Revision"),$page->getName()) ?>
     <?=$SEP?><?= Button(array('action'=>'diff','previous' => 'author'),_("Diff previous Author"),$page->getName()) ?>
-<?php if ((defined('DEBUG') && DEBUG) || $user->isAdmin()) { ?>
+  <?php if ((defined('DEBUG') && DEBUG) || $user->isAdmin()) { ?>
     <!-- Buttons really only for debugging -->
     <?=$SEP?><?= Button("DebugInfo", _("DebugInfo")) ?>
 <?php
-     $PurgeCache = Button(array('nocache' => 'purge'),
+    $PurgeCache = Button(array('nocache' => 'purge'),
                      _("PurgeHtmlCache"), $page->getName());
-     $PurgeCache->addTooltip(_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."));
+    $PurgeCache->addTooltip(_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed."));
 ?>
     <?=$SEP?><?= $PurgeCache ?>
-
     <!-- End debugging buttons -->
-<?php } ?>
-  </div>
+  <?php } ?>
+</div>
-- 
2.45.0