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.2 -r1.3 --- openacs-4/packages/lars-blogger/lars-blogger.info 14 Sep 2002 18:05:11 -0000 1.2 +++ openacs-4/packages/lars-blogger/lars-blogger.info 14 Sep 2002 18:37:57 -0000 1.3 @@ -73,10 +73,7 @@ - - - Index: openacs-4/packages/lars-blogger/www/archive-display.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/Attic/archive-display.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/lars-blogger/www/archive-display.tcl 14 Sep 2002 18:05:12 -0000 1.3 +++ openacs-4/packages/lars-blogger/www/archive-display.tcl 14 Sep 2002 18:37:58 -0000 1.4 @@ -24,7 +24,7 @@ db_1row archive_date_month_day { *SQL* } - set context_bar [ad_context_bar [list "[ad_conn package_url]archive/" "Archive"] $archive_date_pretty] + 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] } Index: openacs-4/packages/lars-blogger/www/archive-display.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/Attic/archive-display.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/lars-blogger/www/archive-display.xql 19 Aug 2002 21:52:59 -0000 1.1 +++ openacs-4/packages/lars-blogger/www/archive-display.xql 14 Sep 2002 18:37:58 -0000 1.2 @@ -13,7 +13,7 @@ select to_date(:year || :month, 'YYYYMM') as archive_date, - to_char(to_date(:year || :month, 'YYYYMM'), 'fmMonthfm, YYYY') + to_char(to_date(:year || :month, 'YYYYMM'), 'fmMonthfm YYYY') as archive_date_pretty from dual @@ -23,7 +23,9 @@ select to_date(:year || :month || :day, 'YYYYMMDD') as archive_date, - to_char(to_date(:year || :month || :day, 'YYYYMMDD'), 'Month fmDDfm, YYYY') + to_char(to_date(:year || :month || :day, 'YYYYMMDD'), 'fmMonthfm YYYY') + as archive_month_pretty, + to_char(to_date(:year || :month || :day, 'YYYYMMDD'), 'DD') as archive_date_pretty from dual Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/www/archive-index.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/archive-index.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/lars-blogger/www/archive-index.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/lars-blogger/www/blog-months-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/blog-months-oracle.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/lars-blogger/www/blog-months-oracle.xql 19 Aug 2002 21:52:59 -0000 1.1 +++ openacs-4/packages/lars-blogger/www/blog-months-oracle.xql 14 Sep 2002 18:37:58 -0000 1.2 @@ -6,11 +6,10 @@ select trunc(entry_date, 'month') as month_date, - to_char(trunc(entry_date, 'month'), 'fmMonthfm, YYYY') + to_char(trunc(entry_date, 'month'), 'fmMonthfm YYYY') as date_pretty, to_char(trunc(entry_date, 'month'), 'YYYY/MM/') - as month_url_stub, - '' as url + as month_url_stub from pinds_blog_entries where draft_p = 'f' and package_id = :package_id Index: openacs-4/packages/lars-blogger/www/blog-months-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/blog-months-postgresql.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/lars-blogger/www/blog-months-postgresql.xql 19 Aug 2002 21:52:59 -0000 1.1 +++ openacs-4/packages/lars-blogger/www/blog-months-postgresql.xql 14 Sep 2002 18:37:58 -0000 1.2 @@ -6,11 +6,10 @@ select date_trunc('month', entry_date) as month_date, - to_char(date_trunc('month', entry_date), 'fmMonthfm, YYYY') + to_char(date_trunc('month', entry_date), 'fmMonthfm YYYY') as date_pretty, to_char(date_trunc('month', entry_date), 'YYYY/MM/') - as month_url_stub, - '' as url + as month_url_stub from pinds_blog_entries where draft_p = 'f' and package_id = :package_id Index: openacs-4/packages/lars-blogger/www/blog-months.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/blog-months.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/lars-blogger/www/blog-months.tcl 14 Sep 2002 16:40:34 -0000 1.2 +++ openacs-4/packages/lars-blogger/www/blog-months.tcl 14 Sep 2002 18:37:58 -0000 1.3 @@ -1,6 +1,6 @@ set package_id [ad_conn package_id] -db_multirow months months { *SQL* } { +db_multirow -extend { url } months months { *SQL* } { set url "[ad_conn package_url]archive/$month_url_stub" } Index: openacs-4/packages/lars-blogger/www/admin/entry-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/Attic/entry-edit.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/lars-blogger/www/admin/entry-edit.tcl 14 Sep 2002 18:05:13 -0000 1.4 +++ openacs-4/packages/lars-blogger/www/admin/entry-edit.tcl 14 Sep 2002 18:37:59 -0000 1.5 @@ -23,8 +23,10 @@ element create entry title -label "Title" -datatype text -html { size 50 } element create entry content -label "Content" -datatype text -widget textarea -html { cols 80 rows 20 } -element create entry entry_date -label "Entry date" -datatype text -element create entry entry_date_today -label "Set to today" -datatype text -widget inform -value {(Set to today)} +element create entry entry_date -label "Entry date" -datatype text \ + -help_text "If you set this to something other than today's date, you must use this form to publish your entry, otherwise the entry date will be set to the date you publish the item." \ + -after_html {(Set to today)} + element create entry draft_p -label "Draft" -datatype text -widget checkbox -options { { "This is a draft, don't publish it" "t" } } -optional element create entry entry_id -widget hidden -datatype text 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.1 -r1.2 --- openacs-4/packages/lars-blogger/www/archive/index.vuh 19 Aug 2002 21:53:00 -0000 1.1 +++ openacs-4/packages/lars-blogger/www/archive/index.vuh 14 Sep 2002 18:37:59 -0000 1.2 @@ -5,21 +5,15 @@ set day [lindex $extra_url_list 3] if { [empty_string_p $year] && [empty_string_p $month] && [empty_string_p $day] } { - - ad_conn -set file "[acs_root_dir]/packages/lars-blogger/www/archive-index.tcl" - + # get year, month, day + set date_list [dt_ansi_to_list [dt_sysdate]] + + ad_returnredirect "[ad_conn package_url]archive/[lindex $date_list 0]/[format "%02d" [lindex $date_list 1]]/" } else { + rp_form_put year $year + rp_form_put month $month + rp_form_put day $day - if { [empty_string_p [ns_getform]] } { - global _ns_form - set _ns_form [ns_set create] - } - - ns_set put [ns_getform] year $year - ns_set put [ns_getform] month $month - ns_set put [ns_getform] day $day - - ad_conn -set file "[acs_root_dir]/packages/lars-blogger/www/archive-display.tcl" + rp_internal_redirect "/packages/lars-blogger/www/archive-display" } -adp_parse_ad_conn_file