Index: openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl,v diff -u -r1.1 -r1.2 --- openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl 13 Mar 2007 10:27:31 -0000 1.1 +++ openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl 14 Mar 2007 13:41:04 -0000 1.2 @@ -196,30 +196,35 @@ portlet="categories -open_page @name@ -decoration plain">
-
+ +
[next]
+
}] } Index: openacs-4/packages/xowiki/www/oacs-view.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/oacs-view.adp,v diff -u -r1.22 -r1.23 --- openacs-4/packages/xowiki/www/oacs-view.adp 13 Mar 2007 10:27:32 -0000 1.22 +++ openacs-4/packages/xowiki/www/oacs-view.adp 14 Mar 2007 13:41:04 -0000 1.23 @@ -1,4 +1,4 @@ - + @title;noquote@ @context;noquote@ Index: openacs-4/packages/xowiki/www/oacs-view2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/oacs-view2.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/xowiki/www/oacs-view2.adp 13 Mar 2007 10:27:32 -0000 1.1 +++ openacs-4/packages/xowiki/www/oacs-view2.adp 14 Mar 2007 13:41:04 -0000 1.2 @@ -1,4 +1,4 @@ - + @title;noquote@ @context;noquote@ @@ -54,7 +54,11 @@ portlet="categories -open_page @name@ -decoration plain">
-
+ +
@top_portlets;noquote@ @content;noquote@
@@ -63,22 +67,23 @@ margin-left: 2px; margin-top: 2px; padding: 0px 6px 6px 0px; ">
- + page="weblog-portlet" summary="1"> + portlet="tags -decoration plain -page weblog-portlet -summary 1"> + portlet="tags -popular 1 -limit 30 -decoration plain -page weblog-portlet -summary 1"> +
+
Index: openacs-4/packages/xowiki/www/view-default.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view-default.adp,v diff -u -r1.18 -r1.19 --- openacs-4/packages/xowiki/www/view-default.adp 13 Mar 2007 10:27:32 -0000 1.18 +++ openacs-4/packages/xowiki/www/view-default.adp 14 Mar 2007 13:41:04 -0000 1.19 @@ -1,4 +1,4 @@ - + @title;noquote@ @context;noquote@ Index: openacs-4/packages/xowiki/www/view-links.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view-links.adp,v diff -u -r1.8 -r1.9 --- openacs-4/packages/xowiki/www/view-links.adp 13 Mar 2007 10:27:32 -0000 1.8 +++ openacs-4/packages/xowiki/www/view-links.adp 14 Mar 2007 13:41:04 -0000 1.9 @@ -1,4 +1,4 @@ - +
Index: openacs-4/packages/xowiki/www/view-plain.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view-plain.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/xowiki/www/view-plain.adp 13 Mar 2007 10:27:32 -0000 1.4 +++ openacs-4/packages/xowiki/www/view-plain.adp 14 Mar 2007 13:41:04 -0000 1.5 @@ -1,4 +1,4 @@ - +
Index: openacs-4/packages/xowiki/www/portlets/weblog-mini-calendar.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/portlets/Attic/weblog-mini-calendar.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/xowiki/www/portlets/weblog-mini-calendar.tcl 12 Mar 2007 08:03:39 -0000 1.4 +++ openacs-4/packages/xowiki/www/portlets/weblog-mini-calendar.tcl 14 Mar 2007 13:41:04 -0000 1.5 @@ -11,16 +11,12 @@ set date [dt_sysdate] } -if {[exists_and_not_null page_num]} { - set page_num_formvar [export_form_vars page_num] - set page_num "&page_num=$page_num" -} else { - set page_num_formvar "" - set page_num "" -} +#if {[exists_and_not_null page_num]} { +# set page_num "&page_num=$page_num" +#} else { +# set page_num "" +#} -set url_stub_period_days "" - array set message_key_array { list #acs-datetime.List# day #acs-datetime.Day# @@ -48,8 +44,9 @@ set curr_month [lindex $months_list $curr_month_idx ] set prev_month [clock format [clock scan "1 month ago" -base $now] -format "%Y-%m-%d"] set next_month [clock format [clock scan "1 month" -base $now] -format "%Y-%m-%d"] -set prev_month_url "$base_url?date=[ad_urlencode $prev_month]${page_num}${url_stub_period_days}" -set next_month_url "$base_url?date=[ad_urlencode $next_month]${page_num}${url_stub_period_days}" +set prev_month_url [export_vars -base $base_url {{date $prev_month} page_num summary}] +set next_month_url [export_vars -base $base_url {{date $next_month} page_num summary}] +#set next_month_url "$base_url?date=[ad_urlencode $next_month]${page_num}" set first_day_of_week [lc_get firstdayofweek] set week_days [lc_get abday] @@ -129,14 +126,14 @@ set class inactive } multirow append days $day_number $beginning_of_week_p $end_of_week_p $today_p $active_p \ - "[export_vars -base $base_url {{date $ansi_date}}]${url_stub_period_days}" $count $class + "[export_vars -base $base_url {{date $ansi_date} summary}]" $count $class incr day_number incr day_of_week } - -set today_url "$base_url?date=[ad_urlencode [dt_sysdate]]${page_num}${url_stub_period_days}" -if {[dt_sysdate] eq $date} { +set sysdate [dt_sysdate] +set today_url [export_vars -base $base_url {{date $sysdate} page_num}] +if {$sysdate eq $date} { set today_p t } else { set today_p f