These changes undo a couple of small things I tried to tweak on the web

client that didn't work the way I hoped they would.

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

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 bb6dfcd..d92c5a6 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
@@ -23,8 +23,7 @@ Template for printing hold transit slips. Fields include:
 
 -->
 <div>
-  <h1>{{dest_location.shortname}}<br/>
-  {{dest_location.courier_code}}</h1>
+  <h1>{{dest_location.shortname}}</h1>
   <hr/>
   <div>[% l('This item needs to be routed to [_1]', '<b>{{dest_location.shortname}}</b>') %]</div>
   <div>{{dest_location.name}}</div>

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 f1d86d9..0d8b88f 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
@@ -14,8 +14,7 @@ Template for printing a transit slip. Fields include:
 * author
 -->
 <div>
-  <h1>{{dest_location.shortname}}<br/>
-  {{dest_location.courier_code}}</h1>
+  <h1>{{dest_location.shortname}}</h1>
   <hr/>
   <div>[% l('This item needs to be routed to [_1]', '<b>{{dest_location.shortname}}</b>') %]</div>
   <div>{{dest_location.name}}</div>

diff --git a/Open-ILS/src/templates/staff/t_splash.tt2 b/Open-ILS/src/templates/staff/t_splash.tt2
index ecaecb0..aae45e7 100644 (file)
--- a/Open-ILS/src/templates/staff/t_splash.tt2
+++ b/Open-ILS/src/templates/staff/t_splash.tt2
@@ -23,8 +23,7 @@
           </div>
           <div>
             <img src="[% ctx.media_prefix %]/images/portal/registerpatron.png"/>
-            <a target="_self" href="./circ/patron/register">[% l('Register New Patron') %]</a><br/>
-                       <span style="font-size:.7em">(Search for Existing Record First)</span>
+            <a target="_self" href="./circ/patron/register">[% l('Register New Patron') %]</a>
           </div>
           <div>
             <img src="[% ctx.media_prefix %]/images/portal/retreivepatron.png"/>
@@ -58,9 +57,6 @@
             </div>
           </div>
           <div>
-<<<<<<< HEAD
-            <img src="[% ctx.media_prefix %]/images/portal/bucket.png"/>
-=======
             <img src="[% ctx.media_prefix %]/images/portal/book.png"/>
             <a target="_self" href="./cat/catalog/index">[% l('Search the Catalog') %]</a>
           </div>
@@ -78,7 +74,6 @@
           </div>
           <div>
             <img src="[% ctx.media_prefix %]/images/portal/bucket.png"/>
->>>>>>> 8f0fe91... Changes to splash screen and receipt template defaults for web client.
             <a target="_self" href="./cat/bucket/record/">[% l('Record Buckets') %]</a>
           </div>
           <div>
@@ -96,11 +91,6 @@
         </div>
         <div class="panel-body">
           <div>
-<<<<<<< HEAD
-            <img src="[% ctx.media_prefix %]/images/portal/helpdesk.png"/>
-            <a target="_top" href="http://docs.evergreen-ils.org/">
-              [% l('Evergreen Documentation') %]
-=======
             <img src="[% ctx.media_prefix %]/images/portal/helpdesk.png"/>
             <a target="_new" href="http://help.georgialibraries.org">
               [% l('GPLS Help Desk') %]
@@ -110,14 +100,12 @@
             <img src="[% ctx.media_prefix %]/images/portal/helpdesk.png"/>
             <a target="_new" href="http://pines.georgialibraries.org/documentation/">
               [% l('PINES Documentation') %]
-            </a><br/>
-                       <span style="font-size:.7em;"Circulation, Cataloging, and Local Admin Documentation</span>
+            </a>
           </div>
           <div>
             <img src="[% ctx.media_prefix %]/images/portal/reports.png"/>
             <a target="_new" href="http://gapines.org/report-creator/">
               [% l('PINES Quick Reports') %]
->>>>>>> 8f0fe91... Changes to splash screen and receipt template defaults for web client.
             </a>
           </div>
           <div>