cleanup:

1) fix broken INCLUDE statements in circ and hold histories

2) move an opac "part" to the parts directory

diff --git a/Open-ILS/web/templates/default/opac/myopac/circ_history.tt2 b/Open-ILS/web/templates/default/opac/myopac/circ_history.tt2
index 8848693..a095558 100644 (file)
--- a/Open-ILS/web/templates/default/opac/myopac/circ_history.tt2
+++ b/Open-ILS/web/templates/default/opac/myopac/circ_history.tt2
@@ -1,5 +1,5 @@
 [%  PROCESS "default/opac/parts/header.tt2";
-    PROCESS "default/opac/parts/marc_misc.tt2";
+    PROCESS "default/opac/parts/misc_util.tt2";
     WRAPPER "default/opac/parts/myopac/base.tt2";
     myopac_page = "circs"
     limit = ctx.circ_history_limit;

diff --git a/Open-ILS/web/templates/default/opac/myopac/hold_history.tt2 b/Open-ILS/web/templates/default/opac/myopac/hold_history.tt2
index 048dbb2..43f3256 100644 (file)
--- a/Open-ILS/web/templates/default/opac/myopac/hold_history.tt2
+++ b/Open-ILS/web/templates/default/opac/myopac/hold_history.tt2
@@ -1,5 +1,5 @@
 [%  PROCESS "default/opac/parts/header.tt2";
-    PROCESS "default/opac/parts/marc_misc.tt2";
+    PROCESS "default/opac/parts/misc_util.tt2";
     WRAPPER "default/opac/parts/myopac/base.tt2";
     myopac_page = "holds"  
     limit = ctx.hold_history_limit;

diff --git a/Open-ILS/web/templates/default/opac/myopac/main_payment_form.tt2 b/Open-ILS/web/templates/default/opac/myopac/main_payment_form.tt2
index 8a57d64..c10d5a2 100644 (file)
--- a/Open-ILS/web/templates/default/opac/myopac/main_payment_form.tt2
+++ b/Open-ILS/web/templates/default/opac/myopac/main_payment_form.tt2
@@ -160,7 +160,7 @@
                             onclick="history.go(-1);" />
                     </td>
                 </tr>
-                [% INCLUDE "default/opac/myopac/main_refund_policy.tt2" %]
+                [% INCLUDE "default/opac/parts/myopac/main_refund_policy.tt2" %]
             </tbody>
         </table>
     </form>

diff --git a/Open-ILS/web/templates/default/opac/myopac/main_refund_policy.tt2 b/Open-ILS/web/templates/default/opac/myopac/main_refund_policy.tt2
deleted file mode 100644 (file)
index a1a81f9..0000000
--- a/Open-ILS/web/templates/default/opac/myopac/main_refund_policy.tt2
+++ /dev/null
@@ -1,16 +0,0 @@
-<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>
-    </td>
-</tr>

diff --git a/Open-ILS/web/templates/default/opac/parts/myopac/main_refund_policy.tt2 b/Open-ILS/web/templates/default/opac/parts/myopac/main_refund_policy.tt2
new file mode 100644 (file)
index 0000000..a1a81f9
--- /dev/null
+++ b/Open-ILS/web/templates/default/opac/parts/myopac/main_refund_policy.tt2
@@ -0,0 +1,16 @@
+<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>
+    </td>
+</tr>