Index: openacs-4/packages/xowiki/xowiki.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v diff -u -r1.33 -r1.34 --- openacs-4/packages/xowiki/xowiki.info 19 Dec 2006 13:16:28 -0000 1.33 +++ openacs-4/packages/xowiki/xowiki.info 25 Dec 2006 21:26:20 -0000 1.34 @@ -48,11 +48,13 @@ - - - - + + + + + Index: openacs-4/packages/xowiki/tcl/link-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/link-procs.tcl,v diff -u -r1.16 -r1.17 --- openacs-4/packages/xowiki/tcl/link-procs.tcl 10 Dec 2006 17:10:24 -0000 1.16 +++ openacs-4/packages/xowiki/tcl/link-procs.tcl 25 Dec 2006 21:26:21 -0000 1.17 @@ -19,13 +19,13 @@ Link instproc init {} { set class [self class]::[my type] if {[my isclass $class]} {my class $class} - my log "--L link has class [my info class] // $class" + #my log "--L link has class [my info class] // $class" } Link instproc resolve {} { - my log "--lookup of [my name]" - if {![regexp {(.*?)(\#|%23)+(.*)$} [my name] full_name name anchor_tag anchor]} { - set name [my name] - } + #my log "--lookup of [my name]" + if {![regexp {(.*?)(\#|%23)+(.*)$} [my name] full_name name anchor_tag anchor]} { + set name [my name] + } ::Generic::CrItem lookup -name $name -parent_id [my folder_id] } Link instproc render_found {href label} { Index: openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/Attic/xowiki-portlet-procs.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl 22 Dec 2006 11:57:53 -0000 1.6 +++ openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl 25 Dec 2006 21:26:21 -0000 1.7 @@ -468,4 +468,28 @@ set users [expr {$count == 0 ? "No users" : "$count users"}] return "

$users $what

$output
" } + + ############################################################################# + # this might become some usful stuff for digg + # + + Class create digg \ + -superclass ::xowiki::Portlet \ + -parameter {{__decoration plain}} + + digg instproc render {} { + # use "span" to specify parameters to the rss call + my initialize -parameter {} + my get_parameters + my instvar __including_page + set description [$__including_page set description] + if {$description eq ""} { + set description [ad_html_text_convert -from text/html -to text/plain -- \ + [$__including_page set text]] + } + return "
\ + $description
" + } + + } Index: openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl,v diff -u -r1.23 -r1.24 --- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 10 Dec 2006 10:41:26 -0000 1.23 +++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 25 Dec 2006 21:26:21 -0000 1.24 @@ -55,20 +55,20 @@ } } - if {[$package_id get_parameter "use_user_tracking" 1]} { + if {[$package_id get_parameter "with_user_tracking" 1]} { my record_last_visited } - my log "--after user_tracking" + #my log "--after user_tracking" set references [my references] - my log "--after references = <$references>" + #my log "--after references = <$references>" # export title, text, and lang_links to current scope my instvar title name text lang_links set tags "" set no_tags 1 - if {[$package_id get_parameter "use_tags" 1] && + if {[$package_id get_parameter "with_tags" 1] && ![my exists_query_parameter no_tags]} { # only activate tags when the user is logged in set no_tags [expr {[::xo::cc user_id] == 0}] @@ -83,7 +83,7 @@ set tags_with_links [join $entries {, }] } } - my log "--after tags" + #my log "--after tags" ### this was added by dave to address a problem with notifications set return_url [ad_return_url] @@ -92,7 +92,7 @@ set return_url [my query_parameter return_url] } - if {[$package_id get_parameter "use_notifications" 1]} { + if {[$package_id get_parameter "with_notifications" 1]} { if {[::xo::cc user_id] != 0} { ;# notifications require login set notification_type [notification::type::get_type_id \ -short_name xowiki_notif] @@ -108,7 +108,7 @@ alt='$notification_text' title='$notification_text'>" } } - my log "--after notifications [info exists notification_image]" + #my log "--after notifications [info exists notification_image]" if {[$package_id get_parameter "show_per_object_categories" 1]} { set entries [list] @@ -132,9 +132,9 @@ } set per_object_categories_with_links [join $entries {, }] } - my log "--after tags" + #my log "--after tags" - if {[$package_id get_parameter "use_gc"] && + if {[$package_id get_parameter "with_general_comments" 0] && ![my exists_query_parameter no_gc]} { set gc_return_url [$package_id url] set gc_link [general_comments_create_link -object_name $title $item_id $gc_return_url] @@ -143,13 +143,28 @@ set gc_link "" set gc_comments "" } - my log "--after gc title=$title" + #my log "--after gc title=$title" + if {[$package_id get_parameter "with_digg" 0] && [ns_conn isconnected]} { + set digg_description [my set description] + if {$digg_description eq ""} { + set digg_description [ad_html_text_convert -from text/html -to text/plain -- $content] + } + set digg_link [export_vars -base "http://digg.com/submit" { + {phase 2} + {url "[ns_conn location][::xo::cc url]"} + {title "[string range $title 0 74]"} + {body_text "[string range $digg_description 0 349]"} + }] + } + #my log "--after digg" + set header_stuff [::xowiki::Page header_stuff] set master [my query_parameter "master" 1] #if {[my exists_query_parameter "edit_return_url"]} { # set return_url [my query_parameter "edit_return_url"] #} + my log "--after options" if {$master} { set context [list $title] @@ -189,7 +204,7 @@ content references lang_links package_id rev_link edit_link delete_link new_link admin_link index_link tags no_tags tags_with_links save_tag_link popular_tags_link - per_object_categories_with_links + per_object_categories_with_links digg_link gc_link gc_comments notification_subscribe_link notification_image } } Index: openacs-4/packages/xowiki/www/oacs-view.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/oacs-view.adp,v diff -u -r1.12 -r1.13 --- openacs-4/packages/xowiki/www/oacs-view.adp 22 Dec 2006 11:59:05 -0000 1.12 +++ openacs-4/packages/xowiki/www/oacs-view.adp 25 Dec 2006 21:26:21 -0000 1.13 @@ -43,23 +43,23 @@ -
-
-@content;noquote@ -
+ +
@content;noquote@
+
+ +
Digg!
+ -

 

#xowiki.references_label# @references;noquote@ @lang_links;noquote@ +#xowiki.references_label# @references;noquote@ @lang_links;noquote@
Index: openacs-4/packages/xowiki/www/view-default.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view-default.adp,v diff -u -r1.9 -r1.10 --- openacs-4/packages/xowiki/www/view-default.adp 1 Dec 2006 08:16:14 -0000 1.9 +++ openacs-4/packages/xowiki/www/view-default.adp 25 Dec 2006 21:26:21 -0000 1.10 @@ -42,9 +42,13 @@
@content;noquote@ +
+ +
Digg!
+ -

 

#xowiki.references_label# @references;noquote@ @lang_links;noquote@ +#xowiki.references_label# @references;noquote@ @lang_links;noquote@
@@ -60,7 +64,6 @@ Categories: @per_object_categories_with_links;noquote@
-

#general-comments.Comments#

    @gc_comments;noquote@

Index: openacs-4/packages/xowiki/www/portlets/include.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/portlets/Attic/include.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/xowiki/www/portlets/include.tcl 22 Dec 2006 11:57:54 -0000 1.1 +++ openacs-4/packages/xowiki/www/portlets/include.tcl 25 Dec 2006 21:26:21 -0000 1.2 @@ -1,3 +1,3 @@ -ns_log notice "--including_page= $__including_page, portlet=$portlet" +#ns_log notice "--including_page= $__including_page, portlet=$portlet" set content [$__including_page include_portlet $portlet] template::set_file [file dir $__adp_stub]/plain-include