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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-advsearch.inc (-1 / +1 lines)
Lines 35-41 Link Here
35
                <li class="local">
35
                <li class="local">
36
                    <label for="branch">Library:</label>
36
                    <label for="branch">Library:</label>
37
                    <select id="branch" name="branch_filter">
37
                    <select id="branch" name="branch_filter">
38
                        <option value="">All</option>
38
                        <option value="">All libraries/branches</option>
39
                        [%# FIXME Should not we filter the libraries? %]
39
                        [%# FIXME Should not we filter the libraries? %]
40
                        [% PROCESS options_for_libraries libraries => Branches.all( selected => branch_filter, unfiltered => 1 ) %]
40
                        [% PROCESS options_for_libraries libraries => Branches.all( selected => branch_filter, unfiltered => 1 ) %]
41
                    </select>
41
                    </select>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/subscriptions-search.inc (-1 / +1 lines)
Lines 30-36 Link Here
30
                    <li>
30
                    <li>
31
                        <label for="branch">Library:</label>
31
                        <label for="branch">Library:</label>
32
                        <select id="branch" name="branch_filter">
32
                        <select id="branch" name="branch_filter">
33
                            <option value="">All</option>
33
                            <option value="">>All libraries/branches</option>
34
                            [%# FIXME Should not we filter the libraries? %]
34
                            [%# FIXME Should not we filter the libraries? %]
35
                            [% PROCESS options_for_libraries libraries => Branches.all( selected => branch_filter, unfiltered => 1 ) %]
35
                            [% PROCESS options_for_libraries libraries => Branches.all( selected => branch_filter, unfiltered => 1 ) %]
36
                        </select>
36
                        </select>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt (-1 / +1 lines)
Lines 430-436 Link Here
430
                            <li>
430
                            <li>
431
                                <label for="branch">Library:</label>
431
                                <label for="branch">Library:</label>
432
                                <select id="branch" name="branch">
432
                                <select id="branch" name="branch">
433
                                    <option value="">All</option>
433
                                    <option value="">All libraries/branches</option>
434
                                    [%# FIXME Should not we filter the libraries %]
434
                                    [%# FIXME Should not we filter the libraries %]
435
                                    [% PROCESS options_for_libraries libraries => Branches.all( selected => branch, unfiltered => 1 ) %]
435
                                    [% PROCESS options_for_libraries libraries => Branches.all( selected => branch, unfiltered => 1 ) %]
436
                                </select>
436
                                </select>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt (-1 / +1 lines)
Lines 310-316 Link Here
310
                    <label for="branchlimit">Library: </label>
310
                    <label for="branchlimit">Library: </label>
311
                    <select name="branchlimit" id="branchlimit">
311
                    <select name="branchlimit" id="branchlimit">
312
                        [% IF CAN_user_superlibrarian || !Koha.Preference('IndependentBranches') %]
312
                        [% IF CAN_user_superlibrarian || !Koha.Preference('IndependentBranches') %]
313
                            <option value="">All</option>
313
                            <option value="">All libraries/branches</option>
314
                        [% END %]
314
                        [% END %]
315
                        [% PROCESS options_for_libraries libraries => Branches.all( selected => branchlimit, only_from_group => 1 ) %]
315
                        [% PROCESS options_for_libraries libraries => Branches.all( selected => branchlimit, only_from_group => 1 ) %]
316
                    </select>
316
                    </select>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/onboarding/onboardingstep5.tt (-1 / +116 lines)
Lines 64-70 Link Here
64
                                <label for="branchname" class="required"> Library branch</label>
64
                                <label for="branchname" class="required"> Library branch</label>
65
                                <select name="branch" id="branchname" required="required">
65
                                <select name="branch" id="branchname" required="required">
66
                                    <option value=""> Choose</option>
66
                                    <option value=""> Choose</option>
67
                                    <option value="*" selected="selected">All</option>
67
                                    <option value="*" selected="selected">All libraries/branches</option>
68
                                    [% FOREACH library IN libraries %]
68
                                    [% FOREACH library IN libraries %]
69
                                        <option value="[% library.branchcode | html %]"> [% library.branchname | html %]</option>
69
                                        <option value="[% library.branchcode | html %]"> [% library.branchname | html %]</option>
70
                                    [% END %]
70
                                    [% END %]
Lines 142-151 Link Here
142
                                <input type="text" inputmode="numeric" pattern="[0-9]*" name="reservesallowed" id="reservesallowed" size="10" value="10" />
142
                                <input type="text" inputmode="numeric" pattern="[0-9]*" name="reservesallowed" id="reservesallowed" size="10" value="10" />
143
                            </li>
143
                            </li>
144
144
145
<<<<<<< HEAD
145
                            <li>
146
                            <li>
146
                                <label for="holds_per_day">Holds allowed (daily): </label>
147
                                <label for="holds_per_day">Holds allowed (daily): </label>
147
                                <input type="text" inputmode="numeric" pattern="[0-9]*" name="holds_per_day" id="holds_per_day" size="10" value="10" />
148
                                <input type="text" inputmode="numeric" pattern="[0-9]*" name="holds_per_day" id="holds_per_day" size="10" value="10" />
148
                            </li>
149
                            </li>
150
=======
151
                    <form name="createcirculationrule" method="post" action="onboarding.pl">
152
                        [% INCLUDE 'csrf-token.inc' %]
153
                        <fieldset class="rows">
154
                            <input type="hidden" name="step" value="5"/>
155
                            <input type="hidden" name="op" value="cud-add_validate_circ_rule" />
156
                            <ol>
157
                                <li>
158
                                    <label for="branchname" class="required"> Library branch</label>
159
                                    <select name="branch" id="branchname" required="required">
160
                                        <option value=""> Choose</option>
161
                                        <option value="*" selected="selected">All libraries/branches</option>
162
                                        [% FOREACH library IN libraries %]
163
                                            <option value="[% library.branchcode | html %]"> [% library.branchname | html %]</option>
164
                                        [% END %]
165
                                    </select>
166
                                    <span class="required">Required</span>
167
                                </li>
168
                                <li>
169
                                    <label for="categorycode" class="required">Patron category: </label>
170
                                    <select name="categorycode" id="categorycode" required="required">
171
                                        <option value=""> Choose</option>
172
                                        <option value="*" selected="selected">All</option>
173
                                        [% FOREACH category IN categories %]
174
                                            <option value = "[% category.categorycode | html %]"> [% category.description | html %]</option>
175
                                        [%END%]
176
                                    </select>
177
                                    <span class="required">Required</span>
178
                                </li>
179
180
                                <li>
181
                                    <label for="itemtype" class="required">Item type: </label>
182
                                    <select id="itemtype" name="itemtype" required="required">
183
                                        <option value=""> Choose </option>
184
                                        <option value="*" selected="selected">All</option>
185
                                        [% FOREACH item IN itemtypes %]
186
                                            <option value = "[% item.itemtype | html %]"> [% item.itemtype | html %]
187
                                        [%END%]
188
                                    </select>
189
                                    <span class="required"> Required</span>
190
                                </li>
191
                                <li>
192
                                    <label for="maxissueqty" class="required">Current checkouts allowed: </label>
193
                                    <input type="text" inputmode="numeric" pattern="[0-9]*" name="maxissueqty" id="maxissueqty" size="10" value="50" class="required" required="required" />
194
                                    <span class="required">Required</span>
195
                                </li>
196
197
                                <li>
198
                                    <label for="issuelength" class="required">Loan period: </label>
199
                                    <input type="text" inputmode="numeric" pattern="[0-9]*" name="issuelength" id="issuelength" size="10" value="14" class="required" required="required" />
200
                                    <span class="required">Required</span>
201
                                </li>
202
                                <li>
203
                                    <label for="lengthunit" class="required">Units: </label>
204
                                    <select name="lengthunit" id="lengthunit" required="required">
205
                                        <option value=""> Choose </option>
206
                                        [% SET units = 'days' %]
207
                                        [% IF category %]
208
                                            [% SET default_privacy = category.default_privacy %]
209
                                        [% END %]
210
211
                                        [% SWITCH units %]
212
                                        [% CASE 'days' %]
213
                                            <option value="days" selected="selected">Days</option>
214
                                            <option value="hours">Hours</option>
215
                                        [% CASE 'hours' %]
216
                                            <option value="days">Days</option>
217
                                            <option value="hours" selected="selected">Hours</option>
218
                                        [% END %]
219
                                    </select>
220
                                    <span class="required">Required</span>
221
                                </li>
222
                                <li>
223
                                    <label for="renewalsallowed" class="required">Renewals allowed: </label>
224
                                    <input type="text" inputmode="numeric" pattern="[0-9]*" name="renewalsallowed" id="renewalsallowed" size="10" value="10" class="required" required="required" />
225
                                    <span class="required">Required</span>
226
                                </li>
227
228
                                <li>
229
                                    <label for="renewalperiod" class="required">Renewals period: </label>
230
                                    <input type="text" inputmode="numeric" pattern="[0-9]*" name="renewalperiod" id="renewalperiod" size="10" value="14" class="required" required="required" />
231
                                    <span class="required">Required</span>
232
                                </li>
233
234
                                <li>
235
                                    <label for="reservesallowed">Holds allowed (total): </label>
236
                                    <input type="text" inputmode="numeric" pattern="[0-9]*" name="reservesallowed" id="reservesallowed" size="10" value="10" />
237
                                </li>
238
239
                                <li>
240
                                    <label for="holds_per_day">Holds allowed (daily): </label>
241
                                    <input type="text" inputmode="numeric" pattern="[0-9]*" name="holds_per_day" id="holds_per_day" size="10" value="10" />
242
                                </li>
243
244
                                <li>
245
                                    <label for="holds_per_record">Holds per record (count): </label>
246
                                    <input type="text" inputmode="numeric" pattern="[0-9]*" name="holds_per_record" id="holds_per_record" size="10" value="1" />
247
                                </li>
248
249
                                <li>
250
                                    <label for="onshelfholds">On shelf holds allowed: </label>
251
                                    <select name="onshelfholds" id="onshelfholds" required="required">
252
                                        <option value="">Choose</option>
253
                                        <option value="1" selected="selected">Yes</option>
254
                                        <option value="0">If any unavailable</option>
255
                                        <option value="2">If all unavailable</option>
256
                                    </select>
257
                                </li>
258
                            </ol>
259
                            <p>
260
                                To create circulation rule, go to:
261
                                <span class="breadcrumbs">Administration &rsaquo; Circulation and fine rules </span>
262
                            </p>
263
>>>>>>> Bug 31736: Editing 'All' to 'All libraries'
149
264
150
                            <li>
265
                            <li>
151
                                <label for="holds_per_record">Holds per record (count): </label>
266
                                <label for="holds_per_record">Holds per record (count): </label>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt (-1 / +1 lines)
Lines 107-113 Link Here
107
                <li>
107
                <li>
108
                    <label>Transaction library</label>
108
                    <label>Transaction library</label>
109
                    <select name="branch" id="branch">
109
                    <select name="branch" id="branch">
110
                        <option value="ALL">All</option>
110
                        <option value="ALL">All libraries/branches</option>
111
                        [% FOREACH branchloo IN branchloop %]
111
                        [% FOREACH branchloo IN branchloop %]
112
                            [% IF ( branchloo.selected ) %]
112
                            [% IF ( branchloo.selected ) %]
113
                                <option value="[% branchloo.branchcode | html %]" selected="selected">[% branchloo.branchname | html %]</option>
113
                                <option value="[% branchloo.branchcode | html %]" selected="selected">[% branchloo.branchname | html %]</option>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/itemslost.tt (-1 / +1 lines)
Lines 143-149 Link Here
143
                    <li
143
                    <li
144
                        ><label for="branchfilter">Library: </label
144
                        ><label for="branchfilter">Library: </label
145
                        ><select name="branchfilter" id="branchfilter">
145
                        ><select name="branchfilter" id="branchfilter">
146
                            <option value="">All</option>
146
                            <option value="">All libraries/branches</option>
147
                            [% PROCESS options_for_libraries libraries => Branches.all() %]
147
                            [% PROCESS options_for_libraries libraries => Branches.all() %]
148
                        </select></li
148
                        </select></li
149
                    >
149
                    >
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tt (-2 / +1 lines)
Lines 46-52 Link Here
46
                        <li
46
                        <li
47
                            ><label for="branch">Library:</label>
47
                            ><label for="branch">Library:</label>
48
                            <select id="branch" name="branch">
48
                            <select id="branch" name="branch">
49
                                <option value="">All</option>
49
                                <option value="">All libraries/branches</option>
50
                                [% PROCESS options_for_libraries libraries => Branches.all( selected => branch ) %]
50
                                [% PROCESS options_for_libraries libraries => Branches.all( selected => branch ) %]
51
                            </select>
51
                            </select>
52
                        </li>
52
                        </li>
53
- 

Return to bug 31736