Index: openacs-4/packages/lars-blogger/www/one-entry.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/one-entry.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/lars-blogger/www/one-entry.adp	8 Sep 2002 11:29:22 -0000	1.2
+++ openacs-4/packages/lars-blogger/www/one-entry.adp	12 Sep 2002 14:14:54 -0000	1.3
@@ -2,20 +2,41 @@
 <property name="title">@page_title@</property>
 <property name="context_bar">@context_bar@</property>   
 
-<if @title@ not nil>
-  <h4>@title@</h4>
+<if @blog.title@ not nil>
+  <h4>@blog.title@</h4>
 </if>
 <p>
-  @content@
-  <if @admin_p@ eq 1>
-    (<a href="@edit_url@">Edit</a>) (<a href="@delete_url@">Delete</a>)
-    <if @draft_p@ eq "t">
-      (<a href="@publish_url@">Publish</a>)
+  @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 @blog.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>
-    <else>
-      (<a href="@revoke_url@">Revoke</a>)
-    </else>
-  </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> -
+        <a href="@blog.comment_add_url@" title="Comment on this entry">Add comment</a>    
+      </td>
+    </tr>
+  </table>
 </p>
 
 <if @comments_html@ not nil>
@@ -25,5 +46,3 @@
    @comments_html@
   </blockquote>
 </if>
-
-<center><a href="@comment_add_url@">Add comment</a></center>
Index: openacs-4/packages/lars-blogger/www/one-entry.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/one-entry.tcl,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/lars-blogger/www/one-entry.tcl	19 Aug 2002 21:52:59 -0000	1.1
+++ openacs-4/packages/lars-blogger/www/one-entry.tcl	12 Sep 2002 14:14:54 -0000	1.2
@@ -19,26 +19,30 @@
     set return_url "[ad_conn url]?[ad_conn query]"
 }
 
-db_1row entry { *SQL* }
+set show_poster_p [ad_parameter "ShowPosterP" "" "1"]
 
-set page_title $title
+db_1row entry { *SQL* } -column_array blog
 
+set page_title $blog(title)
+
 set context_bar [ad_context_bar $page_title]
 
-set title_html [ad_quotehtml $title]
-set content [ns_adp_parse -string $content]
-set content_html [ad_quotehtml $content]
-set entry_date_html [ad_quotehtml $entry_date]
-set draft_p_checked [ad_decode $draft_p "t" "checked" ""]
+set blog(title) [ad_quotehtml $blog(title)]
+set blog(content) [ns_adp_parse -string $blog(content)]
+set blog(draft_p_checked) [ad_decode $blog(draft_p) "t" "checked" ""]
 
-set edit_url "[ad_conn package_url]admin/entry-edit?[export_vars -url { entry_id return_url }]"
-set delete_url "[ad_conn package_url]admin/entry-delete?[export_vars -url { entry_id return_url }]"
+set blog(edit_url) "[ad_conn package_url]admin/entry-edit?[export_vars -url { entry_id return_url }]"
+set blog(delete_url) "[ad_conn package_url]admin/entry-delete?[export_vars -url { entry_id return_url }]"
 
-set publish_url "[ad_conn package_url]admin/entry-publish?[export_vars -url { entry_id return_url }]"
-set revoke_url "[ad_conn package_url]admin/entry-revoke?[export_vars -url { entry_id return_url }]"
+set blog(publish_url) "[ad_conn package_url]admin/entry-publish?[export_vars -url { entry_id return_url }]"
+set blog(revoke_url) "[ad_conn package_url]admin/entry-revoke?[export_vars -url { entry_id return_url }]"
 
+set blog(entry_archive_url) "[ad_conn package_url]one-entry?[export_vars { entry_id }]"
+set blog(google_url) "http://www.google.com/search?[export_vars { {q $blog(title) } }]"
+
+
 set comments_html [general_comments_get_comments -print_content_p 1 $entry_id]
 
-set comment_add_url "[general_comments_package_url]comment-add?[export_vars -url { { object_id $entry_id } { object_name $title } { return_url "[ad_conn package_url]flush-cache?[export_vars -url { return_url }]"} }]"
+set blog(comment_add_url) "[general_comments_package_url]comment-add?[export_vars -url { { object_id $entry_id } { object_name $blog(title) } { return_url "[ad_conn package_url]flush-cache?[export_vars -url { return_url }]"} }]"
 
 ad_return_template
\ No newline at end of file
Index: openacs-4/packages/lars-blogger/www/one-entry.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/Attic/one-entry.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/lars-blogger/www/one-entry.xql	19 Aug 2002 21:52:59 -0000	1.1
+++ openacs-4/packages/lars-blogger/www/one-entry.xql	12 Sep 2002 14:14:54 -0000	1.2
@@ -4,9 +4,19 @@
 
     <fullquery name="entry">
         <querytext>
-		    select title, content, draft_p, to_char(entry_date, 'YYYY-MM-DD') as entry_date
-		    from   pinds_blog_entries
-		    where  entry_id = :entry_id
+		    select b.title, 
+                           b.content, 
+                           b.draft_p, 
+                           to_char(b.entry_date, 'YYYY-MM-DD') as entry_date,
+        		   p.first_names as poster_first_names,
+		           p.last_name as poster_last_name,
+		           to_char(b.posted_date , 'HH24:SS') as posted_time_pretty
+		    from   pinds_blog_entries b,
+                           acs_objects o,
+                           persons p
+		    where  b.entry_id = :entry_id
+                    and    o.object_id = b.entry_id
+                    and    p.person_id = o.creation_user
         </querytext>
     </fullquery>