[open-ils-commits] [GIT] Evergreen ILS branch master updated. 961037561d3fe7b70fbe9d7a196502527374d8f6

[Evergreen Git]

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  961037561d3fe7b70fbe9d7a196502527374d8f6 (commit)
       via  b1727008e92003d04558c310310eae95fed8959b (commit)
      from  e1348fb435a757f6cc96fe28029677efe0cfc5ad (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 961037561d3fe7b70fbe9d7a196502527374d8f6
Author: Dan Scott <dscott at laurentian.ca>
Date:   Tue Jul 17 12:39:37 2012 -0400

    TPAC: Slightly more accessible user-visible account notes display
    
    Rather than a table layout that resembles an unordered list, use a real
    table with table header so that screen readers will know what to
    associate each column with.
    
    Also, move the table display into its own class so that we don't pick up
    the uppercase transform, and move it out of the div box so that we can
    use whatever screen real estate is given to us, rather than forcing
    notes into the hard-coded 662px box.
    
    Signed-off-by: Dan Scott <dscott at laurentian.ca>
    Signed-off-by: Bill Erickson <berick at esilibrary.com>

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 922b783..02c1509 100644
--- a/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
+++ b/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
@@ -82,18 +82,21 @@
                 </table>
             </div>
 
-            [% IF ctx.user.notes.0 %]
-            <div class="acct_sum_row">
-                <table>
-                [% FOR note IN ctx.user.notes %]
-                    <tr><td class='public-note-title'>[% l('* [_1]: ', note.title) | html %]</td><td>[% note.value | html %]</td></tr>
-                [% END %]
-                </table>
-            </div>
-            [% END %]
         </div>
     </div>
     <div class="clear-both"></div>
+
+    [% IF ctx.user.notes.0 %]
+    <table class="acct_notes">
+        <thead><th>[% l('Note title') %]</th><th>[% l('Content') %]</th></thead>
+        <tbody>
+        [% FOR note IN ctx.user.notes %]
+            <tr><td class='public-note-title'>[% note.title | html %]</td><td>[% note.value | html %]</td></tr>
+        [% END %]
+        </tbody>
+    </table>
+    [% END %]
+
     <div id='fines_payments_wrapper'>
         <div id='acct_fines_tabs'>
             [% IF myopac_main_page == 'main' %]
diff --git a/Open-ILS/web/css/skin/default/opac/style.css b/Open-ILS/web/css/skin/default/opac/style.css
index b9faf63..f68a101 100644
--- a/Open-ILS/web/css/skin/default/opac/style.css
+++ b/Open-ILS/web/css/skin/default/opac/style.css
@@ -878,6 +878,20 @@ div.result_place_hold {
 	font-size:12px;
 }
 
+table.acct_notes {
+    border-collapse: collapse;
+    margin: -1em 0 0.5em 0;
+}
+
+table.acct_notes * {
+    border: solid thin;
+    padding: 0.5em; 
+}
+
+table.acct_notes th {
+    font-weight: bold;
+}
+
 #myopac_sum_fines {
 	float:right;
 	padding: 15px 0px 0px 23px;

commit b1727008e92003d04558c310310eae95fed8959b
Author: Bill Erickson <berick at esilibrary.com>
Date:   Tue Jun 19 14:24:33 2012 -0400

    TPAC: show patron-visible notes in my-account
    
    Notes display in the 'Account Summary' box on the first page of
    my-account.
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
    Signed-off-by: Dan Scott <dscott at laurentian.ca>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
index 5038851..8e40799 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
@@ -1436,7 +1436,12 @@ sub load_myopac_main {
     my $limit = $self->cgi->param('limit') || 0;
     my $offset = $self->cgi->param('offset') || 0;
     $self->ctx->{search_ou} = $self->_get_search_lib();
-
+    $self->ctx->{user}->notes(
+        $self->editor->search_actor_usr_note({
+            usr => $self->ctx->{user}->id,
+            pub => 't'
+        })
+    );
     return $self->prepare_fines($limit, $offset) || Apache2::Const::OK;
 }
 
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 9acb4ce..922b783 100644
--- a/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
+++ b/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
@@ -81,6 +81,16 @@
                     </tr>
                 </table>
             </div>
+
+            [% IF ctx.user.notes.0 %]
+            <div class="acct_sum_row">
+                <table>
+                [% FOR note IN ctx.user.notes %]
+                    <tr><td class='public-note-title'>[% l('* [_1]: ', note.title) | html %]</td><td>[% note.value | html %]</td></tr>
+                [% END %]
+                </table>
+            </div>
+            [% END %]
         </div>
     </div>
     <div class="clear-both"></div>

-----------------------------------------------------------------------

Summary of changes:
 .../lib/OpenILS/WWW/EGCatLoader/Account.pm         |    7 ++++++-
 .../src/templates/opac/parts/myopac/main_base.tt2  |   13 +++++++++++++
 Open-ILS/web/css/skin/default/opac/style.css       |   14 ++++++++++++++
 3 files changed, 33 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS