Index: openacs-4/packages/news/www/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/index.tcl,v
diff -u -N -r1.5 -r1.5.2.1
--- openacs-4/packages/news/www/index.tcl 5 Sep 2002 10:49:47 -0000 1.5
+++ openacs-4/packages/news/www/index.tcl 15 Jan 2003 19:27:06 -0000 1.5.2.1
@@ -42,12 +42,12 @@
# switch for showing interface to site-wide-search for news
set allow_search_p [ad_parameter ShowSearchInterfaceP "news" 1]
-set search_url [news_util_get_url search]
+set search_url [apm_package_url_from_key search]
# view switch in live | archived news
if { [string equal "live" $view] } {
- set title "News"
+ set title "[_ news.News]"
set view_clause [db_map view_clause_live]
if { [db_string archived_p "
@@ -56,14 +56,14 @@
where publish_date < sysdate
and archive_date < sysdate
and package_id = :package_id"]} {
- set view_switch_link "Show archived news"
+ set view_switch_link "[_ news.Show_archived_news]"
} else {
set view_switch_link ""
}
} else {
- set title "News Archive"
+ set title "[_ news.News_Archive]"
set view_clause [db_map view_clause_archived]
if { [db_string live_p "
@@ -73,7 +73,7 @@
and (archive_date is null
or archive_date > sysdate)
and package_id = :package_id"] } {
- set view_switch_link "Show live news"
+ set view_switch_link "[_ news.Show_live_news]"
} else {
set view_switch_link ""
}
@@ -87,37 +87,30 @@
# use template::query to limit result to allowed number of rows.
-db_multirow news_items item_list "
-select item_id,
- package_id,
- publish_title,
- publish_date
-from news_items_approved
-where $view_clause
-and package_id = :package_id
-order by publish_date desc, item_id desc" {
-
+db_multirow -extend { publish_date } news_items item_list {} {
# this code block enables paging counter, no direct data manipulation
# alternatives are: = [expr $start + $max_dspl] } break
+
+ set publish_date [lc_time_fmt $publish_date_ansi "%x"]
}
# make paging links
if { $count < [expr $start + $max_dspl] } {
set next_start ""
} else {
- set next_start "next"
+ set next_start "[_ news.next]"
}
if { $start == 1 } {
set prev_start ""
} else {
- set prev_start "prev"
+ set prev_start "[_ news.prev]"
}
if { ![empty_string_p $next_start] && ![empty_string_p $prev_start] } {
@@ -129,3 +122,9 @@
set pagination_link "$prev_start$divider$next_start"
ad_return_template
+
+
+
+
+
+