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.7 -r1.8 --- openacs-4/packages/lars-blogger/www/index.adp 16 Sep 2002 09:25:51 -0000 1.7 +++ openacs-4/packages/lars-blogger/www/index.adp 16 Sep 2002 13:01:33 -0000 1.8 @@ -40,7 +40,7 @@ Add entry
- Administer + Draft entries Index: openacs-4/packages/lars-blogger/www/admin/drafts.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/Attic/drafts.adp,v diff -u -N -r1.4 -r1.5 --- openacs-4/packages/lars-blogger/www/admin/drafts.adp 14 Sep 2002 22:05:25 -0000 1.4 +++ openacs-4/packages/lars-blogger/www/admin/drafts.adp 16 Sep 2002 13:01:34 -0000 1.5 @@ -2,34 +2,40 @@ @page_title@ @context_bar@ - - - + + + + + + +
- - - - - - - - - - - - - + + No draft entries. + + +
DateTitleContentAction
@draft_entries.entry_date_pretty@@draft_entries.title@@draft_entries.content@ - Preview - Publish - Edit - Delete -
+ + - -
+ + + + + + - -
DateTitleContentAction
-
+ +
@draft_entries.entry_date_pretty@@draft_entries.title@@draft_entries.content@ + Preview + Publish + Edit + Delete +
+ + + + - \ No newline at end of file +

+ Add entry + Add entry +

Index: openacs-4/packages/lars-blogger/www/admin/drafts.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/Attic/drafts.tcl,v diff -u -N -r1.3 -r1.4 --- openacs-4/packages/lars-blogger/www/admin/drafts.tcl 14 Sep 2002 22:05:25 -0000 1.3 +++ openacs-4/packages/lars-blogger/www/admin/drafts.tcl 16 Sep 2002 13:01:34 -0000 1.4 @@ -15,13 +15,15 @@ set return_url "[ad_conn url][ad_decode [ad_conn query] "" "" "?[ad_conn query]"]" set edit_url "[ad_conn package_url]admin/entry-edit?[export_vars { entry_id return_url }]" set delete_url "[ad_conn package_url]admin/entry-delete?[export_vars { entry_id return_url }]" - set preview_url "[ad_conn package_url]admin/entry-preview?[export_vars { entry_id return_url }]" + set preview_url "[ad_conn package_url]one-entry?[export_vars { entry_id return_url }]" set publish_url "[ad_conn package_url]admin/entry-publish?[export_vars { entry_id return_url }]" set content [ns_adp_parse -string $content] } set entry_add_url "entry-edit" +set arrow_url "[ad_conn package_url]graphics/arrow-box.gif" + set header_background_color [lars_blog_header_background_color] ad_return_template 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.6 -r1.7 --- openacs-4/packages/lars-blogger/www/admin/entry-edit.tcl 14 Sep 2002 21:43:37 -0000 1.6 +++ openacs-4/packages/lars-blogger/www/admin/entry-edit.tcl 16 Sep 2002 13:01:34 -0000 1.7 @@ -91,7 +91,7 @@ } if { [empty_string_p $return_url] } { - set return_url "entry-preview?[export_vars { entry_id }]" + set return_url "[ad_conn package_url]one-entry?[export_vars { entry_id }]" } ad_returnredirect $return_url Index: openacs-4/packages/lars-blogger/www/admin/entry-preview.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/Attic/entry-preview.adp,v diff -u -N --- openacs-4/packages/lars-blogger/www/admin/entry-preview.adp 14 Sep 2002 22:05:25 -0000 1.5 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ - -@page_title@ -@context_bar@ - - - - - -
- @blog.entry_date_pretty@ -
- - Index: openacs-4/packages/lars-blogger/www/admin/entry-preview.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/Attic/entry-preview.tcl,v diff -u -N --- openacs-4/packages/lars-blogger/www/admin/entry-preview.tcl 14 Sep 2002 22:05:25 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,28 +0,0 @@ -ad_page_contract {} { - entry_id:integer - return_url:optional -} -properties { - context_bar - title_html - content_html - draft_p_checked - entry_date_html - form_export_vars - return_url -} - -set package_id [ad_conn package_id] - -set admin_p [ad_permission_p $package_id admin] - -set page_title "Preview Blog Entry" - -set context_bar [ad_context_bar $page_title] - -set show_poster_p [ad_parameter "ShowPosterP" "" "1"] - -lars_blogger::entry::get -entry_id $entry_id -array blog - -set header_background_color [lars_blog_header_background_color] - -ad_return_template \ No newline at end of file Index: openacs-4/packages/lars-blogger/www/admin/entry-preview.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/Attic/entry-preview.xql,v diff -u -N --- openacs-4/packages/lars-blogger/www/admin/entry-preview.xql 14 Sep 2002 16:40:35 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,24 +0,0 @@ - - - - - - - select b.entry_id, - b.title, - b.content, - b.draft_p, - to_char(b.entry_date, 'YYYY-MM-DD') as entry_date, - 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 - from pinds_blog_entries b, - acs_objects o, - persons p - where b.entry_id = :entry_id - and o.object_id = b.entry_id - and p.person_id = o.creation_user - - - - 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 -N -r1.2 -r1.3 --- openacs-4/packages/lars-blogger/www/admin/index.adp 8 Sep 2002 11:29:23 -0000 1.2 +++ openacs-4/packages/lars-blogger/www/admin/index.adp 16 Sep 2002 13:01:34 -0000 1.3 @@ -4,6 +4,5 @@ Index: openacs-4/packages/lars-blogger/www/admin/recently-published-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/Attic/recently-published-oracle.xql,v diff -u -N --- openacs-4/packages/lars-blogger/www/admin/recently-published-oracle.xql 14 Sep 2002 16:40:35 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ - - - - oracle8.1.6 - - - - select entry_id, - to_char(entry_date, 'YYYY-MM-DD') as entry_date_pretty, - title, - content - from pinds_blog_entries - where package_id = :package_id - and posted_date > sysdate - 14 - and draft_p = 'f' - and deleted_p = 'f' - order by entry_date desc, posted_date desc - - - - Index: openacs-4/packages/lars-blogger/www/admin/recently-published-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/Attic/recently-published-postgresql.xql,v diff -u -N --- openacs-4/packages/lars-blogger/www/admin/recently-published-postgresql.xql 14 Sep 2002 16:40:35 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ - - - - postgresql7.1 - - - - select entry_id, - to_char(entry_date, 'YYYY-MM-DD') as entry_date_pretty, - title, - content - from pinds_blog_entries - where package_id = :package_id - and posted_date > current_timestamp - interval '14 days' - and draft_p = 'f' - and deleted_p = 'f' - order by entry_date desc, posted_date desc - - - - Index: openacs-4/packages/lars-blogger/www/admin/recently-published.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/Attic/recently-published.adp,v diff -u -N --- openacs-4/packages/lars-blogger/www/admin/recently-published.adp 14 Sep 2002 22:05:25 -0000 1.4 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,26 +0,0 @@ - -@page_title@ -@context_bar@ - - - - - -
- - - - - - - - - - - - - - - -
DateTitleContentAction
@entries.entry_date_pretty@@entries.title@@entries.content@Edit - View
-
Index: openacs-4/packages/lars-blogger/www/admin/recently-published.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/Attic/recently-published.tcl,v diff -u -N --- openacs-4/packages/lars-blogger/www/admin/recently-published.tcl 14 Sep 2002 22:05:25 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,22 +0,0 @@ -ad_page_contract {} { -} -properties { - context_bar -} - -set package_id [ad_conn package_id] - -set admin_p [ad_require_permission $package_id admin] - -set page_title "Recently Published Entries" - -set context_bar [ad_context_bar $page_title] - -db_multirow -extend { edit_url preview_url } entries entries { *SQL* } { - set return_url "[ad_conn url][ad_decode [ad_conn query] "" "" "?[ad_conn query]"]" - set edit_url "[ad_conn package_url]admin/entry-edit?[export_vars { entry_id return_url }]" - set preview_url "[ad_conn package_url]admin/entry-preview?[export_vars { entry_id return_url }]" -} - -set header_background_color [lars_blog_header_background_color] - -ad_return_template