Index: openacs-4/packages/xowiki/xowiki.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v diff -u -r1.42 -r1.43 --- openacs-4/packages/xowiki/xowiki.info 28 Jan 2007 23:03:26 -0000 1.42 +++ openacs-4/packages/xowiki/xowiki.info 30 Jan 2007 11:36:06 -0000 1.43 @@ -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) - 2007-01-28 + 2007-01-30 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,45 +23,45 @@ 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 - + - + + - + - - Index: openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml,v diff -u -r1.12 -r1.13 --- openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml 3 Jan 2007 14:03:57 -0000 1.12 +++ openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml 30 Jan 2007 11:36:07 -0000 1.13 @@ -1,9 +1,10 @@ - + Verwalten Zur�ck Inhalt + Erzeuge diese Seite in der folgenden Sprache: L�schen Kurzbeschreibung Bearbeiten Index: openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml,v diff -u -r1.14 -r1.15 --- openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml 3 Jan 2007 14:03:57 -0000 1.14 +++ openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml 30 Jan 2007 11:36:07 -0000 1.15 @@ -1,9 +1,10 @@ - + Admin Back Content + Create this page in a different language Creator Delete Description 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.18 -r1.19 --- openacs-4/packages/xowiki/tcl/link-procs.tcl 31 Dec 2006 16:47:00 -0000 1.18 +++ openacs-4/packages/xowiki/tcl/link-procs.tcl 30 Jan 2007 11:36:07 -0000 1.19 @@ -88,17 +88,22 @@ set item_id [my resolve] if {$item_id} { set css_class "found" - set link [::[my package_id] pretty_link -lang $lang [my stripped_name]] + set link [$package_id pretty_link -lang $lang [my stripped_name]] } else { set css_class "undefined" set last_page_id [$page set item_id] set object_type [[$page info class] set object_type] - set link [export_vars -base [$package_id package_url] \ - {{edit-new 1} object_type name last_page_id}] + set link [$package_id make_link $package_id \ + edit-new object_type name last_page_id] + + #set link [export_vars -base [$package_id package_url] \ + # {{edit-new 1} object_type name last_page_id}] } - $page lappend lang_links \ - "$lang" + } return "" } 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.72 -r1.73 --- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 27 Jan 2007 17:29:57 -0000 1.72 +++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 30 Jan 2007 11:36:07 -0000 1.73 @@ -121,7 +121,6 @@ title text {folder_id -100} - {lang_links ""} {lang en} {render_adp 1} {absolute_links 0} @@ -763,7 +762,7 @@ [my info class] instvar $__v } set __ignorelist [list __v __ignorelist __varlist __template_variables__ \ - text item_id content] + text item_id content lang_links] set __varlist [list] set __template_variables__ "
    \n" foreach __v [lsort [info vars]] { @@ -839,6 +838,7 @@ Page instproc render {-update_references:switch} { my instvar item_id revision_id references lang render_adp unresolved_references parent_id + my array set lang_links {found "" undefined ""} #my log "-- my class=[my info class]" set name [my set name] regexp {^(..):(.*)$} $name _ lang name @@ -850,12 +850,6 @@ if {$update_references || $unresolved_references > 0} { my update_references $item_id [lsort -unique $references] } - if {![my exists lang_links]} { - #my log "-- for some reason, no lang links" - my set lang_links "" - } else { - my set lang_links [join [my set lang_links] ", "] - } return [expr {$render_adp ? [my adp_subst $content] : $content}] } 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.33 -r1.34 --- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 29 Jan 2007 07:55:23 -0000 1.33 +++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 30 Jan 2007 11:36:07 -0000 1.34 @@ -40,8 +40,8 @@ set references [my references] #my log "--after references = <$references>" - # export title, text, and lang_links to current scope - my instvar title name text lang_links + # export title, name and text into current scope + my instvar title name text set tags "" set no_tags 1 @@ -180,7 +180,21 @@ set index_link [$package_id make_link -privilege public -url "" $package_id {} {}] set save_tag_link [$package_id make_link [self] save-tags] set popular_tags_link [$package_id make_link [self] popular-tags] + set create_in_req_locale_link "" + if {[$package_id get_parameter use_connection_locale 0]} { + $package_id get_name_and_lang_from_path \ + [$package_id set object] req_lang req_local_name + set l [Link create new \ + -page [self] -type language -stripped_name $req_local_name \ + -name ${req_lang}:$req_local_name -lang $req_lang \ + -label $req_local_name -folder_id $folder_id \ + -package_id $package_id] + } + foreach i [my array names lang_links] { + set lang_links($i) [join [my set lang_links($i)] ", "] + } + my log "--after context delete_link=$delete_link " set template [$folder_id get_payload template] set page [self] @@ -209,6 +223,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 + create_in_req_locale_link req_lang per_object_categories_with_links digg_link delicious_link my_yahoo_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.19 -r1.20 --- openacs-4/packages/xowiki/www/oacs-view.adp 9 Jan 2007 18:53:39 -0000 1.19 +++ openacs-4/packages/xowiki/www/oacs-view.adp 30 Jan 2007 11:36:07 -0000 1.20 @@ -30,7 +30,7 @@
    - -#xowiki.references_label# @references;noquote@ @lang_links;noquote@ + +#xowiki.references_label# @references;noquote@ @lang_links.found;noquote@
     + +#xowiki.create_this_page_in_language# @lang_links.undefined;noquote@ +
    #xowiki.your_tags_label#: @tags_with_links;noquote@ Index: openacs-4/packages/xowiki/www/view-book.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view-book.adp,v diff -u -r1.7 -r1.8 --- openacs-4/packages/xowiki/www/view-book.adp 9 Jan 2007 18:53:39 -0000 1.7 +++ openacs-4/packages/xowiki/www/view-book.adp 30 Jan 2007 11:36:07 -0000 1.8 @@ -102,9 +102,12 @@ Add to My Yahoo!
    - -#xowiki.references_label# @references;noquote@ @lang_links;noquote@ + +#xowiki.references_label# @references;noquote@ @lang_links.found;noquote@
     + +#xowiki.create_this_page_in_language# @lang_links.undefined;noquote@ +
    #xowiki.your_tags_label#: @tags_with_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.15 -r1.16 --- openacs-4/packages/xowiki/www/view-default.adp 9 Jan 2007 18:53:39 -0000 1.15 +++ openacs-4/packages/xowiki/www/view-default.adp 30 Jan 2007 11:36:07 -0000 1.16 @@ -54,9 +54,12 @@
    Add to My Yahoo!
     - -#xowiki.references_label# @references;noquote@ @lang_links;noquote@ + +#xowiki.references_label# @references;noquote@ @lang_links.found;noquote@
     + +#xowiki.create_this_page_in_language# @lang_links.undefined;noquote@ +
    #xowiki.your_tags_label#: @tags_with_links;noquote@ 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.14 -r1.15 --- openacs-4/packages/xowiki/www/resources/xowiki.css 28 Jan 2007 23:03:26 -0000 1.14 +++ openacs-4/packages/xowiki/www/resources/xowiki.css 30 Jan 2007 11:36:07 -0000 1.15 @@ -66,8 +66,8 @@ #sidebar h3 {font-size: 11px; margin: 0;} #sidebar h4 {font-size: 10px; margin: 0;} #sidebar .sidebox li {font-size: 10px; margin: 0;} -img.found {border: 0px; height: 12px} -img.undefined {border: 10px; color: yellow; height: 12px} +img.found {border-width: 0px; height: 12px} +img.undefined {border-width: 2px; border-color: #859db8; height: 8px} #left-col {float: left; width: 50%; top: 0px;} #right-col {float: right; width: 49%; top: 0px;}