Attachment #88078 for bug #21308

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

Lines 10-16 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/filter-orders.inc (-1 / +1 lines)
10	<li><label for="name">Vendor: </label> <input type="text" name="name" id="name" value="[% filters.name \| html %]" /></li>	10	<li><label for="name">Vendor: </label> <input type="text" name="name" id="name" value="[% filters.name \| html %]" /></li>
11	<li><label for="basket">Basket: </label> <input type="text" name="basket" id="basket" value="[% filters.basket \| html %]" /></li>	11	<li><label for="basket">Basket: </label> <input type="text" name="basket" id="basket" value="[% filters.basket \| html %]" /></li>
12	<li><label for="basket_creators">Basket created by: </label>	12	<li><label for="basket_creators">Basket created by: </label>
13	<input autocomplete="off" id="find_patron" type="text" style="width:150px" class="noEnterSubmit" />	13	<input autocomplete="off" id="find_patron" type="text" class="noEnterSubmit" />
14	<div>	14	<div>
15	<div id="basket_creators" style="float:left;"></div>	15	<div id="basket_creators" style="float:left;"></div>
16	</div>	16	</div>




    <div class="row">
        <div class="col-sm-10 col-sm-push-2">
            <main>
                [% IF !order_loop && search_done %]
                    <div class="dialog message">
                        Your search returned no results.
                    </div>
                [% END %]

                [% UNLESS ( order_loop ) %]
                    [% PROCESS filter_form context => "main" %]
                [% END %]


[% UNLESS ( order_loop ) %]<form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
<fieldset class="rows">
    <legend>Search orders</legend>
    [% INCLUDE 'filter-orders.inc' %]
</fieldset>
    <input type="hidden" name="do_search" value="1" />
	<fieldset class="action"><input type="submit" value="Search" /></fieldset>
	</form>[% END %]
    [% IF ( order_loop ) %]<h1>Search results</h1>
	<div id="acqui_histsearch">
        <table id="histsearcht">

            </tbody>
        </table>
    </div>
    [% ELSIF search_done %]
      There is no order for this search.
    [% END %]

</main>


<div class="col-sm-2 col-sm-pull-10">
    <aside>
        [% IF ( order_loop ) %]
            [% PROCESS filter_form context => "sidebar" %]
        [% END %]
        [% INCLUDE 'acquisitions-menu.inc' %]
    </aside>
</div> <!-- /.col-sm-2.col-sm-pull-10 -->

                "sPaginationType": "four_button"
            }, columns_settings );

            patron_autocomplete({
                patron_container: $("#basket_creators"),
                input_autocomplete: $("#find_patron"),
                patron_input_name: 'created_by',
                field_to_retrieve: 'borrowernumber'
            });
                });
            [% END %]
        });
    </script>
[% END %]

[% BLOCK filter_form %]
    <form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
        [% IF ( context == "sidebar" ) %]
            <fieldset class="brief">
                <h4>Search orders</h4>
        [% ELSE %]
            <fieldset class="rows">
                <legend>Search orders</legend>
        [% END %]
            [% INCLUDE 'filter-orders.inc' %]
        </fieldset>
        <input type="hidden" name="do_search" value="1" />
        <fieldset class="action"><input type="submit" value="Search" /></fieldset>
    </form>
[% END %]

[% INCLUDE 'intranet-bottom.inc' %]
- 

Return to bug 21308

Lines 18-32 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt (-19 / +35 lines)
18	<div class="row">	18	<div class="row">
19	<div class="col-sm-10 col-sm-push-2">	19	<div class="col-sm-10 col-sm-push-2">
20	<main>	20	<main>
		21	[% IF !order_loop && search_done %]
		22	<div class="dialog message">
		23	Your search returned no results.
		24	</div>
		25	[% END %]
		26
		27	[% UNLESS ( order_loop ) %]
		28	[% PROCESS filter_form context => "main" %]
		29	[% END %]
		30
21		31
22	[% UNLESS ( order_loop ) %]<form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
23	<fieldset class="rows">
24	<legend>Search orders</legend>
25	[% INCLUDE 'filter-orders.inc' %]
26	</fieldset>
27	<input type="hidden" name="do_search" value="1" />
28	<fieldset class="action"><input type="submit" value="Search" /></fieldset>
29	</form>[% END %]
30	[% IF ( order_loop ) %]<h1>Search results</h1>	32	[% IF ( order_loop ) %]<h1>Search results</h1>
31	<div id="acqui_histsearch">	33	<div id="acqui_histsearch">
32	<table id="histsearcht">	34	<table id="histsearcht">
Lines 101-108 Link Here
101	</tbody>	103	</tbody>
102	</table>	104	</table>
103	</div>	105	</div>
104	[% ELSIF search_done %]
105	There is no order for this search.
106	[% END %]	106	[% END %]
107		107
108	</main>	108	</main>
Lines 110-115 Link Here
110		110
111	<div class="col-sm-2 col-sm-pull-10">	111	<div class="col-sm-2 col-sm-pull-10">
112	<aside>	112	<aside>
		113	[% IF ( order_loop ) %]
		114	[% PROCESS filter_form context => "sidebar" %]
		115	[% END %]
113	[% INCLUDE 'acquisitions-menu.inc' %]	116	[% INCLUDE 'acquisitions-menu.inc' %]
114	</aside>	117	</aside>
115	</div> <!-- /.col-sm-2.col-sm-pull-10 -->	118	</div> <!-- /.col-sm-2.col-sm-pull-10 -->
Lines 133-148 Link Here
133	"sPaginationType": "four_button"	136	"sPaginationType": "four_button"
134	}, columns_settings );	137	}, columns_settings );
135		138
136	[% UNLESS order_loop %]	139	patron_autocomplete({
137	patron_autocomplete({	140	patron_container: $("#basket_creators"),
138	patron_container: $("#basket_creators"),	141	input_autocomplete: $("#find_patron"),
139	input_autocomplete: $("#find_patron"),	142	patron_input_name: 'created_by',
140	patron_input_name: 'created_by',	143	field_to_retrieve: 'borrowernumber'
141	field_to_retrieve: 'borrowernumber'	144	});
142	});
143	[% END %]
144	});	145	});
145	</script>	146	</script>
146	[% END %]	147	[% END %]
147		148
		149	[% BLOCK filter_form %]
		150	<form action="/cgi-bin/koha/acqui/histsearch.pl" method="post">
		151	[% IF ( context == "sidebar" ) %]
		152	<fieldset class="brief">
		153	<h4>Search orders</h4>
		154	[% ELSE %]
		155	<fieldset class="rows">
		156	<legend>Search orders</legend>
		157	[% END %]
		158	[% INCLUDE 'filter-orders.inc' %]
		159	</fieldset>
		160	<input type="hidden" name="do_search" value="1" />
		161	<fieldset class="action"><input type="submit" value="Search" /></fieldset>
		162	</form>
		163	[% END %]
		164
148	[% INCLUDE 'intranet-bottom.inc' %]	165	[% INCLUDE 'intranet-bottom.inc' %]
149	-