From dd2d09f8cc09c09a4b34925dbe7e7692fb1da4be Mon Sep 17 00:00:00 2001 From: Jesse Weaver Date: Thu, 14 Aug 2008 13:08:47 -0500 Subject: [PATCH] Fix for bug 2155: duplicate checkin box on returns screen This changes some css and markup to make the return box at the top not show when one is on the checkin screen. It also moves the markup for the autocompleting search box to its own file. Signed-off-by: Galen Charlton --- .../prog/en/css/staff-global.css | 3 +- .../prog/en/includes/cataloging-search.inc | 70 +--------------- .../prog/en/includes/checkin-search.inc | 79 +------------------ .../prog/en/includes/circ-search.inc | 67 +--------------- .../en/includes/currencies-admin-search.inc | 67 +--------------- .../prog/en/includes/letters-search.inc | 67 +--------------- .../prog/en/includes/patron-search-box.inc | 66 ++++++++++++++++ .../prog/en/includes/patrons-admin-search.inc | 67 +--------------- .../en/includes/printers-admin-search.inc | 68 +--------------- .../prog/en/includes/serials-search.inc | 68 +--------------- .../en/includes/stopwords-admin-search.inc | 67 +--------------- .../en/includes/sysprefs-admin-search.inc | 67 +--------------- 12 files changed, 78 insertions(+), 678 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/patron-search-box.inc 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 3f825dc2bc..cad023413c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css +++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css @@ -1581,13 +1581,12 @@ span.permissiondesc { } /* autocomplete additions */ #borrowerautocomplete { width: 450px; text-align:left;} /* z-index needed on top instances for ie & sf absolute inside relative issue */ -.autocomplete { width:130px; }/* set width of widget here*/ .autocomplete .yui-ac-highlight , .autocomplete .yui-ac-highlight .sample-result, .autocomplete .yui-ac-highlight .sample-query { color:#FFF; } .autocomplete .sample-result { color: black; } .autocomplete .sample-query { color:#000; } -#findborrower { position:static; width:335px; } +#findborrower { position:static; width:auto; } #yborrowercontainer { text-align:left;width:335px; } #mainuserblock { border : 1px solid #E8E8E8; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc index 3126af2b79..6d07dd1c18 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc @@ -1,49 +1,5 @@

- - \ No newline at end of file + diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc index 0c04e8fde7..d455649e2a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/checkin-search.inc @@ -1,83 +1,7 @@

- -