Index: openacs-4/contrib/packages/events/www/event-info.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/event-info.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/contrib/packages/events/www/event-info.adp	9 Mar 2003 12:08:08 -0000	1.1
+++ openacs-4/contrib/packages/events/www/event-info.adp	9 Mar 2003 16:27:28 -0000	1.2
@@ -2,115 +2,132 @@
 <property name="title">@event_info.name@</property>
 <property name="context">@context@</property>
 
-
-<if @admin_p@ ne 0>
-        <p style="text-align: right;">[<a href="admin/event?event_id=@event_id@">Administer This Event</a>]</p>
+<if @admin_p@ true>
+  <div style="float: right; padding: 4px;">[ <a href="admin/event?event_id=@event_id@">Administer this event</a> ]</div>
 </if>
 
-<if @reg_id@>
+<p>
+  <b>When:</b> @event_info.timespan@
+  <if @event_info.num_other_times@ gt 0>(<a href="activity?activity_id=@event_info.activity_id@">view other times and locations</a>)</if>
+</p>
 
-        <h3>You are already registered for @event_info.name@</h3>
-        <p>
-        If you'd like, you may:
-        <ul>
-                <li><a href="order-check?reg_id=@reg_id@">Review your registration status and information about this event</a>
-           <if @event_info.reg_cancellable_p@>
-                    <li><a href="order-cancel?reg_id=@reg_id@">Cancel your registration</a>
-           </if>
-        </ul>
-        <br><br>
+<p>
+  <b>Where:</b> @event_info.city@
+  <if @reg_id@ false>
+    (You'll get specifics after you register)
+  </if>
+  <else>
+    <if @reg_info.reg_state@ ne "approved">
+      (You'll get specifics once your registration has been approved)
+    </if>
+  </else>
+</p>
+
+<if @reg_id@ ne 0 and @reg_info.reg_state@ eq "approved">
+  <p>
+    <b>Address:</b> 
+    <blockquote>
+      @venue_info.venue_name@
+      <if @venue_info.address1@ not nil><br>@venue_info.address1@</if>
+      <if @venue_info.address2@ not nil><br>@venue_info.address2@</if>
+      <if @venue_info.city@ not nil or @venue_info.usps_abbrev@ not nil>
+        <br><if @venue_info.city@ not nil>@venue_info.city@  </if>@venue_info.usps_abbrev@
+      </if>
+    </blockquote>
+  </p>
 </if>
 
+<if @reg_id@ ne 0 and @reg_info.reg_state@ eq "approved" and @venue_info.description@ not nil>
+  <p>
+    <b>Directions:</b> 
+    <blockquote>
+      @venue_info.description@
+    </blockquote>
+  </p>
+</if>
 
-<h3>About the Event</h3>
+<p>
+  <b>Registration:</b>
+  <if @reg_id@ eq 0>
+    <if @reg_deadline_has_passed_p@ true>
+      Sorry, the deadline to register for this event was @event_info.reg_deadline@.
+    </if>
+    <else>
+      Deadline is @event_info.reg_deadline@.
+      &nbsp;&nbsp;&nbsp;
+      <if @user_id@ ne 0>
+        <if @can_register_p@ true>
+          <a href="order-one?event_id=@event_id@"><b>Register now</b></a>
+        </if>
+        <else>
+          You do not have permission to register for this event.
+        </else>
+      </if>
+      <else>
+        <a href="/register?return_url=/events/event-info?event_id=@event_id@">Login or sign up</a>
+        to register for this event.
+      </else>
 
-<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>@event_info.city@ (you'll get specifics after you register)</td>
-</tr>
+    </else>
+  </if>
+  <else>
+    You have already registered.
+    <a href="order-check?reg_id=@reg_id@">Check registration status</a>.
+  </else>
+</p>
 
 
-<if @reg_deadline_has_passed_p@>
-        <tr>
-          <th valign=top align=right>Registration Deadline</th>
-          <td valign=top><font color="red">The deadline to register for this event was @event_info.reg_deadline@</font></td>
-        </tr>
+<if @organizers:rowcount@ gt 0>
+  <p>
+    <b>Organizers:</b>
+  </p>
+  <ul>
+    <multiple name="organizers">
+      <if @organizers.view_url@ not nil>
+        <li>@organizers.role@: <a href="@organizers.view_url@">@organizers.organizer_name@</a></li>
+      </if>
+      <else>
+        <li>@organizer.role@: @organizers.organizer_name@</li>
+      </else>
+    </multiple>
+  </ul>
 </if>
-<else>
-        <tr>
-          <th valign=top align=right>Registration Deadline</th>
-          <td valign=top><font color="red">@event_info.reg_deadline@</font></td>
-        </tr>
-</else>
 
-<% if { [llength $organizers] > 0 } { %>
-<tr>
-  <th valign=top align=right>Organizers</th>
-  <td valign=top>
-<ul>
-<%
-    foreach organizer $organizers {
-	if {![empty_string_p [lindex $organizer 4]]} {
-	     template::adp_puts "<li>[lindex $organizer 0]: <a href=\"organizer?user_id=[lindex $organizer 2]&role_id=[lindex $organizer 1]\">[lindex $organizer 3]</a></li>"
-	} else {
-	     template::adp_puts "<li>[lindex $organizer 0]: [lindex $organizer 3]</li>"
-	}
-    }
-%>
-</ul>
-  </td>
-</tr>
-<% } %>
-
-
 <if @attachments_enabled_p@>
-  <th valign=top align=right>Event Agenda/Attachments</th>
-  <td valign=top align=left>
-<ul>
-<% 
-    foreach attachment $attachments {
-        template::adp_puts "<li><a href=\"[lindex $attachment 2]\">[lindex $attachment 1]</a></li>"
-    }
-%>
-</ul>
-  </td>
+ <p>
+   <b>Event Agenda/Attachments:</b>
+  </p>
+  <ul>
+    <multiple name="attachments">
+      <li><a href="@attachments.url@">@attachments.name@</a></li>
+    </multiple>
+  </ul>
 </if>
 
-<tr>
-  <th valign=top align=right>Related Web Site</th>
-  <td valign=top>@detail_url@</td>
-</tr>
-</table>
+<if @detail_url@ not nil>
+  <p>
+    <b>Related Web Site:</b>
+    @detail_url@
+  </p>
+</if>
 
-<p></p>
-@event_info.description@
+@event_info.additional_note@
 
-
-
-
-
-
-<if @reg_deadline_has_passed_p@></if></else>
-<p></p>
-
-<if @reg_id@ eq 0>
-        <if @user_id@>
-                <if @can_register_p@>
-                    <ul><li><a href="order-one?event_id=@event_id@">Register for this Event</a></li></ul>
-                </if>
-                <else>
-                    <ul><li>You do not have permission to register for this Event</li></ul>
-                </else>
+<if @reg_deadline_has_passed_p@ false and @reg_id@ eq 0>
+  <ul>
+    <li>
+      <if @user_id@ ne 0>
+        <if @can_register_p@ true>
+          <a href="order-one?event_id=@event_id@"><b>Register now</b></a>
         </if>
         <else>
-                <ul><li>You must first <a href="/register?return_url=/events/event-info?event_id=@event_id@"">login</a> before you can register for this Event</li></ul>
+          You do not have permission to register for this event.
         </else>
+      </if>
+      <else>
+        <a href="/register?return_url=/events/event-info?event_id=@event_id@">Login or sign up</a>
+        to register for this event.
+      </else>
+    </li>
+  </ul>
 </if>
-
-</else>