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.7 -r1.8 --- openacs-4/packages/lars-blogger/lars-blogger.info 14 Sep 2002 22:10:59 -0000 1.7 +++ openacs-4/packages/lars-blogger/lars-blogger.info 16 Sep 2002 09:25:45 -0000 1.8 @@ -7,14 +7,14 @@ f f - + oracle postgresql Lars Pind Write your own web log - 2002-09-15 + 2002-09-16 Collaboraid Manages multiple web logs for your site. Just mount multiple instances, and you can do all the blogging you want. @@ -73,15 +73,10 @@ - - - - - @@ -101,6 +96,7 @@ + Index: openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.tcl 14 Sep 2002 22:05:24 -0000 1.6 +++ openacs-4/packages/lars-blogger/tcl/lars-blogger-procs.tcl 16 Sep 2002 09:25:49 -0000 1.7 @@ -83,7 +83,7 @@ if { ![exists_and_not_null package_id] } { set package_id [ad_conn package_id] } - array set site_node [site_node::get_from_object_id -object_id [ad_conn package_id]] + array set site_node [site_node::get_from_object_id -object_id $package_id] return $site_node(instance_name) } Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/www/admin-links.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/www/admin-links.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.7 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/www/archive-display.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.7 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/www/archive-display.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/www/archive-display.xql'. Fisheye: No comparison available. Pass `N' to diff? 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.7 -r1.8 --- openacs-4/packages/lars-blogger/www/blog.adp 14 Sep 2002 22:17:41 -0000 1.7 +++ openacs-4/packages/lars-blogger/www/blog.adp 16 Sep 2002 09:25:51 -0000 1.8 @@ -1,23 +1,36 @@ - + + + + +
- @blog.entry_date_pretty@ + + @blog.entry_date_pretty@ + @blog_name@ +
-
+
-Archive -Archive - -
- Add entry - Add entry - - +

+ + @blog_name@ + @blog_name@
+ + + Archive + Archive
+ + + Add entry + Add entry + +

\ No newline at end of file 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.7 -r1.8 --- openacs-4/packages/lars-blogger/www/blog.tcl 14 Sep 2002 22:27:25 -0000 1.7 +++ openacs-4/packages/lars-blogger/www/blog.tcl 16 Sep 2002 09:25:51 -0000 1.8 @@ -33,6 +33,14 @@ set package_url [lars_blog_public_package_url -package_id $package_id] +set blog_name [lars_blog_name -package_id $package_id] + +if { [ad_conn isconnected] && ![string equal $package_url [string range [ad_conn url] 0 [string length $package_url]]] } { + set blog_url $package_url +} else { + set blog_url {} +} + set admin_p [ad_permission_p $package_id admin] set count 0 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.6 -r1.7 --- openacs-4/packages/lars-blogger/www/index.adp 14 Sep 2002 22:05:25 -0000 1.6 +++ openacs-4/packages/lars-blogger/www/index.adp 16 Sep 2002 09:25:51 -0000 1.7 @@ -5,12 +5,12 @@ - +@context_bar@ @@ -31,6 +31,25 @@ + + + + + + + + + + + +
- + @@ -22,7 +22,7 @@
- +
+ Actions +
+ Add entry
+ Administer +
+
+
Notifications 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.3 -r1.4 --- openacs-4/packages/lars-blogger/www/index.tcl 14 Sep 2002 22:05:25 -0000 1.3 +++ openacs-4/packages/lars-blogger/www/index.tcl 16 Sep 2002 09:25:51 -0000 1.4 @@ -1,4 +1,12 @@ -ad_page_contract {} { +ad_page_contract { + The Weblogger index page. + + @author Lars Pind (lars@pinds.com) + @creation-date February 2002 +} { + year:optional,string_length_range(4|4) + month:optional,string_length_range(2|2) + day:optional,string_length_range(2|2) } -properties { context_bar page_title @@ -12,6 +20,8 @@ set rss_file_url "[ad_url][ad_parameter "rss_file_url"]" } +set admin_p [ad_permission_p [ad_conn package_id] admin] + set notification_chunk [notification::display::request_widget \ -type lars_blogger_notif \ -object_id [ad_conn package_id] \ @@ -21,4 +31,31 @@ set header_background_color [lars_blog_header_background_color] +if { [exists_and_not_null year] } { + if { ![exists_and_not_null month] } { + ad_return_complaint 1 "
  • You must specify both year and month." + ad_script_abort + } + + if { [exists_and_not_null day] } { + set interval "day" + db_1row archive_date_month_day { *SQL* } + set context_bar [ad_context_bar [list "[ad_conn package_url]archive/" "Archive"] [list "[ad_conn package_url]archive/$year/$month/" $archive_month_pretty] $archive_date_pretty] + } else { + set interval "month" + db_1row archive_date_month { *SQL* } + set context_bar [ad_context_bar [list "[ad_conn package_url]archive/" "Archive"] $archive_date_pretty] + } + + append page_title " Archive" + set date "$year-$month-[ad_decode $day "" "01" $day]" + set type "archive" + +} else { + set date "" + set type "current" + set interval "" + set archive_date "" +} + ad_return_template \ No newline at end of file Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/www/index.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/lars-blogger/www/archive/index.vuh =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/archive/Attic/index.vuh,v diff -u -r1.2 -r1.3 --- openacs-4/packages/lars-blogger/www/archive/index.vuh 14 Sep 2002 18:37:59 -0000 1.2 +++ openacs-4/packages/lars-blogger/www/archive/index.vuh 16 Sep 2002 09:25:53 -0000 1.3 @@ -14,6 +14,6 @@ rp_form_put month $month rp_form_put day $day - rp_internal_redirect "/packages/lars-blogger/www/archive-display" + rp_internal_redirect "/packages/lars-blogger/www/index" }