Beginning redesign of the OPAC. At this stage it's a move to make it more like the...

[koha_gimpoz] / about.pl

diff --git a/about.pl b/about.pl
index ef39f38..dbd981d 100755 (executable)
--- a/about.pl
+++ b/about.pl
@@ -37,7 +37,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 
-my $kohaVersion   = C4::Context->config("kohaversion");
+my $kohaVersion   = C4::Context::KOHAVERSION;
 my $osVersion     = `uname -a`;
 my $perlVersion   = $];
 my $mysqlVersion  = `mysql -V`;
@@ -55,30 +55,63 @@ $template->param(
     apacheVersion => $apacheVersion,
     zebraVersion  => $zebraVersion,
 );
-
-<<<<<<< HEAD:about.pl
 my @component_names =
-    qw/MARC::File::XML   MARC::Charset     Class::Accessor
-       LWP::Simple       XML::Simple       Net::Z3950
-       Event             Net::LDAP         PDF::API2
-       Mail::Sendmail    MARC::Record      Digest::MD5
-       HTML::Template    DBD::mysql        Date::Manip
-       DBI               Net::Z3950::ZOOM
-       Date::Calc
+    qw/CGI
+CGI::Carp
+CGI::Session
+Class::Factory::Util
+Class::Accessor
+DBD::mysql
+DBI
+Data::Dumper
+Date::Calc
+Date::Manip
+Digest::MD5
+File::Temp
+GD::Barcode::UPCE
+Getopt::Long
+Getopt::Std
+HTML::Template::Pro
+HTTP::Cookies
+HTTP::Request::Common
+LWP::Simple
+LWP::UserAgent
+Lingua::Stem
+List::Util
+Locale::Language
+MARC::Charset
+MARC::File::XML
+MARC::Record
+MIME::Base64
+MIME::QuotedPrint
+Mail::Sendmail
+Net::Z3950::ZOOM
+PDF::API2
+PDF::API2::Page
+PDF::API2::Util
+PDF::Reuse
+PDF::Reuse::Barcode
+POSIX
+Schedule::At
+Term::ANSIColor
+Test
+Test::Harness
+Test::More
+Text::CSV
+Text::Wrap
+Time::HiRes
+Time::localtime
+Unicode::Normalize
+XML::Dumper
+XML::LibXML
+XML::SAX::ParserFactory
+XML::Simple
+XML::RSS
       /;
-=======
-my @component_names = qw/MARC::File::XML   MARC::Charset     Class::Accessor
-  LWP::Simple       XML::Simple       Net::Z3950
-  Event             Net::LDAP         PDF::API2
-  Mail::Sendmail    MARC::Record      Digest::MD5
-  HTML::Template    DBD::mysql        Date::Manip
-  DBI               Smart::Comments   Net::Z3950::ZOOM
-  Date::Calc
-  /;
->>>>>>> perltidy:about.pl
 
 my @components = ();
 
+my $counter=0;
 foreach my $component ( sort @component_names ) {
     my $version;
     if ( eval "require $component" ) {
@@ -90,12 +123,14 @@ foreach my $component ( sort @component_names ) {
     else {
         $version = 'module is missing';
     }
-
+    $counter++;
+    $counter=0 if $counter >3;
     push(
         @components,
         {
             name    => $component,
             version => $version,
+            counter => $counter,
         }
     );
 }