@@ -, +, @@ Acquisitions part 2 - I don't have EDI set up, so to test acqui/edi_ean.tt I navigate directly to /cgi-bin/koha/acqui/edi_ean.pl. It's only the page structure we're worried about. - Acquisitions -> Orders search - Acquisitions -> Vendor -> Invoices -> Invoice search - View an invoice - Manage invoice files (Preference AcqEnableFiles must be enabled). - Acquisitions -> Late orders --- koha-tmpl/intranet-tmpl/prog/css/staff-global.css | 44 +++++++++++++++------- .../intranet-tmpl/prog/en/modules/acqui/edi_ean.tt | 23 ++++++----- .../prog/en/modules/acqui/histsearch.tt | 26 +++++++------ .../prog/en/modules/acqui/invoice-files.tt | 25 ++++++------ .../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 33 +++++++++------- .../prog/en/modules/acqui/invoices.tt | 25 ++++++------ .../prog/en/modules/acqui/lateorders.tt | 26 +++++++------ 7 files changed, 119 insertions(+), 83 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css +++ a/koha-tmpl/intranet-tmpl/prog/css/staff-global.css @@ -469,7 +469,8 @@ div#reserves,div#checkouts { } -div.yui-b h5 { +div.yui-b h5, +aside h5 { font-size : 100%; margin : .5em 0; } @@ -618,47 +619,64 @@ fieldset.rows div.hint { margin-left : 7.5em; } -div.yui-b fieldset.brief { - padding : .4em .7em; +div.yui-b fieldset.brief, +aside fieldset.brief { + margin: 0; + padding : .4em .7em; } -div.yui-b fieldset.brief ol { +div.yui-b fieldset.brief ol, +aside fieldset.brief ol { font-size : 85%; margin : 0; padding : 0; } div.yui-b fieldset.brief select, -div.yui-b fieldset.brief input[type=text] { +div.yui-b fieldset.brief input[type=text], +aside fieldset.brief select, +aside fieldset.brief input[type=text] { width: 100%; } -div.yui-b fieldset.brief li.radio { +div.yui-b fieldset.brief li.radio, +aside fieldset.brief li.radio { padding : .7em 0; } + div.yui-b fieldset.brief li.radio label, div.yui-b fieldset.brief li.checkbox label, div.yui-b fieldset.brief li.dateinsert label, div.yui-b fieldset.brief li.dateinsert span.label, -div.yui-b fieldset.brief li.radio span.label { +div.yui-b fieldset.brief li.radio span.label, +aside fieldset.brief li.radio label, +aside fieldset.brief li.checkbox label, +aside fieldset.brief li.dateinsert label, +aside fieldset.brief li.dateinsert span.label, +aside fieldset.brief li.radio span.label { display : inline; } -div.yui-b fieldset.brief li.radio input { +div.yui-b fieldset.brief li.radio input, +aside fieldset.brief li.radio input { padding:0.3em 0; } -div.yui-b fieldset.brief fieldset { - margin : 0 .3em; - padding : .5em; +div.yui-b fieldset.brief fieldset, +aside fieldset.brief fieldset { + margin : 0; + padding : .5em 0; } -div.yui-b fieldset.brief fieldset legend { +div.yui-b fieldset.brief fieldset legend, +aside fieldset.brief fieldset legend { font-size : 85%; } #yui-main div.yui-b fieldset.brief select, -#yui-main div.yui-b fieldset.brief input[type=text] { +#yui-main div.yui-b fieldset.brief input[type=text], +main div.yui-b fieldset.brief select, +main div.yui-b fieldset.brief input[type=text] { width: auto; } --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/edi_ean.tt @@ -9,11 +9,10 @@ -
- -
-
-
+
+
+
+

Select the library account submitting the EDI order


@@ -30,10 +29,14 @@

+
+
+ +
+ +
-
-
-[% INCLUDE 'acquisitions-menu.inc' %] -
-
+ [% INCLUDE 'intranet-bottom.inc' %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt @@ -14,12 +14,11 @@ -
- -
-
-
- +
+
+
+
+ [% UNLESS ( order_loop ) %]
Search orders @@ -200,11 +199,14 @@ There is no order for this search. [% END %] -
-
-
-[% INCLUDE 'acquisitions-menu.inc' %] -
+ +
+ +
+ +
[% MACRO jsinclude BLOCK %] @@ -213,7 +215,7 @@ [% INCLUDE 'datatables.inc' %] [% INCLUDE 'columns_settings.inc' %] [% Asset.js("js/autocomplete/patrons.js") %] -