From: Bill Erickson Date: Thu, 8 Sep 2011 19:55:36 +0000 (-0400) Subject: Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac... X-Git-Tag: sprint4-merge-nov22~5128^2~20 X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=e5ff20ac80dffbc7fd6f07d27bd6a1024dfa1c72;p=working%2FEvergreen.git Merge branch 'master' of git.evergreen-ils.org:Evergreen into template-toolkit-opac-master-merge --- e5ff20ac80dffbc7fd6f07d27bd6a1024dfa1c72 diff --cc Open-ILS/src/templates/booking/reservation.tt2 index 58880497e9,0000000000..ece7c5836e mode 100644,000000..100644 --- a/Open-ILS/src/templates/booking/reservation.tt2 +++ b/Open-ILS/src/templates/booking/reservation.tt2 @@@ -1,118 -1,0 +1,122 @@@ +[% WRAPPER "base.tt2" %] + +
+
+

+
+
+
+
+ +
+
+
+
+
+ + + +

+
+
+
+ +
+
+
+

+ + +
+ + +
+
+ + +
++
++ ++ ++
+
+ + +   + + +
+
+
+

+
+
+ + +
+
+
+ + +
+

+
+
+
+
+ +
+
+

+
+ + + + + + + + + +
TypeResourceStart timeEnd time
+
+ + +
+
+
+ + + + +[% END %] diff --cc Open-ILS/src/templates/conify/global/acq/provider.tt2 index 117f8e2bd9,0000000000..655d838a2c mode 100644,000000..100644 --- a/Open-ILS/src/templates/conify/global/acq/provider.tt2 +++ b/Open-ILS/src/templates/conify/global/acq/provider.tt2 @@@ -1,211 -1,0 +1,219 @@@ +[% WRAPPER base.tt2 %] +[% ctx.page_title = 'Providers' %] + + + +
+
+
+
Provider
+
+ + +
+
+
+
++ Context Org Unit ++ ++
++
+ + + + +
+
+
+ +
+
+
+ +
+
+
Provider Address
+
+ + +
+
+
+ +
+
+
+ +
+
+
Provider Contact
+
+ + +
+
+
+ +
+
+ +
+
Contact Address
+
+ + +
+
+
+ +
+
+ +
+
+
+
Attribute Definitions
+
+ + +
+
+
+ + + + + +
+ + +
+
+
+ +
+
+
Holding Subfield
+
+ + +
+
+
+ +
+
+
+ +
+ Invoices +
+ + + + + +
+
+
+
+
+
+ + + + + +[% END %] +