Index: openacs-4/contrib/packages/events/www/order-check.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/order-check.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/order-check.adp	9 Mar 2003 12:08:08 -0000	1.1
+++ openacs-4/contrib/packages/events/www/order-check.adp	9 Mar 2003 16:27:28 -0000	1.2
@@ -2,60 +2,61 @@
 <property name="title">@title@</property>
 <property name="context">@context@</property>
 
-
-@reg_info.user_name@,
-<p>
-
 <if @reg_info.reg_state@ eq "approved">
-        Your place is reserved for @event_info.name@.
-        <p>
-        @event_info.display_after@
-        <p>
-        <h3>About @event_info.name@</h3>
-        <table>
-                <tr>
-                  <th valign=top align=right>When</th>
-                  <td valign=top align=left>@event_info.timespan@
-                	( <a href="activity?activity_id=@event_info.activity_id@">view other times</a> )</td>
-                </tr>
-                <tr>
-                  <th valign=top align=right>Where</th>
-                  <td valign=top>@venue_info.venue_name@
-                        <if @venue_info.address1@ ne ""><br>@venue_info.address1@</if>
-                        <if @venue_info.address2@ ne ""><br>@venue_info.address2@</if>
-                        <if @venue_info.city@ ne "" or @venue_info.usps_abbrev@ ne "">
-		           <br><if @venue_info.city@ ne "">@venue_info.city@  </if>@venue_info.usps_abbrev@
-		        </if>
-                        <p>
-                        @venue_info.description@
-                        </td>
-                </tr>
-        </table>
-        <p>
-        <if @event_info.reg_cancellable_p@ eq "t">
-                If you would like to, you may <A href="order-cancel?reg_id=@reg_id@">cancel your registration</a>.
-        </if>
+  <p>
+    Your place is reserved.
+  </p>
+  <p>
+    @event_info.display_after@
+  </p>
+
+  <if @event_info.reg_cancellable_p@ eq "t">
+    <p>
+      <b>&raquo;</b> <a href="order-cancel?reg_id=@reg_id@">Cancel your registration</a>.
+    </p>
+  </if>
 </if>
 
 <if @reg_info.reg_state@ eq "pending">
-        Thank you for your interest in @event_info.name@. This
-        event requires final approval for your registration from one of the
-        event organizers. You have been placed on a registration queue, and
-        we will notify you by e-mail once your registrating status changes.
-        <p>
-        If you would like to, you may <A href="order-cancel?reg_id=@reg_id@">cancel your request</a>.
+  <p>
+    Thank you for your interest in @event_info.name@.
+  </p>
+  <p>
+    Registration for this event requires approval by the event
+    organizers.  
+  </p>
+  <p>
+    We will notify you by e-mail as soon as your registrating status
+    changes.
+  </p>
+  <p>
+    If you would like to, you may <A href="order-cancel?reg_id=@reg_id@">cancel your request</a>.
+  </p>
 </if>
 
 <if @reg_info.reg_state@ eq "waiting">
-        Thank you for your interest in @event_info.name@. Unfortunately,
-        all spaces for this event were filled before you applied. Thus, you have
-        been placed on a waiting list. We will notify you by e-mail if your
-        registration status changes.
-        <p>
-        If you would like to, you may <A href="order-cancel?reg_id=@reg_id@">cancel your registration</a>.
+  <p>
+    Thank you for your interest in @event_info.name@.
+  </p>
+  <p>
+    Unfortunately, all spaces for this event were filled before you
+    applied. Thus, you have been placed on a waiting list.
+  </p>
+  <p>
+    We will notify you by e-mail if your registration status changes.
+  </p>
+  <p>
+    If you would like to, you may <A href="order-cancel?reg_id=@reg_id@">cancel your registration</a>.
+  </p>
 </if>
 
 <if @reg_info.reg_state@ eq "canceled">
-        Your registration has been canceled.  If you want, you may
-        <a href="order-one?event_id=@reg_info.event_id@">place a new registration</a>.
+  <p>
+    Your registration has been canceled.  If you want, you may
+    <a href="order-one?event_id=@reg_info.event_id@">place a new registration</a>.
+  </p>
 </if>
+
+<p>
+  <b>&raquo;</b> <a href="@return_url@">Go back to the event page</a>.
+</p>