Move USE * from topnav.tt2 to new header.tt2; also some myopac work

Minor progress in myopac/main and myopac/circs

diff --git a/Open-ILS/web/templates/default/opac/advanced.tt2 b/Open-ILS/web/templates/default/opac/advanced.tt2
index 6479a53..9c6c354 100644 (file)
--- a/Open-ILS/web/templates/default/opac/advanced.tt2
+++ b/Open-ILS/web/templates/default/opac/advanced.tt2
@@ -1,4 +1,5 @@
-[%  WRAPPER "default/opac/parts/base.tt2";
+[%  PROCESS "default/opac/parts/header.tt2";
+    WRAPPER "default/opac/parts/base.tt2";
     INCLUDE "default/opac/parts/topnav.tt2";
     ctx.page_title = "Advanced Search" %]
     <div id="search-wrapper">

diff --git a/Open-ILS/web/templates/default/opac/home.tt2 b/Open-ILS/web/templates/default/opac/home.tt2
index be26963..11edbdf 100644 (file)
--- a/Open-ILS/web/templates/default/opac/home.tt2
+++ b/Open-ILS/web/templates/default/opac/home.tt2
@@ -1,4 +1,5 @@
-[%  WRAPPER "default/opac/parts/base.tt2";
+[%  PROCESS "default/opac/parts/header.tt2";
+    WRAPPER "default/opac/parts/base.tt2";
     INCLUDE "default/opac/parts/topnav.tt2";
     ctx.page_title = "Home" %]
     <div id="search-wrapper">

diff --git a/Open-ILS/web/templates/default/opac/login.tt2 b/Open-ILS/web/templates/default/opac/login.tt2
index 2452281..67e76f1 100644 (file)
--- a/Open-ILS/web/templates/default/opac/login.tt2
+++ b/Open-ILS/web/templates/default/opac/login.tt2
@@ -1,5 +1,5 @@
-[% USE CGI %]
-[%  WRAPPER "default/opac/parts/base.tt2";
+[%  PROCESS "default/opac/parts/header.tt2";
+    WRAPPER "default/opac/parts/base.tt2";
     INCLUDE "default/opac/parts/topnav.tt2";
     ctx.page_title = "Account Login" %]
     <div id="search-wrapper">

diff --git a/Open-ILS/web/templates/default/opac/myopac/circs.tt2 b/Open-ILS/web/templates/default/opac/myopac/circs.tt2
index 8e6cc43..897b210 100644 (file)
--- a/Open-ILS/web/templates/default/opac/myopac/circs.tt2
+++ b/Open-ILS/web/templates/default/opac/myopac/circs.tt2
@@ -1,4 +1,5 @@
-[%  WRAPPER "default/opac/parts/base.tt2" +
+[%  PROCESS "default/opac/parts/header.tt2";
+    WRAPPER "default/opac/parts/base.tt2" +
         "default/opac/parts/myopac/base.tt2";
     myopac_page = "circs"  %]
 <div id='myopac_checked_div' style="padding:0px;">
@@ -84,6 +85,7 @@
             <div id="acct_checked_temp">
                 <table cellpadding='0' cellspacing='0' border='0'
                     style="margin-top:5px;">
+                    [% FOR circ IN ctx.circs %]
                     <tr>
                         <td width="1%" style="padding-left:10px;" valign="top">
                             <input type="checkbox" name="check_all_checked" />
@@ -93,12 +95,21 @@
                             name="author">
                             <a href="#" name="title"></a>
                         </td>
-                        <td width="8%" name="renewals" align="center"></td>
+                        <td width="8%" name="renewals" align="center">
+                            [% circ.circ.renewal_remaining %]
+                        </td>
                         <td width="13%" style="padding-left:5px;"
-                            name="due_date"></td>
-                        <td width="16%" name="barcode"></td>
-                        <td width="22%" name="call_number"></td>
+                            name="due_date">
+                            [% date.format(ctx.parse_datetime(circ.circ.due_date),'%m/%d/%Y') %]
+                        </td>
+                        <td width="16%" name="barcode">
+                            [% circ.circ.target_copy.barcode %]
+                        </td>
+                        <td width="22%" name="call_number">
+                            [% circ.circ.target_copy.call_number.label %]
+                        </td>
                     </tr>
+                    [% END %]
                 </table>
             </div>
         </div>

diff --git a/Open-ILS/web/templates/default/opac/myopac/holds.tt2 b/Open-ILS/web/templates/default/opac/myopac/holds.tt2
index c239066..ce06e6b 100644 (file)
--- a/Open-ILS/web/templates/default/opac/myopac/holds.tt2
+++ b/Open-ILS/web/templates/default/opac/myopac/holds.tt2
@@ -1,4 +1,5 @@
-[%  WRAPPER "default/opac/parts/base.tt2" +
+[%  PROCESS "default/opac/parts/header.tt2";
+    WRAPPER "default/opac/parts/base.tt2" +
         "default/opac/parts/myopac/base.tt2";
     myopac_page = "holds"  %]
 <div id='myopac_holds_div'>

diff --git a/Open-ILS/web/templates/default/opac/myopac/lists.tt2 b/Open-ILS/web/templates/default/opac/myopac/lists.tt2
index 2123f4b..c93fac5 100644 (file)
--- a/Open-ILS/web/templates/default/opac/myopac/lists.tt2
+++ b/Open-ILS/web/templates/default/opac/myopac/lists.tt2
@@ -1,4 +1,5 @@
-[%  WRAPPER "default/opac/parts/base.tt2" +
+[%  PROCESS "default/opac/parts/header.tt2";
+    WRAPPER "default/opac/parts/base.tt2" +
         "default/opac/parts/myopac/base.tt2";
     myopac_page = "lists"  %]
 <div

diff --git a/Open-ILS/web/templates/default/opac/myopac/main.tt2 b/Open-ILS/web/templates/default/opac/myopac/main.tt2
index 1c1d077..ac6c7ae 100644 (file)
--- a/Open-ILS/web/templates/default/opac/myopac/main.tt2
+++ b/Open-ILS/web/templates/default/opac/myopac/main.tt2
@@ -1,4 +1,5 @@
-[%  WRAPPER "default/opac/parts/base.tt2" +
+[%  PROCESS "default/opac/parts/header.tt2";
+    WRAPPER "default/opac/parts/base.tt2" +
         "default/opac/parts/myopac/base.tt2";
     myopac_page = "main"  %]
 <div id='myopac_summary_div' style="padding:0px;">
@@ -44,7 +45,7 @@
                             <td>
                                 Items Currently Checked out
                                 <span id="myopac_sum_checked" class="view_link">
-                                    (0)
+                                    ([% ctx.user_stats.checkouts.out %])
                                 </span>
                             </td>
                             <td align="right" class="view_link">
@@ -59,7 +60,7 @@
                             <td>
                                 Items Currently on Hold
                                 <span id="myopac_sum_holds" class="view_link">
-                                    (0)
+                                    ([% ctx.user_stats.holds.total %])
                                 </span>
                             </td>
                             <td align="right" class="view_link">
@@ -74,7 +75,7 @@
                             <td>
                                 Items ready for pickup
                                 <span id="myopac_sum_pickup" class="view_link">
-                                    (0)
+                                    ([% ctx.user_stats.holds.ready %])
                                 </span>
                             </td>
                             <td align="right" class="view_link">

diff --git a/Open-ILS/web/templates/default/opac/myopac/prefs.tt2 b/Open-ILS/web/templates/default/opac/myopac/prefs.tt2
index ea6fb15..0545872 100644 (file)
--- a/Open-ILS/web/templates/default/opac/myopac/prefs.tt2
+++ b/Open-ILS/web/templates/default/opac/myopac/prefs.tt2
@@ -1,4 +1,5 @@
-[%  WRAPPER "default/opac/parts/base.tt2" +
+[%  PROCESS "default/opac/parts/header.tt2";
+    WRAPPER "default/opac/parts/base.tt2" +
         "default/opac/parts/myopac/base.tt2";
     myopac_page = "prefs"  %]
     <div id='myopac_prefs_div'>

diff --git a/Open-ILS/web/templates/default/opac/parts/header.tt2 b/Open-ILS/web/templates/default/opac/parts/header.tt2
new file mode 100644 (file)
index 0000000..08f0854
--- /dev/null
+++ b/Open-ILS/web/templates/default/opac/parts/header.tt2
@@ -0,0 +1,4 @@
+[%- USE money = format('$%.2f');
+    USE date;
+    USE CGI; 
+    USE EGI18N; -%]

diff --git a/Open-ILS/web/templates/default/opac/parts/record/summary.tt2 b/Open-ILS/web/templates/default/opac/parts/record/summary.tt2
index f07c6a0..712042e 100644 (file)
--- a/Open-ILS/web/templates/default/opac/parts/record/summary.tt2
+++ b/Open-ILS/web/templates/default/opac/parts/record/summary.tt2
@@ -66,7 +66,7 @@
                     <table border="0" cellpadding="0" width="100%">
                         <tr>
                             <td nowrap='nowrap' valign="top">
-                                [% IF attrs.isbn %]<strong id="rdetail_isbn_lbl" class="">[% l("ISBN") %]</strong>[% END %]
+                                [% IF attrs.isbn %]<strong id="rdetail_isbn_lbl">[% l("ISBN") %]</strong>[% END %]
                             </td>
                             <td valign="top" id='rdetail_isbn'>[% attrs.isbn %]</td>
                             <td nowrap='nowrap' valign="top">
@@ -96,18 +96,18 @@
                             </td>
                             <td valign="top" id='rdetail_pubdate'>[% attrs.pubdate %]</td>
                             <td nowrap='nowrap' valign="top">
-                                <strong id="rdetail_sum_lbl" class="">Summary</strong>
+                                <strong id="rdetail_sum_lbl">Summary</strong>
                             </td>
                             <td valign="top" id='rdetail_abstract'></td>
                         </tr>
                         <tr>
                             <td nowrap='nowrap' valign="top">
-                                <strong id="rdetail_pub_lbl" class="">[% IF attrs.publisher; l("Publisher"); END %]</strong>
+                                <strong id="rdetail_pub_lbl">[% IF attrs.publisher; l("Publisher"); END %]</strong>
                             </td>
                             <td valign="top" id='rdetail_publisher'>[% attrs.publisher %]</td>
                             <td nowrap='nowrap' valign="top">
                                 [%# XXX TODO see kcls' drawMarcSubjects() in rdetail.js %]
-                                <strong id="rdetail_sub_lbl" class="hide_me">[% l("Subjects") %]</strong>
+                                <strong id="rdetail_sub_lbl">[% l("Subjects") %]</strong>
                             </td>
                             <td valign="top"></td>
                         </tr>

diff --git a/Open-ILS/web/templates/default/opac/parts/topnav.tt2 b/Open-ILS/web/templates/default/opac/parts/topnav.tt2
index c0a9c0a..4b4bda5 100644 (file)
--- a/Open-ILS/web/templates/default/opac/parts/topnav.tt2
+++ b/Open-ILS/web/templates/default/opac/parts/topnav.tt2
@@ -1,6 +1,3 @@
-[%- USE money = format('$%.2f');
-    USE CGI; 
-    USE EGI18N; -%]
 <div id="header">
     <div class="float-left">
         <a href="http://www.kcls.org"><img alt="KCLS Logo"

diff --git a/Open-ILS/web/templates/default/opac/place_hold.tt2 b/Open-ILS/web/templates/default/opac/place_hold.tt2
index 43e8ab2..95c7acb 100644 (file)
--- a/Open-ILS/web/templates/default/opac/place_hold.tt2
+++ b/Open-ILS/web/templates/default/opac/place_hold.tt2
@@ -1,4 +1,5 @@
-[%  WRAPPER "default/opac/parts/base.tt2";
+[%  PROCESS "default/opac/parts/header.tt2";
+    WRAPPER "default/opac/parts/base.tt2";
     INCLUDE "default/opac/parts/topnav.tt2";
     ctx.page_title = "Place Hold" %]
     <div id="search-wrapper">

diff --git a/Open-ILS/web/templates/default/opac/record.tt2 b/Open-ILS/web/templates/default/opac/record.tt2
index f046ddd..04e33cb 100644 (file)
--- a/Open-ILS/web/templates/default/opac/record.tt2
+++ b/Open-ILS/web/templates/default/opac/record.tt2
@@ -1,4 +1,5 @@
-[%  WRAPPER "default/opac/parts/base.tt2";
+[%  PROCESS "default/opac/parts/header.tt2";
+    WRAPPER "default/opac/parts/base.tt2";
     INCLUDE "default/opac/parts/topnav.tt2";
     ctx.page_title = "Record Detail" %]
     <div id="search-wrapper">

diff --git a/Open-ILS/web/templates/default/opac/results.tt2 b/Open-ILS/web/templates/default/opac/results.tt2
index d4351f2..147fe2b 100644 (file)
--- a/Open-ILS/web/templates/default/opac/results.tt2
+++ b/Open-ILS/web/templates/default/opac/results.tt2
@@ -1,4 +1,4 @@
-[%  USE CGI;
+[%  PROCESS "default/opac/parts/header.tt2";
     USE POSIX;
 
     WRAPPER "default/opac/parts/base.tt2";