Index: openacs-4/packages/calendar/www/view-month-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-month-display.adp,v
diff -u -r1.16.2.3 -r1.16.2.4
--- openacs-4/packages/calendar/www/view-month-display.adp	9 Mar 2007 19:29:16 -0000	1.16.2.3
+++ openacs-4/packages/calendar/www/view-month-display.adp	17 May 2007 12:59:57 -0000	1.16.2.4
@@ -48,7 +48,8 @@
                         <a href="@items.event_url@" title="#calendar.goto_items_event_name#">
                         <if @items.time_p@ true>@items.start_time@</if>
                         @items.event_name@
-                        <if @show_calendar_name_p@>
+                        <if @items.num_attachments@ gt 0><img src="/resources/calendar/images/attach.png" alt=""/></if>
+			<if @show_calendar_name_p@>
                           <span class="cal-text-grey-sml"> [@items.calendar_name@]</span>
                         </if>
                         </a>
Index: openacs-4/packages/calendar/www/view-month-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-month-display.tcl,v
diff -u -r1.20.2.3 -r1.20.2.4
--- openacs-4/packages/calendar/www/view-month-display.tcl	6 Apr 2007 18:04:15 -0000	1.20.2.3
+++ openacs-4/packages/calendar/www/view-month-display.tcl	17 May 2007 12:59:57 -0000	1.20.2.4
@@ -22,9 +22,13 @@
     set portlet_mode_p 1
 }
 
+if {![info exists return_url]} {
+    set return_url [ad_urlencode "../"]
+}
+
 if {[info exists portlet_mode_p] && $portlet_mode_p} {
     set page_num_urlvar "&page_num=$page_num"
-    set item_template "\${url_stub}cal-item-view?show_cal_nav=0&return_url=[ad_urlencode "../"]&action=edit&cal_item_id=\$item_id"
+    set item_template "\${url_stub}cal-item-view?show_cal_nav=0&return_url=$return_url&action=edit&cal_item_id=\$item_id"
     set prev_month_template "?view=month&date=\[ad_urlencode \$prev_month\]&page_num=$page_num"
     set next_month_template "?view=month&date=\[ad_urlencode \$next_month\]&page_num=$page_num"
     set url_stub_callback "calendar_portlet_display::get_url_stub"
@@ -117,7 +121,8 @@
     time_p \
     add_url \
     day_url \
-    style_class
+    style_class \
+    num_attachments
 
 # Calculate number of greyed days and then add them to the calendar mulitrow
 set greyed_days_before_month [expr [expr [dt_first_day_of_month $this_year $this_month]] -1 ]
@@ -151,7 +156,8 @@
             "" \
             "" \
             "" \
-            ""
+            "" \
+	    ""
     }
 }
 
@@ -209,7 +215,8 @@
                 0 \
                 "${base_url}cal-item-new?date=[dt_julian_to_ansi $current_day]&start_time=&end_time" \
                 "?view=day&date=[dt_julian_to_ansi $current_day]&$page_num_urlvar" \
-                "calendar-${system_type}Item"
+                "calendar-${system_type}Item" \
+		$num_attachments
         } 
     }
 
@@ -251,7 +258,8 @@
         $time_p \
         "${base_url}cal-item-new?date=[dt_julian_to_ansi $current_day]&start_time=&end_time" \
         "?view=day&date=[dt_julian_to_ansi $current_day]&$page_num_urlvar" \
-        "calendar-${system_type}Item"
+        "calendar-${system_type}Item" \
+	$num_attachments
 }
 
 if { !$exporting_p } {
@@ -285,7 +293,8 @@
             0 \
             "${base_url}cal-item-new?date=[dt_julian_to_ansi $current_day]&start_time=&end_time" \
             "?view=day&date=[dt_julian_to_ansi $current_day]&$page_num_urlvar" \
-            "" 
+            "" \
+	    $num_attachments
     }
 
     # Add cells for remaining days outside the month
@@ -312,7 +321,8 @@
                 "" \
                 "" \
                 "" \
-                ""
+                "" \
+		$num_attachments
         }
     }
 }
Index: openacs-4/packages/calendar/www/view-one-day-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-one-day-display.adp,v
diff -u -r1.19.2.2 -r1.19.2.3
--- openacs-4/packages/calendar/www/view-one-day-display.adp	4 Mar 2007 19:01:36 -0000	1.19.2.2
+++ openacs-4/packages/calendar/www/view-one-day-display.adp	17 May 2007 12:59:57 -0000	1.19.2.3
@@ -12,7 +12,7 @@
 			<td style="vertical-align: top;" class="day-event-1" width="80%" valign="top">
             <div id="day-entry-box">
             <multiple name="items">
-			<div id="day-entry-@items.rownum@" class="day-entry-item @items.style_class@" style="top: @items.top@@hour_height_units@; height: @items.height@@hour_height_units@; @items.style@" onmouseover="showCalItem(this,'@items.height@@hour_height_units@',20);" onmouseout="showCalItem(this,'@items.height@@hour_height_units@',10);"><p><a href="@items.event_url@" title="#calendar.goto_items_event_name#">@items.event_name@</a></p></div>
+			<div id="day-entry-@items.rownum@" class="day-entry-item @items.style_class@" style="top: @items.top@@hour_height_units@; height: @items.height@@hour_height_units@; @items.style@" onmouseover="showCalItem(this,'@items.height@@hour_height_units@',20);" onmouseout="showCalItem(this,'@items.height@@hour_height_units@',10);"><p><if @items.num_attachments@ gt 0><img src="/resources/calendar/images/attach.png" alt="" /></if><a href="@items.event_url@" title="#calendar.goto_items_event_name#">@items.event_name@</a></p></div>
             </multiple>
 			</div><!-- day-entry-box -->
             </td>
Index: openacs-4/packages/calendar/www/view-one-day-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-one-day-display.tcl,v
diff -u -r1.34.2.1 -r1.34.2.2
--- openacs-4/packages/calendar/www/view-one-day-display.tcl	9 Feb 2007 16:07:38 -0000	1.34.2.1
+++ openacs-4/packages/calendar/www/view-one-day-display.tcl	17 May 2007 12:59:57 -0000	1.34.2.2
@@ -16,7 +16,7 @@
 set hour_height_sep 3
 set hour_height_units px
 set bump_right_base 0
-set bump_right_delta 35
+set bump_right_delta 155
 set bump_right_units px
 
 if {[info exists url_stub_callback]} {
@@ -83,7 +83,8 @@
     end_time \
     top \
     height \
-    style
+    style \
+    num_attachments
 
 set previous_intervals [list]
 
@@ -134,7 +135,8 @@
         $pretty_end_time \
         0 \
         0 \
-        "left: ${bump_right_base}${bump_right_units};"
+        "left: ${bump_right_base}${bump_right_units};" \
+	$num_attachments
 
     incr bump_right_base $bump_right_delta
 }
@@ -216,7 +218,8 @@
         $pretty_end_time \
         $top \
         $height \
-        "left: ${bump_right}${bump_right_units};"
+        "left: ${bump_right}${bump_right_units};" \
+	$num_attachments
     
     lappend previous_intervals $start_seconds $end_seconds
 }
Index: openacs-4/packages/calendar/www/view-week-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-week-display.adp,v
diff -u -r1.13.2.4 -r1.13.2.5
--- openacs-4/packages/calendar/www/view-week-display.adp	11 Mar 2007 01:05:53 -0000	1.13.2.4
+++ openacs-4/packages/calendar/www/view-week-display.adp	17 May 2007 12:59:57 -0000	1.13.2.5
@@ -33,7 +33,7 @@
               <div class="week-entry-box">
                 <multiple name="items">
 				  <div class="week-entry-item @items.style_class@" style="position: absolute; top:@items.top@@hour_height_units@; left: @items.left@@width_units@; height:@items.height@@hour_height_units@;" onMouseOver="showCalItem(this,'@items.height@@hour_height_units@',20);" onMouseOut="showCalItem(this,'@items.height@@hour_height_units@',10);">
-					<p><a href="@items.event_url@" title="#calendar.goto_items_event_name#">@items.event_name@</a></p>
+					<p><if @items.num_attachments@ gt 0><img src="/resources/calendar/images/attach.png" alt="" /></if><a href="@items.event_url@" title="#calendar.goto_items_event_name#">@items.event_name@</a></p>
 				  </div>
                 </multiple>
 			  </div>
Index: openacs-4/packages/calendar/www/view-week-display.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-week-display.tcl,v
diff -u -r1.18.2.3 -r1.18.2.4
--- openacs-4/packages/calendar/www/view-week-display.tcl	12 Apr 2007 17:49:02 -0000	1.18.2.3
+++ openacs-4/packages/calendar/www/view-week-display.tcl	17 May 2007 12:59:57 -0000	1.18.2.4
@@ -101,7 +101,8 @@
     style_class \
     top \
     height \
-    left
+    left \
+    num_attachments
 
 # Convert date from user timezone to system timezone
 set first_weekday_of_the_week_tz [lc_time_conn_to_system "$first_weekday_of_the_week 00:00:00"]
@@ -263,7 +264,8 @@
         "calendar-Item" \
         $top \
         $height \
-        $left
+        $left \
+	$num_attachments
 
     set current_weekday $day_of_week
 
Index: openacs-4/packages/calendar/www/resources/images/attach.png
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/resources/images/attach.png,v
diff -u -r1.1 -r1.1.2.1
Binary files differ