Index: openacs-4/packages/news/catalog/news.da_DK.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/catalog/news.da_DK.ISO-8859-1.xml,v diff -u -r1.13 -r1.14 --- openacs-4/packages/news/catalog/news.da_DK.ISO-8859-1.xml 15 Oct 2003 15:28:22 -0000 1.13 +++ openacs-4/packages/news/catalog/news.da_DK.ISO-8859-1.xml 22 Oct 2003 16:12:39 -0000 1.14 @@ -15,7 +15,7 @@ Arkiveret Forfatter Tilbage til nyhedslisten - Nyhedstekst + Inhold bytes Kommentarer Bekr�ft @@ -29,6 +29,8 @@ Slet Fejl Videre + Bliver publiceret om %n_days_until_publish% dage; bliver ikke arkiveret + Bliver publiceret om %n_days_until_publish% dage; bliver arkiveret om %n_days_until_archive% dage HTML Den vil blive synlig den Nyheden vil flytte til arkivet den @@ -48,7 +50,7 @@ er blevet indsendt og vil blive aktiv, n�r den godkendes. Nyheden vil blive synlig efter den er godkendt af Nyhedsadministratoren. H�ndt�r nyheder individuelt f�rst med henblik p� godkendelse. - p� de(t) f�lgende nyhedsemne(r)? + p� f�lgende nyheder? En Nyhed - tilf�j revision Afkryds venligst de nyheder, du vil have gennemg�et. Angiv venligst en nyhedstekst til nyheden. @@ -85,7 +87,10 @@ Vis Vis nyhed Udgivelsesdato + Publicer Udgivet + Publiceret; bliver ikke arkiveret + Publiceret, vil blive arkiveret om %n_days_until_archive% dage Udgiv Udgivelsesdato revision Index: openacs-4/packages/news/catalog/news.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/catalog/news.en_US.ISO-8859-1.xml,v diff -u -r1.15 -r1.16 --- openacs-4/packages/news/catalog/news.en_US.ISO-8859-1.xml 15 Oct 2003 15:28:22 -0000 1.15 +++ openacs-4/packages/news/catalog/news.en_US.ISO-8859-1.xml 22 Oct 2003 16:12:39 -0000 1.16 @@ -91,6 +91,7 @@ Preview Preview news item Publication Date + Publish Published Published, not scheduled for archive Published, archived in %n_days_until_archive% days Index: openacs-4/packages/news/tcl/news-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/tcl/news-procs.tcl,v diff -u -r1.12 -r1.13 --- openacs-4/packages/news/tcl/news-procs.tcl 6 Oct 2003 12:11:23 -0000 1.12 +++ openacs-4/packages/news/tcl/news-procs.tcl 22 Oct 2003 16:12:39 -0000 1.13 @@ -145,6 +145,8 @@ } set now_seconds [clock scan now] + set n_days_until_archive {} + if { ![empty_string_p $archive_date] } { set archive_date_seconds [clock scan $archive_date] Index: openacs-4/packages/news/www/admin/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/index.adp,v diff -u -r1.11 -r1.12 --- openacs-4/packages/news/www/admin/index.adp 6 Oct 2003 12:11:23 -0000 1.11 +++ openacs-4/packages/news/www/admin/index.adp 22 Oct 2003 16:12:39 -0000 1.12 @@ -39,8 +39,8 @@ @news_items.item_id@ @news_items.publish_title@ (#news.rev# @news_items.revision_no@) [#news.revise#] @news_items.item_creator@ - @news_items.publish_date@ - @news_items.archive_date@ + @news_items.publish_date_pretty@ + @news_items.archive_date_pretty@ @news_items.pretty_status@ @@ -58,7 +58,7 @@ #news.lt_Do_the_following_to_t# Index: openacs-4/packages/news/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/index.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/news/www/admin/index.tcl 6 Oct 2003 12:11:23 -0000 1.6 +++ openacs-4/packages/news/www/admin/index.tcl 22 Oct 2003 16:12:39 -0000 1.7 @@ -40,9 +40,15 @@ # define action on selected views, unapproved, archived, approved need restriction switch $view { - "unapproved" { set select_actions " @@ -52,21 +58,17 @@ } } - - set title "[_ news.Administration]" set context {} # administrator sees all news items -db_multirow -extend { publish_date archive_date pretty_status } news_items itemlist {} { - set publish_date [lc_time_fmt $publish_date_ansi "%x"] - set archive_date [lc_time_fmt $archive_date_ansi "%x"] +db_multirow -extend { publish_date_pretty archive_date_pretty pretty_status } news_items itemlist {} { + set publish_date_pretty [lc_time_fmt $publish_date_ansi "%x"] + set archive_date_pretty [lc_time_fmt $archive_date_ansi "%x"] set pretty_status [news_pretty_status \ - -publish_date $publish_date \ - -archive_date $archive_date \ + -publish_date $publish_date_ansi \ + -archive_date $archive_date_ansi \ -status $status] } - -ad_return_template Index: openacs-4/packages/news/www/admin/process.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/process.adp,v diff -u -r1.6 -r1.7 --- openacs-4/packages/news/www/admin/process.adp 23 Aug 2003 22:25:11 -0000 1.6 +++ openacs-4/packages/news/www/admin/process.adp 22 Oct 2003 16:12:39 -0000 1.7 @@ -2,51 +2,26 @@ @context;noquote@ @title;noquote@ -

-

#news.Error#

#news.The_action# @action@ #news.lt_cannot_be_applied_to_# -
-#news.lt_Manage_the_items_indi# +
+ #news.lt_Manage_the_items_indi# - -

- #news.lt_Do_you_really_want_to# @action@
#news.lt_on_the_following_news# -

- - - - - - - - -
#news.Title##news.Creation_Date##news.Author#
  • @news_items.publish_title@
    		• @news_items.creation_date@@news_items.item_creator@
    - -

    + #news.lt_Do_you_really_want_to# @action_pretty@
    #news.lt_on_the_following_news#     + +

    +
    - @hidden_vars;noquote@ - + @hidden_vars;noquote@ +
    -
     - - - - - - - - - - - Index: openacs-4/packages/news/www/admin/process.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/process.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/news/www/admin/process.tcl 18 Nov 2002 17:59:12 -0000 1.5 +++ openacs-4/packages/news/www/admin/process.tcl 22 Oct 2003 16:12:39 -0000 1.6 @@ -12,16 +12,11 @@ @cvs-id $Id$ } { - n_items:multiple,notnull action:notnull - } -errors { - n_items:notnull "[_ news.lt_Please_check_the_item]" - } -properties { - title:onevalue context:onevalue action:onevalue @@ -30,7 +25,6 @@ n_items:onevalue halt_p:onevalue news_items:multirow - } @@ -44,7 +38,17 @@ set title "[_ news.Confirm_Action] $action" set context [list $title] +array set action_msg_key { + publish news.Publish + "make permanent" news.Make_Permanent + "archive now" news.Archive_Now + "archive next week" news.lt_Archive_as_of_Next_We + "archive next month" news.lt_Archive_as_of_Next_Mo + "make permanent" news.Make_Permanent +} +set action_pretty [_ $action_msg_key($action)] + # produce bind_id_list for {set i 0} {$i < [llength $n_items]} {incr i} { set id_$i [lindex $n_items $i] @@ -55,16 +59,35 @@ # 'archive' or 'making permanent' only after release possible if {[regexp -nocase {archive|permanent} $action ]} { - db_multirow unapproved unapproved_list {} + db_multirow -extend { creation_date_pretty } unapproved unapproved_list {} { + set creation_date_pretty [lc_time_fmt $creation_date "%x"] + } + set halt_p [array size unapproved] } # proceed if no errors if { ![info exist halt_p] || $halt_p==0 } { - db_multirow news_items item_list {} { - set creation_date [lc_time_fmt $creation_date "%x"] + template::list::create \ + -name news_items \ + -multirow news_items \ + -elements { + publish_title { + label \#news.Title\# + } + creation_date { + label \#news.Creation_Date\# + display_col creation_date_pretty + } + item_creator { + label \#news.Author\# + } + } + + db_multirow -extend { creation_date_pretty } news_items item_list {} { + set creation_date_pretty [lc_time_fmt $creation_date "%x"] } }