X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=includes%2Fui%2Fdb_pager_view.inc;h=7fe7754ed22124b30532987de0bd9119bab6fa27;hb=3d77ce40e05a285a68c70bb29ed29872e998227e;hp=d0c50ad1bc2b6ab047746027778c3da5e8a30a91;hpb=e42015fd03c124d8243d9dc0469c13e003cb2652;p=fa-stable.git

diff --git a/includes/ui/db_pager_view.inc b/includes/ui/db_pager_view.inc
index d0c50ad1..7fe7754e 100644
--- a/includes/ui/db_pager_view.inc
+++ b/includes/ui/db_pager_view.inc
@@ -1,13 +1,13 @@
 <?php
 /**********************************************************************
     Copyright (C) FrontAccounting, LLC.
-	Released under the terms of the GNU Affero General Public License,
-	AGPL, as published by the Free Software Foundation, either version 
-	3 of the License, or (at your option) any later version.
+	Released under the terms of the GNU General Public License, GPL, 
+	as published by the Free Software Foundation, either version 3 
+	of the License, or (at your option) any later version.
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
-    See the License here <http://www.gnu.org/licenses/agpl-3.0.html>.
+    See the License here <http://www.gnu.org/licenses/gpl-3.0.html>.
 ***********************************************************************/
 //--------------------------------------------------------------------------------------------------
 function pager_link($link_text, $url, $icon=false)
@@ -45,7 +45,7 @@ function display_db_pager(&$pager) {
 
 	div_start("_{$pager->name}_span");
     $headers = array();
-//display_error(print_r($pager->columns,true));
+
 	foreach($pager->columns as $num_col=>$col) {
     	if (isset($col['head'])) {
 			if (!isset($col['ord'])) 
@@ -59,8 +59,8 @@ function display_db_pager(&$pager) {
  		}
 	}
     /* show a table of records returned by the sql */
-    start_table("$table_style width=95%");
-    table_header($headers);
+    start_table("$table_style width=$pager->width");
+    table_header($headers, 'nowrap');
 
 	if($pager->header_fun) {	// if set header handler
 		start_row("class='{$pager->header_class}'");
@@ -104,9 +104,9 @@ function display_db_pager(&$pager) {
 		    case 'time':
 		  	  label_cell($cell, "width=40"); break;
 		    case 'date':
-		  	  label_cell(sql2date($cell), "align='center' width=50"); break;
+		  	  label_cell(sql2date($cell), "align='center' nowrap"); break;
 		    case 'dstamp':	// time stamp displayed as date
-		  	  label_cell(sql2date(substr($cell, 0, 10)), "align='center'"); break;
+		  	  label_cell(sql2date(substr($cell, 0, 10)), "align='center' nowrap"); break;
 		    case 'tstamp':	// time stamp - FIX user format
 		  	  label_cell(sql2date(substr($cell, 0, 10)).
 			  ' '. substr($cell, 10), "align='center'"); break;
@@ -123,7 +123,7 @@ function display_db_pager(&$pager) {
 			  else
 		  	  	qty_cell($cell, false, isset($col['dec']) ? $col['dec'] : null); break;
 		    case 'rate':
-		  	  rate_cell($cell);  break;
+				label_cell(number_format2($cell, user_exrate_dec()), "align=center"); break;
 		    default:
 //		    case 'text':
 			  if (isset( $col['align']))
@@ -153,32 +153,33 @@ function display_db_pager(&$pager) {
 		end_row();
 	}
 
-	end_table();
-	start_table("$table_style align='center' class='navibar' width=95%");
-	start_row();
+	start_row("class='navibar'");
+	$colspan = count($pager->columns);
 	 if($pager->rec_count) {
-		$from = ($pager->curr_page-1)*$pager->page_len+1;
-		$to = $from + $pager->page_len - 1;
-		if ($to > $pager->rec_count)
-		  $to = $pager->rec_count;
-		$all = $pager->rec_count;
-		label_cell(sprintf( _('Records %d-%d of %d'), $from, $to, $all),
-			"style='border:none'");
-		echo "<td style='border:none'>";
+		echo "<td colspan=$colspan class='navibar' style='border:none;padding:3px;'>";
+		echo "<div style='float:right;'>";
 		$but_pref = $pager->name.'_page_';
-	    start_table("align='right'");
+	    start_table();
 		start_row();
 		echo navi_button_cell($but_pref.'first', _('First'), $pager->first_page, 'right');
 		echo navi_button_cell($but_pref.'prev', _('Prev'), $pager->prev_page,'right');
 		echo navi_button_cell($but_pref.'next', _('Next'), $pager->next_page,'right');
 		echo navi_button_cell($but_pref.'last', _('Last'), $pager->last_page, 'right');
 		end_row(); 
-		end_table();	
+		end_table();
+		echo "</div>";
+		$from = ($pager->curr_page-1)*$pager->page_len+1;
+		$to = $from + $pager->page_len - 1;
+		if ($to > $pager->rec_count)
+		  $to = $pager->rec_count;
+		$all = $pager->rec_count;
+		echo sprintf( _('Records %d-%d of %d'), $from, $to, $all);
 		echo "</td>";
 	} else {
-	  label_cell( _('No records'));
+	  label_cell( _('No records'), "colspan=$colspan class='navibar'");
 	}
 	end_row();
+
 	end_table();
 
    if (isset($pager->marker_txt))