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.7 -r1.9.2.8
--- openacs-4/packages/news-aggregator/www/index.tcl	18 Jan 2006 15:25:17 -0000	1.9.2.7
+++ openacs-4/packages/news-aggregator/www/index.tcl	28 Jan 2006 04:17:44 -0000	1.9.2.8
@@ -17,6 +17,8 @@
 set enable_purge_p [parameter::get -package_id $package_id -parameter EnablePurgeP -default 1]
 set multiple_aggregators_p [parameter::get -package_id $package_id -parameter MultipleAggregatorsP -default 1]
 set allow_aggregator_edit_p [parameter::get -package_id $package_id -parameter AllowAggregatorEditP -default 1]
+set stylesheet_url [parameter::get -package_id $package_id -parameter StylesheetURL]
+set package_css "<link rel=\"stylesheet\" type=\"text/css\" href=\"$stylesheet_url\" media=\"all\"/>"
 
 if { !$aggregator_id } {
     # Check whether the user has an aggregator
@@ -173,10 +175,11 @@
     item_blog_url 
     technorati_url
     item_guid_link
-    pub_sort_date
     chunk_updated
-    pub_date
-    pub_time
+    pub_datestamp
+    pub_timestamp
+    pub_time_pretty
+    inner_sort_col
 } items items $items_query {
     if { $enable_purge_p } {
         # Top is the first item
@@ -219,20 +222,22 @@
     } else {
         set item_guid_link $item_link
     }
-
+    set item_title [string_truncate -len 80 $item_title]
     #set diff [news_aggregator::last_scanned -diff [expr [expr [clock seconds] - [clock scan $last_scanned]] / 60]]
     set source_url [export_vars -base source {source_id}]
     set technorati_url "http://www.technorati.com/cosmos/links.html?url=$link&sub=Get+Link+Cosmos"
 
-    set localtime [clock scan [lc_time_utc_to_local $item_pub_date]]
-    set pub_date [clock scan [clock format $localtime -format "%Y-%m-%d 00:00:00"]]
-    set chunk_updated [news_aggregator::chunk_updated [expr [expr [clock seconds] - $pub_date] / 60]]
-    if { $pub_date > [clock scan "2 days ago" -gmt 1] } {
-        set pub_time [clock format $localtime -format "%I:%M %p"]
+    set pub_timestamp [clock scan [lc_time_utc_to_local $item_pub_date]]
+    set pub_datestamp [clock scan [clock format $pub_timestamp -format "%Y-%m-%d 00:00:00"]]
+    set inner_sort_col "${pub_datestamp},${source_id}"
+    set chunk_updated [news_aggregator::chunk_updated [expr [expr [clock seconds] - $pub_datestamp] / 60]]
+
+    if { $pub_datestamp > [clock scan "2 days ago" -gmt 1] } {
+        set pub_time_pretty [clock format $pub_timestamp -format "%I:%M %p"]
     } else {
-        set pub_time [clock format $localtime -format "%d %b %Y %I:%M %p"]
+        set pub_time_pretty [clock format $pub_timestamp -format "%d %b %Y %I:%M %p"]
     } 
-
+        
     if { [string equal $write_p "1"] } {
 	if { [lsearch $saved_items $item_id] == -1 } {
             set save_url [export_vars -base "${url}item-save" {item_id}]
@@ -254,6 +259,8 @@
     }
 }
 
+template::multirow sort items -decreasing pub_datestamp title pub_timestamp
+
 if { $enable_purge_p &&
      [exists_and_not_null top] && [exists_and_not_null bottom] &&
      $top >= $bottom && $public_p == "f" &&