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

(-)a/C4/Auth.pm (-1 / +1 lines)
Lines 1239-1245 sub checkauth { Link Here
1239
                            : Koha::Cash::Registers->search(
1239
                            : Koha::Cash::Registers->search(
1240
                            { branch => $branchcode, branch_default => 1 },
1240
                            { branch => $branchcode, branch_default => 1 },
1241
                            { rows   => 1 }
1241
                            { rows   => 1 }
1242
                        )->single;
1242
                            )->single;
1243
                        $register_id   = $register->id   if ($register);
1243
                        $register_id   = $register->id   if ($register);
1244
                        $register_name = $register->name if ($register);
1244
                        $register_name = $register->name if ($register);
1245
                    }
1245
                    }
(-)a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss (-2 / +2 lines)
Lines 3187-3193 button, Link Here
3187
    }
3187
    }
3188
}
3188
}
3189
3189
3190
#changelanguage {
3190
#footer_menu_container {
3191
    border-top: 1px solid rgb(173, 173, 173);
3191
    border-top: 1px solid rgb(173, 173, 173);
3192
    min-height: $language-footer-min-height;
3192
    min-height: $language-footer-min-height;
3193
    position: unset;
3193
    position: unset;
Lines 4788-4794 div .suggestion_note { Link Here
4788
        padding-bottom: 4em;
4788
        padding-bottom: 4em;
4789
    }
4789
    }
4790
4790
4791
    #changelanguage {
4791
    #footer_menu_container {
4792
        bottom: 0;
4792
        bottom: 0;
4793
        display: block;
4793
        display: block;
4794
        left: 0;
4794
        left: 0;
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/intranet-bottom.inc (-23 / +26 lines)
Lines 12-25 Link Here
12
12
13
[% IF start_time || ( ( languages_loop ) && ( ! popup_window ) && ( Koha.Preference('StaffLangSelectorMode') == 'both' || Koha.Preference('StaffLangSelectorMode') == 'footer') ) %]
13
[% IF start_time || ( ( languages_loop ) && ( ! popup_window ) && ( Koha.Preference('StaffLangSelectorMode') == 'both' || Koha.Preference('StaffLangSelectorMode') == 'footer') ) %]
14
    [% UNLESS ( one_language_enabled ) %]
14
    [% UNLESS ( one_language_enabled ) %]
15
        <div id="changelanguage" class="navbar navbar-expand navbar-light bg-light">
15
        <div id="footer_menu_container" class="navbar navbar-expand navbar-light bg-light">
16
            <div class="container-fluid">
16
            <div class="container-fluid">
17
                <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#nav_lang_menu" aria-controls="nav_lang_menu" aria-expanded="false" aria-label="Toggle navigation">
17
                <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#footer_menu" aria-controls="footer_menu" aria-expanded="false" aria-label="Toggle navigation">
18
                    <span class="navbar-toggler-icon"></span>
18
                    <span class="navbar-toggler-icon"></span>
19
                </button>
19
                </button>
20
20
21
                [% IF ( ( languages_loop ) && ( ! popup_window ) && ( Koha.Preference('StaffLangSelectorMode') == 'both' || Koha.Preference('StaffLangSelectorMode') == 'footer') ) %]
21
                <div class="collapse navbar-collapse" id="footer_menu">
22
                    <div class="collapse navbar-collapse" id="nav_lang_menu">
22
                    [% IF ( ( languages_loop ) && ( ! popup_window ) && ( Koha.Preference('StaffLangSelectorMode') == 'both' || Koha.Preference('StaffLangSelectorMode') == 'footer') ) %]
23
                        <ul id="i18nMenu" class="navbar-nav me-auto">
23
                        <ul id="i18nMenu" class="navbar-nav me-auto">
24
                            [% FOREACH languages_loo IN languages_loop %]
24
                            [% FOREACH languages_loo IN languages_loop %]
25
                                [% IF ( languages_loo.group_enabled ) %]
25
                                [% IF ( languages_loo.group_enabled ) %]
Lines 92-118 Link Here
92
                            [% END # /FOREACH languages_loo %]
92
                            [% END # /FOREACH languages_loo %]
93
                        </ul>
93
                        </ul>
94
                        <!-- /#i18nMenu -->
94
                        <!-- /#i18nMenu -->
95
                    </div>
95
                    [% END %]
96
                    <!-- /.navbar-collapse -->
96
                    [% IF start_time %]
97
                [% END %]
97
                        <div id="start_end_time" class="d-flex justify-content-end flex-grow-1">
98
                            <span class="navbar-text start_time" data-start="[% start_time | html %]">
99
                                <span class="badge text-bg-light">
100
                                    Start
101
                                    <span class="badge bg-info-subtle">[% start_time.hms(':') | html %]</span>
102
                                </span>
103
                            </span>
104
105
                            [%- SET end_time = KohaDates.datetime_from_string %]
106
                            <span class="navbar-text end_time" data-end="[% end_time | html %]">
107
                                <span class="badge text-bg-light">
108
                                    End
109
                                    <span class="badge bg-primary-subtle">[% end_time.hms(':') | html %]</span>
110
                                </span>
111
                            </span>
112
                        </div>
113
                    [% END %]
114
                </div>
115
                <!-- /.navbar-collapse#footer_menu -->
98
            </div>
116
            </div>
99
            <!-- /.container-fluid -->
117
            <!-- /.container-fluid -->
100
101
            [% IF start_time %]
102
                <span class="container">
103
                    <span class="navbar-text start_time" data-start="[% start_time %]">
104
                        <span class="badge text-bg-info">Start</span>
105
                        [% start_time.hms(':') %]
106
                    </span>
107
                    [%- SET end_time = KohaDates.datetime_from_string %]
108
                    <span class="navbar-text end_time" data-end="[% end_time %]">
109
                        <span class="badge text-bg-primary">End</span>
110
                        [% end_time.hms(':') %]
111
                    </span>
112
                </span>
113
            [% END %]
114
        </div>
118
        </div>
115
        <!-- /#changelanguage -->
119
        <!-- /#footer_menu_container -->
116
    [% END # /UNLESS ( one_language_enabled ) %]
120
    [% END # /UNLESS ( one_language_enabled ) %]
117
[% END # /IF ( ( languages_loop )... %]
121
[% END # /IF ( ( languages_loop )... %]
118
122
119
- 

Return to bug 40813