Index: openacs-4/packages/news-aggregator/catalog/news-aggregator.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/catalog/news-aggregator.en_US.ISO-8859-1.xml,v diff -u -r1.1 -r1.1.2.1 --- openacs-4/packages/news-aggregator/catalog/news-aggregator.en_US.ISO-8859-1.xml 3 Jun 2004 18:11:12 -0000 1.1 +++ openacs-4/packages/news-aggregator/catalog/news-aggregator.en_US.ISO-8859-1.xml 29 Dec 2005 22:54:18 -0000 1.1.2.1 @@ -10,6 +10,5 @@ Post Purges: &raquo; - , - updated %items.diff% + updated %items.diff% Index: openacs-4/packages/news-aggregator/tcl/news-aggregator-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/tcl/news-aggregator-procs.tcl,v diff -u -r1.9 -r1.9.2.1 --- openacs-4/packages/news-aggregator/tcl/news-aggregator-procs.tcl 13 Jan 2005 13:58:27 -0000 1.9 +++ openacs-4/packages/news-aggregator/tcl/news-aggregator-procs.tcl 29 Dec 2005 22:54:19 -0000 1.9.2.1 @@ -25,15 +25,22 @@ {-diff:required} } { - Returns the number of hours and minutes since the feed was last updated. + Returns the number of days, hours and minutes since the feed was last updated. @author Simon Carstensen } { if {$diff < 120 && $diff > 60} { set to_return "1 hour and " - } elseif {$diff >= 60} { + } elseif {$diff >= 60 && $diff < 1440} { set to_return "[expr $diff / 60] hours and " + } else { + if {$diff >= 1440 && $diff <2880} { + set to_return "1 day, [expr $diff / 60] hours and " + } else { + set to_return "[expr $diff / 1440] days, [expr [expr $diff % 1440] / 60] hours and " + } } + set mins [expr $diff % 60] if {[string equal 1 $mins]} { append to_return "1 minute ago" Index: openacs-4/packages/news-aggregator/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-aggregator/www/index.adp,v diff -u -r1.12.2.2 -r1.12.2.3 --- openacs-4/packages/news-aggregator/www/index.adp 28 Dec 2005 20:37:37 -0000 1.12.2.2 +++ openacs-4/packages/news-aggregator/www/index.adp 29 Dec 2005 22:54:19 -0000 1.12.2.3 @@ -8,7 +8,7 @@ - @@ -40,7 +38,6 @@ Manage @aggregator_name@ - #news-aggregator.lt_Create_New_Aggregator#@instance_name@ Settings

@@ -53,47 +50,38 @@ #news-aggregator.No_items# -

+

@aggregator_name@

@aggregator_description@ @@ -24,11 +24,9 @@
- + + +
- - - -
- - - - - - - - - - - - - - -
- @items.title@#news-aggregator.updated_x_time_ago# - Technorati Cosmos -
- @items.content;noquote@ - - # - - - - - Save - - - Unsave - - Post this item to your Weblog - - - @items.pub_date@ -
-
+ + +
+ @items.title@#news-aggregator.updated_x_time_ago# +
+ +

+

+ +
+ + @items.item_title@ + +
+
Posted: @items.pub_date@
+ @items.content;noquote@ + + # + + + + Save + + + Unsave + + Post this item to your Weblog + +
+
+
+
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 -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 } {