Index: openacs-4/packages/lars-blogger/catalog/lars-blogger.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/catalog/lars-blogger.en_US.ISO-8859-1.xml,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/lars-blogger/catalog/lars-blogger.en_US.ISO-8859-1.xml	20 Apr 2005 08:23:09 -0000	1.1.2.1
+++ openacs-4/packages/lars-blogger/catalog/lars-blogger.en_US.ISO-8859-1.xml	20 Apr 2005 14:27:43 -0000	1.1.2.2
@@ -1,52 +1,14 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <message_catalog package_key="lars-blogger" package_version="2.1.1" locale="en_US" charset="ISO-8859-1">
-
-  <msg key="_Add">Link</msg>
-  <msg key="_Add_1">a link to your blogroll</msg>
-  <msg key="_Add_2">Ping URL</msg>
-  <msg key="_Add_3">another ping-compatible site</msg>
-  <msg key="_Add_4">category</msg>
-  <msg key="_Add_5">new category</msg>
-  <msg key="_Add_6">Blog Entry</msg>
-  <msg key="_Are">you sure that you want to delete this link?</msg>
-  <msg key="_Categories">are not supported. Modify the package parameters to add support.</msg>
-  <msg key="_Category">migration finished. $count objects recategorized.</msg>
-  <msg key="_Category_1">Short Name</msg>
-  <msg key="_Delete">category</msg>
-  <msg key="_Delete_1">entry</msg>
-  <msg key="_Draft">Entries</msg>
-  <msg key="_Edit">category</msg>
-  <msg key="_Edit_1">entry</msg>
-  <msg key="_Edit_2">Blog Entry</msg>
-  <msg key="_Entry">date</msg>
-  <msg key="_If">this entry is a rant on a web page you can \
-                put the full URL here, e.g. ${valid_url_example}.  The \
-                title of your entry will then become a hyperlink to \
-                that web page.</msg>
-  <msg key="_It">might be a good idea to take a look at your log file.
-Some useful information about the progress of migration will be written
-there.</msg>
-  <msg key="_Migrating">categories ...</msg>
-  <msg key="_Migrating_1">categories, please wait ...</msg>
-  <msg key="_No">category support</msg>
-  <msg key="_Ping">URL \&quot;$ping_url\&quot; has been added.</msg>
-  <msg key="_Ping_1">URL</msg>
-  <msg key="_Ping_2">URLs</msg>
-  <msg key="_Post">Status</msg>
-  <msg key="_Preview">entry</msg>
-  <msg key="_Publish">entry</msg>
-  <msg key="_Set">to now</msg>
-  <msg key="_This">category tree is a result of migration of old \
-      Weblogger-specific categories performed on [ns_fmttime [ns_time]]</msg>
-  <msg key="_This_1">is used to provide a pretty URL for viewing postings in this category</msg>
-  <msg key="_This_2">short name is already used by another category</msg>
-  <msg key="_Title">URL</msg>
-  <msg key="_Your">input \&quot;$title_url\&quot; doesn't look like a valid URL. \
-            Example of a valid URL: $valid_url_example</msg>
   <msg key="Actions">Actions</msg>
+  <msg key="Add_Blog_Entry">Add Blog Entry</msg>
+  <msg key="Add_category">Add category</msg>
   <msg key="Add_comment">Add comment</msg>
   <msg key="Add_entry">Add entry</msg>
+  <msg key="Add_Link">Add Link</msg>
   <msg key="Add_new_blog_entry">Add new blog entry</msg>
+  <msg key="Add_new_category">Add new category</msg>
+  <msg key="Add_Ping_URL">Add Ping URL</msg>
   <msg key="Administer">Administer</msg>
   <msg key="Administration">Administration</msg>
   <msg key="Archive">Archive</msg>
@@ -57,50 +19,88 @@
   <msg key="Bookmarklet_Link">Bookmarklet Link</msg>
   <msg key="by_commentsauthor">by %comments.author%</msg>
   <msg key="Categories">Categories</msg>
+  <msg key="Categories_Migration">Categories Migration</msg>
   <msg key="Category">Category</msg>
+  <msg key="Category_Short_Name">Category Short Name</msg>
   <msg key="Change_permissions">Change permissions</msg>
   <msg key="Configure_Trackback">Configure Trackback</msg>
+  <msg key="Confirm_Delete">Confirm Delete</msg>
   <msg key="Content">Content</msg>
   <msg key="Date">Date</msg>
   <msg key="Delete">Delete</msg>
+  <msg key="Delete_category">Delete category</msg>
+  <msg key="Delete_entry">Delete entry</msg>
   <msg key="Deprecated">[Deprecated]</msg>
+  <msg key="Down">Down</msg>
   <msg key="Draft">Draft</msg>
+  <msg key="Draft_Entries">Draft Entries</msg>
   <msg key="Draft_entries">Draft entries</msg>
   <msg key="E-mail_subscribers">E-mail subscribers</msg>
   <msg key="Edit">Edit</msg>
+  <msg key="Edit_Blog_Entry">Edit Blog Entry</msg>
+  <msg key="Edit_category">Edit category</msg>
+  <msg key="Edit_entry">Edit entry</msg>
+  <msg key="Entry_date">Entry date</msg>
   <msg key="in">in</msg>
+  <msg key="links">links</msg>
   <msg key="lt_____will_crawl_your_w">,
     will crawl your weblog shortly after it has been updated.
     You can</msg>
   <msg key="lt__use_this_information">, use this information to
     compile lists of recently updated weblogs. Other services,
     such as</msg>
+  <msg key="lt_Add_a_link_to_your_bl">Add a link to your blogroll</msg>
+  <msg key="lt_Add_another_ping-comp">Add another ping-compatible site</msg>
+  <msg key="lt_Are_you_sure_that_you">Are you sure that you want to delete this link?</msg>
+  <msg key="lt_Are_you_sure_that_you_1">Are you sure that you want to delete this ping URL?</msg>
   <msg key="lt_Before_you_can_start_">Before you can start using your web log, you must setup a screen name at %pvt_home_name%.</msg>
   <msg key="lt_blog_name_Add_Ping_UR">%blog_name%: Add Ping URL</msg>
   <msg key="lt_blog_name_Bookmarklet">%blog_name%: Bookmarklet</msg>
   <msg key="lt_blog_namenoquote_Blog">%blog_name;noquote% Blogroll</msg>
   <msg key="lt_blog_namenoquote_Ping">%blog_name;noquote% Ping URLs</msg>
   <msg key="lt_by_blogposter_first_n">by %blog.poster_first_names% %blog.poster_last_name%</msg>
+  <msg key="lt_Categories_are_not_su">Categories are not supported. Modify the package parameters to add support.</msg>
+  <msg key="lt_Category_doesnt_exist">Category doesn't exist</msg>
+  <msg key="lt_Category_migration_fi">Category migration finished. $count objects recategorized.</msg>
   <msg key="lt_Comments_blognum_comm">Comments (%blog.num_comments%)</msg>
   <msg key="lt_Drag_the_bookmarklet_">Drag the bookmarklet link to your Bookmarks/Favorites toolbar.
     You can then quickly blog about any page you visit by selecting
     some text that will be quoted and clicking on your bookmarklet.</msg>
+  <msg key="lt_For_example_default_p">For example $default_ping_url</msg>
+  <msg key="lt_Format_YYYY-MM-DD_HH2">Format: YYYY-MM-DD HH24:MI:SS</msg>
   <msg key="lt_I_put_this_hack_in_be">I put this hack in because category_url is not valid.</msg>
+  <msg key="lt_If_this_entry_is_abou">If this entry is about a web page you can \
+                put the full URL here, e.g. ${valid_url_example}.  The \
+                title of your entry will then become a hyperlink to \
+                that web page.</msg>
   <msg key="lt_instance_name_Categor">$instance_name Categories</msg>
+  <msg key="lt_It_might_be_a_good_id">It might be a good idea to take a look at your log file.
+Some useful information about the progress of migration will be written
+there.</msg>
   <msg key="lt_Manage_your_ping_URLs">Manage your ping URLs</msg>
   <msg key="lt_Manage_your_RSS_feeds">Manage your RSS feeds</msg>
+  <msg key="lt_Migrating_categories_">Migrating categories ...</msg>
+  <msg key="lt_Migrating_categories__1">Migrating categories, please wait ...</msg>
   <msg key="lt_Migration_Script_Sour">Migration Script Source Code</msg>
   <msg key="lt_more">...more</msg>
   <msg key="lt_Name_must_be_less_tha">Name must be less than 100 characters.</msg>
   <msg key="lt_Old_style_Weblogger-o">Old style Weblogger-only Categories</msg>
   <msg key="lt_on_commentspretty_dat">on %comments.pretty_date%</msg>
+  <msg key="lt_Ping_URL_must_be_a_va">Ping URL must be a valid URL</msg>
+  <msg key="lt_Ping_URL_ping_url_has">Ping URL \&quot;$ping_url\&quot; has been added.</msg>
+  <msg key="lt_Ping_URL_ping_url_has_1">Ping URL \&quot;$ping_url\&quot; has been removed.</msg>
   <msg key="lt_Proceed_only_if_you_a">Proceed only if you are sure you know what you are doing.</msg>
   <msg key="lt_read_more____about_th">read more
     about the ping API</msg>
   <msg key="lt_Setup_instance_RSS_fe">Setup instance RSS feed</msg>
   <msg key="lt_Show_E-Mail_subscribe">Show E-Mail subscribers</msg>
   <msg key="lt_Suggested_Ping_Servic">Suggested Ping Services</msg>
+  <msg key="lt_The_specified_categor">The specified category wasn't valid.</msg>
   <msg key="lt_These_are_standard_pi">These are standard ping services which you might want to add.</msg>
+  <msg key="lt_This_category_tree_is">This category tree is a result of migration of old \
+      Weblogger-specific categories performed on [ns_fmttime [ns_time]]</msg>
+  <msg key="lt_This_is_used_to_provi">This is used to provide a pretty URL for viewing postings in this category</msg>
+  <msg key="lt_This_short_name_is_al">This short name is already used by another category</msg>
   <msg key="lt_This_utility_script_w">This utility script will migrate all the Blogger-specific categories to
 Site-wide categories.  Depending on the specific need of your site you
 may want to customize the script.  The script source code is included
@@ -111,25 +111,38 @@
   <msg key="lt_Whenever_you_update_y">Whenever you update your weblog this server will automatically
     contact the listed sites and notify them that your weblog has
     changed. Some services, such as</msg>
+  <msg key="lt_Your_input_title_url_">Your input \&quot;$title_url\&quot; doesn't look like a valid URL. \
+            Example of a valid URL: $valid_url_example</msg>
+  <msg key="Manage_Categories">Manage Categories</msg>
   <msg key="Migrate_Categories">Migrate Categories</msg>
   <msg key="Name">Name</msg>
   <msg key="No_bloggers_here">No bloggers here.</msg>
+  <msg key="No_category_support">No category support</msg>
   <msg key="No_subscribers">No subscribers.</msg>
   <msg key="Notifications">Notifications</msg>
   <msg key="One_Link">One Link</msg>
   <msg key="or">or</msg>
   <msg key="Order">Order</msg>
   <msg key="Permalink">Permalink</msg>
+  <msg key="Ping_URL">Ping URL</msg>
+  <msg key="Ping_URLs">Ping URLs</msg>
+  <msg key="Post_Status">Post Status</msg>
+  <msg key="Preview_entry">Preview entry</msg>
   <msg key="Publish">Publish</msg>
+  <msg key="Publish_entry">Publish entry</msg>
   <msg key="Recent_Comments">Recent Comments</msg>
+  <msg key="Remove">Remove</msg>
+  <msg key="Screen_Name">Screen Name</msg>
   <msg key="Service">Service</msg>
   <msg key="Set_parameters">Set parameters</msg>
   <msg key="Site-Wide_Categories">Site-Wide Categories</msg>
   <msg key="Start_your_weblog">Start your weblog</msg>
   <msg key="Syndication_Feed">Syndication Feed</msg>
   <msg key="Technorati_Blogs">Technorati Blogs</msg>
   <msg key="Title">Title</msg>
+  <msg key="Title_URL">Title URL</msg>
   <msg key="Trackback_from">Trackback from</msg>
+  <msg key="Up">Up</msg>
   <msg key="URL">URL</msg>
   <msg key="URLs">URLs</msg>
   <msg key="View_draft_entries">View draft entries</msg>
Index: openacs-4/packages/lars-blogger/www/blog.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/blog.tcl,v
diff -u -r1.21.2.2 -r1.21.2.3
--- openacs-4/packages/lars-blogger/www/blog.tcl	18 Dec 2004 00:37:11 -0000	1.21.2.2
+++ openacs-4/packages/lars-blogger/www/blog.tcl	20 Apr 2005 14:27:43 -0000	1.21.2.3
@@ -10,10 +10,14 @@
 #  min_num_entries: optional
 #  num_days: optional
 #  max_content_length:integer,optional
+#  create_p:boolean
+#  display_template:
+#  unpublish_p
+#  manageown_p
 
 # If the caller specified a URL, then we gather the package_id from that URL
 if { [info exists url] } {
-    array set blog_site_node [site_node $url]
+    array set blog_site_node [site_node::get -url $url]
     set package_id $blog_site_node(object_id)
 }
 
@@ -22,8 +26,18 @@
     set package_id [ad_conn package_id]
 }
 
-set create_p [permission::permission_p -object_id $package_id -privilege create]
+if {! [info exists create_p] } { 
+    set create_p [permission::permission_p -object_id $package_id -privilege create]
+}
 
+if {![exists_and_not_null unpublish_p]} { 
+    set unpublish_p 1
+}
+if {![exists_and_not_null manageown_p]} { 
+    set manageown_p [expr ![permission::permission_p -object_id $package_id -privilege admin]]
+}
+
+
 if { ![info exists category_id] } {
     set blog_category_id {}
 } else {
@@ -71,9 +85,9 @@
                                 -package_id $package_id \
                                 -parameter max_content_length \
                                 -default 0]
-}        
-        
+}
 
+
 if { ![info exists type] } {
     set type "current"
 }
@@ -132,12 +146,12 @@
     } else {
         set num_entries [db_string num_entries_by_date {}]
     }
-    
+
     if { $num_entries < $min_num_entries } {
        # Eliminate date clause, and set the limit to the minimum number of entries
        set date_clause {}
        set limit $min_num_entries
-   }  
+   }
 }
 
 set arr_category_name() None
@@ -177,8 +191,8 @@
 
 set output_rows_count 0
 
-db_multirow -extend { 
-    category_name category_short_name sw_category_multirow 
+db_multirow -extend {
+    category_name category_short_name sw_category_multirow permalink_url
 } blog blog {} {
 
     # Putting the limit in the query won't give correct results.  We
@@ -203,6 +217,8 @@
         append sw_category_url "swcat/$sw_category_id"
     }
 
+    set permalink_url "${package_url}one-entry?[export_vars { entry_id }]"
+
     # Inner multirow.  Here's its magic name:
     set sw_category_multirow "__branimir__multirow__blog/$entry_id"
 
@@ -238,3 +254,6 @@
 
 set rss_file_url [lars_blogger::get_rss_file_url -package_id $package_id]
 
+if { [exists_and_not_null display_template] } {
+    ad_return_template $display_template
+}
Index: openacs-4/packages/lars-blogger/www/category-edit.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/category-edit.tcl,v
diff -u -r1.6.2.1 -r1.6.2.2
--- openacs-4/packages/lars-blogger/www/category-edit.tcl	20 Apr 2005 08:23:09 -0000	1.6.2.1
+++ openacs-4/packages/lars-blogger/www/category-edit.tcl	20 Apr 2005 14:27:43 -0000	1.6.2.2
@@ -10,7 +10,7 @@
     {short_name:allhtml ""}
 }
 
-set page_title "Manage Categories"
+set page_title "[_ lars-blogger.Manage_Categories]"
 set context [list $page_title]
 
 # Must be logged in
@@ -22,7 +22,7 @@
 set package_id [ad_conn package_id]
 
 if { [lars_blog_categories_p -package_id $package_id] != 1} {
-    ad_return_error "[_ lars-blogger._No]" "[_ lars-blogger._Categories]"
+    ad_return_error "[_ lars-blogger.No_category_support]" "[_ lars-blogger.lt_Categories_are_not_su]"
     ad_script_abort
 }
 
@@ -43,9 +43,9 @@
         {html { size 50 }}
     }
     {short_name:text,optional
-        {label "[_ lars-blogger._Category_1]"}
+        {label "[_ lars-blogger.Category_Short_Name]"}
         {html { size 20 }}
-        {help_text "[_ lars-blogger._This_1]"}
+        {help_text "[_ lars-blogger.lt_This_is_used_to_provi]"}
     }
     {return_url:text(hidden),optional}
 } -new_request {
@@ -59,7 +59,7 @@
     if { ![empty_string_p $short_name] } {
 	db_1row short_name_exists { *SQL* }
 	if { $short_name_exists > 0 } {
-	    form set_error category short_name "[_ lars-blogger._This_2]"
+	    form set_error category short_name "[_ lars-blogger.lt_This_short_name_is_al]"
 	    break
 	}
     }
@@ -95,13 +95,13 @@
     -name categories \
     -multirow categories \
     -actions {
-        "[_ lars-blogger._Add_4]" "category-edit" "[_ lars-blogger._Add_5]"
+        "[_ lars-blogger.Add_category]" "category-edit" "[_ lars-blogger.Add_new_category]"
     } -elements {
         edit {
             label {}
             display_template {<img src="/resources/acs-subsite/Edit16.gif" width="16" height="16" border="0" alt="[_ lars-blogger.Edit]">}
             link_url_eval {[export_vars -base [ad_conn url] { category_id }]}
-            link_html { title "[_ lars-blogger._Edit]" }
+            link_html { title "[_ lars-blogger.Edit_category]" }
             sub_class narrow
         }
         name {
@@ -120,7 +120,7 @@
             label {}
             display_template {<img src="/resources/acs-subsite/Delete16.gif" width="16" height="16" border="0" alt="[_ lars-blogger.Delete]">}
             link_url_eval {[export_vars -base "category-delete" { category_id { return_url [ad_return_url] } }]}
-            link_html { title "[_ lars-blogger._Delete]" }
+            link_html { title "[_ lars-blogger.Delete_category]" }
             sub_class narrow
         }
     }
Index: openacs-4/packages/lars-blogger/www/drafts.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/drafts.tcl,v
diff -u -r1.5.2.1 -r1.5.2.2
--- openacs-4/packages/lars-blogger/www/drafts.tcl	20 Apr 2005 08:23:09 -0000	1.5.2.1
+++ openacs-4/packages/lars-blogger/www/drafts.tcl	20 Apr 2005 14:27:43 -0000	1.5.2.2
@@ -6,7 +6,7 @@
 set package_id [ad_conn package_id]
 set user_id [ad_conn user_id]
 
-set page_title "[_ lars-blogger._Draft]"
+set page_title "[_ lars-blogger.Draft_Entries]"
 
 set context [list $page_title]
 
@@ -18,12 +18,12 @@
         <img src="/resources/acs-subsite/Edit16.gif" height="16" width="16" border="0">
     }
     link_url_eval {[export_vars -base entry-edit { entry_id { return_url [ad_return_url] } }]}
-    link_html { title "[_ lars-blogger._Edit_1]" }
+    link_html { title "[_ lars-blogger.Edit_entry]" }
 }
 lappend elements title {
     label "[_ lars-blogger.Title]"
     link_url_eval {[export_vars -base one-entry { entry_id }]}
-    link_html { title "[_ lars-blogger._Preview]" }
+    link_html { title "[_ lars-blogger.Preview_entry]" }
 }
 lappend elements entry_date {
     label "[_ lars-blogger.Date]"
@@ -45,13 +45,13 @@
     label "[_ lars-blogger.Content]"
 }
 lappend elements publish {
-    label {Publish}
+    label "[_ lars-blogger.Publish]"
     sub_class narrow
     display_template {
         Publish
     }
     link_url_eval {[export_vars -base entry-publish { entry_id { return_url [ad_return_url] } }]}
-    link_html { title "[_ lars-blogger._Publish]" }
+    link_html { title "[_ lars-blogger.Publish_entry]"  }
     html { align center }
 }
 lappend elements delete {
@@ -61,7 +61,7 @@
         <img src="/resources/acs-subsite/Delete16.gif" height="16" width="16" border="0">
     }
     link_url_eval {[export_vars -base entry-delete { entry_id { return_url [ad_return_url] } }]}
-    link_html { title "[_ lars-blogger._Delete_1]" }
+    link_html { title "[_ lars-blogger.Delete_entry]" }
 }
 
 
Index: openacs-4/packages/lars-blogger/www/entry-chunk.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/entry-chunk.tcl,v
diff -u -r1.19.2.1 -r1.19.2.2
--- openacs-4/packages/lars-blogger/www/entry-chunk.tcl	20 May 2004 09:41:51 -0000	1.19.2.1
+++ openacs-4/packages/lars-blogger/www/entry-chunk.tcl	20 Apr 2005 14:27:43 -0000	1.19.2.2
@@ -51,15 +51,9 @@
 
 set entry_id $blog(entry_id)
 
-if { [empty_string_p $screen_name] } {
-    set blog(permalink_url) "${package_url}one-entry?[export_vars { entry_id }]"
-} else {
-    set blog(permalink_url) "${package_url}user/$screen_name/one-entry?[export_vars { entry_id }]"
-}
-
 lars_blogger::entry::htmlify \
     -max_content_length $max_content_length \
-    -more [ad_decode [ad_return_url] $blog(permalink_url) {} "<p><a href=\"$blog(permalink_url)\">Continued...</a>"] \
+    -more [ad_decode [ad_return_url] $blog(permalink_url) {} "<p><a href=\"[ad_quotehtml $blog(permalink_url)]\">Continued...</a>"] \
     -array blog
 
 
Index: openacs-4/packages/lars-blogger/www/entry-delete.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/entry-delete.tcl,v
diff -u -r1.3 -r1.3.4.1
--- openacs-4/packages/lars-blogger/www/entry-delete.tcl	16 Oct 2003 23:10:45 -0000	1.3
+++ openacs-4/packages/lars-blogger/www/entry-delete.tcl	20 Apr 2005 14:27:43 -0000	1.3.4.1
@@ -3,6 +3,24 @@
     {return_url "."}
 }
 
-lars_blogger::entry::delete -entry_id $entry_id
+ad_form -name confirmation \
+    -cancel_url $return_url \
+    -form {
+	{entry_id:text(hidden)
+	    {value $entry_id}
+	}
+    } -on_submit {
+	lars_blogger::entry::delete -entry_id $entry_id
+    } -after_submit {
+	ad_returnredirect $return_url
+	ad_script_abort
+    } \
+    -export {return_url}
 
-ad_returnredirect $return_url
+set page_title "[_ lars-blogger.Confirm_Delete]"
+set context [list $page_title]
+
+ad_return_template
+
+
+
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.21.2.2 -r1.21.2.3
--- openacs-4/packages/lars-blogger/www/entry-edit.tcl	20 Apr 2005 08:23:09 -0000	1.21.2.2
+++ openacs-4/packages/lars-blogger/www/entry-edit.tcl	20 Apr 2005 14:27:43 -0000	1.21.2.3
@@ -21,9 +21,9 @@
 # need it sooner.
 
 if {[ad_form_new_p -key entry_id]} {
-    set page_title "[_ lars-blogger._Add_6]"
+    set page_title "[_ lars-blogger.Add_Blog_Entry]"
 } else {
-    set page_title "[_ lars-blogger._Edit_2]"
+    set page_title "[_ lars-blogger.Edit_Blog_Entry]"
 }
 
 set valid_url_example "http://www.example.com/foo"
@@ -33,7 +33,7 @@
     acs_user::get -user_id [ad_conn user_id] -array user_info
     if { [empty_string_p $user_info(screen_name)] } {
 
-        set page_title "Screen Name"
+        set page_title "[_ lars-blogger.Screen_Name]"
         set context [list $page_title]
         set pvt_home_url [ad_pvt_home]
         set pvt_home_name [ad_pvt_home_name]
@@ -51,11 +51,11 @@
     -cancel_url [ad_decode $return_url "" "." $return_url] \
     -form {entry_id:key(acs_object_id_seq)
         {title:text
-            {label "[_ lars-blogger.Title]"}
+            {label Title}
             {html {size 50}}}
         {title_url:text,optional
-            {label "[_ lars-blogger._Title]"}
-            {help_text "[_ lars-blogger._If]"}
+            {label "[_ lars-blogger.Title_URL]"}
+            {help_text "[_ lars-blogger.lt_If_this_entry_is_abou]"}
             {html {size 50}}
         }
     } \
@@ -78,10 +78,11 @@
 
     }
 }
+set container_id [ad_conn [parameter::get -parameter CategoryContainer -default package_id]]
 
 # SWC (Site-wide categories):
 category::ad_form::add_widgets \
-    -container_object_id $package_id \
+    -container_object_id $container_id \
     -categorized_object_id [value_if_exists entry_id] \
     -form_name entry
 
@@ -94,19 +95,36 @@
 
 ad_form -extend -name entry -form {
     {entry_date:text
-        {label "[_ lars-blogger._Entry]"}
-        {help_text "Format: YYYY-MM-DD HH24:MI:SS"}
+        {label "[_ lars-blogger.Entry_date]"}
+        {help_text "[_ lars-blogger.lt_Format_YYYY-MM-DD_HH2]"}
         {html {size 20}}
         {after_html
-            {(<a href="javascript:setEntryDateToToday()">[_ lars-blogger._Set]</a>)}
+            {(<a href="javascript:setEntryDateToToday()">Set to now</a>)}
         }
     }
-    {draft_p:text(select)
-        {options {{"[_ lars-blogger.Draft]" "t"} {"[_ lars-blogger.Publish]" "f"}}}
-        {label "[_ lars-blogger._Post]"}
+}
+set unpublish_p [expr ![parameter::get -parameter ImmediatePublishP -default 0]]
+
+if {$unpublish_p} {
+    ad_form -extend -name entry -form {
+        {draft_p:text(select)
+            {options {{"[_ lars-blogger.Draft]" "t"} {"[_ lars-blogger.Publish]" "f"}}}
+            {label "[_ lars-blogger.Post_Status]"}
+        }
     }
-} \
+} else {
+    ad_form -extend -name entry -form {
+        {draft_p:text(hidden)}
+    }
+}
+
+ad_form -extend -name entry \
     -new_request {
+        if {$unpublish_p} {
+            set draft_p t
+        } else {
+            set draft_p f
+        }
         set entry_date $now_ansi
         set content [template::util::richtext::create $content {}]
     } \
@@ -140,7 +158,7 @@
 
         # SWC Collect categories from all the category widgets
         set category_ids [category::ad_form::get_categories \
-          -container_object_id $package_id]
+                              -container_object_id $container_id]
 
     } \
     -new_data {
@@ -194,7 +212,7 @@
                 [util_url_valid_p $title_url]
             }
         ]}
-        "[_ lars-blogger._Your]"
+        "[_ lars-blogger.lt_Your_input_title_url_]"
     }}
 
 set context [list $page_title]
Index: openacs-4/packages/lars-blogger/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/index.tcl,v
diff -u -r1.22.2.3 -r1.22.2.4
--- openacs-4/packages/lars-blogger/www/index.tcl	9 Dec 2004 18:12:19 -0000	1.22.2.3
+++ openacs-4/packages/lars-blogger/www/index.tcl	20 Apr 2005 14:27:43 -0000	1.22.2.4
@@ -34,7 +34,7 @@
 
 if { ![empty_string_p $category_short_name] } {
     if { ![db_0or1row get_category_from_short_name {}] } {
-	ad_return_error "Category doesn't exist" "The specified category wasn't valid."
+	ad_return_error "[_ lars-blogger.lt_Category_doesnt_exist]" "[_ lars-blogger.lt_The_specified_categor]"
 	return
     }
     # Show Category in context bar
@@ -61,10 +61,18 @@
 set rsd_url ""
 if { [xmlrpc::enabled_p] } {
     set rsd_url "[ad_url]${package_url}rsd/"
-} 
+}
 
 set stylesheet_url [lars_blog_stylesheet_url]
 
+set unpublish_p [expr ![parameter::get -parameter ImmediatePublishP -default 0]]
+
+# We say manageown if manageown set and not admin on the package.
+set manageown_p [parameter::get -parameter OnlyManageOwnPostsP -default 0]
+if {$manageown_p} {
+    set manageown_p [expr ![permission::permission_p -object_id $package_id -privilege admin]]
+}
+
 # since ADP commands can't be evaluated in the <property> tags, we
 # create a separate ADP file for headerstuff. See Bart's post
 # http://openacs.org/forums/message-view?message_id=149849
@@ -151,7 +159,7 @@
         db_1row archive_date_year {}
     }
 
-    append page_title " Archive"
+    append page_title "[_ lars-blogger.Archive]"
     set date "$year-[ad_decode $month "" "01" $month]-[ad_decode $day "" "01" $day]"
     set type "archive"
 
@@ -179,17 +187,33 @@
     set type "all"
 }
 
-db_multirow -unclobber -extend { sw_category_name tree_name } sw_categories sw_categories {
-    select c.category_id as sw_category_id, c.tree_id
-    from   categories c, category_tree_map ctm
-    where  ctm.tree_id = c.tree_id
-    and    ctm.object_id = :package_id
-} {
-    set sw_category_name [category::get_name $sw_category_id]
-    set tree_name [category_tree::get_name $tree_id]
+set counts {}
+set sw_cats 0
+db_foreach catcount {select c.category_id as catid, count(*) as count from category_object_map c, pinds_blog_entries e where e.package_id = :package_id and c.object_id = e.entry_id group by c.category_id} { 
+    lappend counts $catid $count
+    if {$count > 0} {
+        incr sw_cats
+    }
 }
 
+if {$sw_cats} {
+    db_multirow -unclobber -extend { sw_category_name tree_name } sw_categories sw_categories {
+        select c.category_id as sw_category_id, c.tree_id
+        from   categories c, category_tree_map ctm
+        where  ctm.tree_id = c.tree_id
+        and    ctm.object_id = :package_id
+    } {
+        set sw_category_name [category::get_name $sw_category_id]
+        set tree_name [category_tree::get_name $tree_id]
+    }
+
+    set container_id [ad_conn [parameter::get -parameter CategoryContainer -default package_id]]
+    category_tree::get_multirow -datasource sw_categories -container_id $container_id -category_counts $counts
+}
+
 # Cut the URL off the last item in the context bar
 if { [llength $context] > 0 } {
     set context [lreplace $context end end [lindex [lindex $context end] end]]
 }
+
+set blog_name [lars_blog_name]
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.14 -r1.14.2.1
--- openacs-4/packages/lars-blogger/www/one-entry.tcl	20 Feb 2004 05:43:02 -0000	1.14
+++ openacs-4/packages/lars-blogger/www/one-entry.tcl	20 Apr 2005 14:27:43 -0000	1.14.2.1
@@ -13,6 +13,14 @@
 
 set sw_category_multirow "__branimir__multirow__blog/$entry_id"
 
+set unpublish_p [expr ![parameter::get -parameter ImmediatePublishP -default 0]]
+
+# We say manageown if manageown set and not admin on the package.
+set manageown_p [parameter::get -parameter OnlyManageOwnPostsP -default 0]
+if {$manageown_p} {
+    set manageown_p [expr ![permission::permission_p -object_id $package_id -privilege admin]]
+}
+
 template::multirow create $sw_category_multirow sw_category_id \
   sw_category_name sw_category_url
 
@@ -46,7 +54,9 @@
 if {![exists_and_not_null screen_name]} {
     set screen_name ""
     set context [list $page_title]
+    set blog(permalink_url) "${package_url}one-entry?[export_vars { entry_id }]"
 } else {
+    set blog(permalink_url) "${package_url}user/$screen_name/one-entry?[export_vars { entry_id }]"
     set context [list $screen_name]
 }
 
Index: openacs-4/packages/lars-blogger/www/admin/blogroll.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/blogroll.tcl,v
diff -u -r1.2.2.1 -r1.2.2.2
--- openacs-4/packages/lars-blogger/www/admin/blogroll.tcl	20 Apr 2005 08:23:09 -0000	1.2.2.1
+++ openacs-4/packages/lars-blogger/www/admin/blogroll.tcl	20 Apr 2005 14:27:43 -0000	1.2.2.2
@@ -5,7 +5,7 @@
     @creation-date 2003-12-14
 }
 
-set context [list "Blogroll"]
+set context [list "[_ lars-blogger.Blogroll]"]
 set blog_name [lars_blog_name]
 
 set package_id [ad_conn package_id]
@@ -14,9 +14,9 @@
     -name links \
     -multirow links \
     -key link_id \
-    -row_pretty_plural "links" \
+    -row_pretty_plural "[_ lars-blogger.links]" \
     -actions {
-        "[_ lars-blogger._Add]" "blogroll-ae" "[_ lars-blogger._Add_1]"
+        "[_ lars-blogger.Add_Link]" "blogroll-ae" "[_ lars-blogger.lt_Add_a_link_to_your_bl]"
     } -elements {
         edit {
             sub_class narrow
@@ -38,15 +38,15 @@
         order {
             label "[_ lars-blogger.Order]"
             display_template {
-                <a href="@links.move_up_link@">Up</a>
-                <a href="@links.move_down_link@">Down</a>
+                <a href="@links.move_up_link@">[_ lars-blogger.Up]</a>
+                <a href="@links.move_down_link@">[_ lars-blogger.Down]</a>
             }
         }
         delete {
             label ""
             sub_class narrow
             display_template {
-                <a onclick="if (confirm('[_ lars-blogger._Are]')) return true; else return false;" href="@links.delete_link@"><img src="/shared/images/Delete16.gif" height="16" width="16" border="0"></a>
+                <a onclick="if (confirm('[_ lars-blogger.lt_Are_you_sure_that_you]')) return true; else return false;" href="@links.delete_link@"><img src="/shared/images/Delete16.gif" height="16" width="16" border="0"></a>
             }
         }
     }
Index: openacs-4/packages/lars-blogger/www/admin/bookmarklet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/bookmarklet.tcl,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/lars-blogger/www/admin/bookmarklet.tcl	13 Dec 2003 19:57:28 -0000	1.1
+++ openacs-4/packages/lars-blogger/www/admin/bookmarklet.tcl	20 Apr 2005 14:27:43 -0000	1.1.2.1
@@ -9,6 +9,6 @@
 set entry_edit_url "[ad_url][lars_blog_public_package_url]entry-edit"
 
 set blog_name [lars_blog_name]
-set context [list "Bookmarklet"]
+set context [list "[_ lars-blogger.Bookmarklet]"]
 
 set bookmarklet_link "javascript:d=document;w=window;t='';if(d.selection){t=d.selection.createRange().text}else%20if(d.getSelection){t=d.getSelection()}else%20if(w.getSelection){t=w.getSelection()}void(w.open('$entry_edit_url?title='+escape(d.title)+'&title_url='+escape(d.location.href)+'&content='+escape(t),'_blank','scrollbars=yes,width=500,height=575,status=yes,resizable=yes,scrollbars=yes'))"
Index: openacs-4/packages/lars-blogger/www/admin/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/index.tcl,v
diff -u -r1.10.2.2 -r1.10.2.3
--- openacs-4/packages/lars-blogger/www/admin/index.tcl	20 Apr 2005 08:23:09 -0000	1.10.2.2
+++ openacs-4/packages/lars-blogger/www/admin/index.tcl	20 Apr 2005 14:27:43 -0000	1.10.2.3
@@ -15,13 +15,11 @@
 
 set arrow_url "[lars_blog_public_package_url -package_id $package_id]graphics/arrow-box.gif"
 
-set permission_url [export_vars -base "/permissions/one" {{object_id $package_id}}]
-
 set categories [lars_blog_categories_p -package_id $package_id]
 
 set category_map_url [export_vars -base \
     "[site_node::get_package_url -package_key categories]cadmin/one-object" \
-    { { object_id $package_id } }]
+                          { { object_id {[ad_conn [parameter::get -parameter CategoryContainer -default package_id]]} } }]
 
 set instance_feed_p [db_string rss_feed_p {}]
 
Index: openacs-4/packages/lars-blogger/www/admin/migrate-categories-1.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/migrate-categories-1.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/lars-blogger/www/admin/migrate-categories-1.tcl	20 Apr 2005 08:23:09 -0000	1.1.2.1
+++ openacs-4/packages/lars-blogger/www/admin/migrate-categories-1.tcl	20 Apr 2005 14:27:43 -0000	1.1.2.2
@@ -14,9 +14,9 @@
 # Getting fancy - display progress bar
 
 ad_progress_bar_begin \
-    -title "[_ lars-blogger._Migrating] \
-    -message_1 "[_ lars-blogger._Migrating_1] \
-    -message_2 "[_ lars-blogger._It]
+    -title "[_ lars-blogger.lt_Migrating_categories_]" \
+    -message_1 "[_ lars-blogger.lt_Migrating_categories__1]" \
+    -message_2 "[_ lars-blogger.lt_It_might_be_a_good_id]"
 
 # Migrate categories
 
@@ -27,8 +27,8 @@
     of $instance_name $package_id ###############
   ns_log Notice catmig Creating new site wide tree
   set tree_id [category_tree::add \
-    -name "[_ lars-blogger.lt_instance_name_Categor] \
-    -description "[_ lars-blogger._This]]
+    -name "[_ lars-blogger.lt_instance_name_Categor]" \
+    -description "[_ lars-blogger.lt_This_category_tree_is]"]
   ns_log Notice catmig Done. tree_id = $tree_id
   category_tree::map \
     -tree_id $tree_id \
@@ -83,4 +83,4 @@
 # Done
 
 ad_progress_bar_end -url .. -message_after_redirect \
-  "[_ lars-blogger._Category]
+  "[_ lars-blogger.lt_Category_migration_fi]"
Index: openacs-4/packages/lars-blogger/www/admin/migrate-categories.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/migrate-categories.tcl,v
diff -u -r1.1 -r1.1.2.1
--- openacs-4/packages/lars-blogger/www/admin/migrate-categories.tcl	20 Feb 2004 05:43:02 -0000	1.1
+++ openacs-4/packages/lars-blogger/www/admin/migrate-categories.tcl	20 Apr 2005 14:27:43 -0000	1.1.2.1
@@ -11,7 +11,7 @@
 
 set context {{Categories Migration}}
 
-set title "Categories Migration"
+set title "[_ lars-blogger.Categories_Migration]"
 
 set fp [open [ns_info pageroot]/../packages/lars-blogger/www/admin/migrate-categories-1.tcl]
 set meat [read $fp]
Index: openacs-4/packages/lars-blogger/www/admin/ping-url-add-api.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/ping-url-add-api.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/lars-blogger/www/admin/ping-url-add-api.tcl	20 Apr 2005 08:23:09 -0000	1.1.2.1
+++ openacs-4/packages/lars-blogger/www/admin/ping-url-add-api.tcl	20 Apr 2005 14:27:43 -0000	1.1.2.2
@@ -8,4 +8,4 @@
     -package_id [ad_conn package_id] \
     -ping_url $ping_url
 
-ad_returnredirect -message "[_ lars-blogger._Ping]" ping-urls
+ad_returnredirect -message "Ping URL \"$ping_url\" has been added." ping-urls
Index: openacs-4/packages/lars-blogger/www/admin/ping-url-add.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/ping-url-add.tcl,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/lars-blogger/www/admin/ping-url-add.tcl	27 Feb 2004 19:16:25 -0000	1.2
+++ openacs-4/packages/lars-blogger/www/admin/ping-url-add.tcl	20 Apr 2005 14:27:43 -0000	1.2.2.1
@@ -7,25 +7,25 @@
 
 set package_id [ad_conn package_id]
 
-set context [list [list "ping-urls" "Ping URLs"] "Add Ping URL"]
+set context [list [list "ping-urls" "[_ lars-blogger.Ping_URLs]"] "[_ lars-blogger.Add_Ping_URL]"]
 
 set blog_name [lars_blog_name]
 set default_ping_url [parameter::get -package_id $package_id \
                           -parameter "weblogs_ping_url"]
 
 ad_form -name ping_url_add -form {
-    {ping_url:text  {label "URL"}
-                    {help_text "For example $default_ping_url"}
+    {ping_url:text  {label "[_ lars-blogger.URL]"}
+                    {help_text "[_ lars-blogger.lt_For_example_default_p]"}
                     {html {size 40}}}
 } -validate {
     {ping_url
         {[util_url_valid_p $ping_url]}
-        "Ping URL must be a valid URL"}
+        "[_ lars-blogger.lt_Ping_URL_must_be_a_va]"}
 } -on_submit {
     
     lars_blogger::instance::add_ping_url \
         -package_id $package_id \
         -ping_url $ping_url
 } -after_submit {
-    ad_returnredirect -message "Ping URL \"$ping_url\" has been added."  "ping-urls"
+    ad_returnredirect -message "[_ lars-blogger.lt_Ping_URL_ping_url_has]"  "ping-urls"
 }
Index: openacs-4/packages/lars-blogger/www/admin/ping-url-remove.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/ping-url-remove.tcl,v
diff -u -r1.2 -r1.2.2.1
--- openacs-4/packages/lars-blogger/www/admin/ping-url-remove.tcl	27 Feb 2004 19:16:25 -0000	1.2
+++ openacs-4/packages/lars-blogger/www/admin/ping-url-remove.tcl	20 Apr 2005 14:27:43 -0000	1.2.2.1
@@ -15,4 +15,4 @@
                                 -ping_url $ping_url
 }
 
-ad_returnredirect -message "Ping URL \"$ping_url\" has been removed." "ping-urls"
+ad_returnredirect -message "[_ lars-blogger.lt_Ping_URL_ping_url_has_1]" "ping-urls"
Index: openacs-4/packages/lars-blogger/www/admin/ping-urls.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/ping-urls.tcl,v
diff -u -r1.2.2.1 -r1.2.2.2
--- openacs-4/packages/lars-blogger/www/admin/ping-urls.tcl	20 Apr 2005 08:23:09 -0000	1.2.2.1
+++ openacs-4/packages/lars-blogger/www/admin/ping-urls.tcl	20 Apr 2005 14:27:43 -0000	1.2.2.2
@@ -13,21 +13,21 @@
     -name ping_urls \
     -multirow ping_urls \
     -key ping_url \
-    -row_pretty_plural "[_ lars-blogger.URLs] \
+    -row_pretty_plural "[_ lars-blogger.URLs]" \
     -actions {
-        "[_ lars-blogger._Add_2] "ping-url-add" "[_ lars-blogger._Add_3]
+        "[_ lars-blogger.Add_Ping_URL]" "ping-url-add" "[_ lars-blogger.lt_Add_another_ping-comp]"
     } -elements {
         ping_url {
-            label "[_ lars-blogger._Ping_1]
+            label "[_ lars-blogger.Ping_URL]"
         }
         remove_url {
             label ""
-            display_template {<a onclick="if (confirm('Are you sure that you want to delete this ping URL?')) return true; else return false;" href="@ping_urls.remove_url@">Remove</a>}
+            display_template {<a onclick="if (confirm('[_ lars-blogger.lt_Are_you_sure_that_you_1]')) return true; else return false;" href="@ping_urls.remove_url@">[_ lars-blogger.Remove]</a>}
         }
     }
     
 set blog_name [lars_blog_name]
-set context "[_ lars-blogger._Ping_2]"
+set context "[_ lars-blogger.Ping_URLs]"
 
 multirow create ping_urls ping_url remove_url
 
@@ -50,10 +50,10 @@
     -name default_pings \
     -elements {
         service {
-            label "[_ lars-blogger.Service]
+            label "[_ lars-blogger.Service]"
         }
         ping_url {
-            label "[_ lars-blogger._Ping_1]
+            label "[_ lars-blogger.Ping_URL]"
         }
         add {
             display_template {Add}