From 80ef7efa4a097a03abd925ed34c6a4dddace1069 Mon Sep 17 00:00:00 2001 From: Mason James Date: Sat, 5 Nov 2011 23:28:48 +1300 Subject: [PATCH] Bug 7164 - add Koha history timeline tab to 'About' page Includes follow up by Chris Cormack fixing formatting in docs/history.txt [MINOR EDIT] Added html filter to output for validity's sake Signed-off-by: Owen Leonard (cherry picked from commit 6bc414a3d418cd5255a178271207121f3cb9878a) Signed-off-by: Chris Nighswonger --- about.pl | 41 +++++++++++++++++ .../intranet-tmpl/prog/en/modules/about.tt | 45 ++++++++++++++----- 2 files changed, 76 insertions(+), 10 deletions(-) diff --git a/about.pl b/about.pl index 596637d7f6..249f245464 100755 --- a/about.pl +++ b/about.pl @@ -33,6 +33,8 @@ use C4::Auth; use C4::Context; use C4::Installer; +#use Smart::Comments '####'; + my $query = new CGI; my ( $template, $loggedinuser, $cookie ) = get_template_and_user( { @@ -106,7 +108,46 @@ foreach (@components) { $row = []; } } +## ## $table $template->param( table => $table ); + +## ------------------------------------------ +## Koha time line code + +#get file location +my $dir = C4::Context->config('intranetdir'); +open( FILE, "$dir" . "/docs/history.txt" ); +my $i = 0; + +my @rows2 = (); +my $row2 = []; + +my @lines = ; +close(FILE); + +shift @lines; #remove header row + +foreach (@lines) { + my ( $date, $desc, $tag ) = split(/\t/); + push( + @rows2, + { + date => $date, + desc => $desc, + } + ); +} + +my $table2 = []; +#foreach my $row2 (@rows2) { +foreach (@rows2) { + push (@$row2, $_); + push( @$table2, { row2 => $row2 } ); + $row2 = []; +} + +$template->param( table2 => $table2 ); + output_html_with_http_headers $query, $cookie, $template->output; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt index bdf06d04d1..582892ed24 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt @@ -16,12 +16,12 @@
- +

About Koha

- +
- +
- + @@ -95,8 +96,8 @@
  • The Near East University, Cyprus
  • OPUS International Consultants, Wellington, New Zealand (Corporate Serials sponsorship)
  • famfamfam.com Birmingham (UK) based developer Mark James for the famfamfam Silk iconset.
    • - - + +

    Koha Release Team

    • Colin Campbell (Koha 3.4 QA Manager)
      • @@ -286,7 +287,7 @@
    • Katipo Communications, New Zealand
    • KohaAloha, New Zealand
    • LibLime, USA
      • -
    • Libriotech, Norway
      • +
    • Libriotech, Norway
    • Nelsonville Public Library, Ohio, USA
    • PTFS, Maryland, USA
    • PTFS Europe Ltd, United Kingdom
      • @@ -296,7 +297,7 @@
    • Tamil, France
    • Xercode, Spain
    - +

    Additional Thanks To...

    • Jo Ransom
      • @@ -307,6 +308,7 @@
    • Nicolas Morin (French Translation in 2.0)
    +

    Koha

    @@ -315,7 +317,7 @@

    YUI

    BSD License -

    +

    Famfamfam iconset

    • FamFamFam Site
      • @@ -329,6 +331,7 @@ by the Bridge Consortium of Carleton College and St. Olaf College.
    +

    Translation

      @@ -380,8 +383,30 @@
    • اردو(Urdu) Ata ur Rehman
    • Українська (Ukrainian) Victor Titarchuk and Serhij Dubyk
    - + +
    + +
    +

    Koha history timeline

    +
    Server information
    Koha version: [% kohaVersion |html %]
    + + + + + + + [% FOREACH tabl IN table2 %] + + [% FOREACH ro IN tabl.row2 %] + + + [% END %] + + [% END %] +
    DateDescription
    [% ro.date %][% ro.desc|html %]
    +
    +
    [% INCLUDE 'intranet-bottom.inc' %] -- 2.39.5