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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt (-1 / +5 lines)
Lines 3-11 Link Here
3
[% USE Koha %]
3
[% USE Koha %]
4
[% USE Asset %]
4
[% USE Asset %]
5
[% USE KohaDates %]
5
[% USE KohaDates %]
6
[% PROCESS 'i18n.inc' %]
6
[% SET footerjs = 1 %]
7
[% SET footerjs = 1 %]
7
[% INCLUDE 'doc-head-open.inc' %]
8
[% INCLUDE 'doc-head-open.inc' %]
8
<title>About Koha &rsaquo; Koha</title>
9
<title>[% FILTER collapse %]
10
    [% t("About Koha") | html %] &rsaquo;
11
    [% t("Koha") | html %]
12
[% END %]</title>
9
[% INCLUDE 'doc-head-close.inc' %]
13
[% INCLUDE 'doc-head-close.inc' %]
10
</head>
14
</head>
11
<body id="about_about" class="about">
15
<body id="about_about" class="about">
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt (-11 / +30 lines)
Lines 6-24 Link Here
6
[% USE Categories %]
6
[% USE Categories %]
7
[% USE Registers %]
7
[% USE Registers %]
8
[% USE AuthClient %]
8
[% USE AuthClient %]
9
[% PROCESS 'i18n.inc' %]
9
[% SET footerjs = 1 %]
10
[% SET footerjs = 1 %]
10
[% INCLUDE 'doc-head-open.inc' %]
11
[% INCLUDE 'doc-head-open.inc' %]
11
<title>
12
<title>[% FILTER collapse %]
12
    [% IF TwoFA_prompt %]Two-factor authentication[% END %]
13
    [% IF TwoFA_prompt %]
13
    [% IF TwoFA_setup %]Two-factor authentication setup[% END %]
14
        [% t("Two-factor authentication") | html %] &rsaquo;
14
    [% IF ( loginprompt ) %]Log in to Koha[% END %]
15
    [% END %]
15
    [% IF too_many_login_attempts %]This account has been locked.
16
    [% IF TwoFA_setup %]
16
    [% ELSIF invalid_username_or_password %]Invalid username or password[% END %]
17
        [% t("Two-factor authentication setup") | html %] &rsaquo;
17
    [% IF ( different_ip ) %]IP address change[% END %]
18
    [% END %]
18
    [% IF ( timed_out ) %]Session timed out[% END %]
19
    [% IF too_many_login_attempts %]
19
    [% IF ( nopermission ) %]Access denied[% END %]
20
        [% t("This account has been locked.") | html %] &rsaquo;
20
    [% IF ( auth_error ) %]Error authenticating with external provider[% END %] &rsaquo; Koha
21
    [% ELSIF invalid_username_or_password %]
21
</title>
22
        [% t("Invalid username or password") | html %] &rsaquo;
23
    [% END %]
24
    [% IF ( different_ip ) %]
25
        [% t("IP address change") | html %] &rsaquo;
26
    [% END %]
27
    [% IF ( timed_out ) %]
28
        [% t("Session timed out") | html %] &rsaquo;
29
    [% END %]
30
    [% IF ( nopermission ) %]
31
        [% t("Access denied") | html %] &rsaquo;
32
    [% END %]
33
    [% IF ( auth_error ) %]
34
        [% t("Error authenticating with external provider") | html %] &rsaquo;
35
    [% END %]
36
    [% IF ( loginprompt ) %]
37
        [% t("Log in to Koha") | html %] &rsaquo;
38
    [% END %]
39
    [% t("Koha") | html %]
40
[% END %]</title>
22
[% INCLUDE 'doc-head-close.inc' %]
41
[% INCLUDE 'doc-head-close.inc' %]
23
[% PROCESS 'auth-two-factor.inc' %]
42
[% PROCESS 'auth-two-factor.inc' %]
24
</head>
43
</head>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/errors/errorpage.tt (-3 / +7 lines)
Lines 1-6 Link Here
1
[% USE raw %]
1
[% USE raw %]
2
[% PROCESS 'i18n.inc' %]
2
[% INCLUDE 'doc-head-open.inc' %]
3
[% INCLUDE 'doc-head-open.inc' %]
3
<title>Error [% errno | html %] &rsaquo; Koha</title>
4
<title>[% FILTER collapse %]
5
    [% tx("Error {error_number}", {error_number = errno }) | html %] &rsaquo;
6
    [% t("Koha") | html %]
7
[% END %]</title>
4
[% INCLUDE 'doc-head-close.inc' %]
8
[% INCLUDE 'doc-head-close.inc' %]
5
</head>
9
</head>
6
<body id="err_[% errno | html %]" class="err">
10
<body id="err_[% errno | html %]" class="err">
Lines 13-19 Link Here
13
    [% WRAPPER breadcrumbs %]
17
    [% WRAPPER breadcrumbs %]
14
        [% WRAPPER breadcrumb_item %]
18
        [% WRAPPER breadcrumb_item %]
15
            <a href="#" aria-current="page">
19
            <a href="#" aria-current="page">
16
                Error [% errno | html %]
20
                [% tx("Error {error_number}", {error_number = errno }) | html %]
17
            </a>
21
            </a>
18
        [% END %]
22
        [% END %]
19
    [% END #/ WRAPPER breadcrumbs %]
23
    [% END #/ WRAPPER breadcrumbs %]
Lines 24-30 Link Here
24
            <div class="col-md-8 col-md-offset-2">
28
            <div class="col-md-8 col-md-offset-2">
25
29
26
    <h1>An error has occurred!</h1>
30
    <h1>An error has occurred!</h1>
27
    <h2><em>Error [% errno | html %]</em></h2>
31
    <h2><em>[% tx("Error {error_number}", {error_number = errno }) | html %]</em></h2>
28
        <h3>This message may have been caused by any of the following reasons:</h3>
32
        <h3>This message may have been caused by any of the following reasons:</h3>
29
        <ul style="padding-bottom: 0.5em;">
33
        <ul style="padding-bottom: 0.5em;">
30
            <li>You made use of an external link to an item that is no longer available</li>
34
            <li>You made use of an external link to an item that is no longer available</li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt (-2 / +4 lines)
Lines 3-11 Link Here
3
[% USE Koha %]
3
[% USE Koha %]
4
[% USE Branches %]
4
[% USE Branches %]
5
[% USE KohaDates %]
5
[% USE KohaDates %]
6
[% PROCESS 'i18n.inc' %]
6
[% SET footerjs = 1 %]
7
[% SET footerjs = 1 %]
7
[% INCLUDE 'doc-head-open.inc' %]
8
[% INCLUDE 'doc-head-open.inc' %]
8
<title>Koha staff interface</title>
9
<title>[% FILTER collapse %]
10
    [% t("Koha staff interface") | html %]
11
[% END %]</title>
9
[% Asset.css("css/mainpage.css") | $raw %]
12
[% Asset.css("css/mainpage.css") | $raw %]
10
[% INCLUDE 'doc-head-close.inc' %]
13
[% INCLUDE 'doc-head-close.inc' %]
11
</head>
14
</head>
12
- 

Return to bug 33928