[open-ils-commits] [GIT] Evergreen ILS branch master updated. b56c7173b3df954a351c51df27ed3870c235588b
Evergreen Git
git at git.evergreen-ils.org
Mon Sep 26 16:47:23 EDT 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via b56c7173b3df954a351c51df27ed3870c235588b (commit)
via d299e9c6dbc978be4e3a565e859f7b43c4df9b5e (commit)
via 69046b827fc4ad21fa6fba99d9f0b983d59b7562 (commit)
via f3e16a8d3b2bd2189d406238728af41f6d176738 (commit)
from 73a0f2a6431d00026d4ce6f912ee210877b9cedf (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 b56c7173b3df954a351c51df27ed3870c235588b
Author: Thomas Berezansky <tsbere at mvlc.org>
Date: Mon Sep 26 10:04:35 2011 -0400
TPac: Respect OU opac_visible flags
Unless we appear to be in staff mode. Then continue to ignore them.
Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/src/templates/opac/parts/org_selector.tt2 b/Open-ILS/src/templates/opac/parts/org_selector.tt2
index 1485679..96bdcbf 100644
--- a/Open-ILS/src/templates/opac/parts/org_selector.tt2
+++ b/Open-ILS/src/templates/opac/parts/org_selector.tt2
@@ -7,16 +7,18 @@
ELSIF walker.id == value;
selected = 'selected="selected"';
END;
+ IF ctx.is_staff || walker.opac_visible == 't';
%]
- <option value='[% walker.id | uri %]' [% selected %] [% disabled %]>
- [%
- pad = walker.ou_type.depth * 2;
- FOR idx IN [0..pad]; ' '; END;
- walker.name | html;
- %]
- </option>
- [% FOR child IN walker.children;
- PROCESS build_org_selector_options walker=child value=value;
+ <option value='[% walker.id | uri %]' [% selected %] [% disabled %]>
+ [%
+ pad = walker.ou_type.depth * 2;
+ FOR idx IN [0..pad]; ' '; END;
+ walker.name | html;
+ %]
+ </option>
+ [% FOR child IN walker.children;
+ PROCESS build_org_selector_options walker=child value=value;
+ END;
END;
END;
commit d299e9c6dbc978be4e3a565e859f7b43c4df9b5e
Author: Thomas Berezansky <tsbere at mvlc.org>
Date: Sat Sep 24 19:03:27 2011 -0400
TPac: Fix bolding of bad email/username
HTML filter the variable, not the entire language string.
Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/src/templates/opac/myopac/update_email.tt2 b/Open-ILS/src/templates/opac/myopac/update_email.tt2
index 8279959..b920e08 100644
--- a/Open-ILS/src/templates/opac/myopac/update_email.tt2
+++ b/Open-ILS/src/templates/opac/myopac/update_email.tt2
@@ -6,7 +6,8 @@
[% IF ctx.invalid_email %]
<div id='account-update-email-error'>
- [% l('The email address "<b>[_1]</b>" is invalid. Please try a different email address.', ctx.invalid_email) | html %]
+ [% bad_email = ctx.invalid_email | html %]
+ [% l('The email address "<b>[_1]</b>" is invalid. Please try a different email address.', bad_email) %]
</div>
[% END %]
diff --git a/Open-ILS/src/templates/opac/myopac/update_username.tt2 b/Open-ILS/src/templates/opac/myopac/update_username.tt2
index 8ff329e..6f48320 100644
--- a/Open-ILS/src/templates/opac/myopac/update_username.tt2
+++ b/Open-ILS/src/templates/opac/myopac/update_username.tt2
@@ -6,7 +6,8 @@
[% IF ctx.invalid_username %]
<div id='account-update-email-error'> <!-- borrow css from update-email page -->
- [% l('"<b>[_1]</b>" is not a valid username. Usernames cannot have any spaces. Please try a different username.', ctx.invalid_username) | html %]
+ [% bad_user = ctx.invalid_username | html %]
+ [% l('"<b>[_1]</b>" is not a valid username. Usernames cannot have any spaces. Please try a different username.', bad_user) %]
</div>
[% ELSIF ctx.username_exists %]
commit 69046b827fc4ad21fa6fba99d9f0b983d59b7562
Author: Thomas Berezansky <tsbere at mvlc.org>
Date: Sat Sep 24 14:55:18 2011 -0400
TPac: Hide CC Payment info when not enabled
Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/src/templates/opac/myopac/main.tt2 b/Open-ILS/src/templates/opac/myopac/main.tt2
index 158e597..5068474 100644
--- a/Open-ILS/src/templates/opac/myopac/main.tt2
+++ b/Open-ILS/src/templates/opac/myopac/main.tt2
@@ -3,6 +3,10 @@
WRAPPER "opac/parts/myopac/main_base.tt2";
myopac_page = "main";
myopac_main_page = "main";
+ myopac_cc_allowed = 0;
+ IF (ctx.fines.grocery.size OR ctx.fines.circulation.size) AND ctx.get_org_setting(ctx.user.home_ou, 'credit.payments.allow') == 1;
+ myopac_cc_allowed = 1;
+ END
%]
<form action="[% ctx.opac_root %]/myopac/main_payment_form" method="GET">
[% IF ctx.fines.circulation.size > 0 %]
@@ -21,12 +25,14 @@
<td>[% l("Due Date") %]</td>
<td>[% l("Date Returned") %]</td>
<td>[% l("Balance Owed") %]</td>
+ [% IF myopac_cc_allowed %]
<td nowrap="nowrap" style="white-space:nowrap;">
<input id="pay_fines_box1" checked="checked"
type="checkbox" onclick="select_all_checkboxes('xact', this.checked)"
title="[% l('Click to (un)select all fines') %]" />
<label for="pay_fines_box1">[% l('Pay Fines') %]</label>
</td>
+ [% END %]
</tr>
</thead>
<tbody id='myopac_circ_trans_tbody'>
@@ -77,11 +83,13 @@
[% money(f.xact.balance_owed) %]
</strong>
</td>
+ [% IF myopac_cc_allowed %]
<td>
<input type="checkbox" checked="checked"
title="[% l('Pay this fine') %]" name="xact"
value="[% f.xact.id %]" />
</td>
+ [% END %]
</tr>
[% END %]
</tbody>
@@ -110,6 +118,7 @@
<td width='16%'>[% l("Total Amount Paid") %]</td>
<td width='16%'>[% l("Balance Owed") %]</td>
<td width='16%'>[% l("Billing Type") %]</td>
+ [% IF myopac_cc_allowed %]
<td width='4%' align="center" nowrap="nowrap"
style="white-space:nowrap;">
<input id="pay_fines_box2" checked="checked"
@@ -117,6 +126,7 @@
title="[% l('Click to (un)select all fines') %]" />
<label for="pay_fines_box2">[% l("Pay Fines") %]</label>
</td>
+ [% END %]
</tr>
</thead>
<tbody id='myopac_trans_tbody'>
@@ -143,11 +153,13 @@
</strong>
</td>
<td>[% f.xact.last_billing_type %]</td>
+ [% IF myopac_cc_allowed %]
<td>
<input type="checkbox" title='[% l("Pay this fine") %]'
name="xact_misc" value="[% f.xact.id %]"
checked="checked" />
</td>
+ [% END %]
</tr>
[% END %]
</tbody>
@@ -156,7 +168,7 @@
[% END %]
[% UNLESS ctx.fines.grocery.size OR ctx.fines.circulation.size %]
<div>[% l('You have no current fines.') %]</div>
- [% ELSE %]
+ [% ELSIF myopac_cc_allowed %]
<div class="text-right pad-top-ten">
<input type="submit"
value="[% l('Pay selected fines') %]"
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 43383c4..36ec79c 100644
--- a/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
+++ b/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
@@ -40,10 +40,11 @@
<span class='[% ctx.user_stats.fines.balance_owed ? "red" : ""%]'>
[% money(ctx.user_stats.fines.balance_owed) %]
</span><br />
-
+ [% IF (ctx.fines.grocery.size OR ctx.fines.circulation.size) AND ctx.get_org_setting(ctx.user.home_ou, 'credit.payments.allow') == 1 %]
<form action="[% ctx.opac_root %]/myopac/main_payment_form" method="GET"><input
type="submit" title="[% l('Pay Fines') %]" alt="[% l('Pay Fines') %]"
value="[% l('Pay Fines') %]" class="pos-rel-top-5 opac-button" /></form>
+ [% END %]
</div>
[% END %]
commit f3e16a8d3b2bd2189d406238728af41f6d176738
Author: Thomas Berezansky <tsbere at mvlc.org>
Date: Sat Sep 24 14:23:00 2011 -0400
TPac Fixes - Missing Quotes
Start off real easy, add some missing quotes.
Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
Signed-off-by: Dan Scott <dscott at laurentian.ca>
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 850673a..43383c4 100644
--- a/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
+++ b/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
@@ -43,7 +43,7 @@
<form action="[% ctx.opac_root %]/myopac/main_payment_form" method="GET"><input
type="submit" title="[% l('Pay Fines') %]" alt="[% l('Pay Fines') %]"
- value=[% l('Pay Fines') %] class="pos-rel-top-5 opac-button" /></form>
+ value="[% l('Pay Fines') %]" class="pos-rel-top-5 opac-button" /></form>
</div>
[% END %]
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/templates/opac/myopac/main.tt2 | 14 +++++++++++++-
.../src/templates/opac/myopac/update_email.tt2 | 3 ++-
.../src/templates/opac/myopac/update_username.tt2 | 3 ++-
.../src/templates/opac/parts/myopac/main_base.tt2 | 5 +++--
Open-ILS/src/templates/opac/parts/org_selector.tt2 | 20 +++++++++++---------
5 files changed, 31 insertions(+), 14 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list