From 5389a8714ecd5d68875596619ff544cbc73c8c23 Mon Sep 17 00:00:00 2001 From: dbs Date: Tue, 7 Oct 2008 02:20:50 +0000 Subject: [PATCH] Integrate language picker into SlimPAC start/advanced search forms git-svn-id: svn://svn.open-ils.org/ILS/trunk@10771 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/examples/apache/eg_vhost.conf | 7 ++-- Open-ILS/src/extras/locale_html_options.pl | 10 +----- .../web/opac/extras/slimpac/advanced.html | 32 +++++++++++++------ Open-ILS/web/opac/extras/slimpac/start.html | 23 ++++++++----- 4 files changed, 43 insertions(+), 29 deletions(-) diff --git a/Open-ILS/examples/apache/eg_vhost.conf b/Open-ILS/examples/apache/eg_vhost.conf index b529f32fc2..f14d3d703f 100644 --- a/Open-ILS/examples/apache/eg_vhost.conf +++ b/Open-ILS/examples/apache/eg_vhost.conf @@ -83,10 +83,13 @@ RewriteRule ^/opac/extras/ac/jacket/(small|medium|large)/$ \ AddType application/xhtml+xml .xml - +RewriteEngine ON +RewriteCond %{QUERY_STRING} locale=([^&]*) +RewriteRule ^/opac/[^/]+/extras/slimpac/(.*)$ /opac/%1/extras/slimpac/$1? [redirect] + AddOutputFilter INCLUDES;XMLENT .html - + # ---------------------------------------------------------------------------------- # Run server-side XUL and XHTML through xmlent to load the correct XML entities # ---------------------------------------------------------------------------------- diff --git a/Open-ILS/src/extras/locale_html_options.pl b/Open-ILS/src/extras/locale_html_options.pl index 705ee3ed9d..0c1405e4bc 100755 --- a/Open-ILS/src/extras/locale_html_options.pl +++ b/Open-ILS/src/extras/locale_html_options.pl @@ -27,18 +27,10 @@ close FILE; sub print_option { my $locales = shift; - my $count = 0; - my $class; foreach my $locale (@$locales) { my $code = OpenILS::Application::AppUtils->entityize($locale->code); my $name = OpenILS::Application::AppUtils->entityize($locale->name); - if ($count % 2) { - $class = 'greenrow'; - } else { - $class = 'bluerow'; - } - print FILE "

\n"; - $count++; + print FILE "\n"; } } diff --git a/Open-ILS/web/opac/extras/slimpac/advanced.html b/Open-ILS/web/opac/extras/slimpac/advanced.html index 684336144c..40cc62eb6c 100644 --- a/Open-ILS/web/opac/extras/slimpac/advanced.html +++ b/Open-ILS/web/opac/extras/slimpac/advanced.html @@ -15,17 +15,24 @@ border: 3px solid #A7EA9D; -moz-border-radius: 6px; padding: 6px; - margin-top: 65px;' + margin-top: 65px; } .greenrow { border: 1px solid #D0D0D0; background: #A7EA9D; + height: 20px; } .bluerow { border: 1px solid #D0D0D0; background: #E0F6E0; + height: 20px; + } + + .search_field { + width: 100%; + text-align: center; } .rowpad { @@ -80,12 +87,12 @@ -

+ --> + + + + + + + +

&opac.navigate.advanced;

&slimpac.start.nowSearching;	@@ -163,11 +170,22 @@


+ + + + +

- -

@@ -184,12 +202,6 @@ | - - &slimpac.language.select; - - - | - &footer.find.library; diff --git a/Open-ILS/web/opac/extras/slimpac/start.html b/Open-ILS/web/opac/extras/slimpac/start.html index 2e6abc6419..12cc610f85 100644 --- a/Open-ILS/web/opac/extras/slimpac/start.html +++ b/Open-ILS/web/opac/extras/slimpac/start.html @@ -21,11 +21,13 @@ .greenrow { border: 1px solid #D0D0D0; background: #A7EA9D; + height: 20px; } .bluerow { border: 1px solid #D0D0D0; background: #E0F6E0; + height: 20px; } .rowpad { @@ -81,7 +83,6 @@ -