Index: openacs-4/packages/xowiki/xowiki.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v diff -u -r1.70 -r1.71 --- openacs-4/packages/xowiki/xowiki.info 13 Nov 2007 11:36:11 -0000 1.70 +++ openacs-4/packages/xowiki/xowiki.info 19 Nov 2007 12:44:00 -0000 1.71 @@ -8,7 +8,7 @@ f xowiki - + Gustaf Neumann A more generic xotcl-based wikis example with object types and subtypes based on the content repository (with category support) @@ -54,12 +54,12 @@ BSD-Style 0 - + - + Index: openacs-4/packages/xowiki/tcl/weblog-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/weblog-procs.tcl,v diff -u -r1.27 -r1.28 --- openacs-4/packages/xowiki/tcl/weblog-procs.tcl 13 Nov 2007 11:36:11 -0000 1.27 +++ openacs-4/packages/xowiki/tcl/weblog-procs.tcl 19 Nov 2007 12:44:00 -0000 1.28 @@ -163,7 +163,8 @@ if {[$p info mixin] ne ""} {$p mixin {}} if {[my exists entry_flag]} {$p set [my entry_flag] 1} if {[my no_footer]} {$p set __no_footer 1} - if {[catch {$p set description [$p render]} errorMsg]} { +# if {[catch {$p set description [$p render]} errorMsg]} {} + if {[catch {$p set description [$p get_content]} errorMsg]} { set description "Render Error ($errorMsg) $revision_id $name $title" } if {[my exists entry_flag]} {$p unset [my entry_flag]} Index: openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl,v diff -u -r1.35 -r1.36 --- openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl 13 Nov 2007 11:36:11 -0000 1.35 +++ openacs-4/packages/xowiki/tcl/xowiki-callback-procs.tcl 19 Nov 2007 12:44:00 -0000 1.36 @@ -365,6 +365,19 @@ } copy_parameter top_portlet top_includelet } + + set v 0.78 + if {[apm_version_names_compare $from_version_name $v] == -1 && + [apm_version_names_compare $to_version_name $v] > -1} { + ns_log notice "-- upgrading to $v" + # load for all xowiki package instances the weblog-portlet prototype page + foreach package_id [::xowiki::Package instances] { + ::xowiki::Package initialize -package_id $package_id -init_url false + $package_id import_prototype_page news + $package_id import_prototype_page weblog-portlet + } + copy_parameter top_portlet top_includelet + } } proc copy_parameter {from to} { Index: openacs-4/packages/xowiki/tcl/xowiki-sc-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-sc-procs.tcl,v diff -u -r1.22 -r1.23 --- openacs-4/packages/xowiki/tcl/xowiki-sc-procs.tcl 13 Sep 2007 20:48:20 -0000 1.22 +++ openacs-4/packages/xowiki/tcl/xowiki-sc-procs.tcl 19 Nov 2007 12:44:00 -0000 1.23 @@ -30,12 +30,23 @@ } $page absolute_links 1 + $page set __no_form_page_footer 1 #ns_log notice "--sc setting absolute links for page = $page [$page set name]" set html [$page render] + + $page unset __no_form_page_footer + set text [ad_html_text_convert -from text/html -to text/plain -- $html] #set text [ad_text_to_html $html]; #this could be used for entity encoded html text in rss entries + set found [string first {[1]} $text] + $page log "search=$found,text=$text" + if {$found > -1} { + append description {} + } else { + set description [string map [list "&" "&" < "<" > ">"] $text] + } #::xowiki::notification::do_notifications -page $page -html $html -text $text #ns_log notice "--sc INDEXING $revision_id -> $text" @@ -65,16 +76,21 @@ } #ns_log notice "--sc keywords $revision_id -> [array names word]" + set pubDate [::xo::db::tcl_date [$page set last_modified] tz] + set link [::xowiki::Includelet detail_link \ + -package_id $package_id -name [$page set name] \ + -absolute true \ + -instance_attributes [$page get_instance_attributes]] + return [list object_id $revision_id title [$page title] \ - content $text keywords [array names word] \ + content $html keywords [array names word] \ storage_type text mime text/html \ - syndication [list \ - link [$package_id pretty_link -absolute 1 [$page set name]] \ - description $text \ - author [$page set creator] \ - category "" \ - guid "$item_id" \ - pubDate [$page set last_modified]] \ + syndication [list link [string map [list & "&"] $link] \ + description $description \ + author [$page set creator] \ + category "" \ + guid "$item_id" \ + pubDate $pubDate] \ ] } 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.108 -r1.109 --- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 13 Nov 2007 11:36:11 -0000 1.108 +++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 19 Nov 2007 12:44:00 -0000 1.109 @@ -69,10 +69,10 @@ if {[$package_id get_parameter "with_general_comments" 0] && ![my exists_query_parameter no_gc]} { - append footer [my include my-general-comments]
+ append footer [my include my-general-comments] } - return "
$footer
\n" + return "
$footer
\n" } } @@ -742,15 +742,15 @@ $ff(_title) value "" } if {!$anon_instances} {$ff(_name) value ""} - foreach var {title detail_link text} { + foreach var [list title detail_link text description] { if {[my exists_query_parameter $var]} { set value [my query_parameter $var] switch -- $var { detail_link { set f [my lookup_form_field -name $var $form_fields] $f value $value } - title - text { + title - text - description { set f [my lookup_form_field -name _$var $form_fields] } } 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.23 -r1.24 --- openacs-4/packages/xowiki/www/resources/xowiki.css 12 Nov 2007 08:40:17 -0000 1.23 +++ openacs-4/packages/xowiki/www/resources/xowiki.css 19 Nov 2007 12:44:00 -0000 1.24 @@ -156,3 +156,10 @@ } div.collab-graph div {font-size: 85%;} div.activity-graph div {font-size: 85%;} + + +div.news-item {clear: both; border: 1px solid #a9a9a9; padding: 15px 15px; margin: 10px 10px; background: #f8f8f8;} +div.news-item h2 {display: inline; font-weight: bolder;} +div.news-item .footer {margin-left: 20px; margin-right: 20px;} + +div.xowiki-content .footer {clear: both; text-align: left; font-size: 85%;} \ No newline at end of file