Index: openacs-4/packages/lars-blogger/lars-blogger.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/lars-blogger.info,v diff -u -r1.10 -r1.11 --- openacs-4/packages/lars-blogger/lars-blogger.info 30 Nov 2002 17:36:49 -0000 1.10 +++ openacs-4/packages/lars-blogger/lars-blogger.info 4 Jan 2003 09:36:17 -0000 1.11 @@ -107,7 +107,7 @@ - + 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.3 -r1.4 --- openacs-4/packages/lars-blogger/www/entry-chunk.adp 30 Nov 2002 17:37:27 -0000 1.3 +++ openacs-4/packages/lars-blogger/www/entry-chunk.adp 4 Jan 2003 09:36:48 -0000 1.4 @@ -29,15 +29,17 @@ # - - G - + G - @blog.num_comments@ commentcomments - + - @blog.num_comments@ commentcomments - Add comment + + - Add comment + 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.3 -r1.4 --- openacs-4/packages/lars-blogger/www/entry-chunk.tcl 14 Sep 2002 22:27:25 -0000 1.3 +++ openacs-4/packages/lars-blogger/www/entry-chunk.tcl 4 Jan 2003 09:36:48 -0000 1.4 @@ -21,6 +21,8 @@ set package_url [lars_blog_public_package_url -package_id $package_id] +set general_comments_package_url [general_comments_package_url] + set show_poster_p [ad_parameter "ShowPosterP" "" "1"] set blog(title) [ad_quotehtml $blog(title)] @@ -36,7 +38,11 @@ set blog(entry_archive_url) "${package_url}one-entry?[export_vars { entry_id }]" set blog(google_url) "http://www.google.com/search?[export_vars { {q $blog(title) } }]" -set blog(comment_add_url) "[general_comments_package_url]comment-add?[export_vars { { object_id $entry_id } { object_name $blog(title) } { return_url "${package_url}flush-cache?[export_vars { return_url }]"} }]" + +if { ![empty_string_p $general_comments_package_url] } { + set blog(comment_add_url) "${general_comments_package_url}comment-add?[export_vars { { object_id $entry_id } { object_name $blog(title) } { return_url "${package_url}flush-cache?[export_vars { return_url }]"} }]" +} + set blog(comments_view_url) "${package_url}one-entry?[export_vars { entry_id }]" if { [string equal $show_comments_p "t"] } { Index: openacs-4/packages/lars-blogger/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/index.adp,v diff -u -r1.10 -r1.11 --- openacs-4/packages/lars-blogger/www/index.adp 30 Nov 2002 17:37:27 -0000 1.10 +++ openacs-4/packages/lars-blogger/www/index.adp 4 Jan 2003 09:36:48 -0000 1.11 @@ -38,7 +38,8 @@ Add entry
- Draft entries + Draft entries
+
Administer @@ -48,21 +49,23 @@ - - - Notifications - - - - - @notification_chunk@ - - - - -
- - + + + + Notifications + + + + + @notification_chunk@ + + + + +
+ + +
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.5 -r1.6 --- openacs-4/packages/lars-blogger/www/index.tcl 30 Nov 2002 17:37:27 -0000 1.5 +++ openacs-4/packages/lars-blogger/www/index.tcl 4 Jan 2003 09:36:48 -0000 1.6 @@ -17,7 +17,7 @@ set page_title [lars_blog_name] if { ![empty_string_p [ad_parameter "rss_file_url"]] } { - set rss_file_url "[ad_conn url]/[ad_parameter "rss_file_url"]" + set rss_file_url "[ad_url][ad_conn package_url][ad_parameter "rss_file_url"]" } set admin_p [ad_permission_p [ad_conn package_id] admin] Index: openacs-4/packages/lars-blogger/www/admin/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/index.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/lars-blogger/www/admin/index.adp 30 Nov 2002 17:37:43 -0000 1.4 +++ openacs-4/packages/lars-blogger/www/admin/index.adp 4 Jan 2003 09:37:47 -0000 1.5 @@ -1,9 +1,28 @@ @title@ -
+

+ These are your administrative options +

+
+

+ Add new blog entry + Add new blog entry +

+ +

+ View draft entries + View draft entries +

+ +

+ Show E-Mail subscribers + Show E-Mail subscribers +

+ +

+ Set parameters + Set parameters +

+
\ No newline at end of file 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.1 -r1.2 --- openacs-4/packages/lars-blogger/www/admin/index.tcl 19 Aug 2002 21:52:59 -0000 1.1 +++ openacs-4/packages/lars-blogger/www/admin/index.tcl 4 Jan 2003 09:37:47 -0000 1.2 @@ -11,5 +11,9 @@ set title [db_string package_name { *SQL* }] +set parameters_url "/admin/site-map/parameter-set?[export_vars { package_id }]" + +set arrow_url "[lars_blog_public_package_url -package_id $package_id]graphics/arrow-box.gif" + ad_return_template