Index: openacs-4/packages/xowiki/xowiki.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v diff -u -r1.35 -r1.36 --- openacs-4/packages/xowiki/xowiki.info 26 Dec 2006 10:21:47 -0000 1.35 +++ openacs-4/packages/xowiki/xowiki.info 26 Dec 2006 11:31:37 -0000 1.36 @@ -8,7 +8,7 @@ f xowiki - + Gustaf Neumann A more generic xotcl-based wikis example with object types and subtypes based on the content repository (with category support) @@ -20,13 +20,13 @@ combines aspects of wikis (ease of page-creation) with aspects of a content management system (revisions, re-usable items, multiple languages). Furthermore, XoWiki allows to define different types of links such -one could define book-structures (where a navigation structure could be built on the fly) or glossaries with differnt kind of word relationships (like synonyms, etc.). XoWiki supports pages in multiple languages and is localized (currently only for English and German). Currently, richtext and plaintext type entries are supported. Included support for adp-substitution in wiki pages and a file-selector. 0.13 supports page templates and uses the new generic form interface. Use of the oo layer for the content repository, reduced number of database interactions.0.18 supports text/enhanced, nice page names, import/export. Support for search (::xowiki::Page and ::xowiki::PlainPage); 0.20 support ::xowiki::Object, directory object, rss generation into syndication table, improved admin pages; 0.21: ajax-ased chat added, new attributes creator and page_title for all xowiki::Pages; 0.22 improved permission checking. 0.24 provides link-types, more includeletes (most-recently viewed, most frequently accessed pages). 0.26 provides Weblog support. 0.27: alignment with xotcl-core 0.38 (use cr_item.name instead of cr_revisions.title), change page_title to title (potential incompatibility) to rely more strictly to the CR data model (most files are effected). 0.28: tag and improved weblog support. 0.30: symbolic oo interface, nicer links, permission management. 0.31: per package search. 0.32: new class ::xowiki::File for [[file:readme.pdf]] and [[image:picture.jpg]] 0.33: direct inclusion of xowiki pages via {{en:mypage}}, simpler default pages (see xowiki/www/default-pages). 0.34: notifications; 0.36: prototypes, direct includes, context handling; 0.37: initial reqression testing (118 tests); 0.38: production_mode, virtual presence, google-sitemap. 0.39: version diff, provide image properties in xowiki-pages, specify how links can be generated +one could define book-structures (where a navigation structure could be built on the fly) or glossaries with differnt kind of word relationships (like synonyms, etc.). XoWiki supports pages in multiple languages and is localized (currently only for English and German). Currently, richtext and plaintext type entries are supported. Included support for adp-substitution in wiki pages and a file-selector. 0.13 supports page templates and uses the new generic form interface. Use of the oo layer for the content repository, reduced number of database interactions.0.18 supports text/enhanced, nice page names, import/export. Support for search (::xowiki::Page and ::xowiki::PlainPage); 0.20 support ::xowiki::Object, directory object, rss generation into syndication table, improved admin pages; 0.21: ajax-ased chat added, new attributes creator and page_title for all xowiki::Pages; 0.22 improved permission checking. 0.24 provides link-types, more includeletes (most-recently viewed, most frequently accessed pages). 0.26 provides Weblog support. 0.27: alignment with xotcl-core 0.38 (use cr_item.name instead of cr_revisions.title), change page_title to title (potential incompatibility) to rely more strictly to the CR data model (most files are effected). 0.28: tag and improved weblog support. 0.30: symbolic oo interface, nicer links, permission management. 0.31: per package search. 0.32: new class ::xowiki::File for [[file:readme.pdf]] and [[image:picture.jpg]] 0.33: direct inclusion of xowiki pages via {{en:mypage}}, simpler default pages (see xowiki/www/default-pages). 0.34: notifications; 0.36: prototypes, direct includes, context handling; 0.37: initial reqression testing (118 tests); 0.38: production_mode, virtual presence, google-sitemap. 0.39: version diff, provide image properties in xowiki-pages, specify how links can be generated; 0.41: digg and delicious buttons BSD-Style 0 - + @@ -49,7 +49,8 @@ - + 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.24 -r1.25 --- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 25 Dec 2006 21:26:21 -0000 1.24 +++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 26 Dec 2006 11:31:37 -0000 1.25 @@ -41,6 +41,7 @@ set content [my render] my log "--after render" + set top_portlets "" set vp [$package_id get_parameter "top_portlet" ""] if {$vp ne ""} { set vp_name [lindex $vp 0] @@ -51,7 +52,7 @@ -actual_query [::xo::cc actual_query] \ -destroy_on_cleanup ] $p set __caller_parameters [lrange $vp 1 end] - set content [$p render]$content + set top_portlets [$p render] } } @@ -157,7 +158,25 @@ {body_text "[string range $digg_description 0 349]"} }] } - #my log "--after digg" + if {[$package_id get_parameter "with_delicious" 0] && [ns_conn isconnected]} { + set delicious_description [my set description] + if {$delicious_description eq ""} { + set delicious_description [ad_html_text_convert -from text/html -to text/plain -- $content] + } + # the following opens a window, where a user can edit the posted info. + # however, it seems not possible to add tags this way automatically. + # Alternatively, one could use the api as descibed below; this allows + # tags, but no editing... + # http://farm.tucows.com/blog/_archives/2005/3/24/462869.html#adding + set delicious_link [export_vars -base "http://del.icio.us/post" { + {v 4} + {url "[ns_conn location][::xo::cc url]"} + {title "[string range $title 0 79]"} + {notes "[string range $delicious_description 0 199]"} + tags + }] + } + #my log "--after delicious" set header_stuff [::xowiki::Page header_stuff] set master [my query_parameter "master" 1] @@ -204,8 +223,9 @@ 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 digg_link - gc_link gc_comments notification_subscribe_link notification_image + per_object_categories_with_links digg_link delicious_link + gc_link gc_comments notification_subscribe_link notification_image + top_portlets } } } else { Index: openacs-4/packages/xowiki/www/oacs-view.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/oacs-view.adp,v diff -u -r1.13 -r1.14 --- openacs-4/packages/xowiki/www/oacs-view.adp 25 Dec 2006 21:26:21 -0000 1.13 +++ openacs-4/packages/xowiki/www/oacs-view.adp 26 Dec 2006 11:31:37 -0000 1.14 @@ -52,12 +52,17 @@ &__including_page=page portlet="categories -open_page @name@ -decoration plain"> -
@content;noquote@
+
@top_portlets;noquote@ +@content;noquote@
Digg!
 + + + +
#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/view-default.adp,v diff -u -r1.10 -r1.11 --- openacs-4/packages/xowiki/www/view-default.adp 25 Dec 2006 21:26:21 -0000 1.10 +++ openacs-4/packages/xowiki/www/view-default.adp 26 Dec 2006 11:31:37 -0000 1.11 @@ -40,13 +40,16 @@
- +@top_portlets;noquote@ @content;noquote@
Digg!
 + + + #xowiki.references_label# @references;noquote@ @lang_links;noquote@