Index: openacs-4/contrib/packages/cop-ui/lib/contributions.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/cop-ui/lib/contributions.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/contrib/packages/cop-ui/lib/contributions.tcl 26 Jul 2004 12:10:23 -0000 1.6 +++ openacs-4/contrib/packages/cop-ui/lib/contributions.tcl 18 Mar 2005 14:36:47 -0000 1.7 @@ -64,7 +64,7 @@ if {![info exists hide(pretty_name)]} { lappend elements pretty_name { label {Type} - display_template {@content.pretty_name@} + display_template {@content.object_type@} } } @@ -112,8 +112,8 @@ } \ -orderby { stars { - orderby_desc {coalesce(rating_ave,99) asc, o.last_modified desc} - orderby_asc {coalesce(rating_ave,0) desc, o.last_modified desc} + orderby_desc {coalesce(all_rating_ave,99) asc, o.last_modified desc} + orderby_asc {coalesce(all_rating_ave,0) desc, o.last_modified desc} } object_title { orderby lower(o.title) Index: openacs-4/contrib/packages/cop-ui/lib/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/cop-ui/lib/index.adp,v diff -u -r1.5 -r1.6 --- openacs-4/contrib/packages/cop-ui/lib/index.adp 14 May 2004 11:30:15 -0000 1.5 +++ openacs-4/contrib/packages/cop-ui/lib/index.adp 18 Mar 2005 14:36:47 -0000 1.6 @@ -30,6 +30,7 @@
+ @news;noquote@ Notify me of new content and updates RSS Feed
Index: openacs-4/contrib/packages/cop-ui/www/clipboards/ae.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/cop-ui/www/clipboards/ae.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/cop-ui/www/clipboards/ae.tcl 28 Mar 2004 21:17:10 -0000 1.1 +++ openacs-4/contrib/packages/cop-ui/www/clipboards/ae.tcl 18 Mar 2005 14:36:48 -0000 1.2 @@ -18,21 +18,21 @@ {title:text(text) {label "Clipboard name"} {html {size 60}}} } -select_query { - select title from acs_objects where object_id = :clipboard_id and object_type = 'cop_clipboard' + select title from acs_objects where object_id = :clipboard_id and object_type = 'clipboard' } -validate { {title {![string is space $title]} "You must provide a name for the clipboard" } } -new_data { - cop::clipboard::new -title $title + clipboard::new -title $title } -edit_data { set peeraddr [ad_conn peeraddr] permission::require_permission -object_id $clipboard_id -privilege admin db_dml do_update { UPDATE acs_objects SET title = :title, last_modified = now(), modifying_user = :user_id, modifying_ip = :peeraddr - WHERE object_id = :clipboard_id and object_type = 'cop_clipboard' + WHERE object_id = :clipboard_id and object_type = 'clipboard' } } -after_submit { if {![empty_string_p $object_id]} { Index: openacs-4/contrib/packages/cop-ui/www/clipboards/attach.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/cop-ui/www/clipboards/attach.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/cop-ui/www/clipboards/attach.tcl 28 Mar 2004 21:17:10 -0000 1.1 +++ openacs-4/contrib/packages/cop-ui/www/clipboards/attach.tcl 18 Mar 2005 14:36:48 -0000 1.2 @@ -20,11 +20,11 @@ # If we got clipboard_id 0 then we need to create a "General" clipboard if {$clipboard_id == 0} { - set clipboard_id [cop::clipboard::new -title "General"] + set clipboard_id [clipboard::new -title "General"] } if {$clipboard_id > 0} { - cop::clipboard::attach -clipboard_id $clipboard_id -object_id $object_id -user_id $user_id + clipboard::attach -clipboard_id $clipboard_id -object_id $object_id -user_id $user_id } # should redirect to the original object and preserve state... Index: openacs-4/contrib/packages/cop-ui/www/clipboards/delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/cop-ui/www/clipboards/delete.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/cop-ui/www/clipboards/delete.tcl 28 Mar 2004 21:17:10 -0000 1.1 +++ openacs-4/contrib/packages/cop-ui/www/clipboards/delete.tcl 18 Mar 2005 14:36:48 -0000 1.2 @@ -12,6 +12,6 @@ permission::require_permission -object_id $clipboard_id -privilege delete -cop::clipboard::delete -clipboard_id $clipboard_id +clipboard::delete -clipboard_id $clipboard_id ad_returnredirect ./ Index: openacs-4/contrib/packages/cop-ui/www/clipboards/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/cop-ui/www/clipboards/index.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/contrib/packages/cop-ui/www/clipboards/index.tcl 28 Mar 2004 21:17:10 -0000 1.1 +++ openacs-4/contrib/packages/cop-ui/www/clipboards/index.tcl 18 Mar 2005 14:36:48 -0000 1.2 @@ -11,5 +11,5 @@ set user_id [auth::require_login] if {$user_id > 0} { - cop::clipboard::clipboards -count $user_id clipboards + clipboard::clipboards -count $user_id clipboards } Index: openacs-4/contrib/packages/cop-ui/www/clipboards/remove.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/cop-ui/www/clipboards/remove.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/contrib/packages/cop-ui/www/clipboards/remove.tcl 1 Apr 2004 12:09:46 -0000 1.2 +++ openacs-4/contrib/packages/cop-ui/www/clipboards/remove.tcl 18 Mar 2005 14:36:48 -0000 1.3 @@ -17,5 +17,5 @@ ad_script_abort } -cop::clipboard::remove -user_id $user_id -clipboard_id $clipboard_id -object_id $object_id +clipboard::remove -user_id $user_id -clipboard_id $clipboard_id -object_id $object_id ad_returnredirect [get_referrer] Index: openacs-4/contrib/packages/cop-ui/www/clipboards/view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/cop-ui/www/clipboards/view.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/contrib/packages/cop-ui/www/clipboards/view.tcl 1 Apr 2004 12:09:46 -0000 1.2 +++ openacs-4/contrib/packages/cop-ui/www/clipboards/view.tcl 18 Mar 2005 14:36:48 -0000 1.3 @@ -16,10 +16,10 @@ if {![db_0or1row clipboard { SELECT u.first_names || ' ' || u.last_name as owner_name, c.owner_id, o.title - FROM cop_clipboards c, acs_objects o, acs_users_all u + FROM clipboards c, acs_objects o, acs_users_all u WHERE c.clipboard_id = :clipboard_id and o.object_id = c.clipboard_id - and o.object_type = 'cop_clipboard' + and o.object_type = 'clipboard' and c.owner_id = u.user_id}] } { ad_return_complaint 1 "Invalid clipboard id." ad_script_abort @@ -30,7 +30,7 @@ # TODO: Yuck! should fix this query. maybe stick it in a cop_object_type view... db_multirow -extend {clipped} items get_items { SELECT o.object_id, t.pretty_name as object_type, coalesce(o.title,'object '||o.object_id) as item_title, to_char(m.clipped_on,'YYYY-MM-DD HH24:MI:SS') as clipped_ansi - FROM cop_clipboard_object_map m, acs_objects o, acs_object_types t + FROM clipboard_object_map m, acs_objects o, acs_object_types t WHERE clipboard_id = :clipboard_id and o.object_id = m.object_id and t.object_type = (case when o.object_type = 'content_item' then (select case when i.content_type = 'content_extlink' then 'content_extlink' else r.object_type end from acs_objects r, cr_items i where r.object_id = coalesce(i.live_revision, i.latest_revision, i.item_id) and i.item_id = o.object_id) else o.object_type end) Index: openacs-4/contrib/packages/cop-ui/www/related/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/contrib/packages/cop-ui/www/related/index.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/contrib/packages/cop-ui/www/related/index.tcl 7 May 2004 17:25:40 -0000 1.3 +++ openacs-4/contrib/packages/cop-ui/www/related/index.tcl 18 Mar 2005 14:36:48 -0000 1.4 @@ -49,7 +49,7 @@ db_multirow -extend {extra user_url} related related " SELECT to_char(ro.creation_date,'YYYY-MM-DD HH24:MI') as related_on, coalesce(o1.title,'? '||o1.object_type||o1.object_id) as object_one_title, o2.title as object_two_title, person__name(ro.creation_user) as name, object_id_one, object_id_two - FROM cop_rels r, acs_objects o1, acs_objects o2, acs_rels ar, acs_objects ro + FROM content_rels r, acs_objects o1, acs_objects o2, acs_rels ar, acs_objects ro WHERE o1.object_id = ar.object_id_one and o2.object_id = ar.object_id_two and ar.rel_id = r.rel_id