Index: openacs-4/packages/xowiki/xowiki.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v diff -u -N -r1.41 -r1.42 --- openacs-4/packages/xowiki/xowiki.info 27 Jan 2007 16:28:06 -0000 1.41 +++ openacs-4/packages/xowiki/xowiki.info 28 Jan 2007 23:03:26 -0000 1.42 @@ -8,11 +8,11 @@ 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-12-30 + 2007-01-28 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 @@ -23,22 +23,23 @@ 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: book-style (toc and book portlet, based on yui treeview), use language prefix to avoid clashes, ltree (for ordering) +0.41: book-style (toc and book portlet, based on yui treeview), use language prefix to avoid clashes, ltree (for ordering); +0.44: dotlrn portlet support BSD-Style 0 - + - + @@ -54,7 +55,7 @@ - Index: openacs-4/packages/xowiki/www/view-page.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/view-page.adp,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/xowiki/www/view-page.adp 7 Jan 2007 21:52:38 -0000 1.1 +++ openacs-4/packages/xowiki/www/view-page.adp 28 Jan 2007 23:03:26 -0000 1.2 @@ -3,7 +3,7 @@
--> -
+
#xowiki.edit# · #xotcl-core.revisions# · #xowiki.new# · Index: openacs-4/packages/xowiki/www/admin/portal-element-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/portal-element-add.tcl,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/xowiki/www/admin/portal-element-add.tcl 28 Jan 2007 23:03:26 -0000 1.1 @@ -0,0 +1,43 @@ +::xowiki::Package initialize -ad_doc { + Add an element to a given portal + + @author Gustaf Neumann (gustaf.neumann@wu-wien.ac.at) + @creation-date Oct 23, 2005 + @cvs-id $Id: portal-element-add.tcl,v 1.1 2007/01/28 23:03:26 gustafn Exp $ + + @param object_type show objects of this class and its subclasses +} -parameter { + {-portal_id} + {-page_name} + {-referer .} +} + + +set page_id [$package_id resolve_request -path $page_name] +set page_id [::Generic::CrItem lookup -name $page_name -parent_id [$package_id folder_id]] + +ns_log notice "we have page=$page_id\n::Generic::CrItem lookup -name $page_name -parent_id [$package_id folder_id]" +db_transaction { +ns_log notice "portal::add_element \ + -portal_id $portal_id \ + -portlet_name [xowiki_portlet::get_my_name] \ + -pretty_name [$page_id title] \ + -force_region [parameter::get_from_package_key \ + -parameter xowiki_portal_content_force_region \ + -package_key xowiki-portlet]" + + set element_id [portal::add_element \ + -portal_id $portal_id \ + -portlet_name [xowiki_portlet::get_my_name] \ + -pretty_name [$page_id title] \ + -force_region [parameter::get_from_package_key \ + -parameter "xowiki_portal_content_force_region" \ + -package_key "xowiki-portlet"] + ] + portal::set_element_param $element_id package_id $package_id + portal::set_element_param $element_id page_name [$page_id name] +} + +ad_returnredirect $referer +ad_script_abort + Index: openacs-4/packages/xowiki/www/admin/portal-element-remove.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/portal-element-remove.tcl,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/xowiki/www/admin/portal-element-remove.tcl 28 Jan 2007 23:03:26 -0000 1.1 @@ -0,0 +1,19 @@ +::xowiki::Package initialize -ad_doc { + Add an element to a given portal + + @author Gustaf Neumann (gustaf.neumann@wu-wien.ac.at) + @creation-date Oct 23, 2005 + @cvs-id $Id: portal-element-remove.tcl,v 1.1 2007/01/28 23:03:26 gustafn Exp $ + +} -parameter { + {-element_id} + {-portal_id} + {-referer .} +} + +# permissions? +portal::remove_element -element_id $element_id +# redirect and abort +ad_returnredirect $referer +ad_script_abort + 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 -N -r1.13 -r1.14 --- openacs-4/packages/xowiki/www/resources/xowiki.css 9 Jan 2007 11:05:58 -0000 1.13 +++ openacs-4/packages/xowiki/www/resources/xowiki.css 28 Jan 2007 23:03:26 -0000 1.14 @@ -5,8 +5,10 @@ #wikicmds {position: relative; top: -24px; right: 0px; height: 0px; text-align: right; font-family: sans-serif; font-size: 85%;color: #7A7A78;} -#portal #wikicmds {top: -90px} -#page-body #wikicmds {top: -30px} +/*#portal #wikicmds {top: -90px;}*/ +div.portlet #wikicmds {float: inherit ! important; top: 0px ! important; height: inherit;} +#page-body #wikicmds {top: -30px;} + #wikicmds a, #wikicmds a:visited { color: #7A7A78; text-decoration: none;} #wikicmds a:hover {text-decoration: underline;} #wikicmds a:active {color: rgb(255,153,51);}