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.11 -r1.12
--- openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml	29 Dec 2006 11:01:36 -0000	1.11
+++ openacs-4/packages/xowiki/catalog/xowiki.de_DE.ISO-8859-1.xml	3 Jan 2007 14:03:57 -0000	1.12
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="xowiki" package_version="0.41" locale="de_DE" charset="ISO-8859-1">
+<message_catalog package_key="xowiki" package_version="0.43" locale="de_DE" charset="ISO-8859-1">
 
-  <msg key="admin">Administrator</msg>
+  <msg key="admin">Verwalten</msg>
   <msg key="back">Zur�ck</msg>
   <msg key="content">Inhalt</msg>
   <msg key="delete">L�schen</msg>
@@ -25,5 +25,6 @@
   <msg key="search">Suche</msg>
   <msg key="title">Titel</msg>
   <msg key="view">Ansehen</msg>
+  <msg key="weblog-more">mehr...</msg>
   <msg key="your_tags_label">Pers�nliche Schlagworte</msg>
 </message_catalog>
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.13 -r1.14
--- openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml	29 Dec 2006 11:01:36 -0000	1.13
+++ openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml	3 Jan 2007 14:03:57 -0000	1.14
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="xowiki" package_version="0.41" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="xowiki" package_version="0.43" locale="en_US" charset="ISO-8859-1">
 
   <msg key="admin">Admin</msg>
   <msg key="back">Back</msg>
@@ -25,5 +25,6 @@
   <msg key="search">Search</msg>
   <msg key="title">Title</msg>
   <msg key="view">View</msg>
+  <msg key="weblog-more">more...</msg>
   <msg key="your_tags_label">Your Tags</msg>
 </message_catalog>
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.3 -r1.4
--- openacs-4/packages/xowiki/tcl/weblog-procs.tcl	29 Dec 2006 11:01:36 -0000	1.3
+++ openacs-4/packages/xowiki/tcl/weblog-procs.tcl	3 Jan 2007 14:03:58 -0000	1.4
@@ -74,6 +74,7 @@
       return $content
     }]
     foreach i [split [my exclude_item_ids] ,] {lappend ::xowiki_page_item_id_rendered $i}
+    $items set weblog_obj [self]
  
     set sql \
         [list -folder_id $folder_id \
@@ -175,17 +176,24 @@
 
   # default layout for weblog entries
   Class create ::xowiki::Weblog::EntryRenderer -instproc render {} {
-    my instvar package_id name title creator creation_user pretty_date
-    my log "-- rendering default $name" 
+    my instvar package_id name title creator creation_user pretty_date description 
+    [my set __parent] instvar weblog_obj
+
+    set link [::$package_id pretty_link $name]
+    set more [expr {[$weblog_obj summary] ? 
+                    " <span class='more'> \[<a href='$link'>#xowiki.weblog-more#</a>\]</span>" : ""}]
+    append more "<p></p>"
+
     append content "<DIV class='post' style='clear: both;'>" \
-        "<h2><a href='[::$package_id pretty_link $name]'>$title</a></h2>" \
+        "<h2><a href='$link'>$title</a></h2>" \
         "<p class='auth'>Created by $creator, " \
         "last modfified by [::xo::get_user_name $creation_user] " \
         "<span class='date'>$pretty_date</span></p>" \
-        [my set description] \n \
+        $description $more \n\
         "</DIV>"
   }
 
+
   # Default layout for weblog
   Class create ::xowiki::Weblog::WeblogRenderer -instproc render {} {
     my instvar filter_msg link name prev_page_link next_page_link 
Index: openacs-4/packages/xowiki/www/prototypes/weblog-portlet.page
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/prototypes/weblog-portlet.page,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/xowiki/www/prototypes/weblog-portlet.page	17 Aug 2006 01:44:27 -0000	1.1
+++ openacs-4/packages/xowiki/www/prototypes/weblog-portlet.page	3 Jan 2007 14:03:58 -0000	1.2
@@ -18,13 +18,20 @@
   # weblog 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
+    my instvar package_id name title creator creation_user pretty_date description 
+    [my set __parent] instvar weblog_obj
+
+    set link [::$package_id pretty_link $name]
+    set more [expr {[$weblog_obj summary] ? 
+                    " <span class='more'> \[<a href='$link'>#xowiki.weblog-more#</a>\]</span>" : ""}]
+    append more "<p></p>"
+
     append content "<DIV class='post' style='clear: both;'>" \
-        "<h2><a href='[::$package_id pretty_link $name]'>$title</a></h2>" \
+        "<h2><a href='$link'>$title</a></h2>" \
         "<p class='auth'>Created by $creator, " \
         "last modfified by [::xo::get_user_name $creation_user] " \
         "<span class='date'>$pretty_date</span></p>" \
-        $description \n\
+        $description $more \n\
         "</DIV>"
   }
 
@@ -63,9 +70,9 @@
       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"
+      #my log "--W including page $i"
     } else {
-      my log "--W NO including page"
+      #my log "--W NO including page"
       set exclude_item_ids [$page item_id]
     }
 
@@ -77,7 +84,7 @@
     set renderer       [self]::WeblogRenderer
     set entry_renderer [self]::EntryRenderer 
     
-    set w [::xowiki::Weblog new -volatile \
+    set w [::xowiki::Weblog new -destroy_on_cleanup \
                -package_id $package_id \
                -page_size $page_size \
                -page_number $page_number \
Index: openacs-4/packages/xowiki/www/resources/weblog.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/resources/weblog.css,v
diff -u -N -r1.1 -r1.2
--- openacs-4/packages/xowiki/www/resources/weblog.css	30 Apr 2006 23:53:35 -0000	1.1
+++ openacs-4/packages/xowiki/www/resources/weblog.css	3 Jan 2007 14:03:58 -0000	1.2
@@ -12,6 +12,10 @@
     background: url(/resources/xowiki/bracket.gif) no-repeat;
 }
 
+.post .more {
+    color: #9a9a9b;
+}
+
 .post h2 {
     font: normal 140%/1.3em Arial, Verdana, Helvetica, sans-serif;
 }