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.53 -r1.54
--- openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml 8 Jan 2009 11:10:31 -0000 1.53
+++ openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml 15 Nov 2009 11:06:59 -0000 1.54
@@ -142,5 +142,7 @@
week
weeks
%errorMsg%
+ year
+ years
Your Tags
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.128 -r1.129
--- openacs-4/packages/xowiki/tcl/includelet-procs.tcl 5 Nov 2009 12:34:16 -0000 1.128
+++ openacs-4/packages/xowiki/tcl/includelet-procs.tcl 15 Nov 2009 11:06:59 -0000 1.129
@@ -845,6 +845,7 @@
{-max_entries:integer 10}
{-tree_name ""}
{-locale ""}
+ {-pretty_age "off"}
}}
}
@@ -886,10 +887,18 @@
db_foreach [my qn get_pages] $sql {
if {$title eq ""} {set title $name}
set itemobj [Object new]
- set prefix "$formatted_date "
- set suffix ""
+ set prefix ""
+ set suffix ""
+ switch -- $pretty_age {
+ 1 {set suffix " ([::xowiki::utility pretty_age -timestamp [clock scan $formatted_date] -locale [my locale]])"}
+ 2 {set suffix "([::xowiki::utility pretty_age -timestamp [clock scan $formatted_date] -locale [my locale] -levels 2])"}
+ default {set prefix "$formatted_date "}
+ }
+ if {$prefix ne ""} {set prefix "$prefix";$itemobj set encoded(prefix) 1}
+ if {$suffix ne ""} {set suffix "$suffix";$itemobj set encoded(suffix) 1}
foreach var {name title prefix suffix} {$itemobj set $var [set $var]}
$itemobj set href [::$package_id pretty_link $name]
+
if {![info exists categories($category_id)]} {
set categories($category_id) [::xowiki::TreeNode new \
-label [category::get_name $category_id $locale] \
Index: openacs-4/packages/xowiki/tcl/tree-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/tree-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/xowiki/tcl/tree-procs.tcl 5 Jun 2009 18:38:27 -0000 1.3
+++ openacs-4/packages/xowiki/tcl/tree-procs.tcl 15 Nov 2009 11:06:59 -0000 1.4
@@ -188,12 +188,13 @@
return "
"
}
TreeRenderer=list instproc render_item {{-highlight:boolean false} item} {
- $item instvar title prefix suffix href
+ $item instvar title href
+ set prefix [$item set prefix]
+ set suffix [$item set suffix]
+ if {![$item exists encoded(prefix)]} {set prefix [::xowiki::Includelet html_encode $prefix]}
+ if {![$item exists encoded(suffix)]} {set suffix [::xowiki::Includelet html_encode $suffix]}
append entry \
- [::xowiki::Includelet html_encode $prefix] \
- "" \
- [::xowiki::Includelet html_encode $title] \
- "[::xowiki::Includelet html_encode $suffix]"
+ $prefix "" [::xowiki::Includelet html_encode $title] "" $suffix
if {$highlight} {
return "$entry\n"
} else {
@@ -318,12 +319,13 @@
TreeRenderer create TreeRenderer=sections \
-superclass TreeRenderer=list
TreeRenderer=sections instproc render_item {{-highlight:boolean false} item} {
- $item instvar title prefix suffix href
+ $item instvar title href
+ set prefix [$item set prefix]
+ set suffix [$item set suffix]
+ if {![$item exists encoded(prefix)]} {set prefix [::xowiki::Includelet html_encode $prefix]}
+ if {![$item exists encoded(suffix)]} {set suffix [::xowiki::Includelet html_encode $suffix]}
append entry \
- [::xowiki::Includelet html_encode $prefix] \
- "" \
- [::xowiki::Includelet html_encode $title] \
- "[::xowiki::Includelet html_encode $suffix]"
+ $prefix "" [::xowiki::Includelet html_encode $title] "" $suffix
if {$highlight} {
return "$entry
\n"
} else {
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.47 -r1.48
--- openacs-4/packages/xowiki/www/resources/xowiki.css 18 Jun 2009 11:46:17 -0000 1.47
+++ openacs-4/packages/xowiki/www/resources/xowiki.css 15 Nov 2009 11:06:59 -0000 1.48
@@ -303,6 +303,15 @@
div.recent div.portlet .list-table td.list {
padding: 8px 4px;
}
+
+/* includelet "categories-recent" */
+div.categories-recent .date {
+ font-size: 85%;
+ font-weight: bold;
+ color: #9a9a9b;
+}
+
+/* inherited markup */
div.xowiki-content a.inherited {
background: url(/resources/acs-subsite/arrow-down.gif) right center no-repeat;
padding-right: 14px;