[open-ils-commits] [GIT] Evergreen ILS branch master updated. 85a68d8477c2372284723c391b536478267b64ea
Evergreen Git
git at git.evergreen-ils.org
Wed Sep 25 18:53:51 EDT 2013
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 85a68d8477c2372284723c391b536478267b64ea (commit)
via ea017990c589ee3c9abd18c547385286921d087b (commit)
via 2e34bd51de6869f5cd15c810b49322b3e526ce15 (commit)
via d2a643960bc8c854b9a1c38f4fcb654b9a235145 (commit)
via 207177851b797c2357aa455b35e24cad9389954a (commit)
via 793168a99f4de8c70a68bbea6dc83eee71ff4868 (commit)
via 77d7cda9b647c744f8c68690e4ef0f20f1651188 (commit)
via 12c37dc68fd03deea857dd003cefea6a09b3f5b8 (commit)
via f3b7bc3befbe09d2102cd7e0027a87869e913775 (commit)
via 3292fc83efe8fd2461c8b9d41988b0fea408a1a1 (commit)
via 405b76152eec34c993eb4e20bf18e69cb79c0ec4 (commit)
via 51cba9000bbb7138aba2ca8dd7633ce61633e31c (commit)
via 23e8de55bb283101ba046d40fbdc75c22e55741f (commit)
via 455c587c23c56dee0eeabee0fba0ba0b927dfa73 (commit)
via bfda0d74f476629afa3c9934d29501dce3ef9991 (commit)
via 4f8139372d712cbeb3a3a1bb9be9b10bc3b0c2d9 (commit)
via 16fde03781c4efc9dc2d1f64819515603f24d9ed (commit)
via 64776b44b39a60aed9e67ee1aa418df9e8677ece (commit)
via b1df6a60b40c6341874b0631cb381935bf98286b (commit)
via 3314f282e94f058e05e21eba0278822b00955cba (commit)
via 3f746a756a063924447e1ceb8ab5621b6f2cb8a5 (commit)
via f89d938f4e9f0cfeebe693b3844c153d2cce405c (commit)
via 984ca33e5eb48e275069c092e27ed82f3552259d (commit)
via 6748df6b22cd194b775fbf4a14a1184e284ea726 (commit)
via debabf1c411689c2e00b429c4ea7b6c16d90a383 (commit)
via af892c5075c8c910ac50b74a9c85b46c3e77bacf (commit)
via 86ad330855587f6421dc328b37c57cdd3aa207f6 (commit)
via dd3183bae26885baa10f61cbfc842774b1f78984 (commit)
via 90d5a0e12b5d55efe4f6d212b71740b9fca11b5e (commit)
via 0cf1a5e5b228553e39a19d68c3b945e4b21c29c6 (commit)
via 48316e8c2f5ea328ac79c24fb5b45dbd38fe0a41 (commit)
via 07ae504ad135b1eec1445b647e1067082628e62b (commit)
via 480602d8e706a38d390113614127f870582ce565 (commit)
via ce5504d8e64433f6e948920092c5c96cf0558634 (commit)
via 8d4c855c239390de9e3e3c39f2087bafd47863d2 (commit)
via 582f68c0f6dca59c57330d4a7f0013ac3e9df182 (commit)
via 7419645aabd19dbe9b9dac2d6292fa7afdd02c1e (commit)
via db6b04817c899816e9be887c8bbc13a782614c28 (commit)
via f6360ccdd1652b04299eea00018fa372a8f74a8d (commit)
via b471e6105bff194ddf26619f32bbcae10553867b (commit)
via 08beb255d5d247e29ead4e68fb41cb8db750369f (commit)
via 851c9a909c010d530926f8222dd52b5843858abc (commit)
via ecd0b786e24811cf1e1b75929f11e396ce4d1301 (commit)
via e72b728646e4023dbf6d7fd4ce035aa24d50481d (commit)
via 2cf503ac745b1a4e73d9c396da932f491aecca65 (commit)
via 5511067ce20b1588ba7a521ebe590000ccc0badc (commit)
via bea813fb7a078dcbf53dccfc1da70a1ae1d8de95 (commit)
via 4a1c5dd97e1df30181f086ef115ad0889a03c1e8 (commit)
via b22d9ed1bf1d062de25b06baeea28ed76265d50d (commit)
via 2acd47d3b0d77edf6f245027e49fd14c5e1b938c (commit)
via 803eb2577fa106d81635c74190199a6d0ae6ef35 (commit)
via 7dc6cf72acecabebc9da5f2b7b2d739d6136e9eb (commit)
via b8e8f9144e968570ca33bc47537b0e2f389942e9 (commit)
via 555d80d2f4ec80c11e911b6c1879a4ad6ada5d2e (commit)
via bea06cf704f0d3da797dc0c7fbce3ab4604eb11a (commit)
via a663723d592ef63e95181f18b1c136c5b1e73661 (commit)
via 73b4d7d88539a3c741495682b763f4d9f142ccbc (commit)
via 4a946473b83b28ce78cfdd2e88a8ebe3c107ab5a (commit)
via 694d31353870553bc8d89cf1a828436fe64ee88b (commit)
via 30e6c139d88f5585ce89b484064ca6e486aa98b1 (commit)
via 1db928e0faa39634fc9453206ab5a2dd9eeaf931 (commit)
via 29f55b22a9113a134dfcb5a3461eb74e4c96fc05 (commit)
via 5d4c42799d1e1884d119bd506eb1d552ac6a2f5e (commit)
via d1689d088e62192a6a1210f96923b4bbc6a06c2d (commit)
via 19fa3682679c04f2fe645cf584b5a7fbe503c0be (commit)
via 7adb8c4c13429c5ab64ba77f7e926ede6bbc8e8b (commit)
via d6c5604bd2213fa87bb15da765d534e8461bdf95 (commit)
via 33e2d1841dc47baa483b0a28303a549a4f0520f6 (commit)
via a0a0d9a0c4eec6d608c041bfb5797f1eff6d6146 (commit)
via 4c4b103b36245acd2be41aed0baa7ec8ce83b457 (commit)
via c4812509a9d0aa0e797535257ab8e27d907eca06 (commit)
via 817d269e129b1e0a0d32b9cdafb5473bac97d031 (commit)
via c6e95b7c2ce5810e15a48192750e87282e3028c6 (commit)
via 8068d338916e5fe33c02150667351bff4958ec96 (commit)
via 4903341c669fa968d27d42031a3c988b35513ca0 (commit)
via e9de4a0583a72f50d9c5deeb019f94a5290c6fcf (commit)
via 7491d0168983c7abcd5448cfd9541dbcc3453874 (commit)
via 05239d02340f06fe0dd64276dbd80ea715fa9de7 (commit)
via f0dba97f96cbdb5cbd069427eaf53181790ef999 (commit)
via c001b1d8bcb8ad142e2742859aeae99b6581169b (commit)
via c722724ded1e30bd72c905652e04caf802d87e06 (commit)
from 188537250069e7dd8c9624f674e03eadfd6d8db7 (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 85a68d8477c2372284723c391b536478267b64ea
Author: Dan Wells <dbw2 at calvin.edu>
Date: Wed Sep 25 12:53:51 2013 -0400
TPAC: Make corner image link to server root
Most people will do this anyway, and in the MOPAC view, you currently
get trapped in 'My Account' with no obvious way out unless we have
a link like this.
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
diff --git a/Open-ILS/src/templates/opac/parts/topnav_logo.tt2 b/Open-ILS/src/templates/opac/parts/topnav_logo.tt2
index 0b55700..fedb66a 100644
--- a/Open-ILS/src/templates/opac/parts/topnav_logo.tt2
+++ b/Open-ILS/src/templates/opac/parts/topnav_logo.tt2
@@ -1,2 +1,2 @@
- <div id="topnav_logo"> <a href="http://evergreen-ils.org"><img alt="[% l('Evergreen Logo') %]"
+ <div id="topnav_logo"> <a href="/"><img alt="[% l('Evergreen Logo') %]"
src="[% ctx.media_prefix %]/opac/images/small_logo.png" /></a></div>
commit ea017990c589ee3c9abd18c547385286921d087b
Author: Dan Wells <dbw2 at calvin.edu>
Date: Wed Sep 25 12:27:40 2013 -0400
MOPAC: Remove fixed height from fines tabs
With 'overflow:auto' applied, a fixed height isn't needed, and
actually causes minor issues.
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index ac5482c..6abaec8 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1757,9 +1757,6 @@ a.preflib_change {
font-size: [% css_fonts.size_base %];
margin: 0px 5px 0px 0px;
}
- #acct_fines_tabs {
- height: 15px;
- }
#dash_wrapper div {
background: transparent;
commit 2e34bd51de6869f5cd15c810b49322b3e526ce15
Author: Dan Scott <dscott at laurentian.ca>
Date: Tue Sep 24 23:38:23 2013 -0400
TPAC: Make low hits help support low-width devices
Inline styles were forcing the width of the low-hits help box to be
353px wide, which is wider than our target 320 width for mobile devices.
Let the help use the full available width under the 600px barrier.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 6fbadea..ac5482c 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -774,6 +774,14 @@ div.result_table_utils_cont {
text-transform: uppercase;
}
+#lowhits_help {
+ float: right;
+ width: 353px;
+ background: [% css_colors.accent_light %];
+ padding: 10px;
+ margin-top: 7px;
+}
+
.results_info_table td {
padding-right: 10px;
}
@@ -1926,6 +1934,7 @@ a.preflib_change {
.bookshelf table thead tr {
display: block;
}
+ #lowhits_help { width: inherit; }
#adv_search_tabs a{
font-size: [% css_fonts.size_small %];
margin: 2px 2px 0px 2px;
diff --git a/Open-ILS/src/templates/opac/parts/result/lowhits.tt2 b/Open-ILS/src/templates/opac/parts/result/lowhits.tt2
index 2f7c8f8..0c7dfb3 100644
--- a/Open-ILS/src/templates/opac/parts/result/lowhits.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/lowhits.tt2
@@ -22,7 +22,7 @@
END %]
</p>
</div>
- <div style="float:right;width:353px;background:#ccc;padding:10px;margin-top:7px;">
+ <div id="lowhits_help">
[% INCLUDE "opac/parts/result/lowhits_purchase.tt2" %]
<p>
<strong>[% l('Keyword Search Tips') %]</strong><br />
commit d2a643960bc8c854b9a1c38f4fcb654b9a235145
Author: Dan Scott <dscott at laurentian.ca>
Date: Tue Sep 24 23:07:30 2013 -0400
TPAC: Make home search screen work on IE8+
The home logo is now centred on IE, and the white background extends
across the full width of the page. Huzzah!
As a bonus, the markup makes more sense without the <strong><center>.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index d163d41..6fbadea 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -20,6 +20,8 @@ img {
#homesearch_main_logo {
padding-top: 60px;
+ margin: auto;
+ width: 50%;
}
a {
diff --git a/Open-ILS/src/templates/opac/parts/homesearch.tt2 b/Open-ILS/src/templates/opac/parts/homesearch.tt2
index e99e1b1..b4b917a 100644
--- a/Open-ILS/src/templates/opac/parts/homesearch.tt2
+++ b/Open-ILS/src/templates/opac/parts/homesearch.tt2
@@ -1,3 +1,3 @@
<div id="homesearch_main_logo">
- <strong><center><img src="[% ctx.media_prefix %]/opac/images/main_logo.png" /></center></strong>
+ <img src="[% ctx.media_prefix %]/opac/images/main_logo.png" />
</div>
commit 207177851b797c2357aa455b35e24cad9389954a
Author: Ben Shum <bshum at biblio.org>
Date: Tue Sep 24 17:47:16 2013 -0400
Add missing ending label tag for format selector
On the basic search, we were missing an ending label tag so it was combining
the one from formats and library pickers into a single element which made
selecting the library misbehave.
Signed-off-by: Ben Shum <bshum at biblio.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/parts/searchbar.tt2 b/Open-ILS/src/templates/opac/parts/searchbar.tt2
index 9ea7f6c..e16729f 100644
--- a/Open-ILS/src/templates/opac/parts/searchbar.tt2
+++ b/Open-ILS/src/templates/opac/parts/searchbar.tt2
@@ -45,6 +45,7 @@
filter_group=search.basic_config.group none_ok=1 none_label=search.basic_config.none_label;
END;
-%]
+ </label>
<label id="search_locg_label">
[%-
l('Library: ');
commit 793168a99f4de8c70a68bbea6dc83eee71ff4868
Author: Ben Shum <bshum at biblio.org>
Date: Tue Sep 24 16:03:59 2013 -0400
Remove extra large facets
While an interesting experiment, as agreed in IRC conversation with kmlussier
and dbs, we will remove the extra wide facets being used in wider screens for
the time being.
Signed-off-by: Ben Shum <bshum at biblio.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index c5ff401..d163d41 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1685,13 +1685,6 @@ a.preflib_change {
font-size: [% css_fonts.size_bigger %];
}
- at media only screen and (min-width: 1280px) {
- .facet_box_temp { width: inherit; }
- .facet_box_wrapper .box_wrapper .box { width: inherit; }
- .facet_template .facet { width: inherit; max-width: 640px; }
- .facet_template .count { margin-left: 1em; }
-}
-
@media only screen and (max-width: 800px) {
.facet_sidebar_hidden, .result_block_hidden {
display: none;
commit 77d7cda9b647c744f8c68690e4ef0f20f1651188
Author: Ben Shum <bshum at biblio.org>
Date: Tue Sep 24 16:02:41 2013 -0400
Increase height of facet headers
Because the font size is larger now, the bottom of the facet headers was
getting too close to the text. Increase size slightly for now.
Signed-off-by: Ben Shum <bshum at biblio.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 8964e55..c5ff401 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1025,7 +1025,7 @@ div#facet_sidebar {
}
.facet_box_temp .header {
- height: 2em;
+ height: 2.5em;
overflow:hidden;
background:[% css_colors.primary %];
-moz-border-top-left-radius: 5px;
commit 12c37dc68fd03deea857dd003cefea6a09b3f5b8
Author: Kathy Lussier <klussier at masslnc.org>
Date: Tue Sep 24 16:01:11 2013 -0400
Remove My Account tabs at higher resolution
The My Account tabs begin to break at a higher resolution than 600 so
let's remove them at 800px instead.
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 2fff51e..8964e55 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1699,6 +1699,12 @@ a.preflib_change {
.facet_sidebar_visible, .result_block_visible {
display: inline ! important;
}
+ #acct_select, #acct_prefs_select {
+ display: inline-block;
+ }
+#acct_tabs, #acct_prefs_tabs {
+ display:none;
+ }
}
@media only screen and (max-width: 600px) {
@@ -1752,14 +1758,6 @@ a.preflib_change {
height: 15px;
}
- #acct_select, #acct_prefs_select {
- display: inline-block;
- }
-
- #acct_tabs, #acct_prefs_tabs {
- display:none;
- }
-
#dash_wrapper div {
background: transparent;
padding: 0px;
commit f3b7bc3befbe09d2102cd7e0027a87869e913775
Author: Kathy Lussier <klussier at masslnc.org>
Date: Tue Sep 24 15:48:35 2013 -0400
Remove explicit widths from My account
There were a couple of explicit width in the My Account area that were
causing the account expiration alert to run off the screen. I removed them
and a tweak to the CSS to get the page elements to display
properly.
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 27d9772..2fff51e 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -809,6 +809,11 @@ div.result_table_utils_cont {
font-weight: normal;
}
+#acct_sum_block {
+ float:left;
+ clear:left;
+}
+
.acct_sum_table {
border-collapse: collapse;
background: [% css_colors.accent_ultralight %];
diff --git a/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2 b/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
index b14572e..420bd3e 100644
--- a/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
+++ b/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
@@ -5,7 +5,7 @@
<div id='myopac_summary_div' style="padding:0px;">
- <div style="width:742px;float:left;">
+ <div style="float:left;">
<div class="header_middle">[% l('Account Summary') %]</div>
</div>
@@ -48,8 +48,8 @@
</div>
[% END %]
- <div style="width:662px;">
- <div style="float:left;">
+ <div>
+ <div id="acct_sum_block">
<div style="padding:10px 0px;">
[%- IF date.format(ctx.parse_datetime(ctx.user.expire_date), '%s') < date.format(date.now , '%s');
fmt_expire_date = date.format(ctx.parse_datetime(ctx.user.expire_date), DATE_FORMAT);
commit 3292fc83efe8fd2461c8b9d41988b0fea408a1a1
Author: Bill Ott <bott at grpl.org>
Date: Tue Sep 24 15:20:56 2013 -0400
i18n support for field names in myopac css
Signed-off-by: Bill Ott <bott at grpl.org>
Signed-off-by: Ben Shum <bshum at biblio.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index bc76713..27d9772 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1977,11 +1977,11 @@ a.preflib_change {
}
table#acct_checked_main_header td:nth-of-type(1) { border-top: 5px solid #aaa; padding-top: 15px; background-color: #fff;}
- table#acct_checked_main_header td:nth-of-type(2):before { content: "Title / Author";}
- table#acct_checked_main_header td:nth-of-type(3):before { content: "Renewals Left"; }
- table#acct_checked_main_header td:nth-of-type(4):before { content: "Due Date"; }
- table#acct_checked_main_header td:nth-of-type(5):before { content: "Barcode"; }
- table#acct_checked_main_header td:nth-of-type(6):before { content: "Call number"; }
+ table#acct_checked_main_header td:nth-of-type(2):before { content: "[% l('Title / Author') %]";}
+ table#acct_checked_main_header td:nth-of-type(3):before { content: "[% l('Renewals Left') %]"; }
+ table#acct_checked_main_header td:nth-of-type(4):before { content: "[% l('Due Date') %]"; }
+ table#acct_checked_main_header td:nth-of-type(5):before { content: "[% l('Barcode') %]"; }
+ table#acct_checked_main_header td:nth-of-type(6):before { content: "[% l('Call number') %]"; }
table#acct_holds_main_header thead tr th {
display: block;
@@ -2010,12 +2010,12 @@ a.preflib_change {
}
table#acct_holds_main_header td:nth-of-type(1) { border-top: 5px solid #aaa; padding-top: 15px; background-color: #fff;}
- table#acct_holds_main_header td:nth-of-type(2):before { content: "Title";}
- table#acct_holds_main_header td:nth-of-type(3):before { content: "Author"; }
- table#acct_holds_main_header td:nth-of-type(4):before { content: "Format"; }
- table#acct_holds_main_header td:nth-of-type(5):before { content: "Pickup Location"; }
- table#acct_holds_main_header td:nth-of-type(6):before { content: "Activate"; }
- table#acct_holds_main_header td:nth-of-type(7):before { content: "Cancel on"; }
- table#acct_holds_main_header td:nth-of-type(8):before { content: "Active"; }
- table#acct_holds_main_header td:nth-of-type(9):before { content: "Status"; }
+ table#acct_holds_main_header td:nth-of-type(2):before { content: "[% l('Title') %]";}
+ table#acct_holds_main_header td:nth-of-type(3):before { content: "[% l('Author') %]"; }
+ table#acct_holds_main_header td:nth-of-type(4):before { content: "[% l('Format') %]"; }
+ table#acct_holds_main_header td:nth-of-type(5):before { content: "[% l('Pickup Location') %]"; }
+ table#acct_holds_main_header td:nth-of-type(6):before { content: "[% l('Activate') %]"; }
+ table#acct_holds_main_header td:nth-of-type(7):before { content: "[% l('Cancel on') %]"; }
+ table#acct_holds_main_header td:nth-of-type(8):before { content: "[% l('Active') %]"; }
+ table#acct_holds_main_header td:nth-of-type(9):before { content: "[% l('Status') %]"; }
}
commit 405b76152eec34c993eb4e20bf18e69cb79c0ec4
Author: Ben Shum <bshum at biblio.org>
Date: Tue Sep 24 14:57:16 2013 -0400
Fix margins in advanced search tabs for mobile view too
Similarly, in the mobile view, do not have a bottom margin separating the tab
from the content below. Clean up margin code while we're at it.
Signed-off-by: Ben Shum <bshum at biblio.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 641dfdd..bc76713 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1930,9 +1930,7 @@ a.preflib_change {
}
#adv_search_tabs a{
font-size: [% css_fonts.size_small %];
- margin: 2px;
- margin-right: 2px;
- margin-bottom: 2px;
+ margin: 2px 2px 0px 2px;
padding: 2px 2px 5px 2px;
-moz-border-radius: 10px 0px 0px 0px;
border-radius: 7px 7px 0px 0px;
commit 51cba9000bbb7138aba2ca8dd7633ce61633e31c
Author: Ben Shum <bshum at biblio.org>
Date: Tue Sep 24 14:16:21 2013 -0400
Fix tab button margins
Remove a hanging 10px margin that made the advanced search tabs and my account
tabs appear as though they were floating over the contents they were connected
with.
Signed-off-by: Ben Shum <bshum at biblio.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 76b9b64..641dfdd 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -266,7 +266,7 @@ span.dash_divider {
text-align: center;
vertical-align: middle;
display: block;
- margin: 10px 7px 10px 0px;
+ margin: 10px 7px 0px 0px;
padding: 10px 0px 10px 0px;
-moz-border-radius: 10px 10px 0px 0px;
border-radius: 10px 10px 0px 0px;
commit 23e8de55bb283101ba046d40fbdc75c22e55741f
Author: Dan Scott <dscott at laurentian.ca>
Date: Tue Sep 24 13:21:35 2013 -0400
TPAC: Simplify opac-button styling
Conflicting padding declarations in the stylesheet, in an old attempt to
balance out the sizes of various INPUT types vs A elements in Chrome vs.
Firefox, were resulting in increasingly odd sizes for the buttons
(depending on which browser you used). Switching to a BUTTON instead of
an A tag and dropping all of the padding declarations improves the
situation on Firefox, Chrome, and IE8, while simplifying the CSS.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 09eacb6..76b9b64 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1253,7 +1253,6 @@ div.opac-multiline-button > a,
.opac-multiline-button > a, a.opac-button, input.opac-button {
margin: 10px;
- padding: 5px 10px 5px 10px;
}
#dash_wrapper .opac-button {
@@ -1737,16 +1736,6 @@ a.preflib_change {
#simple-detail-view-links {
display: none;
}
- .opac-button {
- padding: 5px;
- margin: 3px;
- }
-
- a.opac-button {
- margin: 15px 5px;
- padding: 2px 5px;
- }
-
#acct_tabs a, #acct_fines_tabs a {
padding: 2px 4px 3px 4px;
-moz-border-radius: 6px 6px 0px 0px;
diff --git a/Open-ILS/src/templates/opac/parts/advanced/search.tt2 b/Open-ILS/src/templates/opac/parts/advanced/search.tt2
index 1228a39..d41c7e1 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/search.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/search.tt2
@@ -38,8 +38,8 @@
<img id='search-submit-spinner' src='/opac/images/progressbar_green.gif' class='hidden' alt=''/>
</span>
- <a href="[% mkurl(ctx.opac_root _ '/advanced', {$loc_name => loc_value}, 1) %]"
- class="pointer opac-button">[% l('Clear Form') %]</a>
+ <button href="[% mkurl(ctx.opac_root _ '/advanced', {$loc_name => loc_value}, 1) %]"
+ class="pointer opac-button">[% l('Clear Form') %]</button>
</div>
<div id='adv_search_filters'>
commit 455c587c23c56dee0eeabee0fba0ba0b927dfa73
Author: Dan Scott <dscott at laurentian.ca>
Date: Tue Sep 24 13:04:56 2013 -0400
TPAC: Retain advanced search tabs via overflow:auto
At small widths, the advanced search tabs could be forced to escape the
search tab header in a displeasing fashion. Also, the background bar
that provides context for the selected tab had been lost - and
overflow:auto fixes that. Thanks to Dan Wells for the suggestion.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 87741f4..09eacb6 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -258,6 +258,7 @@ span.dash_divider {
#adv_search_tabs, #acct_tabs, #acct_fines_tabs, #acct_checked_tabs, #acct_holds_tabs, #acct_prefs_tabs, #results_header_inner{
margin-left: 2px;
+ overflow: auto;
}
#adv_search_tabs a, #acct_tabs a, #acct_fines_tabs a, #acct_checked_tabs a, #acct_holds_tabs a, #acct_prefs_tabs a {
@@ -1938,9 +1939,6 @@ a.preflib_change {
.bookshelf table thead tr {
display: block;
}
- #adv_search_tabs {
- height: 25px;
- }
#adv_search_tabs a{
font-size: [% css_fonts.size_small %];
margin: 2px;
commit bfda0d74f476629afa3c9934d29501dce3ef9991
Author: Dan Scott <dscott at laurentian.ca>
Date: Tue Sep 24 11:24:39 2013 -0400
TPAC: Main content needs a clear:both style
On My Account, the content of tabs was riding up against the tabs. Use
clear:both style for #main-content to force the main content to start on
a new line.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 91b6c4b..87741f4 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -567,6 +567,7 @@ div.format_icon {
#main-content {
padding-left: 0px;
margin-left: 1em;
+ clear: both;
}
#main-content-after-bar {
commit 4f8139372d712cbeb3a3a1bb9be9b10bc3b0c2d9
Author: Dan Scott <dscott at laurentian.ca>
Date: Tue Sep 24 10:57:56 2013 -0400
TPAC expert search: wrap labelled fields consistently
Use a new class "nonbreaking-wrapper" with display:inline-block to keep
label + input fields together, rather than the inline "whitespace:
no-wrap" which did not work on Chrome (and oddly enough forced the value
field to the next line).
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index e79506e..91b6c4b 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1375,6 +1375,10 @@ table.bookbag-specific {
}
.save-notes { padding-bottom: 1.5ex; }
+.nonbreaking-wrapper {
+ display: inline-block;
+}
+
/* Moved from semiauto.css */
.adv_global_input_container {
border-bottom: none;
diff --git a/Open-ILS/src/templates/opac/parts/advanced/expert.tt2 b/Open-ILS/src/templates/opac/parts/advanced/expert.tt2
index 1abc365..5212209 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/expert.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/expert.tt2
@@ -5,15 +5,19 @@
<tbody id="adv_expert_rows_here">
<tr id="adv_expert_row">
<td>
- <label for="expert_tag">[% l("Tag:") %]</label>
+ <span class="nonbreaking-wrapper">
+ <label for="expert_tag">[% l("Tag:") %]</label>
<input id="expert_tag" type="text" name="tag" size="3" autofocus />
+ </span>
+ <span class="nonbreaking-wrapper">
<label for="expert_subfield">[% l("Subfield:") %]</label>
<input id="expert_subfield" type="text" name="subfield" size="1" />
- <span style="white-space:nowrap">
- <label for="expert_term">[% l("Value:") %]</label>
- <input id="expert_term" type="text" name="term" size="16" />
- </span>
- </td>
+ </span>
+ <span class="nonbreaking-wrapper">
+ <label for="expert_term">[% l("Value:") %]</label>
+ <input id="expert_term" type="text" name="term" size="16" />
+ </span>
+ </td>
<td>
<a href="javascript:;" class="row-remover"
title="[% l('Remove row') %]" alt="[% l('Remove row') %]"
commit 16fde03781c4efc9dc2d1f64819515603f24d9ed
Author: Dan Scott <dscott at laurentian.ca>
Date: Tue Sep 24 10:51:36 2013 -0400
TPAC: Prevent IE compatibility view
Windows XP has IE8, and it can handle the CSS we have in the TPAC.
However, the "compatibility view" button, if clicked, actually results
in horribly broken rendering (contrary to what one would expect).
Adding this <meta> tag prevents the compatibility view button from
displaying and should improve the experience for users.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/parts/base.tt2 b/Open-ILS/src/templates/opac/parts/base.tt2
index 0e51783..95b3c31 100644
--- a/Open-ILS/src/templates/opac/parts/base.tt2
+++ b/Open-ILS/src/templates/opac/parts/base.tt2
@@ -2,6 +2,7 @@
<html lang='[% ctx.locale.replace('_', '-') %]'>
<head>
<meta charset="utf-8" />
+ <meta http-equiv="X-UA-Compatible" content="IE=edge" />
[% IF ctx.refresh %]
<meta http-equiv="refresh" content="[% ctx.refresh %]">
[% ELSIF ctx.authtime %]
commit 64776b44b39a60aed9e67ee1aa418df9e8677ece
Author: Dan Scott <dscott at laurentian.ca>
Date: Tue Sep 24 09:53:34 2013 -0400
TPAC: Clear line for initial advanced search tab
The initial advanced search tab was being rendered right beside the tabs
instead of underneath them; fix in the same way we fixed the numeric and
expert tabs previously.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index f9cfa6b..e79506e 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1376,7 +1376,10 @@ table.bookbag-specific {
.save-notes { padding-bottom: 1.5ex; }
/* Moved from semiauto.css */
-.adv_global_input_container { border-bottom: none; }
+.adv_global_input_container {
+ border-bottom: none;
+ clear: both;
+}
.opac-auto-013 {
border-bottom: none;
*height: 0px;
commit b1df6a60b40c6341874b0631cb381935bf98286b
Author: Kathy Lussier <klussier at masslnc.org>
Date: Tue Sep 24 07:32:28 2013 -0400
Restore fines, checkout, and holds tabs
These display well as tabs since there are only two tabs to display. Probably
inadvisable to replace these tabs with menus as we did in other places because
there are already menus on these screens to perform actions on selected
checkouts/holds.
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 212967b..f9cfa6b 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1746,7 +1746,7 @@ a.preflib_change {
margin: 0px 5px 0px 0px;
}
#acct_fines_tabs {
- display: none;
+ height: 15px;
}
#acct_select, #acct_prefs_select {
@@ -1757,12 +1757,6 @@ a.preflib_change {
display:none;
}
- #acct_checked_tabs {
- display:none;
- }
- #acct_holds_tabs {
- display: none;
- }
#dash_wrapper div {
background: transparent;
padding: 0px;
commit 3314f282e94f058e05e21eba0278822b00955cba
Author: Dan Scott <dscott at laurentian.ca>
Date: Tue Sep 24 01:55:37 2013 -0400
TPAC: Streamline facet display
Rather than including a DIV containing only a non-breaking space to
clear the lines of the facets, just use CSS to clear each facet and set
a bottom margin appropriately.
Also, take advantage of wide screens by allowing facets to display
more broadly rather than being limited to a 10% width of the screen.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index dcedbda..212967b 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1018,7 +1018,7 @@ div#facet_sidebar {
}
.facet_box_temp .header {
- height:31px;
+ height: 2em;
overflow:hidden;
background:[% css_colors.primary %];
-moz-border-top-left-radius: 5px;
@@ -1062,18 +1062,18 @@ div#facet_sidebar {
}
.facet_template {
- padding-bottom:5px;
+ clear: both;
}
.facet_template .facet {
float:left;
- width:124px;
+ width: 12em;
+ margin-bottom: 0.5em;
}
.facet_template .count {
float:right;
color: [% css_colors.accent_mediumdark %];
- padding-right:11px;
}
.facet_template_selected .facet {
@@ -1672,6 +1672,13 @@ a.preflib_change {
font-size: [% css_fonts.size_bigger %];
}
+ at media only screen and (min-width: 1280px) {
+ .facet_box_temp { width: inherit; }
+ .facet_box_wrapper .box_wrapper .box { width: inherit; }
+ .facet_template .facet { width: inherit; max-width: 640px; }
+ .facet_template .count { margin-left: 1em; }
+}
+
@media only screen and (max-width: 800px) {
.facet_sidebar_hidden, .result_block_hidden {
display: none;
diff --git a/Open-ILS/src/templates/opac/parts/result/facets.tt2 b/Open-ILS/src/templates/opac/parts/result/facets.tt2
index c5b95a0..12d6597 100644
--- a/Open-ILS/src/templates/opac/parts/result/facets.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/facets.tt2
@@ -110,7 +110,6 @@ FOR facet IN sorted_facets;
[% END %]
</div>
<div class="count">([% facet_data.count %])</div>
- <div class="clear"> </div>
</div>
[%
ELSE;
@@ -122,7 +121,6 @@ FOR facet IN sorted_facets;
<a href='[% mkurl('', {facet => selected_facets.merge([param_string])}, ['page']) %]'>[% display_value %]</a>
</div>
<div class="count">([% facet_data.count %])</div>
- <div class="clear"> </div>
</div>
[% END %]
[% END %]
commit 3f746a756a063924447e1ceb8ab5621b6f2cb8a5
Author: Dan Scott <dscott at laurentian.ca>
Date: Tue Sep 24 01:29:19 2013 -0400
TPAC: Advanced search - add line break
The header and form for numeric search and expert search were being
displayed inline with the tabs on the advanced search page; push those
down where they should be.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 678ede7..dcedbda 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -800,6 +800,7 @@ div.result_table_utils_cont {
color:[% css_colors.primary_fade %];
padding: 0px 7px 0px 0px;
border-bottom: 1px dotted [% css_colors.accent_light %];
+ clear: both;
}
.header_middle a {
commit f89d938f4e9f0cfeebe693b3844c153d2cce405c
Author: Dan Scott <dscott at laurentian.ca>
Date: Tue Sep 24 01:15:39 2013 -0400
TPAC: Draw a border under the result header bar
Particularly needed in mobile mode, where the background has been set to
inherit, draw a bottom border to separate the result header actions from
the pagination controls.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 7b070ce..678ede7 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -654,6 +654,7 @@ div.format_icon {
#results_header_bar {
background: [% css_colors.accent_medium %];
border-top:1px solid [% css_colors.accent_mediumdark %];
+ border-bottom:1px solid [% css_colors.accent_mediumdark %];
}
.cached_list_div { height: 25px; }
commit 984ca33e5eb48e275069c092e27ed82f3552259d
Author: Dan Scott <dscott at laurentian.ca>
Date: Tue Sep 24 01:11:36 2013 -0400
TPAC: Enable search bar elements to wrap gracefully
As the browser window narrows, stack the search bar elements vertically
as needed.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 49d83c6..7b070ce 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1658,6 +1658,7 @@ a.preflib_change {
#search_query_label, #search_qtype_label, #search_itype_label, #search_locg_label {
white-space: nowrap;
+ display: inline-block;
}
.result_table_title_cell {
commit 6748df6b22cd194b775fbf4a14a1184e284ea726
Author: Dan Scott <dscott at laurentian.ca>
Date: Tue Sep 24 01:07:00 2013 -0400
TPAC: Define result header padding by contents
Rather than defining padding for the result header bar and then defining
margins for the contained labels and buttons, rely strictly on the
buttons and labels to position themselves.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 763642c..49d83c6 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -656,11 +656,6 @@ div.format_icon {
border-top:1px solid [% css_colors.accent_mediumdark %];
}
-#results_header_inner {
- padding-top: 0.5em;
- padding-bottom: 0.5em;
-}
-
.cached_list_div { height: 25px; }
.results_header_div {
@@ -676,8 +671,7 @@ div.format_icon {
float: left;
color: [% css_colors.text %];
background: [% css_colors.accent_medium %];
- margin-right: 0.5em;
- margin-top: 0.5em;
+ margin: 0.5em 0.5em 0.5em 0em;
}
.results_header_sel {
@@ -1207,8 +1201,7 @@ a.dash-link:hover { text-decoration: underline !important; }
.results_header_btns, .results_header_sel {
float:left;
- margin-right: 0.5em;
- margin-top: 0.5em;
+ margin: 0.5em 0.5em 0.5em 0em;
}
.opac-button:disabled {
commit debabf1c411689c2e00b429c4ea7b6c16d90a383
Author: Dan Scott <dscott at laurentian.ca>
Date: Tue Sep 24 00:46:27 2013 -0400
TPAC: Make result label text consistent size
The text on the result header buttons was all 100%, while the text
labels for the sort and limit to available widgets for some reason were
set to a smaller font size, despite appearing on the same line.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 3e60a60..763642c 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -674,7 +674,6 @@ div.format_icon {
.results_header_lbl {
font-weight: bold;
float: left;
- font-size: [% css_fonts.size_small %];
color: [% css_colors.text %];
background: [% css_colors.accent_medium %];
margin-right: 0.5em;
commit af892c5075c8c910ac50b74a9c85b46c3e77bacf
Author: Dan Scott <dscott at laurentian.ca>
Date: Tue Sep 24 00:43:50 2013 -0400
TPAC: Make result button text consistent
There's no good reason for the result buttons to have underlined text
when most other buttons in the Web UI do not have underlined text.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 626a343..3e60a60 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1242,6 +1242,7 @@ div.opac-multiline-button > a,
color: [% css_colors.text_invert %];
vertical-align: middle;
display: table-cell;
+ text-decoration: none;
}
.opac-multiline-button > a:hover,
commit 86ad330855587f6421dc328b37c57cdd3aa207f6
Author: Dan Scott <dscott at laurentian.ca>
Date: Tue Sep 24 00:36:59 2013 -0400
TPAC: Remove wide bar under results options header
The hard-coded <br class="clear-both"> adds a full em of empty vertical
space to the full TPAC with no usability gain. Remove it.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/results.tt2 b/Open-ILS/src/templates/opac/results.tt2
index a1c087a..520d429 100644
--- a/Open-ILS/src/templates/opac/results.tt2
+++ b/Open-ILS/src/templates/opac/results.tt2
@@ -66,7 +66,6 @@
</div>
</div>
</form>
- <br class="clear-both" />
<div id="content-wrapper">
<div id="main-content">
<div id="results-page">
commit dd3183bae26885baa10f61cbfc842774b1f78984
Author: Dan Scott <dscott at laurentian.ca>
Date: Tue Sep 24 00:33:12 2013 -0400
TPAC: Saner search button CSS
Gradients and text shadows begone.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 4ff0b36..626a343 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -962,6 +962,13 @@ table.acct_notes th {
height: 16px;
width: 16px;
}
+#search-submit-go {
+ background: [% css_colors.primary_fade %];
+ border-radius: 5px;
+ color: [% css_colors.button_text %];
+ font-weight: bold;
+ padding: 0px;
+}
div.adv_search_available {
margin-top: 1em;
}
@@ -1218,16 +1225,11 @@ div.opac-multiline-button > a,
color: [% css_colors.button_text %];
font-weight: bold;
text-decoration: none;
- text-shadow: 1px 1px 1px [% css_colors.button_text_shadow %];
cursor: pointer !important;
-moz-border-radius: 5px;
border-radius: 5px;
- border: 1px solid [% css_colors.primary_fade %];
- background: linear-gradient([% css_colors.primary_fade %], [% css_colors.primary %]);
- background: -moz-linear-gradient([% css_colors.primary_fade %], [% css_colors.primary %]);
- background: -o-linear-gradient([% css_colors.primary_fade %], [% css_colors.primary %]);
- background: -webkit-linear-gradient([% css_colors.primary_fade %], [% css_colors.primary %]);
- background-color: [% css_colors.primary %];
+ border: 5px solid [% css_colors.primary_fade %];
+ background: [% css_colors.primary_fade %];
}
.opac-button-header {
@@ -1237,7 +1239,6 @@ div.opac-multiline-button > a,
.results_header_btns a, #simple-detail-view-links a {
margin: 10px;
- padding: 5px 10px 5px 10px;
color: [% css_colors.text_invert %];
vertical-align: middle;
display: table-cell;
commit 90d5a0e12b5d55efe4f6d212b71740b9fca11b5e
Author: Dan Scott <dscott at laurentian.ca>
Date: Mon Sep 23 23:03:05 2013 -0400
Mobile TPAC: Cleaner Refine/Return to hits behaviour
Have the Refine results / Return to results button be the target ID, so
that clicking the link leaves the opposite action at the top of the page
(giving users a quick exit path back to where they came from).
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index b0419c3..18b55e3 100644
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -371,13 +371,13 @@ function getFacety() {
resultButton.setAttribute('class', 'results_header_btns result_block_visible');
facetSidebar.setAttribute('class', 'facet_sidebar_visible');
facetButton.setAttribute('class', 'result_block_hidden');
- window.location.hash = 'facet_sidebar';
+ window.location.hash = 'return_to_hits';
}
function getResulty() {
resultBlock.setAttribute('class', 'result_block_visible');
resultButton.setAttribute('class', 'result_block_hidden');
facetSidebar.setAttribute('class', 'facet_sidebar_hidden');
facetButton.setAttribute('class', 'results_header_btns result_block_visible');
- window.location.hash = 'result_block';
+ window.location.hash = 'refine_hits';
}
</script>
commit 0cf1a5e5b228553e39a19d68c3b945e4b21c29c6
Author: Dan Scott <dscott at laurentian.ca>
Date: Mon Sep 23 22:55:04 2013 -0400
TPAC: Consistent results paginator font size
It is weird to have two different font sizes appearing on the same line
in the regular TPAC, and it introduces slight inconsistency for the left
padding of the results pagination in mobile mode.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 9aa09bf..4ff0b36 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -698,10 +698,6 @@ div.format_icon {
color:[% css_colors.primary_fade %];
}
-.start_end_links_span {
- font-size: [% css_fonts.size_small %];
-}
-
#result_table_div {
margin-top: 1em;
}
@@ -1806,7 +1802,6 @@ a.preflib_change {
display: none;
}
.start_end_links_span {
- /* font-size: 12px; test */
display: block;
}
.invisible {
commit 48316e8c2f5ea328ac79c24fb5b45dbd38fe0a41
Author: Dan Scott <dscott at laurentian.ca>
Date: Mon Sep 23 22:44:18 2013 -0400
TPAC: Avoid paginator HTML rather than hiding it
Rather than generating HTML and then hiding it via CSS, just don't
generate the HTML at all. In this case, avoid generating the Previous /
Next links in those cases where we're on either page one or the last page
of results respectively.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index ea6dd7c..9aa09bf 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1129,7 +1129,10 @@ div#facet_sidebar {
color: [% css_colors.text_alert %];
}
#acct_prefs_header { float: left; }
-.search_page_nav_link { cursor: pointer; }
+.search_page_nav_link {
+ cursor: pointer;
+ padding-left: 1em;
+}
#opac.result.sort { width: 160px; }
.renew-summary { font-size: [% css_fonts.size_bigger %]; font-style: italic; margin: 0.5ex 0; }
.failure-text { margin-left: 4em; font-style: italic; color: [% css_colors.text_alert %]; }
@@ -1190,10 +1193,7 @@ a.dash-link:hover { text-decoration: underline !important; }
padding-bottom: 1ex;
}
.cn_browse_item { padding: 2ex; }
-.results-paginator-list {
- padding-left: 1em;
- padding-right: 1em;
-}
+.results-paginator-list { padding-left: 1em; }
.results-paginator-selected { color: [% css_colors.text_alert %]; }
.inactive-hold { background: [% css_colors.accent_lightest %]; }
diff --git a/Open-ILS/src/templates/opac/parts/result/paginate.tt2 b/Open-ILS/src/templates/opac/parts/result/paginate.tt2
index d41822f..5673a85 100644
--- a/Open-ILS/src/templates/opac/parts/result/paginate.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/paginate.tt2
@@ -18,16 +18,16 @@
<span>
<span class='start_end_links_span'>
- [% class = 'search_page_nav_link';
+ [%- class = 'search_page_nav_link';
href = '#';
IF page > 0;
href = mkurl('', {page => page - 1});
- ELSE; class = class _ ' invisible'; END;
- %]
+ -%]
<a class='[% class %]' href='[% href %]'
title='[% l("Previous page") %]'><span class="nav_arrow_fix">◄</span> [% l('Previous') %] </a>
+ [%- END;
- [%- # show links to 4 previous pages, the current page, and 3 more pages.
+ # show links to 4 previous pages, the current page, and 3 more pages.
added = 0;
pageitr = page - 5;
IF page_count > 1; # no need to paginate 1 page
@@ -46,16 +46,16 @@
END;
-%]
</span>
- [%- END; -%]
+ [%- END;
- [% class = 'search_page_nav_link';
+ class = 'search_page_nav_link';
href = '#';
IF (page + 1) < page_count;
href = mkurl('', {page => page + 1});
- ELSE; class = class _ ' invisible'; END;
- %]
+ -%]
<a class='[% class %]' href='[% href %]'
title='[% l("Next page") %]'> [% l('Next') %] <span class="nav_arrow_fix">►</span></a>
+ [%- END; -%]
</span>
</span>
</div>
commit 07ae504ad135b1eec1445b647e1067082628e62b
Author: Dan Scott <dscott at laurentian.ca>
Date: Mon Sep 23 22:33:09 2013 -0400
TPAC: Align results pagination in mobile mode
The results summary and results paginator had been using hard-coded
pixel values for the padding-left value; amusingly, they were different
values. Now that the paginator is part of the CSS stylesheet, switch to
using a standard 1 em so that we can also respond to the chosen font
size of both the stylesheet and the user's preference.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 680ba2d..ea6dd7c 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -729,7 +729,8 @@ tr.result_table_row > td.result_table_pic_header {
}
.result_number {
- padding-left:15px; white-space: nowrap; width: 320px;
+ padding-left: 1em;
+ white-space: nowrap;
}
.result_count_number {
commit 480602d8e706a38d390113614127f870582ce565
Author: Dan Scott <dscott at laurentian.ca>
Date: Mon Sep 23 22:29:23 2013 -0400
TPAC: Reduce vertical space in results paginator
An unnecessary span element with inline CSS results in additional blank
vertical space being generated for searches with only one page of
results. Avoid creating the span (which would normally contain the list
of pages), move the CSS to the style sheet, and use ems rather than
hard-coded px values for the padding to adjust relative to the font
size.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 5973d5f..680ba2d 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1189,7 +1189,10 @@ a.dash-link:hover { text-decoration: underline !important; }
padding-bottom: 1ex;
}
.cn_browse_item { padding: 2ex; }
-
+.results-paginator-list {
+ padding-left: 1em;
+ padding-right: 1em;
+}
.results-paginator-selected { color: [% css_colors.text_alert %]; }
.inactive-hold { background: [% css_colors.accent_lightest %]; }
diff --git a/Open-ILS/src/templates/opac/parts/result/paginate.tt2 b/Open-ILS/src/templates/opac/parts/result/paginate.tt2
index 066cd8c..d41822f 100644
--- a/Open-ILS/src/templates/opac/parts/result/paginate.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/paginate.tt2
@@ -27,11 +27,13 @@
<a class='[% class %]' href='[% href %]'
title='[% l("Previous page") %]'><span class="nav_arrow_fix">◄</span> [% l('Previous') %] </a>
- <span style='padding-left: 11px; padding-right:11px;'>
- [% # show links to 4 previous pages, the current page, and 3 more pages.
- added = 0;
- pageitr = page - 5;
- IF page_count > 1; # no need to paginate 1 page
+ [%- # show links to 4 previous pages, the current page, and 3 more pages.
+ added = 0;
+ pageitr = page - 5;
+ IF page_count > 1; # no need to paginate 1 page
+ -%]
+ <span class='results-paginator-list'>
+ [%-
WHILE (pageitr = pageitr + 1) < page_count;
IF pageitr < 0; NEXT; END;
IF pageitr == page; %]
@@ -42,9 +44,9 @@
added = added + 1;
IF added == 8; LAST; END;
END;
- END;
- %]
+ -%]
</span>
+ [%- END; -%]
[% class = 'search_page_nav_link';
href = '#';
commit ce5504d8e64433f6e948920092c5c96cf0558634
Author: Dan Scott <dscott at laurentian.ca>
Date: Mon Sep 23 15:16:16 2013 -0400
Mobile TPAC: Show Advanced Search button in results header
Now that the advanced search UI is reasonably mobile-friendly, make it
visible. At the same time, make the wrapping behaviour more friendly by
giving a little bit of vertical margin between wrapped buttons (because
adding "Advanced Search" is almost guaranteed to cause wrapping).
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index e3dcad8..5973d5f 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -677,7 +677,8 @@ div.format_icon {
font-size: [% css_fonts.size_small %];
color: [% css_colors.text %];
background: [% css_colors.accent_medium %];
- margin-right: 6px;
+ margin-right: 0.5em;
+ margin-top: 0.5em;
}
.results_header_sel {
@@ -1200,8 +1201,8 @@ a.dash-link:hover { text-decoration: underline !important; }
.results_header_btns, .results_header_sel {
float:left;
- margin-right: 6px;
- height: 26px;
+ margin-right: 0.5em;
+ margin-top: 0.5em;
}
.opac-button:disabled {
@@ -1723,9 +1724,6 @@ a.preflib_change {
#simple-detail-view-links {
display: none;
}
- .results_header_btns:nth-child(2) {
- display: none;
- }
.opac-button {
padding: 5px;
margin: 3px;
diff --git a/Open-ILS/src/templates/opac/results.tt2 b/Open-ILS/src/templates/opac/results.tt2
index 3862355..a1c087a 100644
--- a/Open-ILS/src/templates/opac/results.tt2
+++ b/Open-ILS/src/templates/opac/results.tt2
@@ -24,11 +24,11 @@
<div class="results_header_btns">
<a href="[% mkurl(ctx.opac_root _ '/home', {$loc_name => loc_value}, 1) %]">[% l('Another Search') %]</a>
</div>
- <div id="refine_hits" class="results_header_btns result_block_visible"><a onclick="getFacety();">[% l('Refine these results') %]</a></div>
- <div id="return_to_hits" class="results_header_btns"><a onclick="getResulty();">[% l('Back to results') %]</a></div>
<div class="results_header_btns">
<a href="[% mkurl(ctx.opac_root _ '/advanced') %]">[% l('Advanced Search') %]</a>
</div>
+ <div id="refine_hits" class="results_header_btns result_block_visible"><a onclick="getFacety();">[% l('Refine these results') %]</a></div>
+ <div id="return_to_hits" class="results_header_btns"><a onclick="getResulty();">[% l('Back to results') %]</a></div>
[% IF ctx.mylist.size %]
<div class="results_header_btns cached_list_div">
[%- IF ctx.user; %]
commit 8d4c855c239390de9e3e3c39f2087bafd47863d2
Author: Dan Scott <dscott at laurentian.ca>
Date: Mon Sep 23 15:02:04 2013 -0400
TPAC: More responsive search result header buttons
Rather than having a specific height of 40px, which is crazy, remove the
specific height. This enables the buttons contained in the search result
header to wrap without overlapping the bottom border in strange
patterns.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 50087b4..e3dcad8 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -257,7 +257,6 @@ span.dash_divider {
}
#adv_search_tabs, #acct_tabs, #acct_fines_tabs, #acct_checked_tabs, #acct_holds_tabs, #acct_prefs_tabs, #results_header_inner{
- height: 40px;
margin-left: 2px;
}
@@ -658,8 +657,8 @@ div.format_icon {
}
#results_header_inner {
- height: 32px;
- padding-top:6px;
+ padding-top: 0.5em;
+ padding-bottom: 0.5em;
}
.cached_list_div { height: 25px; }
@@ -667,7 +666,6 @@ div.format_icon {
.results_header_div {
float: left;
width: 0px;
- height: 25px;
border-left: 1px solid [% css_colors.accent_mediumdark %];
border-right: 1px solid [% css_colors.accent_medium %];
margin: 0px 13px;
commit 582f68c0f6dca59c57330d4a7f0013ac3e9df182
Author: Dan Scott <dscott at laurentian.ca>
Date: Mon Sep 23 14:59:04 2013 -0400
Mobile TPAC: Better styling for facet/results buttons
Adopt the OPAC button style and move the buttons into the search bar to
consolidate result-specific actions into a single contextual area.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index cdc6071..50087b4 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1681,11 +1681,7 @@ a.preflib_change {
display: none;
}
.facet_sidebar_visible, .result_block_visible {
- display: inline;
- }
- #refine_hits, #return_to_hits {
- display: block;
- padding-left: 15px;
+ display: inline ! important;
}
}
diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index 4c7f7ed..b0419c3 100644
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -21,12 +21,10 @@
[% END %]
<div id="result_table_div">
<div class="facet_sidebar_hidden" id="facet_sidebar">
- <div id="return_to_hits"><a onclick="getResulty();">[% l('Back to results') %]</a></div>
[% INCLUDE "opac/parts/staff_saved_searches.tt2" %]
[% INCLUDE 'opac/parts/result/facets.tt2' %]
</div>
<div id="result_block" class="result_block_visible">
- <div id="refine_hits"><a onclick="getFacety();">[% l('Refine these results') %]</a></div>
<table cellpadding="0" cellspacing="0"
border="0" style="margin-top:10px;">
<tbody id="result_table">
@@ -365,15 +363,21 @@ END;
</div>
<script>
resultBlock = document.querySelector('#result_block');
+resultButton = document.querySelector('#return_to_hits');
facetSidebar = document.querySelector('#facet_sidebar');
+facetButton = document.querySelector('#refine_hits');
function getFacety() {
resultBlock.setAttribute('class', 'result_block_hidden');
+ resultButton.setAttribute('class', 'results_header_btns result_block_visible');
facetSidebar.setAttribute('class', 'facet_sidebar_visible');
+ facetButton.setAttribute('class', 'result_block_hidden');
window.location.hash = 'facet_sidebar';
}
function getResulty() {
resultBlock.setAttribute('class', 'result_block_visible');
+ resultButton.setAttribute('class', 'result_block_hidden');
facetSidebar.setAttribute('class', 'facet_sidebar_hidden');
+ facetButton.setAttribute('class', 'results_header_btns result_block_visible');
window.location.hash = 'result_block';
}
</script>
diff --git a/Open-ILS/src/templates/opac/results.tt2 b/Open-ILS/src/templates/opac/results.tt2
index 39b40ad..3862355 100644
--- a/Open-ILS/src/templates/opac/results.tt2
+++ b/Open-ILS/src/templates/opac/results.tt2
@@ -24,6 +24,8 @@
<div class="results_header_btns">
<a href="[% mkurl(ctx.opac_root _ '/home', {$loc_name => loc_value}, 1) %]">[% l('Another Search') %]</a>
</div>
+ <div id="refine_hits" class="results_header_btns result_block_visible"><a onclick="getFacety();">[% l('Refine these results') %]</a></div>
+ <div id="return_to_hits" class="results_header_btns"><a onclick="getResulty();">[% l('Back to results') %]</a></div>
<div class="results_header_btns">
<a href="[% mkurl(ctx.opac_root _ '/advanced') %]">[% l('Advanced Search') %]</a>
</div>
commit 7419645aabd19dbe9b9dac2d6292fa7afdd02c1e
Author: Dan Scott <dscott at laurentian.ca>
Date: Mon Sep 23 14:16:01 2013 -0400
TPAC: Remove "Dynamic catalog" link from footer
The TPAC _is_ the dynamic catalog as of 2.3. It no longer has a need to
link to itself.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/parts/footer.tt2 b/Open-ILS/src/templates/opac/parts/footer.tt2
index 83d63e5..4e62f85 100644
--- a/Open-ILS/src/templates/opac/parts/footer.tt2
+++ b/Open-ILS/src/templates/opac/parts/footer.tt2
@@ -1,6 +1,5 @@
<div id="footer-wrap">
<div id="footer">
- <a href="/">[% l('Dynamic catalog') %]</a> |
[% IF ctx.get_org_setting(
ctx.physical_loc || ctx.aou_tree.id, 'opac.allow_pending_user') %]
<a href="[% mkurl(ctx.opac_root _ '/register') %]">[%
commit db6b04817c899816e9be887c8bbc13a782614c28
Author: Ben Shum <bshum at biblio.org>
Date: Fri Sep 20 17:48:40 2013 -0400
Hide searchbar from myopac and other non-search related pages
Ugly hack to add the mobile_hide div class around the searchbar.tt2 includes.
Eventually should add some smarter options in searchbar.tt2 for displaying or not
in various interfaces.
Signed-off-by: Ben Shum <bshum at biblio.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/mylist.tt2 b/Open-ILS/src/templates/opac/mylist.tt2
index 2a00a35..2164e41 100644
--- a/Open-ILS/src/templates/opac/mylist.tt2
+++ b/Open-ILS/src/templates/opac/mylist.tt2
@@ -3,7 +3,9 @@
WRAPPER "opac/parts/base.tt2";
INCLUDE "opac/parts/topnav.tt2";
ctx.page_title = l("Record Detail") %]
+ <div class="mobile_hide">
[% INCLUDE "opac/parts/searchbar.tt2" %]
+ </div>
<div id="content-wrapper">
<div id="main-content">
[% IF ctx.mylist.size;
diff --git a/Open-ILS/src/templates/opac/parts/myopac/base.tt2 b/Open-ILS/src/templates/opac/parts/myopac/base.tt2
index 7f87968..3dae62f 100644
--- a/Open-ILS/src/templates/opac/parts/myopac/base.tt2
+++ b/Open-ILS/src/templates/opac/parts/myopac/base.tt2
@@ -10,7 +10,9 @@
skin_root = "../"
%]
[% INCLUDE "opac/parts/topnav.tt2" %]
+ <div class="mobile_hide">
[% INCLUDE "opac/parts/searchbar.tt2" %]
+ </div>
<div id="content-wrapper">
<div id="myopac_tabs">
<div id="acct_tabs">
diff --git a/Open-ILS/src/templates/opac/password_reset.tt2 b/Open-ILS/src/templates/opac/password_reset.tt2
index beb75c7..6bc6b24 100644
--- a/Open-ILS/src/templates/opac/password_reset.tt2
+++ b/Open-ILS/src/templates/opac/password_reset.tt2
@@ -3,7 +3,9 @@
INCLUDE "opac/parts/topnav.tt2";
ctx.page_title = l('Library system password reset request form');
-%]
+<div class="mobile_hide">
[% INCLUDE "opac/parts/searchbar.tt2" %]
+</div>
[%
uuid = ctx.page_args.0;
diff --git a/Open-ILS/src/templates/opac/sms_cn.tt2 b/Open-ILS/src/templates/opac/sms_cn.tt2
index 3ccbf6f..5353a70 100644
--- a/Open-ILS/src/templates/opac/sms_cn.tt2
+++ b/Open-ILS/src/templates/opac/sms_cn.tt2
@@ -2,7 +2,9 @@
WRAPPER "opac/parts/base.tt2";
INCLUDE "opac/parts/topnav.tt2";
ctx.page_title = l("Send Call Number via Text/SMS") %]
+ <div class="mobile_hide">
[% INCLUDE "opac/parts/searchbar.tt2" %]
+ </div>
<div id="content-wrapper">
<div id="main-content">
<div class="common-full-pad"></div>
commit f6360ccdd1652b04299eea00018fa372a8f74a8d
Author: Kathy Lussier <klussier at masslnc.org>
Date: Fri Sep 20 15:09:13 2013 -0400
Replace prefs tabs with select menu in mobile view
There are too many account preference tabs to display cleanly on a small
screen resolution, so let's replace them with a select menu for
navigation. At the same time, we remove hardcoded values used for the
navigation tabs so that we do not need to maintain links/labels for the
menus in two different places.
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 8764760..cdc6071 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -353,7 +353,7 @@ span.dash_divider {
color: [% css_colors.accent_medium %];
}
-#acct_select {
+#acct_select, #acct_prefs_select {
display: none;
}
@@ -1753,11 +1753,11 @@ a.preflib_change {
display: none;
}
- #acct_select {
+ #acct_select, #acct_prefs_select {
display: inline-block;
}
- #acct_tabs {
+ #acct_tabs, #acct_prefs_tabs {
display:none;
}
diff --git a/Open-ILS/src/templates/opac/myopac/prefs.tt2 b/Open-ILS/src/templates/opac/myopac/prefs.tt2
index 8e45561..df1d444 100644
--- a/Open-ILS/src/templates/opac/myopac/prefs.tt2
+++ b/Open-ILS/src/templates/opac/myopac/prefs.tt2
@@ -1,7 +1,7 @@
[% PROCESS "opac/parts/header.tt2";
WRAPPER "opac/parts/myopac/prefs_base.tt2";
myopac_page = "prefs";
- prefs_page = 'personal' %]
+ prefs_page = 'prefs' %]
<div id="acct_info_main">
<div id='myopac.expired.alert'
diff --git a/Open-ILS/src/templates/opac/myopac/prefs_my_lists.tt2 b/Open-ILS/src/templates/opac/myopac/prefs_my_lists.tt2
index 69106a4..441ba3e 100644
--- a/Open-ILS/src/templates/opac/myopac/prefs_my_lists.tt2
+++ b/Open-ILS/src/templates/opac/myopac/prefs_my_lists.tt2
@@ -1,7 +1,7 @@
[% PROCESS "opac/parts/header.tt2";
WRAPPER "opac/parts/myopac/prefs_base.tt2";
myopac_page = "prefs";
- prefs_page = 'my_lists' %]
+ prefs_page = 'prefs_my_lists' %]
<form method='post'>
diff --git a/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2 b/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2
index c0c1fba..0663d86 100644
--- a/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2
+++ b/Open-ILS/src/templates/opac/myopac/prefs_notify.tt2
@@ -1,7 +1,7 @@
[% PROCESS "opac/parts/header.tt2";
WRAPPER "opac/parts/myopac/prefs_base.tt2";
myopac_page = "prefs";
- prefs_page = 'notify' %]
+ prefs_page = 'prefs_notify' %]
<form method='post'>
[% setting = 'opac.hold_notify' %]
diff --git a/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2 b/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2
index 4896a7b..3032382 100644
--- a/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2
+++ b/Open-ILS/src/templates/opac/myopac/prefs_settings.tt2
@@ -2,7 +2,7 @@
PROCESS "opac/parts/org_selector.tt2";
WRAPPER "opac/parts/myopac/prefs_base.tt2";
myopac_page = "prefs";
- prefs_page = 'settings' %]
+ prefs_page = 'prefs_settings' %]
<form method='post'>
diff --git a/Open-ILS/src/templates/opac/parts/myopac/prefs_base.tt2 b/Open-ILS/src/templates/opac/parts/myopac/prefs_base.tt2
index 031da15..ec9e657 100644
--- a/Open-ILS/src/templates/opac/parts/myopac/prefs_base.tt2
+++ b/Open-ILS/src/templates/opac/parts/myopac/prefs_base.tt2
@@ -1,65 +1,31 @@
[% PROCESS "opac/parts/header.tt2";
WRAPPER "opac/parts/myopac/base.tt2"; %]
+ [% acct_prefs_pages = [
+ {url => "prefs", name => l("Personal Information")},
+ {url => "prefs_notify", name => l("Notification Preferences")},
+ {url => "prefs_settings", name => l("Search and History Preferences")},
+ {url => "prefs_my_lists", name => l("My Lists Preferences")}
+ ];
+ skin_root = "../"
+%]
+
<div id='myopac_prefs_div'>
<div id="acct_prefs_tabs">
<div style="float:left;">
+ [%- FOREACH page IN acct_prefs_pages;
+ IF page.url == prefs_page;
+ cls_select = "align selected";
+ ELSE;
+ cls_select = "align";
+ END -%]
- [% IF prefs_page == 'personal' %]
- <div class="align selected">
- <a href='#'>[% l("Personal Information") %]</a>
- </div>
- <div class="align">
- <a href='[% mkurl('prefs_notify') %]'>[% l("Notification Preferences") %]</a>
- </div>
- <div class="align">
- <a href='[% mkurl('prefs_settings') %]'>[% l("Search and History Preferences") %]</a>
- </div>
- <div class="align">
- <a href='[% mkurl('prefs_my_lists') %]'>[% l("My Lists Preferences") %]</a>
- </div>
- [% ELSIF prefs_page == 'notify' %]
- <div class="align">
- <a href='[% mkurl('prefs') %]'>[% l("Personal Information") %]</a>
- </div>
- <div class="align selected">
- <a href='#'>[% l("Notification Preferences") %]</a>
- </div>
- <div class="align" >
- <a href='[% mkurl('prefs_settings') %]'>[% l("Search and History Preferences") %]</a>
- </div>
- <div class="align">
- <a href='[% mkurl('prefs_my_lists') %]'>[% l("My Lists Preferences") %]</a>
- </div>
- [% ELSIF prefs_page == 'settings' %]
- <div class="align">
- <a href='[% mkurl('prefs') %]'>[% l("Personal Information") %]</a>
+ <div class="[% cls_select %]">
+ <a href="[% mkurl(ctx.opac_root _ '/myopac/' _ page.url, {}, ['bbid', 'offset', 'limit']) %]">[% page.name; %]</a>
</div>
- <div class="align">
- <a href='[% mkurl('prefs_notify') %]'>[% l("Notification Preferences") %]</a>
- </div>
- <div class="align selected" >
- <a href='#'>[% l("Search and History Preferences") %]</a>
- </div>
- <div class="align">
- <a href='[% mkurl('prefs_my_lists') %]'>[% l("My Lists Preferences") %]</a>
- </div>
- [% ELSE %]
- <div class="align">
- <a href='[% mkurl('prefs') %]'>[% l("Personal Information") %]</a>
- </div>
- <div class="align">
- <a href='[% mkurl('prefs_notify') %]'>[% l("Notification Preferences") %]</a>
- </div>
- <div class="align" >
- <a href='[% mkurl('prefs_settings') %]'>[% l("Search and History Preferences") %]</a>
- </div>
- <div class="align selected">
- <a href='#'>[% l("My Lists Preferences") %]</a>
- </div>
- [% END %]
- </div>
- </div>
+ [% END %]
+ </div>
+ </div>
<div class="clear-both"></div> <br/>
@@ -69,6 +35,19 @@
<a class="hide_me" href="#">[% l('Export List') %]</a><!-- what does this do? -->
</span>
</div>
+ <!- Select box navigation for mobile view ->
+ <div id="acct_prefs_select">
+ <form name="acct_prefs_nav">
+ <select name="acct_prefs_url" aria-label="Select a preference page" onchange="window.location.href=document.acct_prefs_nav.acct_prefs_url.options[document.acct_prefs_nav.acct_prefs_url.selectedIndex].value">
+ [% FOREACH page IN acct_prefs_pages;
+ IF page.url != prefs_page; %]
+ <option value="[% mkurl(ctx.opac_root _ '/myopac/' _ page.url, {}, ['bbid', 'offset', 'limit']) %]">[% page.name; %]</option>;
+ [% ELSE; %]
+ <option value="" disabled selected>[% page.name; %]</option>;
+ [% END;
+ END; %]
+ </select>
+ </div>
<div class="clear-both normal-height"></div>
commit b471e6105bff194ddf26619f32bbcae10553867b
Author: Bill Ott <bott at grpl.org>
Date: Fri Sep 20 09:13:05 2013 -0400
Reactive tables for myopac circ and holds.
Initial stab at trying to restructure the table data to fit into a vertical table'ish design.
Also took a machete to the nth display:none portions of the previous style so we could see all
the glory that needed to be restructured.
Signed-off-by: Bill Ott <bott at grpl.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 95d5568..8764760 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1764,30 +1764,9 @@ a.preflib_change {
#acct_checked_tabs {
display:none;
}
- #acct_checked_main_header tr td:nth-child(5), #acct_checked_main_header tr td:nth-child(6) {
- display:none;
- }
- #acct_checked_temp table tr td:nth-child(5), #acct_checked_temp table tr td:nth-child(6) {
- display: none;
- }
#acct_holds_tabs {
display: none;
}
- #holds_main form table.opac-auto-097 tr td:nth-child(3), #holds_main form table.opac-auto-097 tr td:nth-child(5) {
- display: none;
- }
- #acct_holds_main_header tr td:nth-child(3),
- #acct_holds_main_header tr td:nth-child(4), #acct_holds_main_header tr td:nth-child(5),
- #acct_holds_main_header tr td:nth-child(6), #acct_holds_main_header tr td:nth-child(7),
- #acct_holds_main_header tr td:nth-child(8) {
- display: none;
- }
- tr#acct_holds_temp td:nth-child(3),
- tr#acct_holds_temp td:nth-child(4), tr#acct_holds_temp td:nth-child(5),
- tr#acct_holds_temp td:nth-child(6), tr#acct_holds_temp td:nth-child(7),
- tr#acct_holds_temp td:nth-child(8), tr#acct_holds_temp td:nth-child(10) {
- display: none;
- }
#dash_wrapper div {
background: transparent;
padding: 0px;
@@ -1821,23 +1800,6 @@ a.preflib_change {
#myopac_sum_fines {
display: none;
}
- #myopac_circ_trans_row td:nth-child(2), #myopac_circ_trans_row td:nth-child(3),
- #myopac_circ_trans_row td:nth-child(4), #myopac_circ_trans_row td:nth-child(5) {
- display: none;
- }
- #myopac_trans_row td:nth-child(1), #myopac_trans_row td:nth-child(2),
- #myopac_trans_row td:nth-child(3), #myopac_trans_row td:nth-child(4) {
- display: none;
- }
- /* Hack el terrible... */
- #myopac_circ_trans_div table thead tr td:nth-child(2), #myopac_circ_trans_div table thead tr td:nth-child(3),
- #myopac_circ_trans_div table thead tr td:nth-child(4), #myopac_circ_trans_div table thead tr td:nth-child(5) {
- display:none;
- }
- #myopac_trans_div table thead tr td:nth-child(1), #myopac_trans_div table thead tr td:nth-child(2),
- #myopac_trans_div table thead tr td:nth-child(3), #myopac_trans_div table thead tr td:nth-child(4) {
- display: none;
- }
.results_header_div, .results_header_lbl {
display: none;
}
@@ -1997,4 +1959,81 @@ a.preflib_change {
#adv_global_addrow td {
border-bottom: none;
}
+ /* Force table to not be like tables anymore */
+ table#acct_checked_main_header thead tr th {
+ display: block;
+ }
+ table#acct_checked_main_header tbody tr td {
+ display: block;
+ }
+
+ /* Hide table headers (but not display: none;, for accessibility) */
+ thead tr {
+ position: absolute;
+ top: -9999px;
+ left: -9999px;
+ }
+
+ table#acct_checked_main_header tr { border: 1px solid #ddd; }
+
+ table#acct_checked_main_header td {
+ /* Behave like a "row" */
+ border: none;
+ border-bottom: 1px solid #eee;
+ position: relative;
+ padding-left: 40%;
+ }
+
+ table#acct_checked_main_header td:before {
+ /* Now like a table header */
+ position: absolute;
+ /* Top/left values mimic padding */
+ left: 2px;
+ width: 40%;
+ padding-right: 10px;
+ white-space: nowrap;
+ }
+
+ table#acct_checked_main_header td:nth-of-type(1) { border-top: 5px solid #aaa; padding-top: 15px; background-color: #fff;}
+ table#acct_checked_main_header td:nth-of-type(2):before { content: "Title / Author";}
+ table#acct_checked_main_header td:nth-of-type(3):before { content: "Renewals Left"; }
+ table#acct_checked_main_header td:nth-of-type(4):before { content: "Due Date"; }
+ table#acct_checked_main_header td:nth-of-type(5):before { content: "Barcode"; }
+ table#acct_checked_main_header td:nth-of-type(6):before { content: "Call number"; }
+
+ table#acct_holds_main_header thead tr th {
+ display: block;
+ }
+ table#acct_holds_main_header tbody tr td {
+ display: block;
+ }
+
+ table#acct_holds_main_header td {
+ /* Behave like a "row" */
+ border: none;
+ border-bottom: 1px solid #eee;
+ position: relative;
+ padding-left: 40%;
+ }
+
+
+ table#acct_holds_main_header td:before {
+ /* Now like a table header */
+ position: absolute;
+ /* Top/left values mimic padding */
+ left: 2px;
+ width: 40%;
+ padding-right: 10px;
+ white-space: nowrap;
+ }
+
+ table#acct_holds_main_header td:nth-of-type(1) { border-top: 5px solid #aaa; padding-top: 15px; background-color: #fff;}
+ table#acct_holds_main_header td:nth-of-type(2):before { content: "Title";}
+ table#acct_holds_main_header td:nth-of-type(3):before { content: "Author"; }
+ table#acct_holds_main_header td:nth-of-type(4):before { content: "Format"; }
+ table#acct_holds_main_header td:nth-of-type(5):before { content: "Pickup Location"; }
+ table#acct_holds_main_header td:nth-of-type(6):before { content: "Activate"; }
+ table#acct_holds_main_header td:nth-of-type(7):before { content: "Cancel on"; }
+ table#acct_holds_main_header td:nth-of-type(8):before { content: "Active"; }
+ table#acct_holds_main_header td:nth-of-type(9):before { content: "Status"; }
}
diff --git a/Open-ILS/src/templates/opac/myopac/circs.tt2 b/Open-ILS/src/templates/opac/myopac/circs.tt2
index 60dd243..21d4baa 100644
--- a/Open-ILS/src/templates/opac/myopac/circs.tt2
+++ b/Open-ILS/src/templates/opac/myopac/circs.tt2
@@ -93,7 +93,7 @@
) %]">[% attrs.author | html %]</a>
[% END %]
</td>
- <td name="renewals" align="center">
+ <td name="renewals">
[% circ.circ.renewal_remaining %]
</td>
[%
commit 08beb255d5d247e29ead4e68fb41cb8db750369f
Author: Kathy Lussier <klussier at masslnc.org>
Date: Fri Sep 20 00:52:28 2013 -0400
Disabled option in account menu
Instead of hiding the active page in the My Account select box navigation,
let's disable it so that the menu remains consistent from page to page.
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/parts/myopac/base.tt2 b/Open-ILS/src/templates/opac/parts/myopac/base.tt2
index 630a5a0..7f87968 100644
--- a/Open-ILS/src/templates/opac/parts/myopac/base.tt2
+++ b/Open-ILS/src/templates/opac/parts/myopac/base.tt2
@@ -25,14 +25,17 @@
class="[% cls_which %]">[% page.name; %]</a>
[% END %]
</div>
- <div id="acct_select">
+ <!- Select box navigation for media view ->
+ <div id="acct_select">
<form name="acct_nav">
<select name="acct_url" aria-label="Select an account page" onchange="window.location.href=document.acct_nav.acct_url.options[document.acct_nav.acct_url.selectedIndex].value">
<option value="" selected="selected">Go to...</option>
[% FOREACH page IN myopac_pages;
IF page.url != myopac_page; %]
<option value="[% mkurl(ctx.opac_root _ '/myopac/' _ page.url, {}, ['bbid', 'offset', 'limit']) %]">[% page.name; %]</option>
- [% END;
+ [% ELSE; %]
+ <option value="" disabled>[% page.name; %]</option>
+ [% END;
END; %]
</select>
</div>
commit 851c9a909c010d530926f8222dd52b5843858abc
Author: Dan Scott <dscott at laurentian.ca>
Date: Thu Sep 19 20:28:32 2013 -0400
Restore facet-first loading, add breakpoint for results
Facet first loading should be faster on slow servers, so do that rather
than loading them after the results and forcing a page render when we
dump them into place on wide screens.
Also add an 800px breakpoint to prevent results from getting pushed
underneath the facets; at 800px, we go into "hide facets" mode instead.
This gets picked up by the 600px breakpoint, so it's all good.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 491802a..95d5568 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1007,9 +1007,6 @@ div.adv_search_available {
.facetFieldLineValue { overflow: hidden; text-overflow: ellipsis; }
[%- END -%]
-div#result_block {
- float: left;
-}
div#facet_sidebar {
float: left;
border-right: 1px solid [% css_colors.border_standard %];
@@ -1679,6 +1676,19 @@ a.preflib_change {
font-size: [% css_fonts.size_bigger %];
}
+ at media only screen and (max-width: 800px) {
+ .facet_sidebar_hidden, .result_block_hidden {
+ display: none;
+ }
+ .facet_sidebar_visible, .result_block_visible {
+ display: inline;
+ }
+ #refine_hits, #return_to_hits {
+ display: block;
+ padding-left: 15px;
+ }
+}
+
@media only screen and (max-width: 600px) {
input, select {
font-size: [% css_fonts.size_big %];
@@ -1914,16 +1924,6 @@ a.preflib_change {
#facet_sidebar {
margin-top: 0.5em;
}
- .facet_sidebar_hidden, .result_block_hidden {
- display: none;
- }
- .facet_sidebar_visible, .result_block_visible {
- display: visible;
- }
- #refine_hits, #return_to_hits {
- display: block;
- padding-left: 15px;
- }
#adv_search_parent {
font-size: [% css_fonts.size_smaller %];
}
diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index f2bb4b8..4c7f7ed 100644
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -20,6 +20,11 @@
</div>
[% END %]
<div id="result_table_div">
+ <div class="facet_sidebar_hidden" id="facet_sidebar">
+ <div id="return_to_hits"><a onclick="getResulty();">[% l('Back to results') %]</a></div>
+ [% INCLUDE "opac/parts/staff_saved_searches.tt2" %]
+ [% INCLUDE 'opac/parts/result/facets.tt2' %]
+ </div>
<div id="result_block" class="result_block_visible">
<div id="refine_hits"><a onclick="getFacety();">[% l('Refine these results') %]</a></div>
<table cellpadding="0" cellspacing="0"
@@ -354,11 +359,6 @@ END;
</tbody>
</table>
</div>
- <div class="facet_sidebar_hidden" id="facet_sidebar">
- <div id="return_to_hits"><a onclick="getResulty();">[% l('Back to results') %]</a></div>
- [% INCLUDE "opac/parts/staff_saved_searches.tt2" %]
- [% INCLUDE 'opac/parts/result/facets.tt2' %]
- </div>
</div>
<div class="result_footer_nav1">
[% ctx.results_count_header %]
@@ -376,14 +376,4 @@ function getResulty() {
facetSidebar.setAttribute('class', 'facet_sidebar_hidden');
window.location.hash = 'result_block';
}
-function moveFacets() {
- var clientWidth = document.documentElement.clientWidth;
- if (clientWidth >= 600) {
- if (resultBlock && facetSidebar) {
- resultBlock.parentNode.insertBefore(facetSidebar, resultBlock);
- }
- }
-}
-window.onresize = moveFacets;
-window.onload = moveFacets;
</script>
commit ecd0b786e24811cf1e1b75929f11e396ce4d1301
Author: Dan Scott <dscott at laurentian.ca>
Date: Thu Sep 19 14:57:58 2013 -0400
Show/hide facets & search results in mobile mode
Use CSS + a bit of JavaScript to show/hide facets and results, and
anchor the page accordingly.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 8841502..491802a 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1007,7 +1007,10 @@ div.adv_search_available {
.facetFieldLineValue { overflow: hidden; text-overflow: ellipsis; }
[%- END -%]
-div.facet_sidebar {
+div#result_block {
+ float: left;
+}
+div#facet_sidebar {
float: left;
border-right: 1px solid [% css_colors.border_standard %];
margin-right: 1em;
@@ -1655,7 +1658,7 @@ a.preflib_change {
clear: both;
}
-.small_view_only, #refine_hits {
+.small_view_only, #refine_hits, #return_to_hits {
display: none;
}
@@ -1908,10 +1911,16 @@ a.preflib_change {
.facet_template .count {
padding-left: 1em;
}
- .facet_sidebar {
+ #facet_sidebar {
margin-top: 0.5em;
}
- #refine_hits {
+ .facet_sidebar_hidden, .result_block_hidden {
+ display: none;
+ }
+ .facet_sidebar_visible, .result_block_visible {
+ display: visible;
+ }
+ #refine_hits, #return_to_hits {
display: block;
padding-left: 15px;
}
diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index 394bfe8..f2bb4b8 100644
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -10,8 +10,6 @@
%]
-<div id="refine_hits"><a href="#facet_sidebar">[% l('Refine these results') %]</a></div>
-
[% PROCESS "opac/parts/result/paginate.tt2" %]
[% ctx.results_count_header = PROCESS results_count_header;
ctx.results_count_header %]
@@ -22,7 +20,8 @@
</div>
[% END %]
<div id="result_table_div">
- <div class="result_block">
+ <div id="result_block" class="result_block_visible">
+ <div id="refine_hits"><a onclick="getFacety();">[% l('Refine these results') %]</a></div>
<table cellpadding="0" cellspacing="0"
border="0" style="margin-top:10px;">
<tbody id="result_table">
@@ -355,29 +354,36 @@ END;
</tbody>
</table>
</div>
- <div class="facet_sidebar" id="facet_sidebar">
+ <div class="facet_sidebar_hidden" id="facet_sidebar">
+ <div id="return_to_hits"><a onclick="getResulty();">[% l('Back to results') %]</a></div>
[% INCLUDE "opac/parts/staff_saved_searches.tt2" %]
[% INCLUDE 'opac/parts/result/facets.tt2' %]
</div>
- <script>
- function showHideFacets() {
- var clientWidth = document.documentElement.clientWidth;
- resultBlock = document.querySelector('.result_block');
- facetSidebar = document.querySelector('.facet_sidebar');
- if (clientWidth >= 600) {
- if (resultBlock && facetSidebar) {
- resultBlock.parentNode.insertBefore(facetSidebar, resultBlock);
- }
- } else if (clientWidth < 600) {
- if (resultBlock && facetSidebar) {
- resultBlock.parentNode.insertBefore(resultBlock, facetSidebar);
- }
- }
- }
- window.onresize = showHideFacets;
- window.onload = showHideFacets;
- </script>
</div>
<div class="result_footer_nav1">
[% ctx.results_count_header %]
</div>
+<script>
+resultBlock = document.querySelector('#result_block');
+facetSidebar = document.querySelector('#facet_sidebar');
+function getFacety() {
+ resultBlock.setAttribute('class', 'result_block_hidden');
+ facetSidebar.setAttribute('class', 'facet_sidebar_visible');
+ window.location.hash = 'facet_sidebar';
+}
+function getResulty() {
+ resultBlock.setAttribute('class', 'result_block_visible');
+ facetSidebar.setAttribute('class', 'facet_sidebar_hidden');
+ window.location.hash = 'result_block';
+}
+function moveFacets() {
+ var clientWidth = document.documentElement.clientWidth;
+ if (clientWidth >= 600) {
+ if (resultBlock && facetSidebar) {
+ resultBlock.parentNode.insertBefore(facetSidebar, resultBlock);
+ }
+ }
+}
+window.onresize = moveFacets;
+window.onload = moveFacets;
+</script>
commit e72b728646e4023dbf6d7fd4ce035aa24d50481d
Author: Dan Scott <dscott at laurentian.ca>
Date: Thu Sep 19 11:45:44 2013 -0400
Mobile: group advanced search rows with a border
We want advanced search rows to wrap on mobile, but also want to group
the elements in some way. This adds a simple border on the bottom of
each row to suggest that things are together.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 37328b9..8841502 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1121,7 +1121,6 @@ div.facet_sidebar {
.advanced_div { padding-top: 15px; }
#adv_global_search { width: 100%; }
#adv_global_search select { width: 13em; }
-#adv_global_row { white-space: nowrap; }
#adv_global_addrow td { padding-top: 7px; }
#adv_global_input_table { width: 100%; }
#adv_global_input_table select { width: 7em; }
@@ -1983,4 +1982,10 @@ a.preflib_change {
-moz-border-radius: 10px 0px 0px 0px;
border-radius: 7px 7px 0px 0px;
}
+ #adv_global_tbody td {
+ border-bottom: thin solid [% css_colors.accent_light %];
+ }
+ #adv_global_addrow td {
+ border-bottom: none;
+ }
}
commit 2cf503ac745b1a4e73d9c396da932f491aecca65
Author: Dan Scott <dscott at laurentian.ca>
Date: Thu Sep 19 11:11:22 2013 -0400
Bump up the default font size, use consistent font sizes
opac/parts/css/fonts.tt2 defines all of the font sizes we should be
using for consistency throughout the TPAC. There was a need felt to bump
up the default font size in the mobile UI from 12px to 12pt, which was
matched by a number of sites who had also bumped the normal UI up to
14px or 15px. Rather than having a weird font-size jump when you narrow
a browser window to < 600px, keep the same base font size... but bump it
up.
Also, replace hardcoded 100% etc font sizes with the templated font
sizes for consistency.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index a9b2cf0..37328b9 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1601,7 +1601,7 @@ a.preflib_change {
padding-bottom: 0.5ex;
}
.browse-shortcuts {
- font-size: 120%;
+ font-size: [% css_fonts.size_bigger %];
}
.browse-result-authority-field-name {
font-style: italic;
@@ -1609,10 +1609,10 @@ a.preflib_change {
}
.browse-leading-article-warning {
font-style: italic;
- font-size: 110%;
+ font-size: [% css_fonts.size_big %];
}
.browse-public-general-note {
- font-size: 110%;
+ font-size: [% css_fonts.size_big %];
}
.browse-public-general-note-label { }
.browse-public-general-note-institution {
@@ -1629,7 +1629,7 @@ a.preflib_change {
#main-content-register {
margin-left: 40px;
- font-size: 120%;
+ font-size: [% css_fonts.size_bigger %];
}
#main-content-register table {
@@ -1678,11 +1678,8 @@ a.preflib_change {
}
@media only screen and (max-width: 600px) {
- body {
- font-size: 12pt;
- }
input, select {
- font-size: 110%;
+ font-size: [% css_fonts.size_big %];
}
span .nav_arrow_fix {
display: none;
@@ -1737,7 +1734,7 @@ a.preflib_change {
padding: 2px 4px 3px 4px;
-moz-border-radius: 6px 6px 0px 0px;
border-radius: 6px 6px 0px 0px;
- font-size: 100%;
+ font-size: [% css_fonts.size_base %];
margin: 0px 5px 0px 0px;
}
#acct_fines_tabs {
@@ -1978,7 +1975,7 @@ a.preflib_change {
height: 25px;
}
#adv_search_tabs a{
- font-size: 93%;
+ font-size: [% css_fonts.size_small %];
margin: 2px;
margin-right: 2px;
margin-bottom: 2px;
diff --git a/Open-ILS/src/templates/opac/parts/css/fonts.tt2 b/Open-ILS/src/templates/opac/parts/css/fonts.tt2
index 860d8d1..556952b 100644
--- a/Open-ILS/src/templates/opac/parts/css/fonts.tt2
+++ b/Open-ILS/src/templates/opac/parts/css/fonts.tt2
@@ -1,10 +1,10 @@
[%-
css_fonts = {
- size_base = "12px",
- size_small = "92%", # 11px
- size_smaller = "83%", # 10px
- size_smallest = "75%", # 9px
- size_big = "110%", # 13.2px
+ size_base = "14px",
+ size_small = "92%",
+ size_smaller = "83%",
+ size_smallest = "75%",
+ size_big = "110%",
size_bigger = "125%",
size_biggest = "150%"
}
commit 5511067ce20b1588ba7a521ebe590000ccc0badc
Author: Ben Shum <bshum at biblio.org>
Date: Thu Sep 19 10:59:30 2013 -0400
Change CSS for dash identity
Set to float:left; for the dash identity so that the buttons are in order:
"My account" then "Logout"
Signed-off-by: Ben Shum <bshum at biblio.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 5611e77..a9b2cf0 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1794,7 +1794,7 @@ a.preflib_change {
display: inline !important;
}
#dash_identity a {
- float:right;
+ float:left;
}
#dashboard {
display: none;
commit bea813fb7a078dcbf53dccfc1da70a1ae1d8de95
Author: Garry Collum <gcollum at gmail.com>
Date: Thu Sep 19 10:24:56 2013 -0400
Additional CSS changes for copy details for mobile web.
Adds fix for background color for bibs with linked items.
Signed-off-by: Garry Collum <gcollum at gmail.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 2ff121a..5611e77 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1882,13 +1882,16 @@ a.preflib_change {
display: block;
margin-top: 3px;
}
- #rdetails_status tr:nth-of-type(odd) {
- background-color: #eee;
- }
#rdetails_status td {
display: block;
padding: 1px;
}
+ .copy_details_row {
+ background-color: [% css_colors.accent_lightest %];
+ }
+ .copy_details_offers_row {
+ background-color: [% css_colors.accent_lightest %];
+ }
select#pickup_lib.search-wrapper-locg {
width: 100%;
}
diff --git a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2 b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
index 41268f3..e9f962e 100644
--- a/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/copy_table.tt2
@@ -54,7 +54,7 @@ END;
<tbody class="copy_details_table">
[%- FOREACH peer IN ctx.foreign_copies;
FOREACH bib IN peer.foreign_copy_maps; %]
- <tr><td header='copy_header_shelfloc'>
+ <tr class="copy_details_row"><td header='copy_header_shelfloc'>
[%- bib_lib_name = ctx.get_aou(bib.target_copy.circ_lib).name | html;
l("[_1] (foreign item)", bib_lib_name); -%]
<ul><li>
@@ -89,7 +89,7 @@ END; # FOREACH bib
callnum = callnum _ " " _ callnum_suffix;
END;
-%]
- <tr property="offers" typeof="Offer">
+ <tr class="copy_details_offers_row" property="offers" typeof="Offer">
[%- IF serial_holdings %]<td header='copy_header_holding_label' class='rdetail-issue-issue'>
[%- copy_info.holding_label | html; -%]
</td>
commit 4a1c5dd97e1df30181f086ef115ad0889a03c1e8
Author: Bill Ott <bott at grpl.org>
Date: Thu Sep 19 10:18:16 2013 -0400
Fix up the advanced search tabs advanced, numeric, expert
Signed-off-by: Bill Ott <bott at grpl.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index ecbf8de..2ff121a 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1971,5 +1971,16 @@ a.preflib_change {
.bookshelf table thead tr {
display: block;
}
-
+ #adv_search_tabs {
+ height: 25px;
+ }
+ #adv_search_tabs a{
+ font-size: 93%;
+ margin: 2px;
+ margin-right: 2px;
+ margin-bottom: 2px;
+ padding: 2px 2px 5px 2px;
+ -moz-border-radius: 10px 0px 0px 0px;
+ border-radius: 7px 7px 0px 0px;
+ }
}
commit b22d9ed1bf1d062de25b06baeea28ed76265d50d
Author: Dan Scott <dscott at laurentian.ca>
Date: Thu Sep 19 10:38:40 2013 -0400
Respect adv_break with clear: both
This keeps the old behaviour, in all ways, but rather than using a specific
/ arbitrary pixel width it uses clear:both to start a new line for a new
adv_break.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index bb4a2f2..ecbf8de 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -296,6 +296,7 @@ span.dash_divider {
#adv_filter_block {
padding: 15px;
float: left;
+ clear: both;
}
#adv_filter_block_item {
float: left;
diff --git a/Open-ILS/src/templates/opac/parts/config.tt2 b/Open-ILS/src/templates/opac/parts/config.tt2
index 65861b2..bd4f77c 100644
--- a/Open-ILS/src/templates/opac/parts/config.tt2
+++ b/Open-ILS/src/templates/opac/parts/config.tt2
@@ -115,7 +115,7 @@ search.adv_config = [
{adv_label => l("Item Type"), adv_attr => ["mattype", "item_type"]},
{adv_label => l("Item Form"), adv_attr => "item_form"},
{adv_label => l("Language"), adv_attr => "item_lang"},
- {adv_label => l("Audience"), adv_attr => ["audience_group", "audience"]},
+ {adv_label => l("Audience"), adv_attr => ["audience_group", "audience"], adv_break => 1},
{adv_label => l("Video Format"), adv_attr => "vr_format"},
{adv_label => l("Bib Level"), adv_attr => "bib_level"},
{adv_label => l("Literary Form"), adv_attr => "lit_form"},
commit 2acd47d3b0d77edf6f245027e49fd14c5e1b938c
Author: Dan Scott <dscott at laurentian.ca>
Date: Thu Sep 19 10:02:45 2013 -0400
More responsive advanced search
By default, rather than having blocks of search filters with an explicit
width of 800px or 850px, just have one line of filters that wraps
according to the width of the page (truly responsive).
Also move all inline styles into style.css so we can more easily
manipulate them based on media queries. And notice silly styles that can
be easily swapped out with clean styles.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 3d08ab2..bb4a2f2 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -289,9 +289,10 @@ span.dash_divider {
#adv_search_filters {
position: relative;
- width: 850px;
}
-
+#adv_search_rows {
+ border-bottom: none;
+}
#adv_filter_block {
padding: 15px;
float: left;
@@ -304,6 +305,7 @@ span.dash_divider {
#adv_special_block {
float: left;
padding: 5px;
+ margin-top: 5px;
}
#adv_search_submit {
@@ -904,7 +906,6 @@ table.acct_notes th {
.search_catalog_lbl {
font-size: [% css_fonts.size_bigger %];
}
-
.adv_search_catalog_lbl {
font-size: [% css_fonts.size_bigger %];
}
@@ -956,11 +957,17 @@ table.acct_notes th {
padding: 10px; border: 1px solid [% css_colors.accent_medium_dark %];
text-align: center;
}
-
+#adv_search_input { width: 100%; }
#adv_search_parent {
margin-bottom:0px;
}
-
+#search-submit-spinner {
+ height: 16px;
+ width: 16px;
+}
+div.adv_search_available {
+ margin-top: 1em;
+}
#myopac_loading {
width:100%;
text-align:center;
@@ -1111,8 +1118,11 @@ div.facet_sidebar {
}
.advanced_div { padding-top: 15px; }
+#adv_global_search { width: 100%; }
#adv_global_search select { width: 13em; }
-#adv_global_row { nowrap: 'nowrap'; }
+#adv_global_row { white-space: nowrap; }
+#adv_global_addrow td { padding-top: 7px; }
+#adv_global_input_table { width: 100%; }
#adv_global_input_table select { width: 7em; }
.adv_adv_link {
font-size: [% css_fonts.size_smaller %];
diff --git a/Open-ILS/src/templates/opac/parts/advanced/search.tt2 b/Open-ILS/src/templates/opac/parts/advanced/search.tt2
index ff88938..1228a39 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/search.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/search.tt2
@@ -3,15 +3,15 @@
PROCESS get_library;
%]
<form action="[% ctx.opac_root %]/results" method="get">
-<div id='adv_global_search' class='data_grid data_grid_center' width='100%'>
- <div id='adv_search_rows' style='border-bottom: none;'>
+<div id='adv_global_search' class='data_grid data_grid_center'>
+ <div id='adv_search_rows'>
<!-- Contains the user-addable(?) rows to define search class, containment and text -->
<div valign='top' class='adv_global_input_container'>
- <table width='100%' id='adv_global_input_table'>
+ <table id='adv_global_input_table'>
<thead>
<tr>
<td>
- <div style="width:100%;" class="header_middle">
+ <div class="header_middle" id="adv_search_input">
[% l("Search Input") %]
</div>
</td>
@@ -21,7 +21,7 @@
[% INCLUDE "opac/parts/advanced/global_row.tt2" %]
<!-- add a new row -->
<tr id='adv_global_addrow'>
- <td align='left' style="padding-top:7px;">
+ <td align='left'>
<a href="javascript:;" id="myopac_new_global_row" onclick='addSearchRow();'>[% l('Add Search Row') %]</a>
</td>
</tr>
@@ -35,7 +35,7 @@
<span>
<input id='search-submit-go' type="submit" value="[% l('Search') %]" alt="[% l('Search') %]" class="opac-button"
onclick='setTimeout(function(){$("search-submit-spinner").className=""; $("search-submit-go").className="hidden"}, 2000)'/>
- <img id='search-submit-spinner' src='/opac/images/progressbar_green.gif' style='height:16px;width:16px;' class='hidden' alt=''/>
+ <img id='search-submit-spinner' src='/opac/images/progressbar_green.gif' class='hidden' alt=''/>
</span>
<a href="[% mkurl(ctx.opac_root _ '/advanced', {$loc_name => loc_value}, 1) %]"
@@ -65,12 +65,11 @@
CASE "lib_selector";
PROCESS "opac/parts/org_selector.tt2";
INCLUDE build_org_selector show_loc_groups=1 id="adv_org_selector" %]
- <div style="position:relative;top:7px;">
+ <div class="adv_search_available">
<input type='checkbox' name="modifier"
value="available"[% CGI.param('modifier').grep('available').size ? ' checked="checked"' : '' %]
id='opac.result.limit2avail' />
- <label style="top:-2px;"
- for='opac.result.limit2avail'>
+ <label for='opac.result.limit2avail'>
[% l("Limit to Available") %]</label>
</div>
[%
@@ -89,7 +88,7 @@
[% END %]
</select>
<br/>
- <div id='adv_special_block' style='margin-top:5px;'>
+ <div id='adv_special_block'>
<input name='date1' type='text' size='4' maxlength='4' value="[% CGI.param('date1') | html %]" />
<span id='adv_global_pub_date_2_span' class='[% CGI.param("pubdate") == "between" ? "" : "hide_me" %]'>
[% l("and") %] <input name='date2' type='text' size='4' maxlength='4' value="[% CGI.param('date2') | html %]" />
diff --git a/Open-ILS/src/templates/opac/parts/config.tt2 b/Open-ILS/src/templates/opac/parts/config.tt2
index bd4f77c..65861b2 100644
--- a/Open-ILS/src/templates/opac/parts/config.tt2
+++ b/Open-ILS/src/templates/opac/parts/config.tt2
@@ -115,7 +115,7 @@ search.adv_config = [
{adv_label => l("Item Type"), adv_attr => ["mattype", "item_type"]},
{adv_label => l("Item Form"), adv_attr => "item_form"},
{adv_label => l("Language"), adv_attr => "item_lang"},
- {adv_label => l("Audience"), adv_attr => ["audience_group", "audience"], adv_break => 1},
+ {adv_label => l("Audience"), adv_attr => ["audience_group", "audience"]},
{adv_label => l("Video Format"), adv_attr => "vr_format"},
{adv_label => l("Bib Level"), adv_attr => "bib_level"},
{adv_label => l("Literary Form"), adv_attr => "lit_form"},
commit 803eb2577fa106d81635c74190199a6d0ae6ef35
Author: Ben Shum <bshum at biblio.org>
Date: Wed Sep 18 23:56:00 2013 -0400
Resize advanced search filters to allow more space by default
By default, the space allotted was perfect at 800px which worked in
Chrome browser just fine. But viewing in Firefox rendered the elements
slightly larger and wrapped some filters instead of displaying four
in a row as expected.
Increase the adv_search_filters from 800px to 850px to allow for more
space.
Signed-off-by: Ben Shum <bshum at biblio.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index e1da9bf..3d08ab2 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -289,7 +289,7 @@ span.dash_divider {
#adv_search_filters {
position: relative;
- width: 800px;
+ width: 850px;
}
#adv_filter_block {
commit 7dc6cf72acecabebc9da5f2b7b2d739d6136e9eb
Author: Ben Shum <bshum at biblio.org>
Date: Wed Sep 18 22:03:19 2013 -0400
Add new span for myopac buttons
Based on direction from Kathy Lussier:
1) Add a new span for the myopac buttons to keep them grouped
2) Hide an unnecessary extra dash divider from the myopac dashboard identity
Signed-off-by: Ben Shum <bshum at biblio.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index fbdf160..e1da9bf 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1942,6 +1942,12 @@ a.preflib_change {
.mobile_hide {
display: none;
}
+ .dash_divider {
+ display: none;
+ }
+ .dash_account_buttons {
+ display: block;
+ }
.searchbar { line-height: 1.5em; }
#browse-controls { line-height: 1.5em; }
#search_query_label, #search_qtype_label, #search_itype_label, #search_locg_label {
@@ -1954,4 +1960,5 @@ a.preflib_change {
.bookshelf table thead tr {
display: block;
}
+
}
diff --git a/Open-ILS/src/templates/opac/parts/topnav.tt2 b/Open-ILS/src/templates/opac/parts/topnav.tt2
index 46c497a..e9cacdd 100644
--- a/Open-ILS/src/templates/opac/parts/topnav.tt2
+++ b/Open-ILS/src/templates/opac/parts/topnav.tt2
@@ -22,11 +22,13 @@
[% l('[_1] [_2]', ctx.user.first_given_name, ctx.user.family_name) | html %]
</span>
<span class="dash_divider">|</span>
+ <span class="dash_account_buttons">
<a href="[% mkurl(ctx.opac_root _ '/myopac/main') %]"
class="opac-button">[% l('My Account') %]</a>
<a href="[% mkurl(ctx.opac_root _ '/logout', {}, 1) %]"
class="opac-button" id="logout_link">[% l('Logout') %]</a>
+ </span>
</div>
<div id="dashboard">
<span class="dash-align">
commit b8e8f9144e968570ca33bc47537b0e2f389942e9
Author: Ben Shum <bshum at biblio.org>
Date: Wed Sep 18 17:57:00 2013 -0400
Some CSS tweaks
1) Remove the login height to prevent problems with larger fonts at entry
2) Add some top and bottom padding between search results
3) Make the titles larger by default in search results
4) Add some right padding to the results block
Signed-off-by: Ben Shum <bshum at biblio.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 6792d99..fbdf160 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -598,7 +598,6 @@ div.format_icon {
#main-content .left_brain input[type=text], #main-content .left_brain input[type=password] {
width:167px;
- height:18px;
margin:0;
padding:0;
background: [% css_colors.background %];
@@ -714,6 +713,7 @@ tr.result_table_row > td.result_table_title_cell {
.result_metadata {
float: left;
width: 30em;
+ padding-right: 2em;
}
tr.result_table_row:nth-child(n+2) > td {
@@ -1657,6 +1657,15 @@ a.preflib_change {
white-space: nowrap;
}
+.result_table_title_cell {
+ padding-top: 4px;
+ padding-bottom: 4px;
+}
+
+.record_title {
+ font-size: [% css_fonts.size_bigger %];
+}
+
@media only screen and (max-width: 600px) {
body {
font-size: 12pt;
commit 555d80d2f4ec80c11e911b6c1879a4ad6ada5d2e
Author: Kathy Lussier <klussier at masslnc.org>
Date: Wed Sep 18 17:53:55 2013 -0400
Tweak My Account buttons
Tweak the padding and margins for My Account buttons so that they fit on
one line for small screens. Also fits well for users with very, very long
names.
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index d92cfef..6792d99 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1707,6 +1707,12 @@ a.preflib_change {
padding: 5px;
margin: 3px;
}
+
+ a.opac-button {
+ margin: 15px 5px;
+ padding: 2px 5px;
+ }
+
#acct_tabs a, #acct_fines_tabs a {
padding: 2px 4px 3px 4px;
-moz-border-radius: 6px 6px 0px 0px;
commit bea06cf704f0d3da797dc0c7fbce3ab4604eb11a
Author: Dan Scott <dscott at laurentian.ca>
Date: Wed Sep 18 17:35:29 2013 -0400
Keep label + input together in search bar
The better for breaking in a sane way on a non-mobile screen.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 6f6156d..d92cfef 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1653,6 +1653,10 @@ a.preflib_change {
margin-bottom: 1em;
}
+#search_query_label, #search_qtype_label, #search_itype_label, #search_locg_label {
+ white-space: nowrap;
+}
+
@media only screen and (max-width: 600px) {
body {
font-size: 12pt;
commit a663723d592ef63e95181f18b1c136c5b1e73661
Author: Dan Scott <dscott at laurentian.ca>
Date: Wed Sep 18 17:23:46 2013 -0400
Restore missing format selector from search bar
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index fde2104..6f6156d 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1925,7 +1925,7 @@ a.preflib_change {
}
.searchbar { line-height: 1.5em; }
#browse-controls { line-height: 1.5em; }
- #search_query_label, #search_qtype_label, #search_locg_label {
+ #search_query_label, #search_qtype_label, #search_itype_label, #search_locg_label {
display: block;
}
.bookshelf td {
diff --git a/Open-ILS/src/templates/opac/parts/searchbar.tt2 b/Open-ILS/src/templates/opac/parts/searchbar.tt2
index b276a9d..9ea7f6c 100644
--- a/Open-ILS/src/templates/opac/parts/searchbar.tt2
+++ b/Open-ILS/src/templates/opac/parts/searchbar.tt2
@@ -34,6 +34,17 @@
INCLUDE "opac/parts/qtype_selector.tt2" id="qtype";
-%]
</label>
+ <label id="search_itype_label">
+ [%-
+ l('Format: ');
+ IF search.basic_config.type == 'attr';
+ INCLUDE "opac/parts/coded_value_selector.tt2"
+ attr=search.basic_config.group none_ok=1 none_label=search.basic_config.none_label;
+ ELSIF search.basic_config.type == 'filter';
+ INCLUDE "opac/parts/filter_group_selector.tt2"
+ filter_group=search.basic_config.group none_ok=1 none_label=search.basic_config.none_label;
+ END;
+ -%]
<label id="search_locg_label">
[%-
l('Library: ');
commit 73b4d7d88539a3c741495682b763f4d9f142ccbc
Author: Dan Scott <dscott at laurentian.ca>
Date: Tue Sep 24 11:20:13 2013 -0400
Changes to CSS to make the table in shelf browse to display in a block for mobile tpac.
Signed-off-by: Garry Collum <gcollum at gmail.com>
Conflicts:
Open-ILS/src/templates/opac/css/style.css.tt2
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 5cad7d2..fde2104 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1928,4 +1928,11 @@ a.preflib_change {
#search_query_label, #search_qtype_label, #search_locg_label {
display: block;
}
+ .bookshelf td {
+ display: block;
+ width: 100%;
+ }
+ .bookshelf table thead tr {
+ display: block;
+ }
}
commit 4a946473b83b28ce78cfdd2e88a8ebe3c107ab5a
Author: Ben Shum <bshum at biblio.org>
Date: Wed Sep 18 16:46:07 2013 -0400
My account menu CSS tweaking
Remove duplicate acct_tabs entry now that we plan to hide entirely.
Remove unnecessary font resizing.
Signed-off-by: Ben Shum <bshum at biblio.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 184cdb7..5cad7d2 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1713,16 +1713,12 @@ a.preflib_change {
#acct_fines_tabs {
display: none;
}
- #acct_tabs {
- height: 20px;
- margin: 1em 0em 0em .5em;
- }
-
+
#acct_select {
display: inline-block;
}
- #acct_tabs a {
+ #acct_tabs {
display:none;
}
@@ -1890,9 +1886,8 @@ a.preflib_change {
display: block;
padding-left: 15px;
}
- #myopac_tabs, #adv_search_parent, #fines_payments_wrapper {
- background: [% css_colors.primary_fade %];
- font-size: 10px;
+ #adv_search_parent {
+ font-size: [% css_fonts.size_smaller %];
}
#adv_search_filters {
position: relative;
commit 694d31353870553bc8d89cf1a828436fe64ee88b
Author: Dan Scott <dscott at laurentian.ca>
Date: Wed Sep 18 17:13:38 2013 -0400
Refactor searchbar into non-sentence form
A search bar that does not use a sentence is easier to translate and has
the additional advantage of breaking up into a simpler mobile display.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 0890030..184cdb7 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -228,10 +228,6 @@ span.dash_divider {
background: [% css_colors.background %];
}
-.search_box_wrapper {
- padding: 10px 5px 5px 3px;
-}
-
#search-wrapper #breadcrumb {
margin-top:0px;
font-size: [% css_fonts.size_smaller %];
@@ -1874,9 +1870,6 @@ a.preflib_change {
width: 85%;
padding-top: 5px;
}
- #qtype {
- display: none;
- }
#main-content-home {
padding: 0px;
margin: 0px;
@@ -1935,6 +1928,9 @@ a.preflib_change {
.mobile_hide {
display: none;
}
- .searchbar { width: 200px; line-height: 1.5em; }
- #browse-controls { width: 200px; line-height: 1.5em; }
+ .searchbar { line-height: 1.5em; }
+ #browse-controls { line-height: 1.5em; }
+ #search_query_label, #search_qtype_label, #search_locg_label {
+ display: block;
+ }
}
diff --git a/Open-ILS/src/templates/opac/parts/searchbar.tt2 b/Open-ILS/src/templates/opac/parts/searchbar.tt2
index 4688e23..b276a9d 100644
--- a/Open-ILS/src/templates/opac/parts/searchbar.tt2
+++ b/Open-ILS/src/templates/opac/parts/searchbar.tt2
@@ -9,19 +9,11 @@
id="home_adv_search_link">[% l('Advanced Search') %]</a></span>
<span class="browse_the_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/browse', {}, ['fi:has_browse_entry']) %]">[% l('Browse the Catalog') %]</a></span>
</div>
- <div class="searchbar">[%- l('Search ');
- IF search.basic_config.type == 'attr';
- INCLUDE "opac/parts/coded_value_selector.tt2"
- attr=search.basic_config.group none_ok=1 none_label=search.basic_config.none_label;
- ELSIF search.basic_config.type == 'filter';
- INCLUDE "opac/parts/filter_group_selector.tt2"
- filter_group=search.basic_config.group none_ok=1 none_label=search.basic_config.none_label;
- END;
- l(' for ');
- %]
+ <div class="searchbar">
<span class='search_box_wrapper'>
[%- # autosuggest breaks accessibility, as the aria-label
# attribute is removed when the Dijit is created. :( %]
+ <label id="search_box_label">[% l('Search: ') %]
<input type="text" id="search_box" name="query" aria-label="[%
l('Enter search query:');
%]" value="[% is_advanced ? ctx.naive_query_scrub(ctx.processed_search_query) : CGI.param('query') | html %]"
@@ -34,13 +26,21 @@
[%- ELSE -%]
[% IF basic_search != "f" %] autofocus [% END %] x-webkit-speech
[%- END # autosuggest enabled %] />
+ </label>
</span>
+ <label id="search_qtype_label">
[%-
- select_lib_label = l("Select search library");
+ l('Type: ');
INCLUDE "opac/parts/qtype_selector.tt2" id="qtype";
- l(' in ');
+ -%]
+ </label>
+ <label id="search_locg_label">
+ [%-
+ l('Library: ');
+ select_lib_label = l("Select search library");
INCLUDE build_org_selector arialabel=select_lib_label show_loc_groups=1
-%]
+ </label>
<span>
<input id='search-submit-go' type="submit" value="[% l('Search') %]" alt="[% l('Search') %]" class="opac-button"
onclick='setTimeout(function(){$("search-submit-spinner").className=""; $("search-submit-go").className="hidden"}, 2000)'/>
diff --git a/Open-ILS/web/css/skin/default/opac/semiauto.css b/Open-ILS/web/css/skin/default/opac/semiauto.css
index dfe8a6f..0770599 100644
--- a/Open-ILS/web/css/skin/default/opac/semiauto.css
+++ b/Open-ILS/web/css/skin/default/opac/semiauto.css
@@ -30,7 +30,6 @@
.nowrap { white-space: nowrap; }
.opac-auto-164 { white-space: nowrap; padding-left: 5px; }
.full-width { width: 100%; }
-#search_box { width: 162px; }
.selector_actions_for_list { width: 175px; margin-right: 11px; }
.selector_actions_for_list_inner_option { margin-left: 2em; } /* XXX ".opac-auto-179 optgroup option" doesn't work!? */
#cn_browse_div > div { width: 90%; text-align: center; margin: 10px; }
commit 30e6c139d88f5585ce89b484064ca6e486aa98b1
Author: Garry Collum <gcollum at gmail.com>
Date: Wed Sep 18 15:52:52 2013 -0400
Improve rdetail_status table display for copy info.
Signed-off-by: Garry Collum <gcollum at gmail.com>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index d2d1f9c..0890030 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -426,6 +426,9 @@ span#rdetail_hold_counts {
display: inline-block;
vertical-align: top;
}
+span#rdetail_hold_counts p {
+ padding-left: 2em;
+}
#rdetail_image_div {
float: left;
@@ -1853,8 +1856,16 @@ a.preflib_change {
#rdetails_status thead {
display: none;
}
- #rdetails_status tr, #rdetails_status td {
- display: block;
+ #rdetails_status tr {
+ display: block;
+ margin-top: 3px;
+ }
+ #rdetails_status tr:nth-of-type(odd) {
+ background-color: #eee;
+ }
+ #rdetails_status td {
+ display: block;
+ padding: 1px;
}
select#pickup_lib.search-wrapper-locg {
width: 100%;
commit 1db928e0faa39634fc9453206ab5a2dd9eeaf931
Author: Kathy Lussier <klussier at masslnc.org>
Date: Wed Sep 18 15:17:58 2013 -0400
Replace My account tabs with dropdown
The my account tabs were crowded on a small screen, so we switch it to a
dropdown navigation menu. Many thanks to Dan Pearl for his help!
Signed-off-by: Kathy Lussier <klussier at masslnc.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 7520acd..d2d1f9c 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -354,6 +354,10 @@ span.dash_divider {
color: [% css_colors.accent_medium %];
}
+#acct_select {
+ display: none;
+}
+
.rdetail_header {
padding: 5px 7px 6px 0px;
margin-left: 1em;
@@ -1714,9 +1718,15 @@ a.preflib_change {
height: 20px;
margin: 1em 0em 0em .5em;
}
- #acct_tabs a:nth-child(4), #acct_tabs a:nth-child(5) {
- display: none;
+
+ #acct_select {
+ display: inline-block;
}
+
+ #acct_tabs a {
+ display:none;
+ }
+
#acct_checked_tabs {
display:none;
}
diff --git a/Open-ILS/src/templates/opac/parts/myopac/base.tt2 b/Open-ILS/src/templates/opac/parts/myopac/base.tt2
index e478f83..630a5a0 100644
--- a/Open-ILS/src/templates/opac/parts/myopac/base.tt2
+++ b/Open-ILS/src/templates/opac/parts/myopac/base.tt2
@@ -25,7 +25,19 @@
class="[% cls_which %]">[% page.name; %]</a>
[% END %]
</div>
- </div>
+ <div id="acct_select">
+ <form name="acct_nav">
+ <select name="acct_url" aria-label="Select an account page" onchange="window.location.href=document.acct_nav.acct_url.options[document.acct_nav.acct_url.selectedIndex].value">
+ <option value="" selected="selected">Go to...</option>
+ [% FOREACH page IN myopac_pages;
+ IF page.url != myopac_page; %]
+ <option value="[% mkurl(ctx.opac_root _ '/myopac/' _ page.url, {}, ['bbid', 'offset', 'limit']) %]">[% page.name; %]</option>
+ [% END;
+ END; %]
+ </select>
+ </div>
+ </form>
+ </div>
<div id="main-content">
[% content %]
<div class="common-full-pad"></div>
commit 29f55b22a9113a134dfcb5a3461eb74e4c96fc05
Author: Bill Ott <bott at grpl.org>
Date: Wed Sep 18 14:55:40 2013 -0400
Various mobile style and display changes.
Try to reduce the size of the search bar and search type option links.
Remove completely from login page (problem or make user rely on back button?)
Introduce mobile_hide class for cheap/easy method to alter pieces for mobile.
Signed-off-by: Bill Ott <bott at grpl.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/advanced.tt2 b/Open-ILS/src/templates/opac/advanced.tt2
index 9d3929c..2d04448 100644
--- a/Open-ILS/src/templates/opac/advanced.tt2
+++ b/Open-ILS/src/templates/opac/advanced.tt2
@@ -7,7 +7,7 @@
-%]
<div id="search-wrapper">
<div id="search-box">
- <span class="search_catalog_lbl">[% l('Search the Catalog') %]</span>
+ <span class="search_catalog_lbl mobile_hide">[% l('Search the Catalog') %]</span>
<span class="adv_search_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/home') %]"
id="home_adv_search_link">[%l('Basic Search')%]</a></span>
diff --git a/Open-ILS/src/templates/opac/browse.tt2 b/Open-ILS/src/templates/opac/browse.tt2
index 54dec17..415e41c 100644
--- a/Open-ILS/src/templates/opac/browse.tt2
+++ b/Open-ILS/src/templates/opac/browse.tt2
@@ -16,16 +16,17 @@
[%# XXX TODO Give searchbar.tt2 more smarts so we can just do:
# INCLUDE "opac/parts/searchbar.tt2" %]
<div id="search-box">
- <span class="search_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/home', {}, depart_list) %]">[% l('Search the Catalog') %]</a></span>
+ <span class="search_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/home', {}, depart_list) %]">[% l('Basic Search') %]</a></span>
<span class="adv_search_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/advanced', {}, depart_list) %]"
id="home_adv_search_link">[%l('Advanced Search')%]</a></span>
- <span class="browse_the_catalog_lbl">[% l('Browse the Catalog') %]</span>
+
+ <span class="browse_the_catalog_lbl mobile_hide">[% l('Browse the Catalog') %]</span>
</div>
</div>
<div id="content-wrapper">
<div id="main-content">
<div id="browse-the-catalog">
- <div id="browse-controls">
+ <div id="browse-controls" class='searchbar'>
<form method="get" onsubmit="$('browse-submit-spinner').className = ''; return true">
<input type="hidden" name="blimit"
value="[% blimit %]" />
@@ -40,7 +41,7 @@
arialabel=l('Select holding library') %]
[% l('Browse for [_1] starting with [_2] in [_3]', control_qtype, control_bterm, control_locg) %]
- <input type="submit" value="[% l('Go') %]" />
+ <input id='search-submit-go' type="submit" value="[% l('Browse') %]" alt="[% l('Browse') %]" class="opac-button"/>
<img id="browse-submit-spinner" src="[% ctx.media_prefix %]/opac/images/progressbar_green.gif" class="hidden" style="width: 16px; height: 16px;" alt="" />
</form>
</div>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 520ed5e..7520acd 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1667,9 +1667,6 @@ a.preflib_change {
#homesearch_main_logo img {
width:75%;
}
- #home_adv_search_link {
- display: block;
- }
#format_selector {
display:none;
}
@@ -1693,9 +1690,6 @@ a.preflib_change {
#gold-links-holder {
display: none;
}
- #search-wrapper {
- display: block;
- }
#simple-detail-view-links {
display: none;
}
@@ -1855,8 +1849,9 @@ a.preflib_change {
select#pickup_lib.search-wrapper-locg {
width: 100%;
}
- #search_box {
+ #search-wrapper #search-box {
width: 85%;
+ padding-top: 5px;
}
#qtype {
display: none;
@@ -1905,4 +1900,20 @@ a.preflib_change {
h2.rdetail_uris {
clear: both;
}
+ .search_catalog_lbl {
+ margin-left: 0;
+ white-space: nowrap;
+ }
+ .adv_search_catalog_lbl {
+ margin-top: 0;
+ white-space: nowrap;
+ }
+ .browse_the_catalog_lbl {
+ white-space: nowrap;
+ }
+ .mobile_hide {
+ display: none;
+ }
+ .searchbar { width: 200px; line-height: 1.5em; }
+ #browse-controls { width: 200px; line-height: 1.5em; }
}
diff --git a/Open-ILS/src/templates/opac/login.tt2 b/Open-ILS/src/templates/opac/login.tt2
index 1de7468..9b6513f 100644
--- a/Open-ILS/src/templates/opac/login.tt2
+++ b/Open-ILS/src/templates/opac/login.tt2
@@ -3,7 +3,9 @@
INCLUDE "opac/parts/topnav.tt2";
basic_search = "f";
ctx.page_title = l("Account Login") %]
- [% INCLUDE "opac/parts/searchbar.tt2" %]
+ <div class='mobile_hide'>
+ [% INCLUDE "opac/parts/searchbar.tt2" %]
+ </div>
<div id="content-wrapper">
<div id="main-content">
[% INCLUDE "opac/parts/login/form.tt2" %]
diff --git a/Open-ILS/src/templates/opac/parts/searchbar.tt2 b/Open-ILS/src/templates/opac/parts/searchbar.tt2
index 6cac5f8..4688e23 100644
--- a/Open-ILS/src/templates/opac/parts/searchbar.tt2
+++ b/Open-ILS/src/templates/opac/parts/searchbar.tt2
@@ -4,7 +4,7 @@
<form action="[% ctx.opac_root %]/results" method="get">
[%- END %]
<div id="search-box">
- <span class="search_catalog_lbl">[% l('Search the Catalog') %]</span>
+ <span class="search_catalog_lbl mobile_hide">[% l('Search the Catalog') %]</span>
<span class="adv_search_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/advanced') %]"
id="home_adv_search_link">[% l('Advanced Search') %]</a></span>
<span class="browse_the_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/browse', {}, ['fi:has_browse_entry']) %]">[% l('Browse the Catalog') %]</a></span>
commit 5d4c42799d1e1884d119bd506eb1d552ac6a2f5e
Author: Dan Scott <dscott at laurentian.ca>
Date: Wed Sep 18 14:19:49 2013 -0400
Electronic resources must be cleanly displayed
In MOPAC view, electronic resource URIs were overlapping the rdetail
actions. Clear 'em out.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index da6e392..520ed5e 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1899,4 +1899,10 @@ a.preflib_change {
.result_metadata {
width: inherit;
}
+ div#rdetail_actions_div {
+ float: none;
+ }
+ h2.rdetail_uris {
+ clear: both;
+ }
}
commit d1689d088e62192a6a1210f96923b4bbc6a06c2d
Author: Dan Scott <dscott at laurentian.ca>
Date: Wed Sep 18 13:55:40 2013 -0400
Improve rdetail action formatting when no cover art
When there is no cover art, the format label gets the actions hung oddly
to the right in the record detail view. Just wrap the whole block in a
div and float that instead.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index fae9f8d..da6e392 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1889,17 +1889,13 @@ a.preflib_change {
position: relative;
width: 300px;
}
- #rdetail_format_label {
+ #format_actions {
float: left;
}
.rdetail_aux_utils {
padding: 0px;
border: none;
}
- div#rdetail_actions_div {
- float: left;
- background: [% css_colors.background %];
- }
.result_metadata {
width: inherit;
}
diff --git a/Open-ILS/src/templates/opac/parts/record/summary.tt2 b/Open-ILS/src/templates/opac/parts/record/summary.tt2
index 2e0e222..6d78327 100644
--- a/Open-ILS/src/templates/opac/parts/record/summary.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/summary.tt2
@@ -32,47 +32,49 @@
[% END %]
<br />
</div>
- [%- IF attrs.format_label %]
- <div id="rdetail_format_label">
- [%- attrs.format_label -%]
- </div>
- [%- END %]
- <div id="rdetail_actions_div">
- [%- search_ou = ctx.search_ou;
- IF ctx.place_unfillable ||
- ( attrs.marc_xml.findnodes('//*[local-name()="holdings" and @has_holdable="true"]').size > 0
- && (ctx.holds_block.enabled != 'true' || attrs.org_copy_counts.$search_ou.available == 0)
- )
- %]
- <div class="rdetail_aux_utils place_hold">
- <a href="[% mkurl(ctx.opac_root _ '/place_hold',
- {hold_target => ctx.bre_id, hold_type => 'T', hold_source_page => mkurl()}, stop_parms) %]"
- class="no-dec"><img src="[% ctx.media_prefix %]/images/green_check.png" alt="[% l('place hold') %]" /><span
- class="place_hold">[% l('Place Hold') %]</span></a>
+ <div id="format_actions">
+ [%- IF attrs.format_label %]
+ <div id="rdetail_format_label">
+ [%- attrs.format_label -%]
</div>
- [%- END -%]
- <div class="rdetail_aux_utils toggle_list">
- [% IF ctx.user;
- INCLUDE "opac/parts/bookbag_actions.tt2";
- %]
- [% ELSE;
- operation = ctx.mylist.grep(ctx.bre_id).size ? "delete" : "add";
- label = (operation == "add") ? l("Add to my list") : l("Remove from my list");
- %]
- <a href="[% mkurl(ctx.opac_root _ '/mylist/' _ operation, {record => ctx.bre_id}, stop_parms) %]" class="no-dec">
+ [%- END %]
+ <div id="rdetail_actions_div">
+ [%- search_ou = ctx.search_ou;
+ IF ctx.place_unfillable ||
+ ( attrs.marc_xml.findnodes('//*[local-name()="holdings" and @has_holdable="true"]').size > 0
+ && (ctx.holds_block.enabled != 'true' || attrs.org_copy_counts.$search_ou.available == 0)
+ )
+ %]
+ <div class="rdetail_aux_utils place_hold">
+ <a href="[% mkurl(ctx.opac_root _ '/place_hold',
+ {hold_target => ctx.bre_id, hold_type => 'T', hold_source_page => mkurl()}, stop_parms) %]"
+ class="no-dec"><img src="[% ctx.media_prefix %]/images/green_check.png" alt="[% l('place hold') %]" /><span
+ class="place_hold">[% l('Place Hold') %]</span></a>
+ </div>
+ [%- END -%]
+ <div class="rdetail_aux_utils toggle_list">
+ [% IF ctx.user;
+ INCLUDE "opac/parts/bookbag_actions.tt2";
+ %]
+ [% ELSE;
+ operation = ctx.mylist.grep(ctx.bre_id).size ? "delete" : "add";
+ label = (operation == "add") ? l("Add to my list") : l("Remove from my list");
+ %]
+ <a href="[% mkurl(ctx.opac_root _ '/mylist/' _ operation, {record => ctx.bre_id}, stop_parms) %]" class="no-dec">
+ <img src="[% ctx.media_prefix %]/images/clipboard.png" alt="" />
+ [% label %]
+ </a>
+ [% END %]
+ </div>
+ <div class="rdetail_aux_utils">
<img src="[% ctx.media_prefix %]/images/clipboard.png" alt="" />
- [% label %]
- </a>
- [% END %]
+ <a href="[% mkurl(ctx.opac_root _ '/record/print/' _ ctx.bre_id) %]" class="no-dec">[% l('Print') %]</a> /
+ <a href="[% mkurl(ctx.opac_root _ '/record/email/' _ ctx.bre_id) %]" class="no-dec">[% l('Email') %]</a>
+ </div>
+ [%- IF ctx.refworks.enabled == 'true' %]
+ [%- INCLUDE 'opac/parts/record/refworks.tt2' %]
+ [%- END %]
</div>
- <div class="rdetail_aux_utils">
- <img src="[% ctx.media_prefix %]/images/clipboard.png" alt="" />
- <a href="[% mkurl(ctx.opac_root _ '/record/print/' _ ctx.bre_id) %]" class="no-dec">[% l('Print') %]</a> /
- <a href="[% mkurl(ctx.opac_root _ '/record/email/' _ ctx.bre_id) %]" class="no-dec">[% l('Email') %]</a>
- </div>
- [%- IF ctx.refworks.enabled == 'true' %]
- [%- INCLUDE 'opac/parts/record/refworks.tt2' %]
- [%- END %]
</div>
</div>
commit 19fa3682679c04f2fe645cf584b5a7fbe503c0be
Author: Dan Scott <dscott at laurentian.ca>
Date: Wed Sep 18 13:36:15 2013 -0400
Set explicit width for result metadata in main view
We were getting ragged edges for search results with titles longer than
the "# of # available copies..." statement and the placement of the
place hold action buttons, so set an explicit width, and then deset that
in mobile mode.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index c31abd4..fae9f8d 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -710,6 +710,7 @@ tr.result_table_row > td.result_table_title_cell {
.result_metadata {
float: left;
+ width: 30em;
}
tr.result_table_row:nth-child(n+2) > td {
@@ -1899,4 +1900,7 @@ a.preflib_change {
float: left;
background: [% css_colors.background %];
}
+ .result_metadata {
+ width: inherit;
+ }
}
commit 7adb8c4c13429c5ab64ba77f7e926ede6bbc8e8b
Author: Dan Scott <dscott at laurentian.ca>
Date: Wed Sep 18 13:13:41 2013 -0400
Minor fix for non-existent pubdates in search results
If you do not have a pubdate, it is better etter to have nothing follow
the format label than "()".
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index 4edda2e..394bfe8 100644
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -96,10 +96,14 @@ END;
[% attrs.format_label; %]
[%- END %]
[%- UNLESS CGI.param('detail_record_view')
- OR (show_more_details.default == 'true'
- OR show_more_details.default == 'hide')
- %] ([% attrs.pubdate | html %])
- [%- END -%]
+ OR (show_more_details.default == 'true'
+ OR show_more_details.default == 'hide');
+ IF attrs.pubdate;
+ pubdate_clean = attrs.pubdate | html;
+ l(" ([_1])", pubdate_clean);
+ END;
+ END
+ -%]
</div>
<span name="googleBooksLink" class="hide_me">
<a style='padding-left: 8px;'
commit d6c5604bd2213fa87bb15da765d534e8461bdf95
Author: Bill Ott <bott at grpl.org>
Date: Wed Sep 18 11:26:42 2013 -0400
Allow the advanced search rows to wrap on smaller displays.
Signed-off-by: Bill Ott <bott at grpl.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/parts/advanced/global_row.tt2 b/Open-ILS/src/templates/opac/parts/advanced/global_row.tt2
index ad0243a..5ce4305 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/global_row.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/global_row.tt2
@@ -24,7 +24,7 @@
<!-- tag the second row so the bool column won't be hidden -->
<tr[% IF loop.index == 1 %] id="adv_global_row"[% END %]>
- <td align='left' width='100%' nowrap='nowrap'>
+ <td align='left' width='100%'>
<!-- bool selector. hide for first row. safe to ignore first bool value in form submission -->
<select name='bool' style='width: auto' [% IF loop.first %] class='invisible' [% END %]>
commit 33e2d1841dc47baa483b0a28303a549a4f0520f6
Author: Bill Ott <bott at grpl.org>
Date: Wed Sep 18 11:12:20 2013 -0400
Clean-up of expert and numeric forms.
Again, toward the mobilization of advanced searches. Allow the forms to resize happily.
Signed-off-by: Bill Ott <bott at grpl.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 722e7ed..c31abd4 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1169,6 +1169,8 @@ a.dash-link:hover { text-decoration: underline !important; }
.staff-hold { background-color: [% css_colors.accent_lightest %]; }
.expert-search tbody tr th { text-align: right; padding-left: 2em; }
.expert-search-row { padding-top: 10px; }
+#adv_expert_row label { font-weight: bold; }
+
.bookshelf thead tr td {
border-bottom: 1px dashed [% css_colors.accent_dark %];
padding-bottom: 1ex;
diff --git a/Open-ILS/src/templates/opac/parts/advanced/expert.tt2 b/Open-ILS/src/templates/opac/parts/advanced/expert.tt2
index 4d069d0..1abc365 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/expert.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/expert.tt2
@@ -4,12 +4,16 @@
<table class="expert-search">
<tbody id="adv_expert_rows_here">
<tr id="adv_expert_row">
- <th><label for="expert_tag">[% l("Tag:") %]</label></th>
- <td><input id="expert_tag" type="text" name="tag" size="3" autofocus /></td>
- <th><label for="expert_subfield">[% l("Subfield:") %]</label></th>
- <td><input id="expert_subfield" type="text" name="subfield" size="1" /></td>
- <th><label for="expert_term">[% l("Value:") %]</label></th>
- <td><input id="expert_term" type="text" name="term" size="16" /></td>
+ <td>
+ <label for="expert_tag">[% l("Tag:") %]</label>
+ <input id="expert_tag" type="text" name="tag" size="3" autofocus />
+ <label for="expert_subfield">[% l("Subfield:") %]</label>
+ <input id="expert_subfield" type="text" name="subfield" size="1" />
+ <span style="white-space:nowrap">
+ <label for="expert_term">[% l("Value:") %]</label>
+ <input id="expert_term" type="text" name="term" size="16" />
+ </span>
+ </td>
<td>
<a href="javascript:;" class="row-remover"
title="[% l('Remove row') %]" alt="[% l('Remove row') %]"
diff --git a/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2 b/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2
index d5df951..d471308 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2
@@ -2,9 +2,8 @@
<div class="header_middle">[% l("Numeric Search") %]</div>
<input type="hidden" name="contains" value="contains" />
<input type="hidden" name="_special" value="1" />
- <table>
- <tr>
- <td><label for="numeric_qtype"><strong>[% l("Field:") %]</strong></label>
+ <div id='adv_numeric_block'>
+ <label for="numeric_qtype"><strong>[% l("Field:") %]</strong></label>
<select id="numeric_qtype" name="qtype">
<!-- TODO: Pull labels from config.metabib_field.label -->
<option value="identifier|isbn">[% l('ISBN') %]</option>
@@ -16,24 +15,17 @@
<option value="item_barcode">[% l('Item Barcode') %]</option>
</select>
</label>
- </td>
- <td>
+
<input type="text" name="query" size="16" autofocus placeholder='[% l("Identifier") %]' />
- </td>
- </tr>
- <tr>
+ <br/>
[%- lib_select_id="numeric_search_library" -%]
- <td colspan="2"><label for="[% lib_select_id %]"><strong>[% l("Search Library:") %]</strong>
+ <label for="[% lib_select_id %]"><strong>[% l("Search Library:") %]</strong>
[% PROCESS "opac/parts/org_selector.tt2";
INCLUDE build_org_selector id=lib_select_id show_loc_groups=1
%]
- </label>
- </td>
- </tr>
- <tr>
- <td colspan="2" align="right">
+ </label>
+ <br/>
<input type="submit" alt="[% l('Search') %]"
value="[% l('Search') %]" class="opac-button" />
- </td>
- </table>
+ </div>
</form>
commit a0a0d9a0c4eec6d608c041bfb5797f1eff6d6146
Author: Dan Scott <dscott at laurentian.ca>
Date: Wed Sep 18 10:57:52 2013 -0400
Make record actions available in mobile record details
Use the format label approach and push the actions beside the cover art
(if any) so that users can do actions like place hold in a mobile UI.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 00d7cb4..722e7ed 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1643,6 +1643,10 @@ a.preflib_change {
display: none;
}
+.rdetail_authors_div {
+ margin-bottom: 1em;
+}
+
@media only screen and (max-width: 600px) {
body {
font-size: 12pt;
@@ -1839,21 +1843,6 @@ a.preflib_change {
#main-content {
margin-left: 1px;
}
- #rdetail_actions_div {
- float: none !important;
- }
- #rdetail_actions_div div:nth-child(2), #rdetail_actions_div div:nth-child(3) {
- display: none;
- }
- div#rdetail_title_div .format_icon {
- float: none;
- display: inline;
- margin-right: 5px;
- }
- #rdetail_title {
- float: none;
- display: inline;
- }
#rdetails_status thead {
display: none;
}
@@ -1897,5 +1886,15 @@ a.preflib_change {
position: relative;
width: 300px;
}
-
+ #rdetail_format_label {
+ float: left;
+ }
+ .rdetail_aux_utils {
+ padding: 0px;
+ border: none;
+ }
+ div#rdetail_actions_div {
+ float: left;
+ background: [% css_colors.background %];
+ }
}
diff --git a/Open-ILS/src/templates/opac/parts/record/summary.tt2 b/Open-ILS/src/templates/opac/parts/record/summary.tt2
index b9a91a8..2e0e222 100644
--- a/Open-ILS/src/templates/opac/parts/record/summary.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/summary.tt2
@@ -9,6 +9,21 @@
[%-# This holds the record summary information %]
<div id="rdetail_summary_header">
+ <div id='rdetail_title_div'>
+ <h1 id='rdetail_title' property="name">[% attrs.title_extended | html %]</h1>
+ [%-
+ FOR link880 IN attrs.graphic_titles;
+ FOR alt IN link880.graphic;
+ '<h2 class="graphic880"';
+ IF alt.dir;
+ ' dir="' _ alt.dir _ '"';
+ END;
+ '>'; alt.value | html; '</h2>';
+ END;
+ END;
+ -%]
+ [%- INCLUDE "opac/parts/record/authors.tt2" %]
+ </div>
<div id="rdetail_image_div">
[% ident = attrs.isbn_clean || attrs.upc; IF ident; %]
<a href='[% ctx.media_prefix %]/opac/extras/ac/jacket/large/[% ident | uri %]'><img
@@ -17,7 +32,11 @@
[% END %]
<br />
</div>
-
+ [%- IF attrs.format_label %]
+ <div id="rdetail_format_label">
+ [%- attrs.format_label -%]
+ </div>
+ [%- END %]
<div id="rdetail_actions_div">
[%- search_ou = ctx.search_ou;
IF ctx.place_unfillable ||
@@ -55,26 +74,6 @@
[%- INCLUDE 'opac/parts/record/refworks.tt2' %]
[%- END %]
</div>
- <div id='rdetail_title_div'>
- [%- IF attrs.format_icon %]
- <div class="format_icon">
- <img alt="[% attrs.format_label %]" title="[% attrs.format_label | html %]" src="[% attrs.format_icon %]" />
- </div>
- [%- END %]
- <h1 id='rdetail_title' property="name">[% attrs.title_extended | html %]</h1>
- [%-
- FOR link880 IN attrs.graphic_titles;
- FOR alt IN link880.graphic;
- '<h2 class="graphic880"';
- IF alt.dir;
- ' dir="' _ alt.dir _ '"';
- END;
- '>'; alt.value | html; '</h2>';
- END;
- END;
- -%]
- [%- INCLUDE "opac/parts/record/authors.tt2" %]
- </div>
</div>
[%- IF openurl.enabled == 'true';
commit 4c4b103b36245acd2be41aed0baa7ec8ce83b457
Author: Dan Scott <dscott at laurentian.ca>
Date: Wed Sep 18 10:14:25 2013 -0400
Result actions use width when available
Float the actions to the right side when enough width is available,
otherwise push them under the result metadata in width-constrained
viewports.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 41a4e4e..00d7cb4 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -708,6 +708,10 @@ tr.result_table_row > td.result_table_title_cell {
vertical-align: top;
}
+.result_metadata {
+ float: left;
+}
+
tr.result_table_row:nth-child(n+2) > td {
border-top: 1px solid [% css_colors.accent_lighter2 %];
}
@@ -733,6 +737,7 @@ tr.result_table_row > td.result_table_pic_header {
div.result_table_utils_cont {
text-align:left;
+ float: left;
}
.icon_text {
diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index bca53ab..4edda2e 100644
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -45,6 +45,7 @@
[% END %]
</td>
<td class='result_table_title_cell' name='result_table_title_cell'>
+ <div class="result_metadata">
<abbr class="unapi-id" title='tag:[% ctx.hostname %],[% date.format(date.now, '%Y') %]:biblio-record_entry/[% rec.id %]'></abbr>
<a class='record_title' name='record_[% rec.id %]' name='item_title'
href="[% mkurl(ctx.opac_root _ '/record/' _ rec.id) %]"
@@ -65,7 +66,7 @@ FOR entry IN attrs.graphic_titles;
END;
END;
-%]
- <div>
+
<div>
<a title="[% l("Perform an Author Search") %]"
class="record_author" name='item_author'
commit c4812509a9d0aa0e797535257ab8e27d907eca06
Author: Garry Collum <gcollum at gmail.com>
Date: Tue Sep 17 15:14:00 2013 -0400
Tpac links for search the catalog, advanced search, and browse the catalog have inconsistent styles.
Added labels and classes to the said links for greater configurability.
Signed-off-by: Garry Collum <gcollum at gmail.com>
Signed-off-by: Ben Shum <bshum at biblio.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/advanced.tt2 b/Open-ILS/src/templates/opac/advanced.tt2
index 38f01fb..9d3929c 100644
--- a/Open-ILS/src/templates/opac/advanced.tt2
+++ b/Open-ILS/src/templates/opac/advanced.tt2
@@ -8,10 +8,10 @@
<div id="search-wrapper">
<div id="search-box">
<span class="search_catalog_lbl">[% l('Search the Catalog') %]</span>
- <span><a href="[% mkurl(ctx.opac_root _ '/home') %]"
+ <span class="adv_search_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/home') %]"
id="home_adv_search_link">[%l('Basic Search')%]</a></span>
- <span><a href="[% mkurl(ctx.opac_root _ '/browse') %]">[%
+ <span class="browse_the_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/browse') %]">[%
l('Browse the Catalog')%]</a></span>
</div>
<div id="adv_search_parent">
diff --git a/Open-ILS/src/templates/opac/browse.tt2 b/Open-ILS/src/templates/opac/browse.tt2
index 24e5457..54dec17 100644
--- a/Open-ILS/src/templates/opac/browse.tt2
+++ b/Open-ILS/src/templates/opac/browse.tt2
@@ -17,9 +17,9 @@
# INCLUDE "opac/parts/searchbar.tt2" %]
<div id="search-box">
<span class="search_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/home', {}, depart_list) %]">[% l('Search the Catalog') %]</a></span>
- <span><a href="[% mkurl(ctx.opac_root _ '/advanced', {}, depart_list) %]"
+ <span class="adv_search_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/advanced', {}, depart_list) %]"
id="home_adv_search_link">[%l('Advanced Search')%]</a></span>
- <span>[% l('Browse the Catalog') %]</span>
+ <span class="browse_the_catalog_lbl">[% l('Browse the Catalog') %]</span>
</div>
</div>
<div id="content-wrapper">
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 1caa0b9..41a4e4e 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -896,6 +896,14 @@ table.acct_notes th {
font-size: [% css_fonts.size_bigger %];
}
+.adv_search_catalog_lbl {
+ font-size: [% css_fonts.size_bigger %];
+}
+
+.browse_the_catalog_lbl {
+ font-size: [% css_fonts.size_bigger %];
+}
+
.lbl1 {
font-size: [% css_fonts.size_bigger %];
font-weight:bold;
diff --git a/Open-ILS/src/templates/opac/parts/searchbar.tt2 b/Open-ILS/src/templates/opac/parts/searchbar.tt2
index 84d6008..6cac5f8 100644
--- a/Open-ILS/src/templates/opac/parts/searchbar.tt2
+++ b/Open-ILS/src/templates/opac/parts/searchbar.tt2
@@ -5,8 +5,8 @@
[%- END %]
<div id="search-box">
<span class="search_catalog_lbl">[% l('Search the Catalog') %]</span>
- <a href="[% mkurl(ctx.opac_root _ '/advanced') %]"
- id="home_adv_search_link">[% l('Advanced Search') %]</a>
+ <span class="adv_search_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/advanced') %]"
+ id="home_adv_search_link">[% l('Advanced Search') %]</a></span>
<span class="browse_the_catalog_lbl"><a href="[% mkurl(ctx.opac_root _ '/browse', {}, ['fi:has_browse_entry']) %]">[% l('Browse the Catalog') %]</a></span>
</div>
<div class="searchbar">[%- l('Search ');
commit 817d269e129b1e0a0d32b9cdafb5473bac97d031
Author: Bill Ott <bott at grpl.org>
Date: Wed Sep 18 07:31:58 2013 -0400
De-table the advanced search to allow for mobile resizing.
A first stab at allowing the advanced search page to resize for mobile use.
Much of the style included was borrowed from Jason Boyer. Critical changes
occur in the adv_search_xxx type id's in the non-mobile style.
to-do: See if there's any hope for the search rows. Not sure what can be
done to make them fit any better.
Signed-off-by: Bill Ott <bott at grpl.org>
Signed-off-by: Ben Shum <bshum at biblio.org>
Conflicts:
Open-ILS/src/templates/opac/css/style.css.tt2
Open-ILS/src/templates/opac/parts/advanced/search.tt2
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index b7c0fbd..1caa0b9 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -262,7 +262,7 @@ span.dash_divider {
#adv_search_tabs, #acct_tabs, #acct_fines_tabs, #acct_checked_tabs, #acct_holds_tabs, #acct_prefs_tabs, #results_header_inner{
height: 40px;
- margin-left: 1em;
+ margin-left: 2px;
}
#adv_search_tabs a, #acct_tabs a, #acct_fines_tabs a, #acct_checked_tabs a, #acct_holds_tabs a, #acct_prefs_tabs a {
@@ -291,6 +291,31 @@ span.dash_divider {
text-decoration: none;
}
+#adv_search_filters {
+ position: relative;
+ width: 800px;
+}
+
+#adv_filter_block {
+ padding: 15px;
+ float: left;
+}
+#adv_filter_block_item {
+ float: left;
+ padding: 5px;
+}
+
+#adv_special_block {
+ float: left;
+ padding: 5px;
+}
+
+#adv_search_submit {
+ position: relative;
+ margin-left: 10px;
+
+}
+
.checkbox_col {
width: 1%;
padding-left: 10px !important;
@@ -1070,6 +1095,7 @@ div.facet_sidebar {
.advanced_div { padding-top: 15px; }
#adv_global_search select { width: 13em; }
+#adv_global_row { nowrap: 'nowrap'; }
#adv_global_input_table select { width: 7em; }
.adv_adv_link {
font-size: [% css_fonts.size_smaller %];
@@ -1622,7 +1648,7 @@ a.preflib_change {
width:75%;
}
#home_adv_search_link {
- display: none;
+ display: block;
}
#format_selector {
display:none;
@@ -1648,7 +1674,7 @@ a.preflib_change {
display: none;
}
#search-wrapper {
- display: none;
+ display: block;
}
#simple-detail-view-links {
display: none;
@@ -1850,4 +1876,13 @@ a.preflib_change {
display: block;
padding-left: 15px;
}
+ #myopac_tabs, #adv_search_parent, #fines_payments_wrapper {
+ background: [% css_colors.primary_fade %];
+ font-size: 10px;
+ }
+ #adv_search_filters {
+ position: relative;
+ width: 300px;
+ }
+
}
diff --git a/Open-ILS/src/templates/opac/parts/advanced/search.tt2 b/Open-ILS/src/templates/opac/parts/advanced/search.tt2
index e7e6b09..ff88938 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/search.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/search.tt2
@@ -3,10 +3,10 @@
PROCESS get_library;
%]
<form action="[% ctx.opac_root %]/results" method="get">
-<table id='adv_global_search' class='data_grid data_grid_center' width='100%'>
- <tr style='border-bottom: none;'>
+<div id='adv_global_search' class='data_grid data_grid_center' width='100%'>
+ <div id='adv_search_rows' style='border-bottom: none;'>
<!-- Contains the user-addable(?) rows to define search class, containment and text -->
- <td valign='top' class='adv_global_input_container'>
+ <div valign='top' class='adv_global_input_container'>
<table width='100%' id='adv_global_input_table'>
<thead>
<tr>
@@ -27,23 +27,36 @@
</tr>
</tbody>
</table>
- </td>
- </tr>
- <tr>
- <td align='top'>
- <div style="width:100%;" class="header_middle">[% l('Search Filters') %]</div>
- <table cellpadding='10' cellspacing='0' border='0'>
+ </div>
+ </div>
+
+ <div id='adv_search_submit'>
+ <input type="hidden" name="_adv" value="1" />
+ <span>
+ <input id='search-submit-go' type="submit" value="[% l('Search') %]" alt="[% l('Search') %]" class="opac-button"
+ onclick='setTimeout(function(){$("search-submit-spinner").className=""; $("search-submit-go").className="hidden"}, 2000)'/>
+ <img id='search-submit-spinner' src='/opac/images/progressbar_green.gif' style='height:16px;width:16px;' class='hidden' alt=''/>
+ </span>
+
+ <a href="[% mkurl(ctx.opac_root _ '/advanced', {$loc_name => loc_value}, 1) %]"
+ class="pointer opac-button">[% l('Clear Form') %]</a>
+ </div>
+
+ <div id='adv_search_filters'>
+ <div class="header_middle">[% l('Search Filters') %]</div>
+
[%
in_row = 0;
FOR adv_chunk IN search.adv_config;
NEXT IF adv_chunk.adv_hide;
IF in_row == 0;
in_row = 1; %]
- <tr>
+ <div id='adv_filter_block'>
[%
END; %]
- <td valign='top'[% IF adv_chunk.js_only %]
- id='adv_chunk_[% adv_chunk.adv_special %]'
+ <div id='adv_filter_block_item'>
+ <div valign='top'[% IF adv_chunk.js_only %]
+ id='adv_chunk_[% adv_chunk.adv_special %]'
class='hidden'[% END %]>
<strong>[% adv_chunk.adv_label %]</strong><br />
[%
@@ -56,7 +69,7 @@
<input type='checkbox' name="modifier"
value="available"[% CGI.param('modifier').grep('available').size ? ' checked="checked"' : '' %]
id='opac.result.limit2avail' />
- <label style="position:relative;top:-2px;"
+ <label style="top:-2px;"
for='opac.result.limit2avail'>
[% l("Limit to Available") %]</label>
</div>
@@ -75,7 +88,8 @@
<option value="[% opt.code %]"[% CGI.param('pubdate') == opt.code ? ' selected="selected"' : '' %]>[% opt.label | html %]</option>
[% END %]
</select>
- <div style='margin-top:5px;'>
+ <br/>
+ <div id='adv_special_block' style='margin-top:5px;'>
<input name='date1' type='text' size='4' maxlength='4' value="[% CGI.param('date1') | html %]" />
<span id='adv_global_pub_date_2_span' class='[% CGI.param("pubdate") == "between" ? "" : "hide_me" %]'>
[% l("and") %] <input name='date2' type='text' size='4' maxlength='4' value="[% CGI.param('date2') | html %]" />
@@ -100,25 +114,18 @@
INCLUDE "opac/parts/filter_group_selector.tt2"
filter_group=adv_chunk.adv_filter multiple="multiple" size=adv_chunk.adv_size || search.default_adv_select_height || "4";
END; %]
- </td>
+ </div>
+ </div>
[%
IF adv_chunk.adv_break;
in_row = 0; %]
- </tr>
+ </div>
[%
END;
END; %]
- </table>
- </td>
- </tr>
-</table>
-<input type="hidden" name="_adv" value="1" />
- <span>
- <input id='search-submit-go' type="submit" value="[% l('Search') %]" alt="[% l('Search') %]" class="opac-button"
- onclick='setTimeout(function(){$("search-submit-spinner").className=""; $("search-submit-go").className="hidden"}, 2000)'/>
- <img id='search-submit-spinner' src='/opac/images/progressbar_green.gif' style='height:16px;width:16px;' class='hidden' alt=''/>
- </span>
-<a href="[% mkurl(ctx.opac_root _ '/advanced', {$loc_name => loc_value}, 1) %]"
- class="pointer opac-button">[% l('Clear Form') %]</a>
+ </div>
+ </div>
+ </div>
+</div>
</form>
commit c6e95b7c2ce5810e15a48192750e87282e3028c6
Author: Dan Scott <dscott at laurentian.ca>
Date: Wed Sep 18 09:35:47 2013 -0400
Move search result "actions" below result metadata
Rather than the tabular layout, add the place hold / add to my list
actions underneath the record metadata for each result. This results in
a narrower required width and enables us to actually display the actions
in mobile mode.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index cb552fa..b7c0fbd 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -415,12 +415,6 @@ div.place_hold {
padding-top: 10px;
}
-span.place_hold {
- position:relative;
- top:-3px;
- left:3px;
-}
-
div.toggle_list { padding-top: 6px; }
div.format_icon {
@@ -428,16 +422,17 @@ div.format_icon {
margin-right: 17px;
}
+.result_util {
+ border-bottom: 1px dotted [% css_colors.accent_light %];
+ padding-top: 6px;
+}
+
.results_aux_utils {
- border-left:1px dotted [% css_colors.accent_light %];
- padding-left: 17px;
- padding-bottom: 6px;
- padding-right: 50px;
+ display: table-cell;
}
.result_util {
- border-bottom: 1px dotted [% css_colors.accent_light %];
- padding-top: 6px;
+ padding-left: 1em;
}
.results_reviews {
@@ -712,20 +707,9 @@ tr.result_table_row > td.result_table_pic_header {
}
div.result_table_utils_cont {
- width: 250px;
text-align:left;
}
-div.result_table_utils {
- float: right;
-}
-
-div.result_place_hold {
- position: relative;
- top: -3px;
- left:3px;
-}
-
.icon_text {
text-transform:capitalize;
}
@@ -1786,9 +1770,6 @@ a.preflib_change {
.invisible {
display: none;
}
- .result_table_utils_cont {
- display: none;
- }
.result_table_pic_header {
padding-left: 0px !important;
padding-right: 5px;
diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index 021ffbe..bca53ab 100644
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -282,9 +282,6 @@ END;
[% END %]
[% END %]
</div>
- </td>
-
- <td nowrap='nowrap' width="1" align="right">
<div class="result_table_utils_cont">
<div class="result_table_utils">
[%- search_ou = ctx.search_ou;
@@ -331,7 +328,9 @@ END;
[% END %]
</div>
</div>
+
</td>
+
</tr>
[%- IF ENV.OILS_CHILIFRESH_ACCOUNT %]
<tr>
commit 8068d338916e5fe33c02150667351bff4958ec96
Author: Dan Scott <dscott at laurentian.ca>
Date: Wed Sep 18 09:09:20 2013 -0400
Just use a format label in results + pubdate
Rather than having the format icon, which requires either hovering (not
generally available in mobile) or guessing what the strange symbol
means, just use the plain text format label.
In addition, move the brief pubdate from beside the author name to
beside the format label. This avoids confusion if the author name
already has birth or death dates beside it, like "Scott, Dan 1972-
2006". He's not dead yet!
As a bonus, this enables us to remove one table cell from the search
results.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index ca6939f..021ffbe 100644
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -45,6 +45,7 @@
[% END %]
</td>
<td class='result_table_title_cell' name='result_table_title_cell'>
+ <abbr class="unapi-id" title='tag:[% ctx.hostname %],[% date.format(date.now, '%Y') %]:biblio-record_entry/[% rec.id %]'></abbr>
<a class='record_title' name='record_[% rec.id %]' name='item_title'
href="[% mkurl(ctx.opac_root _ '/record/' _ rec.id) %]"
[% HTML.attributes(title => l('Display record details for "[_1]"', attrs.title)) %]
@@ -72,11 +73,6 @@ END;
authorquery = attrs.author | replace('[#"^$\+\-,\.:;&|\[\]()]', ' ');
mkurl(ctx.opac_root _ '/results', {qtype => 'author', query => authorquery}, ['page'])
-%]">[% attrs.author | html %]</a>
- [%- UNLESS CGI.param('detail_record_view')
- OR (show_more_details.default == 'true'
- OR show_more_details.default == 'hide')
- %] [% attrs.pubdate | html %]
- [%- END -%]
[%-
FOR entry IN attrs.graphic_authors;
FOR alt IN entry.graphic;
@@ -94,6 +90,21 @@ END;
-%]
</div>
+ <div id='bib_format' class='result_table_title_cell'>
+ [%- IF attrs.format_label; %]
+ [% attrs.format_label; %]
+ [%- END %]
+ [%- UNLESS CGI.param('detail_record_view')
+ OR (show_more_details.default == 'true'
+ OR show_more_details.default == 'hide')
+ %] ([% attrs.pubdate | html %])
+ [%- END -%]
+ </div>
+ <span name="googleBooksLink" class="hide_me">
+ <a style='padding-left: 8px;'
+ class='classic_link hide_me'
+ name="googleBooks-link">[% l("Browse in Google Books Search") %]</a>
+ </span>
<table cellpadding="0" cellspacing="0" border="0"
class="results_info_table">
[% IF args.holdings.size > 0 %]
@@ -273,22 +284,6 @@ END;
</div>
</td>
- <td name='result_table_format_cell' class='result_table_format_cell' width="1">
-
- [% IF attrs.format_icon %]
- <img title="[% attrs.format_label | html %]" alt="[% attrs.format_label | html %]" src="[% attrs.format_icon %]" />
- [% END %]
-
- <!-- unAPI link -->
- <abbr class="unapi-id" title='tag:[% ctx.hostname %],[% date.format(date.now, '%Y') %]:biblio-record_entry/[% rec.id %]'></abbr>
-
- <!-- Empty span used for creating Google Book Search-->
- <span name="googleBooksLink" class="hide_me">
- <a style='padding-left: 8px;'
- class='classic_link hide_me'
- name="googleBooks-link">[% l("Browse in Google Books Search") %]</a>
- </span>
- </td>
<td nowrap='nowrap' width="1" align="right">
<div class="result_table_utils_cont">
<div class="result_table_utils">
commit 4903341c669fa968d27d42031a3c988b35513ca0
Author: Dan Scott <dscott at laurentian.ca>
Date: Tue Sep 17 15:16:49 2013 -0400
Facets after results, then DOMinate them into place
We can use a media query in JavaScript to detect a given width and then
drop the facets into their left-hand column if needed; if the browser
window resizes, then potentially put the facets back on the bottom.
Also add a rudimentary "Refine these results" link at the top of the
page that is only visible when the facets are at the bottom to
facilitate navigation.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 39c523b..cb552fa 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1612,7 +1612,11 @@ a.preflib_change {
padding-right: 10px;
}
-.small_view_only {
+.result_footer_nav1 {
+ clear: both;
+}
+
+.small_view_only, #refine_hits {
display: none;
}
@@ -1772,9 +1776,6 @@ a.preflib_change {
.results_header_nav1 span.h1 {
display: none;
}
- .facet_sidebar {
- display: none;
- }
.preflib {
display: none;
}
@@ -1852,4 +1853,20 @@ a.preflib_change {
padding: 0px;
margin: 0px;
}
+ /* Make use of full width in mobile mode */
+ .facet_box_wrapper .box_wrapper .box,
+ .facet_template .facet,
+ .facet_box_temp {
+ width: inherit;
+ }
+ .facet_template .count {
+ padding-left: 1em;
+ }
+ .facet_sidebar {
+ margin-top: 0.5em;
+ }
+ #refine_hits {
+ display: block;
+ padding-left: 15px;
+ }
}
diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index 65b475c..ca6939f 100644
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -10,10 +10,11 @@
%]
+<div id="refine_hits"><a href="#facet_sidebar">[% l('Refine these results') %]</a></div>
+
[% PROCESS "opac/parts/result/paginate.tt2" %]
[% ctx.results_count_header = PROCESS results_count_header;
ctx.results_count_header %]
-
[% IF ctx.bookbag %]
<div id="result-bookbag-heading">
<div class="result-bookbag-name">[% ctx.bookbag.name | html %]</div>
@@ -21,10 +22,6 @@
</div>
[% END %]
<div id="result_table_div">
- <div class="facet_sidebar">
- [% INCLUDE "opac/parts/staff_saved_searches.tt2" %]
- [% INCLUDE 'opac/parts/result/facets.tt2' %]
- </div>
<div class="result_block">
<table cellpadding="0" cellspacing="0"
border="0" style="margin-top:10px;">
@@ -359,7 +356,29 @@ END;
</tbody>
</table>
</div>
+ <div class="facet_sidebar" id="facet_sidebar">
+ [% INCLUDE "opac/parts/staff_saved_searches.tt2" %]
+ [% INCLUDE 'opac/parts/result/facets.tt2' %]
+ </div>
+ <script>
+ function showHideFacets() {
+ var clientWidth = document.documentElement.clientWidth;
+ resultBlock = document.querySelector('.result_block');
+ facetSidebar = document.querySelector('.facet_sidebar');
+ if (clientWidth >= 600) {
+ if (resultBlock && facetSidebar) {
+ resultBlock.parentNode.insertBefore(facetSidebar, resultBlock);
+ }
+ } else if (clientWidth < 600) {
+ if (resultBlock && facetSidebar) {
+ resultBlock.parentNode.insertBefore(resultBlock, facetSidebar);
+ }
+ }
+ }
+ window.onresize = showHideFacets;
+ window.onload = showHideFacets;
+ </script>
</div>
-<div>
+<div class="result_footer_nav1">
[% ctx.results_count_header %]
</div>
commit e9de4a0583a72f50d9c5deeb019f94a5290c6fcf
Author: Ben Shum <bshum at biblio.org>
Date: Tue Sep 17 18:36:04 2013 -0400
Remove extra div layer around password hint include
Signed-off-by: Ben Shum <bshum at biblio.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/parts/login/form.tt2 b/Open-ILS/src/templates/opac/parts/login/form.tt2
index 88a4eb8..2861fa0 100644
--- a/Open-ILS/src/templates/opac/parts/login/form.tt2
+++ b/Open-ILS/src/templates/opac/parts/login/form.tt2
@@ -30,7 +30,7 @@
<div class="input_bg">
<input id="password_field" name="password" type="password" />
</div>
- <div>[% INCLUDE "opac/parts/login/password_hint.tt2" %]</div>
+ [% INCLUDE "opac/parts/login/password_hint.tt2" %]
[% IF reset_password %]
<a style="font-size: 80%" href='[% mkurl(ctx.opac_root _ '/password_reset', {}, 1) %]'>[% l('Forgot your password?') %]</a>
[% END %]
diff --git a/Open-ILS/src/templates/opac/parts/login/password_hint.tt2 b/Open-ILS/src/templates/opac/parts/login/password_hint.tt2
index 920ae2e..e820317 100644
--- a/Open-ILS/src/templates/opac/parts/login/password_hint.tt2
+++ b/Open-ILS/src/templates/opac/parts/login/password_hint.tt2
@@ -1,3 +1,3 @@
-<span class="lbl2">
+<div class="lbl2">
[%- l('If this is your first time logging in, please enter the last 4 digits of your phone number. Example: 0926'); %]
-</span>
+</div>
commit 7491d0168983c7abcd5448cfd9541dbcc3453874
Author: Ben Shum <bshum at biblio.org>
Date: Tue Sep 17 17:44:50 2013 -0400
More tweaks to the form page
Signed-off-by: Ben Shum <bshum at biblio.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 49c0b57..39c523b 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -897,6 +897,7 @@ table.acct_notes th {
font-weight:normal;
position:relative;
top:3px;
+ max-width:300px;
}
#myopac_tabs, #adv_search_parent, #fines_payments_wrapper {
diff --git a/Open-ILS/src/templates/opac/parts/login/form.tt2 b/Open-ILS/src/templates/opac/parts/login/form.tt2
index cd52532..88a4eb8 100644
--- a/Open-ILS/src/templates/opac/parts/login/form.tt2
+++ b/Open-ILS/src/templates/opac/parts/login/form.tt2
@@ -17,7 +17,7 @@
<h1>[% l('Log in to Your Account') %]</h1>
[% l('Please enter the following information:') %]
<form method='post'>
- <div style="float: left; padding-bottom: 10px; margin-right: 20px;">
+ <div style="float: left; padding-bottom: 10px; margin-right: 40px;">
<label for='username_field' class="lbl1" >[% l('Library Card Number or Username') %]</label>
<div class="input_bg">
<input type='text' id="username_field" name="username" autofocus />
commit 05239d02340f06fe0dd64276dbd80ea715fa9de7
Author: Ben Shum <bshum at biblio.org>
Date: Tue Sep 17 14:43:59 2013 -0400
Change form.tt2 from table to div
Signed-off-by: Ben Shum <bshum at biblio.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/parts/login/form.tt2 b/Open-ILS/src/templates/opac/parts/login/form.tt2
index 4c96014..cd52532 100644
--- a/Open-ILS/src/templates/opac/parts/login/form.tt2
+++ b/Open-ILS/src/templates/opac/parts/login/form.tt2
@@ -17,49 +17,38 @@
<h1>[% l('Log in to Your Account') %]</h1>
[% l('Please enter the following information:') %]
<form method='post'>
- <table>
- <tr>
- <td style="width: 20em; vertical-align: top; padding-top: 1.5em;" class='lbl1'><label for='username_field'>[% l('Library Card Number or Username') %]</label>
- <div class="lbl2">[% l('Please include leading zeros and no spaces.') %]</div>
- <div class="lbl2">[% l('Example: 0026626051') %]</div>
- </td>
- <td style="vertical-align: top; padding-top: 1.5em;">
- <div class="input_bg">
- <input type="text" id="username_field" name="username" autofocus />
- </div>
- </td>
- </tr>
- <tr>
- <td class="lbl1" style="width: 20em; vertical-align: top; padding-top: 1.5em">
- <label for="password_field">[% l('PIN Number or Password') %]</label>
- <div>[% INCLUDE "opac/parts/login/password_hint.tt2" %]</div>
- </td>
- <td style="vertical-align: top; padding-top: 1.5em;">
- <div class="input_bg">
- <input id="password_field" name="password" type="password" />
- </div>
- <div>
- [%
- # If no redirect is offered or it's leading us back to the
- # login form, redirect the user to My Account
- redirect = CGI.param('redirect_to') || ctx.referer;
- IF !redirect OR redirect.match(ctx.path_info _ '$');
- redirect = CGI.url('-full' => 1) _ '/opac/myopac/main';
- END;
- redirect = redirect | replace('^http:', 'https:');
- %]
- <input type='hidden' name='redirect_to' value='[% redirect %]'/>
- <input type="checkbox" name="persist" id="login_persist" /><label for="login_persist"> [% l('Stay logged in?') %]</label>
- </div>
- <div style="padding-top: 1em; margin-right: 1em;">
- <input type="submit" value="[% l('Log in') %]" alt="[% l('Log in') %]" class="opac-button" />
- [% IF reset_password %]
- <a href='[% mkurl(ctx.opac_root _ '/password_reset', {}, 1) %]'>[% l('Forgot your password?') %]</a>
- [% END %]
- </div>
- </td>
- </tr>
- </table>
+ <div style="float: left; padding-bottom: 10px; margin-right: 20px;">
+ <label for='username_field' class="lbl1" >[% l('Library Card Number or Username') %]</label>
+ <div class="input_bg">
+ <input type='text' id="username_field" name="username" autofocus />
+ </div>
+ <div class="lbl2">[% l('Please include leading zeros and no spaces.') %]</div>
+ <div class="lbl2">[% l('Example: 0026626051') %]</div>
+ </div>
+ <div style="float: left;">
+ <label for="password_field" class="lbl1" >[% l('PIN Number or Password') %]</label>
+ <div class="input_bg">
+ <input id="password_field" name="password" type="password" />
+ </div>
+ <div>[% INCLUDE "opac/parts/login/password_hint.tt2" %]</div>
+ [% IF reset_password %]
+ <a style="font-size: 80%" href='[% mkurl(ctx.opac_root _ '/password_reset', {}, 1) %]'>[% l('Forgot your password?') %]</a>
+ [% END %]
+ </div>
+ <div style="clear: both; padding-top: 15px;">
+ [%
+ # If no redirect is offered or it's leading us back to the
+ # login form, redirect the user to My Account
+ redirect = CGI.param('redirect_to') || ctx.referer;
+ IF !redirect OR redirect.match(ctx.path_info _ '$');
+ redirect = CGI.url('-full' => 1) _ '/opac/myopac/main';
+ END;
+ redirect = redirect | replace('^http:', 'https:');
+ %]
+ <input type='hidden' name='redirect_to' value='[% redirect %]'/>
+ <input type="checkbox" name="persist" id="login_persist" /><label for="login_persist"> [% l('Stay logged in?') %]</label>
+ <input type="submit" value="[% l('Log in') %]" alt="[% l('Log in') %]" class="opac-button" />
+ </div>
</form>
</div>
[% INCLUDE "opac/parts/login/help.tt2" %]
commit f0dba97f96cbdb5cbd069427eaf53181790ef999
Author: Ben Shum <bshum at biblio.org>
Date: Tue Sep 17 13:53:08 2013 -0400
Add meta viewport tag
Signed-off-by: Ben Shum <bshum at biblio.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/parts/base.tt2 b/Open-ILS/src/templates/opac/parts/base.tt2
index f1a5ee0..0e51783 100644
--- a/Open-ILS/src/templates/opac/parts/base.tt2
+++ b/Open-ILS/src/templates/opac/parts/base.tt2
@@ -7,6 +7,7 @@
[% ELSIF ctx.authtime %]
<meta http-equiv="refresh" content="[% ctx.authtime %]; url=[% ctx.logout_page %]">
[% END %]
+ <meta name = "viewport" content = "initial-scale = 1.0">
<link rel="stylesheet" type="text/css" href="[% ctx.media_prefix %]/css/skin/default/opac/semiauto.css" />
<link rel="stylesheet" type="text/css" href="[% ctx.opac_root %]/css/style.css" />
<title>[% l('Catalog - [_1]', ctx.page_title) %]</title>
commit c001b1d8bcb8ad142e2742859aeae99b6581169b
Author: Ben Shum <bshum at biblio.org>
Date: Tue Sep 17 13:43:21 2013 -0400
Add initial Indiana CSS changes
Signed-off-by: Ben Shum <bshum at biblio.org>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index 0a5d71b..49c0b57 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1610,3 +1610,245 @@ a.preflib_change {
color: red;
padding-right: 10px;
}
+
+.small_view_only {
+ display: none;
+}
+
+ at media only screen and (max-width: 600px) {
+ body {
+ font-size: 12pt;
+ }
+ input, select {
+ font-size: 110%;
+ }
+ span .nav_arrow_fix {
+ display: none;
+ }
+ #header {
+ padding: 0px;
+ margin: 0px;
+ }
+ #homesearch_main_logo img {
+ width:75%;
+ }
+ #home_adv_search_link {
+ display: none;
+ }
+ #format_selector {
+ display:none;
+ }
+ #your-acct-login {
+ padding: 0px;
+ padding-top: 10px;
+ }
+ #your-acct-login a {
+ margin: 0px;
+ padding: 5px;
+ }
+ #topnav_logo {
+ padding: 0px;
+ }
+ #topnav_logo img {
+ width: 200px;
+ }
+ #locale_picker_form {
+ display: none;
+ }
+ #gold-links-holder {
+ display: none;
+ }
+ #search-wrapper {
+ display: none;
+ }
+ #simple-detail-view-links {
+ display: none;
+ }
+ .results_header_btns:nth-child(2) {
+ display: none;
+ }
+ .opac-button {
+ padding: 5px;
+ margin: 3px;
+ }
+ #acct_tabs a, #acct_fines_tabs a {
+ padding: 2px 4px 3px 4px;
+ -moz-border-radius: 6px 6px 0px 0px;
+ border-radius: 6px 6px 0px 0px;
+ font-size: 100%;
+ margin: 0px 5px 0px 0px;
+ }
+ #acct_fines_tabs {
+ display: none;
+ }
+ #acct_tabs {
+ height: 20px;
+ margin: 1em 0em 0em .5em;
+ }
+ #acct_tabs a:nth-child(4), #acct_tabs a:nth-child(5) {
+ display: none;
+ }
+ #acct_checked_tabs {
+ display:none;
+ }
+ #acct_checked_main_header tr td:nth-child(5), #acct_checked_main_header tr td:nth-child(6) {
+ display:none;
+ }
+ #acct_checked_temp table tr td:nth-child(5), #acct_checked_temp table tr td:nth-child(6) {
+ display: none;
+ }
+ #acct_holds_tabs {
+ display: none;
+ }
+ #holds_main form table.opac-auto-097 tr td:nth-child(3), #holds_main form table.opac-auto-097 tr td:nth-child(5) {
+ display: none;
+ }
+ #acct_holds_main_header tr td:nth-child(3),
+ #acct_holds_main_header tr td:nth-child(4), #acct_holds_main_header tr td:nth-child(5),
+ #acct_holds_main_header tr td:nth-child(6), #acct_holds_main_header tr td:nth-child(7),
+ #acct_holds_main_header tr td:nth-child(8) {
+ display: none;
+ }
+ tr#acct_holds_temp td:nth-child(3),
+ tr#acct_holds_temp td:nth-child(4), tr#acct_holds_temp td:nth-child(5),
+ tr#acct_holds_temp td:nth-child(6), tr#acct_holds_temp td:nth-child(7),
+ tr#acct_holds_temp td:nth-child(8), tr#acct_holds_temp td:nth-child(10) {
+ display: none;
+ }
+ #dash_wrapper div {
+ background: transparent;
+ padding: 0px;
+ }
+ #dash_wrapper {
+ position: static;
+ top: auto;
+ }
+ #dash_wrapper .opac-button {
+ top: 0px;
+ }
+ .small_view_only {
+ display: inline !important;
+ }
+ #dash_identity a {
+ float:right;
+ }
+ #dashboard {
+ display: none;
+ }
+ #holds_box form blockquote {
+ margin-left: 10px;
+ margin-right: 2px;
+ }
+ #holds_box form blockquote select {
+ width: 100%;
+ }
+ #myopac_sum_fines_placehold {
+ display:none;
+ }
+ #myopac_sum_fines {
+ display: none;
+ }
+ #myopac_circ_trans_row td:nth-child(2), #myopac_circ_trans_row td:nth-child(3),
+ #myopac_circ_trans_row td:nth-child(4), #myopac_circ_trans_row td:nth-child(5) {
+ display: none;
+ }
+ #myopac_trans_row td:nth-child(1), #myopac_trans_row td:nth-child(2),
+ #myopac_trans_row td:nth-child(3), #myopac_trans_row td:nth-child(4) {
+ display: none;
+ }
+ /* Hack el terrible... */
+ #myopac_circ_trans_div table thead tr td:nth-child(2), #myopac_circ_trans_div table thead tr td:nth-child(3),
+ #myopac_circ_trans_div table thead tr td:nth-child(4), #myopac_circ_trans_div table thead tr td:nth-child(5) {
+ display:none;
+ }
+ #myopac_trans_div table thead tr td:nth-child(1), #myopac_trans_div table thead tr td:nth-child(2),
+ #myopac_trans_div table thead tr td:nth-child(3), #myopac_trans_div table thead tr td:nth-child(4) {
+ display: none;
+ }
+ .results_header_div, .results_header_lbl {
+ display: none;
+ }
+ .results_header_nav1 span.h1 {
+ display: none;
+ }
+ .facet_sidebar {
+ display: none;
+ }
+ .preflib {
+ display: none;
+ }
+ .start_end_links_span {
+ /* font-size: 12px; test */
+ display: block;
+ }
+ .invisible {
+ display: none;
+ }
+ .result_table_utils_cont {
+ display: none;
+ }
+ .result_table_pic_header {
+ padding-left: 0px !important;
+ padding-right: 5px;
+ width: 0px !important;
+ margin: 0px;
+ }
+ .result_table_pic {
+ width: 55px;
+ padding: 0px;
+ margin: 0px;
+ }
+ tr[name=results_isbn_tr], tr[name=results_phys_desc_tr], tr[name=results_pub_tr] strong, .result_count {
+ display: none;
+ }
+ tr.result_table_title_cell[name=bib_cn_list] .result_holdings_table th:nth-child(4),
+ tr.result_table_title_cell[name=bib_cn_list] .result_holdings_table td:nth-child(4) {
+ display:none;
+ }
+ .results_info_table td {
+ padding: 0px;
+ }
+ #results_header_bar {
+ background-color: inherit;
+ }
+ .results_header_btns a {
+ margin: 0px;
+ }
+ #main-content {
+ margin-left: 1px;
+ }
+ #rdetail_actions_div {
+ float: none !important;
+ }
+ #rdetail_actions_div div:nth-child(2), #rdetail_actions_div div:nth-child(3) {
+ display: none;
+ }
+ div#rdetail_title_div .format_icon {
+ float: none;
+ display: inline;
+ margin-right: 5px;
+ }
+ #rdetail_title {
+ float: none;
+ display: inline;
+ }
+ #rdetails_status thead {
+ display: none;
+ }
+ #rdetails_status tr, #rdetails_status td {
+ display: block;
+ }
+ select#pickup_lib.search-wrapper-locg {
+ width: 100%;
+ }
+ #search_box {
+ width: 85%;
+ }
+ #qtype {
+ display: none;
+ }
+ #main-content-home {
+ padding: 0px;
+ margin: 0px;
+ }
+}
commit c722724ded1e30bd72c905652e04caf802d87e06
Author: Dan Scott <dscott at laurentian.ca>
Date: Tue Sep 24 11:08:53 2013 -0400
TPAC: Revert colspan/rowspan advanced search config option
We're no longer going to be using a table layout, so colspan and rowspan
will not be useful going forward.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/templates/opac/parts/advanced/search.tt2 b/Open-ILS/src/templates/opac/parts/advanced/search.tt2
index 0f8b43f..e7e6b09 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/search.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/search.tt2
@@ -44,9 +44,7 @@
END; %]
<td valign='top'[% IF adv_chunk.js_only %]
id='adv_chunk_[% adv_chunk.adv_special %]'
- class='hidden'[% END %]
- [% IF adv_chunk.colspan %]colspan='[% adv_chunk.colspan %]'[% END %]
- [% IF adv_chunk.rowspan %]rowspan='[% adv_chunk.rowspan %]'[% END %]>
+ class='hidden'[% END %]>
<strong>[% adv_chunk.adv_label %]</strong><br />
[%
IF adv_chunk.adv_special;
diff --git a/Open-ILS/src/templates/opac/parts/config.tt2 b/Open-ILS/src/templates/opac/parts/config.tt2
index 49e0e43..bd4f77c 100644
--- a/Open-ILS/src/templates/opac/parts/config.tt2
+++ b/Open-ILS/src/templates/opac/parts/config.tt2
@@ -110,7 +110,6 @@ facet.default_display_count = 5;
# lib_selector will put the search library box (with limit to available)
# pub_year will put the publication year box
# sort_selector will put the sort results selector
-# if present, colspan and rowspan will be used for the table cell.
search.adv_config = [
{adv_label => l("Item Type"), adv_attr => ["mattype", "item_type"]},
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/templates/opac/advanced.tt2 | 6 +-
Open-ILS/src/templates/opac/browse.tt2 | 11 +-
Open-ILS/src/templates/opac/css/style.css.tt2 | 551 +++++++++++++++++---
Open-ILS/src/templates/opac/login.tt2 | 4 +-
Open-ILS/src/templates/opac/mylist.tt2 | 2 +
Open-ILS/src/templates/opac/myopac/circs.tt2 | 2 +-
Open-ILS/src/templates/opac/myopac/prefs.tt2 | 2 +-
.../src/templates/opac/myopac/prefs_my_lists.tt2 | 2 +-
.../src/templates/opac/myopac/prefs_notify.tt2 | 2 +-
.../src/templates/opac/myopac/prefs_settings.tt2 | 2 +-
.../src/templates/opac/parts/advanced/expert.tt2 | 20 +-
.../templates/opac/parts/advanced/global_row.tt2 | 2 +-
.../src/templates/opac/parts/advanced/numeric.tt2 | 24 +-
.../src/templates/opac/parts/advanced/search.tt2 | 76 ++--
Open-ILS/src/templates/opac/parts/base.tt2 | 2 +
Open-ILS/src/templates/opac/parts/config.tt2 | 1 -
Open-ILS/src/templates/opac/parts/css/fonts.tt2 | 10 +-
Open-ILS/src/templates/opac/parts/footer.tt2 | 1 -
Open-ILS/src/templates/opac/parts/homesearch.tt2 | 2 +-
Open-ILS/src/templates/opac/parts/login/form.tt2 | 75 ++--
.../templates/opac/parts/login/password_hint.tt2 | 4 +-
Open-ILS/src/templates/opac/parts/myopac/base.tt2 | 19 +-
.../src/templates/opac/parts/myopac/main_base.tt2 | 6 +-
.../src/templates/opac/parts/myopac/prefs_base.tt2 | 87 ++--
.../src/templates/opac/parts/record/copy_table.tt2 | 4 +-
.../src/templates/opac/parts/record/summary.tt2 | 103 ++--
.../src/templates/opac/parts/result/facets.tt2 | 2 -
.../src/templates/opac/parts/result/lowhits.tt2 | 2 +-
.../src/templates/opac/parts/result/paginate.tt2 | 28 +-
Open-ILS/src/templates/opac/parts/result/table.tt2 | 82 ++--
Open-ILS/src/templates/opac/parts/searchbar.tt2 | 42 +-
Open-ILS/src/templates/opac/parts/topnav.tt2 | 2 +
Open-ILS/src/templates/opac/parts/topnav_logo.tt2 | 2 +-
Open-ILS/src/templates/opac/password_reset.tt2 | 2 +
Open-ILS/src/templates/opac/results.tt2 | 3 +-
Open-ILS/src/templates/opac/sms_cn.tt2 | 2 +
Open-ILS/web/css/skin/default/opac/semiauto.css | 1 -
37 files changed, 816 insertions(+), 372 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list