-
-
-
-
+
+
+
+
+
+
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 -N -r1.3 -r1.4
--- openacs-4/packages/lars-blogger/www/blog.tcl 14 Sep 2002 16:40:34 -0000 1.3
+++ openacs-4/packages/lars-blogger/www/blog.tcl 14 Sep 2002 18:05:12 -0000 1.4
@@ -35,15 +35,12 @@
set admin_p [ad_permission_p $package_id admin]
-set old_date ""
-
set count 0
-db_multirow blog blog { *SQL* } {
- if { ![string equal $old_date $entry_date_pretty] } {
- set new_date_p "t"
- set old_date $entry_date_pretty
- }
+db_multirow -extend {
+ row_number edit_url delete_url publish_url
+ revoke_url comments_view_url comment_add_url google_url
+} blog blog { *SQL* } {
set row_number [incr count]
set return_url "${package_url}one-entry?[export_vars { entry_id }]"
Index: openacs-4/packages/lars-blogger/www/calendar.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/calendar.adp,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lars-blogger/www/calendar.adp 14 Sep 2002 18:05:12 -0000 1.1
@@ -0,0 +1,5 @@
+@widget@
+
+@prev_month_name@ - @next_month_name@
+
+
Index: openacs-4/packages/lars-blogger/www/calendar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/calendar.tcl,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lars-blogger/www/calendar.tcl 14 Sep 2002 18:05:12 -0000 1.1
@@ -0,0 +1,33 @@
+#
+# Expects:
+# date:onevalue,optional
+#
+
+if { ![info exist date] } {
+ set date [dt_sysdate]
+}
+
+dt_get_info $date
+
+# first_julian_date
+# last_julian_date
+
+set calendar_details [ns_set create calendar_details]
+
+set package_url [lars_blog_public_package_url]
+set month_number [clock format [clock scan $date] -format %m]
+
+set package_id [ad_conn package_id]
+
+db_foreach entry_dates { * SQL * } {
+ ns_set put $calendar_details $entry_date_julian "1"
+}
+
+set widget [dt_widget_month_small \
+ -date $date \
+ -calendar_details $calendar_details \
+ -day_number_template "\[ad_decode \[ns_set get \$calendar_details \$julian_date\] 1 \"\$day_number\" \$day_number\]"]
+
+set prev_month_url "${package_url}archive/[clock format [clock scan $prev_month] -format %Y/%m]/"
+set next_month_url "${package_url}archive/[clock format [clock scan $next_month] -format %Y/%m]/"
+
Index: openacs-4/packages/lars-blogger/www/calendar.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/Attic/calendar.xql,v
diff -u -N
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/lars-blogger/www/calendar.xql 14 Sep 2002 18:05:12 -0000 1.1
@@ -0,0 +1,14 @@
+
+
+
+
+
+ select to_char(entry_date, 'J') as entry_date_julian
+ from pinds_blog_entries
+ where package_id = :package_id
+ and draft_p = 'f'
+ and deleted_p = 'f'
+ group by entry_date_julian
+
+
+
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 -N -r1.2 -r1.3
--- openacs-4/packages/lars-blogger/www/index.adp 8 Sep 2002 11:29:22 -0000 1.2
+++ openacs-4/packages/lars-blogger/www/index.adp 14 Sep 2002 18:05:12 -0000 1.3
@@ -17,6 +17,21 @@
|
+ Calendar
+ |
+
+
+ |
+
+ |
+
+
+ |
+
+ |
+
+
+ |
Archive
|
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 -N -r1.4 -r1.5
--- openacs-4/packages/lars-blogger/www/one-entry.adp 14 Sep 2002 16:40:34 -0000 1.4
+++ openacs-4/packages/lars-blogger/www/one-entry.adp 14 Sep 2002 18:05:12 -0000 1.5
@@ -2,4 +2,12 @@
@page_title@
@context_bar@
+
+
\ 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 -N -r1.4 -r1.5
--- openacs-4/packages/lars-blogger/www/one-entry.xql 14 Sep 2002 16:40:34 -0000 1.4
+++ openacs-4/packages/lars-blogger/www/one-entry.xql 14 Sep 2002 18:05:12 -0000 1.5
@@ -9,6 +9,7 @@
b.content,
b.draft_p,
to_char(b.entry_date, 'YYYY-MM-DD') as entry_date,
+ to_char(entry_date, 'fmDayfm, Month fmDDfm, YYYY') as entry_date_pretty,
p.first_names as poster_first_names,
p.last_name as poster_last_name,
to_char(b.posted_date , 'HH24:MI') as posted_time_pretty
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 -N -r1.3 -r1.4
--- openacs-4/packages/lars-blogger/www/admin/entry-edit.tcl 14 Sep 2002 16:40:35 -0000 1.3
+++ openacs-4/packages/lars-blogger/www/admin/entry-edit.tcl 14 Sep 2002 18:05:13 -0000 1.4
@@ -50,7 +50,7 @@
}
element set_properties entry entry_id -value $entry_id
- template::element set_properties entry insert_or_update -value $insert_or_update
+ element set_properties entry insert_or_update -value $insert_or_update
}
@@ -94,8 +94,12 @@
ad_returnredirect $return_url
ad_script_abort
-}
+}
+if { ![form is_request entry] && ![form is_valid entry] } {
+ set insert_or_update [element get_value entry insert_or_update]
+}
+
switch -- $insert_or_update {
insert {
set page_title "Add Blog Entry"