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

(-)a/koha-tmpl/intranet-tmpl/prog/css/login.css (+4 lines)
Lines 96-101 label { Link Here
96
	padding: 3px;
96
	padding: 3px;
97
}
97
}
98
98
99
#login select {
100
    width: 98%;
101
}
102
99
#login ul {
103
#login ul {
100
	list-style: none;
104
	list-style: none;
101
	margin: 0;
105
	margin: 0;
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt (+12 lines)
Lines 4-9 Link Here
4
[% USE Branches %]
4
[% USE Branches %]
5
[% USE Desks %]
5
[% USE Desks %]
6
[% USE Categories %]
6
[% USE Categories %]
7
[% USE Registers %]
7
[% SET footerjs = 1 %]
8
[% SET footerjs = 1 %]
8
[% INCLUDE 'doc-head-open.inc' %]
9
[% INCLUDE 'doc-head-open.inc' %]
9
<title>Koha &rsaquo; 
10
<title>Koha &rsaquo; 
Lines 95-100 Link Here
95
            </select>
96
            </select>
96
        </p>
97
        </p>
97
    [% END %]
98
    [% END %]
99
100
    [% IF Koha.Preference('UseCashRegisters') %]
101
    <p>
102
        <label for="register_id">Cash register:</label>
103
        <select name="register_id" id="register_id" class="input" tabindex="4">
104
            [% PROCESS options_for_registers registers => Registers.all() %]
105
        </select>
106
    </p>
107
    [% END %]
108
98
</fieldset>
109
</fieldset>
99
[% END %]
110
[% END %]
100
111
Lines 137-142 Link Here
137
148
138
[% MACRO jsinclude BLOCK %]
149
[% MACRO jsinclude BLOCK %]
139
    [% Asset.js("js/desk_selection.js") | $raw %]
150
    [% Asset.js("js/desk_selection.js") | $raw %]
151
    [% Asset.js("js/register_selection.js") | $raw %]
140
    <script type="text/javascript">
152
    <script type="text/javascript">
141
        $(document).ready( function() {
153
        $(document).ready( function() {
142
            if ( document.location.hash ) {
154
            if ( document.location.hash ) {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/set-library.tt (-30 / +1 lines)
Lines 143-178 Updated:<ul> Link Here
143
143
144
[% MACRO jsinclude BLOCK %]
144
[% MACRO jsinclude BLOCK %]
145
  [% Asset.js("js/desk_selection.js") | $raw %]
145
  [% Asset.js("js/desk_selection.js") | $raw %]
146
  <script>
146
  [% Asset.js("js/register_selection.js") | $raw %]
147
    $(document).ready(function() {
148
        $("#branch").on("change", function() {
149
            var selectedBranch = $("#branch").children(
150
                    "option:selected").val();
151
152
            $("#register_id").children().each(function() {
153
                // default to no-register
154
                if ($(this).is("#noregister")) {
155
                    $(this).prop("selected", true)
156
                }
157
                // display branch registers
158
                else if ($(this).hasClass(selectedBranch)) {
159
                    $(this).prop("disabled", false);
160
                    $(this).show();
161
                    // default to branch default if there is one
162
                    if ($(this).hasClass("default")) {
163
                        $(this).prop("selected", true)
164
                    }
165
                }
166
                // hide non-branch registers
167
                else
168
                {
169
                    $(this).hide();
170
                    $(this).prop("disabled", true);
171
                }
172
            });
173
        });
174
    });
175
  </script>
176
[% END %]
147
[% END %]
177
148
178
[% INCLUDE 'intranet-bottom.inc' %]
149
[% INCLUDE 'intranet-bottom.inc' %]
(-)a/koha-tmpl/intranet-tmpl/prog/js/register_selection.js (-1 / +27 lines)
Line 0 Link Here
0
- 
1
$(document).ready(function() {
2
    $("#branch").on("change", function() {
3
        var selectedBranch = $("#branch").children(
4
            "option:selected").val();
5
6
        $("#register_id").children().each(function() {
7
            // default to no-register
8
            if ($(this).is("#noregister")) {
9
                $(this).prop("selected", true)
10
            }
11
            // display branch registers
12
            else if ($(this).hasClass(selectedBranch)) {
13
                $(this).prop("disabled", false);
14
                $(this).show();
15
                // default to branch default if there is one
16
                if ($(this).hasClass("default")) {
17
                    $(this).prop("selected", true)
18
                }
19
            }
20
            // hide non-branch registers
21
            else {
22
                $(this).hide();
23
                $(this).prop("disabled", true);
24
            }
25
        });
26
    });
27
});

Return to bug 24786