Merge branch 'opac-tt-poc' of git+ssh://yeti.esilibrary.com/home/evergreen/evergreen...
authorberick <berick@esilibrary.com>
Thu, 7 Apr 2011 14:18:33 +0000 (10:18 -0400)
committerberick <berick@esilibrary.com>
Thu, 7 Apr 2011 14:18:33 +0000 (10:18 -0400)
19 files changed:
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader.pm
Open-ILS/src/perlmods/lib/OpenILS/WWW/EGCatLoader/Account.pm
Open-ILS/web/templates/default/opac/myopac/circ_history.tt2
Open-ILS/web/templates/default/opac/myopac/circs.tt2
Open-ILS/web/templates/default/opac/myopac/hold_history.tt2
Open-ILS/web/templates/default/opac/myopac/holds.tt2
Open-ILS/web/templates/default/opac/myopac/lists.tt2
Open-ILS/web/templates/default/opac/myopac/main.tt2
Open-ILS/web/templates/default/opac/myopac/main_payments.tt2 [new file with mode: 0644]
Open-ILS/web/templates/default/opac/myopac/prefs.tt2
Open-ILS/web/templates/default/opac/myopac/prefs/notify.tt2 [deleted file]
Open-ILS/web/templates/default/opac/myopac/prefs/settings.tt2 [deleted file]
Open-ILS/web/templates/default/opac/myopac/prefs_notify.tt2 [new file with mode: 0644]
Open-ILS/web/templates/default/opac/myopac/prefs_settings.tt2 [new file with mode: 0644]
Open-ILS/web/templates/default/opac/myopac/update_email.tt2
Open-ILS/web/templates/default/opac/parts/myopac/base.tt2
Open-ILS/web/templates/default/opac/parts/myopac/main_base.tt2 [new file with mode: 0644]
Open-ILS/web/templates/default/opac/parts/myopac/personal.tt2 [deleted file]
Open-ILS/web/templates/default/opac/parts/myopac/prefs_base.tt2 [new file with mode: 0644]

index 342217c..33e2822 100644 (file)
@@ -121,14 +121,15 @@ sub load {
     return $self->load_place_hold if $path =~ m|opac/place_hold|;
     return $self->load_myopac_holds if $path =~ m|opac/myopac/holds|;
     return $self->load_myopac_circs if $path =~ m|opac/myopac/circs|;
+    return $self->load_myopac_payments if $path =~ m|opac/myopac/main_payments|;
     return $self->load_myopac_main if $path =~ m|opac/myopac/main|;
     return $self->load_myopac_update_email if $path =~ m|opac/myopac/update_email|;
     return $self->load_myopac_bookbags if $path =~ m|opac/myopac/lists|;
     return $self->load_myopac_bookbag_update if $path =~ m|opac/myopac/list/update|;
     return $self->load_myopac_circ_history if $path =~ m|opac/myopac/circ_history|;
     return $self->load_myopac_hold_history if $path =~ m|opac/myopac/hold_history|;
-    return $self->load_myopac_prefs_notify if $path =~ m|opac/myopac/prefs/notify|;
-    return $self->load_myopac_prefs_settings if $path =~ m|opac/myopac/prefs/settings|;
+    return $self->load_myopac_prefs_notify if $path =~ m|opac/myopac/prefs_notify|;
+    return $self->load_myopac_prefs_settings if $path =~ m|opac/myopac/prefs_settings|;
     return $self->load_myopac_prefs if $path =~ m|opac/myopac/prefs|;
 
     return Apache2::Const::OK;
index 552e5c5..e51ddd9 100644 (file)
@@ -551,23 +551,11 @@ sub load_myopac_hold_history {
     return Apache2::Const::OK;
 }
 
-sub load_myopac_main {
-    my $self = shift;
-    my $limit = $self->cgi->param('limit') || 0;
-    my $offset = $self->cgi->param('offset') || 0;
-    my $expand = $self->cgi->param('expand') || '';
-
-    return $self->load_myopac_payments($limit, $offset) 
-        if $expand eq 'payments';
-
-    return $self->load_myopac_fines($limit, $offset);
-}
-
 # TODO: add other filter options as params/configs/etc.
 sub load_myopac_payments {
     my $self = shift;
-    my $limit = shift || 0;
-    my $offset = shift || 0;
+    my $limit = $self->cgi->param('limit') || 0;
+    my $offset = $self->cgi->param('offset') || 0;
     my $e = $self->editor;
 
     my $args = {};
@@ -584,10 +572,10 @@ sub load_myopac_payments {
 
 
 
-sub load_myopac_fines {
+sub load_myopac_main {
     my $self = shift;
-    my $limit = shift || 0;
-    my $offset = shift || 0;
+    my $limit = $self->cgi->param('limit') || 0;
+    my $offset = $self->cgi->param('offset') || 0;
     my $e = $self->editor;
     my $ctx = $self->ctx;
 
index e21e67f..4b2f27b 100644 (file)
@@ -1,7 +1,6 @@
 [%  PROCESS "default/opac/parts/header.tt2";
     PROCESS "default/opac/parts/marc_misc.tt2";
-    WRAPPER "default/opac/parts/base.tt2" +
-        "default/opac/parts/myopac/base.tt2";
+    WRAPPER "default/opac/parts/myopac/base.tt2";
     myopac_page = "circs";
     limit = CGI.param('limit') || 25;
     offset = CGI.param('offset') || 0;
index 2e68ca1..c16d28c 100644 (file)
@@ -1,7 +1,6 @@
 [%  PROCESS "default/opac/parts/header.tt2";
     PROCESS "default/opac/parts/misc_util.tt2";
-    WRAPPER "default/opac/parts/base.tt2" +
-        "default/opac/parts/myopac/base.tt2";
+    WRAPPER "default/opac/parts/myopac/base.tt2";
     myopac_page = "circs"  %]
 <div id='myopac_checked_div' style="padding:0px;">
 
index e2151e2..62429fe 100644 (file)
@@ -1,7 +1,6 @@
 [%  PROCESS "default/opac/parts/header.tt2";
     PROCESS "default/opac/parts/marc_misc.tt2";
-    WRAPPER "default/opac/parts/base.tt2" +
-        "default/opac/parts/myopac/base.tt2";
+    WRAPPER "default/opac/parts/myopac/base.tt2";
     myopac_page = "holds"  
     limit = CGI.param('limit') || 25;
     offset = CGI.param('offset') || 0;
index acced7f..ec18831 100644 (file)
@@ -1,7 +1,6 @@
 [%  PROCESS "default/opac/parts/header.tt2";
     PROCESS "default/opac/parts/misc_util.tt2";
-    WRAPPER "default/opac/parts/base.tt2" +
-        "default/opac/parts/myopac/base.tt2";
+    WRAPPER "default/opac/parts/myopac/base.tt2";
     myopac_page = "holds"  %]
 <div id='myopac_holds_div'>
 
index f661726..70fc328 100644 (file)
@@ -1,7 +1,6 @@
 [%  PROCESS "default/opac/parts/header.tt2";
     PROCESS "default/opac/parts/misc_util.tt2";
-    WRAPPER "default/opac/parts/base.tt2" +
-        "default/opac/parts/myopac/base.tt2";
+    WRAPPER "default/opac/parts/myopac/base.tt2";
     myopac_page = "lists"  %]
 <div id='myopac_bookbag_div' style="padding:5px;">
     <!-- <div class="header_middle">
index 6b89717..6f2584b 100644 (file)
 [%  PROCESS "default/opac/parts/header.tt2";
     PROCESS "default/opac/parts/misc_util.tt2";
-    WRAPPER "default/opac/parts/base.tt2" +
-        "default/opac/parts/myopac/base.tt2";
+    WRAPPER "default/opac/parts/myopac/main_base.tt2";
     myopac_page = "main";
-    show_payments = (CGI.param('expand') == 'payments');
+    myopac_main_page = "main";
 %]
 
-<div id='myopac_summary_div' style="padding:0px;">
-
-    <div style="width:742px;float:left;">
-        <div class="header_middle">[% l('Account Summary') %]</div>
-    </div>
-
-    <!-- fines summary along the right of the page -->
-    <div id="myopac_sum_fines">
-        <div style="position:absolute;">
-            <div style="position:relative;top:-15px;left:-23px;">
-                <img src="[% ctx.media_prefix %]/images/acct_sum_fines_tl.png" />
-            </div>
-        </div>
-        <div style="position:absolute;">
-            <div style="position:relative;top:-15px;left:172px;">
-                <img src="[% ctx.media_prefix %]/images/acct_sum_fines_tr.png" />
-            </div>
-        </div>
-        <div style="position:absolute;">
-            <div style="position:relative;top:161px;left:-23px;">
-                <img src="[% ctx.media_prefix %]/images/acct_sum_fines_bl.png" />
-            </div>
-        </div>
-        <div style="position:absolute;">
-            <div style="position:relative;top:161px;left:172px;">
-                <img src="[% ctx.media_prefix %]/images/acct_sum_fines_br.png" />
-            </div>
-        </div>
-        [% l('Fines:') %]
-        <span id="myopac_sum_fines_bal" class='[% ctx.user_stats.fines.balance_owed ? "red" : ""%]'>
-            [% money(ctx.user_stats.fines.balance_owed) %]
-        </span><br />
-        <a class="hide_me" href="#" id="pay_fines_btn1"><img
-            alt="[% l('Pay Fines') %]"
-            onmouseover="this.src='[% ctx.media_prefix %]/images/pay-fines-btn-hover.png';"
-            onmouseout="this.src='[% ctx.media_prefix %]/images/pay-fines-btn.png';"
-            src="[% ctx.media_prefix %]/images/pay-fines-btn.png"
-            style="position:relative;top:5px;" /></a>
-    </div>
-
-
-    <div style="width:662px;">
-        <div style="float:left;">
-            <div style="padding:10px 0px;" id="myopac_sum_name"></div>
-            <div class="acct_sum_row">
-                <table width="100%" cellspacing="0" cellpadding="0">
-                    <tr>
-                        <td>[% l("Items Currently Checked out ([_1])", ctx.user_stats.checkouts.total_out) %]</td>
-                        <td align="right">
-                            <a href="[% 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>
-                        <td>[% l('Items Currently on Hold ([_1])', ctx.user_stats.holds.total) %]</td>
-                        <td align="right">
-                            <a href="[% 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>
-                        <td>[% l('Items ready for pickup ([_1])', ctx.user_stats.holds.ready) %]</td>
-                        <td align="right">
-                            <a href="[% ctx.opac_root %]/myopac/holds?available=1">[% l('View All') %]</a>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-
-            <!-- this is here to allow for hiding open transactions, but that 
-            also hides payments history, which we don't want.  perhaps this 
-            can be left out entirely
-            <div class="acct_sum_row" id="myopac_sum_fines_slim">
-                <table width="100%" cellspacing="0" cellpadding="0">
-                    <tr>
-                        <td>[% l('Fees &amp; Fines') %]</td>
-                        <td align="right">
-                            <a href="#">Show Overdue Materials</a>
-                        </td>
-                    </tr>
-                </table>
-            </div>
-            -->
-            
-        </div>
-    </div>
-    <div class="clear-both"></div>
-
-    <div id='fines_payments_wrapper'>
-        <div id='acct_fines_tabs'>
-            [% IF show_payments %]
-            <a href='main'><img src='[% ctx.media_prefix %]/images/acct_fines_off.jpg'/></a>
-            <a href=''><img src='[% ctx.media_prefix %]/images/acct_payments_on.jpg'/></a>
-            [% ELSE %]
-            <a href=''><img src='[% ctx.media_prefix %]/images/acct_fines_on.jpg'/></a>
-            <a href='?expand=payments'><img src='[% ctx.media_prefix %]/images/acct_payments_off.jpg'/></a>
-            [% END %]
-        </div>
-    </div>
-
-[% IF !show_payments %]
     [% IF ctx.fines.circulation.size > 0 %]
     <div id='myopac_circ_trans_div'>
         <table width='100%' class='data_grid'>
     </div>
     [% END %]
 
-    <!-- TODO: hidden until pay-fines is implemented
-    <a href="#"><img alt="[% l('Pay Fines') %]"
-        onmouseover="this.src='[% ctx.media_prefix %]/images/pay-fines-btn-hover.png';"
-        src="[% ctx.media_prefix %]/images/pay-fines-btn.png"
-        style="position:relative;top:5px;" /></a>
-    <br/>
-    -->
+<!-- TODO: move payment form to its own page -->
 
-[% ELSE %] <!-- show payments -->
-    <div>
-        <table id='myopac_payments_table' width='100%' class='data_grid'>
-            <thead><tr>
-                <th>[% l('Payment Date') %]</th>
-                <th>[% l('Payment For') %]</th>
-                <th>[% l('Amount') %]</th>
-                <th>[% l('Receipt') %]</th> 
-            </tr></thead>
-            <tbody>
-                [% FOR payment IN ctx.payments %]
-                <tr>
-                    <td>[% date.format(ctx.parse_datetime(payment.mp.payment_ts), DATE_FORMAT) %]</td>
-                    <td>[% (payment.xact_type == 'grocery') ? payment.last_billing_type : payment.title %]</td>
-                    <td>[% money(payment.mp.amount) %]</td>
-                    <td>
-                        [%# post to print/email form... %]
-                        <a href=''>[% l('Print') %]</a> / <a href=''>[% l('Email') %]</a>
-                    </td>
-                </tr>
-                [% END %]
-            </tbody>
-        </table>
-    </div>
-[% END %] 
-
-
-    <!-- TODO: move payment form to its own page -->
-
-    <div id="pay_fines_now" class="hide_me">
-        <table id='oils-selfck-cc-payment-table'>
-            <tbody>
-                <tr>
-                    <td><div style="width:129px;"></div></td>
-                    <td><div style="width:195px;"></div></td>
-                    <td><div style="width:324px;"></div></td>
-                </tr>
-                <tr>
-                    <td colspan='2'><strong>Billing Information</strong></td>
-                    <td rowspan='13' valign='top'>
-                        Selected fines you are paying for:
-                        <table cellpadding="0" cellspacing="5" border="0">
-                            <thead>
-                                <tr>
-                                    <td>
-                                        <strong>Name</strong>
-                                    </td>
-                                    <td>
-                                        <strong>Amount</strong>
-                                    </td>
-                                </tr>
-                            </thead>
-                            <tbody id="selectedFines">
-                            </tbody>
-                        </table>
-                        <br />
-                        <div id='oils-selfck-cc-payment-summary'>
-                            Total amount to pay:
-                            <strong>$<span></span></strong>
-                        </div>
-                        <br />
-                        Click <strong>Cancel</strong> to go back and (un)select
-                        other fines.
-                    </td>
-                </tr>
-                <tr>
-                    <td>First Name</td>
-                    <td><input jsId='oilsSelfckCCFName' /></td>
-                </tr>
-                <tr>
-                    <td>Last Name</td>
-                    <td><input jsId='oilsSelfckCCLName' /></td>
-                </tr>
-                <tr>
-                    <td>Street Address</td>
-                    <td><input jsId='oilsSelfckCCStreet' /></td>
-                </tr>
-                <tr>
-                    <td>City</td>
-                    <td><input jsId='oilsSelfckCCCity' /></td>
-                </tr>
-                <tr>
-                    <td>State or Province</td>
-                    <td><input jsId='oilsSelfckCCState' /></td>
-                </tr>
-                <tr>
-                    <td>ZIP or Postal Code</td>
-                    <td><input jsId='oilsSelfckCCZip' /></td>
-                </tr>
-                <tr>
-                  <td colspan='2'><strong>Credit Card Information</strong></td>
-                </tr>
-                <!-- Technically not needed since card type is derived from the CC number
-                <tr>
-                    <td>Type of Card</td>
-                    <td>
-                        <select jsId='oilsSelfckCCType' required='true'>
-                            <option value='VISA'>VISA</option>
-                            <option value='MasterCard'>MasterCard</option>
-                            <option value='American Express'>American Express</option>
-                        </select>
-                    </td>
-                </tr>
-                -->
-                <tr>
-                    <td>Credit Card #</td>
-                    <td><input jsId='oilsSelfckCCNumber' /></td>
-                </tr>
-                <tr>
-                    <td>
-                        <div style="position:absolute;">
-                            <div style="position:relative;left:80px;">
-                                <a href="#"><img
-                                    src="[% ctx.media_prefix %]/images/question-mark.png" /></a>
-                            </div>
+<div id="pay_fines_now" class="hide_me">
+    <table id='oils-selfck-cc-payment-table'>
+        <tbody>
+            <tr>
+                <td><div style="width:129px;"></div></td>
+                <td><div style="width:195px;"></div></td>
+                <td><div style="width:324px;"></div></td>
+            </tr>
+            <tr>
+                <td colspan='2'><strong>Billing Information</strong></td>
+                <td rowspan='13' valign='top'>
+                    Selected fines you are paying for:
+                    <table cellpadding="0" cellspacing="5" border="0">
+                        <thead>
+                            <tr>
+                                <td>
+                                    <strong>Name</strong>
+                                </td>
+                                <td>
+                                    <strong>Amount</strong>
+                                </td>
+                            </tr>
+                        </thead>
+                        <tbody id="selectedFines">
+                        </tbody>
+                    </table>
+                    <br />
+                    <div id='oils-selfck-cc-payment-summary'>
+                        Total amount to pay:
+                        <strong>$<span></span></strong>
+                    </div>
+                    <br />
+                    Click <strong>Cancel</strong> to go back and (un)select
+                    other fines.
+                </td>
+            </tr>
+            <tr>
+                <td>First Name</td>
+                <td><input jsId='oilsSelfckCCFName' /></td>
+            </tr>
+            <tr>
+                <td>Last Name</td>
+                <td><input jsId='oilsSelfckCCLName' /></td>
+            </tr>
+            <tr>
+                <td>Street Address</td>
+                <td><input jsId='oilsSelfckCCStreet' /></td>
+            </tr>
+            <tr>
+                <td>City</td>
+                <td><input jsId='oilsSelfckCCCity' /></td>
+            </tr>
+            <tr>
+                <td>State or Province</td>
+                <td><input jsId='oilsSelfckCCState' /></td>
+            </tr>
+            <tr>
+                <td>ZIP or Postal Code</td>
+                <td><input jsId='oilsSelfckCCZip' /></td>
+            </tr>
+            <tr>
+              <td colspan='2'><strong>Credit Card Information</strong></td>
+            </tr>
+            <!-- Technically not needed since card type is derived from the CC number
+            <tr>
+                <td>Type of Card</td>
+                <td>
+                    <select jsId='oilsSelfckCCType' required='true'>
+                        <option value='VISA'>VISA</option>
+                        <option value='MasterCard'>MasterCard</option>
+                        <option value='American Express'>American Express</option>
+                    </select>
+                </td>
+            </tr>
+            -->
+            <tr>
+                <td>Credit Card #</td>
+                <td><input jsId='oilsSelfckCCNumber' /></td>
+            </tr>
+            <tr>
+                <td>
+                    <div style="position:absolute;">
+                        <div style="position:relative;left:80px;">
+                            <a href="#"><img
+                                src="[% ctx.media_prefix %]/images/question-mark.png" /></a>
                         </div>
-                        Security Code
-                    </td>
-                    <td>
-                        <input jsId='oilsSelfckCCCVV' />
-                    </td>
-                </tr>
-                <tr>
-                    <td>Exipration Month</td>
-                    <td>
-                        <select jsId='oilsSelfckCCMonth'>
-                            <option value='01' selected='selected'>January</option>
-                            <option value='02'>February</option>
-                            <option value='03'>March</option>
-                            <option value='04'>April</option>
-                            <option value='05'>May</option>
-                            <option value='06'>June</option>
-                            <option value='07'>July</option>
-                            <option value='08'>August</option>
-                            <option value='09'>September</option>
-                            <option value='10'>October</option>
-                            <option value='11'>November</option>
-                            <option value='12'>December</option>
-                        </select>
-                    </td>
-                </tr>
-                <tr>
-                    <td>Expiration Year</td>
-                    <td>
-                      <select jsId='oilsSelfckCCYear'>
-                        <option value='2011'>2011</option>
-                        <option value='2012'>2012</option>
-                        <option value='2013'>2013</option>
-                        <option value='2014'>2014</option>
-                        <option value='2015'>2015</option>
-                        <option value='2016'>2016</option>
-                        <option value='2017'>2017</option>
-                        <option value='2018'>2018</option>
-                        <option value='2019'>2019</option>
-                      </select>
-                    </td>
-                </tr>
-                <tr class="hide_me">
-                    <td>Edit Billing Address</td>
-                    <td>
-                        <input jsId='oilsSelfckEditDetails'/>
-                    </td>
-                </tr>
-                <tr>
-                    <td colspan='2' align="center">
-                        <button jsId='oilsSelfckCCSubmit'>
-                            Submit Payment
-                        </button>
-                        <button>
-                            Cancel
-                        </button>
-                    </td>
-                </tr>
-                <tr>
-                    <td colspan="3">
-                        <br />
-                        Important! You must have a printed receipt to be
-                        eligible for a refund on lost items (regulations allow
-                        for no exceptions).
-                        <br />
-                        <strong>
-                            To ensure your necessary receipt information is
-                            not lost, enter your email address above and a
-                            receipt will be emailed to you. Otherwise, make
-                            certain you have a printed receipt in hand before
-                            closing the payment receipt screen.
-                        </strong>
-                        <br />
-                        Refunds are not available for parts and pieces, overdue
-                        fines, or items that do not display a specific title in
-                        My Account. For a full list of refundable and
-                        non-refundable items, visit
-                        <a href="http://www.kcls.org/usingthelibrary/borrowing/refundable.cfm">http://www.kcls.org/usingthelibrary/borrowing/refundable.cfm</a><br /><br />
-                        This site uses VeriSign SSL encryption to ensure your
-                        privacy.
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-    </div>
+                    </div>
+                    Security Code
+                </td>
+                <td>
+                    <input jsId='oilsSelfckCCCVV' />
+                </td>
+            </tr>
+            <tr>
+                <td>Exipration Month</td>
+                <td>
+                    <select jsId='oilsSelfckCCMonth'>
+                        <option value='01' selected='selected'>January</option>
+                        <option value='02'>February</option>
+                        <option value='03'>March</option>
+                        <option value='04'>April</option>
+                        <option value='05'>May</option>
+                        <option value='06'>June</option>
+                        <option value='07'>July</option>
+                        <option value='08'>August</option>
+                        <option value='09'>September</option>
+                        <option value='10'>October</option>
+                        <option value='11'>November</option>
+                        <option value='12'>December</option>
+                    </select>
+                </td>
+            </tr>
+            <tr>
+                <td>Expiration Year</td>
+                <td>
+                  <select jsId='oilsSelfckCCYear'>
+                    <option value='2011'>2011</option>
+                    <option value='2012'>2012</option>
+                    <option value='2013'>2013</option>
+                    <option value='2014'>2014</option>
+                    <option value='2015'>2015</option>
+                    <option value='2016'>2016</option>
+                    <option value='2017'>2017</option>
+                    <option value='2018'>2018</option>
+                    <option value='2019'>2019</option>
+                  </select>
+                </td>
+            </tr>
+            <tr class="hide_me">
+                <td>Edit Billing Address</td>
+                <td>
+                    <input jsId='oilsSelfckEditDetails'/>
+                </td>
+            </tr>
+            <tr>
+                <td colspan='2' align="center">
+                    <button jsId='oilsSelfckCCSubmit'>
+                        Submit Payment
+                    </button>
+                    <button>
+                        Cancel
+                    </button>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="3">
+                    <br />
+                    Important! You must have a printed receipt to be
+                    eligible for a refund on lost items (regulations allow
+                    for no exceptions).
+                    <br />
+                    <strong>
+                        To ensure your necessary receipt information is
+                        not lost, enter your email address above and a
+                        receipt will be emailed to you. Otherwise, make
+                        certain you have a printed receipt in hand before
+                        closing the payment receipt screen.
+                    </strong>
+                    <br />
+                    Refunds are not available for parts and pieces, overdue
+                    fines, or items that do not display a specific title in
+                    My Account. For a full list of refundable and
+                    non-refundable items, visit
+                    <a href="http://www.kcls.org/usingthelibrary/borrowing/refundable.cfm">http://www.kcls.org/usingthelibrary/borrowing/refundable.cfm</a><br /><br />
+                    This site uses VeriSign SSL encryption to ensure your
+                    privacy.
+                </td>
+            </tr>
+        </tbody>
+    </table>
 </div>
 [% END %]
diff --git a/Open-ILS/web/templates/default/opac/myopac/main_payments.tt2 b/Open-ILS/web/templates/default/opac/myopac/main_payments.tt2
new file mode 100644 (file)
index 0000000..3749bda
--- /dev/null
@@ -0,0 +1,30 @@
+[%  PROCESS "default/opac/parts/header.tt2";
+    PROCESS "default/opac/parts/misc_util.tt2";
+    WRAPPER "default/opac/parts/myopac/main_base.tt2";
+    myopac_page = "main";
+    myopac_main_page = "payments";
+%]
+<div>
+    <table id='myopac_payments_table' width='100%' class='data_grid'>
+        <thead><tr>
+            <th>[% l('Payment Date') %]</th>
+            <th>[% l('Payment For') %]</th>
+            <th>[% l('Amount') %]</th>
+            <th>[% l('Receipt') %]</th> 
+        </tr></thead>
+        <tbody>
+            [% FOR payment IN ctx.payments %]
+            <tr>
+                <td>[% date.format(ctx.parse_datetime(payment.mp.payment_ts), DATE_FORMAT) %]</td>
+                <td>[% (payment.xact_type == 'grocery') ? payment.last_billing_type : payment.title %]</td>
+                <td>[% money(payment.mp.amount) %]</td>
+                <td>
+                    [%# post to print/email form... %]
+                    <a href=''>[% l('Print') %]</a> / <a href=''>[% l('Email') %]</a>
+                </td>
+            </tr>
+            [% END %]
+        </tbody>
+    </table>
+</div>
+[% END %]
index 1f40c0b..5846c15 100644 (file)
 [%  PROCESS "default/opac/parts/header.tt2";
-    WRAPPER "default/opac/parts/base.tt2" +
-        "default/opac/parts/myopac/base.tt2";
-    myopac_page = "prefs" 
-    prefs_page = (ctx.path_info.match('/prefs$')) ? 'personal' : 
-        (ctx.path_info.match('/prefs/notify')) ? 'notify' : 'settings';
-%]
-
-<div id='myopac_prefs_div'>
-    <div id="acct_prefs_tabs" style="padding-bottom: 12px;color:#666;">
-        <div style="float:left;">
-
-        [% IF prefs_page == 'personal' %]
-            <div class="align">
-                <a href='#'><img src="[% ctx.media_prefix %]/images/sub_prefs_info_on.jpg" /></a>
-            </div>
-            <div class="align">
-                <a href='prefs/notify'><img src="[% ctx.media_prefix %]/images/sub_prefs_notify_off.jpg" /></a>
-            </div>
-            <div class="align">
-                <a href='prefs/settings'><img src="[% ctx.media_prefix %]/images/sub_prefs_search_off.jpg" /></a>
-            </div>
-        [% ELSIF prefs_page == 'notify' %]
-            <div class="align">
-                <a href='../prefs'><img src="[% ctx.media_prefix %]/images/sub_prefs_info_off.jpg" /></a>
-            </div>
-            <div class="align">
-                <a href='#'><img src="[% ctx.media_prefix %]/images/sub_prefs_notify_on.jpg" /></a>
-            </div>
-            <div class="align" >
-                <a href='settings'><img src="[% ctx.media_prefix %]/images/sub_prefs_search_off.jpg" /></a>
-            </div>
-        [% ELSE %]
-            <div class="align">
-                <a href='../prefs'><img src="[% ctx.media_prefix %]/images/sub_prefs_info_off.jpg" /></a>
-            </div>
-            <div class="align">
-                <a href='notify'><img src="[% ctx.media_prefix %]/images/sub_prefs_notify_off.jpg" /></a>
-            </div>
-            <div class="align" >
-                <a href='#'><img src="[% ctx.media_prefix %]/images/sub_prefs_search_on.jpg" /></a>
-            </div>
-        [% END %]
-        </div>
-    </div> 
-
-    <div class="clear-both"></div> <br/>
-
-    <div class="header_middle">
-        <span id="acct_prefs_header">[% l('Account Information and Preferences') %]</span>
-        <span class="float-right"> 
-            <a class="hide_me" href="#">[% l('Export List') %]</a><!-- what does this do? -->
-        </span>
+    WRAPPER "default/opac/parts/myopac/prefs_base.tt2";
+    myopac_page = "prefs";
+    prefs_page = 'personal' %]
+
+<div id="acct_info_main">
+    <div id='myopac.expired.alert'
+         class='hide_me'
+         style='margin-bottom: 20px;'>
+        <table class='data_grid'
+               width='100%'>
+            <tbody>
+                <tr>
+                    <td width='100%' class='red'>
+                        [% l("Your account expired on") %]
+                        <span id='myopac.expired.date'></span>!
+                        [% l("Please see a librarian to renew your account.") %]</td>
+                </tr>
+            </tbody>
+        </table>
+    </div>
+
+    <div id='myopac.notes.div'
+         class='hide_me'>
+        <table class='data_grid'
+               width='100%'>
+            <thead>
+                <tr>
+                    <td colspan='2'>
+                    <b>[% l("* Staff Notes *") %]</b></td>
+                </tr>
+            </thead>
+
+            <tbody id='myopac.notes.tbody'>
+                <tr id='myopac.notes.tr'>
+                    <td><b name='title'></b> : <span name=
+                    'value'></span></td>
+                </tr>
+            </tbody>
+        </table><br />
     </div>
 
-    <div class="clear-both normal-height"></div>
+    <table width='70%'
+           class='light_border data_grid'>
+        <tbody id='myopac_summary_tbody'>
+            <tr>
+                <td width='30%'
+                    class='color_4 light_border'>[% l("Name") %]</td>
+
+                <td class='light_border'>[% l(
+                    HUMAN_NAME_FORMAT,
+                    ctx.user.prefix, ctx.user.first_given_name,
+                    ctx.user.second_given_name, ctx.user.family_name,
+                    ctx.user.suffix
+                ) | html %]</td>
+
+                <td></td>
+            </tr>
+
+            <tr>
+                <td class='color_4 light_border'>
+                [% l("Day Phone") %]</td>
+
+                <td class='light_border'
+                    id='myopac_summary_dayphone'>[% ctx.user.day_phone | html %]</td>
+
+                <td class='light_border'><a href='#'
+                   class="hide_me"
+                   id='myopac_summary_phone1_change'
+                   style=
+                   'text-decoration: underline;'>[% l("Change") %]</a></td>
+            </tr>
+
+            <tr id='myopac_update_phone1_row'
+                class='hide_me'>
+                <td class='myopac_update_cell'
+                    colspan='3'>
+                    <span class='myopac_update_span'>
+                        Enter New [% l("Day Phone") %]:
+                    </span>
+
+                    <input type='text' size='24' id='myopac_new_phone1' />
+                    <span class='myopac_update_span'>
+                        <button>
+                            <span class='myopac_update_span'>
+                                [% l("Submit") %]</span>
+                        </button>
+                    </span>
+                    <span class='myopac_update_span'>
+                        <button>
+                            <span class='myopac_update_span'>
+                                [% l("Cancel") %]</span>
+                        </button>
+                    </span>
+                </td>
+            </tr>
+
+            <tr>
+                <td class='color_4 light_border'>
+                [% l("Evening Phone") %]</td>
+
+                <td class='light_border'
+                    id='myopac_summary_eveningphone'>[% ctx.user.evening_phone | html %]</td>
+
+                <td class='light_border'><a href='#'
+                   class="hide_me"
+                   id='myopac_summary_phone2_change'
+                   style=
+                   'text-decoration: underline;'>[% l("Change") %]</a></td>
+            </tr>
+
+            <tr id='myopac_update_phone2_row'
+                class='hide_me'>
+                <td class='myopac_update_cell'
+                    colspan='3'><span class='myopac_update_span'>New
+                    [% l("Evening Phone") %]:</span>
+                    <input type='text' size='24' id='myopac_new_phone2' />
+                    <span class='myopac_update_span'><button><span class=
+                        'myopac_update_span'>[% l("Submit") %]</span></button></span>
+                    <span class='myopac_update_span'><button><span class=
+                        'myopac_update_span'>[% l("Cancel") %]</span></button></span>
+                </td>
+            </tr>
+
+            <tr>
+                <td class='color_4 light_border'>
+                [% l("Other Phone") %]</td>
+
+                <td class='light_border'
+                    id='myopac_summary_otherphone'>[% ctx.user.other_phone | html %]</td>
+
+                <td class='light_border'><a href='#'
+                   class="hide_me"
+                   id='myopac_summary_phone3_change'
+                   style=
+                   'text-decoration: underline;'>[% l("Change") %]</a></td>
+            </tr>
+
+            <tr id='myopac_update_phone3_row'
+                class='hide_me'>
+                <td class='myopac_update_cell'
+                    colspan='3'><span class='myopac_update_span'>Enter
+                    New [% l("Other Phone") %]:</span>
+                    <input type='text' size='24' id='myopac_new_phone3' />
+                    <span class='myopac_update_span'><button><span class=
+                        'myopac_update_span'>[% l("Submit") %]</span></button></span>
+                    <span class='myopac_update_span'><button><span class=
+                        'myopac_update_span'>[% l("Cancel") %]</span></button></span>
+                </td>
+            </tr>
+
+            <tr>
+                <td class='color_4 light_border'>
+                    <div style="position:absolute">
+                        <div class="hide_me" style=
+                        "position:relative;left:70px;top:-3px;">
+                            <a href="#">
+                            <img alt="Username Help"
+                                 src=
+                                 "[% ctx.media_prefix %]/images/question-mark.png" /></a>
+                        </div>
+                    </div>[% l("Username") %]
+                </td>
+
+                <td class='light_border'
+                    id='myopac_summary_username'>[% ctx.user.usrname | html %]</td>
 
-[% 
-    IF prefs_page == 'personal';
-        # By default, load the personal info page
-        INCLUDE 'default/opac/parts/myopac/personal.tt2';
-    ELSE;
-        content; 
-    END;
-%]
+                <td class='light_border'><a href='#'
+                   class="hide_me"
+                   id='myopac_summary_username_change'
+                   style=
+                   'text-decoration: underline;'>[% l("Change") %]</a></td>
+            </tr>
+
+            <tr id='myopac_update_username_row'
+                class='hide_me'>
+                <td class='myopac_update_cell'
+                    colspan='3'><span class=
+                    'myopac_update_span'>[% l("Enter new username:") %]</span>
+                    <input type='text' size='24' id='myopac_new_username' />
+                    <span class='myopac_update_span'><button><span class=
+                        'myopac_update_span'>[% l("Submit") %]</span></button></span>
+                    <span class='myopac_update_span'><button><span class=
+                        'myopac_update_span'>[% l("Cancel") %]</span></button></span>
+                </td>
+            </tr>
+            <tr>
+                <td class='color_4 light_border'>
+                [% l("Password") %]</td>
+                <td class='light_border'
+                    id='myopac_summary_password'>
+                    [% l("(not shown)") %]</td>
+                <td class='light_border'><a href='#'
+                   class="hide_me"
+                   style='text-decoration: underline;'>[% l("Change") %]</a></td>
+            </tr>
+            <tr class='hide_me'>
+                <td class='myopac_update_cell'
+                    colspan='3'>
+                    <table>
+                        <tbody>
+                            <tr>
+                                <td>
+                                    <span class= 'myopac_update_span'>
+                                        [% l("Enter current password:") %]
+                                    </span>
+                                </td>
+
+                                <td>
+                                    <input type='password'
+                                       size='24' />
+                                   </td>
+                            </tr>
+                            <tr>
+                                <td><span class=
+                                'myopac_update_span'>[% l("Enter new password:") %]</span></td>
+
+                                <td><input type='password' size='24' />
+                                   </td>
+                            </tr>
+
+                            <tr>
+                                <td><span class=
+                                'myopac_update_span'>[% l("Re-enter new password:") %]</span></td>
+
+                                <td>
+                                    <input type='password' size='24' />
+                                </td>
+                            </tr>
+                        </tbody>
+                    </table><span class=
+                    'myopac_update_span'><button><span class=
+                    'myopac_update_span'>[% l("Submit") %]</span></button></span>
+                    <span class='myopac_update_span'><button><span class='myopac_update_span'>
+                    [% l("Cancel") %]</span></button></span>
+                </td>
+            </tr>
+
+            <tr>
+                <td class='color_4 light_border'>[% l("Email Address") %]</td>
+                <td class='light_border'>[% ctx.user.email | html %]</td>
+                <td class='light_border'><a href='update_email'>[% l('Change') %]</a></td>
+            </tr>
+
+            <tr class='hide_me'>
+                <td class='myopac_update_cell' colspan='3'>
+                    <span class= 'myopac_update_span'>
+                        [% l("Enter new email address:") %]
+                    </span>
+                    <input type='text' size='24' />
+                    <span class='myopac_update_span'>
+                        <button>
+                            <span class= 'myopac_update_span'>
+                                [% l("Submit") %]</span>
+                        </button>
+                    </span>
+                    <span class='myopac_update_span'>
+                        <button>
+                            <span class='myopac_update_span'>
+                                [% l("Cancel") %]</span>
+                        </button>
+                    </span>
+                </td>
+            </tr>
+            [% IF ctx.user.ident_value %]<tr class="hide_me">
+                <td class='color_4 light_border'>
+                [% l("Primary Identification") %]</td>
+
+                <td class='light_border'>
+                    [%
+                    # l('[_1] ([_2])', ctx.user.ident_value, ctx.user.ident_type.name) | html
+                    # XXX uncomment the above line to show primary
+                    # identification. With a minor tweak it could
+                    # alternatively be shown but partially obscured. 
+                    %]
+                </td>
+                <td></td>
+            </tr>[% END %]
+
+            <tr>
+                <td class='color_4 light_border'>
+                [% l("Active Barcode") %]</td>
+
+                <td class='light_border'>[% ctx.user.card.barcode %]</td>
+
+                <td></td>
+            </tr>
+
+            <tr>
+                <td class='color_4 light_border'>
+                [% l("Home Library") %]</td>
+                <td class='light_border'>[% ctx.user.home_ou.name %]</td>
+                <td><a href='#'
+                   class="hide_me"
+                   style='text-decoration: underline;'>[% l("Change") %]</a></td>
+            </tr>
+            <tr class='hide_me'>
+                <td class='myopac_update_cell'
+                    colspan='3'>
+                    <span class='myopac_update_span'>
+                        New home library:</span>
+                    <select>
+                    </select>
+                    <span class='myopac_update_span'>
+                        <button>
+                            <span class= 'myopac_update_span'>
+                                [% l("Submit") %]</span>
+                        </button>
+                    </span>
+                    <span class='myopac_update_span'>
+                        <button>
+                            <span class= 'myopac_update_span'>
+                                [% l("Cancel") %]</span>
+                        </button>
+                    </span>
+                </td>
+            </tr>
+            <tr class="hide_me">
+                <td class='color_4 light_border'>
+                    [% l("Account Creation Date") %]
+                </td>
+                <td class='light_border'
+                    id='myopac_summary_create_date'></td>
+                <td></td>
+            </tr>
+        </tbody>
+    </table><br />
+    <hr class='opac-auto-013' color="#DCDBDB" />
+    <br />
+
+    <table width='100%' class='light_border data_grid'>
+        <thead>
+            <tr>
+                <td><strong>[% l("Addresses") %]</strong></td>
+
+            </tr>
+        </thead>
+        <tbody id='myopac_addr_tbody'>
+            [% FOR addr IN ctx.user.addresses %]
+            <tr class='[% addr.pending == "t" ? "pending-addr" : "light_border" %]'>
+                <td>
+                    <table>
+                        <tr>
+                            <td>[% l("Address Type") %]</td>
+                            <td name='myopac_addr_type'>[%
+                                IF addr.pending == "t";
+                                    "<strong>" _ l("*** PENDING ***") _ "</strong> ";
+                                END;
+                                addr.address_type | lower | ucfirst;
+                            %]</td>
+                        </tr>
+                        <tr>
+                            <td>[% l("Street") %]</td>
+                            <td name='myopac_addr_street'>[% addr.street1 | html %]</td>
+                        </tr>
+                        [% IF addr.street2 %]<tr>
+                            <td>[% l("Street") %]</td>
+                            <td name='myopac_addr_street2'>[% addr.street2 | html %]</td>
+                        </tr>[% END %]
+
+                        <tr>
+                            <td>[% l("City") %]</td>
+                            <td name='myopac_addr_city'>[% addr.city | html %]</td>
+                        </tr>
+
+                        <tr>
+                            <td>[% l("County") %]</td>
+                            <td name='myopac_addr_county'>[% addr.county| html  %]</td>
+                        </tr>
+
+                        <tr>
+                            <td>[% l("State") %]</td>
+                            <td name='myopac_addr_state'>[% addr.state | html %]</td>
+                        </tr>
+
+                        <tr>
+                            <td>[% l("Country") %]</td>
+                            <td name='myopac_addr_country'>[% addr.country | html %]</td>
+                        </tr>
+
+                        <tr>
+                            <td>[% l("Zip") %]</td>
+                            <td name='myopac_addr_zip'>[% addr.post_code | html %]</td>
+                        </tr>
+                        <tr>
+                            <td name='myopac_addr_edit_td'
+                                colspan='2' class='hide_me'>
+                                <a class='classic_link'
+                                    name='myopac_addr_edit_link'
+                                    href='#'>Edit Address</a>
+                            </td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+            [% END %]
+        </tbody>
+    </table>
 </div>
+
 [% END %]
diff --git a/Open-ILS/web/templates/default/opac/myopac/prefs/notify.tt2 b/Open-ILS/web/templates/default/opac/myopac/prefs/notify.tt2
deleted file mode 100644 (file)
index e848622..0000000
+++ /dev/null
@@ -1,126 +0,0 @@
-[%  PROCESS "default/opac/parts/header.tt2";
-    WRAPPER "default/opac/myopac/prefs.tt2";
-    myopac_page = "prefs/notify" %]
-
-<form method='POST'>
-
-    <div style="float:right;width:65px;">
-        <input type='image' alt="[% l('Save') %]" src="[% ctx.media_prefix %]/images/save-btn.png" />
-    </div>
-
-    <table>
-        <thead><tr>
-            <th>[% l('Notifation Type') %]</th>
-            <th>[% l('Enabled') %]</th>
-        </tr></thead>
-        <tbody class='data_grid'>
-            [% IF optin.size == 0 %]
-                <strong>[% l('No notification preferences are configured') %]</strong>
-            [% END %]
-            [% FOR optin IN ctx.opt_in_settings %]
-                <tr>
-                    <td>[% optin.cust.label %]</td>
-                    <td>
-                        <input type='checkbox' name='setting' 
-                            value='[% optin.cust.name %]' 
-                            [% IF optin.value %] checked='checked' [% END %]/>
-                    </td>
-                </tr>
-            [% END %]
-        </tbody>
-    </table>
-</form>
-
-
-<!-- NOTIFICATION PREFS / leaving here for reference
-<table class="hide_me"
-       id="acct_notify_main">
-    <tbody>
-        <tr class="hide_me">
-            <td><span>[% l("Default Hold Notification Method") %]</span> <a class=
-            'classic_link'
-               href='#'>[% l("(Help)") %]</a></td>
-
-            <td style="padding-left:15px;"><select id=
-            'prefs_hold_notify'>
-                <option value='phone:email'
-                        selected='selected'>
-                    [% l("Use Phone and Email") %]
-                </option>
-
-                <option value='phone'>
-                    [% l("Use Phone Only") %]
-                </option>
-
-                <option value='email'>
-                    [% l("Use Email Only") %]
-                </option>
-            </select></td>
-        </tr>
-
-        <tr>
-            <td style="padding-top:10px;"><strong>Pick Up Notice for
-            Holds</strong><br />
-            <input type="checkbox"
-                   id="opac.hold_notify.email"
-                   name="opac.hold_notify.email" /> <label for=
-                   "opac.hold_notify.email">Email</label><br />
-            <input type="checkbox"
-                   id="opac.hold_notify.phone"
-                   name="opac.hold_notify.phone" /> <label for=
-                   "opac.hold_notify.phone">Phone</label>
-                   <b>(Temporarily phone notification will generate a
-                   mailed paper notice.)</b></td>
-        </tr>
-
-        <tr>
-            <td style="padding-top:10px;"><strong>Expire Notice for
-            Holds</strong><br />
-            <input type="checkbox"
-                   id="notification.hold.expire.email"
-                   name="notification.hold.expire.email" /> <label for=
-                   "notification.hold.expire.email">Email</label></td>
-        </tr>
-
-        <tr>
-            <td style="padding-top:10px;"><strong>Cancel Notice for
-            Holds</strong><br />
-            <input type="checkbox"
-                   id="notification.hold.cancel.email"
-                   name="notification.hold.cancel.email" /> <label for=
-                   "notification.hold.cancel.email">Email</label></td>
-        </tr>
-
-        <tr>
-            <td style="padding-top:10px;"><strong>Overdue First
-            Notice</strong><br />
-            <input type="checkbox"
-                   id="notification.overdue.first.email"
-                   name="notification.overdue.first.email" />
-                   <label for=
-                   "notification.overdue.first.email">Email</label><br />
-            <input type="checkbox"
-                   id="notification.overdue.first.phone"
-                   name="notification.overdue.first.phone" />
-                   <label for=
-                   "notification.overdue.first.phone">Phone</label>
-                   <b>(Temporarily phone notification will generate a
-                   mailed paper notice.)</b></td>
-        </tr>
-
-        <tr>
-            <td style="padding-top:10px;"><strong>Courtesy
-            Notice</strong><br />
-            <input type="checkbox"
-                   id="notification.predue.email"
-                   name="notification.predue.email" /> <label for=
-                   "notification.predue.email">Email</label><br /></td>
-        </tr>
-    </tbody>
-</table>
--->
-
-
-[% END %]
-
-
diff --git a/Open-ILS/web/templates/default/opac/myopac/prefs/settings.tt2 b/Open-ILS/web/templates/default/opac/myopac/prefs/settings.tt2
deleted file mode 100644 (file)
index 3e111ff..0000000
+++ /dev/null
@@ -1,115 +0,0 @@
-[%  PROCESS "default/opac/parts/header.tt2";
-    WRAPPER "default/opac/myopac/prefs.tt2";
-    myopac_page = "prefs/notify" %]
-
-USER SETTINGS
-
-        <!-- SEARCH PREFS SAVE, MOVE TO SUB-TEMPLATE
-        <div style="float:right;width:65px;">
-            <div style="position:absolute">
-                <div style="position:relative;top:75px;">
-                    <a id='acct_prefs_save'
-                         class='hide_me'
-                         href="#"><img alt="Save"
-                         src="[% ctx.media_prefix %]/images/save-btn.png" /></a>
-                </div>
-            </div>
-        </div>
-        -->
-
-
-        <!-- SEARCH PREFERENCES / leaving here for reference
-        <table class="hide_me full-width" id="acct_search_main">
-            <tbody id='myopac_prefs_tbody'>
-                <tr id='myopac_prefs_loading'>
-                    <td colspan='3'><b>[% l("Loading...") %]</b></td>
-                </tr>
-
-                <tr id='myopac_prefs_row'>
-                    <td width='20%'>[% l("Search hits per page") %]</td>
-
-                    <td>
-                        <div style="position:absolute">
-                            <div style="position:relative;top:0px;left:55px;">
-                                <a href="#">
-                                <img alt="Search Hits Help"
-                                     src="[% ctx.media_prefix %]/images/question-mark.png" /></a>
-                            </div>
-                        </div><select id='prefs_hits_per'
-                            style="position:relative;z-index:100;">
-                            <option value='5'>
-                                5
-                            </option>
-
-                            <option value='8'>
-                                8
-                            </option>
-
-                            <option value='10'>
-                                10
-                            </option>
-
-                            <option value='15'>
-                                15
-                            </option>
-
-                            <option value='20'>
-                                20
-                            </option>
-
-                            <option value='25'>
-                                25
-                            </option>
-
-                            <option value='50'>
-                                50
-                            </option>
-                        </select>
-                    </td>
-                </tr>
-
-                <tr>
-                    <td colspan="2"><label for="circHistStart">Keep history of
-                    checked out items?</label> <input type="checkbox"
-                           id="circHistStart" /></td>
-                </tr>
-
-                <tr class="hide_me">
-                    <td>[% l("Default Font Size") %]</td>
-
-                    <td><select id='prefs_def_font'>
-                        <option value='regular'>
-                            [% l("Regular Font") %]
-                        </option>
-
-                        <option value='large'>
-                            [% l("Large Font") %]
-                        </option>
-                    </select></td>
-                </tr>
-
-                <tr class="hide_me">
-                    <td>[% l("Default Search Location") %]</td>
-                    <td>
-                        <div style='margin-bottom: 5px;'>
-                            <input type='checkbox' id='myopac_pref_home_lib' />
-                                 [% l("Always search my home library by default.") %]
-                        </div>
-                        <select id='prefs_def_location'></select>
-                    </td>
-                </tr>
-
-                <tr class="hide_me">
-                    <td>[% l("Default Search Range") %]</td>
-
-                    <td><select id='prefs_def_range'>
-                        </select></td>
-                </tr>
-            </tbody>
-        </table><a href=
-        "http://www.kcls.org/usingthelibrary/catalog_help/library_elf.cfm"><u>Try
-        Library Elf-to manage library materials!</u></a>
-
-        -->
-
-[% END %]
diff --git a/Open-ILS/web/templates/default/opac/myopac/prefs_notify.tt2 b/Open-ILS/web/templates/default/opac/myopac/prefs_notify.tt2
new file mode 100644 (file)
index 0000000..14a824e
--- /dev/null
@@ -0,0 +1,128 @@
+[%  PROCESS "default/opac/parts/header.tt2";
+    WRAPPER "default/opac/parts/myopac/prefs_base.tt2";
+    myopac_page = "prefs_notify";
+    prefs_page = 'notify' %]
+
+
+<form method='POST'>
+
+    <div style="float:right;width:65px;">
+        <input type='image' alt="[% l('Save') %]" src="[% ctx.media_prefix %]/images/save-btn.png" />
+    </div>
+
+    <table>
+        <thead><tr>
+            <th>[% l('Notifation Type') %]</th>
+            <th>[% l('Enabled') %]</th>
+        </tr></thead>
+        <tbody class='data_grid'>
+            [% IF optin.size == 0 %]
+                <strong>[% l('No notification preferences are configured') %]</strong>
+            [% END %]
+            [% FOR optin IN ctx.opt_in_settings %]
+                <tr>
+                    <td>[% optin.cust.label %]</td>
+                    <td>
+                        <input type='checkbox' name='setting' 
+                            value='[% optin.cust.name %]' 
+                            [% IF optin.value %] checked='checked' [% END %]/>
+                    </td>
+                </tr>
+            [% END %]
+        </tbody>
+    </table>
+</form>
+
+
+<!-- NOTIFICATION PREFS / leaving here for reference
+<table class="hide_me"
+       id="acct_notify_main">
+    <tbody>
+        <tr class="hide_me">
+            <td><span>[% l("Default Hold Notification Method") %]</span> <a class=
+            'classic_link'
+               href='#'>[% l("(Help)") %]</a></td>
+
+            <td style="padding-left:15px;"><select id=
+            'prefs_hold_notify'>
+                <option value='phone:email'
+                        selected='selected'>
+                    [% l("Use Phone and Email") %]
+                </option>
+
+                <option value='phone'>
+                    [% l("Use Phone Only") %]
+                </option>
+
+                <option value='email'>
+                    [% l("Use Email Only") %]
+                </option>
+            </select></td>
+        </tr>
+
+        <tr>
+            <td style="padding-top:10px;"><strong>Pick Up Notice for
+            Holds</strong><br />
+            <input type="checkbox"
+                   id="opac.hold_notify.email"
+                   name="opac.hold_notify.email" /> <label for=
+                   "opac.hold_notify.email">Email</label><br />
+            <input type="checkbox"
+                   id="opac.hold_notify.phone"
+                   name="opac.hold_notify.phone" /> <label for=
+                   "opac.hold_notify.phone">Phone</label>
+                   <b>(Temporarily phone notification will generate a
+                   mailed paper notice.)</b></td>
+        </tr>
+
+        <tr>
+            <td style="padding-top:10px;"><strong>Expire Notice for
+            Holds</strong><br />
+            <input type="checkbox"
+                   id="notification.hold.expire.email"
+                   name="notification.hold.expire.email" /> <label for=
+                   "notification.hold.expire.email">Email</label></td>
+        </tr>
+
+        <tr>
+            <td style="padding-top:10px;"><strong>Cancel Notice for
+            Holds</strong><br />
+            <input type="checkbox"
+                   id="notification.hold.cancel.email"
+                   name="notification.hold.cancel.email" /> <label for=
+                   "notification.hold.cancel.email">Email</label></td>
+        </tr>
+
+        <tr>
+            <td style="padding-top:10px;"><strong>Overdue First
+            Notice</strong><br />
+            <input type="checkbox"
+                   id="notification.overdue.first.email"
+                   name="notification.overdue.first.email" />
+                   <label for=
+                   "notification.overdue.first.email">Email</label><br />
+            <input type="checkbox"
+                   id="notification.overdue.first.phone"
+                   name="notification.overdue.first.phone" />
+                   <label for=
+                   "notification.overdue.first.phone">Phone</label>
+                   <b>(Temporarily phone notification will generate a
+                   mailed paper notice.)</b></td>
+        </tr>
+
+        <tr>
+            <td style="padding-top:10px;"><strong>Courtesy
+            Notice</strong><br />
+            <input type="checkbox"
+                   id="notification.predue.email"
+                   name="notification.predue.email" /> <label for=
+                   "notification.predue.email">Email</label><br /></td>
+        </tr>
+    </tbody>
+</table>
+-->
+
+
+[% END %]
+
+
diff --git a/Open-ILS/web/templates/default/opac/myopac/prefs_settings.tt2 b/Open-ILS/web/templates/default/opac/myopac/prefs_settings.tt2
new file mode 100644 (file)
index 0000000..4267d3a
--- /dev/null
@@ -0,0 +1,116 @@
+[%  PROCESS "default/opac/parts/header.tt2";
+    WRAPPER "default/opac/parts/myopac/prefs_base.tt2";
+    myopac_page = "prefs_notify";
+    prefs_page = 'settings' %]
+
+USER SETTINGS
+
+        <!-- SEARCH PREFS SAVE, MOVE TO SUB-TEMPLATE
+        <div style="float:right;width:65px;">
+            <div style="position:absolute">
+                <div style="position:relative;top:75px;">
+                    <a id='acct_prefs_save'
+                         class='hide_me'
+                         href="#"><img alt="Save"
+                         src="[% ctx.media_prefix %]/images/save-btn.png" /></a>
+                </div>
+            </div>
+        </div>
+        -->
+
+
+        <!-- SEARCH PREFERENCES / leaving here for reference
+        <table class="hide_me full-width" id="acct_search_main">
+            <tbody id='myopac_prefs_tbody'>
+                <tr id='myopac_prefs_loading'>
+                    <td colspan='3'><b>[% l("Loading...") %]</b></td>
+                </tr>
+
+                <tr id='myopac_prefs_row'>
+                    <td width='20%'>[% l("Search hits per page") %]</td>
+
+                    <td>
+                        <div style="position:absolute">
+                            <div style="position:relative;top:0px;left:55px;">
+                                <a href="#">
+                                <img alt="Search Hits Help"
+                                     src="[% ctx.media_prefix %]/images/question-mark.png" /></a>
+                            </div>
+                        </div><select id='prefs_hits_per'
+                            style="position:relative;z-index:100;">
+                            <option value='5'>
+                                5
+                            </option>
+
+                            <option value='8'>
+                                8
+                            </option>
+
+                            <option value='10'>
+                                10
+                            </option>
+
+                            <option value='15'>
+                                15
+                            </option>
+
+                            <option value='20'>
+                                20
+                            </option>
+
+                            <option value='25'>
+                                25
+                            </option>
+
+                            <option value='50'>
+                                50
+                            </option>
+                        </select>
+                    </td>
+                </tr>
+
+                <tr>
+                    <td colspan="2"><label for="circHistStart">Keep history of
+                    checked out items?</label> <input type="checkbox"
+                           id="circHistStart" /></td>
+                </tr>
+
+                <tr class="hide_me">
+                    <td>[% l("Default Font Size") %]</td>
+
+                    <td><select id='prefs_def_font'>
+                        <option value='regular'>
+                            [% l("Regular Font") %]
+                        </option>
+
+                        <option value='large'>
+                            [% l("Large Font") %]
+                        </option>
+                    </select></td>
+                </tr>
+
+                <tr class="hide_me">
+                    <td>[% l("Default Search Location") %]</td>
+                    <td>
+                        <div style='margin-bottom: 5px;'>
+                            <input type='checkbox' id='myopac_pref_home_lib' />
+                                 [% l("Always search my home library by default.") %]
+                        </div>
+                        <select id='prefs_def_location'></select>
+                    </td>
+                </tr>
+
+                <tr class="hide_me">
+                    <td>[% l("Default Search Range") %]</td>
+
+                    <td><select id='prefs_def_range'>
+                        </select></td>
+                </tr>
+            </tbody>
+        </table><a href=
+        "http://www.kcls.org/usingthelibrary/catalog_help/library_elf.cfm"><u>Try
+        Library Elf-to manage library materials!</u></a>
+
+        -->
+
+[% END %]
index 7a9c014..92aed44 100644 (file)
@@ -1,7 +1,6 @@
 [%  PROCESS "default/opac/parts/header.tt2";
     PROCESS "default/opac/parts/misc_util.tt2";
-    WRAPPER "default/opac/parts/base.tt2" +
-        "default/opac/parts/myopac/base.tt2";
+    WRAPPER "default/opac/parts/myopac/base.tt2";
     myopac_page = "update_email"  %]
 <div id='myopac_summary_div' style="padding:0px;">
 
index f374db2..9e1125a 100644 (file)
@@ -1,3 +1,5 @@
+[%  WRAPPER "default/opac/parts/base.tt2" %]
+
 [% myopac_pages = [
         {url => "main", name => "Account Summary"},
         {url => "circs", name => "Items Checked Out"},
@@ -32,3 +34,4 @@
             <div class="common-full-pad"></div>
         </div>
     </div>
+[% END %]
diff --git a/Open-ILS/web/templates/default/opac/parts/myopac/main_base.tt2 b/Open-ILS/web/templates/default/opac/parts/myopac/main_base.tt2
new file mode 100644 (file)
index 0000000..0676ee9
--- /dev/null
@@ -0,0 +1,97 @@
+[%  PROCESS "default/opac/parts/header.tt2";
+    PROCESS "default/opac/parts/misc_util.tt2";
+    WRAPPER "default/opac/parts/myopac/base.tt2";
+%]
+
+<div id='myopac_summary_div' style="padding:0px;">
+
+    <div style="width:742px;float:left;">
+        <div class="header_middle">[% l('Account Summary') %]</div>
+    </div>
+
+    <!-- fines summary along the right of the page -->
+    <div id="myopac_sum_fines">
+        <div style="position:absolute;">
+            <div style="position:relative;top:-15px;left:-23px;">
+                <img src="[% ctx.media_prefix %]/images/acct_sum_fines_tl.png" />
+            </div>
+        </div>
+        <div style="position:absolute;">
+            <div style="position:relative;top:-15px;left:172px;">
+                <img src="[% ctx.media_prefix %]/images/acct_sum_fines_tr.png" />
+            </div>
+        </div>
+        <div style="position:absolute;">
+            <div style="position:relative;top:161px;left:-23px;">
+                <img src="[% ctx.media_prefix %]/images/acct_sum_fines_bl.png" />
+            </div>
+        </div>
+        <div style="position:absolute;">
+            <div style="position:relative;top:161px;left:172px;">
+                <img src="[% ctx.media_prefix %]/images/acct_sum_fines_br.png" />
+            </div>
+        </div>
+        [% l('Fines:') %]
+        <span id="myopac_sum_fines_bal" class='[% ctx.user_stats.fines.balance_owed ? "red" : ""%]'>
+            [% money(ctx.user_stats.fines.balance_owed) %]
+        </span><br />
+
+        [%# TODO %]
+        <a class="hide_me" href="#" id="pay_fines_btn1"><img
+            alt="[% l('Pay Fines') %]"
+            onmouseover="this.src='[% ctx.media_prefix %]/images/pay-fines-btn-hover.png';"
+            onmouseout="this.src='[% ctx.media_prefix %]/images/pay-fines-btn.png';"
+            src="[% ctx.media_prefix %]/images/pay-fines-btn.png"
+            style="position:relative;top:5px;" /></a>
+    </div>
+
+    <div style="width:662px;">
+        <div style="float:left;">
+            <div style="padding:10px 0px;" id="myopac_sum_name"></div>
+            <div class="acct_sum_row">
+                <table width="100%" cellspacing="0" cellpadding="0">
+                    <tr>
+                        <td>[% l("Items Currently Checked out ([_1])", ctx.user_stats.checkouts.total_out) %]</td>
+                        <td align="right">
+                            <a href="[% 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>
+                        <td>[% l('Items Currently on Hold ([_1])', ctx.user_stats.holds.total) %]</td>
+                        <td align="right">
+                            <a href="[% 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>
+                        <td>[% l('Items ready for pickup ([_1])', ctx.user_stats.holds.ready) %]</td>
+                        <td align="right">
+                            <a href="[% ctx.opac_root %]/myopac/holds?available=1">[% l('View All') %]</a>
+                        </td>
+                    </tr>
+                </table>
+            </div>
+        </div>
+    </div>
+    <div class="clear-both"></div>
+    <div id='fines_payments_wrapper'>
+        <div id='acct_fines_tabs'>
+            [% IF myopac_main_page == 'main' %]
+            <a href='#'><img src='[% ctx.media_prefix %]/images/acct_fines_on.jpg'/></a>
+            <a href='main_payments'><img src='[% ctx.media_prefix %]/images/acct_payments_off.jpg'/></a>
+            [% ELSE %]
+            <a href='main'><img src='[% ctx.media_prefix %]/images/acct_fines_off.jpg'/></a>
+            <a href='#'><img src='[% ctx.media_prefix %]/images/acct_payments_on.jpg'/></a>
+            [% END %]
+        </div>
+    </div>
+    [% content %]
+</div>
+[% END %]
diff --git a/Open-ILS/web/templates/default/opac/parts/myopac/personal.tt2 b/Open-ILS/web/templates/default/opac/parts/myopac/personal.tt2
deleted file mode 100644 (file)
index fe1be5c..0000000
+++ /dev/null
@@ -1,395 +0,0 @@
-<div id="acct_info_main">
-    <div id='myopac.expired.alert'
-         class='hide_me'
-         style='margin-bottom: 20px;'>
-        <table class='data_grid'
-               width='100%'>
-            <tbody>
-                <tr>
-                    <td width='100%' class='red'>
-                        [% l("Your account expired on") %]
-                        <span id='myopac.expired.date'></span>!
-                        [% l("Please see a librarian to renew your account.") %]</td>
-                </tr>
-            </tbody>
-        </table>
-    </div>
-
-    <div id='myopac.notes.div'
-         class='hide_me'>
-        <table class='data_grid'
-               width='100%'>
-            <thead>
-                <tr>
-                    <td colspan='2'>
-                    <b>[% l("* Staff Notes *") %]</b></td>
-                </tr>
-            </thead>
-
-            <tbody id='myopac.notes.tbody'>
-                <tr id='myopac.notes.tr'>
-                    <td><b name='title'></b> : <span name=
-                    'value'></span></td>
-                </tr>
-            </tbody>
-        </table><br />
-    </div>
-
-    <table width='70%'
-           class='light_border data_grid'>
-        <tbody id='myopac_summary_tbody'>
-            <tr>
-                <td width='30%'
-                    class='color_4 light_border'>[% l("Name") %]</td>
-
-                <td class='light_border'>[% l(
-                    HUMAN_NAME_FORMAT,
-                    ctx.user.prefix, ctx.user.first_given_name,
-                    ctx.user.second_given_name, ctx.user.family_name,
-                    ctx.user.suffix
-                ) | html %]</td>
-
-                <td></td>
-            </tr>
-
-            <tr>
-                <td class='color_4 light_border'>
-                [% l("Day Phone") %]</td>
-
-                <td class='light_border'
-                    id='myopac_summary_dayphone'>[% ctx.user.day_phone | html %]</td>
-
-                <td class='light_border'><a href='#'
-                   class="hide_me"
-                   id='myopac_summary_phone1_change'
-                   style=
-                   'text-decoration: underline;'>[% l("Change") %]</a></td>
-            </tr>
-
-            <tr id='myopac_update_phone1_row'
-                class='hide_me'>
-                <td class='myopac_update_cell'
-                    colspan='3'>
-                    <span class='myopac_update_span'>
-                        Enter New [% l("Day Phone") %]:
-                    </span>
-
-                    <input type='text' size='24' id='myopac_new_phone1' />
-                    <span class='myopac_update_span'>
-                        <button>
-                            <span class='myopac_update_span'>
-                                [% l("Submit") %]</span>
-                        </button>
-                    </span>
-                    <span class='myopac_update_span'>
-                        <button>
-                            <span class='myopac_update_span'>
-                                [% l("Cancel") %]</span>
-                        </button>
-                    </span>
-                </td>
-            </tr>
-
-            <tr>
-                <td class='color_4 light_border'>
-                [% l("Evening Phone") %]</td>
-
-                <td class='light_border'
-                    id='myopac_summary_eveningphone'>[% ctx.user.evening_phone | html %]</td>
-
-                <td class='light_border'><a href='#'
-                   class="hide_me"
-                   id='myopac_summary_phone2_change'
-                   style=
-                   'text-decoration: underline;'>[% l("Change") %]</a></td>
-            </tr>
-
-            <tr id='myopac_update_phone2_row'
-                class='hide_me'>
-                <td class='myopac_update_cell'
-                    colspan='3'><span class='myopac_update_span'>New
-                    [% l("Evening Phone") %]:</span>
-                    <input type='text' size='24' id='myopac_new_phone2' />
-                    <span class='myopac_update_span'><button><span class=
-                        'myopac_update_span'>[% l("Submit") %]</span></button></span>
-                    <span class='myopac_update_span'><button><span class=
-                        'myopac_update_span'>[% l("Cancel") %]</span></button></span>
-                </td>
-            </tr>
-
-            <tr>
-                <td class='color_4 light_border'>
-                [% l("Other Phone") %]</td>
-
-                <td class='light_border'
-                    id='myopac_summary_otherphone'>[% ctx.user.other_phone | html %]</td>
-
-                <td class='light_border'><a href='#'
-                   class="hide_me"
-                   id='myopac_summary_phone3_change'
-                   style=
-                   'text-decoration: underline;'>[% l("Change") %]</a></td>
-            </tr>
-
-            <tr id='myopac_update_phone3_row'
-                class='hide_me'>
-                <td class='myopac_update_cell'
-                    colspan='3'><span class='myopac_update_span'>Enter
-                    New [% l("Other Phone") %]:</span>
-                    <input type='text' size='24' id='myopac_new_phone3' />
-                    <span class='myopac_update_span'><button><span class=
-                        'myopac_update_span'>[% l("Submit") %]</span></button></span>
-                    <span class='myopac_update_span'><button><span class=
-                        'myopac_update_span'>[% l("Cancel") %]</span></button></span>
-                </td>
-            </tr>
-
-            <tr>
-                <td class='color_4 light_border'>
-                    <div style="position:absolute">
-                        <div class="hide_me" style=
-                        "position:relative;left:70px;top:-3px;">
-                            <a href="#">
-                            <img alt="Username Help"
-                                 src=
-                                 "[% ctx.media_prefix %]/images/question-mark.png" /></a>
-                        </div>
-                    </div>[% l("Username") %]
-                </td>
-
-                <td class='light_border'
-                    id='myopac_summary_username'>[% ctx.user.usrname | html %]</td>
-
-                <td class='light_border'><a href='#'
-                   class="hide_me"
-                   id='myopac_summary_username_change'
-                   style=
-                   'text-decoration: underline;'>[% l("Change") %]</a></td>
-            </tr>
-
-            <tr id='myopac_update_username_row'
-                class='hide_me'>
-                <td class='myopac_update_cell'
-                    colspan='3'><span class=
-                    'myopac_update_span'>[% l("Enter new username:") %]</span>
-                    <input type='text' size='24' id='myopac_new_username' />
-                    <span class='myopac_update_span'><button><span class=
-                        'myopac_update_span'>[% l("Submit") %]</span></button></span>
-                    <span class='myopac_update_span'><button><span class=
-                        'myopac_update_span'>[% l("Cancel") %]</span></button></span>
-                </td>
-            </tr>
-            <tr>
-                <td class='color_4 light_border'>
-                [% l("Password") %]</td>
-                <td class='light_border'
-                    id='myopac_summary_password'>
-                    [% l("(not shown)") %]</td>
-                <td class='light_border'><a href='#'
-                   class="hide_me"
-                   style='text-decoration: underline;'>[% l("Change") %]</a></td>
-            </tr>
-            <tr class='hide_me'>
-                <td class='myopac_update_cell'
-                    colspan='3'>
-                    <table>
-                        <tbody>
-                            <tr>
-                                <td>
-                                    <span class= 'myopac_update_span'>
-                                        [% l("Enter current password:") %]
-                                    </span>
-                                </td>
-
-                                <td>
-                                    <input type='password'
-                                       size='24' />
-                                   </td>
-                            </tr>
-                            <tr>
-                                <td><span class=
-                                'myopac_update_span'>[% l("Enter new password:") %]</span></td>
-
-                                <td><input type='password' size='24' />
-                                   </td>
-                            </tr>
-
-                            <tr>
-                                <td><span class=
-                                'myopac_update_span'>[% l("Re-enter new password:") %]</span></td>
-
-                                <td>
-                                    <input type='password' size='24' />
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table><span class=
-                    'myopac_update_span'><button><span class=
-                    'myopac_update_span'>[% l("Submit") %]</span></button></span>
-                    <span class='myopac_update_span'><button><span class='myopac_update_span'>
-                    [% l("Cancel") %]</span></button></span>
-                </td>
-            </tr>
-
-            <tr>
-                <td class='color_4 light_border'>[% l("Email Address") %]</td>
-                <td class='light_border'>[% ctx.user.email | html %]</td>
-                <td class='light_border'><a href='update_email'>[% l('Change') %]</a></td>
-            </tr>
-
-            <tr class='hide_me'>
-                <td class='myopac_update_cell' colspan='3'>
-                    <span class= 'myopac_update_span'>
-                        [% l("Enter new email address:") %]
-                    </span>
-                    <input type='text' size='24' />
-                    <span class='myopac_update_span'>
-                        <button>
-                            <span class= 'myopac_update_span'>
-                                [% l("Submit") %]</span>
-                        </button>
-                    </span>
-                    <span class='myopac_update_span'>
-                        <button>
-                            <span class='myopac_update_span'>
-                                [% l("Cancel") %]</span>
-                        </button>
-                    </span>
-                </td>
-            </tr>
-            [% IF ctx.user.ident_value %]<tr class="hide_me">
-                <td class='color_4 light_border'>
-                [% l("Primary Identification") %]</td>
-
-                <td class='light_border'>
-                    [%
-                    # l('[_1] ([_2])', ctx.user.ident_value, ctx.user.ident_type.name) | html
-                    # XXX uncomment the above line to show primary
-                    # identification. With a minor tweak it could
-                    # alternatively be shown but partially obscured. 
-                    %]
-                </td>
-                <td></td>
-            </tr>[% END %]
-
-            <tr>
-                <td class='color_4 light_border'>
-                [% l("Active Barcode") %]</td>
-
-                <td class='light_border'>[% ctx.user.card.barcode %]</td>
-
-                <td></td>
-            </tr>
-
-            <tr>
-                <td class='color_4 light_border'>
-                [% l("Home Library") %]</td>
-                <td class='light_border'>[% ctx.user.home_ou.name %]</td>
-                <td><a href='#'
-                   class="hide_me"
-                   style='text-decoration: underline;'>[% l("Change") %]</a></td>
-            </tr>
-            <tr class='hide_me'>
-                <td class='myopac_update_cell'
-                    colspan='3'>
-                    <span class='myopac_update_span'>
-                        New home library:</span>
-                    <select>
-                    </select>
-                    <span class='myopac_update_span'>
-                        <button>
-                            <span class= 'myopac_update_span'>
-                                [% l("Submit") %]</span>
-                        </button>
-                    </span>
-                    <span class='myopac_update_span'>
-                        <button>
-                            <span class= 'myopac_update_span'>
-                                [% l("Cancel") %]</span>
-                        </button>
-                    </span>
-                </td>
-            </tr>
-            <tr class="hide_me">
-                <td class='color_4 light_border'>
-                    [% l("Account Creation Date") %]
-                </td>
-                <td class='light_border'
-                    id='myopac_summary_create_date'></td>
-                <td></td>
-            </tr>
-        </tbody>
-    </table><br />
-    <hr class='opac-auto-013' color="#DCDBDB" />
-    <br />
-
-    <table width='100%' class='light_border data_grid'>
-        <thead>
-            <tr>
-                <td><strong>[% l("Addresses") %]</strong></td>
-
-            </tr>
-        </thead>
-        <tbody id='myopac_addr_tbody'>
-            [% FOR addr IN ctx.user.addresses %]
-            <tr class='[% addr.pending == "t" ? "pending-addr" : "light_border" %]'>
-                <td>
-                    <table>
-                        <tr>
-                            <td>[% l("Address Type") %]</td>
-                            <td name='myopac_addr_type'>[%
-                                IF addr.pending == "t";
-                                    "<strong>" _ l("*** PENDING ***") _ "</strong> ";
-                                END;
-                                addr.address_type | lower | ucfirst;
-                            %]</td>
-                        </tr>
-                        <tr>
-                            <td>[% l("Street") %]</td>
-                            <td name='myopac_addr_street'>[% addr.street1 | html %]</td>
-                        </tr>
-                        [% IF addr.street2 %]<tr>
-                            <td>[% l("Street") %]</td>
-                            <td name='myopac_addr_street2'>[% addr.street2 | html %]</td>
-                        </tr>[% END %]
-
-                        <tr>
-                            <td>[% l("City") %]</td>
-                            <td name='myopac_addr_city'>[% addr.city | html %]</td>
-                        </tr>
-
-                        <tr>
-                            <td>[% l("County") %]</td>
-                            <td name='myopac_addr_county'>[% addr.county| html  %]</td>
-                        </tr>
-
-                        <tr>
-                            <td>[% l("State") %]</td>
-                            <td name='myopac_addr_state'>[% addr.state | html %]</td>
-                        </tr>
-
-                        <tr>
-                            <td>[% l("Country") %]</td>
-                            <td name='myopac_addr_country'>[% addr.country | html %]</td>
-                        </tr>
-
-                        <tr>
-                            <td>[% l("Zip") %]</td>
-                            <td name='myopac_addr_zip'>[% addr.post_code | html %]</td>
-                        </tr>
-                        <tr>
-                            <td name='myopac_addr_edit_td'
-                                colspan='2' class='hide_me'>
-                                <a class='classic_link'
-                                    name='myopac_addr_edit_link'
-                                    href='#'>Edit Address</a>
-                            </td>
-                        </tr>
-                    </table>
-                </td>
-            </tr>
-            [% END %]
-        </tbody>
-    </table>
-</div>
-
diff --git a/Open-ILS/web/templates/default/opac/parts/myopac/prefs_base.tt2 b/Open-ILS/web/templates/default/opac/parts/myopac/prefs_base.tt2
new file mode 100644 (file)
index 0000000..c26be3e
--- /dev/null
@@ -0,0 +1,57 @@
+[%  PROCESS "default/opac/parts/header.tt2";
+    WRAPPER "default/opac/parts/base.tt2" +
+        "default/opac/parts/myopac/base.tt2"; %]
+
+<div id='myopac_prefs_div'>
+    <div id="acct_prefs_tabs" style="padding-bottom: 12px;color:#666;">
+        <div style="float:left;">
+
+        [% IF prefs_page == 'personal' %]
+            <div class="align">
+                <a href='#'><img src="[% ctx.media_prefix %]/images/sub_prefs_info_on.jpg" /></a>
+            </div>
+            <div class="align">
+                <a href='prefs_notify'><img src="[% ctx.media_prefix %]/images/sub_prefs_notify_off.jpg" /></a>
+            </div>
+            <div class="align">
+                <a href='prefs_settings'><img src="[% ctx.media_prefix %]/images/sub_prefs_search_off.jpg" /></a>
+            </div>
+        [% ELSIF prefs_page == 'notify' %]
+            <div class="align">
+                <a href='prefs'><img src="[% ctx.media_prefix %]/images/sub_prefs_info_off.jpg" /></a>
+            </div>
+            <div class="align">
+                <a href='#'><img src="[% ctx.media_prefix %]/images/sub_prefs_notify_on.jpg" /></a>
+            </div>
+            <div class="align" >
+                <a href='prefs_settings'><img src="[% ctx.media_prefix %]/images/sub_prefs_search_off.jpg" /></a>
+            </div>
+        [% ELSE %]
+            <div class="align">
+                <a href='prefs'><img src="[% ctx.media_prefix %]/images/sub_prefs_info_off.jpg" /></a>
+            </div>
+            <div class="align">
+                <a href='prefs_notify'><img src="[% ctx.media_prefix %]/images/sub_prefs_notify_off.jpg" /></a>
+            </div>
+            <div class="align" >
+                <a href='#'><img src="[% ctx.media_prefix %]/images/sub_prefs_search_on.jpg" /></a>
+            </div>
+        [% END %]
+        </div>
+    </div> 
+
+    <div class="clear-both"></div> <br/>
+
+    <div class="header_middle">
+        <span id="acct_prefs_header">[% l('Account Information and Preferences') %]</span>
+        <span class="float-right"> 
+            <a class="hide_me" href="#">[% l('Export List') %]</a><!-- what does this do? -->
+        </span>
+    </div>
+
+    <div class="clear-both normal-height"></div>
+
+[% content; %]
+
+</div>
+[% END %]