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

(-)a/about.pl (-18 / +44 lines)
Lines 62-67 use Koha::Filter::MARC::ViewPolicy; Link Here
62
use C4::Members::Statistics;
62
use C4::Members::Statistics;
63
63
64
my $query = CGI->new;
64
my $query = CGI->new;
65
my $params = $query->Vars();
66
65
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
67
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
66
    {
68
    {
67
        template_name   => "about.tt",
69
        template_name   => "about.tt",
Lines 71-76 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
71
    }
73
    }
72
);
74
);
73
75
76
my $tab = $params->{tab} || 'about';
77
78
$template->param(
79
    tab => $tab,
80
);
81
82
my $docdir;
83
if ( defined C4::Context->config('docdir') ) {
84
    $docdir = C4::Context->config('docdir');
85
} else {
86
87
    # if no <docdir> is defined in koha-conf.xml, use the default location
88
    # this is a work-around to stop breakage on upgraded Kohas, bug 8911
89
    $docdir = C4::Context->config('intranetdir') . '/docs';
90
}
91
92
my %versions = C4::Context::get_versions();
93
94
if ( $tab eq 'about' ) {
95
74
my $config_timezone = C4::Context->config('timezone') // '';
96
my $config_timezone = C4::Context->config('timezone') // '';
75
my $config_invalid  = !DateTime::TimeZone->is_valid_name( $config_timezone );
97
my $config_invalid  = !DateTime::TimeZone->is_valid_name( $config_timezone );
76
my $env_timezone    = $ENV{TZ} // '';
98
my $env_timezone    = $ENV{TZ} // '';
Lines 163-171 $template->param( Link Here
163
    memcached_namespace => $memcached_namespace,
185
    memcached_namespace => $memcached_namespace,
164
    is_memcached_still_active => $is_memcached_still_active,
186
    is_memcached_still_active => $is_memcached_still_active,
165
    where_is_memcached_config => $where_is_memcached_config,
187
    where_is_memcached_config => $where_is_memcached_config,
188
    perlPath      => $perl_path,
189
    zebraVersion  => $zebraVersion,
190
    kohaVersion   => $versions{'kohaVersion'},
191
    osVersion     => $versions{'osVersion'},
192
    perlVersion   => $versions{'perlVersion'},
193
    perlIncPath   => [ map { perlinc => $_ }, @INC ],
194
    mysqlVersion  => $versions{'mysqlVersion'},
195
    apacheVersion => $versions{'apacheVersion'},
166
    memcached_running   => Koha::Caches->get_instance->memcached_cache,
196
    memcached_running   => Koha::Caches->get_instance->memcached_cache,
167
);
197
);
168
198
199
}
200
201
if($tab eq 'sysinfo') {
202
    
169
# Additional system information for warnings
203
# Additional system information for warnings
170
204
171
my $warnStatisticsFieldsError;
205
my $warnStatisticsFieldsError;
Lines 670-686 $template->param( 'bad_yaml_prefs' => \@bad_yaml_prefs ) if @bad_yaml_prefs; Link Here
670
    $template->param( warnDbRowFormat => C4::Installer->has_non_dynamic_row_format );
704
    $template->param( warnDbRowFormat => C4::Installer->has_non_dynamic_row_format );
671
}
705
}
672
706
673
my %versions = C4::Context::get_versions();
674
675
$template->param(
707
$template->param(
676
    kohaVersion   => $versions{'kohaVersion'},
677
    osVersion     => $versions{'osVersion'},
678
    perlPath      => $perl_path,
679
    perlVersion   => $versions{'perlVersion'},
680
    perlIncPath   => [ map { perlinc => $_ }, @INC ],
681
    mysqlVersion  => $versions{'mysqlVersion'},
682
    apacheVersion => $versions{'apacheVersion'},
683
    zebraVersion  => $zebraVersion,
684
    prefRequireChoosingExistingAuthority => $prefRequireChoosingExistingAuthority,
708
    prefRequireChoosingExistingAuthority => $prefRequireChoosingExistingAuthority,
685
    prefAutoCreateAuthorities => $prefAutoCreateAuthorities,
709
    prefAutoCreateAuthorities => $prefAutoCreateAuthorities,
686
    warnPrefRequireChoosingExistingAuthority => $warnPrefRequireChoosingExistingAuthority,
710
    warnPrefRequireChoosingExistingAuthority => $warnPrefRequireChoosingExistingAuthority,
Lines 698-703 $template->param( Link Here
698
    xml_config_warnings => \@xml_config_warnings,
722
    xml_config_warnings => \@xml_config_warnings,
699
    warnStatisticsFieldsError => $warnStatisticsFieldsError,
723
    warnStatisticsFieldsError => $warnStatisticsFieldsError,
700
);
724
);
725
}
726
727
if ( $tab eq 'perl' ) {
701
728
702
my @components = ();
729
my @components = ();
703
730
Lines 750-766 if (scalar(@$row) > 0) { Link Here
750
777
751
$template->param( table => $table );
778
$template->param( table => $table );
752
779
780
}
781
782
if ( $tab eq 'team' ) {
753
783
754
## ------------------------------------------
784
## ------------------------------------------
755
## Koha contributions
785
## Koha contributions
756
my $docdir;
757
if ( defined C4::Context->config('docdir') ) {
758
    $docdir = C4::Context->config('docdir');
759
} else {
760
    # if no <docdir> is defined in koha-conf.xml, use the default location
761
    # this is a work-around to stop breakage on upgraded Kohas, bug 8911
762
    $docdir = C4::Context->config('intranetdir') . '/docs';
763
}
764
786
765
## Release teams
787
## Release teams
766
my $teams =
788
my $teams =
Lines 856-861 $template->param( contributors => \@people ); Link Here
856
$template->param( maintenance_team => $teams->{team}->{$dev_team} );
878
$template->param( maintenance_team => $teams->{team}->{$dev_team} );
857
$template->param( release_team => $teams->{team}->{$short_version} );
879
$template->param( release_team => $teams->{team}->{$short_version} );
858
880
881
}
882
if ( $tab eq 'history' ) {
883
859
## Timeline
884
## Timeline
860
if ( open( my $file, "<:encoding(UTF-8)", "$docdir" . "/history.txt" ) ) {
885
if ( open( my $file, "<:encoding(UTF-8)", "$docdir" . "/history.txt" ) ) {
861
886
Lines 895-899 if ( open( my $file, "<:encoding(UTF-8)", "$docdir" . "/history.txt" ) ) { Link Here
895
} else {
920
} else {
896
    $template->param( timeline_read_error => 1 );
921
    $template->param( timeline_read_error => 1 );
897
}
922
}
923
}
898
924
899
output_html_with_http_headers $query, $cookie, $template->output;
925
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 || itemsTablesColumnsMismatch %]
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 || itemsTablesColumnsMismatch %]
278
                            [% IF ( warnDbRowFormat ) %]
283
                            [% IF ( warnDbRowFormat ) %]
279
                                <h2>Database row format incorrect</h2>
284
                                <h2>Database row format incorrect</h2>
Lines 768-776 Link Here
768
                        [% ELSE %]
773
                        [% ELSE %]
769
                            <p>No warnings.</p>
774
                            <p>No warnings.</p>
770
                        [% END # /IF warnRequireChoosingExistingAuthority... %]
775
                        [% END # /IF warnRequireChoosingExistingAuthority... %]
771
                    [% END # /WRAPPER tab_item sysinfo %]
776
                    [% END # tab=sysinfo %]
772
777
773
                    [% WRAPPER tab_panel tabname= "team" %]
778
                    [% IF tab == 'team' %]
779
                    [% #WRAPPER tab_panel tabname= "team" %]
774
                        <h2>Special thanks to the following organizations</h2>
780
                        <h2>Special thanks to the following organizations</h2>
775
                        <ul>
781
                        <ul>
776
                            <li>
782
                            <li>
Lines 979-987 Link Here
979
                            <li>Nicholas Rosasco (Documentation Compiler)</li>
985
                            <li>Nicholas Rosasco (Documentation Compiler)</li>
980
                            <li>Regula Sebastiao</li>
986
                            <li>Regula Sebastiao</li>
981
                        </ul>
987
                        </ul>
982
                    [% END # /WRAPPER tab_item team %]
988
                    [% END # tab=team %]
983
989
984
                    [% WRAPPER tab_panel tabname= "licenses" %]
990
                    [% IF tab == 'licenses' %]
991
                    [% #WRAPPER tab_panel tabname= "licenses" %]
985
                        <h2>Koha</h2>
992
                        <h2>Koha</h2>
986
                        <p>
993
                        <p>
987
                            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.
994
                            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 1226-1234 Link Here
1226
                            <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>
1233
                            <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>
1227
                        </p>
1234
                        </p>
1228
1235
1229
                    [% END # /WRAPPER tab_item licenses %]
1236
                    [% END # tab=licenses %]
1230
1237
1231
                    [% WRAPPER tab_panel tabname= "translations" %]
1238
                    [% IF tab == 'translations' %]
1239
                    [% #WRAPPER tab_panel tabname= "translations" %]
1232
                        <h2>Translation</h2>
1240
                        <h2>Translation</h2>
1233
                        <ul>
1241
                        <ul>
1234
                            <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.
1242
                            <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 1277-1285 Link Here
1277
                            <li>&#1575;&#1585;&#1583;&#1608;(Urdu) Ata ur Rehman</li>
1285
                            <li>&#1575;&#1585;&#1583;&#1608;(Urdu) Ata ur Rehman</li>
1278
                            <li>&#1059;&#1082;&#1088;&#1072;&#1111;&#1085;&#1089;&#1100;&#1082;&#1072; (Ukrainian) Victor Titarchuk and Serhij Dubyk</li>
1286
                            <li>&#1059;&#1082;&#1088;&#1072;&#1111;&#1085;&#1089;&#1100;&#1082;&#1072; (Ukrainian) Victor Titarchuk and Serhij Dubyk</li>
1279
                        </ul>
1287
                        </ul>
1280
                    [% END # /WRAPPER tab_item translations %]
1288
                    [% END #tab=translations %]
1281
1289
1282
                    [% WRAPPER tab_panel tabname= "history" %]
1290
                    [% IF tab == 'history' %]
1291
                    [% #WRAPPER tab_panel tabname= "history" %]
1283
                        <h2>Koha history timeline</h2>
1292
                        <h2>Koha history timeline</h2>
1284
                        [% IF ! timeline_read_error %]
1293
                        [% IF ! timeline_read_error %]
1285
                            <table style="cursor:pointer">
1294
                            <table style="cursor:pointer">
Lines 1303-1311 Link Here
1303
                                Could not read the history.txt file. Please make sure &lt;docdir&gt; is correctly defined in koha-conf.xml.
1312
                                Could not read the history.txt file. Please make sure &lt;docdir&gt; is correctly defined in koha-conf.xml.
1304
                            </div>
1313
                            </div>
1305
                        [% END %]
1314
                        [% END %]
1306
                    [% END # /WRAPPER tab_item history %]
1315
                    [% END # tab=history %]
1307
1316
1308
                    [% WRAPPER tab_panel tabname= "dedications" %]
1317
                    [% IF tab == 'dedications' %]
1318
                    [% #WRAPPER tab_panel tabname= "dedications" %]
1309
                        <h2>22.11</h2>
1319
                        <h2>22.11</h2>
1310
                        <p>
1320
                        <p>
1311
                            The Koha Community would like to dedicate the release of Koha 22.11 to Rosalie Blake.
1321
                            The Koha Community would like to dedicate the release of Koha 22.11 to Rosalie Blake.
Lines 1320-1338 Link Here
1320
                            She was also a practicing Justice of the Peace, a stalwart of the Levin Pottery Club and much loved
1330
                            She was also a practicing Justice of the Peace, a stalwart of the Levin Pottery Club and much loved
1321
                            mother of Simon and Jeremy, and grandmother of Ben, Toby, Anna, Charlotte and Billy.
1331
                            mother of Simon and Jeremy, and grandmother of Ben, Toby, Anna, Charlotte and Billy.
1322
                        </p>
1332
                        </p>
1323
                    [% END # /WRAPPER tab_item dedications %]
1333
                    [% END # tab=dedications %]
1324
                [% END %]
1334
                [% END %]
1325
            [% END # /WRAPPER abouttabs %]
1335
            [% END # /WRAPPER abouttabs %]
1326
        </div> <!-- /.col-md-12 -->
1336
        </div> <!-- /.col-md-12 -->
1327
    </div> <!-- /.row -->
1337
    </div> <!-- /.row -->
1328
1329
[% MACRO jsinclude BLOCK %]
1330
    <script>
1331
        $(document).ready(function(){
1332
            selectBsTabByHash( "abouttabs" );
1333
        });
1334
    </script>
1335
[% END %]
1336
1337
<!-- the main div is closed in intranet-bottom.inc -->
1338
<!-- the main div is closed in intranet-bottom.inc -->
1338
[% INCLUDE 'intranet-bottom.inc' %]
1339
[% INCLUDE 'intranet-bottom.inc' %]
1339
- 

Return to bug 32693