[Web-erp-svn] SF.net SVN: web-erp:[6344] trunk

[<rc...@us...>]

Revision: 6344
          http://sourceforge.net/p/web-erp/reponame/6344
Author:   rchacon
Date:     2013-10-04 17:10:45 +0000 (Fri, 04 Oct 2013)
Log Message:
-----------
Fixes capital letter mismatch between FormDesigner.php and PDFStarter.php for paper size. Minor changes (info).

Modified Paths:
--------------
    trunk/FormDesigner.php
    trunk/includes/PDFStarter.php

Modified: trunk/FormDesigner.php
===================================================================
--- trunk/FormDesigner.php	2013-10-04 16:42:37 UTC (rev 6343)
+++ trunk/FormDesigner.php	2013-10-04 17:10:45 UTC (rev 6344)
@@ -157,7 +157,7 @@
 }
 echo '<p class="page_title_text"><img src="'.$RootPath.'/css/'.$Theme.'/images/reports.png" title="' . _('Form Design') . '" alt="" />' . ' ' . _('Form Design') . '<br />' .  $FormDesign['name'] . '</p>';
 echo '<div class="page_help_text">' . _('Enter the changes that you want in the form layout below.')  . '<br /> '. _('All measurements are in points') . '.</div><br />';
-$Papers=array('A4_Landscape', 'A4_Portrait', 'A5_Landscape', 'A5_Portrait', 'A3_Landscape', 'A3_Portrait', 'letter_Portrait', 'Letter_Landscape', 'legal_Portrait', 'legal_Landscape'); // Possible paper sizes/orientations
+$Papers=array('A4_Landscape', 'A4_Portrait', 'A5_Landscape', 'A5_Portrait', 'A3_Landscape', 'A3_Portrait', 'Letter_Portrait', 'Letter_Landscape', 'Legal_Portrait', 'Legal_Landscape'); // Possible paper sizes/orientations
 echo '<form method="post" id="Form" action="' . htmlspecialchars($_SERVER['PHP_SELF'],ENT_QUOTES,'UTF-8') . '?' . SID . '">';
 echo '<div>';
 echo '<input type="hidden" name="FormID" value="' . $_SESSION['FormID'] . '" />';

Modified: trunk/includes/PDFStarter.php
===================================================================
--- trunk/includes/PDFStarter.php	2013-10-04 16:42:37 UTC (rev 6343)
+++ trunk/includes/PDFStarter.php	2013-10-04 17:10:45 UTC (rev 6344)
@@ -93,7 +93,7 @@
 		$Right_Margin=40;
 		break;
 
-   case 'A3_landscape':
+   case 'A3_Landscape':
 
 		$DocumentPaper = 'A3';
 		$DocumentOrientation ='L';
@@ -106,7 +106,7 @@
 		$Right_Margin=40;
 		break;
 
-   case 'letter':
+   case 'Letter': // 216mm x 279mm
 
 		$DocumentPaper = 'LETTER';
 		$DocumentOrientation ='P';
@@ -132,30 +132,30 @@
 		$Right_Margin = 36; // Half inch = 72/2
 		break;
 
-   case 'legal':
+   case 'Legal': // 216mm x 356mm
 
 		$DocumentPaper = 'LEGAL';
 		$DocumentOrientation ='P';
 
-		$Page_Width=612;
-		$Page_Height=1008;
-		$Top_Margin=50;
-		$Bottom_Margin=40;
-		$Left_Margin=30;
-		$Right_Margin=25;
+		$Page_Width=612; // 72 * 8.5 inch
+		$Page_Height=1008; // 72 * 14 inch
+		$Top_Margin = 36; // Half inch = 72/2
+		$Bottom_Margin = 36; // Half inch = 72/2
+		$Left_Margin = 36; // Half inch = 72/2
+		$Right_Margin = 36; // Half inch = 72/2
 		break;
 
-   case 'legal_landscape':
+   case 'Legal_Landscape': // 356mm x 216mm
 
 		$DocumentPaper = 'LEGAL';
 		$DocumentOrientation ='L';
 
-		$Page_Width=1008;
-		$Page_Height=612;
-		$Top_Margin=50;
-		$Bottom_Margin=40;
-		$Left_Margin=30;
-		$Right_Margin=25;
+		$Page_Width=1008; // 72 * 14 inch
+		$Page_Height=612; // 72 * 8.5 inch
+		$Top_Margin = 36; // Half inch = 72/2
+		$Bottom_Margin = 36; // Half inch = 72/2
+		$Left_Margin = 36; // Half inch = 72/2
+		$Right_Margin = 36; // Half inch = 72/2
 		break;
 	default:
 		$DocumentOrientation = 'L';