From 96ca48cbf9213aa6953dbe855ebbd6d765720513 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 16 May 2011 15:42:12 -0400 Subject: [PATCH] [SIGNED-OFF] Follow-up fix for Bug 6170 'More options' in advanced search broken Content-Type: text/plain; charset="utf-8" Simplifying markup in the staff client advanced search: - Moving IDs to fieldsets and removing redundant divs - Removing unused section - Adding missing IDs and fieldsets Signed-off-by: Katrin Fischer --- .../intranet-tmpl/prog/en/css/staff-global.css | 33 +++++- .../prog/en/modules/catalogue/advsearch.tt | 132 ++++++-------------- 2 files changed, 68 insertions(+), 97 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css index c211507..d1dffa8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -1988,4 +1988,35 @@ fieldset.rows+h3 {clear:both;padding-top:.5em;} .importing .importing_msg { padding-left: 10px; padding-bottom: 10px; -} \ No newline at end of file +} + +#advanced-search fieldset { + border : 1px solid #EEE; + -moz-border-radius : 3px; + border-radius : 3px; +} + +#advanced-search fieldset.action { + border : 0; +} + +#advanced-search fieldset fieldset { + border : 1px solid #EEE; + margin : 0; + padding : .3em .5em; + -moz-border-radius : 0; + border-radius : 0; +} +#advanced-search fieldset fieldset+fieldset { + border-top : 0; +} +#advanced-search table { + border-spacing : 5px; + border-collapse : separate; + border-width : 0; +} +#advanced-search td { + border : 1px solid #EEE; + padding : 0.3em 0.4em; +} + \ No newline at end of file diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt index bfa5179..7e6b5ad 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt @@ -43,8 +43,8 @@ [% IF ( outer_servers_loop ) %] -
- Select remote databases: +
+ Select remote databases [% FOREACH outer_servers_loo IN outer_servers_loop %] [% IF ( outer_servers_loo.checked ) %][% ELSE %][% END %] @@ -54,8 +54,8 @@ [% END %] -
- Search For: +
+ Search For [% FOREACH search_box IN search_boxes_loop %] [% IF ( search_boxes_label ) %]
[% ELSE %]
[% END %] [% IF ( expanded_options ) %] @@ -74,7 +74,7 @@ [+] [% END %] [% IF ( search_box.scan_index ) %] - + [% END %] [% END %]
@@ -83,20 +83,19 @@ -

+

[% IF ( expanded_options ) %] [Fewer Options] [% ELSE %] [More options] [% END %] [New search] -

+
-
-
- Limit to any of the following: +
+ Limit to any of the following [% FOREACH itemtypeloo IN itemtypeloop %] @@ -113,23 +112,21 @@
-
[% IF ( expanded_options ) %] -
-
- Limits: -
+
+ Limits +

-   (format: yyyy-yyyy)

+   (format: yyyy-yyyy)

-
-
+
+

- [% FOREACH search_languages_loo IN search_languages_loop %] [% IF ( search_languages_loo.selected ) %] @@ -141,20 +138,18 @@ [% END %]

-
+
- [% END %] [% IF ( UNIMARC ) %] [% INCLUDE 'subtypes_unimarc.inc' %] [% ELSE %] -
-
- Subtype limits:

+

+ Subtype limits

- - - - - - - - - - - - - - - - - - - - - - - - - - + +

Location and availability +
+

-
-[% END %] - -
- -
Location and availability: -
- -
-

-

- [% FOREACH branchloo IN branchloop %] [% IF ( branchloo.selected ) %] @@ -288,47 +233,42 @@ [% END %] [% END %] - +

[% IF ( searchdomainloop ) %]

OR

- [% FOREACH searchdomainloo IN searchdomainloop %] [% END %] - +

[% END %] -
+
- - -
-
Sort by: -

[% INCLUDE 'resort_form.inc' %]

-
- - - - + -

+

[% IF ( expanded_options ) %] [Fewer Options] [% ELSE %] [More options] [% END %] [New search] -

+
+ -- 1.7.4.1