Index: openacs-4/packages/wp-slim/www/attach-del.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/attach-del.tcl,v
diff -u -r1.2 -r1.2.4.1
--- openacs-4/packages/wp-slim/www/attach-del.tcl	4 Oct 2001 04:29:01 -0000	1.2
+++ openacs-4/packages/wp-slim/www/attach-del.tcl	21 May 2003 15:31:02 -0000	1.2.4.1
@@ -10,8 +10,12 @@
 } {
     slide_item_id:naturalnum,notnull
     attach_item_id:naturalnum,notnull
+    pres_item_id:naturalnum,notnull
 }
 
+#added permission checking  roc@
+set user_id [ad_verify_and_get_user_id]
+permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_delete_presentation
 
 
 db_exec_plsql revisions_and_item_delete {
@@ -20,4 +24,4 @@
     end;
 }
     
-ad_returnredirect "attach-list?[export_url_vars slide_item_id]"
+ad_returnredirect "attach-list?[export_url_vars slide_item_id pres_item_id]"
Index: openacs-4/packages/wp-slim/www/attach-detail.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/attach-detail.tcl,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/wp-slim/www/attach-detail.tcl	6 Sep 2002 15:32:23 -0000	1.4
+++ openacs-4/packages/wp-slim/www/attach-detail.tcl	21 May 2003 15:31:02 -0000	1.4.2.1
@@ -30,6 +30,11 @@
     and   item_id = :slide_item_id
 }]
 
+#added permission checking  roc@
+set user_id [ad_verify_and_get_user_id]
+permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_edit_presentation
+
+
 set context [list [list "edit-slide?[export_url_vars slide_item_id pres_item_id]" "Edit Slide"] "Details"]
 
 db_multirow revisions revisions_get {
Index: openacs-4/packages/wp-slim/www/attach-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/attach-list.adp,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/wp-slim/www/attach-list.adp	6 Sep 2002 21:51:10 -0000	1.3
+++ openacs-4/packages/wp-slim/www/attach-list.adp	21 May 2003 15:31:02 -0000	1.3.2.1
@@ -4,7 +4,7 @@
 
 <ul>
 <multiple name="att">
-<li>@att.name@ (<a href="attach-del?slide_item_id=@slide_item_id@&attach_item_id=@att.item_id@">remove</a> | <a href="attach-detail?slide_item_id=@slide_item_id@&attach_item_id=@att.item_id@&file_name=@att.name@">details</a>)
+<li>@att.name@ (<a href="attach-del?slide_item_id=@slide_item_id@&attach_item_id=@att.item_id@&pres_item_id=@pres_item_id@">remove</a> | <a href="attach-detail?slide_item_id=@slide_item_id@&attach_item_id=@att.item_id@&file_name=@att.name@&pres_item_id=@pres_item_id@">details</a>)
 </multiple>
 </ul>
 
Index: openacs-4/packages/wp-slim/www/attach-list.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/attach-list.tcl,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/wp-slim/www/attach-list.tcl	6 Sep 2002 15:32:23 -0000	1.3
+++ openacs-4/packages/wp-slim/www/attach-list.tcl	21 May 2003 15:31:02 -0000	1.3.2.1
@@ -10,13 +10,18 @@
      @cvs-id $Id$
 } {
     slide_item_id:naturalnum,notnull
+    pres_item_id:naturalnum,notnull
 } -properties {
     slide_item_id
     context
     att:multirow
 }
 
+#added permission checking  roc@
+set user_id [ad_verify_and_get_user_id]
+permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_edit_presentation
 
+
 set pres_item_id [db_string pres_item_id_get {
     select parent_id
     from cr_items
Index: openacs-4/packages/wp-slim/www/attach.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/attach.tcl,v
diff -u -r1.6.2.1 -r1.6.2.2
--- openacs-4/packages/wp-slim/www/attach.tcl	6 Feb 2003 13:08:16 -0000	1.6.2.1
+++ openacs-4/packages/wp-slim/www/attach.tcl	21 May 2003 15:31:02 -0000	1.6.2.2
@@ -70,5 +70,4 @@
     ad_script_abort
 }
 
-
 ad_returnredirect edit-slide?[export_url_vars slide_item_id pres_item_id]
Index: openacs-4/packages/wp-slim/www/create-presentation.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/create-presentation.adp,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/wp-slim/www/create-presentation.adp	6 Sep 2002 21:51:10 -0000	1.4
+++ openacs-4/packages/wp-slim/www/create-presentation.adp	21 May 2003 15:31:02 -0000	1.4.2.1
@@ -81,10 +81,7 @@
   </tr>
   <tr>
     <th nowrap align=right>Style:</th>
-    <td><select name=style>
-<option value=-1 selected>Default (Plain)
-
-</select>
+    <td>@available_styles@
     </td>
   </tr>
   <tr>
Index: openacs-4/packages/wp-slim/www/create-presentation.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/create-presentation.tcl,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/wp-slim/www/create-presentation.tcl	6 Sep 2002 15:32:23 -0000	1.3
+++ openacs-4/packages/wp-slim/www/create-presentation.tcl	21 May 2003 15:31:02 -0000	1.3.2.1
@@ -11,6 +11,25 @@
     context:onevalue
 }
 
+set package_id [ad_conn package_id]
+set user_id [ad_verify_and_get_user_id]
+permission::require_permission -party_id $user_id -object_id $package_id -privilege wp_create_presentation
+
+set items [db_list_of_lists wp_styles { *SQL* }]
+
+    set names [list]
+    set values [list]
+    foreach image $items {
+	lappend names [lindex $image 1]
+	lappend values [lindex $image 0]
+    }
+
+    lappend names "none" 
+    lappend values -1 
+
+    set available_styles "<select name=style>
+    [ad_generic_optionlist $names $values -1]</select>\n"
+
 set title "Create Presentation"
 set context [list $title]
 
Index: openacs-4/packages/wp-slim/www/delete-presentation-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/delete-presentation-2.tcl,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/wp-slim/www/delete-presentation-2.tcl	18 Sep 2002 12:07:02 -0000	1.2
+++ openacs-4/packages/wp-slim/www/delete-presentation-2.tcl	21 May 2003 15:31:02 -0000	1.2.2.1
@@ -18,7 +18,7 @@
 
 if { [ad_check_password $user_id $password] } {
     db_exec_plsql delete_presentation {
-	begin
+ 	begin
   	  wp_presentation.delete(:pres_item_id);
 	end;
     }
@@ -27,4 +27,4 @@
     ad_script_abort
 }
 
-ad_returnredirect ""
\ No newline at end of file
+ad_returnredirect ""
Index: openacs-4/packages/wp-slim/www/delete-slide-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/delete-slide-2.tcl,v
diff -u -r1.2 -r1.2.4.1
--- openacs-4/packages/wp-slim/www/delete-slide-2.tcl	4 Oct 2001 04:29:01 -0000	1.2
+++ openacs-4/packages/wp-slim/www/delete-slide-2.tcl	21 May 2003 15:31:02 -0000	1.2.4.1
@@ -12,7 +12,11 @@
     pres_item_id:naturalnum,notnull
 }
 
+#added permission checking  roc@
+set user_id [ad_verify_and_get_user_id]
+permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_delete_presentation
 
+
 db_exec_plsql delete_slide {
     begin
       wp_slide.delete(:slide_item_id);
Index: openacs-4/packages/wp-slim/www/delete-slide.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/delete-slide.adp,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/wp-slim/www/delete-slide.adp	6 Sep 2002 21:51:10 -0000	1.3
+++ openacs-4/packages/wp-slim/www/delete-slide.adp	21 May 2003 15:31:02 -0000	1.3.2.1
@@ -7,11 +7,10 @@
 Are you sure that you want to delete this slide?
 
 <ul>
-<li>Title:  as
-<li>Contents:
+<li>Title:  @slide_title@
 </ul>
 
 <input type=button value="Yes, delete the slide." onClick="location.href='delete-slide-2?pres_item_id=@pres_item_id@&slide_item_id=@slide_item_id@'">
 <input type=button value="No, I want to go back." onClick="location.href='presentation-top?pres_item_id=@pres_item_id@'">
 
-</p>
\ No newline at end of file
+</p>
Index: openacs-4/packages/wp-slim/www/delete-slide.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/delete-slide.tcl,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/wp-slim/www/delete-slide.tcl	6 Sep 2002 15:32:23 -0000	1.3
+++ openacs-4/packages/wp-slim/www/delete-slide.tcl	21 May 2003 15:31:02 -0000	1.3.2.1
@@ -10,9 +10,14 @@
 } {
     slide_item_id:naturalnum,notnull
     pres_item_id:naturalnum,notnull
+    slide_title
 }
 
 
+#added permission checking  roc@
+set user_id [ad_verify_and_get_user_id]
+permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_delete_presentation
+
 set context [list "Delete a Slide"]
 
 ad_return_template
Index: openacs-4/packages/wp-slim/www/edit-presentation-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/edit-presentation-2.tcl,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/wp-slim/www/edit-presentation-2.tcl	10 Sep 2002 22:23:30 -0000	1.5
+++ openacs-4/packages/wp-slim/www/edit-presentation-2.tcl	21 May 2003 15:31:02 -0000	1.5.2.1
@@ -17,7 +17,10 @@
 }
 
 
+#added permission checking  roc@
 set user_id [ad_verify_and_get_user_id]
+permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_edit_presentation
+
 set creation_ip [ad_conn peeraddr]
 
 db_exec_plsql update_wp_presentation {
Index: openacs-4/packages/wp-slim/www/edit-presentation-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/edit-presentation-oracle.xql,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/wp-slim/www/edit-presentation-oracle.xql	4 Oct 2001 04:23:13 -0000	1.1
+++ openacs-4/packages/wp-slim/www/edit-presentation-oracle.xql	21 May 2003 15:31:02 -0000	1.1.4.1
@@ -6,7 +6,7 @@
 <fullquery name="get_presentation_data">      
       <querytext>
       
-    select p.pres_title, p.page_signature, p.copyright_notice, p.public_p, p.show_modified_p, wp_presentation.get_audience(:pres_item_id) as audience, wp_presentation.get_background(:pres_item_id) as background
+    select p.pres_title, p.page_signature, p.copyright_notice, p.public_p, p.show_modified_p, wp_presentation.get_audience(:pres_item_id) as audience, wp_presentation.get_background(:pres_item_id) as background, style
     from cr_wp_presentations p, cr_items i
     where i.item_id = :pres_item_id
     and   i.live_revision = p.presentation_id
@@ -15,4 +15,5 @@
 </fullquery>
 
  
+
 </queryset>
Index: openacs-4/packages/wp-slim/www/edit-presentation-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/edit-presentation-postgresql.xql,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/wp-slim/www/edit-presentation-postgresql.xql	4 Oct 2001 04:23:13 -0000	1.1
+++ openacs-4/packages/wp-slim/www/edit-presentation-postgresql.xql	21 May 2003 15:31:02 -0000	1.1.4.1
@@ -6,7 +6,7 @@
 <fullquery name="get_presentation_data">      
       <querytext>
       
-    select p.pres_title, p.page_signature, p.copyright_notice, p.public_p, 
+    select p.pres_title, p.page_signature, p.copyright_notice, p.public_p, style,
 p.show_modified_p
     from cr_wp_presentations p, cr_items i
     where i.item_id = :pres_item_id
@@ -36,5 +36,4 @@
       </querytext>
 </fullquery>
 
- 
 </queryset>
Index: openacs-4/packages/wp-slim/www/edit-presentation.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/edit-presentation.adp,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/wp-slim/www/edit-presentation.adp	6 Sep 2002 21:51:10 -0000	1.3
+++ openacs-4/packages/wp-slim/www/edit-presentation.adp	21 May 2003 15:31:02 -0000	1.3.2.1
@@ -105,12 +105,7 @@
   </tr>
   <tr>
     <th nowrap align=right>Style:</th>
-    <td><select name=style>
-<option value=-1>Default (Plain)
-
-<option value="upload">I'll provide my own
-</select>
-    </td>
+    <td>@available_styles@
   </tr>
   <tr>
     <td></td><td>
Index: openacs-4/packages/wp-slim/www/edit-presentation.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/edit-presentation.tcl,v
diff -u -r1.4.2.1 -r1.4.2.2
--- openacs-4/packages/wp-slim/www/edit-presentation.tcl	24 Jan 2003 09:39:40 -0000	1.4.2.1
+++ openacs-4/packages/wp-slim/www/edit-presentation.tcl	21 May 2003 15:31:02 -0000	1.4.2.2
@@ -19,15 +19,15 @@
 }
 
 
+#added permission checking  roc@
+set user_id [ad_verify_and_get_user_id]
+permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_edit_presentation
+
 set header [ad_header "Edit Presentation"]
 
-db_1row get_presentation_data {
-    select p.pres_title, p.page_signature, p.copyright_notice, p.public_p, p.show_modified_p 
-    from cr_wp_presentations p, cr_items i
-    where i.item_id = :pres_item_id
-    and   i.live_revision = p.presentation_id
-}
+db_1row get_presentation_data { *SQL* }
 
+
 db_1row get_aud_data {
     select name as audience
     from cr_revisions, cr_items
@@ -53,4 +53,20 @@
 set audience [ad_quotehtml $audience]
 set background [ad_quotehtml $background]
 
+set items [db_list_of_lists wp_styles { *SQL* }]
+
+    set names [list]
+    set values [list]
+    foreach image $items {
+	lappend names [lindex $image 1]
+	lappend values [lindex $image 0]
+    }
+
+    lappend names "none" 
+    lappend values -1 
+
+    set available_styles "<select name=style>
+    [ad_generic_optionlist $names $values $style]</select>\n"
+
+
 ad_return_template
Index: openacs-4/packages/wp-slim/www/edit-presentation.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/edit-presentation.xql,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/wp-slim/www/edit-presentation.xql	15 Nov 2001 01:47:13 -0000	1.1
+++ openacs-4/packages/wp-slim/www/edit-presentation.xql	21 May 2003 15:31:03 -0000	1.1.4.1
@@ -35,5 +35,16 @@
       </querytext>
 </fullquery>
 
+<fullquery name="wp_styles">      
+      <querytext>
+
+    select style_id, (case when owner = :user_id then name || ' (yours)' else name end) as name
+    from wp_styles
+    where owner = :user_id
+    or public_p = 't'
+    order by name
+
+      </querytext>
+</fullquery>
  
 </queryset>
Index: openacs-4/packages/wp-slim/www/edit-slide-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/edit-slide-2.tcl,v
diff -u -r1.4.2.1 -r1.4.2.2
--- openacs-4/packages/wp-slim/www/edit-slide-2.tcl	21 Jan 2003 12:46:48 -0000	1.4.2.1
+++ openacs-4/packages/wp-slim/www/edit-slide-2.tcl	21 May 2003 15:31:03 -0000	1.4.2.2
@@ -24,12 +24,15 @@
 }
 
 
+#added permission checking  roc@
 set user_id [ad_verify_and_get_user_id]
+permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_edit_presentation
+
 set creation_ip [ad_conn peeraddr]
 
 # construct the list of bullet_items
 set bullet_items [list]
-for {set index 1} {$index < [expr $bullet_num + 1]} {incr index} {
+for {set index 1} {$index <= [expr $bullet_num + 1]} {incr index} {
     if {![empty_string_p $bullet($index)]} {
         lappend bullet_items $bullet($index)
     }
Index: openacs-4/packages/wp-slim/www/edit-slide.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/edit-slide.adp,v
diff -u -r1.3.2.1 -r1.3.2.2
--- openacs-4/packages/wp-slim/www/edit-slide.adp	21 Jan 2003 12:46:48 -0000	1.3.2.1
+++ openacs-4/packages/wp-slim/www/edit-slide.adp	21 May 2003 15:31:03 -0000	1.3.2.2
@@ -71,5 +71,3 @@
 </center>
 </form>
 
-
-
Index: openacs-4/packages/wp-slim/www/edit-slide.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/Attic/edit-slide.tcl,v
diff -u -r1.4.2.2 -r1.4.2.3
--- openacs-4/packages/wp-slim/www/edit-slide.tcl	24 Jan 2003 09:39:40 -0000	1.4.2.2
+++ openacs-4/packages/wp-slim/www/edit-slide.tcl	21 May 2003 15:31:03 -0000	1.4.2.3
@@ -21,8 +21,12 @@
 }
 
 
-set context [list "Edit Slide"]
+#added permission checking  roc@
+set user_id [ad_verify_and_get_user_id]
+permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_edit_presentation
 
+set context [list "presentation-top?[export_url_vars pres_item_id] {presentation}" {Edit Slide}]
+
 db_1row get_slide_info {
 select s.slide_title,
        s.sort_key,
@@ -63,6 +67,8 @@
 
 set bullet_num 0
 multirow create bullets item widget rows prev
+# up to 3 bullets now! roc@
+lappend bullet_items {} {}
 foreach item $bullet_items { 
     if {[string length $item] < 60} { 
         set rows 1 
@@ -74,7 +80,7 @@
     multirow append bullets $item $widget $rows $bullet_num
     incr bullet_num
 }
-incr bullet_num
+incr bullet_num 
 set bullet_max [expr $bullet_num + 1]
 
 # quote html tags contained in bullet items
Index: openacs-4/packages/wp-slim/www/index-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/index-oracle.xql,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/wp-slim/www/index-oracle.xql	13 Mar 2002 22:50:53 -0000	1.2
+++ openacs-4/packages/wp-slim/www/index-oracle.xql	21 May 2003 15:31:03 -0000	1.2.2.1
@@ -17,6 +17,7 @@
 	and   ao.creation_user = p.person_id
 	and   pres.public_p = 't'
 	and   ao.context_id = :package_id
+	$extra_where_clauses
     
       </querytext>
 </fullquery>
@@ -33,6 +34,7 @@
 	and   ao.object_id = i.item_id
 	and   ao.creation_user = :user_id
 	and   ao.context_id = :package_id
+        $extra_where_clauses
     
       </querytext>
 </fullquery>
@@ -52,8 +54,14 @@
 	and   ao.object_id = i.item_id
 	and   ao.creation_user <> :user_id
 	and   ao.creation_user = p.person_id
-	and   acs_permission.permission_p(i.item_id, :user_id, 'wp_view_presentation') = 't'
 	and   ao.context_id = :package_id
+	$extra_where_clauses
+	and exists (select 1
+        from acs_object_party_privilege_map m
+        where m.object_id = i.item_id
+        and m.party_id = :user_id
+        and m.privilege = 'wp_view_presentation')
+        $extra_where_clauses
     
       </querytext>
 </fullquery>
Index: openacs-4/packages/wp-slim/www/index-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/index-postgresql.xql,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/wp-slim/www/index-postgresql.xql	13 Mar 2002 22:50:53 -0000	1.2
+++ openacs-4/packages/wp-slim/www/index-postgresql.xql	21 May 2003 15:31:03 -0000	1.2.2.1
@@ -17,6 +17,7 @@
 	and   ao.creation_user = p.person_id
 	and   pres.public_p = 't'
 	and   ao.context_id = :package_id
+        $extra_where_clauses
     
       </querytext>
 </fullquery>
@@ -33,6 +34,7 @@
 	and   ao.object_id = i.item_id
 	and   ao.creation_user = :user_id
 	and   ao.context_id = :package_id
+        $extra_where_clauses
     
       </querytext>
 </fullquery>
@@ -41,22 +43,25 @@
 <fullquery name="get_all_visible_presentations">      
       <querytext>
        
-	select i.item_id as pres_item_id,
-	pres.pres_title,
-	to_char(ao.creation_date, 'Month DD, YYYY') as creation_date,
-	ao.creation_user,
-	p.first_names || ' ' || p.last_name as full_name,
+        select i.item_id as pres_item_id,
+        pres.pres_title,
+        to_char(ao.creation_date, 'Month DD, YYYY') as creation_date,
+        ao.creation_user,
+        p.first_names || ' ' || p.last_name as full_name,
 	acs_permission__permission_p(i.item_id, :user_id, 'wp_edit_presentation') as edit_p
-	from cr_items i, cr_wp_presentations pres, persons p, acs_objects ao
-	where i.live_revision = pres.presentation_id
-	and   ao.object_id = i.item_id
-	and   ao.creation_user <> :user_id
-	and   ao.creation_user = p.person_id
-	and   acs_permission__permission_p(i.item_id, :user_id, 'wp_view_presentation') = 't'
-	and   ao.context_id = :package_id
-    
+        from cr_items i, cr_wp_presentations pres, persons p, acs_objects ao
+        where i.live_revision = pres.presentation_id
+        and   ao.object_id = i.item_id
+        and   ao.creation_user <> :user_id
+        and   ao.creation_user = p.person_id
+        and   ao.context_id =  :package_id
+        $extra_where_clauses
+	and exists (select 1
+        from acs_object_party_privilege_map m
+        where m.object_id = i.item_id
+        and m.party_id = :user_id
+        and m.privilege = 'wp_view_presentation')
       </querytext>
 </fullquery>
-
  
 </queryset>
Index: openacs-4/packages/wp-slim/www/index-unregistered.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/index-unregistered.adp,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/wp-slim/www/index-unregistered.adp	6 Sep 2002 21:51:10 -0000	1.3
+++ openacs-4/packages/wp-slim/www/index-unregistered.adp	21 May 2003 15:31:03 -0000	1.3.2.1
@@ -2,6 +2,49 @@
 <property name="title">WimpyPoint</property>
 <property name="context"></property>
 
+<table border=0 width="100%">
+<tr><td align=left>
+[ 
+<if @show_age@ eq 7>
+<b>Last Week</b>
+</if>
+<else>
+<a href=index?show_age=7>Last Week</a>
+</else>
+| 
+<if @show_age@ eq 14>
+<b>Last Two Weeks</b>
+</if>
+<else>
+<a href=index?show_age=14>Last Two Weeks</a>
+</else>
+| 
+<if @show_age@ eq 20>
+<b>Last Month</b>
+</if>
+<else>
+<a href=index?show_age=30>Last Month</a>
+</else>
+| 
+<if @show_age@ eq 0>
+<b>All</b>
+</if>
+<else>
+<a href=index?show_age=0>All</a>
+</else>
+]
+</td>
+<td align=right>
+<h2>Options</h2>
+<ul>
+  <li>To create or edit presentations, please <a href="/register/?return_url=@return_url@">log in</a>
+  <li>Show a list of <a href="users">all WimpyPoint users.</a>       
+</ul>
+</td>
+</tr>
+</table>
+<br>
+
 <h2> Everyone's Presentations</h2>
 
 <ul>
@@ -10,8 +53,3 @@
 </multiple>
 </ul>
 
-<h2>Options</h2>
-<ul>
-  <li>To create or edit presentations, please <a href="/register/?return_url=@return_url@">log in</a>
-  <li>Show a list of <a href="users">all WimpyPoint users.</a>       
-</ul>
\ No newline at end of file
Index: openacs-4/packages/wp-slim/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/index.adp,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/wp-slim/www/index.adp	6 Sep 2002 21:51:10 -0000	1.4
+++ openacs-4/packages/wp-slim/www/index.adp	21 May 2003 15:31:03 -0000	1.4.2.1
@@ -2,29 +2,84 @@
 <property name="title">WimpyPoint</property>
 <property name="context">@context@</property>
 
+<table border=0 width="100%">
+<tr><td align=left>
+[ 
+<if @show_age@ eq 7>
+<b>Last Week</b>
+</if>
+<else>
+<a href=index?show_age=7&@show_user_value@>Last Week</a>
+</else>
+| 
+<if @show_age@ eq 14>
+<b>Last Two Weeks</b>
+</if>
+<else>
+<a href=index?show_age=14&@show_user_value@>Last Two Weeks</a>
+</else>
+| 
+<if @show_age@ eq 30>
+<b>Last Month</b>
+</if>
+<else>
+<a href=index?show_age=30&@show_user_value@>Last Month</a>
+</else>
+| 
+<if @show_age@ eq 0>
+<b>All</b>
+</if>
+<else>
+<a href=index?show_age=0&@show_user_value@>All</a>
+</else>
+]
+</td>
+
+
+<td align=right>
+[ 
+<if @show_user@ eq "yours">
+<b>Yours</b>
+| 
+<a href=index?show_user=all&@show_age_value@>Everyone's</a>
+</if>
+<else>
+<a href=index?show_user=yours&@show_age_value@>Yours</a>
+| 
+<b>Everyone's</b>
+</else>
+]
+</td>
+</tr>
+</table>
+
 <h2>My Presentations</h2>
 
 <ul>
 <multiple name=presentations>
-<li><a href="display/@presentations.pres_item_id@/">@presentations.pres_title@</a> created on @presentations.creation_date@ [ <a href="presentation-top?pres_item_id=@presentations.pres_item_id@">edit</a> ]
-</multiple>
+<li><a href="display/@presentations.pres_item_id@/">@presentations.pres_title@</a> created on @presentations.creation_date@ [ <a href="presentation-top?pres_item_id=@presentations.pres_item_id@">edit</a> ] [<a href="presentation-print-view.tcl?item_id=@presentations.pres_item_id@">print view </a>]
+</multiple>      
 </ul>
 
 
+<h2>Options</h2>
+<ul>
+  <li><a href="create-presentation">Create a new presentation.</a>
+  <li><a href="style-list">Edit your styles.</a>
+  <li>Show a list of <a href="users">all WimpyPoint users.</a>       
+</ul>
+
+
+<if @show_user@ eq "all">
 <h2> Everyone's Presentations</h2>
 
 <ul>
 <multiple name=allpresentations>
 <li><a href="display/@allpresentations.pres_item_id@/">@allpresentations.pres_title@</a> created by <a href="/shared/community-member?user_id=@allpresentations.creation_user@">@allpresentations.full_name@</a> on @allpresentations.creation_date@ 
-<if @allpresentations.edit_p@ eq t>
-[ <a href="presentation-top?pres_item_id=@allpresentations.pres_item_id@">edit</a> ]
+<if @allpresentations.edit_p@ eq "t">
+[ <a href="presentation-top?pres_item_id=@allpresentations.pres_item_id@">edit</a> ] [<a href="presentation-print-view.tcl?item_id=@allpresentations.pres_item_id@">print view </a>]
 </if>
 </multiple>
 </ul>
+</if>
 
-
-<h2>Options</h2>
-<ul>
-  <li><a href="create-presentation">Create a new presentation.</a>
-  <li>Show a list of <a href="users">all WimpyPoint users.</a>       
-</ul>
\ No newline at end of file
Index: openacs-4/packages/wp-slim/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/index.tcl,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/wp-slim/www/index.tcl	6 Sep 2002 15:32:23 -0000	1.4
+++ openacs-4/packages/wp-slim/www/index.tcl	21 May 2003 15:31:03 -0000	1.4.2.1
@@ -5,10 +5,13 @@
     and give you some options...like creating a new presentation or
     editing an old one.
     
-    @author Paul Konigsberg (paul@arsdigita.com)
+    @author Rocael Hernandez (roc@viaro.net) openacs package owner
+    @author Paul Konigsberg (paul@arsdigita.com, original)
     @creation-date Wed Nov  8 17:33:21 2000
     @cvs-id $Id$
 } {
+    {show_age:integer "14"}
+    {show_user "yours"}
 }
 
 set package_id [ad_conn package_id]
@@ -17,47 +20,26 @@
 
 set user_id [ad_verify_and_get_user_id]
 
+set show_user_value "show_user=$show_user"
+set show_age_value "show_age=$show_age"
+
+if {$show_age != 0} {
+    if {[db_type] == "oracle"} { set date sysdate } else { set date "now()" }
+    set extra_where_clauses "and ao.creation_date >= ($date - $show_age)"
+} else {
+    set extra_where_clauses ""
+}
+
 if {$user_id == 0} {
-    db_multirow allpresentations get_all_public_presentations { 
-	select i.item_id as pres_item_id,
-	pres.pres_title,
-	to_char(ao.creation_date, 'Month DD, YYYY') as creation_date,
-	ao.creation_user,
-	p.first_names || ' ' || p.last_name as full_name
-	from cr_items i, cr_wp_presentations pres, persons p, acs_objects ao
-	where i.live_revision = pres.presentation_id
-	and   ao.object_id = i.item_id
-	and   ao.creation_user = p.person_id
-	and   pres.public_p = 't'
-    }
+    db_multirow allpresentations get_all_public_presentations { *SQL* }
     
     set return_url [ns_urlencode [ad_conn url]]
     ad_return_template index-unregistered
 } else {
-    db_multirow presentations get_my_presentations { 
-	select i.item_id as pres_item_id,
-	p.pres_title,
-	to_char(ao.creation_date, 'Month DD, YYYY') as creation_date
-	from cr_items i, cr_wp_presentations p, acs_objects ao
-	where i.live_revision = p.presentation_id
-	and   ao.object_id = i.item_id
-	and   ao.creation_user = :user_id
-    }
+    db_multirow presentations get_my_presentations { *SQL* }
 
-    db_multirow allpresentations get_all_visible_presentations { 
-	select i.item_id as pres_item_id,
-	pres.pres_title,
-	to_char(ao.creation_date, 'Month DD, YYYY') as creation_date,
-	ao.creation_user,
-	p.first_names || ' ' || p.last_name as full_name,
-	acs_permission.permission_p(i.item_id, :user_id, 'wp_edit_presentation') as edit_p
-	from cr_items i, cr_wp_presentations pres, persons p, acs_objects ao
-	where i.live_revision = pres.presentation_id
-	and   ao.object_id = i.item_id
-	and   ao.creation_user <> :user_id
-	and   ao.creation_user = p.person_id
-	and   acs_permission.permission_p(i.item_id, :user_id,
-'wp_view_presentation') = 'f'
+    if {$show_user == "all"} {
+	db_multirow allpresentations get_all_visible_presentations { *SQL* }
     }
 
     ad_return_template index
Index: openacs-4/packages/wp-slim/www/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/index.vuh,v
diff -u -r1.2 -r1.2.4.1
--- openacs-4/packages/wp-slim/www/index.vuh	31 Oct 2001 20:42:07 -0000	1.2
+++ openacs-4/packages/wp-slim/www/index.vuh	21 May 2003 15:31:03 -0000	1.2.4.1
@@ -51,6 +51,11 @@
     global ad_conn
     set ad_conn(file) "$file_path/get-binary-data.tcl"
     adp_parse_ad_conn_file 
+} elseif {[regexp {^styles/(default|[0-9]+)/(.*)} $url match style_id file_name]} {
+    # Serve a specific attachment
+    global ad_conn
+    set ad_conn(file) "$file_path/serve-style.tcl"
+    adp_parse_ad_conn_file 
 } else {
     # Didn't understand the URL.
     ns_log notice "## Wimpy Point: Sorry I could not resolve the URL you requested: $url"
Index: openacs-4/packages/wp-slim/www/presentation-acl.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-acl.tcl,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/wp-slim/www/presentation-acl.tcl	6 Sep 2002 15:32:23 -0000	1.2
+++ openacs-4/packages/wp-slim/www/presentation-acl.tcl	21 May 2003 15:31:03 -0000	1.2.2.1
@@ -16,20 +16,10 @@
     pres_item_id
 }
 
-ad_require_permission $pres_item_id wp_admin_presentation
+set user_id [ad_verify_and_get_user_id]
+permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_admin_presentation
 
-set user_id [ad_maybe_redirect_for_registration]
-#wp_check_authorization $pres_item_id $user_id "write"
 
-#db_1row pres_select {
-#select  title,
-#	creation_user,
-#	public_p,
-#	group_id
-#from wp_presentations
-#where pres_item_id = :pres_item_id
-#}
-
 db_1row get_presentaiton {
 select p.pres_title as title,
        p.public_p,
@@ -90,4 +80,4 @@
 
 db_release_unused_handles
 
-ad_return_template
\ No newline at end of file
+ad_return_template
Index: openacs-4/packages/wp-slim/www/presentation-print-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-print-view.adp,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/wp-slim/www/presentation-print-view.adp	21 Sep 2002 17:09:10 -0000	1.1
+++ openacs-4/packages/wp-slim/www/presentation-print-view.adp	21 May 2003 15:31:03 -0000	1.1.2.1
@@ -1,5 +1,6 @@
 <master>
 <property name="title">@pres_title@</property>
+<property name="context">@context@</property>
 
 <h2>@pres_title@</h2>
 a Wimpy Point Presentation owned by <a href="/shared/community-member?user_id=@owner_id@">@owner_name@</a>
Index: openacs-4/packages/wp-slim/www/presentation-print-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-print-view.tcl,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/wp-slim/www/presentation-print-view.tcl	21 Sep 2002 17:09:10 -0000	1.1
+++ openacs-4/packages/wp-slim/www/presentation-print-view.tcl	21 May 2003 15:31:03 -0000	1.1.2.1
@@ -2,7 +2,8 @@
 ad_page_contract {
 This  generates a printer friendly view of a presentation, suitable for print-out thru' a browser.
     @author Samir Joshi(samir@symphinity.com)
-    @creation-date Thu 8 Aug 2002
+    @author Rocael HR (roc@viaro.net)
+    @creation-date Thu 1 Apr 2003
 
 } {
    item_id:naturalnum,notnull
@@ -18,7 +19,11 @@
     owner_name:onevalue
     owner_id : onevalue
 }
+
+set context [list "Print View"]
 set user_id [ad_verify_and_get_user_id]
+## permission checking roc@
+permission::require_permission -party_id $user_id -object_id $item_id -privilege wp_view_presentation
 
 set subsite_name [ad_conn package_url]
 regexp {^(.+)/$} $subsite_name match subsite_name
Index: openacs-4/packages/wp-slim/www/presentation-print-view.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-print-view.xql,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/wp-slim/www/presentation-print-view.xql	21 Sep 2002 17:09:10 -0000	1.1
+++ openacs-4/packages/wp-slim/www/presentation-print-view.xql	21 May 2003 15:31:03 -0000	1.1.2.1
@@ -51,18 +51,4 @@
   </querytext>
 </fullquery>
 
-<fullquery name="get_slide_info">      
-  <querytext>
-    select s.slide_title as title ,
-     	i.item_id as slide_id ,
-	s.sort_key,wp_slide__get_preamble(i.item_id) as preamble,
-    	wp_slide__get_postamble(i.item_id) as postamble,
-    	wp_slide__get_bullet_items(i.item_id) as bullet_list
-    from cr_wp_slides s, cr_items i
-    where i.parent_id = :pres_item_id
-   	and   i.live_revision = s.slide_id
-    order by s.sort_key
-  </querytext>
-</fullquery>
-
 </queryset>
Index: openacs-4/packages/wp-slim/www/presentation-revisions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-revisions.tcl,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/wp-slim/www/presentation-revisions.tcl	6 Sep 2002 15:32:23 -0000	1.3
+++ openacs-4/packages/wp-slim/www/presentation-revisions.tcl	21 May 2003 15:31:03 -0000	1.3.2.1
@@ -14,7 +14,12 @@
     
 }
 
+#added permission checking  roc@
+set user_id [ad_verify_and_get_user_id]
+permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_edit_presentation
 
+
+
 db_multirow revisions revisions_get {
     select r.revision_id,
            to_char(ao.creation_date, 'HH24:MI:SS Mon DD, YYYY') as creation_date,
Index: openacs-4/packages/wp-slim/www/presentation-top-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-top-oracle.xql,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/wp-slim/www/presentation-top-oracle.xql	4 Oct 2001 04:23:13 -0000	1.1
+++ openacs-4/packages/wp-slim/www/presentation-top-oracle.xql	21 May 2003 15:31:03 -0000	1.1.4.1
@@ -3,14 +3,16 @@
 <queryset>
    <rdbms><type>oracle</type><version>8.1.6</version></rdbms>
 
-<fullquery name="get_presentaiton">      
+<fullquery name="get_presentation">      
       <querytext>
       
 select p.public_p,
        p.pres_title as presentation_title,
        acs_permission.permission_p(:pres_item_id, :user_id, 'wp_admin_presentation') as admin_p,
        acs_permission.permission_p(:pres_item_id, :user_id, 'wp_delete_presentation') as delete_p,
-       ao.creation_user
+       ao.creation_user,
+       p.show_comments_p,
+       p.presentation_id
 from cr_wp_presentations p,
      cr_items i,
      acs_objects ao
@@ -21,19 +23,23 @@
       </querytext>
 </fullquery>
 
- 
-<fullquery name="get_viewers">      
+
+<fullquery name="get_users">      
       <querytext>
       
-    select first_names || ' ' || last_name as full_name,
-           person_id,
-           acs_permission.permission_p(:pres_item_id, person_id, 'wp_view_presentation') as view_p,
-           acs_permission.permission_p(:pres_item_id, person_id, 'wp_edit_presentation') as edit_p,
-           acs_permission.permission_p(:pres_item_id, person_id, 'wp_admin_presentation') as admin_p
-    from persons
-    where acs_permission.permission_p(:pres_item_id, person_id, 'wp_view_presentation') = 't'
-    or    acs_permission.permission_p(:pres_item_id, person_id, 'wp_edit_presentation') = 't'
-    or    acs_permission.permission_p(:pres_item_id, person_id, 'wp_admin_presentation') = 't'
+    select distinct (p.person_id),
+           p.first_names || ' ' || p.last_name as full_name,
+           perm.privilege
+    from persons p,
+         acs_permissions perm
+    where perm.object_id = :pres_item_id
+    and   perm.grantee_id = p.person_id
+    and
+    (perm.privilege = 'wp_view_presentation'
+     or perm.privilege = 'wp_edit_presentation'
+     or perm.privilege = 'wp_admin_presentation'
+    )
+    order by p.person_id, perm.privilege ASC
 
       </querytext>
 </fullquery>
Index: openacs-4/packages/wp-slim/www/presentation-top-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-top-postgresql.xql,v
diff -u -r1.1.4.1 -r1.1.4.2
--- openacs-4/packages/wp-slim/www/presentation-top-postgresql.xql	21 Jan 2003 12:39:09 -0000	1.1.4.1
+++ openacs-4/packages/wp-slim/www/presentation-top-postgresql.xql	21 May 2003 15:31:03 -0000	1.1.4.2
@@ -3,14 +3,16 @@
 <queryset>
    <rdbms><type>postgresql</type><version>7.1</version></rdbms>
 
-<fullquery name="get_presentaiton">      
+<fullquery name="get_presentation">      
       <querytext>
       
 select p.public_p,
        p.pres_title as presentation_title,
        acs_permission__permission_p(:pres_item_id, :user_id, 'wp_admin_presentation') as admin_p,
        acs_permission__permission_p(:pres_item_id, :user_id, 'wp_delete_presentation') as delete_p,
-       ao.creation_user
+       ao.creation_user,
+       p.show_comments_p,
+       p.presentation_id
 from cr_wp_presentations p,
      cr_items i,
      acs_objects ao
@@ -21,19 +23,23 @@
       </querytext>
 </fullquery>
 
- 
-<fullquery name="get_viewers">      
+
+<fullquery name="get_users">      
       <querytext>
       
-    select first_names || ' ' || last_name as full_name,
-           person_id,
-           acs_permission__permission_p(:pres_item_id, person_id, 'wp_view_presentation') as view_p,
-           acs_permission__permission_p(:pres_item_id, person_id, 'wp_edit_presentation') as edit_p,
-           acs_permission__permission_p(:pres_item_id, person_id, 'wp_admin_presentation') as admin_p
-    from persons
-    where acs_permission__permission_p(:pres_item_id, person_id, 'wp_view_presentation') = 't'
-    or    acs_permission__permission_p(:pres_item_id, person_id, 'wp_edit_presentation') = 't'
-    or    acs_permission__permission_p(:pres_item_id, person_id, 'wp_admin_presentation') = 't'
+    select distinct on (p.person_id) p.person_id,
+           p.first_names || ' ' || p.last_name as full_name,
+           perm.privilege
+    from persons p,
+         acs_permissions perm
+    where perm.object_id = :pres_item_id
+    and   perm.grantee_id = p.person_id
+    and
+    (perm.privilege = 'wp_view_presentation'
+     or perm.privilege = 'wp_edit_presentation'
+     or perm.privilege = 'wp_admin_presentation'
+    )
+    order by p.person_id, perm.privilege ASC
 
       </querytext>
 </fullquery>
Index: openacs-4/packages/wp-slim/www/presentation-top.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-top.adp,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/wp-slim/www/presentation-top.adp	6 Sep 2002 21:51:10 -0000	1.4
+++ openacs-4/packages/wp-slim/www/presentation-top.adp	21 May 2003 15:31:03 -0000	1.4.2.1
@@ -3,7 +3,6 @@
 <property name="context">@context@</property>
 
 <h3>The Slides</h3>
-
    <if  @slides:rowcount@ eq 0>
           <a href="create-slide?sort_key=1&pres_item_id=@pres_item_id@">Create the first slide.</a>
    </if>
@@ -16,7 +15,7 @@
      <td>
 [ <a href="edit-slide?slide_item_id=@slides.slide_item_id@&pres_item_id=@pres_item_id@">edit</a> |
 <if @delete_p@ eq t>
-  <a href="delete-slide?slide_item_id=@slides.slide_item_id@&pres_item_id=@pres_item_id@">delete</a> |
+  <a href="delete-slide?slide_item_id=@slides.slide_item_id@&pres_item_id=@pres_item_id@&slide_title=@slides.slide_title@">delete</a> |
 </if>
 <a href="attach-list?slide_item_id=@slides.slide_item_id@&pres_item_id=@pres_item_id@">attach</a> |
 <a href="slide-revisions?slide_item_id=@slides.slide_item_id@&pres_item_id=@pres_item_id@">view revisions</a>]
@@ -37,6 +36,7 @@
 <h3>Options</h3>
 <ul>
 <li> <a href="display/@pres_item_id@/">Show presentation.</a>
+<li> <a href="presentation-print-view.tcl?item_id=@pres_item_id@">Printer friendly view. </a>
 <li> <a href="edit-presentation?pres_item_id=@pres_item_id@">Edit presentation properties.</a>
 <if @delete_p@ eq t>
   <li> <a href="delete-presentation?pres_item_id=@pres_item_id@&title=@encoded_title@">Delete this presentation.</a>
@@ -49,28 +49,33 @@
 <if @public_p@ eq t>
   <li> Everyone can view the presentation, since it is public.
 </if>
-<multiple name="viewers">
-  <li><a href="/shared/community-member?user_id=@viewers.person_id@">@viewers.full_name@</a>
-  <if @viewers.person_id@ eq @creation_user@>
+<multiple name="users">
+  <li><a href="/shared/community-member?user_id=@users.person_id@">@users.full_name@</a>
+  <if @users.person_id@ eq @creation_user@>
     (creator)
   </if>
-  <if @viewers.person_id@ eq @user_id@>
+  <if @users.person_id@ eq @user_id@>
     (You)
   </if>
-  [
-  <if @viewers.view_p@ eq t>
-    read &nbsp;
+  <if @users.privilege@ eq "wp_admin_presentation">
+  [ admin ]
   </if>
-  <if @viewers.edit_p@ eq t>
-    write &nbsp;
-  </if>
-  <if @viewers.admin_p@ eq t>
-    admin &nbsp;
-  </if>
-  ]
+  <elseif @users.privilege@ eq "wp_edit_presentation">
+  [ editor ]
+  </elseif>
+  <else>
+  [ viewer ]
+  </else>
 </multiple>
+
 <if @admin_p@ eq t>
   <li><a href="presentation-acl?pres_item_id=@pres_item_id@">Change people who can view/edit this presentation</a>
+<if @show_comments_p@ eq "t">
+  <li>All viewers can see the comments (<a href=toggle-comments-view?pres_item_id=@pres_item_id@&presentation_id=@presentation_id@&view=f>make available only for editors</a>)
+	</if>
+<else>
+  <li>Editors can see the comments (<a href=toggle-comments-view?pres_item_id=@pres_item_id@&presentation_id=@presentation_id@&view=t>make available to all viewers</a>)
+</else>
 </if>
 </ul>
 
Index: openacs-4/packages/wp-slim/www/presentation-top.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-top.tcl,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/wp-slim/www/presentation-top.tcl	6 Sep 2002 15:32:23 -0000	1.4
+++ openacs-4/packages/wp-slim/www/presentation-top.tcl	21 May 2003 15:31:03 -0000	1.4.2.1
@@ -22,22 +22,13 @@
 }
 
 
+#added permission checking  roc@
 set user_id [ad_verify_and_get_user_id]
+permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_edit_presentation
 
-db_1row get_presentaiton {
-select p.public_p,
-       p.pres_title as presentation_title,
-       acs_permission.permission_p(:pres_item_id, :user_id, 'wp_admin_presentation') as admin_p,
-       acs_permission.permission_p(:pres_item_id, :user_id, 'wp_delete_presentation') as delete_p,
-       ao.creation_user
-from cr_wp_presentations p,
-     cr_items i,
-     acs_objects ao
-where i.item_id = :pres_item_id
-and   i.live_revision = p.presentation_id
-and   ao.object_id = :pres_item_id
-}
 
+db_1row get_presentation { *SQL* }
+
 set encoded_title [ns_urlencode $presentation_title]
 set context [list "$presentation_title"]
 set subsite_name [ad_conn package_url]
@@ -51,18 +42,17 @@
 order by s.sort_key
 }
 
-db_multirow viewers get_viewers {
-    select first_names || ' ' || last_name as full_name,
-           person_id,
-           acs_permission.permission_p(:pres_item_id, person_id, 'wp_view_presentation') as view_p,
-           acs_permission.permission_p(:pres_item_id, person_id, 'wp_edit_presentation') as edit_p,
-           acs_permission.permission_p(:pres_item_id, person_id, 'wp_admin_presentation') as admin_p
-    from persons
-    where acs_permission.permission_p(:pres_item_id, person_id, 'wp_view_presentation') = 't'
-    or    acs_permission.permission_p(:pres_item_id, person_id, 'wp_edit_presentation') = 't'
-    or    acs_permission.permission_p(:pres_item_id, person_id, 'wp_admin_presentation') = 't'
+#lets not show duplicate users for this
+#the oracle select distinct (p.person_id) doesn't work? so lets verify it in the db_multirow, in PG works fine =) roc@
+set users_list [list]
+db_multirow users get_users {} {
+    if {[lsearch $users_list $person_id] != -1} {
+	continue
+    } 
+    lappend users_list $person_id
 }
 
+
 #set public_p [db_string get_permissions {
 #select decode(count(1),1,'The Public','')
 #from acs_permissions
Index: openacs-4/packages/wp-slim/www/presentation-top.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/presentation-top.xql,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/wp-slim/www/presentation-top.xql	4 Oct 2001 04:29:01 -0000	1.1
+++ openacs-4/packages/wp-slim/www/presentation-top.xql	21 May 2003 15:31:03 -0000	1.1.4.1
@@ -14,5 +14,5 @@
       </querytext>
 </fullquery>
 
- 
+
 </queryset>
Index: openacs-4/packages/wp-slim/www/serve-presentation-revision-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-presentation-revision-oracle.xql,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/wp-slim/www/serve-presentation-revision-oracle.xql	4 Oct 2001 04:23:13 -0000	1.1
+++ openacs-4/packages/wp-slim/www/serve-presentation-revision-oracle.xql	21 May 2003 15:31:03 -0000	1.1.4.1
@@ -12,7 +12,8 @@
            p.public_p,
            p.show_modified_p, 
            wp_presentation.get_audience_revision(:pres_revision_id) as audience,
-           wp_presentation.get_background_revision(:pres_revision_id) as background
+           wp_presentation.get_background_revision(:pres_revision_id) as background,
+	   p.style
     from cr_wp_presentations p, cr_items i
     where i.item_id = :pres_item_id
     and   p.presentation_id = :pres_revision_id
Index: openacs-4/packages/wp-slim/www/serve-presentation-revision-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-presentation-revision-postgresql.xql,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/wp-slim/www/serve-presentation-revision-postgresql.xql	4 Oct 2001 04:23:13 -0000	1.1
+++ openacs-4/packages/wp-slim/www/serve-presentation-revision-postgresql.xql	21 May 2003 15:31:03 -0000	1.1.4.1
@@ -10,7 +10,8 @@
            p.page_signature,
            p.copyright_notice,
            p.public_p,
-           p.show_modified_p 
+           p.show_modified_p,
+	   p.style
     from cr_wp_presentations p, cr_items i
     where i.item_id = :pres_item_id
     and   p.presentation_id = :pres_revision_id
Index: openacs-4/packages/wp-slim/www/serve-presentation-revision.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-presentation-revision.adp,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/wp-slim/www/serve-presentation-revision.adp	6 Sep 2002 21:51:10 -0000	1.5
+++ openacs-4/packages/wp-slim/www/serve-presentation-revision.adp	21 May 2003 15:31:03 -0000	1.5.2.1
@@ -1,6 +1,9 @@
-<master>
+<master src="wp-presentation-master">
 <property name="title">@pres_title@</property>
 <property name="context">@context@</property>
+<property name="style_id">@style@</property>
+<property name="page_signature">@page_signature@</property>
+<property name="copyright_notice">@copyright_notice@</property>
 
 <h3>One Revision</h3>
 
Index: openacs-4/packages/wp-slim/www/serve-presentation-revision.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-presentation-revision.tcl,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/wp-slim/www/serve-presentation-revision.tcl	6 Sep 2002 15:32:23 -0000	1.4
+++ openacs-4/packages/wp-slim/www/serve-presentation-revision.tcl	21 May 2003 15:31:03 -0000	1.4.2.1
@@ -25,6 +25,10 @@
     ad_return_error "Wimpy Point" "Could not get a pres_item_id and a pres_revision_id out of url=$url"
 }
 
+#added permission checking  roc@
+set user_id [ad_verify_and_get_user_id]
+permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_view_presentation
+
 set subsite_name [ad_conn package_url]
 regexp {^(.+)/$} $subsite_name match subsite_name
 
Index: openacs-4/packages/wp-slim/www/serve-presentation-revision.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-presentation-revision.xql,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/wp-slim/www/serve-presentation-revision.xql	15 Nov 2001 01:47:13 -0000	1.1
+++ openacs-4/packages/wp-slim/www/serve-presentation-revision.xql	21 May 2003 15:31:03 -0000	1.1.4.1
@@ -6,9 +6,9 @@
       <querytext>
     select p.pres_title,
            p.page_signature,
-           p.copyright_notice,
            p.public_p,
-           p.show_modified_p 
+           p.show_modified_p ,
+	   p.copyright_notice
     from cr_wp_presentations p, cr_items i
     where i.item_id = :pres_item_id
     and   p.presentation_id = :pres_revision_id
Index: openacs-4/packages/wp-slim/www/serve-presentation.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-presentation.adp,v
diff -u -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/wp-slim/www/serve-presentation.adp	27 Jan 2003 11:39:27 -0000	1.5.2.1
+++ openacs-4/packages/wp-slim/www/serve-presentation.adp	21 May 2003 15:31:03 -0000	1.5.2.2
@@ -1,19 +1,30 @@
 <master src="wp-presentation-master">
 <property name="title">@pres_title@</property>
 <property name="context">"one presentation"</property>
+<property name="style_id">@style@</property>
+<property name="page_signature">@page_signature@</property>
+<property name="copyright_notice">@copyright_notice@</property>
 
 <table align=right>
 <tr>
-   <td><a href="@subsite_name@">done</a> | 
+   <td><a href="@subsite_name@">done</a> 
    <if @first_slide_item_id@ not nil>
-   <a href="@subsite_name@/display/@pres_item_id@/@first_slide_item_id@.wimpy">next</a>
+   |  <a href="@subsite_name@/display/@pres_item_id@/@first_slide_item_id@.wimpy">next</a>
    </if>
    </td>
 </tr>
 </table>
        
 <h2>@pres_title@</h2>
 a Wimpy Point Presentation owned by <a href="/shared/community-member?user_id=@owner_id@">@owner_name@</a>
+<if @collaborators:rowcount@ gt 0>
+<br> in collaboration with 
+<multiple name="collaborators">
+<a href="/shared/community-member?user_id=@collaborators.person_id@">@collaborators.full_name@</a>
+<if @collaborators.rownum@ lt @collaborators:rowcount@>,&nbsp;</if>
+</multiple>
+</if>
+.
 <hr>
 
 <ul>
@@ -22,6 +33,3 @@
 </multiple>
 </ul>
 
-<p>Here is a <a href="@subsite_name@/presentation-print-view.tcl?item_id=@pres_item_id@">printer-friendly</a> version of the presentation.
-  <br>
-@page_signature@
Index: openacs-4/packages/wp-slim/www/serve-presentation.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-presentation.tcl,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/wp-slim/www/serve-presentation.tcl	21 Sep 2002 17:09:10 -0000	1.3
+++ openacs-4/packages/wp-slim/www/serve-presentation.tcl	21 May 2003 15:31:03 -0000	1.3.2.1
@@ -24,6 +24,9 @@
     ad_return_error "Wimpy Point" "Could not get a pres_item_id and slide_item_id out of url=$url"
 }
 
+#added permission checking  roc@
+set user_id [ad_verify_and_get_user_id]
+permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_view_presentation
 
 set subsite_name [ad_conn package_url]
 regexp {^(.+)/$} $subsite_name match subsite_name
@@ -37,12 +40,7 @@
     and   exists (select 1 from cr_wp_slides s where s.slide_id=cr_items.live_revision and s.sort_key=1)
 }
 
-db_1row get_presentation_info {
-    select p.pres_title, p.page_signature
-    from cr_wp_presentations p, cr_items i
-    where i.item_id = :pres_item_id
-    and   i.live_revision = p.presentation_id
-}
+db_1row get_presentation_info { *SQL* }
 
 db_1row get_owner_name {
     select first_names || ' ' || last_name as owner_name, person_id as owner_id
@@ -59,4 +57,13 @@
 order by s.sort_key
 "
 
+set users_list [list]
+db_multirow collaborators get_collaborators { *SQL* } {
+    if {[lsearch $users_list $person_id] != -1} {
+	continue
+    } 
+    lappend users_list $person_id
+}
+
+
 ad_return_template
Index: openacs-4/packages/wp-slim/www/serve-presentation.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-presentation.xql,v
diff -u -r1.1 -r1.1.4.1
--- openacs-4/packages/wp-slim/www/serve-presentation.xql	4 Oct 2001 04:29:01 -0000	1.1
+++ openacs-4/packages/wp-slim/www/serve-presentation.xql	21 May 2003 15:31:03 -0000	1.1.4.1
@@ -17,7 +17,7 @@
 <fullquery name="get_presentation_info">      
       <querytext>
       
-    select p.pres_title, p.page_signature
+    select p.pres_title, p.page_signature, p.style, p.copyright_notice
     from cr_wp_presentations p, cr_items i
     where i.item_id = :pres_item_id
     and   i.live_revision = p.presentation_id
@@ -50,5 +50,26 @@
       </querytext>
 </fullquery>
 
+
+<fullquery name="get_collaborators">      
+      <querytext>
+      
+    select p.person_id,
+           p.first_names || ' ' || p.last_name as full_name,
+           perm.privilege
+    from persons p,
+         acs_permissions perm
+    where perm.object_id = :pres_item_id
+    and   perm.grantee_id <> :owner_id
+    and   perm.grantee_id = p.person_id
+    and
+    ( perm.privilege = 'wp_edit_presentation'
+     or perm.privilege = 'wp_admin_presentation'
+    ) 
+    order by p.person_id, perm.privilege ASC
+
+
+      </querytext>
+</fullquery>
  
 </queryset>
Index: openacs-4/packages/wp-slim/www/serve-slide-revision.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-slide-revision.adp,v
diff -u -r1.4 -r1.4.2.1
--- openacs-4/packages/wp-slim/www/serve-slide-revision.adp	6 Sep 2002 21:51:10 -0000	1.4
+++ openacs-4/packages/wp-slim/www/serve-slide-revision.adp	21 May 2003 15:31:03 -0000	1.4.2.1
@@ -1,6 +1,9 @@
-<master>
+<master src="wp-presentation-master">
 <property name="title">@slide_title@</property>
 <property name="context">@context@</property>
+<property name="style_id">@style@</property>
+<property name="page_signature">@page_signature@</property>
+<property name="copyright_notice">@copyright_notice@</property>
 
 <if @show_modified_p@ eq t>
 <i>Last modified @modified_date@</i>
@@ -84,4 +87,4 @@
 </multiple>
 
 
-@page_signature@
\ No newline at end of file
+@page_signature@
Index: openacs-4/packages/wp-slim/www/serve-slide-revision.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-slide-revision.tcl,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/wp-slim/www/serve-slide-revision.tcl	6 Sep 2002 15:32:23 -0000	1.3
+++ openacs-4/packages/wp-slim/www/serve-slide-revision.tcl	21 May 2003 15:31:03 -0000	1.3.2.1
@@ -31,6 +31,9 @@
     ad_return_error "Wimpy Point" "Could not get a pres_item_id, slide_item_id and slide_revision_id out of url=$url"
 }
 
+#added permission checking  roc@
+set user_id [ad_verify_and_get_user_id]
+permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_view_presentation
 
 set subsite_name [ad_conn package_url]
 regexp {^(.+)/$} $subsite_name match subsite_name
Index: openacs-4/packages/wp-slim/www/serve-slide-revision.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-slide-revision.xql,v
diff -u -r1.2 -r1.2.4.1
--- openacs-4/packages/wp-slim/www/serve-slide-revision.xql	15 Nov 2001 01:47:13 -0000	1.2
+++ openacs-4/packages/wp-slim/www/serve-slide-revision.xql	21 May 2003 15:31:03 -0000	1.2.4.1
@@ -5,7 +5,9 @@
       <querytext>
       
     select p.page_signature,
-    p.show_modified_p
+    p.copyright_notice,    
+    p.show_modified_p,
+    p.style
     from cr_wp_presentations p, cr_items i
     where i.item_id = :pres_item_id
     and   i.live_revision = p.presentation_id
Index: openacs-4/packages/wp-slim/www/serve-slide.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-slide.adp,v
diff -u -r1.6.2.1 -r1.6.2.2
--- openacs-4/packages/wp-slim/www/serve-slide.adp	27 Jan 2003 11:39:27 -0000	1.6.2.1
+++ openacs-4/packages/wp-slim/www/serve-slide.adp	21 May 2003 15:31:03 -0000	1.6.2.2
@@ -1,6 +1,9 @@
 <master src="wp-presentation-master">
 <property name="title">@slide_title@</property>
 <property name="context">@context@</property>
+<property name="style_id">@style@</property>
+<property name="page_signature">@page_signature@</property>
+<property name="copyright_notice">@copyright_notice@</property>
 
 <table align=right>
 <tr>
@@ -94,3 +97,23 @@
 
 @page_signature@
 
+<if @edit_p@ eq 1 or @show_comments_p@ eq "t">
+
+<if @comments@ ne "">
+<h3>Slide Comments</h3>
+@comments@
+</if>
+
+</if>
+
+
+<if @edit_p@ eq 1>
+
+<if @comment_link@ ne "">
+<ul>
+<li>
+@comment_link@
+</ul>
+</if>
+
+</if>
Index: openacs-4/packages/wp-slim/www/serve-slide.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-slide.tcl,v
diff -u -r1.5 -r1.5.2.1
--- openacs-4/packages/wp-slim/www/serve-slide.tcl	6 Sep 2002 15:32:23 -0000	1.5
+++ openacs-4/packages/wp-slim/www/serve-slide.tcl	21 May 2003 15:31:03 -0000	1.5.2.1
@@ -29,7 +29,19 @@
     ad_return_error "Wimpy Point" "Could not get a pres_item_id and slide_item_id out of url=$url"
 }
 
+#added permission checking  roc@
+set user_id [ad_verify_and_get_user_id]
+permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_view_presentation
 
+set edit_p 0
+if {[permission::permission_p -party_id $user_id -object_id $pres_item_id -privilege wp_edit_presentation]} {
+    set edit_p 1
+}
+set delete_p 0
+if {[permission::permission_p -party_id $user_id -object_id $pres_item_id -privilege wp_delete_presentation]} {
+    set delete_p 1
+}
+
 set subsite_name [ad_conn package_url]
 regexp {^(.+)/$} $subsite_name match subsite_name
 #set pkg_key [ad_conn package_key]
@@ -48,13 +60,7 @@
     and   ao.object_id = s.slide_id
 }
 
-db_1row get_presentation_page_signature {
-    select p.page_signature,
-    p.show_modified_p
-    from cr_wp_presentations p, cr_items i
-    where i.item_id = :pres_item_id
-    and   i.live_revision = p.presentation_id
-}
+db_1row get_presentation_page_signature { *SQL* }
 
 set context [list [list "$subsite_name/display/$pres_item_id" "one presentation"] "one slide"]
 
@@ -90,10 +96,8 @@
     if {$sort_key == 1} {        
 	# this is the only slide.
 	set href_back ""
-	set href_forward "<a href=\"$subsite_name/display/$pres_item_id\">top</a>"
-    } else { 
-        set href_forward {}
     }
+        set href_forward "<a href=\"$subsite_name/display/$pres_item_id\">top</a>"
 } else {
     set href_forward "<a href=\"$subsite_name/display/$pres_item_id/${next_slide_item_id}.wimpy\">next</a>"
 }
@@ -107,5 +111,22 @@
     and   i.live_revision = x.attach_id
 }
 
-set href_back_forward "$href_back $href_forward"
+set extra ""
+if {$edit_p == 1} {
+    append extra "<a href=\"$subsite_name/edit-slide?[export_url_vars slide_item_id pres_item_id]\">edit</a> | "
+}
+if {$delete_p == 1} {
+    append extra "<a href=\"$subsite_name/delete-slide?[export_url_vars slide_item_id pres_item_id slide_title]\">delete</a> |"
+}
+
+set href_back_forward "$href_back $extra $href_forward"
+
+
+#comments capability added roc@
+if {$edit_p == 1 || $show_comments_p == "t"} {
+    set comment_link [general_comments_create_link $slide_item_id $url]
+    set comments [general_comments_get_comments -print_content_p 1 -print_attachments_p 1 \
+             $slide_item_id $url]
+}
+
 ad_return_template serve-slide
Index: openacs-4/packages/wp-slim/www/serve-slide.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/serve-slide.xql,v
diff -u -r1.2 -r1.2.4.1
--- openacs-4/packages/wp-slim/www/serve-slide.xql	15 Nov 2001 01:47:13 -0000	1.2
+++ openacs-4/packages/wp-slim/www/serve-slide.xql	21 May 2003 15:31:03 -0000	1.2.4.1
@@ -5,7 +5,10 @@
       <querytext>
       
     select p.page_signature,
-    p.show_modified_p
+    p.copyright_notice,
+    p.show_modified_p,
+    p.style,
+    p.show_comments_p
     from cr_wp_presentations p, cr_items i
     where i.item_id = :pres_item_id
     and   i.live_revision = p.presentation_id
Index: openacs-4/packages/wp-slim/www/slide-publish.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/slide-publish.tcl,v
diff -u -r1.1.1.1 -r1.1.1.1.4.1
--- openacs-4/packages/wp-slim/www/slide-publish.tcl	20 Apr 2001 20:51:24 -0000	1.1.1.1
+++ openacs-4/packages/wp-slim/www/slide-publish.tcl	21 May 2003 15:31:03 -0000	1.1.1.1.4.1
@@ -10,8 +10,13 @@
 } {
     revision_id:naturalnum,notnull
     return_url:notnull
+    pres_item_id:notnull
 }
 
+#added permission checking  roc@
+set user_id [ad_verify_and_get_user_id]
+permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_edit_presentation
+
 db_exec_plsql live_revision_set {
     declare
       v_revision_id  cr_revisions.revision_id%TYPE;
@@ -35,4 +40,4 @@
     end;
 }
 
-ad_returnredirect $return_url
\ No newline at end of file
+ad_returnredirect $return_url
Index: openacs-4/packages/wp-slim/www/slide-revisions.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/slide-revisions.adp,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/wp-slim/www/slide-revisions.adp	6 Sep 2002 21:51:10 -0000	1.3
+++ openacs-4/packages/wp-slim/www/slide-revisions.adp	21 May 2003 15:31:03 -0000	1.3.2.1
@@ -14,7 +14,7 @@
 <font color=red>Created by @revisions.full_name@ from @revisions.creation_ip@ at @revisions.creation_date@</font> (<a href="@subsite_name@slide_revision/@pres_item_id@/@slide_item_id@/@revisions.revision_id@.wimpy">view</a>)
 </if>
 <else>
-Created by @revisions.full_name@ from @revisions.creation_ip@ at @revisions.creation_date@ (<a href="@subsite_name@slide_revision/@pres_item_id@/@slide_item_id@/@revisions.revision_id@.wimpy">view</a> | <a href="slide-publish?revision_id=@revisions.revision_id@&return_url=@return_url@">go live</a>)
+Created by @revisions.full_name@ from @revisions.creation_ip@ at @revisions.creation_date@ (<a href="@subsite_name@slide_revision/@pres_item_id@/@slide_item_id@/@revisions.revision_id@.wimpy">view</a> | <a href="slide-publish?revision_id=@revisions.revision_id@&pres_item_id=@pres_item_id@&return_url=@return_url@">go live</a>)
 </else>
 
 </multiple>
Index: openacs-4/packages/wp-slim/www/slide-revisions.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/slide-revisions.tcl,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/wp-slim/www/slide-revisions.tcl	6 Sep 2002 15:32:23 -0000	1.3
+++ openacs-4/packages/wp-slim/www/slide-revisions.tcl	21 May 2003 15:31:03 -0000	1.3.2.1
@@ -16,7 +16,11 @@
     subsite_name
 }
 
+#added permission checking  roc@
+set user_id [ad_verify_and_get_user_id]
+permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_edit_presentation
 
+
 set subsite_name [ad_conn package_url]
 
 set context [list [list "presentation-top?[export_url_vars pres_item_id]" "Presentation"] "Slide Revisions"]
Index: openacs-4/packages/wp-slim/www/slides-reorder-2.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/slides-reorder-2.tcl,v
diff -u -r1.2 -r1.2.4.1
--- openacs-4/packages/wp-slim/www/slides-reorder-2.tcl	4 Oct 2001 04:29:01 -0000	1.2
+++ openacs-4/packages/wp-slim/www/slides-reorder-2.tcl	21 May 2003 15:31:03 -0000	1.2.4.1
@@ -12,6 +12,10 @@
 }
 
 
+#added permission checking  roc@
+set user_id [ad_verify_and_get_user_id]
+permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_edit_presentation
+
 # Just iterate over the values for slide_id in order and set their respective
 # sort_keys to 1, 2, 3, ...
 set counter 0
Index: openacs-4/packages/wp-slim/www/slides-reorder.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/slides-reorder.tcl,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/wp-slim/www/slides-reorder.tcl	6 Sep 2002 15:32:23 -0000	1.3
+++ openacs-4/packages/wp-slim/www/slides-reorder.tcl	21 May 2003 15:31:03 -0000	1.3.2.1
@@ -14,6 +14,10 @@
 }
 
 
+#added permission checking  roc@
+set user_id [ad_verify_and_get_user_id]
+permission::require_permission -party_id $user_id -object_id $pres_item_id -privilege wp_edit_presentation
+
 set header [ad_header "Reorder Slides"]
 
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/wp-slim/www/style-delete-2-oracle.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/wp-slim/www/style-delete-2-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/wp-slim/www/style-delete-2.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/wp-slim/www/style-delete.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/wp-slim/www/style-delete.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/wp-slim/www/style-delete.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/wp-slim/www/style-edit-2.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/wp-slim/www/style-edit-2.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/wp-slim/www/style-edit.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/wp-slim/www/style-edit.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/wp-slim/www/style-edit.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/wp-slim/www/style-image-add.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/wp-slim/www/style-image-add.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/wp-slim/www/style-image-delete-oracle.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/wp-slim/www/style-image-delete-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/wp-slim/www/style-image-delete.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/wp-slim/www/style-list-oracle.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/wp-slim/www/style-list-postgresql.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/wp-slim/www/style-list.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/wp-slim/www/style-list.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/wp-slim/www/style-list.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/wp-slim/www/style-view.adp'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/wp-slim/www/style-view.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/wp-slim/www/style-view.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/wp-slim/www/toggle-comments-view.tcl'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/wp-slim/www/toggle-comments-view.xql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: openacs-4/packages/wp-slim/www/upload-attachments.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/upload-attachments.adp,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/wp-slim/www/upload-attachments.adp	6 Sep 2002 21:51:10 -0000	1.3
+++ openacs-4/packages/wp-slim/www/upload-attachments.adp	21 May 2003 15:31:03 -0000	1.3.2.1
@@ -9,19 +9,14 @@
 <center><p>
 <table border=2 cellpadding=10><tr><td>
 <table cellspacing=0 cellpadding=0>
-<tr>
-  <th align=left nowrap>File Name</th><td>&nbsp;&nbsp;&nbsp;</td>
-  <th align=right nowrap>File Size</th><td>&nbsp;&nbsp;&nbsp;</td>
-  <th nowrap>Display</th>
-</tr>
 <tr><td colspan=7><hr></td></tr>
 
 <tr><td colspan=7 align=center><i>There are 
 <if @attachment_count@ eq 0>
 @attachment_count@
 </if>
 <else>
-<a href="attach-list?slide_item_id=@slide_item_id@">@attachment_count@</a>
+<a href="attach-list?slide_item_id=@slide_item_id@&pres_item_id=@pres_item_id@">@attachment_count@</a>
 </else>
  attachments currently associated with this slide.</i></td></tr>
 
Index: openacs-4/packages/wp-slim/www/users.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/users.adp,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/wp-slim/www/users.adp	6 Sep 2002 21:51:10 -0000	1.3
+++ openacs-4/packages/wp-slim/www/users.adp	21 May 2003 15:31:03 -0000	1.3.2.1
@@ -9,4 +9,8 @@
 <li><a href="/shared/community-member?user_id=@users.person_id@">@users.first_names@ @users.last_name@</a>, @users.email@ (@users.num_presentations@)
 </multiple>
 </ul>
-
+<p>
+Note: this is not a complete list of the users.
+Users who are collaborators on
+presentations owned by others are excluded.  Users who have created
+only private presentations are excluded.
Index: openacs-4/packages/wp-slim/www/users.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/users.tcl,v
diff -u -r1.3 -r1.3.2.1
--- openacs-4/packages/wp-slim/www/users.tcl	6 Sep 2002 15:32:23 -0000	1.3
+++ openacs-4/packages/wp-slim/www/users.tcl	21 May 2003 15:31:03 -0000	1.3.2.1
@@ -32,11 +32,6 @@
     group by p.person_id, p.first_names, p.last_name, parties.email
 }
 
-set footer "Note: this is not a complete list of the users.
-Users who are collaborators on
-presentations owned by others are excluded.  Users who have created
-only private presentations are excluded.
-[ad_footer]"
 
 ad_return_template
 
Index: openacs-4/packages/wp-slim/www/wp-presentation-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/wp-slim/www/wp-presentation-master.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/wp-slim/www/wp-presentation-master.adp	27 Jan 2003 11:39:27 -0000	1.1.2.1
+++ openacs-4/packages/wp-slim/www/wp-presentation-master.adp	21 May 2003 15:31:03 -0000	1.1.2.2
@@ -1,16 +1,20 @@
 <html>
 <head>
+<link rel=stylesheet href="<%=[ad_conn package_url]%>styles/<if @style_id@ eq "-1">default</if><else>@style_id@</else>/style.css" type="text/css">
 <title>@title@</title>
 @header_stuff@
 </head>
-<body<multiple name=attribute> @attribute.key@="@attribute.value@"</multiple>>
+<body <%=[wp_header $style_id]%>>
 <if @body_start_include@ not nil>
 <include src="@body_start_include@" />
 </if>
 <slave>
 
+<br>
+@copyright_notice@
+
 <hr />
-<address><a href="mailto:@signatory@">@signatory@</a></address>
+<address><a href="mailto:@page_signature@">@page_signature@</a></address>
 @ds_link@
 </body>
 </html>