[open-ils-commits] [GIT] Evergreen ILS branch rel_2_4 updated. ef52ddf056b30cf4ebb389b3f5310490bae2fd13

[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, rel_2_4 has been updated
       via  ef52ddf056b30cf4ebb389b3f5310490bae2fd13 (commit)
       via  9aceab921985d83ef0533d12316d6461637df501 (commit)
      from  4e09a7425f1669536df521993556e8ce1e84adfb (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 ef52ddf056b30cf4ebb389b3f5310490bae2fd13
Author: Remington Steed <rjs7 at calvin.edu>
Date:   Wed Jul 10 17:22:24 2013 -0400

    Restore look of acct summary table
    
    This commit makes a small adjustment to Pasi's cleaner layout of the
    Account Summary table.
    
    Signed-off-by: Remington Steed <rjs7 at calvin.edu>
    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 55b311d..a3ddbd5 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -797,6 +797,10 @@ div.result_place_hold {
     text-transform: uppercase;
 }
 
+.acct_sum_table tr {
+    border-bottom: 2px solid white;
+}
+
 .acct_sum_table td {
     padding: 1em;
 }

commit 9aceab921985d83ef0533d12316d6461637df501
Author: Pasi Kallinen <pasi.kallinen at pttk.fi>
Date:   Thu Jan 31 12:20:48 2013 +0200

    Clean up the account summary table HTML.
    
    Instead of faking a table with three separate DIVs,
    actually use a single table.
    
    Signed-off-by: Pasi Kallinen <pasi.kallinen at pttk.fi>
    Signed-off-by: Remington Steed <rjs7 at calvin.edu>
    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 959609d..55b311d 100644
--- a/Open-ILS/src/templates/opac/css/style.css.tt2
+++ b/Open-ILS/src/templates/opac/css/style.css.tt2
@@ -789,22 +789,25 @@ div.result_place_hold {
     font-weight: normal;
 }
 
-.acct_sum_row {
-    padding: 7px 15px;
+.acct_sum_table {
+    border-collapse: collapse;
     background: [% css_colors.accent_ultralight %];
-    margin-bottom: 2px;
     font-size: [% css_fonts.size_smaller %];
     font-weight: bold;
     text-transform: uppercase;
 }
 
-.acct_sum_row a {
+.acct_sum_table td {
+    padding: 1em;
+}
+
+.acct_sum_table a {
     text-transform: none;
     position:relative;
     top:-1px;
 }
 
-.acct_sum_row .view_link {
+.acct_sum_table .view_link {
     font-weight: normal;
 }
 
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 f0685e0..b14572e 100644
--- a/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
+++ b/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
@@ -57,37 +57,26 @@
             <span class="alert">[% l("Your library card expired on [_1]. Please contact a librarian to resolve this issue.", fmt_expire_date) %]</span>
             [% END %]
             </div>
-            <div class="acct_sum_row">
-                <table width="100%" cellspacing="0" cellpadding="0">
-                    <tr>
+            <table class="acct_sum_table">
+                <tr>
                         <td>[% l("Items Currently Checked out ([_1])", ctx.user_stats.checkouts.total_out) %]</td>
                         <td align="right">
                             <a href="[% mkurl(ctx.opac_root _ '/myopac/circs') %]">[% l("View All") %]</a>
                         </td>
-                    </tr>
-                </table>
-            </div>
-            <div class="acct_sum_row">
-                <table width="100%" cellspacing="0" cellpadding="0">
-                    <tr>
+                </tr>
+                <tr>
                         <td>[% l('Items Currently on Hold ([_1])', ctx.user_stats.holds.total) %]</td>
                         <td align="right">
                             <a href="[% mkurl(ctx.opac_root _ '/myopac/holds') %]">[% l('View All') %]</a>
                         </td>
-                    </tr>
-                </table>
-            </div>
-            <div class="acct_sum_row">
-                <table width="100%" cellspacing="0" cellpadding="0">
-                    <tr>
+                </tr>
+                <tr>
                         <td>[% l('Items ready for pickup ([_1])', ctx.user_stats.holds.ready) %]</td>
                         <td align="right">
                             <a href="[% mkurl(ctx.opac_root _ '/myopac/holds', {available => 1}) %]">[% l('View All') %]</a>
                         </td>
-                    </tr>
-                </table>
-            </div>
-
+                </tr>
+            </table>
         </div>
     </div>
     <div class="clear-both"></div>

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

Summary of changes:
 Open-ILS/src/templates/opac/css/style.css.tt2      |   17 +++++++++---
 .../src/templates/opac/parts/myopac/main_base.tt2  |   27 ++++++--------------
 2 files changed, 20 insertions(+), 24 deletions(-)


hooks/post-receive
-- 
Evergreen ILS