@@ -, +, @@ --- koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc | 7 +- .../opac-tmpl/prog/en/modules/opac-advsearch.tt | 89 ++++++++++++++------ 2 files changed, 69 insertions(+), 27 deletions(-) --- a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc +++ a/koha-tmpl/opac-tmpl/prog/en/includes/masthead.inc @@ -145,7 +145,7 @@ No public lists [% END %] [% IF ( opacuserlogin ) %] -

Your lists

+

Your lists

[% IF ( loggedinusername ) %] [% IF ( barshelves ) %] [% END %] [% ELSE %] @@ -165,6 +165,7 @@ [% END %] + [% END %]
@@ -173,7 +174,7 @@ [% IF ( searchdesc ) %]

[% IF ( total ) %]

Your search returned [% total |html %] results.

[% IF ( related ) %] (related searches: [% FOREACH relate IN related %][% relate.related_search %][% END %]). [% END %] Subscribe to this search [% ELSE %] -No results found! +

No results found!

[% IF ( searchdesc ) %] No results found for that in [% LibraryName %] catalog. Subscribe to this search --- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt +++ a/koha-tmpl/opac-tmpl/prog/en/modules/opac-advsearch.tt @@ -55,17 +55,54 @@ [% FOREACH search_box IN search_boxes_loop %]

[% IF ( expanded_options ) %] + [% IF loop.index == 0 %] +                + [% END %] + [% IF ( search_box.boolean ) %] - + [% END %] + [% ELSE %] + [% END %] - [% IF ( expanded_options ) %][% left_content %][% END %] - + [% IF loop.index == 0 %] + + [% ELSIF loop.index == 1 %] + + [% IF ( expanded_options ) %] + + + + + [% END %] + [% ELSIF loop.index == 2 %] + + [% IF ( expanded_options ) %] + + + + + + + [% END %] + [% END %] + + [% IF loop.index != 0 %] + + [% END %] + [% IF ( expanded_options ) %] @@ -73,23 +110,27 @@ [% END %] - -[% IF ( expanded_options ) %] - - - - -[% END %] - + [% IF loop.index != 1 %] + + [% IF ( expanded_options ) %] + + + + + [% END %] + [% END %] -[% IF ( expanded_options ) %] - - - - - - -[% END %] + [% IF loop.index != 2 %] + + [% IF ( expanded_options ) %] + + + + + + + [% END %] + [% END %] [% IF ( expanded_options ) %] --