Index: openacs-4/packages/lars-blogger/www/blog.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/blog.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/lars-blogger/www/blog.adp	12 Sep 2002 13:48:19 -0000	1.3
+++ openacs-4/packages/lars-blogger/www/blog.adp	14 Sep 2002 16:40:34 -0000	1.4
@@ -4,11 +4,6 @@
       <tr>
         <th bgcolor="#e0d0b0" align=left>
           <b><a name="blog-date-@blog.entry_date@">@blog.entry_date_pretty@</a></b>
-          <if @admin_p@ eq 1>
-            <font size="-1">
-              (<a href="@entry_add_url@">Add entry</a>)
-            </font>
-          </if>
         </th>
       </tr>
     </table>
@@ -17,45 +12,15 @@
   <else>
     <div style="border-top:1px dashed #3366cc;padding-bottom:14px;">
   </else>
-  <if @blog.title@ not nil>
-    <h4><a name="blog-entry-@blog.entry_id@">@blog.title@</a></h4>
-  </if>
-    @blog.content@
-    <br>
-    <table cellpadding="0" cellspacing="0" border="0" width="100%">
-      <if @show_poster_p@ true>
-        <tr>
-          <td>
-            <font size="-2" color="#999999">
-              <br>
-              Posted by @blog.poster_first_names@ @blog.poster_last_name@ at @blog.posted_time_pretty@
-              <if @admin_p@ eq 1>
-                &nbsp;&nbsp;&nbsp;&nbsp;
-                <a href="@blog.edit_url@">Edit</a> - <a href="@blog.delete_url@">Delete</a> -
-                <if @draft_p@ eq "t">
-                  <a href="@blog.publish_url@">Publish</a>
-                </if>
-                <else>
-                  <a href="@blog.revoke_url@">Revoke</a>
-                </else>
-              </if>
-            </font>
-          </td>
-        </tr>
-      </if>
-      <tr>
-        <td align="right">
-          <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 @blog.num_comments@ gt 0>
-            <a href="@blog.comments_view_url@" title="View comments on this entry">@blog.num_comments@ <if @blog.num_comments@ eq 1>comment</if><else>comments</else></a> -
-          </if>
-          <a href="@blog.comment_add_url@" title="Comment on this entry">Add comment</a>    
-        </td>
-      </tr>
-    </table>
+  <include src="entry-chunk" &="blog">
   </div>
 </multiple>
 
 <a href="@archive_url@"><img src="@arrow_url@" width="11" height="11" border="0" alt="Archive"></a>
 <a href="@archive_url@" class="action_link">Archive</a>
+<if @admin_p@ eq 1>
+  <br>
+  <a href="@entry_add_url@"><img src="@arrow_url@" width="11" height="11" border="0" alt="Add entry"></a>
+  <a href="@entry_add_url@" class="action_link">Add entry</a>
+</if>
+