Attachment #127196 for bug #29015

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

Lines 228-233 aside { Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss (+5 lines)
228	margin-right: 3px;	228	margin-right: 3px;
229	width: calc(100% - 20px);	229	width: calc(100% - 20px);
230	}	230	}
		231
		232	&+.action {
		233	margin-left: 0;
		234	padding: 0;
		235	}
231	}	236	}
232	}	237	}
233	}	238	}




            <main>
                <div class="row">

                [% IF ( total || Koha.Preference('CircSidebar') ) %]
                    <div class="col-sm-10 col-sm-push-2">
                [% ELSE %]
                    <div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">

	[% END %] 
	[% END %]

                        [% UNLESS ( total ) %]
                            [% PROCESS filter_form %]
                        [% END %]
	<ol>
        <li>
            <label for="branchlimit">Library: </label>
            <select name="branchlimit" id="branchlimit">
                <option value="">All</option>
                [% PROCESS options_for_libraries libraries => Branches.all( only_from_group => 1 ) %]
            </select>
        </li>
        <li>
            <label for="itemtypeslimit">Item type: </label>
            <select name="itemtypeslimit" id="itemtypeslimit">
                <option value="">All</option>
                [% PROCESS options_for_item_types itemtypes => ItemTypes.Get() %]
            </select>
        </li>
        <li>
            <label for="ccodeslimit">Collection code: </label>
            <select name="ccodeslimit" id="ccodeslimit">
                <option value="">All</option>
                [% PROCESS options_for_authorised_values authorised_values => AuthorisedValues.GetAuthValueDropbox( 'CCODE' ) %]
            </select>
        </li>
        <li>
            <label for="locationsslimit">Shelving location: </label>
            <select name="locationslimit" id="ccodeslimit">
                <option value="">All</option>
                [% PROCESS options_for_authorised_values authorised_values => AuthorisedValues.GetAuthValueDropbox( 'LOC' ) %]
            </select>
        </li>
    </ol></fieldset>
    <fieldset class="action">    <input type="submit" value="Submit" />
        <input type="hidden" name="run_report" value="1" /></fieldset>
</form>
[% END %]

                    </div> <!-- /.col-sm-10.col-sm-push-2 -->
                    [% IF ( total || Koha.Preference('CircSidebar') ) %]
                        <div class="col-sm-2 col-sm-pull-10">
                            <aside>
                                [% IF ( total ) %]
                                    [% PROCESS filter_form %]
                                [% END %]
                                [% IF Koha.Preference('CircSidebar') %]
                                    [% INCLUDE 'circ-nav.inc' %]
                                [% END %]
                            </aside>
                        </div> <!-- /.col-sm-2.col-sm-pull-10 -->
                    [% END %]
                </div> <!-- /.row -->

            </main>
        </div> <!-- /.col-sm-12 -->
    </div> <!-- /.row -->

[% BLOCK filter_form %]
    <form name="f" action="/cgi-bin/koha/circ/view_holdsqueue.pl">
        [% IF ( total ) %]
            <fieldset class="brief">
        [% ELSE -%]
            <fieldset class="rows">
        [% END %]
            <ol>
                <li>
                    <label for="branchlimit">Library: </label>
                    <select name="branchlimit" id="branchlimit">
                        <option value="">All</option>
                        [% PROCESS options_for_libraries libraries => Branches.all( selected => branchlimit, only_from_group => 1 ) %]
                    </select>
                </li>
                <li>
                    <label for="itemtypeslimit">Item type: </label>
                    <select name="itemtypeslimit" id="itemtypeslimit">
                        <option value="">All</option>
                        [% PROCESS options_for_item_types itemtypes => ItemTypes.Get(), selected_itemtype => itemtypeslimit %]
                    </select>
                </li>
                <li>
                    <label for="ccodeslimit">Collection code: </label>
                    <select name="ccodeslimit" id="ccodeslimit">
                        <option value="">All</option>
                        [% PROCESS options_for_authorised_values authorised_values => AuthorisedValues.GetAuthValueDropbox( 'CCODE' ), selected_av => ccodeslimit %]
                    </select>
                </li>
                <li>
                    <label for="locationsslimit">Shelving location: </label>
                    <select name="locationslimit" id="locationslimit">
                        <option value="">All</option>
                        [% PROCESS options_for_authorised_values authorised_values => AuthorisedValues.GetAuthValueDropbox( 'LOC' ), selected_av => locationslimit %]
                    </select>
                </li>
            </ol>
        </fieldset>
        <fieldset class="action">
            <input type="submit" value="Submit" />
            <input type="hidden" name="run_report" value="1" />
        </fieldset>
    </form>
[% END %]

[% MACRO jsinclude BLOCK %]
    [% INCLUDE 'datatables.inc' %]
    [% INCLUDE 'columns_settings.inc' %]
- 

Return to bug 29015

Lines 53-59 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/view_holdsqueue.tt (-46 / +61 lines)
53	<main>	53	<main>
54	<div class="row">	54	<div class="row">
55		55
56	[% IF Koha.Preference('CircSidebar') %]	56	[% IF ( total \|\| Koha.Preference('CircSidebar') ) %]
57	<div class="col-sm-10 col-sm-push-2">	57	<div class="col-sm-10 col-sm-push-2">
58	[% ELSE %]	58	[% ELSE %]
59	<div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">	59	<div class="col-md-10 col-md-offset-1 col-lg-8 col-lg-offset-2">
Lines 202-259 Link Here
202	[% END %]	202	[% END %]
203	[% END %]	203	[% END %]
204		204
205	[% UNLESS ( total ) %]	205	[% UNLESS ( total ) %]
206	<form name="f" action="/cgi-bin/koha/circ/view_holdsqueue.pl">	206	[% PROCESS filter_form %]
207	<fieldset class="rows">	207	[% END %]
208	<ol>
209	<li>
210	<label for="branchlimit">Library: </label>
211	<select name="branchlimit" id="branchlimit">
212	<option value="">All</option>
213	[% PROCESS options_for_libraries libraries => Branches.all( only_from_group => 1 ) %]
214	</select>
215	</li>
216	<li>
217	<label for="itemtypeslimit">Item type: </label>
218	<select name="itemtypeslimit" id="itemtypeslimit">
219	<option value="">All</option>
220	[% PROCESS options_for_item_types itemtypes => ItemTypes.Get() %]
221	</select>
222	</li>
223	<li>
224	<label for="ccodeslimit">Collection code: </label>
225	<select name="ccodeslimit" id="ccodeslimit">
226	<option value="">All</option>
227	[% PROCESS options_for_authorised_values authorised_values => AuthorisedValues.GetAuthValueDropbox( 'CCODE' ) %]
228	</select>
229	</li>
230	<li>
231	<label for="locationsslimit">Shelving location: </label>
232	<select name="locationslimit" id="ccodeslimit">
233	<option value="">All</option>
234	[% PROCESS options_for_authorised_values authorised_values => AuthorisedValues.GetAuthValueDropbox( 'LOC' ) %]
235	</select>
236	</li>
237	</ol></fieldset>
238	<fieldset class="action"> <input type="submit" value="Submit" />
239	<input type="hidden" name="run_report" value="1" /></fieldset>
240	</form>
241	[% END %]
242		208
243	[% IF Koha.Preference('CircSidebar') %]	209	</div> <!-- /.col-sm-10.col-sm-push-2 -->
244	</div> <!-- /.col-sm-10.col-sm-push-2 -->	210	[% IF ( total \|\| Koha.Preference('CircSidebar') ) %]
245	<div class="col-sm-2 col-sm-pull-10">	211	<div class="col-sm-2 col-sm-pull-10">
246	<aside>	212	<aside>
		213	[% IF ( total ) %]
		214	[% PROCESS filter_form %]
		215	[% END %]
		216	[% IF Koha.Preference('CircSidebar') %]
247	[% INCLUDE 'circ-nav.inc' %]	217	[% INCLUDE 'circ-nav.inc' %]
248	</aside>	218	[% END %]
249	</div> <!-- /.col-sm-2.col-sm-pull-10 -->	219	</aside>
250	</div> <!-- /.row -->	220	</div> <!-- /.col-sm-2.col-sm-pull-10 -->
251	[% END %]	221	[% END %]
		222	</div> <!-- /.row -->
252		223
253	</main>	224	</main>
254	</div> <!-- /.col-sm-12 -->	225	</div> <!-- /.col-sm-12 -->
255	</div> <!-- /.row -->	226	</div> <!-- /.row -->
256		227
		228	[% BLOCK filter_form %]
		229	<form name="f" action="/cgi-bin/koha/circ/view_holdsqueue.pl">
		230	[% IF ( total ) %]
		231	<fieldset class="brief">
		232	[% ELSE -%]
		233	<fieldset class="rows">
		234	[% END %]
		235	<ol>
		236	<li>
		237	<label for="branchlimit">Library: </label>
		238	<select name="branchlimit" id="branchlimit">
		239	<option value="">All</option>
		240	[% PROCESS options_for_libraries libraries => Branches.all( selected => branchlimit, only_from_group => 1 ) %]
		241	</select>
		242	</li>
		243	<li>
		244	<label for="itemtypeslimit">Item type: </label>
		245	<select name="itemtypeslimit" id="itemtypeslimit">
		246	<option value="">All</option>
		247	[% PROCESS options_for_item_types itemtypes => ItemTypes.Get(), selected_itemtype => itemtypeslimit %]
		248	</select>
		249	</li>
		250	<li>
		251	<label for="ccodeslimit">Collection code: </label>
		252	<select name="ccodeslimit" id="ccodeslimit">
		253	<option value="">All</option>
		254	[% PROCESS options_for_authorised_values authorised_values => AuthorisedValues.GetAuthValueDropbox( 'CCODE' ), selected_av => ccodeslimit %]
		255	</select>
		256	</li>
		257	<li>
		258	<label for="locationsslimit">Shelving location: </label>
		259	<select name="locationslimit" id="locationslimit">
		260	<option value="">All</option>
		261	[% PROCESS options_for_authorised_values authorised_values => AuthorisedValues.GetAuthValueDropbox( 'LOC' ), selected_av => locationslimit %]
		262	</select>
		263	</li>
		264	</ol>
		265	</fieldset>
		266	<fieldset class="action">
		267	<input type="submit" value="Submit" />
		268	<input type="hidden" name="run_report" value="1" />
		269	</fieldset>
		270	</form>
		271	[% END %]
		272
257	[% MACRO jsinclude BLOCK %]	273	[% MACRO jsinclude BLOCK %]
258	[% INCLUDE 'datatables.inc' %]	274	[% INCLUDE 'datatables.inc' %]
259	[% INCLUDE 'columns_settings.inc' %]	275	[% INCLUDE 'columns_settings.inc' %]
260	-