Changed db_pager_view to only use one table (sometimes bad layout)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 3e8b25d171de31bb4d6d7c5d7972190bc33b0600..53e0b1a1ab84206f61830af478a3cafc840dd72b 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -20,8 +20,12 @@ Legend:
 $ -> Affected files
 
 15-Jan-2009 Joe Hunt
-! Adjustment of db pager width. Copyright notes.
+! Adjustment of db pager width. Copyright notes. 
 $ All files with db pager
+  /db_pager_view.inc
+  /themes/default/default.css
+  /themes/aqua/default.css
+  /themes/cool/default.css
 
 15-Jan-2009 Janusz Dobrowolski
 ! Rewritten reconciliation page.

diff --git a/includes/ui/db_pager_view.inc b/includes/ui/db_pager_view.inc
index dfd2ecc534f0130171726f446396dbbbd77415fc..573cae2897889b91b600abcf6f09e164cfe71155 100644 (file)
--- a/includes/ui/db_pager_view.inc
+++ b/includes/ui/db_pager_view.inc
@@ -59,7 +59,7 @@ function display_db_pager(&$pager) {
                }
        }
     /* show a table of records returned by the sql */
-    start_table("$table_style width=".$pager->width);
+    start_table("$table_style width=$pager->width");
     table_header($headers, 'nowrap');
 
        if($pager->header_fun) {        // if set header handler
@@ -153,18 +153,22 @@ function display_db_pager(&$pager) {
                end_row();
        }
 
-       end_table();
-       start_table("$table_style align='center' class='navibar' width=".$pager->width);
-       start_row();
+       //end_table();
+       //start_table("$table_style align='center' class='navibar' width=100%");
+       /*
+       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;
+               $lcols = ($colspan > 4 ? 3 : 2);
                label_cell(sprintf( _('Records %d-%d of %d'), $from, $to, $all),
-                       "style='border:none'");
-               echo "<td style='border:none'>";
+                       "colspan=$lcols class='navibar' style='border:none'");
+               //echo "<td colspan=".($pager->columns -.$lcols)." style='border:none'>";
+               echo "<td colspan=".($colspan-3)." style='border:none'>";
                $but_pref = $pager->name.'_page_';
            start_table("align='right'");
                start_row();
@@ -176,9 +180,37 @@ function display_db_pager(&$pager) {
                end_table();    
                echo "</td>";
        } else {
-         label_cell( _('No records'));
+         label_cell( _('No records'), "colspan=$colspan class='navibar'");
        }
        end_row();
+       */
+       start_row("class='navibar'");
+       $colspan = count($pager->columns);
+        if($pager->rec_count) {
+               echo "<td colspan=$colspan class='navibar' style='border:none;padding:3px;'>";
+               echo "<div style='float:right;'>";
+               $but_pref = $pager->name.'_page_';
+           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();
+               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'), "colspan=$colspan class='navibar'");
+       }
+       end_row();
+
        end_table();
 
    if (isset($pager->marker_txt))

diff --git a/themes/aqua/default.css b/themes/aqua/default.css
index 77b80f188d0cdfc11fc15fb907b8a89c36805f4e..e7693f2cdee729e33027106b814ce6fde5292ca5 100644 (file)
--- a/themes/aqua/default.css
+++ b/themes/aqua/default.css
@@ -389,16 +389,12 @@ button.navibutton {
 }
 
 .navibar {
+       color: #000;
     padding: 0 3px;
        border: 1px solid #8cacbb;
     border-collapse: collapse;
     background-color: #d5cea7;
 }
-table.navibar td {
-       color: #000;
-       border: 0px none;
-}
-
 
 .listsubmit {
     display: none;

diff --git a/themes/cool/default.css b/themes/cool/default.css
index 4105d5dee16d4ee97a043640993d3744b8dcee00..7951e3da62844b0d498cb4cd14cf48d2688b48eb 100644 (file)
--- a/themes/cool/default.css
+++ b/themes/cool/default.css
@@ -393,17 +393,13 @@ button.navibutton {
 }
 
 .navibar {
+       color: #fff;
     padding: 0 3px;
     border: 1px solid #cccccc;
     border-collapse: collapse;
     background-color: #788da1;
 }
 
-table.navibar td {
-       color: #fff;
-    border: 0px none;
-}
-
 
 .listsubmit {
     display: none;

diff --git a/themes/default/default.css b/themes/default/default.css
index f58c3cff2e263dde4f0a7d611d0264fcf75068f5..0877db95bbbe980a61b810dbd90445fefde81484 100644 (file)
--- a/themes/default/default.css
+++ b/themes/default/default.css
@@ -389,17 +389,13 @@ button.navibutton {
 }
 
 .navibar {
+       color: #000;
     padding: 0 3px;
     border: 1px solid #8cacbb;
     border-collapse: collapse;
     background-color: #dee7ec;
 }
 
-table.navibar td {
-       color: #000;
-    border: 0px none;
-}
-
 .listsubmit {
     display: none;
 }