[Weberp-svn] SF.net SVN: weberp:[9576] trunk

[<tim...@us...>]

Revision: 9576
          http://weberp.svn.sourceforge.net/weberp/?rev=9576&view=rev
Author:   tim_schofield
Date:     2012-08-29 19:39:01 +0000 (Wed, 29 Aug 2012)
Log Message:
-----------
Improvements to table printing functions

Modified Paths:
--------------
    trunk/PrintTable.php
    trunk/css/silverwolf/sub.css
    trunk/javascripts/FormFunctions.js

Modified: trunk/PrintTable.php
===================================================================
--- trunk/PrintTable.php	2012-08-28 09:06:05 UTC (rev 9575)
+++ trunk/PrintTable.php	2012-08-29 19:39:01 UTC (rev 9576)
@@ -37,16 +37,19 @@
 
 $pdf->RoundRectangle($Left_Margin-5, $YPos-5, $Page_Width-$Left_Margin-$Right_Margin, ($line_height*1), 10);
 
+$BottomOfTitle=$YPos-5-($line_height*3);
+
 $ColumnNames=explode('</th>', $_POST['Columns']);
 $ColumnWidths=explode('px', $_POST['ColumnWidths']);
+$ColumnAligns=explode('x', $_POST['ColumnAligns']);
 
 $TotalWidth=0;
 for ($i=0; $i<count($ColumnWidths); $i++) {
 	$TotalWidth+=$ColumnWidths[$i];
 }
 
-for ($i=0; $i<count($ColumnWidths); $i++) {
-	$LeftOvers = $pdf->addTextWrap($XPos,$YPos-$line_height,$Page_Width-$Left_Margin,$FontSize,  strip_tags($ColumnNames[$i]), 'centre');
+for ($i=0; $i<count($ColumnWidths)-1; $i++) {
+	$LeftOvers = $pdf->addTextWrap($XPos,$YPos-$line_height,$ColumnWidths[$i],$FontSize,  strip_tags($ColumnNames[$i]), $ColumnAligns[$i]);
 	$XPos+=($Page_Width-$Left_Margin-$Right_Margin)*($ColumnWidths[$i]/$TotalWidth);
 }
 
@@ -62,12 +65,19 @@
 	$ColumnValues=explode('</td>', $Row[$row]);
 	$XPos=$Left_Margin;
 	$YPos-=$line_height;
-	for ($i=0; $i<count($ColumnWidths); $i++) {
-		$LeftOvers = $pdf->addTextWrap($XPos,$YPos-$line_height,$Page_Width-$Left_Margin,$FontSize,  strip_tags($ColumnValues[$i]), 'centre');
+	for ($i=0; $i<count($ColumnWidths)-1; $i++) {
+		if ($ColumnAligns[$i]=='right') {
+			$Align='right';
+		} else {
+			$Align='left';
+		}
+		$LeftOvers = $pdf->addTextWrap($XPos,$YPos-$line_height,$ColumnWidths[$i],$FontSize,  strip_tags($ColumnValues[$i]), $Align, 0);
 		$XPos+=($Page_Width-$Left_Margin-$Right_Margin)*($ColumnWidths[$i]/$TotalWidth);
 	}
 }
 
+$pdf->RoundRectangle($Left_Margin-5, $BottomOfTitle, $Page_Width-$Left_Margin-$Right_Margin, $BottomOfTitle-$YPos+$line_height, 10);
+
 $pdf->OutputF($_SESSION['DatabaseName'] . '_TablePrint_' . date('Y-m-d_h-m-s') . '.pdf');
 $pdf->__destruct();
 

Modified: trunk/css/silverwolf/sub.css
===================================================================
--- trunk/css/silverwolf/sub.css	2012-08-28 09:06:05 UTC (rev 9575)
+++ trunk/css/silverwolf/sub.css	2012-08-29 19:39:01 UTC (rev 9576)
@@ -708,10 +708,11 @@
 	font-family: Calibri, Tahoma, Geneva, sans-serif;
 	position: absolute; left: 1em; top: 2em; z-index: 99;
 	margin-left: 0; width: 250px;
+	text-shadow: 0px 0px #324D5D;
+	text-align: left;
+	font-size: 12px;
 }
 .tooltip:hover img {
-	border: 0; margin: -10px 0 0 -55px;
-	float: left; position: absolute;
 }
 .tooltip:hover em {
 	font-family: Candara, Tahoma, Geneva, sans-serif; font-size: 1.2em; font-weight: bold;

Modified: trunk/javascripts/FormFunctions.js
===================================================================
--- trunk/javascripts/FormFunctions.js	2012-08-28 09:06:05 UTC (rev 9575)
+++ trunk/javascripts/FormFunctions.js	2012-08-29 19:39:01 UTC (rev 9576)
@@ -198,6 +198,7 @@
 }
 
 function OpenSearchWindow(TargetURL, CallingURL) {
+	alert(CallingURL);
 	document.getElementById("SearchMask").setAttribute("class", "mask");
 	document.getElementById("SearchWindow").setAttribute("class", "searchwindow");
 	if (window.XMLHttpRequest) {// code for IE7+, Firefox, Chrome, Opera, Safari
@@ -243,19 +244,30 @@
 function PrintTable(t) {
 	var rows=new Array();
 	var columnWidths='';
+	var columnAligns='';
 	var PostData='';
 	parentElem=t.parentNode;
 	row=parentElem.parentNode;
 	table=row.parentNode;
+	for (var i = 0; i < table.rows.length; i++) {
+		if(table.rows[i].cells[0].tagName=='TD') {
+			MainRow=i;
+		}
+		if(table.rows[i].cells[0].tagName=='TH' && table.rows[i].cells[0].className!='header') {
+			HeaderRow=i;
+		}
+	}
 	header=table.rows[0].cells[0].innerHTML;
 	PostData=PostData+'Header'+'='+header+'&';
-	columns=table.rows[1].innerHTML;
+	columns=table.rows[HeaderRow].innerHTML;
 	PostData=PostData+'Columns'+'='+columns+'&';
-	for (var i = 0; i < table.rows[1].cells.length; i++) {
-		s=getComputedStyle(table.rows[1].cells[i], null);
+	for (var i = 0; i < table.rows[MainRow].cells.length; i++) {
+		s=getComputedStyle(table.rows[MainRow].cells[i], null);
 		columnWidths=columnWidths+s.width;
+		columnAligns=columnAligns+s.textAlign+'x';
 	}
 	PostData=PostData+'ColumnWidths'+'='+columnWidths+'&';
+	PostData=PostData+'ColumnAligns'+'='+columnAligns+'&';
 	for (var i = 2; i < table.rows.length; i++) {
 		PostData=PostData+'Row'+(i-2)+'='+table.rows[i].innerHTML+'&';
 	}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.