View | Details | Raw Unified | Return to bug 30808
Collapse All | Expand All

(-)a/about.pl (-4 / +12 lines)
Lines 722-727 my $dev_team = (sort {$b <=> $a} (keys %{$teams->{team}}))[0]; Link Here
722
my $short_version = substr($versions{'kohaVersion'},0,5);
722
my $short_version = substr($versions{'kohaVersion'},0,5);
723
my $minor = substr($versions{'kohaVersion'},3,2);
723
my $minor = substr($versions{'kohaVersion'},3,2);
724
my $development_version = ( $minor eq '05' || $minor eq '11' ) ? 0 : 1;
724
my $development_version = ( $minor eq '05' || $minor eq '11' ) ? 0 : 1;
725
my $codename;
725
$template->param( short_version => $short_version );
726
$template->param( short_version => $short_version );
726
$template->param( development_version => $development_version );
727
$template->param( development_version => $development_version );
727
728
Lines 747-753 for my $version ( sort { $a <=> $b } keys %{$teams->{team}} ) { Link Here
747
                }
748
                }
748
            }
749
            }
749
        }
750
        }
750
        elsif ( $role ne 'release_date' ) {
751
        elsif ( $role eq 'release_date' ) {
752
            $teams->{team}->{$version}->{$role} = DateTime->from_epoch( epoch => $teams->{team}->{$version}->{$role});
753
        }
754
        elsif ( $role eq 'codename' ) {
755
            if ( $version == $short_version ) {
756
                $codename = $teams->{team}->{$version}->{$role};
757
            }
758
            next;
759
        }
760
        else {
751
            my $name = $teams->{team}->{$version}->{$role}->{name};
761
            my $name = $teams->{team}->{$version}->{$role}->{name};
752
            # Add role to contributors
762
            # Add role to contributors
753
            push @{ $contributors->{$name}->{roles}->{$normalized_role} },
763
            push @{ $contributors->{$name}->{roles}->{$normalized_role} },
Lines 758-766 for my $version ( sort { $a <=> $b } keys %{$teams->{team}} ) { Link Here
758
                  $contributors->{$name}->{openhub};
768
                  $contributors->{$name}->{openhub};
759
            }
769
            }
760
        }
770
        }
761
        else {
762
            $teams->{team}->{$version}->{$role} = DateTime->from_epoch( epoch => $teams->{team}->{$version}->{$role});
763
        }
764
    }
771
    }
765
}
772
}
766
773
Lines 778-783 my @people = map { Link Here
778
  lc($a2last||"") cmp lc($b2last||"");
785
  lc($a2last||"") cmp lc($b2last||"");
779
} keys %$contributors;
786
} keys %$contributors;
780
787
788
$template->param( kohaCodename  => $codename);
781
$template->param( contributors => \@people );
789
$template->param( contributors => \@people );
782
$template->param( maintenance_team => $teams->{team}->{$dev_team} );
790
$template->param( maintenance_team => $teams->{team}->{$dev_team} );
783
$template->param( release_team => $teams->{team}->{$short_version} );
791
$template->param( release_team => $teams->{team}->{$short_version} );
(-)a/docs/teams.yaml (+1 lines)
Lines 1098-1103 team: Link Here
1098
      - name: Wainui Witika-Park
1098
      - name: Wainui Witika-Park
1099
  22.11:
1099
  22.11:
1100
    release_date: 1669420799
1100
    release_date: 1669420799
1101
    codename: Rosalie
1101
    manager:
1102
    manager:
1102
      name: Tomás Cohen Arazi
1103
      name: Tomás Cohen Arazi
1103
    manager_assistants:
1104
    manager_assistants:
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt (-3 / +2 lines)
Lines 45-51 Link Here
45
45
46
        <table>
46
        <table>
47
            <caption>Server information</caption>
47
            <caption>Server information</caption>
48
            <tr><th scope="row">Koha version: </th><td>[% kohaVersion | html %]</td></tr>
48
            <tr><th scope="row">Koha version: </th><td>[% kohaVersion | html %][% IF kohaCodename %] <strong>[% kohaCodename | html %]</strong>[% END %]</td></tr>
49
            <tr><th scope="row">OS version ('uname -a'): </th><td>[% osVersion | html %]</td></tr>
49
            <tr><th scope="row">OS version ('uname -a'): </th><td>[% osVersion | html %]</td></tr>
50
            <tr><th scope="row">Perl interpreter: </th><td>[% perlPath | html %]</td></tr>
50
            <tr><th scope="row">Perl interpreter: </th><td>[% perlPath | html %]</td></tr>
51
            <tr><th scope="row">Perl version: </th><td>[% perlVersion | html %]</td></tr>
51
            <tr><th scope="row">Perl version: </th><td>[% perlVersion | html %]</td></tr>
Lines 554-560 Link Here
554
            [% IF maintenance_team %]
554
            [% IF maintenance_team %]
555
                <div class="row">
555
                <div class="row">
556
                    <div class="col-md-6">
556
                    <div class="col-md-6">
557
                        <h3>Koha [% short_version | html %] release team</h3>
557
                        <h3>Koha [% short_version | html %][% IF kohaCodename %] ([% kohaCodename | html %])[% END %] release team</h3>
558
                        [% IF development_version %]
558
                        [% IF development_version %]
559
                            <p>You are running a development version of Koha</p>
559
                            <p>You are running a development version of Koha</p>
560
                        [% ELSE %]
560
                        [% ELSE %]
561
- 

Return to bug 30808