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.37 -r1.38 --- openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml 18 Mar 2008 13:02:45 -0000 1.37 +++ openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml 13 Apr 2008 16:32:56 -0000 1.38 @@ -63,6 +63,7 @@ Publish Date Content Page Title + %errorMsg% Another item with the name '%value%' exists already in this folder Page Type Instance Attributes @@ -83,6 +84,7 @@ A portlet with the title '%page_title%' already exists in this portal. Published References to this Page: + References of this Page: Revisions %errorMsg% Search Index: openacs-4/packages/xowiki/tcl/includelet-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/includelet-procs.tcl,v diff -u -r1.22 -r1.23 --- openacs-4/packages/xowiki/tcl/includelet-procs.tcl 11 Apr 2008 22:09:57 -0000 1.22 +++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl 13 Apr 2008 16:32:56 -0000 1.23 @@ -1250,6 +1250,11 @@ return "Add to My Yahoo!" } + + # + # my-references lists the pages which are refering to the + # including page + # ::xowiki::IncludeletClass create my-references \ -superclass ::xowiki::Includelet \ -parameter {{__decoration none}} @@ -1285,6 +1290,43 @@ return $result } + # + # my-refers lists the pages which are refered to by the + # including page + # + ::xowiki::IncludeletClass create my-refers \ + -superclass ::xowiki::Includelet \ + -parameter {{__decoration none}} + + my-refers instproc render {} { + my get_parameters + my instvar __including_page + + set item_id [$__including_page item_id] + set refs [list] + db_foreach [my qn get_references] "SELECT reference,ci.name,f.package_id \ + from xowiki_references,cr_items ci,cr_folders f \ + where page=$item_id and ci.item_id = reference and ci.parent_id = f.folder_id" { + ::xowiki::Package require $package_id + lappend refs "$name" + } + set references [join $refs ", "] + + array set lang {found "" undefined ""} + foreach i [$__including_page array names lang_links] { + set lang($i) [join [$__including_page set lang_links($i)] ", "] + } + append references " " $lang(found) + set result "" + if {$references ne " "} { + append result "#xowiki.references_of_label# $references" + } + if {$lang(undefined) ne ""} { + append result "#xowiki.create_this_page_in_language# $lang(undefined)" + } + return $result + } + } namespace eval ::xowiki::includelet { 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.41 -r1.42 --- openacs-4/packages/xowiki/tcl/link-procs.tcl 25 Feb 2008 11:16:01 -0000 1.41 +++ openacs-4/packages/xowiki/tcl/link-procs.tcl 13 Apr 2008 16:32:56 -0000 1.42 @@ -34,8 +34,18 @@ if {[my exists target]} {append atts " target='[my target]'"} } Link instproc init {} { + my instvar page name set class [self class]::[my type] if {[my isclass $class]} {my class $class} + if {![my exists stripped_name]} { + # set stripped name and lang from provided name + my instvar stripped_name lang + regexp {^(..):(.*)$} $name _ lang stripped_name + } + if {![my exists label]} {my label $name} + if {![my exists folder_id]} {my folder_id [$page parent_id]} + if {![my exists package_id]} {my package_id [$page package_id]} + #my log "--L link has class [my info class] // $class" } Link instproc resolve {} {