Index: openacs-4/packages/xowiki/xowiki.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v diff -u -N -r1.20 -r1.21 --- openacs-4/packages/xowiki/xowiki.info 31 Jul 2006 21:44:36 -0000 1.20 +++ openacs-4/packages/xowiki/xowiki.info 5 Aug 2006 20:55:01 -0000 1.21 @@ -8,29 +8,29 @@ 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-07-31 + 2006-08-05 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 +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]] BSD-Style 0 - + - + 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 -N -r1.6 -r1.7 --- openacs-4/packages/xowiki/tcl/link-procs.tcl 26 Jul 2006 22:56:46 -0000 1.6 +++ openacs-4/packages/xowiki/tcl/link-procs.tcl 5 Aug 2006 20:55:02 -0000 1.7 @@ -12,12 +12,17 @@ # generic links # - Class create Link -parameter {type name lang stripped_name label folder_id package_id} + Class create Link -parameter { + type name lang stripped_name label + folder_id package_id + } 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]" } Link instproc resolve {} { + #my log "--lookup of [my name]" ::Generic::CrItem lookup -name [my name] -parent_id [my folder_id] } Link instproc render_found {href label} { @@ -32,21 +37,26 @@ #my log "--u resolve returns $item_id" if {$item_id} { $page lappend references [list $item_id [my type]] - set href [::xowiki::Page pretty_link -package_id [my package_id] -lang [my lang] \ + set href [::xowiki::Page pretty_link \ + -package_id [my package_id] -lang [my lang] \ [my stripped_name]] my render_found $href [my label] } else { my instvar package_id $page incr unresolved_references set object_type [[$page info class] set object_type] - set name [my label] - set href [export_vars -base [$package_id package_url] {{edit-new 1} object_type name}] + set name [my name] + set title [my label] + set href [export_vars -base [$package_id package_url] \ + {{edit-new 1} object_type name title}] my render_not_found $href [my label] } } Link instproc lookup_xowiki_package_by_name {name start_package_id} { - set ancestors [site_node::get_ancestors -node_id $start_package_id -element node_id] + set ancestors [site_node::get_ancestors \ + -node_id $start_package_id \ + -element node_id] foreach a $ancestors { set package_id [site_node::get_children -node_id $a -package_key xowiki \ -filters [list name $name] -element package_id] @@ -79,15 +89,50 @@ 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 [export_vars -base [$package_id package_url] \ + {{edit-new 1} object_type name last_page_id}] } $page lappend lang_links \ "$lang" return "" } + + # + # image links + # + Class create ::xowiki::Link::image -superclass ::xowiki::Link + ::xowiki::Link::image instproc render {} { + my instvar name package_id label + set page [my info parent] + set item_id [my resolve] + if {$item_id} { + set link [export_vars -base [::xowiki::Page pretty_link $name] {{m download}} ] + $page lappend references [list $item_id [my type]] + my render_found $link $label + } else { + $page incr unresolved_references + set last_page_id [$page set item_id] + set title $label + set link [export_vars -base [$package_id package_url] \ + {{edit-new 1} {object_type ::xowiki::File} + {return_url "[$package_id url]"} + name title last_page_id}] + my render_not_found $link $label + } + } + ::xowiki::Link::image instproc render_found {link label} { + set label [string map [list ' "'"] $label] + return "$label" + } + Class create ::xowiki::Link::file -superclass ::xowiki::Link::image + ::xowiki::Link::file instproc render_found {href label} { + return "$label" + } + # # glossary links # 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 -N -r1.2 -r1.3 --- openacs-4/packages/xowiki/tcl/package-procs.tcl 31 Jul 2006 21:24:12 -0000 1.2 +++ openacs-4/packages/xowiki/tcl/package-procs.tcl 5 Aug 2006 20:55:02 -0000 1.3 @@ -59,6 +59,8 @@ Package instproc invoke {-method} { my instvar object folder_id id policy + my set mime_type text/html + my set delivery ns_return my log "--object = '$object'" if {$object eq ""} { set exported [$policy defined_methods Package] @@ -84,7 +86,7 @@ } Package instproc call {policy object method} { - my log "--p $policy check_permissions $object $method = [$policy check_permissions $object $method]" + my log "--p $policy check_permissions $object $method = [$policy check_permissions $object $method] delivery=[my set delivery]" if {[$policy check_permissions $object $method]} { my log "--p calling $object ([$object info class]) '$method'" $object $method @@ -108,6 +110,7 @@ if {[regexp {^pages/(..)/(.*)$} $path _ lang local_name]} { } elseif {[regexp {^(..)/(.*)$} $path _ lang local_name]} { } elseif {[regexp {^(..):(.*)$} $path _ lang local_name]} { + } elseif {[regexp {^(file|image)/(.*)$} $path _ lang local_name]} { } else { set key queryparm(lang) set lang [expr {[info exists $key] ? [set $key] : \ @@ -374,6 +377,9 @@ Class Object -array set require_permission { edit {{package_id admin}} } + Class File -array set require_permission { + download {{package_id read}} + } } } Index: openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl,v diff -u -N -r1.10 -r1.11 --- openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl 26 Jul 2006 22:56:46 -0000 1.10 +++ openacs-4/packages/xowiki/tcl/xowiki-form-procs.tcl 5 Aug 2006 20:55:02 -0000 1.11 @@ -107,14 +107,47 @@ return $lpairs } + # + # this should be OO-ified -gustaf + proc ::xowiki::validate_file {} { + my log "--F validate_file data=[my exists data]" + my instvar data + my get_uploaded_file + my log "--F validate_file returns [$data exists import_file]" + upvar title title + if {$title eq ""} {set title [$data set upload_file]} + return [$data exists import_file] + } + proc ::xowiki::validate_name {} { - upvar name name nls_language nls_language folder_id folder_id - if {![regexp {^..:} $name]} { - if {$nls_language eq ""} {set nls_language [lang::conn::locale]} - set name [string range $nls_language 0 1]:$name + upvar name name nls_language nls_language folder_id folder_id \ + object_type object_type mime_type mime_type + my log "--F validate_name ot=$object_type data=[my exists data]" + my instvar data + if {$object_type eq "::xowiki::File" && [$data exists mime_type]} { + #my get_uploaded_file + switch -glob -- [$data set mime_type] { + image/* {set type image} + default {set type file} + } + if {$name ne ""} { + regexp {^(.*):(.*)$} $name _ _t stripped_name + if {![info exists stripped_name]} {set stripped_name $name} + } else { + set stripped_name [$data set upload_file] + } + set name ${type}:[::xowiki::Page normalize_name \ + -package_id [ad_conn package_id] $stripped_name] + } else { + if {![regexp {^..:} $name]} { + if {![info exists nls_language]} {set nls_language ""} + if {$nls_language eq ""} {set nls_language [lang::conn::locale]} + set name [string range $nls_language 0 1]:$name + } + set name [::xowiki::Page normalize_name -package_id [ad_conn package_id] $name] } - set name [::xowiki::Page normalize_name -package_id [ad_conn package_id] $name] + # check, if we try to create a new item with an existing name #my log "--form vars = [ns_set array [ns_getform] ]" #my log "--form comparing '[ns_set get [ns_getform] __object_name]' w '$name'" if {[ns_set get [ns_getform] __new_p] @@ -135,7 +168,7 @@ WikiForm instproc update_references {} { my instvar data if {![my istype PageInstanceForm]} { - ### danger: update references does an ad_eval, which breaks the [template::adp_level] + ### danger: update references does an ad_eval, which breaks the [template::adp_level] ### ad_form! don't do it in pageinstanceforms. $data render_adp false $data render -update_references @@ -147,31 +180,25 @@ my instvar folder_id #ns_log notice "--F folder_id=$folder_id" ##### why is ns_cache names xowiki_cache *pattern* not working??? - foreach entry [ns_cache names xowiki_cache] { - if {[string match link-*-$folder_id $entry]} { - array set tmp [ns_cache get xowiki_cache $entry] - #ns_log notice "--F item_id [$data set item_id] tmp(item_id) = $tmp(item_id)" - if {$tmp(item_id) == [$data set item_id]} { - ns_cache flush xowiki_cache $entry - } + foreach entry [ns_cache names xowiki_cache link-*-$folder_id] { + array set tmp [ns_cache get xowiki_cache $entry] + #ns_log notice "--F item_id [$data set item_id] tmp(item_id) = $tmp(item_id)" + if {$tmp(item_id) == [$data set item_id]} { + ns_cache flush xowiki_cache $entry } } - ### provide a nice link - #my set submit_link [::xowiki::Page pretty_link \ - -package_id [$data set parent_id] \ - [$data set name]] } WikiForm instproc new_request {} { my instvar data - $data set creator [$data get_user_name [ad_conn user_id]] + $data set creator [::xo::get_user_name [ad_conn user_id]] next } WikiForm instproc edit_request args { my instvar data if {[$data set creator] eq ""} { - $data set creator [$data get_user_name [ad_conn user_id]] + $data set creator [::xo::get_user_name [ad_conn user_id]] } next } @@ -200,7 +227,62 @@ {text:text(textarea),nospell,optional {label #xowiki.content#} {html {cols 80 rows 10}}}} + } + + # + # File Form + # + + Class create FileForm -superclass WikiForm \ + -parameter { + {html { enctype multipart/form-data }} \ + {field_list {item_id name text title creator description}} + {f.name + {name:text,nospell,optional + {help_text {Can be obtained from the name of the uploaded file}}}} + {f.title + {title:text,optional {label #xowiki.title#} {html {size 80}} }} + {f.text + {upload_file:file(file) + {label #xowiki.content#} + {html {size 30}} }} + {validate { + {upload_file {\[::xowiki::validate_file\]} {For new entries, \ + a upload file must be provided}} + {name {\[::xowiki::validate_name\]} {Another item with this name exists \ + already in this folder}} + }} + } + + FileForm instproc get_uploaded_file {} { + my instvar data + #my log "--F... [ns_conn url] [ns_conn query] form vars = [ns_set array [ns_getform]]" + set upload_file [$data form_parameter upload_file] + my log "--F... upload_file = $upload_file" + if {$upload_file ne ""} { + $data set upload_file $upload_file + $data set import_file [$data form_parameter upload_file.tmpfile] + $data set mime_type [$data form_parameter upload_file.content-type] + } else { + my log "--F no upload_file provided [lsort [$data info vars]]" + if {[$data exists mime_type]} { + #my log " mime_type=[$data set mime_type]" + #my log " text=[$data set text]" + regexp {^[^:]+:(.*)$} [$data set name] _ upload_file + $data set upload_file $upload_file + $data set import_file [$data full_file_name] + #my log " import_type=[$data set import_file]" + } + } } + FileForm instproc new_data {} { + #my get_uploaded_file + return [next] + } + FileForm instproc edit_data {} { + #my get_uploaded_file + return [next] + } # # Object Form 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 -N -r1.44 -r1.45 --- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 31 Jul 2006 21:24:12 -0000 1.44 +++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 5 Aug 2006 20:55:02 -0000 1.45 @@ -29,6 +29,12 @@ -mime_type text/plain \ -form ::xowiki::PlainWikiForm + ::Generic::CrClass create File -superclass Page \ + -pretty_name "XoWiki File" -pretty_plural "XoWiki Files" \ + -table_name "xowiki_file" -id_column "file_id" \ + -storage_type file \ + -form ::xowiki::FileForm + ::Generic::CrClass create PageTemplate -superclass Page \ -pretty_name "XoWiki Page Template" -pretty_plural "XoWiki Page Templates" \ -table_name "xowiki_page_template" -id_column "page_template_id" \ @@ -521,7 +527,7 @@ # Page proc pretty_link {{-fully_qualified:boolean false} -lang -package_id name} { my instvar folder_id - my log "--u name=<$name>" + #my log "--u name=<$name>" if {![info exists package_id]} {set package_id [$folder_id set package_id]} if {![my isobject ::$package_id]} { @@ -531,9 +537,11 @@ set url [::$package_id package_url] if {![info exists lang]} { - regexp {^(..):(.*)$} $name _ lang name + if {![regexp {^(..):(.*)$} $name _ lang name]} { + regexp {^(file|image):(.*)$} $name _ lang name + } } - if {![info exists lang] && ![string match :* $name]} { + if {![info exists lang] && ![regexp {^(:|(file|image))} $name]} { set lang [string range [lang::conn::locale] 0 1] } set host [expr {$fully_qualified ? [ad_url] : ""}] @@ -569,15 +577,15 @@ if {[$object istype ::xowiki::Package]} { set base [$package_id package_url] if {[info exists url]} { - return [uplevel export_vars -base $base$url [list $args]] + return [uplevel export_vars -base [list $base$url] [list $args]] } else { lappend args [list $method 1] - return [uplevel export_vars -base $base [list $args]] + return [uplevel export_vars -base [list $base] [list $args]] } } elseif {[$object istype ::xowiki::Page]} { set base [$package_id url] lappend args [list m $method] - return [uplevel export_vars -base $base [list $args]] + return [uplevel export_vars -base [list $base] [list $args]] } } return "" @@ -634,25 +642,15 @@ return 0 } - Page instproc get_user_name {uid} { - if {$uid ne "" && $uid != 0} { - acs_user::get -user_id $uid -array user - return "$user(first_names) $user(last_name)" - } else { - return nobody - } - } - - Page instproc initialize_loaded_object {} { my instvar title creator if {[info exists title] && $title eq ""} {set title [my set name]} - #if {$creator eq ""} {set creator [my get_user_name [my set creation_user]]} + #if {$creator eq ""} {set creator [::xo::get_user_name [my set creation_user]]} next } Page instproc regsub-eval {re string cmd} { - subst [regsub -all $re [string map {\[ \\[ \] \\] \$ \\$ \\ \\\\} $string] \ + subst [regsub -all $re [string map {\" \\\" \[ \\[ \] \\] \$ \\$ \\ \\\\} $string] \ "\[$cmd\]"] } @@ -709,10 +707,14 @@ return "$ch$label" } + set name "" my instvar parent_id package_id # do we have a language link (it starts with a ':') if {[regexp {^:(..):(.*)$} $link _ lang stripped_name]} { set link_type language + } elseif {[regexp {^(file|image):(.*)$} $link _ link_type stripped_name]} { + set lang "" + set name $link } else { # do we have a typed link? if {![regexp {^([^:][^:][^:]+):((..):)?(.+)$} $link _ link_type _ lang stripped_name]} { @@ -723,13 +725,14 @@ regexp {^(..):(.+)$} $link _ lang stripped_name } } - set stripped_name [Page normalize_name -package_id $package_id $stripped_name] - if {$lang eq ""} {set lang [my lang]} + set normalized_name [Page normalize_name -package_id $package_id $stripped_name] + if {$lang eq ""} {set lang [my lang]} + if {$name eq ""} {set name $lang:$normalized_name} if {$label eq $arg} {set label $stripped_name} Link create [self]::link \ - -type $link_type -name $lang:$stripped_name -lang $lang \ - -stripped_name $stripped_name -label $label \ + -type $link_type -name $name -lang $lang \ + -stripped_name $normalized_name -label $label \ -folder_id $parent_id -package_id $package_id return $ch[[self]::link render] } @@ -906,6 +909,63 @@ } # + # Methods of ::xowiki::File + # + + File parameter { + {render_adp 0} + } + File instproc full_file_name {} { + if {![my exists full_file_name]} { + if {[my exists item_id]} { + my instvar text mime_type package_id item_id revision_id + set storage_area_key [db_string get_storage_key \ + "select storage_area_key from cr_items where item_id=$item_id"] + my set full_file_name [cr_fs_path $storage_area_key]/$text + #my log "--F setting FILE=[my set full_file_name]" + } + } + return [my set full_file_name] + } + + File instproc get_content {} { + my instvar name mime_type description parent_id package_id creation_user + set page_link [my make_link [self] download] + #my log "--F page_link=$page_link ---- " + set t [TableWidget new -volatile \ + -columns { + AnchorField name -label [_ xowiki.name] + Field mime_type -label [_ xowiki.page_type] + Field last_modified -label "Last Modified" + Field mod_user -label "By User" + Field size -label "Size" + }] + + regsub {[.][0-9]+([^0-9])} [my set last_modified] {\1} last_modified + regexp {^([^:]+):(.*)$} $name _ link_type stripped_name + set label $stripped_name + + $t add \ + -name $stripped_name \ + -mime_type $mime_type \ + -name.href $page_link \ + -last_modified $last_modified \ + -mod_user [::xo::get_user_name $creation_user] \ + -size [file size [my full_file_name]] + + if {$link_type eq "image"} { + set l [Link new -volatile \ + -type $link_type -name $name -lang "" \ + -stripped_name $stripped_name -label $label \ + -folder_id $parent_id -package_id $package_id] + set image "
[$l render]
" + } else { + set image "" + } + return "$image

[$t asHTML]

\n

$description

" + } + + # # PageTemplate specifics # PageTemplate parameter { 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 -N -r1.2 -r1.3 --- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 31 Jul 2006 21:24:12 -0000 1.2 +++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 5 Aug 2006 20:55:02 -0000 1.3 @@ -47,7 +47,7 @@ my log "--after user_tracking" set references [my references] - my log "--after references" + my log "--after references = <$references>" # export title, text, and lang_links to current scope my instvar title name text lang_links @@ -148,7 +148,7 @@ #} # set some default values if they are provided - foreach key {name} { + foreach key {name title last_page_id} { if {[$package_id exists_query_parameter $key]} {my set $key [$package_id query_parameter $key]} } @@ -220,8 +220,15 @@ return $html } + File instproc download {} { + my instvar text mime_type package_id item_id revision_id + $package_id set mime_type $mime_type + $package_id set delivery \ + [expr {[my isobject bgdelivery] ? "ad_returnfile_background" : "ns_returnfile"}] + #my log "--F FILE=[my full_file_name]" + return [my full_file_name] + } - Page instproc revisions {} { my instvar package_id name item_id set context [list [list [$package_id url] $name ] [_ xotcl-core.revisions]] @@ -266,6 +273,8 @@ ns_cache flush xotcl_object_type_cache item_id-of-$parent_id ::$parent_id destroy } + set key link-*-$name-$parent_id + foreach n [ns_cache names xowiki_cache $key] {ns_cache flush xowiki_cache $n} ad_returnredirect [my query_parameter "return_url" [$package_id package_url]] } Index: openacs-4/packages/xowiki/www/index.vuh =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/index.vuh,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/xowiki/www/index.vuh 26 Jul 2006 22:56:46 -0000 1.1 +++ openacs-4/packages/xowiki/www/index.vuh 5 Aug 2006 20:55:03 -0000 1.2 @@ -13,6 +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]]" -ns_return 200 text/html [$Package invoke -method $m] +#$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 set delivery] 200 [$Package set mime_type] $text +#$Package log "--done" ad_script_abort 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 -N -r1.6 -r1.7 --- openacs-4/packages/xowiki/www/oacs-view.adp 31 Jul 2006 21:37:05 -0000 1.6 +++ openacs-4/packages/xowiki/www/oacs-view.adp 5 Aug 2006 20:55:08 -0000 1.7 @@ -54,11 +54,9 @@ @content;noquote@
- - -

 

#xowiki.references_label# @references;noquote@ -@lang_links;noquote@ - + +

 

#xowiki.references_label# @references;noquote@ @lang_links;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/view-default.adp,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/xowiki/www/view-default.adp 31 Jul 2006 21:37:05 -0000 1.3 +++ openacs-4/packages/xowiki/www/view-default.adp 5 Aug 2006 20:55:08 -0000 1.4 @@ -41,11 +41,9 @@ @content;noquote@
- - -

 

#xowiki.references_label# @references;noquote@ -@lang_links;noquote@ - + +

 

#xowiki.references_label# @references;noquote@ @lang_links;noquote@ +
#xowiki.your_tags_label#: @tags_with_links;noquote@ Index: openacs-4/packages/xowiki/www/admin/list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/admin/list.tcl,v diff -u -N -r1.1 -r1.2 --- openacs-4/packages/xowiki/www/admin/list.tcl 26 Jul 2006 22:56:46 -0000 1.1 +++ openacs-4/packages/xowiki/www/admin/list.tcl 5 Aug 2006 20:55:08 -0000 1.2 @@ -55,8 +55,10 @@ -columns { ImageField_EditIcon edit -label "" AnchorField name -label [_ xowiki.name] -orderby name - Field object_type -label [_ xowiki.page_type] -orderby object_type + Field object_type -label [_ xowiki.page_type] -orderby object_type + Field size -label "Size" -orderby size -html {align right} Field last_modified -label "Last Modified" -orderby last_modified + Field mod_user -label "By User" -orderby mod_user ImageField_DeleteIcon delete -label "" ;#-html {onClick "return(confirm('Confirm delete?'));"} } @@ -70,7 +72,8 @@ [$object_type instance_select_query \ -folder_id $folder_id \ -with_subtypes $with_subtypes \ - -select_attributes [list "to_char(last_modified,'YYYY-MM-DD HH24:MI:SS') as last_modified"] \ + -select_attributes [list content_length creation_user \ + "to_char(last_modified,'YYYY-MM-DD HH24:MI:SS') as last_modified"] \ -order_clause $order_clause \ ] { set page_link [::xowiki::Page pretty_link $name] @@ -81,7 +84,9 @@ -object_type $object_type \ -name.href $page_link \ -last_modified $last_modified \ + -size $content_length \ -edit.href [export_vars -base $page_link {{m edit}}] \ + -mod_user [::xo::get_user_name $creation_user] \ -delete.href [export_vars -base $page_link {{m delete} return_url}] } Index: openacs-4/packages/xowiki/www/portlets/weblog.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/portlets/Attic/weblog.tcl,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/xowiki/www/portlets/weblog.tcl 26 Jul 2006 22:56:46 -0000 1.5 +++ openacs-4/packages/xowiki/www/portlets/weblog.tcl 5 Aug 2006 20:55:08 -0000 1.6 @@ -11,6 +11,7 @@ append content "
" \ "

[my set title]

" \ "

Created by [my set creator], " \ + "last modfified by [::xo::get_user_name [my set creation_user]] " \ "[my set pretty_date]

" \ [my set description] \n \ "
" Index: openacs-4/packages/xowiki/www/resources/file.jpg =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/file.jpg,v diff -u -N Binary files differ