[open-ils-commits] [GIT] Evergreen ILS branch master updated. b5315a444a87b9807aa15bf355699a4640fba63f
Evergreen Git
git at git.evergreen-ils.org
Sun Dec 11 17:42:14 EST 2011
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 b5315a444a87b9807aa15bf355699a4640fba63f (commit)
via 9548cbd83525e1b5af987e308f60a4e946cba155 (commit)
via c9cdea869b574306ca09ada2c5e5058ec540a873 (commit)
from 3791aec127f76fe78d83fe508f38c6399cf01bbf (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 b5315a444a87b9807aa15bf355699a4640fba63f
Author: Dan Scott <dscott at laurentian.ca>
Date: Sun Dec 11 17:40:39 2011 -0500
TPAC: Fix styling in advanced searchbar
Per Peter Lux's comment, we needed to fix the styling in the advanced
search bar. Marking the DIV id with "search-box" makes it consistent
with the searchbar in other interfaces.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/src/templates/opac/advanced.tt2 b/Open-ILS/src/templates/opac/advanced.tt2
index e822795..010e923 100644
--- a/Open-ILS/src/templates/opac/advanced.tt2
+++ b/Open-ILS/src/templates/opac/advanced.tt2
@@ -6,7 +6,7 @@
loc = CGI.param("loc");
-%]
<div id="search-wrapper">
- <div>
+ <div id="search-box">
<span class="search_catalog_lbl">[% l('Search the Catalog') %]</span>
<a href="[% mkurl(ctx.opac_root _ '/home') %]"
id="home_adv_search_link"><span
commit 9548cbd83525e1b5af987e308f60a4e946cba155
Author: Dan Scott <dscott at laurentian.ca>
Date: Sun Dec 11 17:39:43 2011 -0500
TPAC: Fix whitespace in advanced.tt2
Indentation was non-standard following plux's addition of the basic link
in the advanced search UI; fix that up.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/src/templates/opac/advanced.tt2 b/Open-ILS/src/templates/opac/advanced.tt2
index 7114390..e822795 100644
--- a/Open-ILS/src/templates/opac/advanced.tt2
+++ b/Open-ILS/src/templates/opac/advanced.tt2
@@ -7,17 +7,13 @@
-%]
<div id="search-wrapper">
<div>
- <span class="search_catalog_lbl">[% l('Search the Catalog') %]</span>
- <a href="[% mkurl(ctx.opac_root _ '/home') %]"
- id="home_adv_search_link"><span
- class="adv_search_font">[% l('Basic Search') %]</span></a>
- </div>
-
-
+ <span class="search_catalog_lbl">[% l('Search the Catalog') %]</span>
+ <a href="[% mkurl(ctx.opac_root _ '/home') %]"
+ id="home_adv_search_link"><span
+ class="adv_search_font">[%l('Basic Search')%]</span></a>
+ </div>
<div id="adv_search_parent">
-
- <div id="adv_search_tabs">
-
+ <div id="adv_search_tabs">
<a href="?pane=advanced[% IF loc %];loc=[% loc %][% END %]" [% IF pane == 'advanced' %]class="on" [% END %]id="adv_search">[% l('Advanced Search') %]</a>
<a href="?pane=numeric[% IF loc %];loc=[% loc %][% END %]" [% IF pane == 'numeric' %]class="on" [% END %]id="num_search">[% l('Numeric Search') %]</a>
<a href="?pane=expert[% IF loc %];loc=[% loc %][% END %]" [% IF pane == 'expert' %]class="on" [% END %]id="expert_search">[% l('Expert Search') %]</a>
commit c9cdea869b574306ca09ada2c5e5058ec540a873
Author: Peter Lux <plux at upei.ca>
Date: Fri Dec 9 16:12:00 2011 -0500
TPAC: Link to Basic Search from advanced page
The searchbar in basic search, results, record details offers an option
to get to advanced search - but advanced search doesn't offer a way to
get directly back to a basic search. Now it does; however, some CSS is
required to make it look consistent.
Signed-off-by: Peter Lux <plux at upei.ca>
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/src/templates/opac/advanced.tt2 b/Open-ILS/src/templates/opac/advanced.tt2
index db609d2..7114390 100644
--- a/Open-ILS/src/templates/opac/advanced.tt2
+++ b/Open-ILS/src/templates/opac/advanced.tt2
@@ -6,8 +6,18 @@
loc = CGI.param("loc");
-%]
<div id="search-wrapper">
+ <div>
+ <span class="search_catalog_lbl">[% l('Search the Catalog') %]</span>
+ <a href="[% mkurl(ctx.opac_root _ '/home') %]"
+ id="home_adv_search_link"><span
+ class="adv_search_font">[% l('Basic Search') %]</span></a>
+ </div>
+
+
<div id="adv_search_parent">
- <div id="adv_search_tabs">
+
+ <div id="adv_search_tabs">
+
<a href="?pane=advanced[% IF loc %];loc=[% loc %][% END %]" [% IF pane == 'advanced' %]class="on" [% END %]id="adv_search">[% l('Advanced Search') %]</a>
<a href="?pane=numeric[% IF loc %];loc=[% loc %][% END %]" [% IF pane == 'numeric' %]class="on" [% END %]id="num_search">[% l('Numeric Search') %]</a>
<a href="?pane=expert[% IF loc %];loc=[% loc %][% END %]" [% IF pane == 'expert' %]class="on" [% END %]id="expert_search">[% l('Expert Search') %]</a>
diff --git a/Open-ILS/src/templates/opac/advanced.tt2 b/templates_custom/opac/advanced.tt2
similarity index 81%
copy from Open-ILS/src/templates/opac/advanced.tt2
copy to templates_custom/opac/advanced.tt2
index db609d2..7114390 100644
--- a/Open-ILS/src/templates/opac/advanced.tt2
+++ b/templates_custom/opac/advanced.tt2
@@ -6,8 +6,18 @@
loc = CGI.param("loc");
-%]
<div id="search-wrapper">
+ <div>
+ <span class="search_catalog_lbl">[% l('Search the Catalog') %]</span>
+ <a href="[% mkurl(ctx.opac_root _ '/home') %]"
+ id="home_adv_search_link"><span
+ class="adv_search_font">[% l('Basic Search') %]</span></a>
+ </div>
+
+
<div id="adv_search_parent">
- <div id="adv_search_tabs">
+
+ <div id="adv_search_tabs">
+
<a href="?pane=advanced[% IF loc %];loc=[% loc %][% END %]" [% IF pane == 'advanced' %]class="on" [% END %]id="adv_search">[% l('Advanced Search') %]</a>
<a href="?pane=numeric[% IF loc %];loc=[% loc %][% END %]" [% IF pane == 'numeric' %]class="on" [% END %]id="num_search">[% l('Numeric Search') %]</a>
<a href="?pane=expert[% IF loc %];loc=[% loc %][% END %]" [% IF pane == 'expert' %]class="on" [% END %]id="expert_search">[% l('Expert Search') %]</a>
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/templates/opac/advanced.tt2 | 6 ++++++
.../opac/advanced.tt2 | 12 +++++++++++-
2 files changed, 17 insertions(+), 1 deletions(-)
copy {Open-ILS/src/templates => templates_custom}/opac/advanced.tt2 (81%)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list