diff --git a/include/language/en_us.lang.php b/include/language/en_us.lang.php index 7f647a681cc..fcbe6fe1d1a 100755 --- a/include/language/en_us.lang.php +++ b/include/language/en_us.lang.php @@ -3970,3 +3970,8 @@ $app_list_strings['day_list']['Friday'] = 'Friday'; $app_list_strings['day_list']['Saturday'] = 'Saturday'; $app_list_strings['day_list']['Sunday'] = 'Sunday'; +$app_list_strings['pdf_page_size_dom']['A4'] = 'A4'; +$app_list_strings['pdf_page_size_dom']['Letter'] = 'Letter'; +$app_list_strings['pdf_page_size_dom']['Legal'] = 'Legal'; +$app_list_strings['pdf_orientation_dom']['Portrait'] = 'Portrait'; +$app_list_strings['pdf_orientation_dom']['Landscape'] = 'Landscape'; diff --git a/modules/AOS_PDF_Templates/generatePdf.php b/modules/AOS_PDF_Templates/generatePdf.php index ff1c770569b..ded91f11180 100755 --- a/modules/AOS_PDF_Templates/generatePdf.php +++ b/modules/AOS_PDF_Templates/generatePdf.php @@ -140,7 +140,8 @@ function ($matches) { ob_clean(); try { - $pdf = new mPDF('en', 'A4', '', 'DejaVuSansCondensed', $template->margin_left, $template->margin_right, $template->margin_top, $template->margin_bottom, $template->margin_header, $template->margin_footer); + $orientation = ($template->orientation == "Landscape") ? "-L" : ""; + $pdf = new mPDF('en', $template->page_size . $orientation, '', 'DejaVuSansCondensed', $template->margin_left, $template->margin_right, $template->margin_top, $template->margin_bottom, $template->margin_header, $template->margin_footer); $pdf->SetAutoFont(); $pdf->SetHTMLHeader($header); $pdf->SetHTMLFooter($footer); diff --git a/modules/AOS_PDF_Templates/language/en_us.lang.php b/modules/AOS_PDF_Templates/language/en_us.lang.php index e1a74b8b825..ef9344cae63 100755 --- a/modules/AOS_PDF_Templates/language/en_us.lang.php +++ b/modules/AOS_PDF_Templates/language/en_us.lang.php @@ -83,5 +83,7 @@ 'LBL_MARGIN_FOOTER' => 'Margin Footer', 'LBL_EDITVIEW_PANEL1' => 'Margins', 'LBL_DETAILVIEW_PANEL1' => 'Margins', + 'LBL_PAGE_SIZE' => 'Page Size', + 'LBL_ORIENTATION' => 'Orientation', ); ?> diff --git a/modules/AOS_PDF_Templates/metadata/detailviewdefs.php b/modules/AOS_PDF_Templates/metadata/detailviewdefs.php index 264ac83f59f..ee9a3ec1ad4 100755 --- a/modules/AOS_PDF_Templates/metadata/detailviewdefs.php +++ b/modules/AOS_PDF_Templates/metadata/detailviewdefs.php @@ -72,6 +72,19 @@ ), ), 2 => + array ( + 0 => + array ( + 'name' => 'page_size', + 'label' => 'LBL_PAGE_SIZE', + ), + 1 => + array ( + 'name' => 'orientation', + 'label' => 'LBL_ORIENTATION', + ), + ), + 3 => array ( 0 => array ( @@ -80,7 +93,7 @@ 'customCode' => '{$fields.pdfheader.value}', ), ), - 3 => + 4 => array ( 0 => array ( @@ -89,7 +102,7 @@ 'customCode' => '{$fields.description.value}', ), ), - 4 => + 5 => array ( 0 => array ( diff --git a/modules/AOS_PDF_Templates/metadata/editviewdefs.php b/modules/AOS_PDF_Templates/metadata/editviewdefs.php index e4da5f7cb5f..b2e0d3eaa0c 100755 --- a/modules/AOS_PDF_Templates/metadata/editviewdefs.php +++ b/modules/AOS_PDF_Templates/metadata/editviewdefs.php @@ -91,6 +91,19 @@ 1 => '', ), 3 => + array ( + 0 => + array ( + 'name' => 'page_size', + 'label' => 'LBL_PAGE_SIZE', + ), + 1 => + array ( + 'name' => 'orientation', + 'label' => 'LBL_ORIENTATION', + ), + ), + 4 => array ( 0 => array ( @@ -99,7 +112,7 @@ 'customCode' => '{$INSERT_FIELDS}', ), ), - 4 => + 5 => array ( 0 => array ( @@ -107,7 +120,7 @@ 'label' => 'LBL_DESCRIPTION', ), ), - 5 => + 6 => array ( 0 => array ( @@ -115,7 +128,7 @@ 'label' => 'LBL_HEADER', ), ), - 6 => + 7 => array ( 0 => array ( diff --git a/modules/AOS_PDF_Templates/vardefs.php b/modules/AOS_PDF_Templates/vardefs.php index 17e3e4ad55c..07566177cec 100755 --- a/modules/AOS_PDF_Templates/vardefs.php +++ b/modules/AOS_PDF_Templates/vardefs.php @@ -268,6 +268,44 @@ 'enable_range_search' => false, 'disable_num_format' => '', ), + 'page_size' => + array ( + 'required' => '0', + 'name' => 'page_size', + 'vname' => 'LBL_PAGE_SIZE', + 'type' => 'enum', + 'massupdate' => 0, + 'default' => '', + 'comments' => '', + 'help' => '', + 'importable' => 'true', + 'duplicate_merge' => 'disabled', + 'duplicate_merge_dom_value' => '0', + 'audited' => 0, + 'reportable' => 0, + 'len' => 100, + 'options' => 'pdf_page_size_dom', + 'studio' => 'visible', + ), + 'orientation' => + array ( + 'required' => '0', + 'name' => 'orientation', + 'vname' => 'LBL_ORIENTATION', + 'type' => 'enum', + 'massupdate' => 0, + 'default' => '', + 'comments' => '', + 'help' => '', + 'importable' => 'true', + 'duplicate_merge' => 'disabled', + 'duplicate_merge_dom_value' => '0', + 'audited' => 0, + 'reportable' => 0, + 'len' => 100, + 'options' => 'pdf_orientation_dom', + 'studio' => 'visible', + ), ), 'relationships'=>array ( ),