From 7d237f22adc9b8f3b2ba927995dc307e58e6a1e1 Mon Sep 17 00:00:00 2001
From: Matthias Meusburger <matthias.meusburger@biblibre.com>
Date: Thu, 21 Jun 2012 15:41:54 +0200
Subject: [PATCH] Bug 8282: Bug in modules list in about.pl

  Last modules were not displayed if the number of modules did not match the number of rows of the table (when $number_of_modules % 4 != 0)

Signed-off-by: Marc Veron <veron@veron.ch>

Added some code to about.tt to have empty the last remaining cells, not sure if an other signoff is needed.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
---
 about.pl                                         |  7 +++++++
 koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 13 ++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/about.pl b/about.pl
index 7189a229c1..d196a7f9ab 100755
--- a/about.pl
+++ b/about.pl
@@ -108,6 +108,13 @@ foreach (@components) {
         $row = [];
     }
 }
+# Processing the last line (if there are any modules left)
+if (scalar(@$row) > 0) {
+    # Extending $row to the table size
+    $$row[3] = '';
+    # Pushing the last line
+    push (@$table, {row => $row});
+}
 ## ## $table
 
 $template->param( table => $table );
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
index 9a8d806814..68d91143e1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -69,15 +69,22 @@
                     <th scope="row" style="background-color:#FFCB2F;font-weight:normal" title="Module upgrade needed">
                     [% END %]
                     [% ELSE %]
-                    [% IF ( ro.require ) %]
+                    [% IF ( ro.name == '' ) %]
+                    <th>
+                    [% ELSIF ( ro.require ) %]
                     <th scope="row" style="background-color:#FF8A8A;font-weight:bold;" title="Required module missing">
                     [% ELSE %]
                     <th scope="row" style="background-color:#FF8A8A;font-weight:normal" title="Optional module missing">
                     [% END %]
                     [% END %]
-                        [% ro.name %]
+                    [% ro.name %]
                     </th>
-                    [% IF ( ro.version ) %]<td>[% ro.version %][% ELSE %]<td style="font-weight:bold">Not Installed[% END %]</td>
+                    [% IF ( ro.name == '' ) %]
+                    <td>
+                    [% ELSIF ( ro.version ) %]
+                    <td>[% ro.version %]
+                    [% ELSE %]
+                    <td style="font-weight:bold">Not Installed [% END %]</td>
                     [% END %]
                 </tr>
                 [% END %]
-- 
2.39.5