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

(-)a/about.pl (-18 / +44 lines)
Lines 61-66 use Koha::Filter::MARC::ViewPolicy; Link Here
61
use C4::Members::Statistics;
61
use C4::Members::Statistics;
62
62
63
my $query = CGI->new;
63
my $query = CGI->new;
64
my $params = $query->Vars();
65
64
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
66
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
65
    {
67
    {
66
        template_name   => "about.tt",
68
        template_name   => "about.tt",
Lines 70-75 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
70
    }
72
    }
71
);
73
);
72
74
75
my $tab = $params->{tab} || 'about';
76
77
$template->param(
78
    tab => $tab,
79
);
80
81
my $docdir;
82
if ( defined C4::Context->config('docdir') ) {
83
    $docdir = C4::Context->config('docdir');
84
} else {
85
86
    # if no <docdir> is defined in koha-conf.xml, use the default location
87
    # this is a work-around to stop breakage on upgraded Kohas, bug 8911
88
    $docdir = C4::Context->config('intranetdir') . '/docs';
89
}
90
91
my %versions = C4::Context::get_versions();
92
93
if ( $tab eq 'about' ) {
94
73
my $config_timezone = C4::Context->config('timezone') // '';
95
my $config_timezone = C4::Context->config('timezone') // '';
74
my $config_invalid  = !DateTime::TimeZone->is_valid_name( $config_timezone );
96
my $config_invalid  = !DateTime::TimeZone->is_valid_name( $config_timezone );
75
my $env_timezone    = $ENV{TZ} // '';
97
my $env_timezone    = $ENV{TZ} // '';
Lines 162-170 $template->param( Link Here
162
    memcached_namespace => $memcached_namespace,
184
    memcached_namespace => $memcached_namespace,
163
    is_memcached_still_active => $is_memcached_still_active,
185
    is_memcached_still_active => $is_memcached_still_active,
164
    where_is_memcached_config => $where_is_memcached_config,
186
    where_is_memcached_config => $where_is_memcached_config,
187
    perlPath      => $perl_path,
188
    zebraVersion  => $zebraVersion,
189
    kohaVersion   => $versions{'kohaVersion'},
190
    osVersion     => $versions{'osVersion'},
191
    perlVersion   => $versions{'perlVersion'},
192
    perlIncPath   => [ map { perlinc => $_ }, @INC ],
193
    mysqlVersion  => $versions{'mysqlVersion'},
194
    apacheVersion => $versions{'apacheVersion'},
165
    memcached_running   => Koha::Caches->get_instance->memcached_cache,
195
    memcached_running   => Koha::Caches->get_instance->memcached_cache,
166
);
196
);
167
197
198
}
199
200
if($tab eq 'sysinfo') {
201
    
168
# Additional system information for warnings
202
# Additional system information for warnings
169
203
170
my $warnStatisticsFieldsError;
204
my $warnStatisticsFieldsError;
Lines 654-670 $template->param( 'bad_yaml_prefs' => \@bad_yaml_prefs ) if @bad_yaml_prefs; Link Here
654
    $template->param( warnDbRowFormat => C4::Installer->has_non_dynamic_row_format );
688
    $template->param( warnDbRowFormat => C4::Installer->has_non_dynamic_row_format );
655
}
689
}
656
690
657
my %versions = C4::Context::get_versions();
658
659
$template->param(
691
$template->param(
660
    kohaVersion   => $versions{'kohaVersion'},
661
    osVersion     => $versions{'osVersion'},
662
    perlPath      => $perl_path,
663
    perlVersion   => $versions{'perlVersion'},
664
    perlIncPath   => [ map { perlinc => $_ }, @INC ],
665
    mysqlVersion  => $versions{'mysqlVersion'},
666
    apacheVersion => $versions{'apacheVersion'},
667
    zebraVersion  => $zebraVersion,
668
    prefRequireChoosingExistingAuthority => $prefRequireChoosingExistingAuthority,
692
    prefRequireChoosingExistingAuthority => $prefRequireChoosingExistingAuthority,
669
    prefAutoCreateAuthorities => $prefAutoCreateAuthorities,
693
    prefAutoCreateAuthorities => $prefAutoCreateAuthorities,
670
    warnPrefRequireChoosingExistingAuthority => $warnPrefRequireChoosingExistingAuthority,
694
    warnPrefRequireChoosingExistingAuthority => $warnPrefRequireChoosingExistingAuthority,
Lines 682-687 $template->param( Link Here
682
    xml_config_warnings => \@xml_config_warnings,
706
    xml_config_warnings => \@xml_config_warnings,
683
    warnStatisticsFieldsError => $warnStatisticsFieldsError,
707
    warnStatisticsFieldsError => $warnStatisticsFieldsError,
684
);
708
);
709
}
710
711
if ( $tab eq 'perl' ) {
685
712
686
my @components = ();
713
my @components = ();
687
714
Lines 734-750 if (scalar(@$row) > 0) { Link Here
734
761
735
$template->param( table => $table );
762
$template->param( table => $table );
736
763
764
}
765
766
if ( $tab eq 'team' ) {
737
767
738
## ------------------------------------------
768
## ------------------------------------------
739
## Koha contributions
769
## Koha contributions
740
my $docdir;
741
if ( defined C4::Context->config('docdir') ) {
742
    $docdir = C4::Context->config('docdir');
743
} else {
744
    # if no <docdir> is defined in koha-conf.xml, use the default location
745
    # this is a work-around to stop breakage on upgraded Kohas, bug 8911
746
    $docdir = C4::Context->config('intranetdir') . '/docs';
747
}
748
770
749
## Release teams
771
## Release teams
750
my $teams =
772
my $teams =
Lines 840-845 $template->param( contributors => \@people ); Link Here
840
$template->param( maintenance_team => $teams->{team}->{$dev_team} );
862
$template->param( maintenance_team => $teams->{team}->{$dev_team} );
841
$template->param( release_team => $teams->{team}->{$short_version} );
863
$template->param( release_team => $teams->{team}->{$short_version} );
842
864
865
}
866
if ( $tab eq 'history' ) {
867
843
## Timeline
868
## Timeline
844
if ( open( my $file, "<:encoding(UTF-8)", "$docdir" . "/history.txt" ) ) {
869
if ( open( my $file, "<:encoding(UTF-8)", "$docdir" . "/history.txt" ) ) {
845
870
Lines 879-883 if ( open( my $file, "<:encoding(UTF-8)", "$docdir" . "/history.txt" ) ) { Link Here
879
} else {
904
} else {
880
    $template->param( timeline_read_error => 1 );
905
    $template->param( timeline_read_error => 1 );
881
}
906
}
907
}
882
908
883
output_html_with_http_headers $query, $cookie, $template->output;
909
output_html_with_http_headers $query, $cookie, $template->output;
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc (+12 lines)
Lines 387-392 Link Here
387
    </ul>
387
    </ul>
388
[% END %]
388
[% END %]
389
389
390
[% BLOCK tab_item_link %]
391
    [% IF ( bt_active ) %]
392
        <li role="presentation" class="active">
393
    [% ELSE %]
394
        <li role="presentation">
395
    [% END %]
396
        <a href="?tab=[% link | url %]" id="[% tabname | uri %]-tab">
397
            [% content | $raw %]
398
        </a>
399
    </li>
400
[% END %]
401
390
[% BLOCK tab_item %]
402
[% BLOCK tab_item %]
391
    [% IF ( bt_active ) %]
403
    [% IF ( bt_active ) %]
392
        <li role="presentation" class="active">
404
        <li role="presentation" class="active">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt (-34 / +34 lines)
Lines 33-50 Link Here
33
33
34
            [% WRAPPER tabs id= "abouttabs" %]
34
            [% WRAPPER tabs id= "abouttabs" %]
35
                [% WRAPPER tabs_nav %]
35
                [% WRAPPER tabs_nav %]
36
                    [% WRAPPER tab_item tabname= "about" bt_active= 1 %] <span>Server information</span> [% END %]
36
                    [% WRAPPER tab_item_link link = "about" bt_active = tab == "about" %] <span>Server information</span> [% END %]
37
                    [% WRAPPER tab_item tabname= "perl" %] <span>Perl modules</span> [% END %]
37
                    [% WRAPPER tab_item_link link = "perl" bt_active = tab == "perl" %] <span>Perl modules</span> [% END %]
38
                    [% WRAPPER tab_item tabname= "sysinfo" %] <span>System information</span> [% END %]
38
                    [% WRAPPER tab_item_link link = "sysinfo" bt_active = tab == "sysinfo" %] <span>System information</span> [% END %]
39
                    [% WRAPPER tab_item tabname= "team" %] <span>Koha team</span> [% END %]
39
                    [% WRAPPER tab_item_link link = "team" bt_active = tab == "team" %] <span>Koha team</span> [% END %]
40
                    [% WRAPPER tab_item tabname= "licenses" %] <span>Licenses</span> [% END %]
40
                    [% WRAPPER tab_item_link link = "licenses" bt_active = tab == "licenses" %] <span>Licenses</span> [% END %]
41
                    [% WRAPPER tab_item tabname= "translations" %] <span>Translations</span> [% END %]
41
                    [% WRAPPER tab_item_link link = "translations" bt_active = tab == "translations" %] <span>Translations</span> [% END %]
42
                    [% WRAPPER tab_item tabname= "history" %] <span>Timeline</span> [% END %]
42
                    [% WRAPPER tab_item_link link = "history" bt_active = tab == "history" %] <span>Timeline</span> [% END %]
43
                    [% WRAPPER tab_item tabname= "dedications" %] <span>Dedications</span> [% END %]
43
                    [% WRAPPER tab_item_link link = "dedications" bt_active = tab == "dedications" %] <span>Dedications</span> [% END %]
44
                [% END %]
44
                [% END %]
45
45
46
                [% WRAPPER tab_panels %]
46
                [% WRAPPER tab_panels %]
47
                    [% WRAPPER tab_panel tabname= "about" bt_active= 1 %]
47
                    [% IF tab == 'about' %]
48
                        [% WRAPPER tab_panel tabname= "about" bt_active= 1 %]
48
                        <table>
49
                        <table>
49
                            <caption>Server information</caption>
50
                            <caption>Server information</caption>
50
                            <tr>
51
                            <tr>
Lines 218-226 Link Here
218
                                </td>
219
                                </td>
219
                            </tr>
220
                            </tr>
220
                        </table>
221
                        </table>
221
                    [% END # /WRAPPER tab_item about %]
222
                    [% END # tab=about %]
223
                    [% END # tab=about %]
224
225
                    [% #WRAPPER tab_panel tabname= "perl" %]
226
                    [% IF tab == 'perl' %]
222
227
223
                    [% WRAPPER tab_panel tabname= "perl" %]
224
                        <table style="cursor:pointer">
228
                        <table style="cursor:pointer">
225
                            <caption>Perl modules</caption>
229
                            <caption>Perl modules</caption>
226
                            [% FOREACH tabl IN table %]
230
                            [% FOREACH tabl IN table %]
Lines 268-279 Link Here
268
                                </tr>
272
                                </tr>
269
                            [% END # /FOREACH tabl %]
273
                            [% END # /FOREACH tabl %]
270
                        </table>
274
                        </table>
271
                    [% END # /WRAPPER tab_item perl %]
275
                    [% END # tab=perl %]
272
276
277
                    [% IF tab == 'sysinfo' %]
273
                    [% IF Asset.css("css/staff-global.css") == "" || Asset.js("js/vue/dist/erm.js") == "" %]
278
                    [% IF Asset.css("css/staff-global.css") == "" || Asset.js("js/vue/dist/erm.js") == "" %]
274
                        [% SET warnMissingCompiledFiles = 1 %]
279
                        [% SET warnMissingCompiledFiles = 1 %]
275
                    [% END %]
280
                    [% END %]
276
                    [% WRAPPER tab_panel tabname= "sysinfo" %]
281
                    [% #WRAPPER tab_panel tabname= "sysinfo" %]
277
                        [% IF weasyprint_missing || warnPrefRequireChoosingExistingAuthority || warnPrefEasyAnalyticalRecords || warnPrefAnonymousPatronOPACPrivacy || warnPrefAnonymousPatronAnonSuggestions || warnPrefAnonymousPatronOPACPrivacy_PatronDoesNotExist || warnPrefAnonymousPatronAnonSuggestions_PatronDoesNotExist || warnPrefKohaAdminEmailAddress || warnPrefOpacHiddenItems || warnPrefPatronSelfRegistrationDefaultCategory || invalid_yesno.count || warnNoActiveCurrency || warnIsRootUser || xml_config_warnings.size || warnI18nMissing || AutoSelfCheckPatronDoesNotHaveSelfCheckPerm || AutoSelfCheckPatronHasTooManyPerm || warnStatisticsFieldsError || warnNoTemplateCaching || warnILLConfiguration || has_ai_issues || oauth2_missing_deps || bad_yaml_prefs || warnRelationships || log4perl_errors || config_bcrypt_settings_no_set || warnHiddenBiblionumbers.size || warnConnectBroker || elasticsearch_has_missing || warnMissingCompiledFiles || warnDbRowFormat %]
282
                        [% IF weasyprint_missing || warnPrefRequireChoosingExistingAuthority || warnPrefEasyAnalyticalRecords || warnPrefAnonymousPatronOPACPrivacy || warnPrefAnonymousPatronAnonSuggestions || warnPrefAnonymousPatronOPACPrivacy_PatronDoesNotExist || warnPrefAnonymousPatronAnonSuggestions_PatronDoesNotExist || warnPrefKohaAdminEmailAddress || warnPrefOpacHiddenItems || warnPrefPatronSelfRegistrationDefaultCategory || invalid_yesno.count || warnNoActiveCurrency || warnIsRootUser || xml_config_warnings.size || warnI18nMissing || AutoSelfCheckPatronDoesNotHaveSelfCheckPerm || AutoSelfCheckPatronHasTooManyPerm || warnStatisticsFieldsError || warnNoTemplateCaching || warnILLConfiguration || has_ai_issues || oauth2_missing_deps || bad_yaml_prefs || warnRelationships || log4perl_errors || config_bcrypt_settings_no_set || warnHiddenBiblionumbers.size || warnConnectBroker || elasticsearch_has_missing || warnMissingCompiledFiles || warnDbRowFormat %]
278
                            [% IF ( warnDbRowFormat ) %]
283
                            [% IF ( warnDbRowFormat ) %]
279
                                <h2>Database row format incorrect</h2>
284
                                <h2>Database row format incorrect</h2>
Lines 754-762 Link Here
754
                        [% ELSE %]
759
                        [% ELSE %]
755
                            <p>No warnings.</p>
760
                            <p>No warnings.</p>
756
                        [% END # /IF warnRequireChoosingExistingAuthority... %]
761
                        [% END # /IF warnRequireChoosingExistingAuthority... %]
757
                    [% END # /WRAPPER tab_item sysinfo %]
762
                    [% END # tab=sysinfo %]
758
763
759
                    [% WRAPPER tab_panel tabname= "team" %]
764
                    [% IF tab == 'team' %]
765
                    [% #WRAPPER tab_panel tabname= "team" %]
760
                        <h2>Special thanks to the following organizations</h2>
766
                        <h2>Special thanks to the following organizations</h2>
761
                        <ul>
767
                        <ul>
762
                            <li>
768
                            <li>
Lines 965-973 Link Here
965
                            <li>Nicholas Rosasco (Documentation Compiler)</li>
971
                            <li>Nicholas Rosasco (Documentation Compiler)</li>
966
                            <li>Regula Sebastiao</li>
972
                            <li>Regula Sebastiao</li>
967
                        </ul>
973
                        </ul>
968
                    [% END # /WRAPPER tab_item team %]
974
                    [% END # tab=team %]
969
975
970
                    [% WRAPPER tab_panel tabname= "licenses" %]
976
                    [% IF tab == 'licenses' %]
977
                    [% #WRAPPER tab_panel tabname= "licenses" %]
971
                        <h2>Koha</h2>
978
                        <h2>Koha</h2>
972
                        <p>
979
                        <p>
973
                            This program is free software: you can redistribute it and/or modify it under the terms of the <a rel="license" href="https://www.gnu.org/licenses/gpl-3.0.html">GNU General Public License</a> as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
980
                            This program is free software: you can redistribute it and/or modify it under the terms of the <a rel="license" href="https://www.gnu.org/licenses/gpl-3.0.html">GNU General Public License</a> as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
Lines 1212-1220 Link Here
1212
                            <a href="https://mottie.github.io/Keyboard/index.html">Virtual Keyboard v1.30.1</a>: <a href="https://github.com/Mottie/Keyboard/blob/v1.30.1/LICENSE">MIT Licence</a>
1219
                            <a href="https://mottie.github.io/Keyboard/index.html">Virtual Keyboard v1.30.1</a>: <a href="https://github.com/Mottie/Keyboard/blob/v1.30.1/LICENSE">MIT Licence</a>
1213
                        </p>
1220
                        </p>
1214
1221
1215
                    [% END # /WRAPPER tab_item licenses %]
1222
                    [% END # tab=licenses %]
1216
1223
1217
                    [% WRAPPER tab_panel tabname= "translations" %]
1224
                    [% IF tab == 'translations' %]
1225
                    [% #WRAPPER tab_panel tabname= "translations" %]
1218
                        <h2>Translation</h2>
1226
                        <h2>Translation</h2>
1219
                        <ul>
1227
                        <ul>
1220
                            <li>العربية (Arabic) Version 3.2 to 3.4, 3.16 & 3.18 by KnowledgeWare Technologies; Versions 3.6 to 3.14 by Arabic Koha support team: Karam Qubsi, Kouider Bounama, Sham Bajaa, Ghofran Alshami, Chrestian Aboud, Fatema Salem and Duaa Bazzazi.
1228
                            <li>العربية (Arabic) Version 3.2 to 3.4, 3.16 & 3.18 by KnowledgeWare Technologies; Versions 3.6 to 3.14 by Arabic Koha support team: Karam Qubsi, Kouider Bounama, Sham Bajaa, Ghofran Alshami, Chrestian Aboud, Fatema Salem and Duaa Bazzazi.
Lines 1263-1271 Link Here
1263
                            <li>&#1575;&#1585;&#1583;&#1608;(Urdu) Ata ur Rehman</li>
1271
                            <li>&#1575;&#1585;&#1583;&#1608;(Urdu) Ata ur Rehman</li>
1264
                            <li>&#1059;&#1082;&#1088;&#1072;&#1111;&#1085;&#1089;&#1100;&#1082;&#1072; (Ukrainian) Victor Titarchuk and Serhij Dubyk</li>
1272
                            <li>&#1059;&#1082;&#1088;&#1072;&#1111;&#1085;&#1089;&#1100;&#1082;&#1072; (Ukrainian) Victor Titarchuk and Serhij Dubyk</li>
1265
                        </ul>
1273
                        </ul>
1266
                    [% END # /WRAPPER tab_item translations %]
1274
                    [% END #tab=translations %]
1267
1275
1268
                    [% WRAPPER tab_panel tabname= "history" %]
1276
                    [% IF tab == 'history' %]
1277
                    [% #WRAPPER tab_panel tabname= "history" %]
1269
                        <h2>Koha history timeline</h2>
1278
                        <h2>Koha history timeline</h2>
1270
                        [% IF ! timeline_read_error %]
1279
                        [% IF ! timeline_read_error %]
1271
                            <table style="cursor:pointer">
1280
                            <table style="cursor:pointer">
Lines 1289-1297 Link Here
1289
                                Could not read the history.txt file. Please make sure &lt;docdir&gt; is correctly defined in koha-conf.xml.
1298
                                Could not read the history.txt file. Please make sure &lt;docdir&gt; is correctly defined in koha-conf.xml.
1290
                            </div>
1299
                            </div>
1291
                        [% END %]
1300
                        [% END %]
1292
                    [% END # /WRAPPER tab_item history %]
1301
                    [% END # tab=history %]
1293
1302
1294
                    [% WRAPPER tab_panel tabname= "dedications" %]
1303
                    [% IF tab == 'dedications' %]
1304
                    [% #WRAPPER tab_panel tabname= "dedications" %]
1295
                        <h2>22.11</h2>
1305
                        <h2>22.11</h2>
1296
                        <p>
1306
                        <p>
1297
                            The Koha Community would like to dedicate the release of Koha 22.11 to Rosalie Blake.
1307
                            The Koha Community would like to dedicate the release of Koha 22.11 to Rosalie Blake.
Lines 1306-1324 Link Here
1306
                            She was also a practicing Justice of the Peace, a stalwart of the Levin Pottery Club and much loved
1316
                            She was also a practicing Justice of the Peace, a stalwart of the Levin Pottery Club and much loved
1307
                            mother of Simon and Jeremy, and grandmother of Ben, Toby, Anna, Charlotte and Billy.
1317
                            mother of Simon and Jeremy, and grandmother of Ben, Toby, Anna, Charlotte and Billy.
1308
                        </p>
1318
                        </p>
1309
                    [% END # /WRAPPER tab_item dedications %]
1319
                    [% END # tab=dedications %]
1310
                [% END %]
1320
                [% END %]
1311
            [% END # /WRAPPER abouttabs %]
1321
            [% END # /WRAPPER abouttabs %]
1312
        </div> <!-- /.col-md-12 -->
1322
        </div> <!-- /.col-md-12 -->
1313
    </div> <!-- /.row -->
1323
    </div> <!-- /.row -->
1314
1315
[% MACRO jsinclude BLOCK %]
1316
    <script>
1317
        $(document).ready(function(){
1318
            selectBsTabByHash( "abouttabs" );
1319
        });
1320
    </script>
1321
[% END %]
1322
1323
<!-- the main div is closed in intranet-bottom.inc -->
1324
<!-- the main div is closed in intranet-bottom.inc -->
1324
[% INCLUDE 'intranet-bottom.inc' %]
1325
[% INCLUDE 'intranet-bottom.inc' %]
1325
- 

Return to bug 32693