Index: openacs-4/packages/news-aggregator/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/index.tcl,v diff -u -N -r1.9.2.3 -r1.9.2.4 --- openacs-4/packages/news-aggregator/www/index.tcl 28 Dec 2005 22:45:41 -0000 1.9.2.3 +++ openacs-4/packages/news-aggregator/www/index.tcl 29 Dec 2005 22:54:19 -0000 1.9.2.4 @@ -77,7 +77,7 @@ db_1row aggregator_info {} # Get options for "other aggregators" form widget -set other_aggregators [list [list " --- select --- " "\#"]] +set other_aggregators [list [list "Other News Aggregators" "\#"]] db_foreach other_aggregators {} { if { [permission::permission_p \ -object_id $other_id \ @@ -187,20 +187,20 @@ } if { [exists_and_not_null content_encoded] } { - if { [exists_and_not_null item_title] } { - set content "$item_title. $content_encoded" - } else { +# if { [exists_and_not_null item_title] } { +# set content "$item_title. $content_encoded" +# } else { set content $content_encoded - } +# } } else { set text_only [util_remove_html_tags $item_description] - if { [exists_and_not_null item_title] } { - set content "$item_title. $item_author -$item_description" - } else { +# if { [exists_and_not_null item_title] } { +# set content "$item_title. $item_author +# $item_description" +# } else { set content $item_description - } +# } } if { $item_permalink_p == "t" } { @@ -217,13 +217,9 @@ set utctime [clock scan $item_pub_date -gmt 1] if { $utctime > [clock scan "1 day ago" -gmt 1] } { set pub_date [clock format $utctime -format "%I:%M %p"] - } elseif { $utctime > [clock scan "1 week ago" -gmt 1] } { - set pub_date [clock format $utctime -format "%a %I:%M %p"] - } elseif { $utctime > [clock scan "2 weeks ago" -gmt 1] } { - set pub_date [clock format $utctime -format "%a %m/%d"] } else { - set pub_date [clock format $utctime -format "%D"] - } + set pub_date [clock format $utctime -format "%d %b %Y %I:%M %p"] + } if { [string equal $write_p "1"] } { if { [lsearch $saved_items $item_id] == -1 } {