[open-ils-commits] ***SPAM*** [GIT] Evergreen ILS branch master updated. 24d254d578be8e36ba91fac95af9d3875fe6517f
Evergreen Git
git at git.evergreen-ils.org
Mon Jan 6 16:47:17 EST 2014
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 24d254d578be8e36ba91fac95af9d3875fe6517f (commit)
via f90cd00be05c706087f62e9c4173c6c43a48ddb1 (commit)
via 10551250dca09a952986b7cc51bea8837db8f02a (commit)
from 15d3db176737390b141dcd09ad08aad31e14807d (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 24d254d578be8e36ba91fac95af9d3875fe6517f
Author: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Date: Mon Jan 6 11:44:56 2014 -0500
TPAC: Add Notes label to that row in small-screen My Account->Holds
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index a1384ab..4b00864 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -1985,4 +1985,5 @@ a.preflib_change {
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') %]"; }
+ table#acct_holds_main_header td.hold_notes:before { content: "[% l('Notes') %]"; }
}
commit f90cd00be05c706087f62e9c4173c6c43a48ddb1
Author: Dan Scott <dscott at laurentian.ca>
Date: Mon Dec 30 01:47:19 2013 -0500
TPAC: Display public hold notes in user holds list
If a given hold has a note marked as public, and not marked for staff, then
display the note in the My Account -> Holds list. This enhancement also
includes sample notes for each hold, to include data that ensures that the TPAC
does not display any hold notes that are not marked public, or which are marked
for staff.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
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 7f21071..a1384ab 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -873,6 +873,13 @@ table.acct_notes th {
border-collapse: collapse;
}
+.hold_notes {
+ text-transform: none;
+ font-weight: normal;
+}
+
+.hold_note_title { font-weight: bold; }
+
#acct_checked_main_header td, #acct_holds_main_header td, #acct_checked_hist_header td, #acct_list_header td, #acct_list_header_anon td, #temp_list_holds td {
background: [% css_colors.accent_lighter2 %];
padding: 10px;
diff --git a/Open-ILS/src/templates/opac/myopac/holds.tt2 b/Open-ILS/src/templates/opac/myopac/holds.tt2
index e6ddb5a..18eadc2 100644
--- a/Open-ILS/src/templates/opac/myopac/holds.tt2
+++ b/Open-ILS/src/templates/opac/myopac/holds.tt2
@@ -121,6 +121,7 @@
<th>[% l('Cancel if not filled by') %]</th>
<th>[% l('Active') %]</th>
<th>[% l('Status') %]</th>
+ <th>[% l('Notes') %]</th>
</tr>
</thead>
<tbody id="holds_temp_parent">
@@ -179,6 +180,17 @@
[% PROCESS get_hold_status hold=hold; %]
</div>
</td>
+ <td class="hold_notes">
+ [%- FOREACH pubnote IN ahr.notes;
+ IF pubnote.pub == 't';
+ %]
+ <div class="hold_note">
+ <span class="hold_note_title">[% pubnote.title | html %]</span>
+ <br />
+ <span class="hold_note_body">[% pubnote.body | html %]</span>
+ </div>
+ [%- END; END; %]
+ </td>
<td class="opac-auto-161">
<a href="[% mkurl(ctx.opac_root _ '/myopac/holds/edit', {id => ahr.id}) %]">Edit</a>
</td>
diff --git a/Open-ILS/tests/datasets/sql/env_create.sql b/Open-ILS/tests/datasets/sql/env_create.sql
index b1ef2ac..52c3603 100644
--- a/Open-ILS/tests/datasets/sql/env_create.sql
+++ b/Open-ILS/tests/datasets/sql/env_create.sql
@@ -194,6 +194,22 @@ BEGIN
frozen,
thawdate
);
+
+ -- Create hold notes for staff-placed holds: 1 public, 1 private
+ IF requestor != patron_id THEN
+ INSERT INTO action.hold_request_note (hold, title, body, pub, staff)
+ VALUES (
+ currval('action.hold_request_id_seq'),
+ 'Public: Title of hold# ' || currval('action.hold_request_id_seq'),
+ 'Public: Hold note body for ' || currval('action.hold_request_id_seq'),
+ TRUE, TRUE
+ ), (
+ currval('action.hold_request_id_seq'),
+ 'Private: title of hold# ' || currval('action.hold_request_id_seq'),
+ 'Private: Hold note body for ' || currval('action.hold_request_id_seq'),
+ FALSE, TRUE
+ );
+ END IF;
END;
$$ LANGUAGE PLPGSQL;
commit 10551250dca09a952986b7cc51bea8837db8f02a
Author: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Date: Mon Jan 6 11:27:57 2014 -0500
TPAC: Get rid of all unneccessary uppercase and some bold
This gets rid of all places in the TPAC where CSS uses text-transform:
uppercase or capitalize. The former is bad for readability, and the
latter can only confuse users when strings might appear to be
capitalized differently in one context than another (esp. users'
personal names).
This mostly, but not exclusively, affects the My Account section.
Also, one wholly unused CSS class was removed altogether.
It also gets rid of some bold style that was applied too liberally to
the whole contents of tables.
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/src/templates/opac/css/style.css.tt2 b/Open-ILS/src/templates/opac/css/style.css.tt2
index a40d376..7f21071 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -121,7 +121,6 @@ div.select-box-wrapper {
#dash_user {
font-weight: bold;
- text-transform: capitalize;
}
#logout_link { left: 1px; }
@@ -482,7 +481,6 @@ div.format_icon {
background-color: [% css_colors.accent_lighter2 %];
padding: 13px 0px 13px 13px;
font-size: [% css_fonts.size_smaller %];
- text-transform: uppercase;
font-weight: bold;
text-align: left;
}
@@ -519,7 +517,6 @@ div.format_icon {
.rdetail_extras_link {
padding: 6px 12px;
font-size: [% css_fonts.size_smaller %];
- text-transform: uppercase;
font-weight: bold;
}
@@ -738,7 +735,6 @@ div.result_table_utils_cont {
}
.icon_text {
- text-transform:capitalize;
}
#myopac_summary_div p {
@@ -758,16 +754,13 @@ div.result_table_utils_cont {
}
#zero_hits_term {
- text-transform: uppercase;
font-weight: bold;
}
#zero_search_hits #spell_check_link {
- text-transform: uppercase;
}
#zero_search_hits #zero_hits_suggestions {
- text-transform: uppercase;
}
#lowhits_help {
@@ -823,9 +816,6 @@ div.result_table_utils_cont {
.acct_sum_table {
border-collapse: collapse;
background: [% css_colors.accent_ultralight %];
- font-size: [% css_fonts.size_smaller %];
- font-weight: bold;
- text-transform: uppercase;
}
.acct_sum_table tr {
@@ -880,9 +870,6 @@ table.acct_notes th {
}
#acct_checked_main_header, #acct_holds_main_header, #acct_checked_hist_header, #acct_list_header, #acct_list_header_anon, #temp_list_holds {
- font-weight:bold;
- text-transform:uppercase;
- font-size: [% css_fonts.size_smaller %];
border-collapse: collapse;
}
@@ -901,13 +888,6 @@ table.acct_notes th {
text-transform:none;
}
-#acct_holds_activates_table label {
- font-weight: bold;
- font-size: [% css_fonts.size_small %];
- text-transform:uppercase;
- padding-right: 5px;
-}
-
.search_catalog_lbl {
font-size: [% css_fonts.size_bigger %];
}
@@ -1103,9 +1083,7 @@ div#facet_sidebar {
}
.color_4 {
- text-transform: uppercase;
font-weight: bold;
- font-size: [% css_fonts.size_smaller %];
}
.advanced_div { padding-top: 15px; }
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/templates/opac/css/style.css.tt2 | 30 ++++++------------------
Open-ILS/src/templates/opac/myopac/holds.tt2 | 12 ++++++++++
Open-ILS/tests/datasets/sql/env_create.sql | 16 +++++++++++++
3 files changed, 36 insertions(+), 22 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list