---- sidebar/main.php 2009-08-30 00:00:33.098142092 +0300
-+++ sidebar/main.php 2009-08-29 23:53:54.718210429 +0300
-@@ -63,6 +63,28 @@
- <div class="bar-left" id="bar__topleft">
- <?php tpl_button('edit')?>
- <?php tpl_button('history')?>
-+ <?php
-+ $pdf_plugin = &plugin_load('action','html2pdf');
-+ if ($pdf_plugin && !plugin_isdisabled($pdf_plugin->getPluginName())) { ?>
-+ <form class="button" method="get" action="<?php wl($ID)?>">
-+ <div class="no">
-+ <input type="submit" value="Export to PDF" class="button" />
-+ <input type="hidden" name="do" value="export_pdf" />
-+ <input type="hidden" name="id" value="<?php echo $ID?>" />
-+ </div>
-+ </form>
-+ <?php } ?>
-+ <?php
-+ $odt_plugin = &plugin_load('renderer','odt');
-+ if ($pdf_plugin && !plugin_isdisabled($pdf_plugin->getPluginName())) { ?>
-+ <form class="button" method="get" action="<?php wl($ID)?>">
-+ <div class="no">
-+ <input type="submit" value="Export to ODT" class="button" />
-+ <input type="hidden" name="do" value="export_odt" />
-+ <input type="hidden" name="id" value="<?php echo $ID?>" />
-+ </div>
-+ </form>
-+ <?php } ?>
+--- dokuwiki-rc2011-11-10/lib/tpl/default/main.php~ 2012-02-11 15:16:44.000000000 +0200
++++ dokuwiki-rc2011-11-10/lib/tpl/default/main.php 2012-02-11 15:17:57.971423003 +0200
+@@ -15,6 +15,8 @@
+ // must be run from within DokuWiki
+ if (!defined('DOKU_INC')) die();
+
++global $REV;
++
+ ?>
+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+@@ -66,6 +68,31 @@
</div>
<div class="bar-right" id="bar__topright">
++ <?php
++ if (!plugin_isdisabled('html2pdf') || !plugin_isdisabled('dw2pdf')) { ?>
++ <form class="button" method="get" action="<?php wl($ID)?>">
++ <div class="no">
++ <button type="submit" class="button">
++ <img src="<?php echo DOKU_BASE?>lib/images/fileicons/pdf.png" alt="PDF Export" />
++ Export to PDF
++ </button>
++ <input type="hidden" name="do" value="export_pdf" />
++ <input type="hidden" name="id" value="<?php echo $ID?>" />
++ <input type="hidden" name="rev" value="<?php echo $REV ?>" />
++ </div>
++ </form>
++ <?php } ?>
++ <?php
++ if (!plugin_isdisabled('odt')) { ?>
++ <form class="button" method="get" action="<?php wl($ID)?>">
++ <div class="no">
++ <input type="submit" value="Export to ODT" class="button" />
++ <input type="hidden" name="do" value="export_odt" />
++ <input type="hidden" name="id" value="<?php echo $ID?>" />
++ <input type="hidden" name="rev" value="<?php echo $REV ?>" />
++ </div>
++ </form>
++ <?php } ?>
+ <?php tpl_button('recent')?>
+ <?php tpl_searchform()?>
+ </div>
+--- dokuwiki/lib/tpl/dokuwiki/tpl_header.php 2012-09-01 22:54:16.816853164 +0300
++++ dokuwiki-2012-09-01/lib/tpl/dokuwiki/tpl_header.php 2012-09-01 23:14:51.484803869 +0300
+@@ -64,6 +64,19 @@
+ </div>
+ <ul>
+ <?php
++ global $REV;
++ if (!plugin_isdisabled('html2pdf') || !plugin_isdisabled('dw2pdf')) {
++ echo '<li>';
++ tpl_link(wl($ID, array('do' => 'export_pdf', 'rev' => $REV)), '<span>PDF Export</span>', 'class="action html2pdf"');
++ echo '</li>';
++ }
++
++ if (!plugin_isdisabled('odt')) {
++ echo '<li>';
++ tpl_link(wl($ID, array('do' => 'export_odt', 'rev' => $REV)), '<span>ODT Export</span>', 'class="action odt"');
++ echo '</li>';
++ }
++
+ tpl_action('recent', 1, 'li');
+ tpl_action('media', 1, 'li');
+ tpl_action('index', 1, 'li');