XWIKI-12610: It should be possible to disable header and footer in the PDF export

6374bb11 · Thomas Mortagne · c98cf088 · 6374bb11 · 6374bb11 · 6374bb11
Commit 6374bb11 authored 9 years ago by Thomas Mortagne
--- a/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/pdfoptions.vm
+++ b/xwiki-platform-core/xwiki-platform-flamingo/xwiki-platform-flamingo-skin/xwiki-platform-flamingo-skin-resources/src/main/resources/flamingo/pdfoptions.vm
@@ -72,6 +72,24 @@
          </label>
          <span class="xHint">$services.localization.render('core.export.pdf.options.toc.hint')</span>
        </dt>
+        ## Header
+        <dt>
+          <label for="pdfheader">
+            <input id="pdfheader" name="pdfheader" type="checkbox" checked="checked" value="1" />
+            <input name="pdfheader" type="hidden" value="0" />
+            $services.localization.render('core.export.pdf.options.header')
+          </label>
+          <span class="xHint">$services.localization.render('core.export.pdf.options.header.hint')</span>
+        </dt>
+        ## Footer
+        <dt>
+          <label for="pdffooter">
+            <input id="pdffooter" name="pdffooter" type="checkbox" checked="checked" value="1" />
+            <input name="pdffooter" type="hidden" value="0" />
+            $services.localization.render('core.export.pdf.options.footer')
+          </label>
+          <span class="xHint">$services.localization.render('core.export.pdf.options.footer.hint')</span>
+        </dt>
        ## Comments
        <dt>
          <label for="comments">

--- a/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources.properties
+++ b/xwiki-platform-core/xwiki-platform-oldcore/src/main/resources/ApplicationResources.properties
@@ -825,6 +825,10 @@ core.export.pdf.options.cover=Cover
 core.export.pdf.options.cover.hint=Print the cover page, containing the page title, author and last modification date.
 core.export.pdf.options.toc=Table of Contents
 core.export.pdf.options.toc.hint=List headings at the beginning of the PDF document, usually right after the cover page.
+core.export.pdf.options.header=Header
+core.export.pdf.options.header.hint=Header displayed on each page
+core.export.pdf.options.footer=Footer
+core.export.pdf.options.footer.hint=Footer displayed on each page
 core.export.pdf.options.comments=Comments
 core.export.pdf.options.comments.hint=Include page comments at the end of the PDF document, usually before the image attachments.
 core.export.pdf.options.images=Image attachments

--- a/xwiki-platform-core/xwiki-platform-web/src/main/webapp/templates/pdfhtmlheader.vm
+++ b/xwiki-platform-core/xwiki-platform-web/src/main/webapp/templates/pdfhtmlheader.vm
@@ -8,6 +8,16 @@
 #else
  #set ($displayPdfToc = 0)
 #end
+#if ("$!request.pdffooter" != '0')
+  #set ($displayPdfFooter = 1)
+#else
+  #set ($displayPdfFooter = 0)
+#end
+#if ("$!request.pdfheader" != '0')
+  #set ($displayPdfHeader = 1)
+#else
+  #set ($displayPdfHeader = 0)
+#end
 <?xml version="1.0" encoding="${xwiki.encoding}" ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -28,22 +38,26 @@
 <meta name="language" content="$!{xcontext.locale}" />
 </head>
 <body id="body" class="${xcontext.action}body" pdfcover="${displayPdfCover}" pdftoc="${displayPdfToc}">
-<div class="pdfheader">
-#set ($pdfheader = $tdoc.display('header', 'rendered', '', $pdfobj))
-#if ($pdfheader == '')
-  #template("pdfheader.vm")
-#else
-  $pdfheader
+#if ($displayPdfHeader == 1)
+  <div class="pdfheader">
+  #set ($pdfheader = $tdoc.display('header', 'rendered', '', $pdfobj))
+  #if ($pdfheader == '')
+    #template("pdfheader.vm")
+  #else
+    $pdfheader
+  #end
+  </div>
 #end
-</div>
-<div class="pdffooter">
-#set ($pdffooter = $tdoc.display('footer', 'rendered', '', $pdfobj))
-#if ($pdffooter == '')
-  #template("pdffooter.vm")
-#else
-  $pdffooter
+#if ($displayPdfFooter == 1)
+  <div class="pdffooter">
+  #set ($pdffooter = $tdoc.display('footer', 'rendered', '', $pdfobj))
+  #if ($pdffooter == '')
+    #template("pdffooter.vm")
+  #else
+    $pdffooter
+  #end
+  </div>
 #end
-</div>
 #if ($displayPdfCover == 1)
  <div class="pdfcover">
  #set ($pdfcover = $tdoc.display('cover', 'rendered', '', $pdfobj))

--- a/xwiki-platform-core/xwiki-platform-web/src/main/webapp/templates/pdfoptions.vm
+++ b/xwiki-platform-core/xwiki-platform-web/src/main/webapp/templates/pdfoptions.vm
@@ -67,6 +67,24 @@
          </label>
          <span class="xHint">$services.localization.render('core.export.pdf.options.toc.hint')</span>
        </dt>
+        ## Header
+        <dt>
+          <label for="pdfheader">
+            <input id="pdfheader" name="pdfheader" type="checkbox" checked="checked" value="1" />
+            <input name="pdfheader" type="hidden" value="0" />
+            $services.localization.render('core.export.pdf.options.header')
+          </label>
+          <span class="xHint">$services.localization.render('core.export.pdf.options.header.hint')</span>
+        </dt>
+        ## Footer
+        <dt>
+          <label for="pdffooter">
+            <input id="pdffooter" name="pdffooter" type="checkbox" checked="checked" value="1" />
+            <input name="pdffooter" type="hidden" value="0" />
+            $services.localization.render('core.export.pdf.options.footer')
+          </label>
+          <span class="xHint">$services.localization.render('core.export.pdf.options.footer.hint')</span>
+        </dt>
        ## Comments
        <dt>
          <label for="comments">