---- sidebar/main.php 2009-09-01 12:51:33.000000000 +0300
-+++ sidebar/main.php 2009-09-01 12:51:33.000000000 +0300
-@@ -18,6 +18,8 @@
- // must be run from within DokuWiki
- if (!defined('DOKU_INC')) die();
-
-+global $REV;
+--- dokuwiki-2015-08-10/lib/tpl/dokuwiki/tpl_header.php~ 2015-08-11 15:39:31.799253674 +0300
++++ dokuwiki-2015-08-10/lib/tpl/dokuwiki/tpl_header.php 2015-08-11 15:39:49.525658460 +0300
+@@ -66,6 +66,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>';
++ }
+
- // include functions that provide sidebar functionality
- @require_once(dirname(__FILE__).'/tplfn_sidebar.php');
- ?>
-@@ -66,6 +68,28 @@
- </div>
-
- <div class="bar-right" id="bar__topright">
-+ <?php
-+ if (!plugin_isdisabled('html2pdf')) { ?>
-+ <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?>" />
-+ <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>
++ 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_toolsevent('sitetools', array(
+ tpl_action('recent', true, 'li', true),
+ tpl_action('media', true, 'li', true),