From bd28ac331301f43877281c0b3872df3a296e4cf6 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Thu, 11 Apr 2019 13:35:22 +0100 Subject: [PATCH] Bug 21662: Use contributors.yaml for contributors list Signed-off-by: Michal Denar Signed-off-by: Michal Denar --- about.pl | 40 ++- koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 389 +---------------------- 2 files changed, 53 insertions(+), 376 deletions(-) diff --git a/about.pl b/about.pl index 349dfc9668..01b3ce777d 100755 --- a/about.pl +++ b/about.pl @@ -32,6 +32,7 @@ use XML::Simple; use Config; use Search::Elasticsearch; use Try::Tiny; +use YAML::XS qw/LoadFile/; use C4::Output; use C4::Auth; @@ -494,9 +495,7 @@ $template->param( table => $table ); ## ------------------------------------------ -## Koha time line code - -#get file location +## Koha contributions my $docdir; if ( defined C4::Context->config('docdir') ) { $docdir = C4::Context->config('docdir'); @@ -506,6 +505,41 @@ if ( defined C4::Context->config('docdir') ) { $docdir = C4::Context->config('intranetdir') . '/docs'; } +## Contributors +my $contributors = LoadFile("$docdir"."/contributors.yaml"); +my @people = map { + { + name => $_, + ( + exists( $contributors->{$_}->{openhub} ) + ? ( openhub => $contributors->{$_}->{openhub} ) + : () + ), + ( + exists( $contributors->{$_}->{roles} ) + ? ( roles => $contributors->{$_}->{roles} ) + : () + ), + ( + exists( $contributors->{$_}->{commits} ) + ? ( commits => $contributors->{$_}->{commits} ) + : () + ), + ( + exists( $contributors->{$_}->{notes} ) + ? ( notes => $contributors->{$_}->{notes} ) + : () + ) + } +} sort { + my ($alast) = $a =~ /(\S+)$/; + my ($blast) = $b =~ /(\S+)$/; + lc($alast) cmp lc($blast) +} keys %{$contributors}; + +$template->param( contributors => \@people ); + +## Timeline if ( open( my $file, "<:encoding(UTF-8)", "$docdir" . "/history.txt" ) ) { my $i = 0; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt index 2616a6efc3..499d4501d8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt @@ -464,380 +464,12 @@

Koha development team

+
+

Contributing companies and institutions

  • Allen Ginsberg Library, USA
    • @@ -1157,3 +789,14 @@ [% END %] [% INCLUDE 'intranet-bottom.inc' %] +[%- BLOCK person -%] +[% IF p.openhub %][% p.name | html %][% ELSE %][% p.name | html %][% END %] +[%- END -%] +[%- BLOCK contributions -%] +[%- IF p.roles || p.notes -%] +
      + [% FOREACH r IN p.roles %]
    • [% r.key | html %] ([% r.value.join(, ) %])
      • [% END %] + [% IF p.notes %]
    • [% p.notes | html %]
      • [% END %] +
    +[%- END -%] +[%- END -%] -- 2.11.0