[open-ils-commits] r10771 - in trunk/Open-ILS: examples/apache
src/extras web/opac/extras/slimpac
svn at svn.open-ils.org
svn at svn.open-ils.org
Mon Oct 6 22:20:52 EDT 2008
Author: dbs
Date: 2008-10-06 22:20:50 -0400 (Mon, 06 Oct 2008)
New Revision: 10771
Modified:
trunk/Open-ILS/examples/apache/eg_vhost.conf
trunk/Open-ILS/src/extras/locale_html_options.pl
trunk/Open-ILS/web/opac/extras/slimpac/advanced.html
trunk/Open-ILS/web/opac/extras/slimpac/start.html
Log:
Integrate language picker into SlimPAC start/advanced search forms
Modified: trunk/Open-ILS/examples/apache/eg_vhost.conf
===================================================================
--- trunk/Open-ILS/examples/apache/eg_vhost.conf 2008-10-07 02:02:48 UTC (rev 10770)
+++ trunk/Open-ILS/examples/apache/eg_vhost.conf 2008-10-07 02:20:50 UTC (rev 10771)
@@ -83,10 +83,13 @@
AddType application/xhtml+xml .xml
</LocationMatch>
-<LocationMatch /opac/.*/extras/slimpac/>
+RewriteEngine ON
+RewriteCond %{QUERY_STRING} locale=([^&]*)
+RewriteRule ^/opac/[^/]+/extras/slimpac/(.*)$ /opac/%1/extras/slimpac/$1? [redirect]
+<LocationMatch /opac/[^/]+/extras/slimpac/>
AddOutputFilter INCLUDES;XMLENT .html
</LocationMatch>
-
+
# ----------------------------------------------------------------------------------
# Run server-side XUL and XHTML through xmlent to load the correct XML entities
# ----------------------------------------------------------------------------------
Modified: trunk/Open-ILS/src/extras/locale_html_options.pl
===================================================================
--- trunk/Open-ILS/src/extras/locale_html_options.pl 2008-10-07 02:02:48 UTC (rev 10770)
+++ trunk/Open-ILS/src/extras/locale_html_options.pl 2008-10-07 02:20:50 UTC (rev 10771)
@@ -27,18 +27,10 @@
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 "<p class='$class'><a href='/opac/$code/extras/slimpac/start.html'>$name</a></p>\n";
- $count++;
+ print FILE "<option value='$code'>$name</option>\n";
}
}
Modified: trunk/Open-ILS/web/opac/extras/slimpac/advanced.html
===================================================================
--- trunk/Open-ILS/web/opac/extras/slimpac/advanced.html 2008-10-07 02:02:48 UTC (rev 10770)
+++ trunk/Open-ILS/web/opac/extras/slimpac/advanced.html 2008-10-07 02:20:50 UTC (rev 10771)
@@ -15,19 +15,26 @@
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 {
height: 20px;
}
@@ -80,12 +87,12 @@
<body>
<center>
- <form method="GET" action="/opac/extras/opensearch/1.1/-/html-full">
<table class="maintable">
<tbody>
<tr><td colspan="2" align="center"><b>&opac.navigate.advanced;</b></td></tr>
<tr class="rowpad"><td></td></tr>
+ <form method="GET" action="/opac/extras/opensearch/1.1/-/html-full">
<tr class="bluerow">
<th>&slimpac.start.nowSearching;</th>
<td>
@@ -163,11 +170,22 @@
</tr>
-->
<tr class="rowpad"><td align="center" colspan="2"><input type="submit" value="&button.go;"/></td></tr>
+ </form>
+ <tr class="greenrow"><td colspan="2"></td></tr>
+ <form method="GET">
+ <tr class="bluerow">
+ <td colspan="2">
+ <div class='search_field'>
+ <!--#include file="locales.inc"-->
+ <input type="submit" value="&slimpac.language.select;"/>
+ </div>
+ </td>
+ </tr>
+ </form>
+
</tbody>
</table>
- </form>
-
<div class="footer">
<center>
<div class="footer_links">
@@ -185,12 +203,6 @@
<span> | </span>
<span class='footer_link'>
- <a class='classic_link' href='language.html'>&slimpac.language.select;</a>
- </span>
-
- <span> | </span>
-
- <span class='footer_link'>
<a target='_blank' class='classic_link' href='&footer.find.url;'>&footer.find.library;</a>
</span>
Modified: trunk/Open-ILS/web/opac/extras/slimpac/start.html
===================================================================
--- trunk/Open-ILS/web/opac/extras/slimpac/start.html 2008-10-07 02:02:48 UTC (rev 10770)
+++ trunk/Open-ILS/web/opac/extras/slimpac/start.html 2008-10-07 02:20:50 UTC (rev 10771)
@@ -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 @@
<body>
<center>
- <form method="GET" action="/opac/extras/opensearch/1.1/-/html-full">
<table class="maintable">
<tbody>
@@ -93,6 +94,7 @@
</td>
</tr>
<tr class="rowpad"><td></td></tr>
+ <form method="GET" action="/opac/extras/opensearch/1.1/-/html-full">
<tr class="bluerow">
<td>
<div class='search_field'>
@@ -122,11 +124,22 @@
</div>
</td>
</tr>
+ </form>
+ <tr class="bluerow"><td></td></tr>
+ <form method="GET">
+ <tr class="greenrow">
+ <td>
+ <div class='search_field'>
+ <!--#include file="locales.inc"-->
+ <input type="submit" value="&slimpac.language.select;"/>
+ </div>
+ </td>
+ </tr>
+ </form>
<tr class="rowpad"><td></td></tr>
</tbody>
</table>
- </form>
<div class="footer">
<center>
@@ -145,12 +158,6 @@
<span> | </span>
<span class='footer_link'>
- <a class='classic_link' href='language.html'>&slimpac.language.select;</a>
- </span>
-
- <span> | </span>
-
- <span class='footer_link'>
<a target='_blank' class='classic_link' href='&footer.find.url;'>&footer.find.library;</a>
</span>
More information about the open-ils-commits
mailing list