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.3 -r1.4
--- openacs-4/contrib/packages/events/www/event-info.adp	10 Mar 2003 12:50:55 -0000	1.3
+++ openacs-4/contrib/packages/events/www/event-info.adp	13 Mar 2003 09:47:09 -0000	1.4
@@ -26,23 +26,23 @@
 <if @reg_id@ ne 0 and @reg_info.reg_state@ eq "approved">
   <p>
     <b>Address:</b> 
-    <blockquote>
+    <blockquote><p>
       @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></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>
+    <blockquote><p>
       @venue_info.description@
-    </blockquote>
+    </p></blockquote>
   </p>
 </if>
 
@@ -54,26 +54,23 @@
     </if>
     <else>
       Deadline is @event_info.reg_deadline@.
-      <if @event_info.additional_note@ not nil>
-        &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 @user_id@ ne 0>
+        <if @can_register_p@ true>
+          <b>&raquo;</b> <a href="order-one?event_id=@event_id@"><b>Register now</b></a>
         </if>
         <else>
-          <a href="/register?return_url=/events/event-info?event_id=@event_id@">Login or sign up</a>
-          to register for this event.
+          You do not have permission to register for this event.
         </else>
+      </if>
+      <else>
+        <br><b>&raquo;</b> <a href="/register?return_url=/events/event-info?event_id=@event_id@"><b>Login or sign up</b></a>
+        <b>to register for this event.</b>
       </else>
-    </if>
+    </else>
   </if>
   <else>
-    You have already registered.
-    <a href="order-check?reg_id=@reg_id@">Check registration status</a>.
+    You have already registered.<br>
+    <b>&raquo;</b> <a href="order-check?reg_id=@reg_id@">Check registration status</a>.
   </else>
 </p>
 
@@ -112,23 +109,23 @@
   </p>
 </if>
 
-@event_info.additional_note@
-
-<if @reg_deadline_has_passed_p@ false and @reg_id@ eq 0>
-  <ul>
-    <li>
+<if @event_info.additional_note@ not nil>
+  @event_info.additional_note@
+  
+  <if @reg_deadline_has_passed_p@ false and @reg_id@ eq 0>
+    <p>
       <if @user_id@ ne 0>
         <if @can_register_p@ true>
-          <a href="order-one?event_id=@event_id@"><b>Register now</b></a>
+          <b>&raquo;</b> <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>
+        <b>&raquo;</b> <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>
+    </if>
+  </p>
+</if>
\ No newline at end of file
Index: openacs-4/contrib/packages/events/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/index.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/events/www/index.adp	9 Mar 2003 16:27:28 -0000	1.2
+++ openacs-4/contrib/packages/events/www/index.adp	13 Mar 2003 09:47:09 -0000	1.3
@@ -11,7 +11,7 @@
 </if>
 <else>
   <p>
-    Upcoming events:
+    Upcoming events at @system_name@.
   </p>
 
   <table cellspacing="8">
@@ -21,7 +21,7 @@
           <b>@events.start_date_pretty@</b>
         </td>
         <td>
-          <b><a href="@events.view_url@">@events.name@</a></b> in @events.city@, @events.timespan@
+          <b><a href="@events.view_url@">@events.name@</a></b> in @events.city@
         </td>
       </tr>
       <tr valign="top">
Index: openacs-4/contrib/packages/events/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/index.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/events/www/index.tcl	9 Mar 2003 16:27:28 -0000	1.2
+++ openacs-4/contrib/packages/events/www/index.tcl	13 Mar 2003 09:47:09 -0000	1.3
@@ -25,6 +25,8 @@
 set package_id [ad_conn package_id]
 set admin_p [ad_permission_p $package_id admin]
 
+set system_name [ad_system_name]
+
 set date_format [parameter::get -parameter date_format -default "MM/DD/YYYY"]
 set time_format [parameter::get -parameter time_format -default "HH12:MIam"]
 
Index: openacs-4/contrib/packages/events/www/order-one.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/events/www/order-one.tcl,v
diff -u -r1.2 -r1.3
--- openacs-4/contrib/packages/events/www/order-one.tcl	9 Mar 2003 16:27:28 -0000	1.2
+++ openacs-4/contrib/packages/events/www/order-one.tcl	13 Mar 2003 09:47:09 -0000	1.3
@@ -120,7 +120,7 @@
     -label "Optional comment" \
     -datatype text \
     -widget textarea \
-    -html {cols 70 rows 8 wrap soft} \
+    -html {cols 40 rows 8 wrap soft} \
     -optional
 
 if {[template::form is_valid registration]} {