Index: openacs-4/packages/xowiki/xowiki.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v diff -u -r1.21 -r1.22 --- openacs-4/packages/xowiki/xowiki.info 5 Aug 2006 20:55:01 -0000 1.21 +++ openacs-4/packages/xowiki/xowiki.info 6 Aug 2006 19:57:08 -0000 1.22 @@ -8,25 +8,25 @@ f xowiki - + Gustaf Neumann A more generic xotcl-based wikis example with object types and subtypes based on the content repository (with category support) - 2006-08-05 + 2006-08-06 XoWiki is a wiki implementation for OpenACS in xotcl. Instead of trying to implement the full set of wiki markup commands of systems like MediaWiki, XoWiki is based on a rich text editor and focuses more on integration with oacs (e.g categories, general comments, adp-includes). XoWiki 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]] +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). BSD-Style 0 - + @@ -40,6 +40,7 @@ + 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.7 -r1.8 --- openacs-4/packages/xowiki/tcl/link-procs.tcl 5 Aug 2006 20:55:02 -0000 1.7 +++ openacs-4/packages/xowiki/tcl/link-procs.tcl 6 Aug 2006 19:57:09 -0000 1.8 @@ -19,7 +19,7 @@ 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]" + #my log "--L link has class [my info class]" } Link instproc resolve {} { #my log "--lookup of [my name]" Index: openacs-4/packages/xowiki/tcl/package-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/package-procs.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/xowiki/tcl/package-procs.tcl 5 Aug 2006 20:55:02 -0000 1.3 +++ openacs-4/packages/xowiki/tcl/package-procs.tcl 6 Aug 2006 19:57:09 -0000 1.4 @@ -69,19 +69,38 @@ return [my call $policy [self] $m] } } - set object [$id get_parameter index_page] } if {$object eq ""} { # we should change this to the new interface with query_parameter #if {[ns_queryget summary] eq ""} {rp_form_put summary 1} #set object [$id get_parameter weblog_page "en:weblog"] - ad_returnredirect "admin/list" + #ad_returnredirect "admin/list" + set object index } set page [my resolve_request -path $object] if {$page ne ""} { return [my call $policy $page $method] + } + # try standard page + set standard_page [$id get_parameter ${object}_page] + my log "--standard page '$standard_page' from ${object}_page" + if {$standard_page ne ""} { + set page [my resolve_request -path $standard_page] + if {$page ne ""} { + my log "--found standard page $standard_page => $page" + return [my call $policy $page $method] + } + # create from default page + set fn [get_server_root]/packages/xowiki/www/default-pages/$object.page + my log "--sourcing page definition /packages/xowiki/www/default-pages/$object" + set F [open $fn]; set source [read $F]; close $F + set page [::xowiki::Page new -volatile -name $standard_page \ + -title $object -parent_id $folder_id -package_id $id \ + -text [list [string map [list >> ">>" << "<<"] $source] text/html]] + $page save_new + return [my call $policy $page $method] } else { - #... + ad_returnredirect "admin/list" } } @@ -176,10 +195,12 @@ } else { # we have no folder object yet. so we create one... ::xowiki::Object create ::$folder_id - ::$folder_id set text "# this is the payload of the folder object\n\nset index_page \"\"\n" + ::$folder_id set text "# this is the payload of the folder object\n\n\ + set index_page \"en:index\"\n" ::$folder_id set parent_id $folder_id ::$folder_id set name ::$folder_id ::$folder_id set title ::$folder_id + ::$folder_id set package_id $id ::$folder_id save_new ::$folder_id initialize_loaded_object } @@ -199,7 +220,7 @@ } Package instproc return_page {-adp -variables -form} { - my log "--vars=[self args]" + #my log "--vars=[self args]" set __vars [list] foreach _var $variables { if {[llength $_var] == 2} { Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v diff -u -r1.46 -r1.47 --- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 5 Aug 2006 22:22:54 -0000 1.46 +++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 6 Aug 2006 19:57:09 -0000 1.47 @@ -681,6 +681,22 @@ } return $ch$page + } else { + my instvar package_id + set page_name [lindex $arg 0] + set page [$package_id resolve_request -path $page_name] + if {$page ne ""} { + $page volatile + $page set __including_page [self] + set skin portlet + foreach {att value} [lrange $arg 1 end] { + switch -- $att { + -skin {set skin $value} + } + } + if {$skin ne "plain"} {$page mixin add ::xowiki::Page::skin=$skin} + return $ch[$page render] + } } } Page instproc div {ch arg} { 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.4 -r1.5 --- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 5 Aug 2006 23:02:01 -0000 1.4 +++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 6 Aug 2006 19:57:09 -0000 1.5 @@ -298,4 +298,10 @@ } ns_return 200 text/html "[_ xowiki.popular_tags_label]: [join $entries {, }]" } + + Class Page::skin=portlet -instproc render {} { + return "
\ + [my title]
\ +
[next]
" + } } \ No newline at end of file Fisheye: Tag 1.6 refers to a dead (removed) revision in file `openacs-4/packages/xowiki/www/delete-revision.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.8 refers to a dead (removed) revision in file `openacs-4/packages/xowiki/www/delete.tcl'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/xowiki/www/index.vuh =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/index.vuh,v diff -u -r1.2 -r1.3 --- openacs-4/packages/xowiki/www/index.vuh 5 Aug 2006 20:55:03 -0000 1.2 +++ openacs-4/packages/xowiki/www/index.vuh 6 Aug 2006 19:57:09 -0000 1.3 @@ -13,9 +13,9 @@ package_id [ad_conn package_id]] set Package [::xowiki::Package create ::$package_id -folder_id $folder_id] -#$Package log "--starting... [ns_conn url] [ns_conn query] form vars = [ns_set array [ns_getform]]" +$Package log "--starting... [ns_conn url] [ns_conn query] form vars = [ns_set array [ns_getform]]" set text [$Package invoke -method $m] -#$Package log "--delivery [$Package set delivery] 200 [$Package set mime_type] $text" +$Package log "--delivery [$Package set delivery] 200 [$Package set mime_type] [string length $text] bytes" [$Package set delivery] 200 [$Package set mime_type] $text -#$Package log "--done" +$Package log "--done [$Package set object]" ad_script_abort Fisheye: Tag 1.7 refers to a dead (removed) revision in file `openacs-4/packages/xowiki/www/make-live-revision.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/xowiki/www/popular_tags.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.6 refers to a dead (removed) revision in file `openacs-4/packages/xowiki/www/revisions.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/xowiki/www/save_tags.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.21 refers to a dead (removed) revision in file `openacs-4/packages/xowiki/www/view.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/xowiki/www/weblog.tcl'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/xowiki/www/default-pages/index.page =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/default-pages/Attic/index.page,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/xowiki/www/default-pages/index.page 6 Aug 2006 19:57:09 -0000 1.1 @@ -0,0 +1,15 @@ +

+This is the default start page of XoWiki. You can edit this page and save it to provide a personalized look of the XoWiki instance. You can as well provide a different index page through configuration. For more details, consult the [[http://media.wu-wien.ac.at/download/xowiki-doc/|XoWiki documentation]]. +

+>>left-col<< +{{adp portlets/recent {name {Recently Changed Pages} max_entries 25} }} +>><< +>>right-col<< +{{adp portlets/last-visited {name {Last Visited} max_entries 10 }}} +
+{{adp portlets/most-popular {name {Most Popular} max_entries 10 }}} +>><< + + + + Index: openacs-4/packages/xowiki/www/default-pages/weblog.page =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/default-pages/Attic/weblog.page,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/xowiki/www/default-pages/weblog.page 6 Aug 2006 19:57:09 -0000 1.1 @@ -0,0 +1,13 @@ +>>content<< +{{adp portlets/weblog {name Weblog}}} +>><< +>>sidebar<< +{{adp portlets/weblog-mini-calendar}} +{{adp portlets/tags {skin plain-include}}} +{{adp portlets/tags {skin plain-include popular 1 limit 30}}} +{{adp portlets/categories {count 1 skin plain-include}}} +>><< + + + + Index: openacs-4/packages/xowiki/www/resources/xowiki.css =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/xowiki.css,v diff -u -r1.1 -r1.2 --- openacs-4/packages/xowiki/www/resources/xowiki.css 26 Jul 2006 22:56:46 -0000 1.1 +++ openacs-4/packages/xowiki/www/resources/xowiki.css 6 Aug 2006 19:57:09 -0000 1.2 @@ -62,8 +62,8 @@ img.found {border: 0; height: 12px} img.undefined {border: 10; color: yellow; height: 12px} -#left-col {float: left; width: 40%; top: 0px;} -#right-col {float: right; width: 59%; top: 0px;} +#left-col {float: left; width: 50%; top: 0px;} +#right-col {float: right; width: 49%; top: 0px;} #left-col20 {float: left; width: 14%; top: 0px; margin-right: 10px;} #left-col25 {float: left; width: 24%; top: 0px; margin-right: 10px;}