Index: openacs-4/packages/lars-blogger/www/entry-chunk.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/entry-chunk.adp,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/lars-blogger/www/entry-chunk.adp	16 Oct 2003 23:10:45 -0000	1.14
+++ openacs-4/packages/lars-blogger/www/entry-chunk.adp	13 Dec 2003 14:44:34 -0000	1.15
@@ -22,47 +22,30 @@
 </div>
 
 <div class="lars_blogger_poster">
-   <if @show_poster_p@ true>
-     <br />
-     Posted by @blog.poster_first_names@ @blog.poster_last_name@ at @blog.posted_time_pretty@
-   </if>
+  <if @show_poster_p@ true>
+    <br />
+    Posted by @blog.poster_first_names@ @blog.poster_last_name@ at @blog.posted_time_pretty@
+  </if>
 
-   <if @blog.write_p@ true>
-      &nbsp;&nbsp;&nbsp;&nbsp;
-      <a href="@blog.edit_url@">Edit</a> -
-      <if @blog.draft_p@ true>
-         <a href="@blog.publish_url@">Publish</a>
-      </if>
-      <else>
-         <a href="@blog.revoke_url@">Draft</a>
-      </else>
-   </if>
+  <if @blog.write_p@ true>
+    | <a href="@blog.edit_url@">Edit</a>
+    <if @blog.draft_p@ true>
+      | <a href="@blog.publish_url@">Publish</a>
+    </if>
+    <else>
+      | <a href="@blog.revoke_url@">Draft</a>
+    </else>
+  </if>
+  | <a href="@blog.entry_archive_url@" title="Permanent URL for this entry">Permalink</a>
+  | <a href="@blog.comments_view_url@" title="View comments on this entry">Comments (@blog.num_comments@)</a>
+  <if @display_categories@ and @blog.category_id@ gt 0>
+    | <a href="@package_url@<if @screen_name@ not nil>user/@screen_name@/</if>cat/@blog.category_short_name@" title="@blog.category_name@">@blog.category_name@</a>
+  </if>
 </div>
 
-<div class="lars_blogger_entry_options">
-   <a href="@blog.entry_archive_url@" title="Permanent URL for this entry">#</a> -
-   <a href="@blog.google_url@" title="Search for @blog.title@ on Google">G</a>
-   <if @comments_html@ nil>
-     <if @blog.comments_view_url@ not nil>
-       <if @blog.num_comments@ gt 0>
-           - <a href="@blog.comments_view_url@" title="View comments on this entry">@blog.num_comments@ <if @blog.num_comment\
-s@ eq 1>comment</if><else>comments</else></a>
-       </if>
-     </if>
-   </if>
-
-   <if @blog.comment_add_url@ not nil>
-     - <a href="@blog.comment_add_url@" title="Comment on this entry">Add comment</a>
-   </if>
-
-   <if @display_categories@ and @blog.category_id@ gt 0>
-     - <a href="@package_url@<if @screen_name@ not nil>user/@screen_name@/</if>cat/@blog.category_short_name@" title="@blog.category_name@">@blog.category_name@</a>
-   </if>
 </div>
 
-</div>
 
-
 <if @comments:rowcount@ not nil>
 <multiple name="comments">
 <h3 class="lars_blogger_comment_title">@comments.title@</h3>
Index: openacs-4/packages/lars-blogger/www/entry-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/entry-edit.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/lars-blogger/www/entry-edit.tcl	11 Dec 2003 21:40:06 -0000	1.10
+++ openacs-4/packages/lars-blogger/www/entry-edit.tcl	13 Dec 2003 14:44:34 -0000	1.11
@@ -106,7 +106,7 @@
     set insert_or_update [element get_value entry insert_or_update]
 
     if { [string equal $insert_or_update "insert"] } {
-        lars_blogger::entry::new \
+        lars_blog_entry_add \
                 -entry_id $entry_id \
                 -package_id $package_id \
                 -title $title \
@@ -119,35 +119,15 @@
     } else {
         permission::require_write_permission -object_id $entry_id
 
-        set set_clauses { 
-            "title = :title" 
-            "title_url = :title_url"
-            "category_id = :category_id"
-            "content = :content"
-            "content_format = :content_format"
-            "entry_date = to_date(:entry_date, 'YYYY-MM-DD')" 
-            "draft_p = :draft_p" 
-        }
-
-        set org_draft_p [db_string org_draft_p { select draft_p from pinds_blog_entries where entry_id = :entry_id } ]
-
-        # Is this a publish?
-        if { [string equal $draft_p "t"] && [string equal $org_draft_p "f"] } {
-            # set the posted_date to now
-            lappend set_clauses [db_map now]
-        }
-    
-        db_dml update_entry {}
-
-        # Is this a publish?
-        if { [string equal $draft_p "t"] && [string equal $org_draft_p "f"] } {
-            # do notifications
-            lars_blogger::entry::do_notifications -entry_id $entry_id
-            # and ping weblogs.com
-            lars_blog_weblogs_com_update_ping
-        }
-    
-        lars_blog_flush_cache $package_id
+        lars_blog_entry_edit \
+            -entry_id $entry_id \
+            -title $title \
+            -title_url $title_url \
+            -category_id $category_id \
+            -content $content \
+            -content_format $content_format \
+            -entry_date $entry_date \
+            -draft_p $draft_p
     }
     
     if { [empty_string_p $return_url] } {