[phpwiki-checkins] SF.net SVN: phpwiki:[8705] trunk

[<var...@us...>]

Revision: 8705
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8705&view=rev
Author:   vargenau
Date:     2012-12-29 19:58:05 +0000 (Sat, 29 Dec 2012)
Log Message:
-----------
format=printable does not exist

Modified Paths:
--------------
    trunk/TODO
    trunk/themes/MonoBook/templates/navbar.tmpl
    trunk/themes/Sidebar/templates/navbar.tmpl

Modified: trunk/TODO
===================================================================
--- trunk/TODO	2012-12-29 19:43:02 UTC (rev 8704)
+++ trunk/TODO	2012-12-29 19:58:05 UTC (rev 8705)
@@ -68,7 +68,6 @@
 * SQL textsearch with multiple words: AND 
   (the two new failing unit tests)
 * fix textsearch optimize with "word -word -word"
-* format=printable (?) for non js/dom
 
 OLDER TODO's:
 Maybe (probably defer):

Modified: trunk/themes/MonoBook/templates/navbar.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/navbar.tmpl	2012-12-29 19:43:02 UTC (rev 8704)
+++ trunk/themes/MonoBook/templates/navbar.tmpl	2012-12-29 19:58:05 UTC (rev 8705)
@@ -57,15 +57,10 @@
     <?php if ($user->isSignedIn()) { ?>
       <li><?php $link = WikiLink(_("UpLoad"),"",_("Upload File")); $link->setAttr("accesskey","u"); $link->addTooltip(_("Upload images or media files")." [$p-u]"); ?><?php echo $link ?></li>
     <?php } ?>
-    <li>
       <?php $PrintableLink = $WikiTheme->makeButton(_("Printable version"), "javascript:PrinterStylesheet();", 'wikiaction'); ?>
 <script type="text/javascript"><!--
-document.write('<?php echo $PrintableLink ?>'); // -->
+document.write('<li><?php echo $PrintableLink ?></li>'); // -->
 </script>
-<noscript>
-  <?php echo $WikiTheme->makeButton(_("Printable version"), "?format=printable", 'wikiaction') ?>
-</noscript>
-</li>
     <?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { 
       // Do not display the pdf icon
       $btn = new Button(_("Display as Pdf"), WikiURL($page->getName(), array('action' => 'pdf')), 'wikiaction');
@@ -77,4 +72,3 @@
   </div>
 </div>
 <!-- end of the left (by default at least) column -->
-

Modified: trunk/themes/Sidebar/templates/navbar.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/navbar.tmpl	2012-12-29 19:43:02 UTC (rev 8704)
+++ trunk/themes/Sidebar/templates/navbar.tmpl	2012-12-29 19:58:05 UTC (rev 8705)
@@ -48,15 +48,10 @@
       <li><?php $link = WikiLink(_("UpLoad"),"",_("Upload File")); $link->setAttr("accesskey","u"); $link->addTooltip(_("Upload images or media files")." [$p-u]"); ?><?php echo $link ?></li>
       <li><?php echo WikiLink(_("UserPreferences"), "",_("Preferences")) ?></li>
     <?php } ?>
-    <li>
       <?php $PrintableLink = $WikiTheme->makeButton(_("Printable version"), "javascript:PrinterStylesheet();", 'wikiaction'); ?>
 <script type="text/javascript"><!--
-document.write('<?php echo $PrintableLink ?>'); // -->
+document.write('<li><?php echo $PrintableLink ?></li>'); // -->
 </script>
-<noscript>
-  <?php echo $WikiTheme->makeButton(_("Printable version"), "?format=printable", 'wikiaction') ?>
-</noscript>
-</li>
     <?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { 
       // Do not display the pdf icon
       $btn = new Button(_("Display as Pdf"), WikiURL($page->getName(), array('action' => 'pdf')), 'wikiaction');

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