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 -r1.2 -r1.3
--- openacs-4/packages/xowiki/www/prototypes/news.page	13 Nov 2007 11:36:45 -0000	1.2
+++ openacs-4/packages/xowiki/www/prototypes/news.page	19 Nov 2007 12:41:02 -0000	1.3
@@ -27,18 +27,24 @@
     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 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] ? 
                     " <span class='more'> \[<a href='$link'>#xowiki.weblog-more#</a>\]</span>" : ""}]
     append more "<p></p>"
     set day [lc_time_fmt [my set publish_date] "%x"]
     set my_footer [my htmlFooter]
 
-    append content "<DIV class='news' style='clear: both;'>" \
-      "<h2 style='display: inline;'><a href='$link'>$title</a></h2>" \
-      "&nbsp;<span class='date'>($day)</span><br/> " \
-      $description $more $my_footer \n\
-      "</DIV>"
+    set edit_button [my include [list edit-item-button -book_mode true]]
+    if {$edit_button ne ""} {set edit_button "<div style='float: right'>$edit_button</div>"}
+
+    append content "<DIV class='news-item' style='clear: both;'>" $edit_button \
+        "<h2><a href='$link'>$title</a></h2>" \
+        "&nbsp;<span class='date'>($day)</span><br/> " \
+        $description $more $my_footer \n\
+        "</DIV>"
   }
 
   #
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 -r1.11 -r1.12
--- openacs-4/packages/xowiki/www/prototypes/weblog-portlet.page	13 Nov 2007 11:36:45 -0000	1.11
+++ openacs-4/packages/xowiki/www/prototypes/weblog-portlet.page	19 Nov 2007 12:41:02 -0000	1.12
@@ -25,13 +25,8 @@
 
     # We get the instance_attributes, if these are available. For the
     # time being, we have these only in full mode (no summary)
-    if {[my exists instance_attributes]} {
-      set instance_attributes [my set instance_attributes]
-    } else {
-      set instance_attributes ""
-    }
     set link [::xowiki::Includelet detail_link -package_id $package_id -name $name \
-                  -instance_attributes $instance_attributes]
+                  -instance_attributes [my get_instance_attributes]]
     set show_more [expr {[$weblog_obj summary] && [my exists text] && [my text] ne ""}]
     set more [expr {$show_more ? 
                     " <span class='more'> \[<a href='$link'>#xowiki.weblog-more#</a>\]</span>" : ""}]