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.39 -r1.40 --- openacs-4/packages/lars-blogger/lars-blogger.info 24 Feb 2005 13:33:21 -0000 1.39 +++ openacs-4/packages/lars-blogger/lars-blogger.info 5 Apr 2005 12:08:47 -0000 1.40 @@ -7,14 +7,14 @@ f f - + Lars Pind Individual or collaborative web logs. 2004-02-11 Collaboraid Weblog creation and management with notifications, RSS, trackpack, technorati, blogroll, pings, archives, draft and published entries, includable templates for presenting on other pages, and permissioning for multiple users. - + @@ -30,8 +30,9 @@ - + + + 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.22 -r1.23 --- openacs-4/packages/lars-blogger/www/blog.adp 26 Mar 2005 00:10:43 -0000 1.22 +++ openacs-4/packages/lars-blogger/www/blog.adp 5 Apr 2005 12:08:47 -0000 1.23 @@ -1,7 +1,7 @@ - +
    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.25 -r1.26 --- openacs-4/packages/lars-blogger/www/blog.tcl 26 Feb 2005 17:52:22 -0000 1.25 +++ openacs-4/packages/lars-blogger/www/blog.tcl 5 Apr 2005 12:08:47 -0000 1.26 @@ -12,6 +12,8 @@ # max_content_length:integer,optional # create_p:boolean # display_template: +# unpublish_p +# manageown_p # If the caller specified a URL, then we gather the package_id from that URL if { [info exists url] } { @@ -28,6 +30,14 @@ set create_p [permission::permission_p -object_id $package_id -privilege create] } +if {![exists_and_not_null unpublish_p]} { + set unpublish_p 1 +} +if {![exists_and_not_null manageown_p]} { + set manageown_p [expr ![permission::permission_p -object_id $package_id -privilege admin]] +} + + if { ![info exists category_id] } { set blog_category_id {} } else { @@ -75,9 +85,9 @@ -package_id $package_id \ -parameter max_content_length \ -default 0] -} - +} + if { ![info exists type] } { set type "current" } @@ -136,12 +146,12 @@ } else { set num_entries [db_string num_entries_by_date {}] } - + if { $num_entries < $min_num_entries } { # Eliminate date clause, and set the limit to the minimum number of entries set date_clause {} set limit $min_num_entries - } + } } set arr_category_name() None 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.26 -r1.27 --- openacs-4/packages/lars-blogger/www/entry-chunk.adp 26 Mar 2005 00:10:43 -0000 1.26 +++ openacs-4/packages/lars-blogger/www/entry-chunk.adp 5 Apr 2005 12:08:47 -0000 1.27 @@ -51,15 +51,17 @@ | Comments (@blog.num_comments@) - - | Edit - - | Publish + + + | Edit + + | Publish + + + | Unpublish + + | Delete - - | Unpublish - - | Delete

    Index: openacs-4/packages/lars-blogger/www/entry-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/entry-edit.tcl,v diff -u -r1.24 -r1.25 --- openacs-4/packages/lars-blogger/www/entry-edit.tcl 23 Feb 2005 15:28:57 -0000 1.24 +++ openacs-4/packages/lars-blogger/www/entry-edit.tcl 5 Apr 2005 12:08:47 -0000 1.25 @@ -105,12 +105,29 @@ {(Set to now)} } } - {draft_p:text(select) - {options {{"Draft" "t"} {"Publish" "f"}}} - {label "Post Status"} +} +set unpublish_p [expr ![parameter::get -parameter ImmediatePublishP -default 0]] + +if {$unpublish_p} { + ad_form -extend -name entry -form { + {draft_p:text(select) + {options {{"Draft" "t"} {"Publish" "f"}}} + {label "Post Status"} + } } -} \ +} else { + ad_form -extend -name entry -form { + {draft_p:text(hidden)} + } +} + +ad_form -extend -name entry \ -new_request { + if {$unpublish_p} { + set draft_p t + } else { + set draft_p f + } set entry_date $now_ansi set content [template::util::richtext::create $content {}] } \ 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.38 -r1.39 --- openacs-4/packages/lars-blogger/www/index.adp 26 Mar 2005 00:10:43 -0000 1.38 +++ openacs-4/packages/lars-blogger/www/index.adp 5 Apr 2005 12:08:47 -0000 1.39 @@ -38,7 +38,7 @@
    - +
    @@ -74,7 +74,7 @@
    • Add @blog_name@ Item
      • -
    • Draft entries
      • +
    • Draft entries
      •
    • Administer
      •  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.28 -r1.29 --- openacs-4/packages/lars-blogger/www/index.tcl 26 Mar 2005 00:10:43 -0000 1.28 +++ openacs-4/packages/lars-blogger/www/index.tcl 5 Apr 2005 12:08:47 -0000 1.29 @@ -61,10 +61,18 @@ set rsd_url "" if { [xmlrpc::enabled_p] } { set rsd_url "[ad_url]${package_url}rsd/" -} +} set stylesheet_url [lars_blog_stylesheet_url] +set unpublish_p [expr ![parameter::get -parameter ImmediatePublishP -default 0]] + +# We say manageown if manageown set and not admin on the package. +set manageown_p [parameter::get -parameter OnlyManageOwnPostsP -default 0] +if {$manageown_p} { + set manageown_p [expr ![permission::permission_p -object_id $package_id -privilege admin]] +} + # since ADP commands can't be evaluated in the tags, we # create a separate ADP file for headerstuff. See Bart's post # http://openacs.org/forums/message-view?message_id=149849 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 -r1.18 -r1.19 --- openacs-4/packages/lars-blogger/www/one-entry.adp 13 Jan 2005 13:58:22 -0000 1.18 +++ openacs-4/packages/lars-blogger/www/one-entry.adp 5 Apr 2005 12:08:47 -0000 1.19 @@ -7,5 +7,5 @@ @entry_id;noquote@
      - +
      Index: openacs-4/packages/lars-blogger/www/one-entry.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/one-entry.tcl,v diff -u -r1.15 -r1.16 --- openacs-4/packages/lars-blogger/www/one-entry.tcl 17 May 2004 13:02:17 -0000 1.15 +++ openacs-4/packages/lars-blogger/www/one-entry.tcl 5 Apr 2005 12:08:47 -0000 1.16 @@ -13,6 +13,14 @@ set sw_category_multirow "__branimir__multirow__blog/$entry_id" +set unpublish_p [expr ![parameter::get -parameter ImmediatePublishP -default 0]] + +# We say manageown if manageown set and not admin on the package. +set manageown_p [parameter::get -parameter OnlyManageOwnPostsP -default 0] +if {$manageown_p} { + set manageown_p [expr ![permission::permission_p -object_id $package_id -privilege admin]] +} + template::multirow create $sw_category_multirow sw_category_id \ sw_category_name sw_category_url