PINES Receipt Template Customizations for Web Client

Additional receipt template default changes.

Signed-off-by: McCanna <tmccanna@georgialibraries.org>

diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_bill_payment.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_bill_payment.tt2
index 0557e82..7da1c67 100644 (file)
--- a/Open-ILS/src/templates/staff/share/print_templates/t_bill_payment.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_bill_payment.tt2
@@ -5,12 +5,12 @@
 
 <table style="width:100%">
   <tr>
-    <td>Original Balance:</td>
-    <td align="right">{{previous_balance | currency}}</td>
+    <td valign="top">Original Balance:</td>
+    <td align="right" valign="top">{{previous_balance | currency}}</td>
   </tr>
   <tr>
-    <td>Payment Method:</td>
-    <td align="right">
+    <td valign="top">Payment Method:</td>
+    <td align="right" valign="top">
       <div ng-switch="payment_type">
         <div ng-switch-when="cash_payment">Cash</div>
         <div ng-switch-when="check_payment">Check</div>
@@ -23,16 +23,16 @@
     </td>
   </tr>
   <tr>
-    <td>Amount Paid:</td>
-    <td align="right">{{payment_applied | currency}}</td>
+    <td valign="top">Amount Paid:</td>
+    <td align="right" valign="top">{{payment_applied | currency}}</td>
   </tr>
   <tr>
-    <td>Billings Voided:</td>
-    <td align="right">{{amount_voided | currency}}</td>
+    <td valign="top">Billings Voided:</td>
+    <td align="right" valign="top">{{amount_voided | currency}}</td>
   </tr>
   <tr>
-    <td>New Balance:</td>
-    <td align="right">{{new_balance | currency}}</td>
+    <td valign="top">New Balance:</td>
+    <td align="right" valign="top">{{new_balance | currency}}</td>
   </tr>
 </table>
 <div ng-if="payment_note"><br/><b><i>Note: {{payment_note}}</i></b></div>
@@ -44,26 +44,26 @@
      <br/>
       <table>
         <tr>
-          <td>Bill #:</td>
-          <td>{{payment.xact.id}}</td>
+          <td valign="top">Bill #:</td>
+          <td valign="top">{{payment.xact.id}}</td>
         </tr>
         <tr>
-          <td>Type: &nbsp; </td>
-          <td><span ng-if="payment.xact.summary.xact_type == 'grocery'">{{payment.xact.summary.last_billing_type}}</span>
-          <span ng-if="payment.xact.summary.xact_type != 'grocery'" style="text-transform:capitalize;">{{payment.xact.summary.xact_type}}</span></td>
+          <td valign="top">Last Billing Type: &nbsp; </td>
+          <td valign="top">{{payment.xact.summary.last_billing_type}}</td>
         </tr>
         <tr>
-          <td>Received: &nbsp;</td><td>{{payment.amount | currency}}</td>
+          <td valign="top">Received: &nbsp;</td>
+                 <td valign="top">{{payment.amount | currency}}</td>
         </tr>
-        <tr>
-          <td>Title:</td>
-          <td>{{payment.xact.title}}</td>
+        <tr ng-if="payment.xact.title">
+          <td valign="top">Title:</td>
+          <td valign="top">{{payment.xact.title}}</td>
         </tr>
-        <tr>
-          <td>Barcode:</td>
-          <td>{{payment.xact.copy_barcode}}</td>
+        <tr ng-if="payment.xact.copy_barcode">
+          <td valign="top">Barcode:</td>
+          <td valign="top">{{payment.xact.copy_barcode}}</td>
         </tr>
       </table>
     </div>
 <hr/>
-{{current_location.shortname}} {{today | date:'short'}}
+{{current_location.shortname}} {{today | date:'short'}}
\ No newline at end of file

diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_bills_current.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_bills_current.tt2
index f1c6a0a..73cde2d 100644 (file)
--- a/Open-ILS/src/templates/staff/share/print_templates/t_bills_current.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_bills_current.tt2
@@ -1,21 +1,44 @@
+<center><img src="https://pines.georgialibraries.org/dokuwiki/lib/exe/fetch.php?media=logo.png" style="width:150px;"><br/>
+<b>www.gapines.org</b><br/>
+<b>{{current_location.name}}</b></center>
+<h3>Current Bills</h3>
+<div ng-repeat="xact in transactions">
+    <br/>
+    <table> 
       <tr valign="top">
         <td><b>Bill ID:</b></td>
         <td><b>{{xact.id}}</b></td>
-      </tr>
+      </tr> 
       <tr valign="top">
-        <td>Bill Start Date: &nbsp;</td>
-        <td>{{xact.xact_start| date:'M/d/yyyy'}}</td>
-      </tr>
+        <td>Bill Start Date: &nbsp; </td>
+        <td>{{xact.xact_start | date:'M/d/yyyy'}}</td>
+      </tr> 
+        <tr>
+          <td valign="top">Last Billing Type: &nbsp; </td>
+          <td valign="top">{{xact.summary.last_billing_type}}</td>
+        </tr>
+        <tr ng-if="xact.title">
+          <td valign="top">Title:</td>
+          <td valign="top">{{xact.title}}</td>
+        </tr>
+        <tr ng-if="xact.copy_barcode">
+          <td valign="top">Barcode:</td>
+          <td valign="top">{{xact.copy_barcode}}</td>
+        </tr>
       <tr valign="top">
-        <td>Type:</td>
-        <td><span ng-if="xact.summary.xact_type == 'grocery'">{{xact.summary.last_billing_type}}</span>
-<span ng-if="xact.summary.xact_type != 'grocery'" style="text-transform:capitalize;">{{xact.summary.xact_type}}</span></td>
-      </tr>  
+        <td>Total Billed:</td>
+        <td>{{xact.summary.total_owed | currency}}</td>
+      </tr> 
       <tr valign="top">
-        <td><b>Balance: &nbsp;</b></td>
+        <td>Total Paid:</td>
+        <td>{{xact.summary.total_paid | currency}}</td>
+      </tr> 
+      <tr valign="top">
+        <td><b>Balance:</b></td>
         <td><b>{{xact.summary.balance_owed | currency}}</b></td>
-      </tr>
+      </tr> 
     </table>
-</div><!-- ng-repeat -->
+  </div><!-- ng-repeat -->
+<hr/>
+{{current_location.shortname}} {{today | date:'short'}}
 <br/>
-{{current_location.shortname}} &nbsp; {{today | date:'short'}}<br/>

diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_bills_historical.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_bills_historical.tt2
index 5106f13..d36f5d9 100644 (file)
--- a/Open-ILS/src/templates/staff/share/print_templates/t_bills_historical.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_bills_historical.tt2
@@ -5,33 +5,40 @@
 <div ng-repeat="xact in transactions">
     <br/>
     <table> 
-      <tr valign="top">
-        <td><b>Bill ID:</b></td>
-        <td><b>{{xact.id}}</b></td>
+      <tr>
+        <td valign="top"><b>Bill ID:</b></td>
+        <td valign="top"><b>{{xact.id}}</b></td>
       </tr> 
-      <tr valign="top">
-        <td>Bill Start Date: &nbsp; </td>
-        <td>{{xact.xact_start | date:'M/d/yyyy'}}</td>
+      <tr>
+        <td valign="top">Bill Start Date: &nbsp; </td>
+        <td valign="top">{{xact.xact_start | date:'M/d/yyyy'}}</td>
       </tr> 
-      <tr valign="top">
-        <td>Type:</td>
-        <td><span ng-if="xact.summary.xact_type == 'grocery'">{{xact.summary.last_billing_type}}</span>
-<span ng-if="xact.summary.xact_type != 'grocery'" style="text-transform:capitalize;">{{xact.summary.xact_type}}</span></td>
+        <tr>
+          <td valign="top">Last Billing Type: &nbsp; </td>
+          <td valign="top">{{xact.summary.last_billing_type}}</td>
+        </tr>
+        <tr ng-if="xact.title">
+          <td valign="top">Title:</td>
+          <td valign="top">{{xact.title}}</td>
+        </tr>
+        <tr ng-if="xact.copy_barcode">
+          <td valign="top">Barcode:</td>
+          <td valign="top">{{xact.copy_barcode}}</td>
+        </tr>
+      <tr>
+        <td valign="top">Total Billed:</td>
+        <td valign="top">{{xact.summary.total_owed | currency}}</td>
       </tr> 
-      <tr valign="top">
-        <td>Total Billed:</td>
-        <td>{{xact.summary.total_owed | currency}}</td>
+      <tr>
+        <td valign="top">Total Paid:</td>
+        <td valign="top">{{xact.summary.total_paid | currency}}</td>
       </tr> 
-      <tr valign="top">
-        <td>Total Paid:</td>
-        <td>{{xact.summary.total_paid | currency}}</td>
-      </tr> 
-      <tr valign="top">
-        <td><b>Balance:</b></td>
-        <td><b>{{xact.summary.balance_owed | currency}}</b></td>
+      <tr>
+        <td valign="top"><b>Balance:</b></td>
+        <td valign="top"><b>{{xact.summary.balance_owed | currency}}</b></td>
       </tr> 
     </table>
   </div><!-- ng-repeat -->
 <hr/>
 {{current_location.shortname}} {{today | date:'short'}}
-<br/>
+<br/>
\ No newline at end of file

diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_checkout.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_checkout.tt2
index 99fcb0b..2a91759 100644 (file)
--- a/Open-ILS/src/templates/staff/share/print_templates/t_checkout.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_checkout.tt2
@@ -12,5 +12,6 @@
     </li>
 </div>
 </ol>
+<div style="font-weight:bold;">Total Amount Owed: {{patron_money.balance_owed | currency}}</div>
 <hr/>
 <div>{{current_location.shortname}} {{today | date:'short'}}</div>

diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_hold_pull_list.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_hold_pull_list.tt2
index c4dec31..e9bc9ff 100644 (file)
--- a/Open-ILS/src/templates/staff/share/print_templates/t_hold_pull_list.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_hold_pull_list.tt2
@@ -21,12 +21,12 @@
   </thead>
   <tbody>
     <tr ng-repeat="hold_data in holds | orderBy : ['copy.location.name','volume.label']">
-      <td>{{hold_data.copy.location.name}}</td>
-      <td>{{hold_data.volume.label}}</td>
-      <td>{{hold_data.title}}</td>
-      <td>{{hold_data.author}}</td>
-      <td>{{hold_data.copy.barcode}} {{hold_data.part.label}}</td>
-      <td>{{hold_data.hold.hold_type}}</td>
+      <td valign="top">{{hold_data.copy.location.name}}</td>
+      <td valign="top">{{hold_data.volume.label}}</td>
+      <td valign="top">{{hold_data.title}}</td>
+      <td valign="top">{{hold_data.author}}</td>
+      <td valign="top">{{hold_data.copy.barcode}} {{hold_data.part.label}}</td>
+      <td valign="top">{{hold_data.hold.hold_type}}</td>
     </tr>
   </tbody>
 </table>
\ No newline at end of file

diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_list.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_list.tt2
index 2519cfe..cc1bd50 100644 (file)
--- a/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_list.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_list.tt2
@@ -17,19 +17,24 @@
       <th>Author</th>
       <th>Call Number</th>
       <th>Barcode/Part</th>
+         <th>Status</th>
+         <th>Shelf Expire Date</th>
     </tr>
   </thead>
   <tbody>
       <tr ng-repeat="hold_data in holds | orderBy : ['patron_alias','patron_last','patron_first','title']">
-      <td><span ng-if="hold_data.patron_alias">{{hold_data.patron_alias}}</span>
+      <td valign="top"><span ng-if="hold_data.patron_alias">{{hold_data.patron_alias}}</span>
         <span ng-if="!hold_data.patron_alias">
           {{hold_data.patron_last}}, {{hold_data.patron_first}}
         </span><br/>
       </td>
-      <td>{{hold_data.title}}</td>
-      <td>{{hold_data.author}}</td>
-      <td>{{hold_data.volume.label}}</td>
-      <td>{{hold_data.copy.barcode}} {{hold_data.part.label}}</td>
+      <td valign="top">{{hold_data.title}}</td>
+      <td valign="top">{{hold_data.author}}</td>
+      <td valign="top">{{hold_data.volume.label}}</td>
+      <td valign="top">{{hold_data.copy.barcode}} {{hold_data.part.label}}</td>
+         <td valign="top">{{hold_data.status_string}}</td>
+         <td valign="top">{{hold_data.hold.shelf_expire_time | date:'short'}}</td>
     </tr>
   </tbody>
-</table>
\ No newline at end of file
+</table>
+

diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_slip.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_slip.tt2
index fadd09c..95ae098 100644 (file)
--- a/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_slip.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_hold_shelf_slip.tt2
@@ -11,21 +11,26 @@
 <br/>
 
 <table>
-  <tr><td><b>Title:</b></td><td><b>{{title}}</b></td></tr>
-  <tr><td>Barcode:</td><td>{{copy.barcode}}</td></tr>
-  <tr><td>Request Date: &nbsp;</td><td>{{hold.request_time | date:"M/d/yyyy"}}</td></tr>
+  <tr><td valign="top"><b>Title:</b></td><td valign="top"><b>{{title}}</b></td></tr>
+  <tr><td valign="top">Barcode:</td><td valign="top">{{copy.barcode}}</td></tr>
+  <tr><td valign="top">Request Date: &nbsp;</td><td valign="top">{{hold.request_time | date:"M/d/yyyy"}}</td></tr>
   <tr><td>&nbsp;</td><td></td></tr>
-  <tr><td><b>Patron:</td><td><b>{{patron.family_name}}, {{patron.first_given_name}} {{patron.second_given_name}}</b></tr>
-  <tr><td>Barcode:</td><td>{{patron.card.barcode}}</td></tr>
-  <tr><td>
+  <tr><td valign="top"><b>Patron:</td><td valign="top"><b>{{patron.family_name}}, {{patron.first_given_name}} {{patron.second_given_name}}</b></tr>
+  <tr><td valign="top">Barcode:</td><td valign="top">{{patron.card.barcode}}</td></tr>
+  <tr><td valign="top">
       <div ng-if="hold.phone_notify" style="font-weight:bold;">Notify by phone: &nbsp;</div>
       <div ng-if="hold.sms_notify">Notify by text:</div>
       <div ng-if="hold.email_notify == 't'">Notify by email: &nbsp;</div>
-  </td><td>
+  </td><td valign="top">
       <div ng-if="hold.phone_notify" style="font-weight:bold;">{{hold.phone_notify}}</div>
       <div ng-if="hold.sms_notify">{{hold.sms_notify}}</div>
       <div ng-if="hold.email_notify == 't'">{{patron.email}}</div>
   </td></tr>
 </table>
+<ol>
+<li ng-repeat="note in hold_notes | filter: {slip : 't'}">
+<strong>{{note.title}}</strong><br/>
+{{note.body}}</li>
+</ol>
 <hr/>
 <div>{{current_location.shortname}} {{today | date:'short'}}</div>

diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_hold_transit_slip.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_hold_transit_slip.tt2
index e8370bc..47e2ea4 100644 (file)
--- a/Open-ILS/src/templates/staff/share/print_templates/t_hold_transit_slip.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_hold_transit_slip.tt2
@@ -6,10 +6,9 @@
 {{dest_location.name}}</div>
 <br/>
 <table>
-<tr><td>Title:</td><td>{{title}}</td></tr>
-<tr><td>Author:</td><td>{{author}}</td></tr>
-<tr><td>Barcode: &nbsp;</td><td>{{copy.barcode}}</td></tr>
-<tr><td>Request Date: &nbsp;</td><td>{{hold.request_time | date:"M/d/yyyy"}}</td></tr>
+<tr><td valign="top">Title:</td><td valign="top">{{title}}</td></tr>
+<tr><td valign="top">Author:</td><td valign="top">{{author}}</td></tr>
+<tr><td valign="top">Barcode: &nbsp;</td><td valign="top">{{copy.barcode}}</td></tr>
 </table>
 <hr/>
 <div>{{current_location.shortname}} {{today | date:'short'}}</div>

diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_holds_for_bib.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_holds_for_bib.tt2
index e3c8c68..9c79254 100644 (file)
--- a/Open-ILS/src/templates/staff/share/print_templates/t_holds_for_bib.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_holds_for_bib.tt2
@@ -27,16 +27,14 @@ bib record. Fields include:
     </thead>
     <tbody>
       <tr ng-repeat="hold in holds">
-        <td>{{hold.hold.request_time | date:$root.egDateAndTimeFormat}}</td>
-        <td>{{hold.patron_barcode}}</td>
-        <td>{{hold.patron_last}}</td>
-        <td>{{hold.patron_alias}}</td>
-        <td>{{hold.copy.barcode}}</td>
+        <td valign="top">{{hold.hold.request_time | date:$root.egDateAndTimeFormat}}</td>
+        <td valign="top">{{hold.patron_barcode}}</td>
+        <td valign="top">{{hold.patron_last}}</td>
+        <td valign="top">{{hold.patron_alias}}</td>
+        <td valign="top">{{hold.copy.barcode}}</td>
       </tr>
     </tbody>
   </table>
   <hr/>
-  <div>{{current_location.shortname}} {{today | date:$root.egDateAndTimeFormat}}</div>
-  <div>[% l('Printed by [_1]', '{{staff.first_given_name}}') %]</div>
-<br/>
+<div>{{current_location.shortname}} {{today | date:'short'}}</div>
 

diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_offline_checkin.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_offline_checkin.tt2
index 7c0acdd..a2df19d 100644 (file)
--- a/Open-ILS/src/templates/staff/share/print_templates/t_offline_checkin.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_offline_checkin.tt2
@@ -1,25 +1,11 @@
-<!--
-Template for printing offline checkout receipts; fields available include:
-
-* transactions - list of loans made during this session. Each
-  includes:
-
-  * barcode
-  * backdate
-  * timestamp
-
--->
-<div>
-  <div>[% l('You checked in the following [_1] items:', '{{transactions.length}}') %]</div>
+  <h1 style="text-align:center;">PINES</h1>
+  <div>You checked in the following {{transactions.length}} items:</div>
   <hr/>
   <ol>
     <li ng-repeat="checkin in transactions">
-      <div>[% l('Barcode: [_1] Checkin date: [_2]', 
-        '{{checkin.barcode}}',
-        '{{checkin.backdate | date:"short"}}') %]</div>
+      <div>Barcode: {{checkin.barcode}}<br/>
+      Checkin date: {{checkin.backdate | date:"short"}}</div>
     </li>
   </ol>
   <hr/>
   <div>{{today | date:'short'}}</div>
-<br/>
-

diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_offline_checkout.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_offline_checkout.tt2
index 292e7b4..7aeecaf 100644 (file)
--- a/Open-ILS/src/templates/staff/share/print_templates/t_offline_checkout.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_offline_checkout.tt2
@@ -1,26 +1,12 @@
-<!--
-Template for printing offline checkout receipts; fields available include:
-
-* transactions - list of loans made during this session. Each
-  includes:
-
-  * barcode
-  * patron_barcode
-  * due_date
-
--->
-<div>
-  <div>[% l('Patron [_1]', '{{transactions[0].patron_barcode}}') %]</div>
-  <div>[% l('You checked out the following [_1] items:', '{{transactions.length}}') %]</div>
+  <h1 style="text-align:center;">PINES</h1>
+  <div>You checked out the following {{transactions.length}} items:</div>
   <hr/>
   <ol>
     <li ng-repeat="checkout in transactions">
-      <div>[% l('Barcode: [_1] Due: [_2]', 
-        '{{checkout.barcode}}',
-        '{{checkout.due_date | date:"short"}}') %]</div>
+      <div>Barcode: {{checkout.barcode}}<br/>
+         Due: {{checkout.due_date | date:"short"}}</div>
     </li>
   </ol>
   <hr/>
   <div>{{today | date:'short'}}</div>
-<br/>
 

diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_offline_in_house_use.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_offline_in_house_use.tt2
index 1f177ce..efb11a0 100644 (file)
--- a/Open-ILS/src/templates/staff/share/print_templates/t_offline_in_house_use.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_offline_in_house_use.tt2
@@ -1,24 +1,11 @@
-<!--
-Template for printing offline in-house use receipts; fields available include:
+<h1 style="text-align:center;">PINES</h1>
 
-* transactions - list of loans made during this session. Each
-  includes:
-
-  * barcode
-  * count
-
--->
-<div>
-  <div>[% l('You recorded use for the following [_1] items:', '{{transactions.length}}') %]</div>
+  <div>You recorded in-house use for the following {{transactions.length}} items:</div>
   <hr/>
   <ol>
     <li ng-repeat="checkout in transactions">
-      <div>[% l('Barcode [_1] used [_2] times', 
-        '{{checkout.barcode}}',
-        '{{checkout.count}}') %]</div>
+      <div>Barcode {{checkout.barcode}} used {{checkout.count}} times</div>
     </li>
   </ol>
   <hr/>
   <div>{{today | date:'short'}}</div>
-<br/>
-

diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_offline_renew.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_offline_renew.tt2
index 7bd8242..a7134fb 100644 (file)
--- a/Open-ILS/src/templates/staff/share/print_templates/t_offline_renew.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_offline_renew.tt2
@@ -1,24 +1,13 @@
-<!--
-Template for printing offline renew receipts; fields available include:
-
-* transactions - list of loans made during this session. Each
-  includes:
-
-  * barcode
-  * due_date
-
--->
-<div>
-  <div>[% l('You renewed the following [_1] items:', '{{transactions.length}}') %]</div>
+  <h1 style="text-align:center;">PINES</h1>
+  <div>You renewed the following {{transactions.length}} items:</div>
   <hr/>
   <ol>
     <li ng-repeat="checkout in transactions">
-      <div>[% l('Barcode: [_1] Due: [_2]', 
-        '{{checkout.barcode}}',
-        '{{checkout.due_date | date:"short"}}') %]</div>
+      <div>Barcode: {{checkout.barcode}}<br/>
+      Due: {{checkout.due_date | date:"short"}}</div>
     </li>
   </ol>
   <hr/>
   <div>{{today | date:'short'}}</div>
-<br/>
+
 

diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_transit_list.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_transit_list.tt2
index 3f233d1..646233c 100644 (file)
--- a/Open-ILS/src/templates/staff/share/print_templates/t_transit_list.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_transit_list.tt2
@@ -13,13 +13,13 @@ transits - list; each entry contains:
   * target_copy.call_number.record.simple_record.title
 -->
 <div>
-  <div>Transits:</div>
+  <h1>Transit List:</h1>
   <hr/>
   <ol>
     <li ng-repeat="transit in transits">
-      <div>From: {{transit.source.shortname}} To: {{transit.dest.shortname}} <br> When: {{transit.source_send_time | date:'short'}} <br> Barcode: {{transit.target_copy.barcode}} Title: {{transit.target_copy.call_number.record.simple_record.title}}</div>
+      <div>From: {{transit.source.shortname}}<br/>To: {{transit.dest.shortname}}<br/> When: {{transit.source_send_time | date:'short'}}<br/> Barcode: {{transit.target_copy.barcode}}<br/> Title: {{transit.target_copy.call_number.record.simple_record.title}}</div>
     </li>
   </ol>
   <hr/>
-  <div>{{current_location.shortname}} {{today | date:$root.egDateAndTimeFormat}}</div>
+  <div>{{current_location.shortname}}  {{today | date:'short'}}</div>
 <br/>

diff --git a/Open-ILS/src/templates/staff/share/print_templates/t_transit_slip.tt2 b/Open-ILS/src/templates/staff/share/print_templates/t_transit_slip.tt2
index a16662a..47e2ea4 100644 (file)
--- a/Open-ILS/src/templates/staff/share/print_templates/t_transit_slip.tt2
+++ b/Open-ILS/src/templates/staff/share/print_templates/t_transit_slip.tt2
@@ -6,9 +6,9 @@
 {{dest_location.name}}</div>
 <br/>
 <table>
-<tr><td>Title:</td><td>{{title}}</td></tr>
-<tr><td>Author:</td><td>{{author}}</td></tr>
-<tr><td>Barcode: &nbsp;</td><td>{{copy.barcode}}</td></tr>
+<tr><td valign="top">Title:</td><td valign="top">{{title}}</td></tr>
+<tr><td valign="top">Author:</td><td valign="top">{{author}}</td></tr>
+<tr><td valign="top">Barcode: &nbsp;</td><td valign="top">{{copy.barcode}}</td></tr>
 </table>
 <hr/>
 <div>{{current_location.shortname}} {{today | date:'short'}}</div>