diff --git a/about.pl b/about.pl index 45a435894f..86080fa6d5 100755 --- a/about.pl +++ b/about.pl @@ -654,29 +654,7 @@ if ( $tab eq 'perl' ) { @components = sort { $a->{'name'} cmp $b->{'name'} } @components; - my $counter = 0; - my $row = []; - my $table = []; - foreach (@components) { - push( @$row, $_ ); - unless ( ++$counter % 4 ) { - push( @$table, { row => $row } ); - $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 ); + $template->param( table => \@components ); } diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt index 43e2c32f7d..326eae4175 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt @@ -17,6 +17,12 @@ .version-ellipsis { text-decoration: underline; } + #dt-info { + display: flex; + } + .filter_controls { + margin-top: 0.25em; + }
@@ -85,6 +91,39 @@ +[% MACRO jsinclude BLOCK %] + [% INCLUDE 'datatables.inc' %] + +[% END %] + [% INCLUDE 'intranet-bottom.inc' %] [% BLOCK about_panel %] @@ -275,51 +314,70 @@ [% BLOCK perl_panel %] [% WRAPPER tab_panel tabname= "perl" bt_active = 1 %] -| Module | +Required | +Current version | +Minimum version | +Status | +|||
|---|---|---|---|---|---|---|---|
| + [% IF ( line.require ) %] + [% line.name | html %] + [% ELSE %] + [% line.name | html %] + [% END %] + | + [% IF ( line.require ) %] ++ + | [% ELSE %] - [% SET th_font_weight = "normal" %] +[% END %] - [% IF ( ro.current ) %] - [% SET th_background_color = "" %] - [% SET th_title = t("Module current") %] - [% ELSIF ( ro.upgrade ) %] - [% SET th_background_color = "#FFCB2F" %] - [% SET th_title = t("Module upgrade needed") %] - [% ELSE %] - [% IF ( ro.require ) %] - [% SET th_background_color = "#FF8A8A" %] - [% SET th_title = t("Required module missing") %] - [% ELSIF ( ro.name != '' ) %] - [% SET th_background_color = "#FF8A8A" %] - [% SET th_title = t("Optional module missing") %] - [% END %] - [% END # /IF ro.current %] - | - [% IF ( ro.name ) %] - [% ro.name | html %] - - ([% ro.reqversion | html %] - [% IF ro.maxversion %]- [% ro.maxversion | html %][% END %] - [% IF ro.excversion %][% FOR v IN ro.excversion %], ![% v | html %][% END %][% END %]) - - [% END %] - | - [% IF ( ro.name == '' ) %] + + [% IF ( line.name == '' ) %]- [% ELSIF ( ro.version ) %] - | [% ro.version | html %] | + [% ELSIF ( line.version ) %] +[% line.version | html %] | [% ELSE %]Not Installed | [% END %] - [% END # /FOREACH ro %] -+ + [% line.reqversion | html %] + [% IF line.maxversion %]- [% line.maxversion | html %][% END %] + [% IF line.excversion %] + [% FOR v IN line.excversion %] + , ![% v | html %] + [% END %] + [% END %] + + | ++ [% IF ( line.current ) %] + Module current + [% ELSIF ( line.upgrade ) %] + Module upgrade needed + [% ELSE %] + [% IF ( line.require ) %] + Required module missing + [% ELSIF ( line.name != '' ) %] + Optional module missing + [% END %] + [% END # /IF line.current %] + | + + [% END %] +