diff --git a/Application/Model/AbstractClasses/pdfdocumentsGeneric.php b/Application/Model/AbstractClasses/pdfdocumentsGeneric.php index a628ba9..090a547 100644 --- a/Application/Model/AbstractClasses/pdfdocumentsGeneric.php +++ b/Application/Model/AbstractClasses/pdfdocumentsGeneric.php @@ -249,7 +249,7 @@ abstract class pdfdocumentsGeneric extends Base implements genericInterface */ public function renderTemplateFromAdmin() { - return false; + return true; } public function output(Html2Pdf $oPdf, $sFilename, $target, $html) diff --git a/Application/views/tpl/documents/inc/din5008.tpl b/Application/views/tpl/documents/inc/din5008.tpl deleted file mode 100644 index 97c2aab..0000000 --- a/Application/views/tpl/documents/inc/din5008.tpl +++ /dev/null @@ -1,17 +0,0 @@ -[{* fold marks *}] -
- - -[{* punch mark *}] - - - \ No newline at end of file diff --git a/Application/views/tpl/documents/inc/addressarea.tpl b/Application/views/tpl/documents/inc/elements/addressarea.tpl similarity index 69% rename from Application/views/tpl/documents/inc/addressarea.tpl rename to Application/views/tpl/documents/inc/elements/addressarea.tpl index 8228061..93338a2 100644 --- a/Application/views/tpl/documents/inc/addressarea.tpl +++ b/Application/views/tpl/documents/inc/elements/addressarea.tpl @@ -1,12 +1,12 @@ -[{assign var="backaddressfile" value=$backaddressfile|default:"d3pdfbackaddress.tpl"}] +[{assign var="backaddressfile" value=$backaddressfile|default:"d3pdfreturnaddress.tpl"}]
[{oxmultilang ident="D3_ORDER_OVERVIEW_PDF_GET_IN_CONTACT"}]
@@ -116,9 +114,9 @@
[{/capture}]
[{capture append="pdfBlock_footer"}]
- [{block name="pdfFooterFile"}]
+ [{block name="pdfFooter"}]
[{include file="d3pdffooter.tpl"}]
[{/block}]
[{/capture}]
-[{include file="d3pdfbase.tpl"}]
+[{include file="d3pdfbase.tpl" pagePadding=$pagePadding}]
diff --git a/metadata.php b/metadata.php
index 5a61d66..e844446 100644
--- a/metadata.php
+++ b/metadata.php
@@ -35,8 +35,8 @@ $sModuleId = 'd3PdfDocuments';
$aModule = [
'id' => $sModuleId,
'title' => [
- 'de' => $logo.' PDF-Dokumente aus HTML-Templates',
- 'en' => $logo.' PDF documents from HTML templates',
+ 'de' => $logo.' PDF-Dokumente',
+ 'en' => $logo.' PDF documents',
],
'version' => '1.0',
'author' => 'D³ Data Development (Inh.: Thomas Dartsch)',
@@ -62,14 +62,17 @@ $aModule = [
'd3invoice_pdf_conclusion.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/invoice/includingFiles/pdfPastThank.tpl',
'd3_article_costs_summary.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/invoice/includingFiles/d3_article_costs_summary.tpl',
- 'd3pdfbase.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/inc/base.tpl',
- 'd3pdfheader.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/inc/header.tpl',
- 'd3pdffooter.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/inc/footer.tpl',
- 'd3pdfaddressarea.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/inc/addressarea.tpl',
- 'd3pdfbackaddress.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/inc/backaddress.tpl',
- 'd3din5008.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/inc/din5008.tpl',
- 'd3pdfrulers.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/inc/rulers.tpl',
- 'd3pdfstyle.css' => 'd3/pdfdocuments/out/src/css/pdfStyling.css'
+ 'd3pdfbase.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/inc/page/base.tpl',
+ 'd3pdfheader.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/inc/page/header.tpl',
+ 'd3pdffooter.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/inc/page/footer.tpl',
+ 'd3pdfreturnaddress.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/inc/page/returnaddress.tpl',
+
+ 'd3pdfaddressarea.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/inc/elements/addressarea.tpl',
+ 'd3foldmarks.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/inc/elements/foldmarks.tpl',
+
+ 'd3pdfstyles.css' => 'd3/pdfdocuments/out/src/css/pdfStyling.css',
+
+ 'd3pdfrulers.tpl' => 'd3/pdfdocuments/Application/views/tpl/documents/inc/helper/rulers.tpl',
],
'events' => [],
'blocks' => [
diff --git a/out/src/css/pdfStyling.css b/out/src/css/pdfStyling.css
index da6d6ad..6f48574 100644
--- a/out/src/css/pdfStyling.css
+++ b/out/src/css/pdfStyling.css
@@ -1,3 +1,44 @@
+.header {
+ padding: 5mm;
+ height: 35mm;
+ width: 100%;
+ background-color: lightgreen;
+ position: relative;
+}
+
+.header img.logo {
+ float: right;
+ margin: 10mm;
+}
+
+.addressarea {
+ left: 0;
+ width: 80mm;
+ height: 45mm;
+ background-color: lightpink;
+ position: relative;
+}
+
+.addressarea .returnAddress,
+.addressarea .recipientAddress {
+ position: relative;
+}
+
+.addressarea .returnAddress {
+ height: 17.7mm;
+ background-color: lightyellow;
+ font-size: 8px;
+}
+
+.addressarea .returnAddress div {
+ padding-top: 3mm;
+}
+
+.addressarea .recipientAddress {
+ height: 27.3mm;
+ background-color: lightcyan;
+}
+
/*debug hilfe*/
.eraseBug{
border: dashed blueviolet 1px;
@@ -35,48 +76,6 @@ table{
padding-top: 5px;
}
-/*pdf_header*/
-.pdf_header_positioning{
- padding: 5mm;
- height: 35mm;
- width: 100%;
- background-color: lightgreen;
- position: relative;
-}
-
-.pdf_header_positioning img {
- float: right;
- margin: 10mm;
-}
-
-.addressarea {
- left: 20mm;
- width: 85mm;
- height: 45mm;
- background-color: lightpink;
- position: relative;
-}
-
-page .addressarea .backaddress,
-page .addressarea .recipientaddress {
- position: relative;
- margin-left: 5mm;
-}
-
-page .addressarea .backaddress {
- height: 17.7mm;
- background-color: lightyellow;
- font-size: 8px;
-}
-
-page .addressarea .backaddress div {
- padding-top: 3mm;
-}
-
-page .addressarea .recipientaddress {
- height: 27.3mm;
- background-color: lightcyan;
-}
/*pdf_footer*/
.pdf_footer_table{
|