[open-ils-commits] [GIT] Evergreen ILS branch master updated. 8bd6620d08dac540b1ebde0534c39df59dec05f2
Evergreen Git
git at git.evergreen-ils.org
Mon Jul 30 15:03:53 EDT 2012
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via 8bd6620d08dac540b1ebde0534c39df59dec05f2 (commit)
via f7094d7cfb239762975bf16ebd25a21dcc0237d2 (commit)
from df16ba71822e48b7661b1057d523b15deb20f7c8 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 8bd6620d08dac540b1ebde0534c39df59dec05f2
Author: Dan Scott <dscott at laurentian.ca>
Date: Mon Jul 30 09:44:17 2012 -0400
TPAC advanced search org unit selector
Make the advanced search org selector a bit more i18n and accessibility
friendly by giving the fields an explicit label. We shouldn't really build
strings out of individual parts like "in" out of context, because the
translators won't know what "in" refers to; and the label elements help
guide screen readers.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
diff --git a/Open-ILS/src/templates/opac/parts/advanced/expert.tt2 b/Open-ILS/src/templates/opac/parts/advanced/expert.tt2
index 09176c2..b5abd34 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/expert.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/expert.tt2
@@ -19,20 +19,24 @@
</tbody>
<tfoot>
<tr>
- <td colspan="7"><a href="javascript:addExpertRow();">[ [% l("Add row") %] ]</a>
- </td>
+ <td colspan="7"><a href="javascript:addExpertRow();">[ [% l("Add row") %] ]</a></td>
</tr>
<tr>
<td colspan="5" class="expert-search-row">
- [% PROCESS "opac/parts/org_selector.tt2";
- l("in"); INCLUDE build_org_selector show_loc_groups=1 %]
- </td>
- <td colspan="2" class="expert-search-row">
- <input type="submit" value="[% l('Search') %]"
- alt="[% l('Search') %]" title="[% l('Search') %]"
- class="opac-button" />
- </td>
- </tr>
+ <label><strong>[% l("Search Library:") %]</strong>
+ [%- PROCESS "opac/parts/org_selector.tt2";
+ INCLUDE build_org_selector show_loc_groups=1
+ %]
+ </label>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2" class="expert-search-row">
+ <input type="submit" value="[% l('Search') %]"
+ alt="[% l('Search') %]" title="[% l('Search') %]"
+ class="opac-button" />
+ </td>
+ </tr>
</tfoot>
</table>
</form>
diff --git a/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2 b/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2
index c685aaf..819fd79 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2
@@ -4,7 +4,7 @@
<input type="hidden" name="_special" value="1" />
<table>
<tr>
- <td>
+ <td><label><strong>[% l("Field:") %]</strong>
<select name="qtype">
<!-- TODO: Pull labels from config.metabib_field.label -->
<option value="identifier|isbn">[% l('ISBN') %]</option>
@@ -15,13 +15,18 @@
<option value="identifier|tcn">[% l('TCN') %]</option>
<option value="item_barcode">[% l('Item Barcode') %]</option>
</select>
+ </label>
</td>
<td>
<input type="text" name="query" size="16" autofocus />
</td>
- <td>
+ </tr>
+ <tr>
+ <td colspan="2"><label><strong>[% l("Search Library:") %]</strong>
[% PROCESS "opac/parts/org_selector.tt2";
- l(' in '); INCLUDE build_org_selector show_loc_groups=1 %]
+ INCLUDE build_org_selector show_loc_groups=1
+ %]
+ </label>
</td>
</tr>
<tr>
commit f7094d7cfb239762975bf16ebd25a21dcc0237d2
Author: Kathy Lussier <klussier at masslnc.org>
Date: Mon Jul 23 23:23:55 2012 -0400
Add the library selector to numeric and expert search pages.
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/src/templates/opac/parts/advanced/expert.tt2 b/Open-ILS/src/templates/opac/parts/advanced/expert.tt2
index 7d1ffa1..09176c2 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/expert.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/expert.tt2
@@ -1,7 +1,6 @@
<form action="[% ctx.opac_root %]/results" method="GET">
<div class="header_middle">[% l("Expert Search") %]</div>
<input type="hidden" name="_special" value="1" />
- [% IF loc %]<input type="hidden" name="loc" value="[% loc %]" />[% END %]
<table class="expert-search">
<tbody id="adv_expert_rows_here">
<tr id="adv_expert_row">
@@ -20,13 +19,20 @@
</tbody>
<tfoot>
<tr>
- <td colspan="2"><a href="javascript:addExpertRow();">[ [% l("Add row") %] ]</a></td>
- <td colspan="4">
- <input type="submit" value="[% l('Search') %]"
- alt="[% l('Search') %]" title="[% l('Search') %]"
- class="opac-button" />
- </td>
+ <td colspan="7"><a href="javascript:addExpertRow();">[ [% l("Add row") %] ]</a>
+ </td>
</tr>
+ <tr>
+ <td colspan="5" class="expert-search-row">
+ [% PROCESS "opac/parts/org_selector.tt2";
+ l("in"); INCLUDE build_org_selector show_loc_groups=1 %]
+ </td>
+ <td colspan="2" class="expert-search-row">
+ <input type="submit" value="[% l('Search') %]"
+ alt="[% l('Search') %]" title="[% l('Search') %]"
+ class="opac-button" />
+ </td>
+ </tr>
</tfoot>
</table>
</form>
diff --git a/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2 b/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2
index 32bf56e..c685aaf 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2
@@ -2,7 +2,6 @@
<div class="header_middle">[% l("Numeric Search") %]</div>
<input type="hidden" name="contains" value="contains" />
<input type="hidden" name="_special" value="1" />
- [% IF loc %]<input type="hidden" name="loc" value="[% loc %]" />[% END %]
<table>
<tr>
<td>
@@ -20,6 +19,10 @@
<td>
<input type="text" name="query" size="16" autofocus />
</td>
+ <td>
+ [% PROCESS "opac/parts/org_selector.tt2";
+ l(' in '); INCLUDE build_org_selector show_loc_groups=1 %]
+ </td>
</tr>
<tr>
<td colspan="2" align="right">
diff --git a/Open-ILS/web/css/skin/default/opac/style.css b/Open-ILS/web/css/skin/default/opac/style.css
index 9aa2ba7..3f5b33f 100644
--- a/Open-ILS/web/css/skin/default/opac/style.css
+++ b/Open-ILS/web/css/skin/default/opac/style.css
@@ -1203,6 +1203,7 @@ a.dash-link:hover { text-decoration: underline !important; }
.rdetail-extras-summary { margin: 10px; }
.staff-hold { background-color: #eee; }
.expert-search tbody tr th { text-align: right; padding-left: 2em; }
+.expert-search-row { padding-top: 10px; }
.bookshelf thead tr td {
border-bottom: 1px dashed #999;
padding-bottom: 1ex;
-----------------------------------------------------------------------
Summary of changes:
.../src/templates/opac/parts/advanced/expert.tt2 | 22 ++++++++++++++-----
.../src/templates/opac/parts/advanced/numeric.tt2 | 12 +++++++++-
Open-ILS/web/css/skin/default/opac/style.css | 1 +
3 files changed, 27 insertions(+), 8 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list