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 -N -r1.26 -r1.27 --- openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml 21 Nov 2007 19:03:32 -0000 1.26 +++ openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml 22 Nov 2007 10:32:57 -0000 1.27 @@ -17,6 +17,8 @@ Formular ausf�llen Index Neuer Eintrag + Quelle + Kurztext Verst�ndigungen Creator Kurzbeschreibung 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 -N -r1.32 -r1.33 --- openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml 21 Nov 2007 09:13:26 -0000 1.32 +++ openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml 22 Nov 2007 10:32:57 -0000 1.33 @@ -38,6 +38,8 @@ %errorMsg% Index New Page + Source + Teaser Notifications Invalid numeric value Creator 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.95 -r1.96 --- openacs-4/packages/xowiki/tcl/package-procs.tcl 19 Nov 2007 13:13:11 -0000 1.95 +++ openacs-4/packages/xowiki/tcl/package-procs.tcl 22 Nov 2007 10:32:57 -0000 1.96 @@ -814,7 +814,7 @@ return [$page edit -new true -autoname $autoname] } - Package instproc flush_references {-item_id:integer,required -name} { + Package instproc flush_references {-item_id:integer,required -name:required} { my instvar folder_id id if {$name eq "::$folder_id"} { #my log "--D deleting folder object ::$folder_id" 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 -N -r1.30 -r1.31 --- openacs-4/packages/xowiki/tcl/weblog-procs.tcl 21 Nov 2007 11:49:44 -0000 1.30 +++ openacs-4/packages/xowiki/tcl/weblog-procs.tcl 22 Nov 2007 10:32:57 -0000 1.31 @@ -19,10 +19,11 @@ {name_filter ""} {entry_label "Postings"} {exclude_item_ids 0} - {summary false} - {summary_chars 150} {entry_renderer ::xowiki::Weblog::Entry} {entry_flag} + {summary false} + {summary_chars 150} + {compute_summary false} } ::xowiki::Weblog proc instantiate_forms {-entries_of:required -package_id:required} { @@ -172,9 +173,11 @@ -item_id $item_id -revision_id $revision_id \ -name $name -title $title -creator $creator] $p set creation_user $creation_user - $p set description [expr {$description eq "" && $body ne ""? \ - "[string range $body 0 $summary_chars]..." : \ - $description}] + if {$description eq "" && [my compute_summary] && $body ne ""} { + $p set description [my get_description -nr_chars $summary_chars $body] + } else { + $p set description $description + } $p set instance_attributes $instance_attributes } else { # do full instantiation and rendering @@ -246,7 +249,8 @@ # ::xo::Page requireCSS "/resources/xowiki/weblog.css" - $items set entry_renderer [my entry_renderer] + #$items set entry_renderer [my entry_renderer] + set content [$items render] $items destroy_on_cleanup #my log "--W end" 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.189 -r1.190 --- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 21 Nov 2007 19:03:32 -0000 1.189 +++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 22 Nov 2007 10:32:57 -0000 1.190 @@ -824,17 +824,21 @@ return $template_value } - Page instproc get_description {content} { + Page instproc get_description {-nr_chars content} { my instvar revision_id set description [my set description] if {$description eq "" && $content ne ""} { set description [ad_html_text_convert -from text/html -to text/plain -- $content] } if {$description eq "" && $revision_id > 0} { - set description [db_string [my qn get_description_from_syndication] \ + set body [db_string [my qn get_description_from_syndication] \ "select body from syndication where object_id = $revision_id" \ -default ""] + set description [ad_html_text_convert -from text/html -to text/plain -- $body] } + if {[info exists nr_chars] && [string length $description] > $nr_chars} { + set description [string range $description 0 $nr_chars]... + } return $description } @@ -1271,6 +1275,7 @@ $payload set package_id [my set package_id] if {[catch {$payload contains $cmd} error ]} { ns_log error "content $cmd lead to error: $error" + ::xo::clusterwide ns_cache flush xotcl_object_cache [my item_id] } #my log "call init mixins=[my info mixin]//[$payload info mixin]" $payload init 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.114 -r1.115 --- openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 21 Nov 2007 19:11:31 -0000 1.114 +++ openacs-4/packages/xowiki/tcl/xowiki-www-procs.tcl 22 Nov 2007 10:32:57 -0000 1.115 @@ -11,15 +11,12 @@ namespace eval ::xowiki { Page instproc htmlFooter {{-content ""}} { - my instvar package_id description + my instvar package_id if {[my exists __no_footer]} {return ""} set footer "" - - if {$description eq ""} { - set description [my get_description $content] - } + set description [my get_description $content] #set ::META(description) $description Index: openacs-4/packages/xowiki/www/prototypes/announcements.page =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/prototypes/Attic/announcements.page,v diff -u -N --- openacs-4/packages/xowiki/www/prototypes/announcements.page 13 Nov 2007 11:36:45 -0000 1.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,121 +0,0 @@ -# -*- tcl-*- -# $Id: announcements.page,v 1.5 2007/11/13 11:36:45 gustafn Exp $ -::xowiki::Object new -title "Announcements" -text { - # - # A sample Announcements object. - # - my initialize -parameter { - {-page_size:integer 10} - {-page_number:integer 1} - {-summary:boolean 0} - {-date ""} - {-tag ""} - {-ptag ""} - {-entries_of en:announcement-entry} - } - - # The name filter is not the most efficient way of selecting - # autonamed entries. However, most times the number of announcements items - # is not overwhelming, so we can live with that for the time being. - # TODO: more efficient selection of autonamed entries - - # - # The following definition is the default rendering per - # announcements entry. This is executed in the context of every displayed page. - # - Class create EntryRenderer -instproc render {} { - my instvar package_id name title creator creation_user pretty_date description publish_date - [my set __parent] instvar weblog_obj - - set link [::$package_id pretty_link $name] - set more [expr {[$weblog_obj summary] ? - " \[#xowiki.weblog-more#\]" : ""}] - append more "

" - set day [lc_time_fmt [my set publish_date] "%x"] - set my_footer [my htmlFooter] - - append content "
" \ - "

$title

" \ - " ($day)
" \ - $description $more $my_footer \n\ - "
" - } - - # - # The following definition is the renderer for the full weblog. - # This is executed in the context of the whole weblog object - # - Class create AnnouncementsRenderer -instproc render {} { - my instvar filter_msg link name prev_page_link next_page_link title - - set filter "" - set prev "" - set next "" - - if {[info exists filter_msg]} { - set filter "
$filter_msg
" - } - if {[info exists prev_page_link]} { - set prev "\ - Previous Page" - } - if {[info exists next_page_link]} { - set next "\ - Next Page" - } - set page [my set __page] - set rss [$page include "rss-button -title {[$page title]} -entries_of [my entries_of]"] - #set rss [list [self] [lsort [my info vars]]] - return "
$filter [next] $prev $next
$rss
" - } - - my proc content {} { - my get_parameters - set page [my info parent] - - if {[$page exists __including_page]} { - set i [$page set __including_page] - set exclude_item_ids [$i item_id] - $i set render_adp 0 ;# no double substitutions - #my log "--W including page $i" - } else { - #my log "--W NO including page" - set exclude_item_ids [$page item_id] - $page set __no_footer 1 - } - - # on the announcements page, an edit-new should not create an object - ::xo::cc set_parameter object_type ::xowiki::Page - ::xo::cc set_parameter autoname 1 - - # use the above defined custom renderers - set renderer [self]::AnnouncementsRenderer - set entry_renderer [self]::EntryRenderer - - set w [::xowiki::Weblog new -destroy_on_cleanup \ - -package_id $package_id \ - -page_size $page_size \ - -page_number $page_number \ - -summary $summary \ - -date $date \ - -locale "default+system" \ - -category_id [ns_queryget category_id] \ - -tag $tag \ - -ptag $ptag \ - -entry_label "Announcements" \ - -exclude_item_ids $exclude_item_ids \ - -entry_renderer $entry_renderer \ - -entry_flag __no_form_page_footer \ - -entries_of $entries_of \ - ] - $w set __page $page - $w mixin add $renderer - return [$w render] - } - -} - - - Index: openacs-4/packages/xowiki/www/prototypes/news-item.page =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/prototypes/Attic/news-item.page,v diff -u -N -r1.2 -r1.3 --- openacs-4/packages/xowiki/www/prototypes/news-item.page 21 Nov 2007 09:27:08 -0000 1.2 +++ openacs-4/packages/xowiki/www/prototypes/news-item.page 22 Nov 2007 10:33:25 -0000 1.3 @@ -4,15 +4,15 @@ -set name en:news-item \ -title "News Item" \ -set anon_instances t \ - -set form {{
@_title@ @detail_link@ @_text@ @_nls_language@ @_publish_status@
} text/html} \ - -set text {

@_text@

@detail_link@

} \ + -set form {{
@_title@ @detail_link@ @_text@ @_description@ @_nls_language@ @_publish_status@
} text/html} \ + -set text {@_text@
@detail_link@} \ -set form_constraints { _page_order:hidden - _description:hidden + {_description:textarea,rows=3,label=#xowiki.news-teaser#} {_publish_status:radio,options={live ready} {draft production},label=#xowiki.publish_status#} _creator:hidden _title:text,label=#acs-kernel.common_Title# - {detail_link:detail_link,label=Source} + {detail_link:detail_link,label=#xowiki.news-source#} } Index: openacs-4/packages/xowiki/www/prototypes/news.page =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/prototypes/news.page,v diff -u -N -r1.5 -r1.6 --- openacs-4/packages/xowiki/www/prototypes/news.page 21 Nov 2007 11:50:02 -0000 1.5 +++ openacs-4/packages/xowiki/www/prototypes/news.page 22 Nov 2007 10:33:25 -0000 1.6 @@ -44,7 +44,6 @@ set link [::xowiki::Includelet detail_link \ -package_id $package_id -name $name \ -instance_attributes [my get_instance_attributes]] - #set link [::$package_id pretty_link $name] set more [expr {[$weblog_obj summary] ? " \[#xowiki.weblog-more#\]" : ""}] append more "

" @@ -53,10 +52,9 @@ set edit_button [my include [list edit-item-button -book_mode true]] if {$edit_button ne ""} {set edit_button "
$edit_button
"} - append content "
" $edit_button \ - "

$title

" \ - " ($day)
" \ + "

$title

" \ + " ($day)
\n" \ $description $more $my_footer \n\ "
" } 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 -N -r1.25 -r1.26 --- openacs-4/packages/xowiki/www/resources/xowiki.css 20 Nov 2007 11:00:04 -0000 1.25 +++ openacs-4/packages/xowiki/www/resources/xowiki.css 22 Nov 2007 10:32:57 -0000 1.26 @@ -159,6 +159,7 @@ div.news-item {clear: both; border: 1px solid #a9a9a9; padding: 15px 15px; margin: 10px 10px; background: #f8f8f8;} +div.news-item .item-header {margin-bottom: 12px;} div.news-item h2 {display: inline; font-weight: bolder;} /*div.xowiki-content div.news-item .item-footer {margin-left: 20px; margin-right: 20px;}*/