Index: openacs-4/packages/acs-datetime/acs-datetime.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/acs-datetime.info,v diff -u -r1.17 -r1.18 --- openacs-4/packages/acs-datetime/acs-datetime.info 15 May 2007 20:14:13 -0000 1.17 +++ openacs-4/packages/acs-datetime/acs-datetime.info 9 Nov 2008 23:29:22 -0000 1.18 @@ -7,15 +7,15 @@ f t - + OpenACS An API for date and time functions 2006-02-18 OpenACS Note: this version of the package requires acs-event(s) for a helper function. This requirement may go away in the future. 0 - + Index: openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs.tcl,v diff -u -r1.41 -r1.42 --- openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs.tcl 29 Jun 2004 10:17:36 -0000 1.41 +++ openacs-4/packages/acs-datetime/tcl/acs-calendar-2-procs.tcl 9 Nov 2008 23:29:22 -0000 1.42 @@ -73,11 +73,11 @@ [subst $prev_week_template] - + [util_AnsiDatetoPrettyDate $sunday_date] - [util_AnsiDatetoPrettyDate $saturday_date] - + [subst $next_week_template] @@ -120,9 +120,9 @@ append return_html " - + [ns_set value $calendar_details $index] - + " @@ -251,8 +251,8 @@ set start_time "" set odd_row_p 0 set display_hour "\"[_" - append return_html "[subst $hour_template]" - append return_html "" + append return_html "[subst $hour_template]" + append return_html "" # Go through events while {1} { @@ -270,7 +270,7 @@ ns_set delete $calendar_details $index } - append return_html " + append return_html " " for {set hour $start_hour} {$hour <= $end_hour} {incr hour} { @@ -319,7 +319,7 @@ } set display_hour [subst $hour_template] - append return_html "$display_hour\n" + append return_html "$display_hour\n" set n_processed_events 0 @@ -359,7 +359,7 @@ set colspan 1 } - append return_html "[lindex $one_item_val 2]" + append return_html "[lindex $one_item_val 2]" } else { append return_html "[ns_set value $calendar_details $index]
\n" } Index: openacs-4/packages/acs-datetime/tcl/acs-calendar-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-datetime/tcl/acs-calendar-procs.tcl,v diff -u -r1.23 -r1.24 --- openacs-4/packages/acs-datetime/tcl/acs-calendar-procs.tcl 15 May 2007 20:14:14 -0000 1.23 +++ openacs-4/packages/acs-datetime/tcl/acs-calendar-procs.tcl 9 Nov 2008 23:29:22 -0000 1.24 @@ -19,7 +19,7 @@ -header_bgcolor "black" -header_text_color "white" -header_text_size "+2" - -day_number_template {$day_number} + -day_number_template {$day_number} -day_header_size 2 -day_header_bgcolor "#666666" -calendar_width "100%" @@ -75,42 +75,46 @@ # in the title bar if { $prev_next_links_in_title == 0 } { - set title " - - $month_heading - \n" + set title [subst { + + + $month_heading + + \n}] } else { - set title " - - - - - - - -
$prev_month_url - $month_heading - $next_month_url
- \n" + set title [subst { + + + + + + + +
$prev_month_url + + $month_heading + + $next_month_url
+ \n}] } # Write out the header and the days of the week - append output " - - $title - \n" + append output [subst { +
+ $title + \n}] foreach day_of_week $days_of_week { - append output " - \n" + append output [subst { + \n}] } - append output "\n" + append output "\n" set day_of_week 1 set julian_date $first_julian_date @@ -140,68 +144,68 @@ set day_number 1 } - if { $day_of_week == 1} { - append output "\n" - } + if { $day_of_week == 1} { + append output "\n" + } - set skip_day 0 + set skip_day 0 - if {$before_month_p || $after_month_p} { - append output "\n" + append output "\n" - incr day_of_week - incr julian_date + incr day_of_week + incr julian_date incr day_number - if { $day_of_week > 7 } { - set day_of_week 1 - append output "\n" - } + if { $day_of_week > 7 } { + set day_of_week 1 + append output "\n" + } } # There are two ways to display previous and next month link - # this is the default if { $prev_next_links_in_title == 0 } { - append output " - - - \n" + append output [subst { + + + \n}] } return [concat $output "
- - $day_of_week - - + + $day_of_week + +
 " - if { $fill_all_days == 0 } { - set skip_day 1 - } else { - append output "[subst $day_number_template] " - } - } else { + if {$before_month_p || $after_month_p} { + append output " " + if { $fill_all_days == 0 } { + set skip_day 1 + } else { + append output "[subst $day_number_template] " + } + } else { if {$julian_date == $today_julian_date} { set the_bgcolor $today_bgcolor - set the_class "cal-month-today" + set the_class "cal-month-today" } else { set the_bgcolor $day_bgcolor - set the_class "cal-month-day" + set the_class "cal-month-day" } - append output "[subst $day_number_template] " - } + append output "[subst $day_number_template] " + } - if { (!$skip_day) && $large_calendar_p == 1 } { - append output "
" + if { (!$skip_day) && $large_calendar_p == 1 } { + append output "
" - set calendar_day_index [ns_set find $calendar_details $julian_date] - - while { $calendar_day_index >= 0 } { - set calendar_day [ns_set value $calendar_details $calendar_day_index] + set calendar_day_index [ns_set find $calendar_details $julian_date] + + while { $calendar_day_index >= 0 } { + set calendar_day [ns_set value $calendar_details $calendar_day_index] - ns_set delete $calendar_details $calendar_day_index + ns_set delete $calendar_details $calendar_day_index - append output "$calendar_day" + append output "$calendar_day" - set calendar_day_index [ns_set find $calendar_details $julian_date] - } - append output "
" - } + set calendar_day_index [ns_set find $calendar_details $julian_date] + } + append output "
" + } - append output "
$prev_month_url$next_month_url
$prev_month_url$next_month_url
\n"] @@ -217,7 +221,7 @@ -header_bgcolor "black" -header_text_color "white" -header_text_size "+1" - -day_number_template {$day_number} + -day_number_template {$day_number} -day_header_size 1 -day_header_bgcolor "#666666" -calendar_width 0 @@ -263,7 +267,7 @@ -header_bgcolor "black" -header_text_color "white" -header_text_size "+1" - -day_number_template {$day_number} + -day_number_template {$day_number} -day_header_size 1 -day_header_bgcolor "#666666" -calendar_width 0 @@ -315,7 +319,7 @@ -header_bgcolor "black" -header_text_color "white" -header_text_size "+1" - -day_number_template {$day_number} + -day_number_template {$day_number} -day_header_size 1 -day_header_bgcolor "#666666" -calendar_width 0 @@ -372,7 +376,7 @@ -header_bgcolor "black" -header_text_color "white" -header_text_size "+1" - -day_number_template {$day_number} + -day_number_template {$day_number} -day_header_size 1 -day_header_bgcolor "#666666" -calendar_width 0 @@ -451,13 +455,13 @@ if { $viewname == $view } { # current view append result " - $text + $text " } else { append result " - $text + $text " } @@ -589,7 +593,7 @@ } append results " - $curr_month" + $curr_month" # Output link to next month only if it's a legal month if {$next_month_legal_p != 0} { @@ -690,7 +694,7 @@ if {$i == $curr_month} { append output " - $month + $month \n" } else { set target_date [clock format \ @@ -699,7 +703,7 @@ append output " - $month + $month \n" } } @@ -724,12 +728,12 @@ for {set year [expr $curr_year - 2]} {$year <= $end_year} {incr year} { if {$year == $curr_year} { append output " - $year\n" + $year\n" } else { append output " - $year + $year \n" } } @@ -752,7 +756,7 @@ set days_of_week [list S M T W T F S] foreach day_of_week $days_of_week { - append output "$day_of_week\n" + append output "$day_of_week\n" } append output "
" @@ -791,18 +795,18 @@ append output " - $day_number + $day_number " } elseif {$julian_date == $julian_date_today} { append output " - $day_number + $day_number " } else { append output " - $day_number + $day_number " } @@ -833,21 +837,23 @@ + is [dt_ansi_to_pretty]
- " + " if { $view == "day" && [dt_sysdate] == $date } { - append output "Today" + append output "Today" } else { append output " - Today " + Today " } append output " - is [dt_ansi_to_pretty]

-
Date as YYYYMMDD +
+
Date as YYYYMMDD +
" foreach var $list_of_vars { Index: openacs-4/packages/acs-developer-support/acs-developer-support.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/acs-developer-support.info,v diff -u -r1.20 -r1.21 --- openacs-4/packages/acs-developer-support/acs-developer-support.info 5 Oct 2007 12:03:48 -0000 1.20 +++ openacs-4/packages/acs-developer-support/acs-developer-support.info 9 Nov 2008 23:29:22 -0000 1.21 @@ -8,7 +8,7 @@ t ds - + Lars Pind Profiling for requests including database timing information. 2005-02-04 @@ -18,7 +18,7 @@ 0 - + Index: openacs-4/packages/acs-developer-support/lib/footer.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/lib/footer.adp,v diff -u -r1.15 -r1.16 --- openacs-4/packages/acs-developer-support/lib/footer.adp 15 May 2007 20:14:14 -0000 1.15 +++ openacs-4/packages/acs-developer-support/lib/footer.adp 9 Nov 2008 23:29:22 -0000 1.16 @@ -5,19 +5,19 @@ - Comment: 
@comments.text@

+ Comment: 
@comments.text@

 -
+
@export_vars;noquote@ - Real user: @real_user_name@ (@real_user_email@) [user_id #@real_user_id@]
+ Real user: @real_user_name@ (@real_user_email@) [user_id #@real_user_id@]
- Faked user: @fake_user_name@ (@fake_user_email@) [user_id #@fake_user_id@] (Unfake)
+ Faked user: @fake_user_name@ (@fake_user_email@) [user_id #@fake_user_id@] (Unfake)
 - Faked user: Not faking.
+ Faked user: Not faking.
 Change faked user: -
+

Profiling Information

- - - + + +

Index: openacs-4/packages/acs-developer-support/lib/footer.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/lib/footer.tcl,v diff -u -r1.10 -r1.11 --- openacs-4/packages/acs-developer-support/lib/footer.tcl 15 May 2007 20:14:14 -0000 1.10 +++ openacs-4/packages/acs-developer-support/lib/footer.tcl 9 Nov 2008 23:29:22 -0000 1.11 @@ -30,8 +30,8 @@ if { $fake_user_id == 0 } { set selected " selected" - set you_are "You are currently not logged in
" - set you_are_really "You are really not logged in
" + set you_are "You are currently not logged in
" + set you_are_really "You are really not logged in
" } else { set selected {} } Index: openacs-4/packages/acs-developer-support/lib/toolbar.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/lib/toolbar.adp,v diff -u -r1.18 -r1.19 --- openacs-4/packages/acs-developer-support/lib/toolbar.adp 7 Oct 2007 22:36:53 -0000 1.18 +++ openacs-4/packages/acs-developer-support/lib/toolbar.adp 9 Nov 2008 23:29:22 -0000 1.19 @@ -46,10 +46,10 @@
-

#attachments.lt_Folder_folder_name_is#

+

#attachments.lt_Folder_folder_name_is#

 Index: openacs-4/packages/attachments/www/file-add.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/file-add.adp,v diff -u -r1.7 -r1.8 --- openacs-4/packages/attachments/www/file-add.adp 9 Oct 2003 09:54:02 -0000 1.7 +++ openacs-4/packages/attachments/www/file-add.adp 9 Nov 2008 23:29:22 -0000 1.8 @@ -2,23 +2,25 @@ #attachments.lt_Upload_New_Attachment# @context;noquote@ -#attachments.you_are_attaching_document_to_object# +

#attachments.you_are_attaching_document_to_object#

+
+
- + - + Index: openacs-4/packages/attachments/www/file-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/file-add.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/attachments/www/file-add.tcl 10 Nov 2002 16:13:21 -0000 1.5 +++ openacs-4/packages/attachments/www/file-add.tcl 9 Nov 2008 23:29:22 -0000 1.6 @@ -30,8 +30,8 @@ # set templating datasources -set context {{Attach File}} -set fs_context [fs_context_bar_list -final "[_ attachments.Add_File]" $folder_id] +set context [_ attachments.Add_File] +#set fs_context [fs_context_bar_list -final "[_ attachments.Add_File]" $folder_id] # Should probably generate the item_id and version_id now for # double-click protection Index: openacs-4/packages/attachments/www/go-to-attachment.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/go-to-attachment.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/attachments/www/go-to-attachment.tcl 15 May 2007 20:14:19 -0000 1.9 +++ openacs-4/packages/attachments/www/go-to-attachment.tcl 9 Nov 2008 23:29:22 -0000 1.10 @@ -36,8 +36,12 @@ # Test if the filename contains the extension, otherwise append it # This usually happens if you just rename the title (displayed filename) but forget # to append the extension to it. + + #file extension return "." extension without "." + set file_extension_aux [concat .$file_extension] + set extension [file extension $filename] - if {$extension ne $file_extension} { + if {$extension ne $file_extension_aux} { append filename ".${file_extension}" } Index: openacs-4/packages/attachments/www/simple-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/simple-add.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/attachments/www/simple-add.tcl 25 Feb 2004 18:01:38 -0000 1.8 +++ openacs-4/packages/attachments/www/simple-add.tcl 9 Nov 2008 23:29:22 -0000 1.9 @@ -35,7 +35,8 @@ return -code error "[_ attachments.No_such_type]" } -set context [fs_context_bar_list -final [_ attachments.Add_pretty_name [list pretty_name $pretty_name]] $folder_id] +set context [_ attachments.Add_pretty_name [list pretty_name $pretty_name]] +#set context [fs_context_bar_list -final [_ attachments.Add_pretty_name [list pretty_name $pretty_name]] $folder_id] # Should probably generate the item_id and version_id now for # double-click protection Index: openacs-4/packages/bm-portlet/bm-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bm-portlet/bm-portlet.info,v diff -u -r1.16 -r1.17 --- openacs-4/packages/bm-portlet/bm-portlet.info 8 Jan 2008 13:04:47 -0000 1.16 +++ openacs-4/packages/bm-portlet/bm-portlet.info 9 Nov 2008 23:29:22 -0000 1.17 @@ -7,14 +7,14 @@ ft - + OpenACS - 2008-01-08 + 2008-10-18 OpenACS - + - + Index: openacs-4/packages/bulk-mail/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/bulk-mail/www/index.tcl,v diff -u -r1.13 -r1.14 --- openacs-4/packages/bulk-mail/www/index.tcl 11 Mar 2008 15:50:34 -0000 1.13 +++ openacs-4/packages/bulk-mail/www/index.tcl 9 Nov 2008 23:29:22 -0000 1.14 @@ -33,7 +33,7 @@ " set table [ad_table \ - -Tmissing_text "
[_ bulk-mail.lt_No_bulk_mail_messages]
" \ + -Tmissing_text "

[_ bulk-mail.lt_No_bulk_mail_messages]

" \ -Torderby $orderby \ -Ttable_extra_html {width="95%"} \ select_bulk_mail_messages \ Index: openacs-4/packages/calendar/calendar.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/calendar.info,v diff -u -r1.38 -r1.39 --- openacs-4/packages/calendar/calendar.info 30 Aug 2008 19:51:23 -0000 1.38 +++ openacs-4/packages/calendar/calendar.info 9 Nov 2008 23:29:22 -0000 1.39 @@ -7,7 +7,7 @@ f f - + Dirk Gomez Personal and shared event calendars. 2008-06-12 @@ -16,7 +16,7 @@ 0 #calendar.Calendar# - + Index: openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml,v diff -u -r1.31 -r1.32 --- openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml 30 Aug 2008 19:51:23 -0000 1.31 +++ openacs-4/packages/calendar/catalog/calendar.en_US.ISO-8859-1.xml 9 Nov 2008 23:29:22 -0000 1.32 @@ -36,6 +36,7 @@ Current Permissions Date: Date + Day day day rolling period Please, could you give more info of the context for this, thanks @@ -87,6 +88,7 @@ Item is recurring. Item last week + List Are you sure you want to delete this calendar. All the calendar items and all the permission that's associated with this calendar will be deleted as well. @@ -148,6 +150,7 @@ You have no party wide calendars Manage Item Types Monday + Month New Type: Next day Next Month @@ -191,6 +194,7 @@ sync with Outlook Thursday Time: + Time Title: Title to @@ -201,6 +205,7 @@ Use Hours Below: View Wednesday + Week Week of y-m-d year Index: openacs-4/packages/calendar/catalog/calendar.es_ES.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/catalog/calendar.es_ES.ISO-8859-1.xml,v diff -u -r1.18 -r1.19 --- openacs-4/packages/calendar/catalog/calendar.es_ES.ISO-8859-1.xml 30 Aug 2008 19:51:23 -0000 1.18 +++ openacs-4/packages/calendar/catalog/calendar.es_ES.ISO-8859-1.xml 9 Nov 2008 23:29:22 -0000 1.19 @@ -34,6 +34,7 @@ Permisos actuales Fecha: Fecha + D�a d�a d�as d�a(s) @@ -77,6 +78,7 @@ El evento se repite Evento semana anterior + Lista �Desea realmente borrar este calendario? Todos los eventos y permisos asociados ser�n borrados tambi�n. �Desea realmente borrar este evento? Audiencias del calendario @@ -130,6 +132,7 @@ No tiene acceso a calendarios algunos Administrar los tipos de eventos Lunes + Mes Categor�a nueva: D�a siguiente Mes siguiente @@ -171,6 +174,7 @@ sincronizar con Outlook: Jueves Hora: + Hora T�tulo: T�tulo a @@ -181,6 +185,7 @@ Horario: Vista Mi�rcoles + Semana Semana aaaa-mm-dd a�o Index: openacs-4/packages/calendar/www/navbar.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/navbar.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/calendar/www/navbar.tcl 30 Aug 2008 19:51:23 -0000 1.3 +++ openacs-4/packages/calendar/www/navbar.tcl 9 Nov 2008 23:29:22 -0000 1.4 @@ -37,49 +37,34 @@ multirow create views name text url spacer selected_p onclick multirow append views \ - "Day" \ + [_ calendar.Day] \ "day" \ "[export_vars -base $base_url {date {view day}}]${page_num}\#calendar" \ "   |   " \ $day_selected_p \ "" multirow append views \ - "Week" \ + [_ calendar.Week] \ "week" \ "[export_vars -base $base_url {date {view week}}]${page_num}\#calendar" \ "   |   " \ $week_selected_p \ "" multirow append views \ - "Month" \ + [_ calendar.Month] \ "month" \ "[export_vars -base $base_url {date {view month}}]${page_num}\#calendar" \ "   |      " \ $month_selected_p \ "" multirow append views \ - " Calendar" \ - "calendar" \ - "[export_vars -base $base_url {date {view month}}]${page_num}\#calendar" \ - "    |    " \ - $calendar_selected_p \ - "" - -multirow append views \ - " List" \ + [_ calendar.List] \ "list" \ "[export_vars -base $base_url {date {view list}}]${page_num}${url_stub_period_days}\#calendar" \ - "    |    " \ + "" \ $list_selected_p \ "" -multirow append views \ - " Print" \ - "print" \ - "[export_vars -url -base $base_url -entire_form -exclude {export}]&export=print" \ - "" \ - f \ - "return calOpenPrintView('[export_vars -url -base $base_url -entire_form -exclude {export}]&export=print');" Index: openacs-4/packages/calendar/www/view-list-display.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-list-display.adp,v diff -u -r1.18 -r1.19 --- openacs-4/packages/calendar/www/view-list-display.adp 8 Sep 2008 20:13:37 -0000 1.18 +++ openacs-4/packages/calendar/www/view-list-display.adp 9 Nov 2008 23:29:22 -0000 1.19 @@ -1,5 +1,4 @@ -
#attachments.Version_filename_#
 #attachments.lt_Use_the_Browse_button# #attachments.lt_Use_the_Browse_button#
- - - - + - - - - - - - - - - - -
+
[ 1  |  7 @@ -12,61 +11,6 @@  |  60 ] -
-

@start_month@ @start_day@ @start_year@ – @end_month@ @end_day@ @end_year@

-
- - - -
- - - - - - - - - - - - - - - -
- @items.weekday@, @items.start_date@     @items.start_time@ – @items.end_time@ -
- #calendar.Event# @items.event_name@ - - (@items.calendar_name@) - - -
- #calendar.Description# - none@items.description;noquote@ - - #calendar.Print# -
- -
- - - -
#calendar.No_Items#
+ Index: openacs-4/packages/calendar/www/view-list-display.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-list-display.tcl,v diff -u -r1.30 -r1.31 --- openacs-4/packages/calendar/www/view-list-display.tcl 8 Sep 2008 20:13:37 -0000 1.30 +++ openacs-4/packages/calendar/www/view-list-display.tcl 9 Nov 2008 23:29:22 -0000 1.31 @@ -76,10 +76,7 @@ end_time \ today \ description \ - name_style_class \ - description_style_class \ - container_style_class \ - event_print_url + calendar_name set last_pretty_start_date "" # Loop through the events, and add them @@ -106,11 +103,11 @@ # Localize set pretty_weekday [lc_time_fmt $ansi_start_date "%A"] - set pretty_start_date [lc_time_fmt $ansi_start_date "%x"] - set pretty_end_date [lc_time_fmt $ansi_end_date "%x"] + set pretty_start_date [lc_time_fmt $ansi_start_date "%Q"] + set pretty_end_date [lc_time_fmt $ansi_end_date "%Q"] set pretty_start_time [lc_time_fmt $ansi_start_date "%X"] set pretty_end_time [lc_time_fmt $ansi_end_date "%X"] - set pretty_today [lc_time_fmt $ansi_today "%x"] + set pretty_today [lc_time_fmt $ansi_today "%Q"] set start_date_seconds [clock scan [lc_time_fmt $ansi_start_date "%Y-%m-%d"]] set today_seconds [clock scan [lc_time_fmt $ansi_today "%Y-%m-%d"]] @@ -144,6 +141,10 @@ set event_url [export_vars -base [site_node::get_url_from_object_id -object_id $cal_package_id]cal-item-view {return_url {cal_item_id $item_id}}] + if { !$show_calendar_name_p } { + set calendar_name "" + } + multirow append items \ $name \ $event_url \ @@ -156,12 +157,39 @@ $pretty_end_time \ $today \ $description \ - "calendar-ItemListName" \ - "calendar-ItemListDescription" \ - "calendar-ItemListContainer" \ - $event_url&[export_vars {{export print}}] + $calendar_name } +template::list::create -name "items-list" -multirow items -no_data [_ calendar.No_Items] -caption $title -elements { + start_date { + label "[_ calendar.Date_1]" + } + time { + label "[_ calendar.Time_1]" + display_template { + + @items.start_time@ – @items.end_time@ + + + #calendar.All_Day_Event# + + } + } + event { + label "[_ calendar.Event]" + display_col event_name + link_url_col event_url + link_html {title "#calendar.goto_items_event_name#"} + } + calendar { + label "[_ calendar.Calendar]" + display_col calendar_name + } + description { + label "[_ calendar.Description]" + } +} + set start_year [lc_time_fmt $start_date "%Y"] set start_month [lc_time_fmt $start_date "%B"] set start_day [lc_time_fmt $start_date "%d"] @@ -198,7 +226,7 @@ } -ad_form -name frmdays -has_submit 1 -html {style float:right} -export $noprocessing_vars -form { +ad_form -name frmdays -has_submit 1 -html {class "inline-form"} -export $noprocessing_vars -form { {period_days:integer,optional {label ""} {html {size 3} {maxlength 3} {class "cal-input-field"}} Index: openacs-4/packages/calendar/www/view-month-display.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-month-display.tcl,v diff -u -r1.24 -r1.25 --- openacs-4/packages/calendar/www/view-month-display.tcl 8 Sep 2008 20:13:37 -0000 1.24 +++ openacs-4/packages/calendar/www/view-month-display.tcl 9 Nov 2008 23:29:22 -0000 1.25 @@ -171,7 +171,7 @@ "" \ "" \ "" \ - [lc_time_fmt $current_day_ansi %Q] \ + [lc_time_fmt [dt_julian_to_ansi $current_day] %Q] \ "" \ "" \ "" \ Index: openacs-4/packages/calendar/www/view-one-day-display.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-one-day-display.tcl,v diff -u -r1.38 -r1.39 --- openacs-4/packages/calendar/www/view-one-day-display.tcl 8 Sep 2008 20:13:37 -0000 1.38 +++ openacs-4/packages/calendar/www/view-one-day-display.tcl 9 Nov 2008 23:29:22 -0000 1.39 @@ -138,8 +138,8 @@ set start_time [lc_time_fmt $ansi_start_date "%X"] set end_time [lc_time_fmt $ansi_end_date "%X"] - set start_hour [format %.0f [lc_time_fmt $ansi_start_date "%H"]] - set end_hour [format %.0f [lc_time_fmt $ansi_end_date "%H"]] + scan [lc_time_fmt $ansi_start_date "%H"] %d start_hour + scan [lc_time_fmt $ansi_end_date "%H"] %d end_hour if { $start_hour < $adjusted_start_display_hour && \ [string equal \ Index: openacs-4/packages/calendar/www/view-print-display.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-print-display.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/calendar/www/view-print-display.adp 15 May 2007 20:14:21 -0000 1.2 +++ openacs-4/packages/calendar/www/view-print-display.adp 9 Nov 2008 23:29:22 -0000 1.3 @@ -15,7 +15,7 @@
@items.event_name@
- #calendar.Date# @items.weekday@, @items.start_date@     @items.start_time@ – @items.end_time@ + #calendar.Date# @items.start_date@     @items.start_time@ – @items.end_time@
@items.calendar_name@
@@ -28,4 +28,4 @@ - \ No newline at end of file + Index: openacs-4/packages/calendar/www/view-week-display.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-week-display.tcl,v diff -u -r1.23 -r1.24 --- openacs-4/packages/calendar/www/view-week-display.tcl 8 Sep 2008 20:13:37 -0000 1.23 +++ openacs-4/packages/calendar/www/view-week-display.tcl 9 Nov 2008 23:29:22 -0000 1.24 @@ -110,8 +110,8 @@ set start_time [lc_time_fmt $ansi_start_date "%X"] set end_time [lc_time_fmt $ansi_end_date "%X"] - set start_hour [format %.0f [lc_time_fmt $ansi_start_date "%H"]] - set end_hour [format %.0f [lc_time_fmt $ansi_end_date "%H"]] + scan [lc_time_fmt $ansi_start_date "%H"] %d start_hour + scan [lc_time_fmt $ansi_end_date "%H"] %d end_hour set ansi_this_date [dt_julian_to_ansi [expr $first_weekday_julian + $current_weekday]] Index: openacs-4/packages/calendar/www/resources/calendar.css =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/resources/calendar.css,v diff -u -r1.15 -r1.16 --- openacs-4/packages/calendar/www/resources/calendar.css 2 Sep 2008 22:02:10 -0000 1.15 +++ openacs-4/packages/calendar/www/resources/calendar.css 9 Nov 2008 23:29:22 -0000 1.16 @@ -25,7 +25,7 @@ } .cal-month-day-inactive { - background: #E6E6E6; + background: #F0EFF0; } .cal-month-event { @@ -67,12 +67,11 @@ background-color: #FFFFFF; } - .cal-table-caption { font-size: 1.2em; font-weight: bold; - color: #646c61; margin: 1em; + background: #fff; } .cal-table-caption img { @@ -121,7 +120,7 @@ } #at-a-glance td.inactive { - background-color: #E6E6E6; + background-color: #F0EFF0; } #at-a-glance a { @@ -147,33 +146,24 @@ .cal-text-grey-sml { font-size: .75em; - color: #666666; + color: #444444; font-weight: normal; - } /* cal-item-view, cal-item-new ---------------------------------------------------*/ #viewadp-mini-calendar { width: 25%; float: left; - margin-bottom: 1em; + margin-bottom: 1em; } #viewadp-cal-table { - margin-left: 25%; + float: right; width: 75%; margin-bottom: 1em; } -#viewadp-cal-table table.cal-table-list { - height: 25em; -} - -#viewadp-cal-table .form-item-wrapper { -clear: none; -} - /* Week/Day View Common Styles ---------------------------------------------------*/ #cal-table-day, #cal-table-week { background-color:#89A2B3; @@ -185,7 +175,7 @@ .day-time-1 { border:1px #ffffff solid; - background-color:#D8E0E6; + background-color:#F0EFF0; height:43px; } .day-time-1 p, .day-time-2 p { @@ -195,7 +185,7 @@ .day-time-2 { border:1px #ffffff solid; - background-color:#e8edf1; + background-color:#f0eff0; height:43px; } @@ -280,35 +270,18 @@ /* view-list-display ---------------------------------------------------*/ -.cal-table-list { - padding:5px; +.list-table caption { + font-size: 1.2em; + font-weight: bold; + margin: 1em; + background: #fff; } -.cal-table-list td { - padding-top:2px; - padding-bottom:2px; - padding-left:5px; - padding-right:5px; -} - -.cal-table-list thead { - background-color:#547083; - font-weight:bold; - color:#ffffff; - padding:0px; -} - -.cal-table-list tbody td { - padding-left:5px; - padding-top:5px; - padding-bottom:5px; -} - /* END view-list-display ---------------------------------------------------*/ .topnavbar { - background:#dddddd; + background:#e7e6e7; height:25px; text-align:center; } @@ -356,16 +329,8 @@ background-image: url("/resources/calendar/images/print-icon.gif"); } - - - - - - - /* UNUSED?*/ - .cal-row-dark { background: #DDEEFF; } @@ -384,48 +349,12 @@ border: 0px solid #7D7DFF; } - - .calendar-Item { background-color:#FFFFFF; border: 1px solid #89A2B3; opacity:.9; } -.calendar-classItem { - background-color:#F2E18F; -} - -.calendar-communityItem { - background-color:#DBC9C3; -} - -.calendar-personalItem { - background-color:#CBD3AB; -} - - -.cal-table-list .calendar-personalItemListName { - background-color:#CBD3AB; -} -.cal-table-list .calendar-personalItemListDescription { - border:1px #CBD3AB solid; -} - -.cal-table-list .calendar-classItemListName { - background-color:#F2E18F; -} -.cal-table-list .calendar-classItemListDescription { - border:1px #F2E18F solid; -} - -.cal-table-list .calendar-communityItemListName { - background-color:#DBC9C3; -} -.cal-table-list .calendar-communityItemListDescription { - border:1px #DBC9C3 solid; -} - .bottomnavbar { margin-top:20px; background:#89A2B3; Index: openacs-4/packages/calendar-portlet/calendar-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/calendar-portlet.info,v diff -u -r1.25 -r1.26 --- openacs-4/packages/calendar-portlet/calendar-portlet.info 8 Jan 2008 13:04:47 -0000 1.25 +++ openacs-4/packages/calendar-portlet/calendar-portlet.info 9 Nov 2008 23:29:22 -0000 1.26 @@ -7,14 +7,14 @@ f t - + OpenACS - 2008-01-08 + 2008-10-18 OpenACS - - - + + + Index: openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp,v diff -u -r1.30 -r1.31 --- openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp 12 Sep 2008 16:13:01 -0000 1.30 +++ openacs-4/packages/calendar-portlet/www/calendar-full-portlet.adp 9 Nov 2008 23:29:22 -0000 1.31 @@ -35,13 +35,14 @@ date="@date@" page_num="@page_num@"> +

#calendar-portlet.Add_an_item# #calendar-portlet.Manage_Item_Types# - +

Index: openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl,v diff -u -r1.38 -r1.39 --- openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl 12 Sep 2008 16:13:01 -0000 1.38 +++ openacs-4/packages/calendar-portlet/www/calendar-full-portlet.tcl 9 Nov 2008 23:29:22 -0000 1.39 @@ -57,6 +57,7 @@ # Styles for calendar template::head::add_css -href "/resources/calendar/calendar.css" +template::head::add_css -alternate -href "/resources/calendar/calendar-hc.css" -title "highContrast" # set the period_days for calendar's list view, therefore we need # to check which instance of calendar is currently displayed Index: openacs-4/packages/calendar-portlet/www/calendar-list-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-list-portlet.tcl,v diff -u -r1.13 -r1.14 --- openacs-4/packages/calendar-portlet/www/calendar-list-portlet.tcl 11 Sep 2008 14:13:42 -0000 1.13 +++ openacs-4/packages/calendar-portlet/www/calendar-list-portlet.tcl 9 Nov 2008 23:29:22 -0000 1.14 @@ -93,5 +93,6 @@ # Stylesheet template::head::add_css -href "/resources/calendar/calendar.css" +template::head::add_css -alternate -href "/resources/calendar/calendar-hc.css" -title "highContrast" ad_return_template Index: openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl,v diff -u -r1.33 -r1.34 --- openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl 12 Sep 2008 16:13:01 -0000 1.33 +++ openacs-4/packages/calendar-portlet/www/calendar-portlet.tcl 9 Nov 2008 23:29:23 -0000 1.34 @@ -80,5 +80,6 @@ } template::head::add_css -href "/resources/calendar/calendar.css" +template::head::add_css -alternate -href "/resources/calendar/calendar-hc.css" -title "highContrast" ad_return_template Index: openacs-4/packages/categories/www/cadmin/category-form.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-form.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/categories/www/cadmin/category-form.adp 14 Dec 2003 15:36:57 -0000 1.3 +++ openacs-4/packages/categories/www/cadmin/category-form.adp 9 Nov 2008 23:29:23 -0000 1.4 @@ -4,6 +4,4 @@ f category_form.name -
-
Index: openacs-4/packages/categories/www/cadmin/category-link-add-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-link-add-2.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/categories/www/cadmin/category-link-add-2.tcl 6 Nov 2008 15:50:44 -0000 1.6 +++ openacs-4/packages/categories/www/cadmin/category-link-add-2.tcl 9 Nov 2008 23:29:23 -0000 1.7 @@ -71,8 +71,8 @@ links { sub_class narrow display_template { - backward link - forward link + backward link + forward link } html {align center} } Index: openacs-4/packages/categories/www/cadmin/category-link-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-link-delete.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/categories/www/cadmin/category-link-delete.tcl 6 Nov 2008 15:50:44 -0000 1.5 +++ openacs-4/packages/categories/www/cadmin/category-link-delete.tcl 9 Nov 2008 23:29:23 -0000 1.6 @@ -66,8 +66,8 @@ sub_class narrow label "Direction" display_template { - forward link - backward link + forward link + backward link } html {align center} } Index: openacs-4/packages/categories/www/cadmin/category-links-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/category-links-view.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/categories/www/cadmin/category-links-view.tcl 6 Nov 2008 15:50:44 -0000 1.5 +++ openacs-4/packages/categories/www/cadmin/category-links-view.tcl 9 Nov 2008 23:29:23 -0000 1.6 @@ -70,8 +70,8 @@ sub_class narrow label "Direction" display_template { - forward link - backward link + forward link + backward link } html {align center} } @@ -85,7 +85,7 @@ delete { sub_class narrow display_template { - Delete + Delete } link_url_col delete_url link_html { title "Delete link" } Index: openacs-4/packages/categories/www/cadmin/master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/master.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/categories/www/cadmin/master.adp 2 Feb 2008 13:50:17 -0000 1.4 +++ openacs-4/packages/categories/www/cadmin/master.adp 9 Nov 2008 23:29:23 -0000 1.5 @@ -5,7 +5,15 @@
- + + @form_vars;noquote@ + + + + + +
Language
+
Index: openacs-4/packages/categories/www/cadmin/synonym-form.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/synonym-form.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/categories/www/cadmin/synonym-form.adp 11 Feb 2004 13:25:28 -0000 1.1 +++ openacs-4/packages/categories/www/cadmin/synonym-form.adp 9 Nov 2008 23:29:23 -0000 1.2 @@ -4,6 +4,4 @@ f synonym_form.name -
-
Index: openacs-4/packages/categories/www/cadmin/synonyms-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/synonyms-view.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/categories/www/cadmin/synonyms-view.tcl 6 Nov 2008 15:50:44 -0000 1.3 +++ openacs-4/packages/categories/www/cadmin/synonyms-view.tcl 9 Nov 2008 23:29:23 -0000 1.4 @@ -63,7 +63,7 @@ edit { sub_class narrow display_template { - Edit + Edit } link_url_col edit_url link_html {title "Edit this synonym"} @@ -79,7 +79,7 @@ delete { sub_class narrow display_template { - Delete + Delete } link_url_col delete_url link_html { title "Delete synonym" } Index: openacs-4/packages/categories/www/cadmin/tree-form.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-form.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/categories/www/cadmin/tree-form.adp 6 Nov 2008 15:50:44 -0000 1.4 +++ openacs-4/packages/categories/www/cadmin/tree-form.adp 9 Nov 2008 23:29:23 -0000 1.5 @@ -4,6 +4,4 @@ f tree_form.tree_name -
- -
+ Index: openacs-4/packages/categories/www/cadmin/tree-map-2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-map-2.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/categories/www/cadmin/tree-map-2.adp 11 Feb 2004 09:35:31 -0000 1.1 +++ openacs-4/packages/categories/www/cadmin/tree-map-2.adp 9 Nov 2008 23:29:23 -0000 1.2 @@ -4,6 +4,4 @@ f tree_map_form.assign_single_p -
-
Index: openacs-4/packages/categories/www/cadmin/tree-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/categories/www/cadmin/tree-view.tcl,v diff -u -r1.13 -r1.14 --- openacs-4/packages/categories/www/cadmin/tree-view.tcl 6 Nov 2008 15:50:44 -0000 1.13 +++ openacs-4/packages/categories/www/cadmin/tree-view.tcl 9 Nov 2008 23:29:23 -0000 1.14 @@ -81,7 +81,7 @@ lappend elements edit { sub_class narrow display_template { - Edit + Edit } link_url_col edit_url link_html {title "Edit this category"} @@ -100,7 +100,7 @@ lappend elements add_child { sub_class narrow display_template { - Add + Add } link_url_col add_url link_html { title "Add subcategory" } @@ -123,7 +123,7 @@ lappend elements delete { sub_class narrow display_template { - Delete + Delete } link_url_col delete_url link_html { title "Delete category and all subcategories" } Index: openacs-4/packages/chat/chat.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/chat.info,v diff -u -r1.13 -r1.14 --- openacs-4/packages/chat/chat.info 4 Mar 2008 08:17:14 -0000 1.13 +++ openacs-4/packages/chat/chat.info 9 Nov 2008 23:29:23 -0000 1.14 @@ -18,7 +18,7 @@ - + Index: openacs-4/packages/chat/catalog/chat.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/catalog/chat.en_US.ISO-8859-1.xml,v diff -u -r1.5 -r1.6 --- openacs-4/packages/chat/catalog/chat.en_US.ISO-8859-1.xml 10 Dec 2007 09:12:29 -0000 1.5 +++ openacs-4/packages/chat/catalog/chat.en_US.ISO-8859-1.xml 9 Nov 2008 23:29:23 -0000 1.6 @@ -54,6 +54,8 @@ Edit Edit Room Edit transcript + Enter chat room using the HTML client + Enter chat room exit chat room Extreme Actions from @@ -87,6 +89,7 @@ revoke Revoke moderator Revoke user + Room active Admin Deactive Room Room Information Index: openacs-4/packages/chat/catalog/chat.es_ES.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/catalog/chat.es_ES.ISO-8859-1.xml,v diff -u -r1.5 -r1.6 --- openacs-4/packages/chat/catalog/chat.es_ES.ISO-8859-1.xml 10 Dec 2007 09:12:29 -0000 1.5 +++ openacs-4/packages/chat/catalog/chat.es_ES.ISO-8859-1.xml 9 Nov 2008 23:29:23 -0000 1.6 @@ -54,6 +54,8 @@ Editar Editar sala Editar transcripci�n + Entrar con el cliente HTML + Entrar en el chat Salir de la sala Acciones extremas de @@ -87,6 +89,7 @@ revocar Revocar moderador Revocar usuario + Sala activa Admin Desactivar la sala Informaci�n de sala Index: openacs-4/packages/chat/lib/transcript-view.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/lib/Attic/transcript-view.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/chat/lib/transcript-view.adp 24 Jun 2006 14:23:41 -0000 1.2 +++ openacs-4/packages/chat/lib/transcript-view.adp 9 Nov 2008 23:29:23 -0000 1.3 @@ -1,5 +1,5 @@ -#chat.Edit# +

#chat.Edit#

 Index: openacs-4/packages/chat/lib/transcript-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/lib/transcript-view.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/chat/lib/transcript-view.tcl 19 Nov 2007 01:14:15 -0000 1.4 +++ openacs-4/packages/chat/lib/transcript-view.tcl 9 Nov 2008 23:29:23 -0000 1.5 @@ -9,3 +9,5 @@ } set edit_p [permission::permission_p -object_id $room_id -privilege "chat_transcript_edit"] + +set edit_url [export_vars -base "transcript-edit" {transcript_id room_id}] Index: openacs-4/packages/chat/lib/transcripts.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/lib/transcripts.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/chat/lib/transcripts.tcl 24 Jun 2006 14:23:41 -0000 1.2 +++ openacs-4/packages/chat/lib/transcripts.tcl 9 Nov 2008 23:29:23 -0000 1.3 @@ -3,20 +3,25 @@ set transcript_view_p [permission::permission_p -object_id $room_id -privilege chat_transcript_view] # List available chat transcript -db_multirow -extend { creation_date_pretty viewer } chat_transcripts list_transcripts *SQL* { +db_multirow -extend { creation_date_pretty viewer transcript_url} chat_transcripts list_transcripts *SQL* { set creation_date_pretty [lc_time_fmt $creation_date "%q %X"] + set transcript_url [export_vars -base "chat-transcript" {room_id transcript_id}] } +set actions [list [_ chat.Create_transcript] [export_vars -base "transcript-new" {room_id}]] + list::create \ -name "chat_transcripts" \ -multirow "chat_transcripts" \ -key transcript_id \ -pass_properties { transcript_delete_p room_id } \ -row_pretty_plural [_ chat.Transcripts] \ + -actions $actions \ -elements { pretty_name { label "#chat.Name#" - link_url_eval {chat-transcript?room_id=$room_id&transcript_id=$transcript_id} + link_url_col transcript_url + link_html {title "[_ chat.View_transcript]"} } creation_date_pretty { label "#chat.creation_date#" @@ -26,8 +31,8 @@ html { align "center" } display_template { - - + + #chat.Delete_transcript# } Index: openacs-4/packages/chat/tcl/chat-ajax-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/tcl/chat-ajax-procs.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/chat/tcl/chat-ajax-procs.tcl 19 Nov 2007 01:14:16 -0000 1.8 +++ openacs-4/packages/chat/tcl/chat-ajax-procs.tcl 9 Nov 2008 23:29:23 -0000 1.9 @@ -29,33 +29,41 @@ Chat proc login {-chat_id -package_id} { auth::require_login - if {![info exists package_id]} {set package_id [ad_conn package_id] } - if {![info exists chat_id]} {set chat_id $package_id } + if {![info exists package_id]} { + set package_id [ad_conn package_id] + } + if {![info exists chat_id]} { + set chat_id $package_id + } - set context id=$chat_id&s=[ad_conn session_id].[clock seconds] - set jspath packages/chat/www/ajax/chat.js - if { ![file exists [acs_root_dir]/$jspath] } { - return -code error "File [acs_root_dir]/$jspath does not exist" - } - set file [open [acs_root_dir]/$jspath]; set js [read $file]; close $file - set path [site_node::get_url_from_object_id -object_id $package_id] - set login_url ${path}ajax/chat?m=login&$context - set send_url ${path}ajax/chat?m=add_msg&$context&msg= - set users_url ${path}ajax/chat?m=get_users&$context - return "\ - + style='width:70%; border:1px solid black; margin-right:15px;' height='257'> + + style='width:25%; border:1px solid black;' height='257'> +
#chat.message# Index: openacs-4/packages/chat/www/ajax-chat-script.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/ajax-chat-script.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/chat/www/ajax-chat-script.adp 19 Nov 2007 01:14:16 -0000 1.4 +++ openacs-4/packages/chat/www/ajax-chat-script.adp 9 Nov 2008 23:29:23 -0000 1.5 @@ -1,13 +1,12 @@ -@context_bar;noquote@ -@room_name;noquote@ +@context;noquote@ +doc ichat_form.msg

#chat.Log_off# #chat.Transcript# -#chat.Hml# +#chat.Hml#

@chat_frame;noquote@ - Index: openacs-4/packages/chat/www/ajax-chat-script.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/ajax-chat-script.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/chat/www/ajax-chat-script.tcl 19 Nov 2007 01:14:16 -0000 1.6 +++ openacs-4/packages/chat/www/ajax-chat-script.tcl 9 Nov 2008 23:29:23 -0000 1.7 @@ -8,5 +8,7 @@ msg:optional } +set html_room_url [export_vars -base "room-enter" {room_id {client html}}] + set chat_frame [ ::chat::Chat login -chat_id $room_id] Index: openacs-4/packages/chat/www/chat-transcript.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/chat-transcript.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/chat/www/chat-transcript.adp 24 Jun 2006 14:23:41 -0000 1.2 +++ openacs-4/packages/chat/www/chat-transcript.adp 9 Nov 2008 23:29:23 -0000 1.3 @@ -1,22 +1,7 @@ -@context_bar;noquote@ +@context;noquote@ #chat.transcript_of_room# "@room_name;noquote@" - - Index: openacs-4/packages/chat/www/chat-transcript.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/chat-transcript.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/chat/www/chat-transcript.tcl 24 Jun 2006 14:23:41 -0000 1.2 +++ openacs-4/packages/chat/www/chat-transcript.tcl 9 Nov 2008 23:29:23 -0000 1.3 @@ -6,7 +6,7 @@ } set page_title "[_ chat.Transcript]" -set context_bar "$page_title" +set context [list $page_title] set user_id [ad_conn user_id] set read_p [permission::permission_p -object_id $room_id -privilege "chat_read"] @@ -23,4 +23,17 @@ ad_return_complaint 1 "[_ chat.Room_not_found]" } -ad_return_template \ No newline at end of file +template::head::add_style -style "#messages { + border: 1px dotted black; + padding: 5px; + margin-top:10px; + font-size: 12px; + color: #666666; + font-family: Trebuchet MS, Lucida Grande, Lucida Sans Unicode, Arial, sans-serif; +} +#messages .timestamp {vertical-align: top; color: #CCCCCC; } +#messages .user {text-align: right; vertical-align: top; font-weight:bold; } +#messages .message {vertical-align: top} +#messages .line {margin:0px;}" + +ad_return_template Index: openacs-4/packages/chat/www/chat.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/chat.tcl,v diff -u -r1.12 -r1.13 --- openacs-4/packages/chat/www/chat.tcl 19 Nov 2007 01:14:16 -0000 1.12 +++ openacs-4/packages/chat/www/chat.tcl 9 Nov 2008 23:29:23 -0000 1.13 @@ -11,7 +11,7 @@ {client "ajax"} {message:html ""} } -properties { - context_bar:onevalue + context:onevalue user_id:onevalue user_name:onevalue message:onevalue @@ -29,7 +29,11 @@ ad_return_complaint 1 "[_ chat.Room_not_found]" } -set context_bar $room_name +set doc(title) $room_name +set doc(type) {} + +set context [list $doc(title)] + auth::require_login set user_id [ad_conn user_id] set read_p [permission::permission_p -object_id $room_id -privilege "chat_read"] Index: openacs-4/packages/chat/www/html-chat.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/html-chat.adp,v diff -u -r1.8 -r1.9 --- openacs-4/packages/chat/www/html-chat.adp 19 Nov 2007 01:14:16 -0000 1.8 +++ openacs-4/packages/chat/www/html-chat.adp 9 Nov 2008 23:29:23 -0000 1.9 @@ -1,22 +1,11 @@ -@context_bar;noquote@ -@room_name;noquote@ +@context;noquote@ +doc - -

#chat.Log_off# #chat.Transcript# -@richclient.title@ +@richclient.title@

Index: openacs-4/packages/chat/www/html-chat.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/html-chat.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/chat/www/html-chat.tcl 19 Nov 2007 01:14:16 -0000 1.3 +++ openacs-4/packages/chat/www/html-chat.tcl 9 Nov 2008 23:29:23 -0000 1.4 @@ -31,4 +31,16 @@ set html_chat [c1 get_all] set html_users [c1 get_users] -ad_return_template \ No newline at end of file +template::head::add_style -style "#messages { margin-right:15px; float:left; width:70%; height:250px; overflow:auto; border:1px solid black; padding:5px; font-size: 12px; color: #666666; font-family: Trebuchet MS, Lucida Grande, Lucida Sans Unicode, Arial, sans-serif; } +#messages .timestamp {vertical-align: top; color: #CCCCCC; } +#messages .user {margin: 0px 5px; text-align: right; vertical-align: top; font-weight:bold;} +#messages .message {vertical-align: top;} +#messages .line {margin:0px;} +#users { float:right; width:25%; height:250px; border:1px solid black; padding:5px; font-size: 12px; color: #666666; font-family: Trebuchet MS, Lucida Grande, Lucida Sans Unicode, Arial, sans-serif; } +#users .user {text-align: left; vertical-align: top; font-weight:bold; } +#users .timestamp {text-align: right; vertical-align: top; } +" + +set room_enter_url [export_vars -base "room-enter" {room_id {client $richclient(short)}}] + +ad_return_template Index: openacs-4/packages/chat/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/index.adp,v diff -u -r1.9 -r1.10 --- openacs-4/packages/chat/www/index.adp 19 Nov 2007 01:14:16 -0000 1.9 +++ openacs-4/packages/chat/www/index.adp 9 Nov 2008 23:29:23 -0000 1.10 @@ -6,20 +6,12 @@ @cvs-id $Id$ --> -#chat.Chat_main_page# -#chat.Chat_main_page# +doc
@warning;noquote@
- -

#chat.There_are_no_rooms_available#

-

#chat.Create_a_new_room#

 - - - - Index: openacs-4/packages/chat/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/index.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/chat/www/index.tcl 19 Nov 2007 01:14:16 -0000 1.8 +++ openacs-4/packages/chat/www/index.tcl 9 Nov 2008 23:29:23 -0000 1.9 @@ -29,10 +29,15 @@ lappend actions "#chat.Create_a_new_room#" room-edit "#chat.Create_a_new_room#" } -db_multirow -extend { active_users last_activity } rooms rooms_list {} { - set room [::chat::Chat create new -volatile -chat_id $room_id] - set active_users [$room nr_active_users] - set last_activity [$room last_activity] +db_multirow -extend { active_users last_activity room_url} rooms rooms_list {} { + + set room [::chat::Chat create new -volatile -chat_id $room_id] + set active_users [$room nr_active_users] + set last_activity [$room last_activity] + + if { $active_p } { + set room_url [export_vars -base "room-enter" {room_id {client $default_client}}] + } } list::create \ @@ -42,36 +47,28 @@ -pass_properties {room_create_p} \ -actions $actions \ -row_pretty_plural [_ chat.rooms] \ + -no_data [_ chat.There_are_no_rooms_available] \ -elements { active { label "#chat.Active#" - html { align "center" } + html { style "text-align: center" } display_template { -
- -
+ #chat.Room_active# -
- -
+ #chat.Room_no_active# } } pretty_name { label "#chat.Room_name#" - html { width 400px } - display_template { - - @rooms.pretty_name@ \[#chat.HTML_chat#\] - - - @rooms.pretty_name@ - -
@rooms.description@
- } + link_url_col room_url + link_html {title "[_ chat.Enter_rooms_pretty_name]"} } + description { + label "[_ chat.Description]" + } active_users { label "#chat.active_users#" html { style "text-align:center;" } @@ -91,4 +88,8 @@ } } +# set page properties + +set doc(title) [_ chat.Chat_main_page] + ad_return_template Index: openacs-4/packages/chat/www/message-delete.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/message-delete.adp,v diff -u -r1.8 -r1.9 --- openacs-4/packages/chat/www/message-delete.adp 19 Nov 2007 01:14:16 -0000 1.8 +++ openacs-4/packages/chat/www/message-delete.adp 9 Nov 2008 23:29:23 -0000 1.9 @@ -10,7 +10,7 @@ #chat.Confirm_message_delete# - -#chat.Are_you_sure_you_want_to_delete# @message_count@ #chat.messages_in# @pretty_name@? -

+

+

#chat.Are_you_sure_you_want_to_delete# @message_count@ #chat.messages_in# @pretty_name@?

+
Index: openacs-4/packages/chat/www/room-delete.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room-delete.adp,v diff -u -r1.7 -r1.8 --- openacs-4/packages/chat/www/room-delete.adp 19 Nov 2007 01:14:16 -0000 1.7 +++ openacs-4/packages/chat/www/room-delete.adp 9 Nov 2008 23:29:23 -0000 1.8 @@ -10,9 +10,9 @@ #chat.Confirm_room_delete#
- -#chat.Are_you_sure_you_want_to_delete# @pretty_name@? -

+

+

#chat.Are_you_sure_you_want_to_delete# @pretty_name@?

+
Index: openacs-4/packages/chat/www/room-edit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room-edit.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/chat/www/room-edit.adp 24 Jun 2006 14:23:42 -0000 1.2 +++ openacs-4/packages/chat/www/room-edit.adp 9 Nov 2008 23:29:23 -0000 1.3 @@ -1,4 +1,5 @@ @title@ +@context;noquote@ Index: openacs-4/packages/chat/www/room-edit.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room-edit.tcl,v diff -u -r1.10 -r1.11 --- openacs-4/packages/chat/www/room-edit.tcl 14 Mar 2008 12:24:30 -0000 1.10 +++ openacs-4/packages/chat/www/room-edit.tcl 9 Nov 2008 23:29:23 -0000 1.11 @@ -13,9 +13,11 @@ if { ![info exists room_id] } { set title "[_ chat.Create_a_new_room]" } else { - set title "[_ chat.Edit_room] \"[chat_room_name $room_id]\"" + set title "[_ chat.Edit_room]" } +set context [list $title] + ad_form -name "edit-room" -edit_buttons [list [list [_ chat.Update_room] next]] -has_edit 1 -form { {room_id:key} {moderated_p:boolean(hidden) Index: openacs-4/packages/chat/www/room.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room.adp,v diff -u -r1.8 -r1.9 --- openacs-4/packages/chat/www/room.adp 19 Nov 2007 01:14:16 -0000 1.8 +++ openacs-4/packages/chat/www/room.adp 9 Nov 2008 23:29:23 -0000 1.9 @@ -9,7 +9,7 @@ @context_bar;noquote@ #chat.Room_Information# -

#chat.Room_Information#

+

#chat.Room_Information#

@@ -42,28 +42,22 @@
-

-#chat.Edit# -#acs-kernel.common_Permissions# + #chat.Edit# + #acs-kernel.common_Permissions# -#chat.Delete_all_messages_in_the_room# -#chat.Delete_room# + #chat.Delete_all_messages_in_the_room# + #chat.Delete_room# -

#chat.No_information_available#. +

#chat.No_information_available#

-

#chat.Users_ban#

+

#chat.Users_ban#

- -

#chat.Ban_user# - -

#chat.Transcripts# - +

#chat.Transcripts#

-

#chat.Create_transcript# + - Index: openacs-4/packages/chat/www/room.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/room.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/chat/www/room.tcl 19 Nov 2007 01:14:16 -0000 1.7 +++ openacs-4/packages/chat/www/room.tcl 9 Nov 2008 23:29:23 -0000 1.8 @@ -60,14 +60,25 @@ set message_count [db_string message_count "select count(*) from chat_msgs where room_id = :room_id" -default 0] # List user ban from chat -db_multirow banned_users list_user_ban {} +db_multirow -extend {unban_url unban_text} banned_users list_user_ban {} { + if { $user_unban_p } { + set unban_url [export_vars -base "user-unban" {room_id party_id}] + set unban_text [_ chat.Unban_user] + } +} +set actions "" +if { $user_ban_p } { + set actions [list [_ chat.Ban_user] [export_vars -base "search" {room_id {type ban}}]] +} + list::create \ -name "banned_users" \ -multirow "banned_users" \ -key party_id \ -pass_properties { user_unban_p room_id } \ -row_pretty_plural [_ chat.banned_users] \ + -actions $actions \ -elements { name { label "#chat.Name#" @@ -77,16 +88,11 @@ } actions { label "#chat.actions#" - html { align "center" } - display_template { - - - - - - } + html { style "text-align:center" } + link_url_col unban_url + display_col unban_text + link_html {class "button"} } } ad_return_template - Index: openacs-4/packages/chat/www/search-2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/search-2.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/chat/www/search-2.adp 14 Mar 2006 12:16:09 -0000 1.1 +++ openacs-4/packages/chat/www/search-2.adp 9 Nov 2008 23:29:23 -0000 1.2 @@ -2,28 +2,32 @@ #chat.Add_user_to_room# @context;noquote@ - - - #dotlrn.lt_The_results_of_your_s#
+

+ + #dotlrn.lt_The_results_of_your_s#
(#chat.What_search# @SQL_LIMIT@) - - - for email "@email@" - - for last name "@last_name@" - + + + + for email "@email@" + + + for last name "@last_name@" + + +

Index: openacs-4/packages/chat/www/search-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/search-2.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/chat/www/search-2.tcl 19 Nov 2007 01:14:16 -0000 1.3 +++ openacs-4/packages/chat/www/search-2.tcl 9 Nov 2008 23:29:23 -0000 1.4 @@ -25,7 +25,7 @@ set exception_text "" set SQL_LIMIT 20 -set context [list [list "./" "Users"] "Search"] +set context [list "Search"] if [info exists keyword] { # this is an administrator @@ -122,6 +122,7 @@ set user_search:[set rowcount](email) $email set user_search:[set rowcount](export_vars) [export_url_vars user_id_from_search first_names_from_search last_name_from_search email_from_search] set user_search:[set rowcount](member_state) $member_state + set user_search:[set rowcount](url) [export_vars -base "search-3" {room_id type {party_id $user_id}}] if { $member_state != "approved" } { Index: openacs-4/packages/chat/www/search.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/search.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/chat/www/search.adp 24 Jun 2006 14:23:42 -0000 1.2 +++ openacs-4/packages/chat/www/search.adp 9 Nov 2008 23:29:23 -0000 1.3 @@ -3,10 +3,14 @@ @context;noquote@
- - - - - +
+ + + +
+

+ + +

Index: openacs-4/packages/chat/www/transcript-delete.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/transcript-delete.adp,v diff -u -r1.7 -r1.8 --- openacs-4/packages/chat/www/transcript-delete.adp 19 Nov 2007 01:14:16 -0000 1.7 +++ openacs-4/packages/chat/www/transcript-delete.adp 9 Nov 2008 23:29:23 -0000 1.8 @@ -6,12 +6,14 @@ @cvs-id $Id$ --> -@context_bar;noquote@ +@context;noquote@ #chat.Confirm_chat_transcript_delete#
+
-#chat.Are_you_sure_you_want_to_delete# Replace with transcript name? -

+

+

#chat.Are_you_sure_you_want_to_delete# Replace with transcript name?

+

Index: openacs-4/packages/chat/www/transcript-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/transcript-delete.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/chat/www/transcript-delete.tcl 19 Nov 2007 01:14:16 -0000 1.5 +++ openacs-4/packages/chat/www/transcript-delete.tcl 9 Nov 2008 23:29:23 -0000 1.6 @@ -16,5 +16,5 @@ permission::require_permission -object_id $transcript_id -privilege chat_transcript_delete -set context_bar [list "[_ chat.Delete_transcript]"] +set context [list "[_ chat.Delete_transcript]"] ad_return_template Index: openacs-4/packages/chat/www/transcript-entry.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/Attic/transcript-entry.adp,v diff -u -r1.8 -r1.9 --- openacs-4/packages/chat/www/transcript-entry.adp 19 Nov 2007 01:14:16 -0000 1.8 +++ openacs-4/packages/chat/www/transcript-entry.adp 9 Nov 2008 23:29:23 -0000 1.9 @@ -6,48 +6,64 @@ @cvs-id $Id$ --> -@context_bar;noquote@ +@context;noquote@ @title;noquote@ -
+ +
- - - - - - - - - - - - - - - - - - - -
#chat.Transcript_name# -
#chat.Delete_messages# -
- [i] +
+
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+ Help text #chat.delete_messages_after_transcript# +
+
+ +
+
+
-
#chat.Room_deactivate# +
+ +
- [i] + Help text #chat.deactivate_room_after_transcript#
-
#chat.Description# - -
#chat.Contents# -
@contents;noquote@
-
-
- +
+ +
+
+ +
+
+ +
+
+
+
#chat.Contents#
+
+
@contents;noquote@
+
+
+
+ +
Index: openacs-4/packages/chat/www/transcript-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat/www/transcript-new.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/chat/www/transcript-new.tcl 19 Nov 2007 01:14:16 -0000 1.6 +++ openacs-4/packages/chat/www/transcript-new.tcl 9 Nov 2008 23:29:23 -0000 1.7 @@ -16,14 +16,14 @@ permission::require_permission -object_id $room_id -privilege chat_transcript_create -set context_bar [list [list "room?room_id=$room_id" "[_ chat.Room_Information]"] "[_ chat.Create_transcript]"] +set title "[_ chat.Create_transcript]" +set context [list [list "room?room_id=$room_id" "[_ chat.Room_Information]"] $title] set transcript_id "" set transcript_name "[_ chat.transcript_of_date] [clock format [clock seconds] -format "%d.%m.%y %H:%M:%S"]" set description "" set contents "" set action "transcript-new-2" -set title "[_ chat.Create_transcript]" set submit_label "[_ chat.Create_transcript]" set active_p [room_active_status $room_id] Index: openacs-4/packages/chat-portlet/chat-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat-portlet/chat-portlet.info,v diff -u -r1.7 -r1.8 --- openacs-4/packages/chat-portlet/chat-portlet.info 8 Jan 2008 13:04:48 -0000 1.7 +++ openacs-4/packages/chat-portlet/chat-portlet.info 9 Nov 2008 23:29:23 -0000 1.8 @@ -7,15 +7,15 @@ f t - + OpenACS - 2006-12-31 + 2008-10-18 OpenACS - - - - + + + + Index: openacs-4/packages/chat-portlet/www/chat-portlet-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat-portlet/www/chat-portlet-oracle.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/chat-portlet/www/chat-portlet-oracle.xql 14 Mar 2006 12:23:38 -0000 1.1 +++ openacs-4/packages/chat-portlet/www/chat-portlet-oracle.xql 9 Nov 2008 23:29:23 -0000 1.2 @@ -20,6 +20,7 @@ acs_objects obj where rm.room_id = obj.object_id and obj.context_id IN ($sep_package_ids) + and rm.active_p = 't' order by rm.pretty_name @@ -39,7 +40,7 @@ where site_nodes.object_id = obj.context_id) as base_url from chat_rooms rm, acs_objects obj - where rm.room_id = obj.object_id + where rm.room_id = obj.object_id and rm.active_p = 't' order by rm.pretty_name Index: openacs-4/packages/chat-portlet/www/chat-portlet-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat-portlet/www/chat-portlet-postgresql.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/chat-portlet/www/chat-portlet-postgresql.xql 19 Nov 2007 14:12:54 -0000 1.3 +++ openacs-4/packages/chat-portlet/www/chat-portlet-postgresql.xql 9 Nov 2008 23:29:23 -0000 1.4 @@ -20,6 +20,7 @@ acs_objects obj where rm.room_id = obj.object_id and obj.context_id IN ($sep_package_ids) + and rm.active_p = 't' order by rm.pretty_name @@ -39,7 +40,7 @@ where site_nodes.object_id = obj.context_id) as base_url from chat_rooms rm, acs_objects obj - where rm.room_id = obj.object_id + where rm.room_id = obj.object_id and rm.active_p = 't' order by rm.pretty_name Index: openacs-4/packages/chat-portlet/www/chat-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat-portlet/www/chat-portlet.adp,v diff -u -r1.8 -r1.9 --- openacs-4/packages/chat-portlet/www/chat-portlet.adp 19 Nov 2007 14:12:54 -0000 1.8 +++ openacs-4/packages/chat-portlet/www/chat-portlet.adp 9 Nov 2008 23:29:23 -0000 1.9 @@ -16,37 +16,9 @@ # %> -@context;noquote@ -#chat.Chat_main_page# - - -[#chat.Create_a_new_room#] + + - - -

#chat.There_are_no_rooms_available#

- - - - - - - - - - - -
@rooms.pretty_name@ - [ #chat-portlet.html_mode# ] - - - [#chat.room_admin#] - - - (NO #chat.Active#) - - - @rooms.description@ -
+ #new-portal.when_portlet_shaded# Index: openacs-4/packages/chat-portlet/www/chat-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/chat-portlet/www/chat-portlet.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/chat-portlet/www/chat-portlet.tcl 19 Nov 2007 14:12:54 -0000 1.5 +++ openacs-4/packages/chat-portlet/www/chat-portlet.tcl 9 Nov 2008 23:29:23 -0000 1.6 @@ -29,11 +29,11 @@ } array set config $cf +set shaded_p $config(shaded_p) set list_of_package_ids $config(package_id) set sep_package_ids [join $list_of_package_ids ", "] set chat_url "[ad_conn package_url]/chat/" -set context [list] set user_id [ad_conn user_id] set community_id [dotlrn_community::get_community_id] set room_create_p [ad_permission_p $user_id chat_room_create] @@ -45,12 +45,35 @@ } else { set query_name "rooms_list" } -db_multirow -extend { can_see_p } rooms $query_name {} { +db_multirow -extend { can_see_p room_enter_url room_html_url html_text } rooms $query_name {} { set can_see_p 0 - if {($active_p eq "t" && $user_p eq "t") || ($admin_p eq "t")} { + if { $user_p || $admin_p } { set can_see_p 1 set num_rooms [expr $num_rooms + 1] } + set room_enter_url [export_vars -base "${base_url}room-enter" {room_id {client $default_mode}}] + set room_html_url [export_vars -base "${base_url}room-enter" {room_id {client html}}] + set html_text [_ chat.html_client_msg] } +template::list::create -name chat_rooms -multirow rooms \ + -no_data [_ chat.There_are_no_rooms_available] \ + -filters {can_see_p {default_value 1}} \ + -elements { + pretty_name { + label "[_ chat.Room_name]" + link_url_col room_enter_url + link_html {title "[_ chat.Enter_rooms_pretty_name]"} + } + description { + label "[_ chat.Description]" + } + html_mode { + label "[_ chat-portlet.html_mode]" + link_url_col room_html_url + display_col html_text + link_html {title "[_ chat.Enter_html_pretty_name]"} + } + } + ad_return_template Index: openacs-4/packages/dotlrn/dotlrn.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/dotlrn.info,v diff -u -r1.129 -r1.130 --- openacs-4/packages/dotlrn/dotlrn.info 17 Jan 2008 17:18:37 -0000 1.129 +++ openacs-4/packages/dotlrn/dotlrn.info 9 Nov 2008 23:29:23 -0000 1.130 @@ -7,57 +7,62 @@ f f - + OpenACS A Course Management System - 2008-01-08 + 2008-10-18 OpenACS Course Management - - - + + + - - + + - + - - - - - - + + + + + + + + + + + + - + + + - + - - - - - - - + + + + @@ -67,24 +72,19 @@ - + + - - + - - - + - - - Index: openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml,v diff -u -r1.50 -r1.51 --- openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml 2 Feb 2008 11:44:49 -0000 1.50 +++ openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml 9 Nov 2008 23:29:23 -0000 1.51 @@ -41,7 +41,7 @@ Administer <img border=0 src="/resources/dotlrn/admin.gif" alt="Administer"> Administration - a + 9 Administration Cockpit Administrator Administrators @@ -116,9 +116,10 @@ Community Communities Cockpit + Collapse list Comma Separated Values Communities - m + 6 Community %clubs_pretty_name% Name Community ID @@ -140,17 +141,18 @@ Confirm Drop Confirmation Control Panel - p + 7 Copy We couldn't find user #%user_id%; perhaps this person was deleted? Course Administrator Course Administrators Course Assistant Course Assistants Courses - r + 5 Create A New User Create a Web Log + Create and add a member Create Club Created CSV File Format @@ -199,7 +201,7 @@ Drop Drop from subgroup %subgroup_name% Drop Membership - <img src="/resources/dotlrn/drop.gif" alt="Drop Membership" border=0> + <img src="/resources/dotlrn/drop.gif" alt="Drop Membership" style="border:0"> Drop selected members Edit Edit a User @@ -229,6 +231,8 @@ Actual end date Error sending mail Example File + Expand list + Export members list to a CSV file External URL External URL: Extra Large @@ -276,7 +280,7 @@ Help Hide .LRN toolbar Home - h + 1 HTML ID: ID @@ -325,7 +329,7 @@ Community's Web Address Current %clubs_pretty_plural% Delete subject - <font color="red">Do not use P tags for paragraphs</font> + Do not use P tags for paragraphs Do you really want to remove the following members? Do you really want to remove %num_users% users? dotLRN properties for this user. @@ -612,6 +616,8 @@ Show .LRN Toolbar silver Site-wide Admin? + Site Map + Go to the Site Map Add New Site Template Add Site Template Admin Parameters for Site Templating @@ -673,6 +679,7 @@ preceded by the *@ string which match &lt;anything&gt;@&lt;email-domain&gt;). For example, you might use: The name + The user(s) have been added to the selected community. You can send an email to welcome the users to the community. There are no users matching %search_text%. this user is deleted Member types to email: Index: openacs-4/packages/dotlrn/catalog/dotlrn.es_ES.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.es_ES.ISO-8859-1.xml,v diff -u -r1.20 -r1.21 --- openacs-4/packages/dotlrn/catalog/dotlrn.es_ES.ISO-8859-1.xml 10 Dec 2007 09:12:29 -0000 1.20 +++ openacs-4/packages/dotlrn/catalog/dotlrn.es_ES.ISO-8859-1.xml 9 Nov 2008 23:29:23 -0000 1.21 @@ -38,7 +38,7 @@ Administrar <img border=0 valign="bottom" src="graphics/admin.gif" alt="Administrar"> Administraci�n - a + 9 Administraci�n Cockpit Administrador Administradores @@ -109,9 +109,10 @@ Comunidad Comunidades Cockpit + Colapsar lista Exportar en formato CSV Comunidades - c + 6 Comunidad T�tulo de %clubs_pretty_name% Identificador de la comunidad @@ -130,17 +131,18 @@ Confirmar borrado Confirmaci�n Panel de control - p + 7 Copiar El usuario %user_id% no ha podido ser encontrado. Es posible que haya sido borrado. Administrador del curso Administradores del curso Tutor Tutores Cursos - r + 5 Crear un nuevo usuario Crear un weblog + Crear y a�adir usuario Crear comunidad Creado Formato CSV @@ -216,6 +218,8 @@ Fecha de finalizaci�n actual Error al enviar el correo Archivo ejemplo + Expandir lista + Exportar lista de usuarios a un fichero CSV Servidor web propio Servidor propio: Muy grande @@ -263,7 +267,7 @@ Ayuda Esconder la barra de .LRN Inicio - h + 1 HTML Identificador: Identificador @@ -307,7 +311,7 @@ Direcci�n web de la comunidad %clubs_pretty_plural% actuales Borrar asignatura - <font color="red">No use etiquetas P para los p�rrafos</font> + No use etiquetas P para los p�rrafos �Desea realmente borrar los miembros siguientes? �Desea realmente borrar estos %num_users% usuarios? Propiedades dotLRN para este usuario. @@ -550,6 +554,8 @@ Mostrar bara .LRN plateado �Administrador del sitio? + Mapa del sitio + Ir al Mapa del Sitio A�adir una nueva plantilla A�adir plantilla general Par�metros de administraci�n para plantillas generales @@ -610,6 +616,7 @@ Introducir una lista de dominios separados por comas. Por ejemplo: El nombre + El usuario ha sido a�adido a la comunidad seleccionada. Puede enviarle un correo electr�nico para darle la bienvenida a la mencionada comunidad. No hay usuarios que coincidan con %search_text%. este usuario ha sido borrado A Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/lib/admin-chunk.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/lib/admin-chunk.tcl'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/dotlrn/lib/bio.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/lib/Attic/bio.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/dotlrn/lib/bio.adp 15 May 2007 20:14:25 -0000 1.3 +++ openacs-4/packages/dotlrn/lib/bio.adp 9 Nov 2008 23:29:23 -0000 1.4 @@ -1,15 +1,15 @@ -
-
+
+

@user.name;noquote@ #dotlrn.Edit_Biography#

-
+
-Portrait of @user.name@ +Portrait of @user.name@ @user.bio;noquote@ Index: openacs-4/packages/dotlrn/lib/member-email.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/lib/member-email.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/dotlrn/lib/member-email.tcl 7 Oct 2007 22:36:56 -0000 1.4 +++ openacs-4/packages/dotlrn/lib/member-email.tcl 9 Nov 2008 23:29:23 -0000 1.5 @@ -50,7 +50,7 @@ array set available_vars [lindex [callback dotlrn::member_email_available_vars -type $type -community_id $community_id] 0] set available_vars_help "" foreach var [array names available_vars] { - append available_vars_help "$var $available_vars($var)
" + append available_vars_help "$var $available_vars($var)
" } ad_form \ Index: openacs-4/packages/dotlrn/lib/toolbar.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/lib/toolbar.adp,v diff -u -r1.8 -r1.9 --- openacs-4/packages/dotlrn/lib/toolbar.adp 25 Jul 2008 01:32:35 -0000 1.8 +++ openacs-4/packages/dotlrn/lib/toolbar.adp 9 Nov 2008 23:29:23 -0000 1.9 @@ -30,19 +30,19 @@ #dotlrn.Admin# | - @info_title@ + @info_title@ - -
- - - - in: - -
- + +
+ + + + in: + +
+ - Hide me + Hide me @@ -54,6 +54,7 @@
  • context_id: @package_id@
  • community_id: @community_id@
  • portal_id: @portal_id@
    • +
  • package_id: @package_id@
    • Index: openacs-4/packages/dotlrn/lib/toolbar.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/lib/toolbar.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/dotlrn/lib/toolbar.tcl 13 Jan 2005 13:57:20 -0000 1.2 +++ openacs-4/packages/dotlrn/lib/toolbar.tcl 9 Nov 2008 23:29:23 -0000 1.3 @@ -17,7 +17,11 @@ set info_action "info_show" set info_title "Show Xtra Info" } + set info_url [export_vars -base "$dotlrn_admin_url/toolbar-actions" {{action $info_action} return_url}] + # hide/show dotlrn toolbar + set hide_me_url [export_vars -base "$dotlrn_admin_url/toolbar-actions" {{action hide} return_url}] + if { [empty_string_p $community_id ] } { set portal_id [dotlrn::get_portal_id -user_id $user_id] } else { Index: openacs-4/packages/dotlrn/tcl/spam-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/tcl/spam-procs.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/dotlrn/tcl/spam-procs.tcl 8 Aug 2006 21:26:23 -0000 1.6 +++ openacs-4/packages/dotlrn/tcl/spam-procs.tcl 9 Nov 2008 23:29:23 -0000 1.7 @@ -88,9 +88,7 @@ append errors "

    Failed to deliver to $email because: -

    [ad_quotehtml $errmsg] -

    " } Index: openacs-4/packages/dotlrn/www/applets-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/applets-chunk.tcl,v diff -u -r1.11 -r1.12 --- openacs-4/packages/dotlrn/www/applets-chunk.tcl 8 Aug 2006 21:26:23 -0000 1.11 +++ openacs-4/packages/dotlrn/www/applets-chunk.tcl 9 Nov 2008 23:29:23 -0000 1.12 @@ -40,6 +40,11 @@ template::multirow append active_applets $applet_key [dotlrn_community::applet_call $applet_key GetPrettyName] } +set active_applets_list [template::util::multirow_to_list active_applets] +set active_applets_list_localized [lang::util::localize_list_of_lists -list $active_applets_list] +template::util::list_to_multirow active_applets $active_applets_list_localized +template::multirow sort active_applets -ascii -increasing applet_pretty_name + # List all applets set list_of_applets [dotlrn_applet::list_applets] @@ -50,6 +55,10 @@ template::multirow append all_applets $applet_key [dotlrn_community::applet_call $applet_key GetPrettyName] } } +set all_applets_list [template::util::multirow_to_list all_applets] +set all_applets_list_localized [lang::util::localize_list_of_lists -list $all_applets_list] +template::util::list_to_multirow all_applets $all_applets_list_localized +template::multirow sort all_applets -ascii -increasing applet_pretty_name ad_return_template Index: openacs-4/packages/dotlrn/www/bio-update.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/bio-update.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/dotlrn/www/bio-update.tcl 17 Jan 2008 17:18:37 -0000 1.3 +++ openacs-4/packages/dotlrn/www/bio-update.tcl 9 Nov 2008 23:29:23 -0000 1.4 @@ -48,7 +48,7 @@ if { [exists_and_not_null user_id ] } { if { ![acs_user::site_wide_admin_p -user_id [ad_conn user_id] ] } { if { $user_id != [ad_conn user_id] } { - ad_return_forbidden "Permission Denied" "
    You don't have permission to view this page.
    " + ad_return_forbidden "Permission Denied" "

    You don't have permission to view this page.

    " ad_script_abort } else { acs_user::get -user_id $user_id -array user -include_bio Index: openacs-4/packages/dotlrn/www/communities.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/communities.adp,v diff -u -r1.12 -r1.13 --- openacs-4/packages/dotlrn/www/communities.adp 12 Mar 2008 22:11:31 -0000 1.12 +++ openacs-4/packages/dotlrn/www/communities.adp 9 Nov 2008 23:29:23 -0000 1.13 @@ -26,7 +26,7 @@
    - @portlet_title@ +

    @portlet_title@

    Index: openacs-4/packages/dotlrn/www/community-edit-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-edit-2.tcl,v diff -u -r1.16 -r1.17 --- openacs-4/packages/dotlrn/www/community-edit-2.tcl 8 Aug 2006 21:26:23 -0000 1.16 +++ openacs-4/packages/dotlrn/www/community-edit-2.tcl 9 Nov 2008 23:29:23 -0000 1.17 @@ -122,13 +122,10 @@
  • [_ dotlrn.lt_You_tried_to_upload_a]
  • [_ dotlrn.lt_You_double-clicked_th] -

    - [_ dotlrn.lt_Here_is_the_actual_er] -

    +

    [_ dotlrn.lt_Here_is_the_actual_er]

                       $errmsg
-
    -
    " + " ad_script_abort } } else { Index: openacs-4/packages/dotlrn/www/community-edit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-edit.adp,v diff -u -r1.14 -r1.15 --- openacs-4/packages/dotlrn/www/community-edit.adp 8 Aug 2006 21:26:24 -0000 1.14 +++ openacs-4/packages/dotlrn/www/community-edit.adp 9 Nov 2008 23:29:23 -0000 1.15 @@ -41,7 +41,7 @@ - + @@ -56,12 +56,12 @@ + - + @@ -72,11 +72,11 @@ + +
    #dotlrn.Header_Font#  
    #dotlrn.Header_Font_Color#   -
    #dotlrn.header_logo#  
    #dotlrn.Header_Alternate_Text#   -
    -
    Index: openacs-4/packages/dotlrn/www/community-member.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/community-member.adp,v diff -u -r1.24 -r1.25 --- openacs-4/packages/dotlrn/www/community-member.adp 15 May 2007 20:14:25 -0000 1.24 +++ openacs-4/packages/dotlrn/www/community-member.adp 9 Nov 2008 23:29:23 -0000 1.25 @@ -29,12 +29,12 @@ -
    #dotlrn.this_user_is_deleted#
    +

    #dotlrn.this_user_is_deleted#

     -
    #dotlrn.lt_this_user_is_deleted_#
    +

    #dotlrn.lt_this_user_is_deleted_#

     Index: openacs-4/packages/dotlrn/www/control-panel.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/control-panel.adp,v diff -u -r1.20 -r1.21 --- openacs-4/packages/dotlrn/www/control-panel.adp 12 Mar 2008 22:11:31 -0000 1.20 +++ openacs-4/packages/dotlrn/www/control-panel.adp 9 Nov 2008 23:29:23 -0000 1.21 @@ -37,29 +37,27 @@ #acs-subsite.Account_closed_workspace_msg# + + + #acs-subsite.Manage_your_notifications# + + #dotlrn.Customize_Template# + #dotlrn.Customize_Layout# + #acs-subsite.Change_locale_label# - - #acs-subsite.Manage_your_notifications# - - - #dotlrn.Customize_Layout# - #acs-subsite.Change_my_Password# #acs-subsite.Close_your_account# - - @admin_pretty_name@ -
    • Index: openacs-4/packages/dotlrn/www/control-panel.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/control-panel.tcl,v diff -u -r1.12 -r1.13 --- openacs-4/packages/dotlrn/www/control-panel.tcl 12 Mar 2008 22:11:31 -0000 1.12 +++ openacs-4/packages/dotlrn/www/control-panel.tcl 9 Nov 2008 23:29:23 -0000 1.13 @@ -61,9 +61,7 @@ set system_name [ad_system_name] -if { [llength [lang::system::get_locales]] > 1 } { - set change_locale_url [apm_package_url_from_key "acs-lang"] -} +set change_locale_url [apm_package_url_from_key "acs-lang"] set whos_online_url "[subsite::get_element -element url]shared/whos-online" set make_visible_url "[subsite::get_element -element url]shared/make-visible" Index: openacs-4/packages/dotlrn/www/courses.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/courses.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/dotlrn/www/courses.adp 12 Mar 2008 22:11:31 -0000 1.4 +++ openacs-4/packages/dotlrn/www/courses.adp 9 Nov 2008 23:29:23 -0000 1.5 @@ -26,7 +26,7 @@
    - @portlet_title@ +

    @portlet_title@

    Index: openacs-4/packages/dotlrn/www/dotlrn-group-admin-faq.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-group-admin-faq.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/dotlrn/www/dotlrn-group-admin-faq.adp 8 Aug 2006 21:26:24 -0000 1.4 +++ openacs-4/packages/dotlrn/www/dotlrn-group-admin-faq.adp 9 Nov 2008 23:29:23 -0000 1.5 @@ -21,24 +21,21 @@ #dotlrn.help# -

    -
    Group Administrator FAQ -

    +

    -

    (For user information, please read the Help page in your Control Panel) -

    This FAQ contains these sections:

    Dealing with Members
    Managing Content
    Preparing for Next Term

    If your question is not answered, please email your site administrator. -

    +

    Dealing with Members

    +

    Q. Who will have access to my dotlearn class?
    A. The default enrollment policy setting for new classes is "open" and any registered user can join the class. If you are concerned about who @@ -104,9 +101,9 @@ Limited Access users and Limited Access Guests (cross-registered students and non-institution people) can access their Control Panel page through the Help icon in the page banner.

    -

    +

    Managing Content

    -
    +

    Q. Do all the administrators of the class have the same privileges?
    A. Yes, all administrator roles have full control over the content and membership of the community.
    @@ -134,8 +131,9 @@ all their forum email alerts before going away. If this happens while they are away, you will have to remove the user from your group to stop the looping.

    +

    Preparing for Next Term

    -
    +

    Q. What happens to my class at the end of the semester?
    A. At the end of the semester, all classes are closed to further enrollment, but the student and administrator members are left in place. Because you are @@ -172,4 +170,3 @@ Type" window. Choose "Pick App" and click "OK" when the "Configure External Viewer" window appears. The user is then prompted to "Open" or "Save" the file. Outlook does not need to be open before these steps are executed.

    -     Index: openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp,v diff -u -r1.44 -r1.45 --- openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp 5 Jan 2008 12:00:59 -0000 1.44 +++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet.adp 9 Nov 2008 23:29:23 -0000 1.45 @@ -31,23 +31,23 @@ @communities.previous_type_ul_tags;noquote@
    • -

      +

      <%= [parameter::get -localize -parameter class_instances_pretty_plural] %> <%= [parameter::get -localize -parameter clubs_pretty_plural] %> -

      ( ++ | -- ) +( ++ | -- )
      • @communities.intra_type_ul_tags;noquote@ @communities.pretty_name@ - Archived + Archived   Index: openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl,v diff -u -r1.18 -r1.19 --- openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl 26 Feb 2008 16:00:06 -0000 1.18 +++ openacs-4/packages/dotlrn/www/dotlrn-main-portlet.tcl 9 Nov 2008 23:29:23 -0000 1.19 @@ -107,7 +107,8 @@ set dotlrn_url [dotlrn::get_url] # Add the dhtml tree javascript to the HEAD. -template::head::add_javascript -src "/resources/acs-templating/mktree.js" +template::head::add_javascript -script "var mktree_remember = true;" -order 1 +template::head::add_javascript -src "/resources/acs-templating/mktree.js" -order 2 template::head::add_css -href "/resources/acs-templating/mktree.css" set self_registration_p [parameter::get -parameter SelfRegistrationP -package_id [dotlrn::get_package_id] -default 1] Index: openacs-4/packages/dotlrn/www/dotlrn-master-custom.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master-custom.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/dotlrn/www/dotlrn-master-custom.adp 19 Dec 2007 12:28:52 -0000 1.4 +++ openacs-4/packages/dotlrn/www/dotlrn-master-custom.adp 9 Nov 2008 23:29:23 -0000 1.5 @@ -1,12 +1,14 @@ + @doc_type;noquote@ @title;noquote@ + + doc + @context;noquote@ @context_bar;noquote@ @focus;noquote@ - @doc_type;noquote@ @link_control_panel;noquote@ @hide_feedback@ - @title;noquote@ @portal_page_p;noquote@ Index: openacs-4/packages/dotlrn/www/dotlrn-master-custom.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-master-custom.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/dotlrn/www/dotlrn-master-custom.tcl 8 Aug 2006 21:26:24 -0000 1.2 +++ openacs-4/packages/dotlrn/www/dotlrn-master-custom.tcl 9 Nov 2008 23:29:23 -0000 1.3 @@ -11,6 +11,12 @@ -default "/packages/dotlrn/www/dotlrn-master"] } -if {![exists_and_not_null title]} { +# Set page title +if { ![info exists doc(title)] && [exists_and_not_null title] } { + set doc(title) $title +} elseif { [info exists doc(title)] && ![exists_and_not_null title] } { + set title $doc(title) +} elseif { ![info exists doc(title)] && [exists_and_not_null title] } { set title [ad_system_name] -} \ No newline at end of file + set doc(title) $title +} Index: openacs-4/packages/dotlrn/www/dotlrn-user-faq.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/dotlrn-user-faq.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/dotlrn/www/dotlrn-user-faq.adp 12 Jul 2004 14:49:56 -0000 1.3 +++ openacs-4/packages/dotlrn/www/dotlrn-user-faq.adp 9 Nov 2008 23:29:23 -0000 1.4 @@ -21,8 +21,8 @@ #dotlrn.help# - -

        dotlrn User FAQ


        +

        dotlrn User FAQ

        +

        Q: How do I change my password?
        A: Go to your Control Panel page or to the Help icon in the page banner. Select "Change Password."
        @@ -75,4 +75,3 @@ open before these steps are executed.

        -         Index: openacs-4/packages/dotlrn/www/member-add-2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-add-2.adp,v diff -u -r1.21 -r1.22 --- openacs-4/packages/dotlrn/www/member-add-2.adp 15 May 2007 20:14:25 -0000 1.21 +++ openacs-4/packages/dotlrn/www/member-add-2.adp 9 Nov 2008 23:29:23 -0000 1.22 @@ -21,6 +21,7 @@ #dotlrn.Add_A_Member# #dotlrn.Add_A_Member# +member-add-2.rel_type

        #dotlrn.Add_A_Member#

        @@ -33,10 +34,10 @@ #dotlrn.lt_You_are_adding_strong#

        -

        + - #dotlrn.Role# +   \ No newline at end of file Index: openacs-4/packages/dotlrn/www/member-email-confirm.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-email-confirm.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/dotlrn/www/member-email-confirm.adp 15 May 2007 20:14:25 -0000 1.2 +++ openacs-4/packages/dotlrn/www/member-email-confirm.adp 9 Nov 2008 23:29:23 -0000 1.3 @@ -4,6 +4,6 @@

        @page_title@

        -

        The user(s) have been added to the selected community. You can send an email to welcome the users to the community.

        +

        #dotlrn.The_users_have_been_added_#

        Index: openacs-4/packages/dotlrn/www/members-chunk-table.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members-chunk-table.adp,v diff -u -r1.19 -r1.20 --- openacs-4/packages/dotlrn/www/members-chunk-table.adp 8 Aug 2006 21:26:24 -0000 1.19 +++ openacs-4/packages/dotlrn/www/members-chunk-table.adp 9 Nov 2008 23:29:23 -0000 1.20 @@ -146,15 +146,13 @@

        #dotlrn.Add_New_Members#

        -

        #dotlrn.lt_The_following_members#

        #dotlrn.lt_First_check_the_box_o#

        -
        Index: openacs-4/packages/dotlrn/www/members-chunk.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members-chunk.adp,v diff -u -r1.23 -r1.24 --- openacs-4/packages/dotlrn/www/members-chunk.adp 8 Aug 2006 21:26:24 -0000 1.23 +++ openacs-4/packages/dotlrn/www/members-chunk.adp 9 Nov 2008 23:29:23 -0000 1.24 @@ -95,15 +95,13 @@

        #dotlrn.Add_New_Members#

        -

        #dotlrn.lt_The_following_members#

        #dotlrn.lt_First_check_the_box_o#

        -
        Index: openacs-4/packages/dotlrn/www/members.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members.adp,v diff -u -r1.25 -r1.26 --- openacs-4/packages/dotlrn/www/members.adp 7 Oct 2007 22:36:56 -0000 1.25 +++ openacs-4/packages/dotlrn/www/members.adp 9 Nov 2008 23:29:23 -0000 1.26 @@ -23,57 +23,59 @@ 1@context;noquote@ - -

        - #dotlrn.Email_Members# -

        -         +

        #dotlrn.Manage_Membership#

        - - #dotlrn.Add_A_Member# - - -Create and add a member -

        +

        +
        +
        +
        + +
        +
        + +
        + +
        -

        #dotlrn.Membership_Requests#

        +

        #dotlrn.Membership_Requests#

                 -
        +

        #dotlrn.Add_New_Members#

        -

        #dotlrn.Add_New_Members#

        - -

        #dotlrn.lt_The_following_members#

        #dotlrn.lt_First_check_the_box_o#

        -
        -
        +
        - - - - - - + + + + + + + + + <% foreach user $parent_user_list { @@ -84,23 +86,20 @@ %> - - + + - + <% } %> - - - - + - +
        #dotlrn.Dont_Add##dotlrn.Member##dotlrn.Administrator# 
        #dotlrn.Dont_Add##dotlrn.Member##dotlrn.Administrator##dotlrn.Users#
        @formgroup.widget;noquote@@formgroup.widget;noquote@ @this_last_name@, @this_first_names@ (@this_email@)@this_last_name@, @this_first_names@
         
         
        Index: openacs-4/packages/dotlrn/www/members.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members.tcl,v diff -u -r1.27 -r1.28 --- openacs-4/packages/dotlrn/www/members.tcl 7 Oct 2007 22:36:56 -0000 1.27 +++ openacs-4/packages/dotlrn/www/members.tcl 9 Nov 2008 23:29:23 -0000 1.28 @@ -32,10 +32,13 @@ set community_id [dotlrn_community::get_community_id] set spam_p [dotlrn::user_can_spam_community_p -user_id [ad_get_user_id] -community_id $community_id] set approval_policy_p [string eq [group::join_policy -group_id $community_id] "needs approval"] +set subcomm_p [dotlrn_community::subcommunity_p -community_id $community_id] set referer [ns_conn url] set return_url "[ns_conn url]?[ns_conn query]" +set csv_p [exists_and_not_null csv] + set site_wide_admin_p [permission::permission_p -object_id [acs_magic_object security_context_root] -privilege admin] if {!$site_wide_admin_p} { @@ -44,19 +47,6 @@ set admin_p 1 } -# make it so that only course admins -# and site wide admins can read this page -# if { !$admin_p } { -# ad_return_forbidden "Permission Denied" "
        -# You don't have permission to view this page. -#
        " -# ad_script_abort -#} - -if {$admin_p} { - set add_member_url [export_vars -base user-add { {can_browse_p 1} {read_private_data_p t} {referer $return_url} }] -} - if {![exists_and_not_null referer]} { if {[string equal $admin_p t] == 1} { set referer "one-community-admin" @@ -65,122 +55,108 @@ } } -set bio_attribute_id [db_string bio_attribute_id { - select attribute_id - from acs_attributes - where object_type = 'person' - and attribute_name = 'bio' -}] - # Actions for Removing Members according to their role set rel_types [dotlrn_community::get_roles -community_id $community_id] set bulk_actions "" set bulk_actions_export_vars "" set actions "" -if {$admin_p} { +if {$admin_p && !$csv_p} { set bulk_actions [list "[_ dotlrn.Drop_Membership]" "deregister" "[_ dotlrn.Drop_Membership]"] set bulk_actions_export_vars [list "user_id" "referer" "reset"] - set actions [list "CSV" "members?csv=yes" "[_ dotlrn.Comma_Separated_Values]"] + + if { !$subcomm_p } { + lappend actions [_ dotlrn.Create_and_add_a_member] [export_vars -base user-add { {can_browse_p 1} {read_private_data_p t} {referer $return_url} }] [_ dotlrn.Create_and_add_a_member] + } + + if { $spam_p } { + lappend actions [_ dotlrn.Email_Members] [export_vars -base "spam-recipients" {community_id}] [_ dotlrn.Email_Members] + } + + lappend actions "CSV" "members?csv=yes" [_ dotlrn.Export_members_list_to_CSV] + foreach role $rel_types { - # lappend actions "[_ dotlrn.Remove_all] [lang::util::localize [lindex $role 3]]" "members?reset=1&reltype=[lindex $role 0]" "[lang::util::localize [lindex $role 2]]" - lappend actions "[_ dotlrn.Remove_all] [lang::util::localize [lindex $role 3]]" "member-confirm?reset=1&reltype=[lindex $role 0]" "[lang::util::localize [lindex $role 2]]" + set action_label "[_ dotlrn.Remove_all] [lang::util::localize [lindex $role 3]]" + lappend actions $action_label "member-confirm?reset=1&reltype=[lindex $role 0]" $action_label } } # Set the elements list set elm_list { - portrait { - label "" - html "align right" - display_template { - - - #acs-subsite.Profile# - - - -
        Update bio -         - - } - } last_name { - label "[_ acs-subsite.Last_name]" - html "align left" - display_template { - @members.last_name;noquote@ - } - } first_names { - label "[_ acs-subsite.First_names]" - html "align left" - display_template { - @members.first_names@ - } - } email { - label "[_ dotlrn.Email_1]" - html "align left" - display_template { - @members.email@ - } - } role { - label "[_ dotlrn.Role]" - html "align left" - } + portrait { + label "" + html "align right" + display_template { + + + #acs-subsite.Profile# + + + } + hide_p $csv_p + } last_name { + label "[_ acs-subsite.Last_name]" + html "align left" + display_template { + @members.last_name;noquote@ + } + } first_names { + label "[_ acs-subsite.First_names]" + html "align left" + display_template { + @members.first_names@ + } + } email { + label "[_ dotlrn.Email_1]" + html "align left" + display_template {@members.email_pretty;noquote@} + } role { + label "[_ dotlrn.Role]" + html "align left" + } } -if {$admin_p} { +if {$admin_p && !$csv_p} { lappend elm_list {action} { - label "[_ dotlrn.Actions]" - html "align left" - display_template { - - #dotlrn.Drop_Membership# | - #dotlrn.User_Admin_Page# - - } - } + label "[_ dotlrn.Actions]" + html "align left" + display_template { + + #dotlrn.Drop_Membership# | + #dotlrn.User_Admin_Page# + + } + } } # Build the list-builder list template::list::create -name members -multirow members -key user_id -actions $actions -bulk_actions $bulk_actions -bulk_action_export_vars $bulk_actions_export_vars -elements $elm_list -orderby { - last_name {orderby last_name} - first_names {orderby first_names} - email {orderby email} - role {orderby role} + last_name {orderby last_name} + first_names {orderby first_names} + email {orderby email} + role {orderby role} } -selected_format csv -formats { - csv { output csv } + csv { output csv } } set orderby [template::list::orderby_clause -name "members" -orderby] set member_page [acs_community_member_page] -db_multirow -extend { update_bio_p member_url member_referer } members select_current_members {} { +db_multirow -extend { member_url member_referer email_pretty } members select_current_members {} { + + set email_pretty [email_image::get_user_email -user_id $user_id -return_url $return_url] set member_url "$member_page?user_id=$user_id" set member_referer $referer - set update_bio_p $admin_p set role [dotlrn_community::get_role_pretty_name -community_id $community_id -rel_type $rel_type] } -if { [exists_and_not_null csv] } { +if { $csv_p } { template::list::write_output -name members } -# # Bulk action User Admin Page -# # Depending on the community_type, we have allowable rel_types -# set rel_types [dotlrn_community::get_roles -community_id $community_id] -# set selection "" -# set size [multirow size members] -# if { $size > 0 } { -# multirow append members "" "" "" "" "" $selection -# } - set user_ids "" db_multirow -extend { member_url pending_user_referer } pending_users select_pending_users {} { set role [dotlrn_community::get_role_pretty_name -community_id $community_id -rel_type $rel_type] @@ -192,49 +168,47 @@ if {$admin_p} { if { [template::multirow size pending_users] > 0 } { - set pend_actions [list "[_ dotlrn.Approve_all]" "approve?${user_ids}referer=$referer" "[_ dotlrn.Approve_all]" \ - "[_ dotlrn.Reject_all]" "reject?${user_ids}referer=$referer" "[_ dotlrn.Reject_all]"] + set pend_actions [list "[_ dotlrn.Approve_all]" "approve?${user_ids}referer=$referer" "[_ dotlrn.Approve_all]" \ + "[_ dotlrn.Reject_all]" "reject?${user_ids}referer=$referer" "[_ dotlrn.Reject_all]"] } else { - set pend_actions "" + set pend_actions "" } } else { set pend_actions "" } template::list::create -name pending_users -multirow pending_users -key user_id -actions $pend_actions -elements { last_name { - label "[_ acs-subsite.Last_name]" - html "align left" - display_template { - @pending_users.last_name;noquote@ - } + label "[_ acs-subsite.Last_name]" + html "align left" + display_template { + @pending_users.last_name;noquote@ + } } first_names { - label "[_ acs-subsite.First_names]" - html "align left" - display_template { - @pending_users.first_names@ - } + label "[_ acs-subsite.First_names]" + html "align left" + display_template { + @pending_users.first_names@ + } } email { - label "[_ dotlrn.Email_1]" - html "align left" - display_template { - @pending_users.email@ - } + label "[_ dotlrn.Email_1]" + html "align left" + display_template { + @pending_users.email@ + } } role { - label "[_ dotlrn.Role]" - html "align left" + label "[_ dotlrn.Role]" + html "align left" } action { - label "[_ dotlrn.Actions]" - html "align left" - display_template { - #dotlrn.Approve# | - #dotlrn.Reject# - } + label "[_ dotlrn.Actions]" + html "align left" + display_template { + #dotlrn.Approve# | + #dotlrn.Reject# + } } } -set subcomm_p [dotlrn_community::subcommunity_p -community_id $community_id] - if {$subcomm_p} { form create parent_users_form @@ -247,29 +221,29 @@ } if {[form is_valid parent_users_form]} { - set user_ids_to_email [list] + set user_ids_to_email [list] foreach user $parent_user_list { set rel [element get_value parent_users_form "selected_user.[ns_set get $user user_id]"] if {![string match $rel none]} { dotlrn_community::add_user -rel_type $rel $community_id [ns_set get $user user_id] - lappend user_ids_to_email [ns_set get $user user_id] + lappend user_ids_to_email [ns_set get $user user_id] } } - if {[llength $user_ids_to_email]} { - set return_url [export_vars -base member-email-confirm {{user_id $user_ids_to_email} community_id}] - } else { - set return_url [ns_conn url] - } + if {[llength $user_ids_to_email]} { + set return_url [export_vars -base member-email-confirm {{user_id $user_ids_to_email} community_id}] + } else { + set return_url [ns_conn url] + } ad_returnredirect $return_url } } if {[exists_and_not_null reset] && [exists_and_not_null reltype]} { -set result "" + set result "" db_multirow reset_members select_members {} { - rp_form_put user_id $member_id + rp_form_put user_id $member_id } rp_form_put referer "one-community" rp_form_put community_id $community_id Index: openacs-4/packages/dotlrn/www/members.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/members.xql,v diff -u -r1.3 -r1.4 Binary files differ Index: openacs-4/packages/dotlrn/www/one-community-type.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/one-community-type.adp,v diff -u -r1.26 -r1.27 --- openacs-4/packages/dotlrn/www/one-community-type.adp 8 Aug 2006 21:26:24 -0000 1.26 +++ openacs-4/packages/dotlrn/www/one-community-type.adp 9 Nov 2008 23:29:23 -0000 1.27 @@ -22,23 +22,13 @@ @context_bar@ @title@ -

        - -
        +

        @description@ -

        +

        -

        - -
        -
        -

        - -
        -
         Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/site-map-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/site-map-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/site-map.adp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/site-map.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/dotlrn/www/site-map.xql'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/dotlrn/www/spam-variables.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/spam-variables.adp,v diff -u -r1.7 -r1.8 --- openacs-4/packages/dotlrn/www/spam-variables.adp 4 Dec 2002 09:51:04 -0000 1.7 +++ openacs-4/packages/dotlrn/www/spam-variables.adp 9 Nov 2008 23:29:23 -0000 1.8 @@ -18,8 +18,6 @@ %> -
        - @@ -64,7 +62,6 @@
        -
        Index: openacs-4/packages/dotlrn/www/user-add-3.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/user-add-3.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/dotlrn/www/user-add-3.tcl 8 Aug 2006 21:26:24 -0000 1.9 +++ openacs-4/packages/dotlrn/www/user-add-3.tcl 9 Nov 2008 23:29:23 -0000 1.10 @@ -42,9 +42,9 @@ set email_subject [_ dotlrn.user_add_confirm_email_subject $msg_subst_values] if [catch {ns_sendmail "$email" "$admin_email" "$email_subject" "$message"} errmsg] { ad_return_error "[_ dotlrn.Mail_Failed]" "[_ dotlrn.lt_The_system_was_unable] -
        +
         [ad_quotehtml $errmsg]
-
        " +" ad_script_abort } Index: openacs-4/packages/dotlrn/www/user-add.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/user-add.adp,v diff -u -r1.16 -r1.17 --- openacs-4/packages/dotlrn/www/user-add.adp 15 May 2007 20:14:25 -0000 1.16 +++ openacs-4/packages/dotlrn/www/user-add.adp 9 Nov 2008 23:29:23 -0000 1.17 @@ -25,8 +25,9 @@

        #dotlrn.lt_Add_a_new_user_to_Slo#

        -
        +

        #dotlrn.lt_Note_use_this_feature# +

        1. #dotlrn.lt_If_this_person_is_a_M#
        2. #dotlrn.lt_Be_sure_that_the_pers# @@ -44,7 +45,6 @@
      - Index: openacs-4/packages/dotlrn/www/admin/class.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/class.adp,v diff -u -r1.34 -r1.35 --- openacs-4/packages/dotlrn/www/admin/class.adp 15 May 2007 20:14:25 -0000 1.34 +++ openacs-4/packages/dotlrn/www/admin/class.adp 9 Nov 2008 23:29:23 -0000 1.35 @@ -55,10 +55,10 @@
      #dotlrn.Search_classes_with# - - - - + + + +

      Index: openacs-4/packages/dotlrn/www/admin/classes-chunk.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/classes-chunk.adp,v diff -u -r1.22 -r1.23 --- openacs-4/packages/dotlrn/www/admin/classes-chunk.adp 15 May 2007 20:14:25 -0000 1.22 +++ openacs-4/packages/dotlrn/www/admin/classes-chunk.adp 9 Nov 2008 23:29:23 -0000 1.23 @@ -28,22 +28,22 @@ -
      +
      #dotlrn.Search_subjects_with# - + - - - + + +
      -
      +
      Index: openacs-4/packages/dotlrn/www/admin/club-new.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/club-new.tcl,v diff -u -r1.21 -r1.22 --- openacs-4/packages/dotlrn/www/admin/club-new.tcl 7 Oct 2007 22:36:56 -0000 1.21 +++ openacs-4/packages/dotlrn/www/admin/club-new.tcl 9 Nov 2008 23:29:23 -0000 1.22 @@ -34,7 +34,7 @@ ad_form -name add_club -form { - {pretty_name:text(text),optional + {pretty_name:text(text) {label "#dotlrn.Name#"} {html {size 60 maxlength 100}} {help_text "[_ dotlrn.Name_help]"} Index: openacs-4/packages/dotlrn/www/admin/cockpit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/cockpit.adp,v diff -u -r1.2 -r1.3 Binary files differ Index: openacs-4/packages/dotlrn/www/admin/community-members-add-to-community.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/community-members-add-to-community.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/dotlrn/www/admin/community-members-add-to-community.adp 4 Dec 2002 09:51:04 -0000 1.2 +++ openacs-4/packages/dotlrn/www/admin/community-members-add-to-community.adp 9 Nov 2008 23:29:23 -0000 1.3 @@ -22,10 +22,8 @@ #dotlrn.lt_Add_community_name_Me# @context_bar@ -#dotlrn.Note# +

      #dotlrn.Note#

      -#dotlrn.lt_This_action_will_take_1# +

      #dotlrn.lt_This_action_will_take_1#

      -

      - Index: openacs-4/packages/dotlrn/www/admin/departments.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/departments.adp,v diff -u -r1.23 -r1.24 --- openacs-4/packages/dotlrn/www/admin/departments.adp 15 May 2007 20:14:25 -0000 1.23 +++ openacs-4/packages/dotlrn/www/admin/departments.adp 9 Nov 2008 23:29:23 -0000 1.24 @@ -25,7 +25,7 @@
      #dotlrn.Search_departments_with# - +
      Index: openacs-4/packages/dotlrn/www/admin/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/index.adp,v diff -u -r1.31 -r1.32 --- openacs-4/packages/dotlrn/www/admin/index.adp 5 Jan 2008 17:12:42 -0000 1.31 +++ openacs-4/packages/dotlrn/www/admin/index.adp 9 Nov 2008 23:29:23 -0000 1.32 @@ -24,40 +24,17 @@ @version $Id$ --> - -@admin_pretty_name@ + +@admin_pretty_name@ @context_bar@
      - @admin_pretty_name@ +

      @admin_pretty_name@

      - - - - - -
      +
      - - +
    Index: openacs-4/packages/dotlrn/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/index.tcl,v diff -u -r1.20 -r1.21 --- openacs-4/packages/dotlrn/www/admin/index.tcl 15 May 2007 20:14:25 -0000 1.20 +++ openacs-4/packages/dotlrn/www/admin/index.tcl 9 Nov 2008 23:29:23 -0000 1.21 @@ -26,7 +26,7 @@ set oacs_site_wide_admin_p [acs_user::site_wide_admin_p] -set admin_pretty_name [parameter::get -localize -parameter dotlrn_admin_pretty_name] +set admin_pretty_name [_ dotlrn.Administration] set context_bar {} # Some en_US messages reuse these configurable pretty names Index: openacs-4/packages/dotlrn/www/admin/site-wide-admin-toggle.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/site-wide-admin-toggle.tcl,v diff -u -r1.11 -r1.12 --- openacs-4/packages/dotlrn/www/admin/site-wide-admin-toggle.tcl 8 Aug 2006 21:26:28 -0000 1.11 +++ openacs-4/packages/dotlrn/www/admin/site-wide-admin-toggle.tcl 9 Nov 2008 23:29:23 -0000 1.12 @@ -33,9 +33,9 @@ ns_log notice "user has tried to site-wide-admin-toggle without permission" ad_return_forbidden \ "Permission Denied" \ - "
    + "

    [_ acs-admin.lt_You_dont_have_permiss] -

    " +

    " return } Index: openacs-4/packages/dotlrn/www/admin/term.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/term.adp,v diff -u -r1.26 -r1.27 --- openacs-4/packages/dotlrn/www/admin/term.adp 15 May 2007 20:14:25 -0000 1.26 +++ openacs-4/packages/dotlrn/www/admin/term.adp 9 Nov 2008 23:29:23 -0000 1.27 @@ -80,10 +80,10 @@
    #dotlrn.Search_classes_with# - - - - + + + +

    Index: openacs-4/packages/dotlrn/www/admin/user-edit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-edit.adp,v diff -u -r1.12 -r1.13 --- openacs-4/packages/dotlrn/www/admin/user-edit.adp 29 Jun 2004 10:18:05 -0000 1.12 +++ openacs-4/packages/dotlrn/www/admin/user-edit.adp 9 Nov 2008 23:29:23 -0000 1.13 @@ -22,11 +22,9 @@ #dotlrn.Edit_a_User# @context_bar@ -#dotlrn.Youre_editing# @first_names@ @last_name@. -

    -#dotlrn.Note_if_you_make# +

    #dotlrn.Youre_editing# @first_names@ @last_name@.

    -

    +

    #dotlrn.Note_if_you_make#

    Index: openacs-4/packages/dotlrn/www/admin/user-nuke-error.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user-nuke-error.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/dotlrn/www/admin/user-nuke-error.adp 13 Jan 2005 13:57:22 -0000 1.3 +++ openacs-4/packages/dotlrn/www/admin/user-nuke-error.adp 9 Nov 2008 23:29:23 -0000 1.4 @@ -6,12 +6,12 @@

    -#dotlrn.lt_Well_we_tried_to_nuke#

    -

    +#dotlrn.lt_Well_we_tried_to_nuke# +

     @error_msg@
    -

    #dotlrn.lt_Return_to_where_you_w# +

    Index: openacs-4/packages/dotlrn/www/admin/user.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user.adp,v diff -u -r1.31 -r1.32 --- openacs-4/packages/dotlrn/www/admin/user.adp 8 Aug 2006 21:26:28 -0000 1.31 +++ openacs-4/packages/dotlrn/www/admin/user.adp 9 Nov 2008 23:29:23 -0000 1.32 @@ -124,7 +124,6 @@ -

    #dotlrn.class_memberships#

      @@ -136,11 +135,9 @@
    -
    -

    #dotlrn.community_memberships#

      @@ -151,11 +148,9 @@
    -
    -

    #dotlrn.subcommunity_memberships#

      @@ -166,7 +161,6 @@
    -
      Index: openacs-4/packages/dotlrn/www/admin/user.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/user.tcl,v diff -u -r1.22 -r1.23 --- openacs-4/packages/dotlrn/www/admin/user.tcl 1 Jan 2007 15:26:05 -0000 1.22 +++ openacs-4/packages/dotlrn/www/admin/user.tcl 9 Nov 2008 23:29:24 -0000 1.23 @@ -86,6 +86,8 @@ } set site_wide_admin_p [acs_user::site_wide_admin_p] +# ER: this is silly, user has to be at least dotlrn admin to get +# to this page and dotlrn admin right is checked above set dotlrn_admin_p [dotlrn::admin_p] set administrative_action_p [expr {$site_wide_admin_p || $dotlrn_admin_p}] @@ -105,7 +107,7 @@ set dual_approve_return_url [ns_urlencode [dotlrn::get_admin_url]/user-new-2?user_id=$user_id&referer=$return_url] -if {$site_wide_admin_p} { +if { [acs_user::site_wide_admin_p -user_id $user_id] } { set toggle_value revoke set toggle_text [_ dotlrn.Revoke_site_wide_admin] } else { Index: openacs-4/packages/dotlrn/www/admin/users-add-to-community.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/admin/users-add-to-community.adp,v diff -u -r1.7 -r1.8 --- openacs-4/packages/dotlrn/www/admin/users-add-to-community.adp 23 Oct 2002 12:38:40 -0000 1.7 +++ openacs-4/packages/dotlrn/www/admin/users-add-to-community.adp 9 Nov 2008 23:29:24 -0000 1.8 @@ -23,10 +23,9 @@ @context_bar@ -#dotlrn.Note# -#dotlrn.lt_This_action_will_take# <%= [expr [llength $users] * 3] %> #dotlrn.seconds# +

      #dotlrn.Note#

      -

      +

      #dotlrn.lt_This_action_will_take# <%= [expr [llength $users] * 3] %> #dotlrn.seconds#

      Index: openacs-4/packages/dotlrn-assessment/dotlrn-assessment.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-assessment/dotlrn-assessment.info,v diff -u -r1.5 -r1.6 --- openacs-4/packages/dotlrn-assessment/dotlrn-assessment.info 8 Jan 2008 13:04:48 -0000 1.5 +++ openacs-4/packages/dotlrn-assessment/dotlrn-assessment.info 9 Nov 2008 23:29:24 -0000 1.6 @@ -7,13 +7,13 @@ f t - + Jose Pablo Escobedo Del Cid - 2008-01-08 + 2008-10-18 - - - + + + Index: openacs-4/packages/dotlrn-bm/dotlrn-bm.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-bm/dotlrn-bm.info,v diff -u -r1.13 -r1.14 --- openacs-4/packages/dotlrn-bm/dotlrn-bm.info 8 Jan 2008 13:04:48 -0000 1.13 +++ openacs-4/packages/dotlrn-bm/dotlrn-bm.info 9 Nov 2008 23:29:24 -0000 1.14 @@ -7,14 +7,14 @@ f t - + OpenACS - 2008-01-08 + 2008-10-18 OpenACS - - - + + + Index: openacs-4/packages/dotlrn-bm/www/admin/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-bm/www/admin/index.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/dotlrn-bm/www/admin/index.tcl 18 Nov 2002 18:01:20 -0000 1.3 +++ openacs-4/packages/dotlrn-bm/www/admin/index.tcl 9 Nov 2008 23:29:24 -0000 1.4 @@ -31,7 +31,7 @@ " set table [ad_table \ - -Tmissing_text {
      No bulk mail messages to display.
      } \ + -Tmissing_text {

      No bulk mail messages to display.

      } \ -Torderby $orderby \ -Ttable_extra_html {width="95%"} \ select_bulk_mail_messages \ Index: openacs-4/packages/dotlrn-calendar/dotlrn-calendar.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-calendar/dotlrn-calendar.info,v diff -u -r1.19 -r1.20 --- openacs-4/packages/dotlrn-calendar/dotlrn-calendar.info 8 Jan 2008 13:04:48 -0000 1.19 +++ openacs-4/packages/dotlrn-calendar/dotlrn-calendar.info 9 Nov 2008 23:29:24 -0000 1.20 @@ -7,15 +7,15 @@ f t - + OpenACS - 2008-01-08 + 2008-10-18 OpenACS - - - - + + + + Index: openacs-4/packages/dotlrn-chat/dotlrn-chat.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-chat/dotlrn-chat.info,v diff -u -r1.5 -r1.6 --- openacs-4/packages/dotlrn-chat/dotlrn-chat.info 8 Jan 2008 13:04:48 -0000 1.5 +++ openacs-4/packages/dotlrn-chat/dotlrn-chat.info 9 Nov 2008 23:29:24 -0000 1.6 @@ -7,15 +7,15 @@ f t - + OpenACS 2007-04-22 OpenACS - - - - + + + + Index: openacs-4/packages/dotlrn-dotlrn/dotlrn-dotlrn.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-dotlrn/dotlrn-dotlrn.info,v diff -u -r1.20 -r1.21 --- openacs-4/packages/dotlrn-dotlrn/dotlrn-dotlrn.info 8 Jan 2008 13:04:48 -0000 1.20 +++ openacs-4/packages/dotlrn-dotlrn/dotlrn-dotlrn.info 9 Nov 2008 23:29:24 -0000 1.21 @@ -7,15 +7,15 @@ f t - + OpenACS Helper routines for dotLRN applets - 2008-01-08 + 2008-10-18 OpenACS - - - + + + Index: openacs-4/packages/dotlrn-evaluation/dotlrn-evaluation.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-evaluation/dotlrn-evaluation.info,v diff -u -r1.8 -r1.9 --- openacs-4/packages/dotlrn-evaluation/dotlrn-evaluation.info 8 Jan 2008 13:04:49 -0000 1.8 +++ openacs-4/packages/dotlrn-evaluation/dotlrn-evaluation.info 9 Nov 2008 23:29:24 -0000 1.9 @@ -7,13 +7,13 @@ f t - + Jose Pablo Escobedo Del Cid - 2008-01-08 + 2008-10-18 - - - + + + Index: openacs-4/packages/dotlrn-faq/dotlrn-faq.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-faq/dotlrn-faq.info,v diff -u -r1.19 -r1.20 --- openacs-4/packages/dotlrn-faq/dotlrn-faq.info 8 Jan 2008 13:04:49 -0000 1.19 +++ openacs-4/packages/dotlrn-faq/dotlrn-faq.info 9 Nov 2008 23:29:24 -0000 1.20 @@ -7,14 +7,14 @@ f t - + OpenACS - 2008-01-08 + 2008-10-18 OpenACS - - - + + + Index: openacs-4/packages/dotlrn-forums/dotlrn-forums.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-forums/dotlrn-forums.info,v diff -u -r1.17 -r1.18 --- openacs-4/packages/dotlrn-forums/dotlrn-forums.info 8 Jan 2008 13:04:49 -0000 1.17 +++ openacs-4/packages/dotlrn-forums/dotlrn-forums.info 9 Nov 2008 23:29:24 -0000 1.18 @@ -7,15 +7,15 @@ f t - + OpenACS - 2008-01-08 + 2008-10-18 OpenACS 0 - - - + + + Index: openacs-4/packages/dotlrn-fs/dotlrn-fs.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-fs/dotlrn-fs.info,v diff -u -r1.31 -r1.32 --- openacs-4/packages/dotlrn-fs/dotlrn-fs.info 8 Jan 2008 13:04:49 -0000 1.31 +++ openacs-4/packages/dotlrn-fs/dotlrn-fs.info 9 Nov 2008 23:29:24 -0000 1.32 @@ -7,15 +7,15 @@ f t - + OpenACS - 2008-01-08 + 2008-10-18 OpenACS - - - - + + + + Index: openacs-4/packages/dotlrn-fs/www/all-objects.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-fs/www/all-objects.tcl,v diff -u -r1.14 -r1.15 --- openacs-4/packages/dotlrn-fs/www/all-objects.tcl 1 Mar 2005 00:01:29 -0000 1.14 +++ openacs-4/packages/dotlrn-fs/www/all-objects.tcl 9 Nov 2008 23:29:24 -0000 1.15 @@ -72,7 +72,7 @@ set dotlrn_package_key [dotlrn::package_key] set table [ad_table \ - -Tmissing_text "
      [_ dotlrn-fs.No_contents_found]
      " \ + -Tmissing_text "

      [_ dotlrn-fs.No_contents_found]

      " \ -Torderby $orderby \ -Ttable_extra_html {width="95%"} \ select_folder_contents \ Index: openacs-4/packages/dotlrn-homework/dotlrn-homework.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/dotlrn-homework.info,v diff -u -r1.12 -r1.13 --- openacs-4/packages/dotlrn-homework/dotlrn-homework.info 8 Jan 2008 13:04:49 -0000 1.12 +++ openacs-4/packages/dotlrn-homework/dotlrn-homework.info 9 Nov 2008 23:29:24 -0000 1.13 @@ -7,16 +7,16 @@ f f - + Don Baccus Provides a homework assignment dropboxes for dotLRN classes. - 2008-01-08 + 2008-10-18 furfly.net, LLC - - - - + + + + Index: openacs-4/packages/dotlrn-homework/tcl/dotlrn-homework-applet-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/tcl/dotlrn-homework-applet-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/dotlrn-homework/tcl/dotlrn-homework-applet-procs.tcl 30 Oct 2003 12:21:43 -0000 1.2 +++ openacs-4/packages/dotlrn-homework/tcl/dotlrn-homework-applet-procs.tcl 9 Nov 2008 23:29:24 -0000 1.3 @@ -63,6 +63,26 @@ ad_return_complaint 1 "[applet_key] remove_applet not implemented!" } + ad_proc -public add_portlet { + portal_id + } { + + Adds a porlet. + @param portal_id The page to add portlet. + } { + dotlrn_homework_portlet::add_portlet -portal_id $portal_id + } + + ad_proc -public remove_portlet { + {-portal_id:required} + } { + Remove portlet + @param portal_id The page from remove portlet. + } { + ad_return_complaint 1 "[applet_key] remove_portlet not implimented!" + } + + ad_proc -private create_homework_folder { -community_id:required -package_id:required Index: openacs-4/packages/dotlrn-homework/tcl/dotlrn-homework-portlet-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/tcl/dotlrn-homework-portlet-procs.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/dotlrn-homework/tcl/dotlrn-homework-portlet-procs.tcl 8 Aug 2006 21:26:36 -0000 1.4 +++ openacs-4/packages/dotlrn-homework/tcl/dotlrn-homework-portlet-procs.tcl 9 Nov 2008 23:29:24 -0000 1.5 @@ -41,6 +41,45 @@ return "" } + ad_proc -public add_portlet { + {-portal_id:required} + } { + + Adds a porlet. + @param portal_id The page to add portlet. + } { + set args [ns_set create] + ns_set put $args package_id 0 + ns_set put $args page_name "" + ns_set put $args folder_id 0 + ns_set put $args param_action "overwrite" + + add_portlet_helper $portal_id $args + } + + + ad_proc -public remove_portlet { + {-portal_id:required} + } { + Remove portlet + @param portal_id The page from remove portlet. + } { + ad_return_complaint 1 "[applet_key] remove_portlet not implimented!" + } + + ad_proc -public add_portlet_helper { + portal_id + args + } { + This does the call to add portlet to the given portal. Params for the portlet are set by the callers. + } { + add_self_to_page -portal_id $portal_id \ + -page_name [ns_set get $args page_name] \ + -package_id [ns_set get $args package_id] \ + -folder_id [ns_set get $args folder_id] \ + -param_action [ns_set get $args param_action] + } + ad_proc -public add_self_to_page { {-portal_id:required} {-page_name ""} Index: openacs-4/packages/dotlrn-homework/www/folder-chunk.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/folder-chunk.adp,v diff -u -r1.7 -r1.8 --- openacs-4/packages/dotlrn-homework/www/folder-chunk.adp 15 May 2007 20:14:30 -0000 1.7 +++ openacs-4/packages/dotlrn-homework/www/folder-chunk.adp 9 Nov 2008 23:29:24 -0000 1.8 @@ -48,11 +48,11 @@ - @folders.spaces;noquote@#file-storage.Folder# + @folders.spaces;noquote@#file-storage.Folder# @folders.name@ - @folders.spaces;noquote@ + @folders.spaces;noquote@ @folders.name@
      @folders.title@ Index: openacs-4/packages/dotlrn-homework/www/version-add.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-homework/www/version-add.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/dotlrn-homework/www/version-add.adp 20 Apr 2004 21:13:31 -0000 1.3 +++ openacs-4/packages/dotlrn-homework/www/version-add.adp 9 Nov 2008 23:29:24 -0000 1.4 @@ -2,7 +2,7 @@ #dotlrn-homework.lt_Upload_New_Version_of# @context_bar@ -#dotlrn-homework.lt_use_browse#

        +

      #dotlrn-homework.lt_use_browse#

      Index: openacs-4/packages/dotlrn-imsld/dotlrn-imsld.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-imsld/dotlrn-imsld.info,v diff -u -r1.3 -r1.4 --- openacs-4/packages/dotlrn-imsld/dotlrn-imsld.info 16 Mar 2008 01:25:47 -0000 1.3 +++ openacs-4/packages/dotlrn-imsld/dotlrn-imsld.info 9 Nov 2008 23:29:24 -0000 1.4 @@ -7,13 +7,13 @@ f t - + Eduardo Pérez Ureta - 2005-09-26 + 2008-10-18 - - - + + + Index: openacs-4/packages/dotlrn-lorsm/dotlrn-lorsm.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-lorsm/dotlrn-lorsm.info,v diff -u -r1.9 -r1.10 --- openacs-4/packages/dotlrn-lorsm/dotlrn-lorsm.info 17 Oct 2008 10:58:15 -0000 1.9 +++ openacs-4/packages/dotlrn-lorsm/dotlrn-lorsm.info 9 Nov 2008 23:29:24 -0000 1.10 @@ -9,7 +9,7 @@ Ernie Ghiglione - 2008-09-16 + 2008-10-18 OpenACS Index: openacs-4/packages/dotlrn-news/dotlrn-news.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-news/dotlrn-news.info,v diff -u -r1.15 -r1.16 --- openacs-4/packages/dotlrn-news/dotlrn-news.info 8 Jan 2008 13:04:49 -0000 1.15 +++ openacs-4/packages/dotlrn-news/dotlrn-news.info 9 Nov 2008 23:29:24 -0000 1.16 @@ -7,14 +7,14 @@ f t - + OpenACS - 2008-01-08 + 2008-10-18 OpenACS - - - + + + Index: openacs-4/packages/dotlrn-photo-album/dotlrn-photo-album.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-photo-album/dotlrn-photo-album.info,v diff -u -r1.8 -r1.9 --- openacs-4/packages/dotlrn-photo-album/dotlrn-photo-album.info 8 Jan 2008 13:04:50 -0000 1.8 +++ openacs-4/packages/dotlrn-photo-album/dotlrn-photo-album.info 9 Nov 2008 23:29:24 -0000 1.9 @@ -7,15 +7,15 @@ f t - + Jeff Davis Xarg - 2008-01-08 + 2008-10-18 - - + + - + Index: openacs-4/packages/dotlrn-portlet/dotlrn-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/dotlrn-portlet.info,v diff -u -r1.24 -r1.25 --- openacs-4/packages/dotlrn-portlet/dotlrn-portlet.info 8 Jan 2008 13:04:50 -0000 1.24 +++ openacs-4/packages/dotlrn-portlet/dotlrn-portlet.info 9 Nov 2008 23:29:24 -0000 1.25 @@ -7,14 +7,14 @@ f t - + OpenACS - 2008-01-08 + 2008-10-18 OpenACS - - - + + + Index: openacs-4/packages/dotlrn-portlet/tcl/dotlrn-portlet-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/tcl/dotlrn-portlet-procs.tcl,v diff -u -r1.35 -r1.36 --- openacs-4/packages/dotlrn-portlet/tcl/dotlrn-portlet-procs.tcl 24 Jul 2004 08:34:16 -0000 1.35 +++ openacs-4/packages/dotlrn-portlet/tcl/dotlrn-portlet-procs.tcl 9 Nov 2008 23:29:24 -0000 1.36 @@ -118,9 +118,9 @@ ns_log notice "user has tried to see without permission" ad_return_forbidden \ "Permission Denied"\ - "
      + "

      You don't have permission to see this page. -

      " +

      " } } } @@ -130,9 +130,9 @@ ns_log notice "user has tried to see /dotlrn/www/members without permission" ad_return_forbidden \ "Permission Denied"\ - "
      + "

      You don't have permission to see this page. -

      " +

      " } } } @@ -142,9 +142,9 @@ ns_log notice "user has tried to see /dotlrn/www/one-community-portal-configure without permission" ad_return_forbidden \ "Permission Denied"\ - "
      + "

      You don't have permission to see this page. -

      " +

      " } } } @@ -154,9 +154,9 @@ ns_log notice "user has tried to see /dotlrn/www/user-add without permission" ad_return_forbidden \ "Permission Denied"\ - "
      + "

      You don't have permission to see this page. -

      " +

      " } } } @@ -166,9 +166,9 @@ ns_log notice "user has tried to see /dotlrn/www/user-add without permission" ad_return_forbidden \ "Permission Denied"\ - "
      + "

      You don't have permission to see this page. -

      " +

      " } } } @@ -178,9 +178,9 @@ ns_log notice "user has tried to see /dotlrn/www/applets without permission" ad_return_forbidden \ "Permission Denied"\ - "
      + "

      You don't have permission to see this page. -

      " +

      " } } } Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp,v diff -u -r1.37 -r1.38 --- openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp 6 Jul 2007 12:13:24 -0000 1.37 +++ openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp 9 Nov 2008 23:29:24 -0000 1.38 @@ -18,40 +18,44 @@ %> - + +Group properties section + - +Membership section + + +
    - + +manage applets section + +.LRN admin actions section + + + Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.tcl,v diff -u -r1.14 -r1.15 --- openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.tcl 15 May 2007 20:14:31 -0000 1.14 +++ openacs-4/packages/dotlrn-portlet/www/dotlrn-members-portlet.tcl 9 Nov 2008 23:29:24 -0000 1.15 @@ -29,6 +29,7 @@ set user_id [ad_conn user_id] set referer [ad_conn url] set community_id $config(community_id) +set return_url [ad_return_url] set admin_p [dotlrn::user_can_admin_community_p -user_id $user_id -community_id $community_id] set read_private_data_p [dotlrn::user_can_read_private_data_p -user_id $user_id -object_id $community_id] @@ -43,7 +44,7 @@ template::multirow foreach users { set role [dotlrn_community::get_role_pretty_name -community_id $community_id -rel_type $rel_type] set community_member_url [acs_community_member_url -user_id $user_id] - set email [email_image::get_user_email -user_id $user_id] + set email [email_image::get_user_email -user_id $user_id -return_url $return_url] set name "$first_names $last_name" } @@ -56,7 +57,7 @@ bio { display_template { - #acs-subsite.Profile# + #acs-subsite.Profile# } label {} Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.adp,v diff -u -r1.20 -r1.21 --- openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.adp 15 May 2007 20:14:31 -0000 1.20 +++ openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.adp 9 Nov 2008 23:29:24 -0000 1.21 @@ -32,7 +32,7 @@
  • <%= [acs_community_member_link -user_id $users(user_id) -label "$users(first_names) $users(last_name)"] %> - (<%= [email_image::get_user_email -user_id $users(user_id)] %>) + (<%= [email_image::get_user_email -user_id $users(user_id) -return_url @return_url@] %>)
    • @@ -50,7 +50,7 @@
  • <%= [acs_community_member_link -user_id $users(user_id) -label "$users(first_names) $users(last_name)"] %> - (<%= [email_image::get_user_email -user_id $users(user_id)] %>) + (<%= [email_image::get_user_email -user_id $users(user_id) -return_url @return_url@] %>)
    • @@ -66,7 +66,7 @@
  • <%= [acs_community_member_link -user_id $users(user_id) -label "$users(first_names) $users(last_name)"] %> - (<%= [email_image::get_user_email -user_id $users(user_id)] %>) + (<%= [email_image::get_user_email -user_id $users(user_id) -return_url @return_url@] %>)
    • Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.tcl,v diff -u -r1.11 -r1.12 --- openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.tcl 20 Apr 2004 21:13:34 -0000 1.11 +++ openacs-4/packages/dotlrn-portlet/www/dotlrn-members-staff-portlet.tcl 9 Nov 2008 23:29:24 -0000 1.12 @@ -30,6 +30,7 @@ set user_id [ad_conn user_id] set referer [ad_conn url] set community_id $config(community_id) +set return_url [ad_return_url] if { ![string equal $community_id 0] } { Index: openacs-4/packages/dotlrn-random-photo/dotlrn-random-photo.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-random-photo/dotlrn-random-photo.info,v diff -u -r1.6 -r1.7 --- openacs-4/packages/dotlrn-random-photo/dotlrn-random-photo.info 8 Jan 2008 13:04:50 -0000 1.6 +++ openacs-4/packages/dotlrn-random-photo/dotlrn-random-photo.info 9 Nov 2008 23:29:24 -0000 1.7 @@ -7,12 +7,12 @@ f f - + Gerardo Morales - 2008-01-08 + 2008-10-18 - - + + Index: openacs-4/packages/dotlrn-static/dotlrn-static.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-static/dotlrn-static.info,v diff -u -r1.16 -r1.17 --- openacs-4/packages/dotlrn-static/dotlrn-static.info 8 Jan 2008 13:04:50 -0000 1.16 +++ openacs-4/packages/dotlrn-static/dotlrn-static.info 9 Nov 2008 23:29:24 -0000 1.17 @@ -7,14 +7,14 @@ f t - + OpenACS - 2008-01-08 + 2008-10-18 OpenACS - - - + + + Index: openacs-4/packages/dotlrn-survey/dotlrn-survey.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-survey/dotlrn-survey.info,v diff -u -r1.10 -r1.11 --- openacs-4/packages/dotlrn-survey/dotlrn-survey.info 8 Jan 2008 13:04:50 -0000 1.10 +++ openacs-4/packages/dotlrn-survey/dotlrn-survey.info 9 Nov 2008 23:29:24 -0000 1.11 @@ -7,15 +7,15 @@ f t - + dave bauer dotLRN applet for Survey package dotLRN applet for Survey package - 2008-01-08 + 2008-10-18 - - - + + + Index: openacs-4/packages/dotlrn-syllabus/dotlrn-syllabus.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-syllabus/dotlrn-syllabus.info,v diff -u -r1.12 -r1.13 --- openacs-4/packages/dotlrn-syllabus/dotlrn-syllabus.info 8 Jan 2008 13:04:50 -0000 1.12 +++ openacs-4/packages/dotlrn-syllabus/dotlrn-syllabus.info 9 Nov 2008 23:29:24 -0000 1.13 @@ -7,14 +7,14 @@ f f - + OpenACS - 2008-01-08 + 2008-10-18 OpenACS - + - + Index: openacs-4/packages/dotlrn-syllabus/catalog/dotlrn-syllabus.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-syllabus/catalog/dotlrn-syllabus.en_US.ISO-8859-1.xml,v diff -u -r1.15 -r1.16 --- openacs-4/packages/dotlrn-syllabus/catalog/dotlrn-syllabus.en_US.ISO-8859-1.xml 10 Dec 2007 09:12:32 -0000 1.15 +++ openacs-4/packages/dotlrn-syllabus/catalog/dotlrn-syllabus.en_US.ISO-8859-1.xml 9 Nov 2008 23:29:24 -0000 1.16 @@ -6,8 +6,10 @@ Edit Go to Go to the Syllabus + Add a link to a syllabus <a href="%upload_url%">Upload</a> or <a href="%link_to_url%">link</a> to a Syllabus No Syllabus Found or Syllabus + Upload a new syllabus Index: openacs-4/packages/dotlrn-syllabus/catalog/dotlrn-syllabus.es_ES.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-syllabus/catalog/dotlrn-syllabus.es_ES.ISO-8859-1.xml,v diff -u -r1.13 -r1.14 --- openacs-4/packages/dotlrn-syllabus/catalog/dotlrn-syllabus.es_ES.ISO-8859-1.xml 10 Dec 2007 09:12:32 -0000 1.13 +++ openacs-4/packages/dotlrn-syllabus/catalog/dotlrn-syllabus.es_ES.ISO-8859-1.xml 9 Nov 2008 23:29:24 -0000 1.14 @@ -6,8 +6,10 @@ Editar Ir a Ir al programa + A�adir enlace a un programa de estudios <a href="%upload_url%">Subir</a> o <a href="%link_to_url%">enlazar</a> a un programa Sin programa o Programa de estudios + Subir uno nuevo programa de estudios Index: openacs-4/packages/dotlrn-syllabus/tcl/syllabus-portlet-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-syllabus/tcl/syllabus-portlet-procs.tcl,v diff -u -r1.13 -r1.14 --- openacs-4/packages/dotlrn-syllabus/tcl/syllabus-portlet-procs.tcl 8 Aug 2006 21:26:39 -0000 1.13 +++ openacs-4/packages/dotlrn-syllabus/tcl/syllabus-portlet-procs.tcl 9 Nov 2008 23:29:24 -0000 1.14 @@ -127,13 +127,15 @@ -user_id [dotlrn::get_users_rel_segment_id] ] + set pretty_name "#dotlrn-syllabus.pretty_name#" + # this should move to fs:: foreach row $rows { - if {[string equal -nocase [ns_set get $row title] [_ dotlrn-syllabus.pretty_name]] || ([string equal -nocase [ns_set get $row name] [_ dotlrn-syllabus.pretty_name]] && [string equal -nocase [ns_set get $row type] "url"])} { + if {[string equal -nocase [ns_set get $row title] $pretty_name] || ([string equal -nocase [ns_set get $row name] $pretty_name] && [string equal -nocase [ns_set get $row type] "url"])} { lappend out_list [ns_set get $row object_id] lappend out_list [ns_set get $row type] lappend out_list [ns_set get $row live_revision] - lappend out_list [ns_set get $row file_upload_name] + lappend out_list [ns_set get $row file_upload_name] } } Index: openacs-4/packages/dotlrn-syllabus/www/syllabus-admin-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-syllabus/www/syllabus-admin-portlet.adp,v diff -u -r1.6 -r1.7 --- openacs-4/packages/dotlrn-syllabus/www/syllabus-admin-portlet.adp 15 Dec 2006 22:45:29 -0000 1.6 +++ openacs-4/packages/dotlrn-syllabus/www/syllabus-admin-portlet.adp 9 Nov 2008 23:29:24 -0000 1.7 @@ -18,24 +18,30 @@ %> - Index: openacs-4/packages/dotlrn-syllabus/www/syllabus-admin-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-syllabus/www/syllabus-admin-portlet.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/dotlrn-syllabus/www/syllabus-admin-portlet.tcl 29 May 2003 18:05:05 -0000 1.4 +++ openacs-4/packages/dotlrn-syllabus/www/syllabus-admin-portlet.tcl 9 Nov 2008 23:29:24 -0000 1.5 @@ -35,9 +35,10 @@ set type [lindex $syllabus_info_list 2] set community_id [dotlrn_community::get_community_id] -set title [_ dotlrn-syllabus.pretty_name] -set upload_url "file-storage/file-add?folder_id=$public_folder_id&lock_title_p=1&title=[ad_urlencode $title]" -set link_to_url "file-storage/simple-add?folder_id=$public_folder_id&lock_title_p=1&title=[ad_urlencode $title]" +set title "#dotlrn-syllabus.pretty_name#" + +set upload_url [export_vars -base "file-storage/file-add" {{folder_id $public_folder_id} {lock_title_p 1} {title $title}}] +set link_to_url [export_vars -base "file-storage/simple-add" {{folder_id $public_folder_id} {lock_title_p 1} {title $title}}] # DRB: community_id will be blank if we're called by the portal package portal preview # code for the generic class portlet template. Index: openacs-4/packages/dotlrn-weblogger/dotlrn-weblogger.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-weblogger/dotlrn-weblogger.info,v diff -u -r1.11 -r1.12 --- openacs-4/packages/dotlrn-weblogger/dotlrn-weblogger.info 8 Jan 2008 13:04:50 -0000 1.11 +++ openacs-4/packages/dotlrn-weblogger/dotlrn-weblogger.info 9 Nov 2008 23:29:25 -0000 1.12 @@ -7,14 +7,14 @@ f t - + Simon Carstensen - 2008-01-08 + 2008-10-18 Collaboraid - - - + + + Index: openacs-4/packages/evaluation/evaluation.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/evaluation.info,v diff -u -r1.31 -r1.32 --- openacs-4/packages/evaluation/evaluation.info 8 Jan 2008 13:04:51 -0000 1.31 +++ openacs-4/packages/evaluation/evaluation.info 9 Nov 2008 23:29:25 -0000 1.32 @@ -7,19 +7,19 @@ f f - + Jose Pablo Escobedo Del Cid This package allows the users (professors and students) to use the system to submit and grade the tasks. - 2008-01-08 + 2008-10-18 This package allows the professors and TAs to assign tasks to the students and to grade them, and to the students to upload their answers and see their grades. 0 #evaluation.Evaluations# - - - - + + + + Index: openacs-4/packages/evaluation/lib/audit-chunk.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/audit-chunk.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/evaluation/lib/audit-chunk.adp 28 Apr 2004 11:06:40 -0000 1.1 +++ openacs-4/packages/evaluation/lib/audit-chunk.adp 9 Nov 2008 23:29:25 -0000 1.2 @@ -1,4 +1,2 @@ -
    -
    Index: openacs-4/packages/evaluation/lib/student-grades-report-chunk.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/lib/student-grades-report-chunk.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/evaluation/lib/student-grades-report-chunk.adp 14 Mar 2008 12:26:40 -0000 1.2 +++ openacs-4/packages/evaluation/lib/student-grades-report-chunk.adp 9 Nov 2008 23:29:25 -0000 1.3 @@ -1,7 +1,5 @@ -

    #evaluation.lt_Total_points_in_this__2#
    #evaluation.lt_grade_plural_name_rep#

    -
    Index: openacs-4/packages/evaluation/tcl/evaluation-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/tcl/evaluation-callback-procs.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/evaluation/tcl/evaluation-callback-procs.tcl 25 May 2006 11:38:50 -0000 1.2 +++ openacs-4/packages/evaluation/tcl/evaluation-callback-procs.tcl 9 Nov 2008 23:29:25 -0000 1.3 @@ -1,74 +1,74 @@ ad_library { - Library of callbacks implementations for photo-album -} - -ad_proc -callback application-track::getApplicationName -impl evaluation {} { - callback implementation - } { - return "evaluation" - } - ad_proc -callback application-track::getGeneralInfo -impl evaluation {} { - callback implementation - } { - - db_1row my_query { - SELECT count(1) as result - FROM evaluation_tasks e,dotlrn_communities_full com,acs_objects o, acs_objects o2 - WHERE e.task_id = o.object_id - and com.community_id=:comm_id - and o.package_id= o2.object_id - and o2.context_id=com.package_id - - - - - } - return "$result" - } - - ad_proc -callback application-track::getSpecificInfo -impl evaluation {} { - callback implementation - } { - - upvar $query_name my_query - upvar $elements_name my_elements - - set my_query { - select e.task_name as name,e.task_id as task_id,e.number_of_members as number_elements,c.description as type - FROM evaluation_tasks e,dotlrn_communities_full com,acs_objects o, acs_objects o2,cr_revisions c - WHERE e.task_id = o.object_id - and com.community_id=:class_instance_id - and o.package_id= o2.object_id - and o2.context_id=com.package_id - and e.grade_item_id = c.item_id - - } - - set my_elements { - name { - label "Name" - display_col name - html {align center} - - } - id { - label "Id" - display_col task_id - html {align center} - } - type_evaluation { - label "Type" - display_col type - html {align center} - } - number_elements { - label "Number of elements" - display_col number_elements - html {align center} - } - - - - - } + Library of callbacks implementations for evaluation +} + +ad_proc -callback application-track::getApplicationName -impl evaluation {} { + callback implementation + } { + return "evaluation" + } + ad_proc -callback application-track::getGeneralInfo -impl evaluation {} { + callback implementation + } { + + db_1row my_query { + SELECT count(1) as result + FROM evaluation_tasks e,dotlrn_communities_full com,acs_objects o, acs_objects o2 + WHERE e.task_id = o.object_id + and com.community_id=:comm_id + and o.package_id= o2.object_id + and o2.context_id=com.package_id + + + + + } + return "$result" + } + + ad_proc -callback application-track::getSpecificInfo -impl evaluation {} { + callback implementation + } { + + upvar $query_name my_query + upvar $elements_name my_elements + + set my_query { + select e.task_name as name,e.task_id as task_id,e.number_of_members as number_elements,c.description as type + FROM evaluation_tasks e,dotlrn_communities_full com,acs_objects o, acs_objects o2,cr_revisions c + WHERE e.task_id = o.object_id + and com.community_id=:class_instance_id + and o.package_id= o2.object_id + and o2.context_id=com.package_id + and e.grade_item_id = c.item_id + + } + + set my_elements { + name { + label "Name" + display_col name + html {align center} + + } + id { + label "Id" + display_col task_id + html {align center} + } + type_evaluation { + label "Type" + display_col type + html {align center} + } + number_elements { + label "Number of elements" + display_col number_elements + html {align center} + } + + + + + } } \ No newline at end of file Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.adp,v diff -u -r1.8 -r1.9 --- openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.adp 14 Mar 2008 12:33:59 -0000 1.8 +++ openacs-4/packages/evaluation/www/admin/evaluations/evaluate-students.adp 9 Nov 2008 23:29:25 -0000 1.9 @@ -7,10 +7,11 @@
    @export_vars;noquote@ +
    -
    +
    @@ -22,17 +23,20 @@
    - +
    +
    @export_vars;noquote@ +
    -
    +
    +
    @@ -45,19 +49,22 @@
    - +
    +
    @export_vars;noquote@ +
    -
    +
    +
    @@ -69,8 +76,9 @@
    - +
    +
    Index: openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.adp,v diff -u -r1.7 -r1.8 --- openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.adp 7 Apr 2005 11:26:59 -0000 1.7 +++ openacs-4/packages/evaluation/www/admin/evaluations/evaluations-edit.adp 9 Nov 2008 23:29:25 -0000 1.8 @@ -4,15 +4,17 @@
    - +
    @export_vars;noquote@ -
    - + +
    -
    +
    - - +
    + + +
    @@ -26,9 +28,9 @@
    #evaluation.lt_Grade_students_using_file#
    -
    +     -

    #evaluation.lt_There_are_no_edit# +

    #evaluation.lt_There_are_no_edit#

     -

    + Index: openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.adp 14 Mar 2008 12:33:59 -0000 1.5 +++ openacs-4/packages/evaluation/www/admin/evaluations/grades-sheet-parse.adp 9 Nov 2008 23:29:25 -0000 1.6 @@ -7,7 +7,7 @@
    @export_vars;noquote@ -
    +
    @@ -19,8 +19,9 @@
    -
    +
    +
    #evaluation.lt_There_is_no_info_# Index: openacs-4/packages/evaluation/www/admin/evaluations/grades-sheets.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/grades-sheets.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/evaluation/www/admin/evaluations/grades-sheets.adp 7 Apr 2005 11:26:59 -0000 1.3 +++ openacs-4/packages/evaluation/www/admin/evaluations/grades-sheets.adp 9 Nov 2008 23:29:25 -0000 1.4 @@ -4,7 +4,8 @@

    #evaluation.lt_These_are_the_grades_#

    -
    + +

    Go Back - +

    Index: openacs-4/packages/evaluation/www/admin/evaluations/student-list.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/evaluations/student-list.adp,v diff -u -r1.13 -r1.14 --- openacs-4/packages/evaluation/www/admin/evaluations/student-list.adp 14 Mar 2008 16:22:09 -0000 1.13 +++ openacs-4/packages/evaluation/www/admin/evaluations/student-list.adp 9 Nov 2008 23:29:25 -0000 1.14 @@ -92,7 +92,7 @@

    #evaluation.lt_Evaluated_Students_to#

    #evaluation.Theese#

     -
    +
    @@ -125,7 +125,7 @@
    -
    +
    @@ -136,9 +136,9 @@
    -
    +
    -
    +
    @@ -161,7 +161,7 @@
    -
    +

    #evaluation.lt_There_are_no_students#

     @@ -216,7 +216,7 @@
    -
    + @@ -227,10 +227,10 @@
    #evaluation.lt_Grade_students_with_0#
    -
    +

    -
    +
    @@ -255,8 +255,8 @@
  • #evaluation.upload_graded##evaluation.students_without_subm#
    -
    +
    @@ -272,7 +272,7 @@
  • #evaluation.How_does_this_work# -
    • +

    #evaluation.lt_There_are_no_students_1#

    @@ -303,7 +303,7 @@
    -
    +
    @@ -318,7 +318,7 @@
    #evaluation.lt_Grade_students_with_0#
    -
    +
    @@ -343,10 +343,12 @@
    • #evaluation.download# #evaluation.class_students##evaluation.spreadsheet#
    • #evaluation.upload_graded# #evaluation.class_students# -
      + +
      +
      @@ -358,7 +360,7 @@ - +
    • #evaluation.lt_See_grades_sheets_ass#
    • #evaluation.How_does_this_work# Index: openacs-4/packages/evaluation/www/admin/grades/grades-reports.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-reports.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/evaluation/www/admin/grades/grades-reports.adp 14 Mar 2008 13:20:39 -0000 1.5 +++ openacs-4/packages/evaluation/www/admin/grades/grades-reports.adp 9 Nov 2008 23:29:25 -0000 1.6 @@ -5,7 +5,8 @@ #evaluation.lt_You_can_order_the_gra#
      #evaluation.lt_If_you_click_on_the_s#

      -
      + + Index: openacs-4/packages/evaluation/www/admin/grades/grades-type-reports.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades-type-reports.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/evaluation/www/admin/grades/grades-type-reports.adp 14 Mar 2008 13:20:39 -0000 1.4 +++ openacs-4/packages/evaluation/www/admin/grades/grades-type-reports.adp 9 Nov 2008 23:29:25 -0000 1.5 @@ -6,7 +6,4 @@ #evaluation.lt_If_you_click_on_the_s#

      - -
      - - + Index: openacs-4/packages/evaluation/www/admin/grades/grades.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/grades/grades.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/evaluation/www/admin/grades/grades.adp 14 Mar 2008 13:20:39 -0000 1.3 +++ openacs-4/packages/evaluation/www/admin/grades/grades.adp 9 Nov 2008 23:29:25 -0000 1.4 @@ -19,6 +19,6 @@ -
      +

      @notice;noquote@

      Index: openacs-4/packages/evaluation/www/admin/groups/group-member-add.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-member-add.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/evaluation/www/admin/groups/group-member-add.adp 7 Jul 2004 17:26:45 -0000 1.4 +++ openacs-4/packages/evaluation/www/admin/groups/group-member-add.adp 9 Nov 2008 23:29:25 -0000 1.5 @@ -3,13 +3,11 @@ @context;noquote@ -

      #evaluation.lt_Please_select_the_gro#

      -
      - -
      - -       -

      #evaluation.There#

      +

      #evaluation.lt_Please_select_the_gro#

      + + + +

      #evaluation.There#

       Index: openacs-4/packages/evaluation/www/admin/groups/group-new.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-new.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/evaluation/www/admin/groups/group-new.adp 30 Jul 2004 22:50:11 -0000 1.4 +++ openacs-4/packages/evaluation/www/admin/groups/group-new.adp 9 Nov 2008 23:29:25 -0000 1.5 @@ -13,7 +13,7 @@
      • -
      +
      #evaluation.lt_Grade_students_using_#
      Index: openacs-4/packages/evaluation/www/admin/groups/group-reuse.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/group-reuse.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/evaluation/www/admin/groups/group-reuse.adp 10 Jun 2004 21:08:54 -0000 1.2 +++ openacs-4/packages/evaluation/www/admin/groups/group-reuse.adp 9 Nov 2008 23:29:25 -0000 1.3 @@ -4,5 +4,4 @@

      #evaluation.lt_Click_on_the_task_tha#

      -
      - + Index: openacs-4/packages/evaluation/www/admin/groups/one-group.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/one-group.adp,v diff -u -r1.6 -r1.7 --- openacs-4/packages/evaluation/www/admin/groups/one-group.adp 14 Mar 2008 14:51:36 -0000 1.6 +++ openacs-4/packages/evaluation/www/admin/groups/one-group.adp 9 Nov 2008 23:29:25 -0000 1.7 @@ -12,7 +12,7 @@ @export_vars;noquote@ -
      +
      @@ -28,7 +28,7 @@
      #evaluation.Group_name#
      - + #evaluation.lt_There_are_no_studens_# Index: openacs-4/packages/evaluation/www/admin/groups/one-task.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/groups/one-task.adp,v diff -u -r1.8 -r1.9 --- openacs-4/packages/evaluation/www/admin/groups/one-task.adp 14 Mar 2008 14:51:36 -0000 1.8 +++ openacs-4/packages/evaluation/www/admin/groups/one-task.adp 9 Nov 2008 23:29:25 -0000 1.9 @@ -16,8 +16,8 @@
      - -
      +
      + @@ -28,19 +28,19 @@
      -
      +

      #evaluation.lt_Already_created_group#

      -
      + -
      +       -#evaluation.Go# +

      #evaluation.Go#

      Index: openacs-4/packages/evaluation/www/admin/tasks/task-add-to-communities.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation/www/admin/tasks/task-add-to-communities.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/evaluation/www/admin/tasks/task-add-to-communities.adp 14 Mar 2008 14:48:49 -0000 1.5 +++ openacs-4/packages/evaluation/www/admin/tasks/task-add-to-communities.adp 9 Nov 2008 23:29:25 -0000 1.6 @@ -4,5 +4,6 @@

      #evaluation.lt_The_assignment_task_n#
      #evaluation.lt_Check_the_rest_of_com#

      -
      -       no rregreso nada?!?!??! @communities_count@ :p + + + Index: openacs-4/packages/evaluation-portlet/evaluation-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/evaluation-portlet.info,v diff -u -r1.11 -r1.12 --- openacs-4/packages/evaluation-portlet/evaluation-portlet.info 8 Jan 2008 13:04:51 -0000 1.11 +++ openacs-4/packages/evaluation-portlet/evaluation-portlet.info 9 Nov 2008 23:29:25 -0000 1.12 @@ -7,12 +7,12 @@ f t - + Jose Pablo Escobedo Del Cid - 2008-01-08 + 2008-10-18 - - + + Index: openacs-4/packages/evaluation-portlet/catalog/evaluation-portlet.de_DE.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/catalog/evaluation-portlet.de_DE.ISO-8859-1.xml,v diff -u -r1.5 -r1.6 --- openacs-4/packages/evaluation-portlet/catalog/evaluation-portlet.de_DE.ISO-8859-1.xml 10 Dec 2007 09:12:33 -0000 1.5 +++ openacs-4/packages/evaluation-portlet/catalog/evaluation-portlet.de_DE.ISO-8859-1.xml 9 Nov 2008 23:29:25 -0000 1.6 @@ -23,8 +23,8 @@ Admin Portlet f�r Aufgabenzuweisungen Gruppen administrieren <small>Gesamtpunkte in dieser Kategorie: %total_grade%/%max_grade%<br /> Diese Bewertungskategorie macht %grade_weight%% von 100% der Gesamtklassenleistung aus</small> - Antwort abschicken <style font-color:red>late</style> - Antwort nochmal abschicken <style font-color:red>late</style> + Antwort abschicken <style color:red>late</style> + Antwort nochmal abschicken <style color:red>late</style> F�r diese Paket liegen keine Aufgaben vor. F�r diese Paket liegen keine zu bewertenden Aufgaben vor. Aus Admininstrationsgr�nden sollte nur eine Instanz des Moduls "Evaluations" genutzt werden. Index: openacs-4/packages/evaluation-portlet/catalog/evaluation-portlet.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/catalog/evaluation-portlet.en_US.ISO-8859-1.xml,v diff -u -r1.11 -r1.12 --- openacs-4/packages/evaluation-portlet/catalog/evaluation-portlet.en_US.ISO-8859-1.xml 10 Dec 2007 09:12:33 -0000 1.11 +++ openacs-4/packages/evaluation-portlet/catalog/evaluation-portlet.en_US.ISO-8859-1.xml 9 Nov 2008 23:29:25 -0000 1.12 @@ -39,8 +39,8 @@ <small> <text class="blue">%grade_plural_name% TOTAL:</text> <text class="blue"><b>%grade_plural_name% TOTALS:</text> - submit answer <style font-color:red>late</style> - submit answer <style font-color:red>late</style> again + submit answer <style color:red>late</style> + submit answer <style color:red>late</style> again There are no tasks for this package. There are no tasks to evaluate for this package. There should be only one instance of evaluation for admin purposes Index: openacs-4/packages/evaluation-portlet/catalog/evaluation-portlet.es_ES.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/catalog/evaluation-portlet.es_ES.ISO-8859-1.xml,v diff -u -r1.5 -r1.6 --- openacs-4/packages/evaluation-portlet/catalog/evaluation-portlet.es_ES.ISO-8859-1.xml 10 Dec 2007 09:12:33 -0000 1.5 +++ openacs-4/packages/evaluation-portlet/catalog/evaluation-portlet.es_ES.ISO-8859-1.xml 9 Nov 2008 23:29:25 -0000 1.6 @@ -36,8 +36,8 @@ <small>Total de puntos en esta categor�a: %total_grade%/%max_grade%<br /> Esta categor�a representa el %grade_weight%% del 100% de la clase</small> <small>Total de puntos en esta categor�a: ${total_grade}/${max_grade}<br /> Esta categor�a representa el ${grade_weight}% del 100% de la clase</small> <text class="blue"><b>%grade_plural_name% TOTALES:</text - enviar respuesta <style font-color:red>tarde</style> - re-entregar <style font-color:red>tarde</style> + enviar respuesta <style color:red>tarde</style> + re-entregar <style color:red>tarde</style> No hay tareas para este paquete. No hay tareas que evaluar para este paquete. Solo debe de haber una instancia de evaluaci�n para prop�sitos administrativos Index: openacs-4/packages/evaluation-portlet/catalog/evaluation-portlet.es_GT.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/catalog/evaluation-portlet.es_GT.ISO-8859-1.xml,v diff -u -r1.5 -r1.6 --- openacs-4/packages/evaluation-portlet/catalog/evaluation-portlet.es_GT.ISO-8859-1.xml 10 Dec 2007 09:12:33 -0000 1.5 +++ openacs-4/packages/evaluation-portlet/catalog/evaluation-portlet.es_GT.ISO-8859-1.xml 9 Nov 2008 23:29:25 -0000 1.6 @@ -24,8 +24,8 @@ Administraci�n de Grupos <small>Total de puntos en esta categor�a: %total_grade%/%max_grade%<br /> Esta categor�a representa el %grade_weight%% del 100% de la clase</small> <small>Total de puntos en esta categor�a: ${total_grade}/${max_grade}<br /> Esta categor�a representa el ${grade_weight}% del 100% de la clase</small> - enviar respuesta <style font-color:red>tarde</style> - re-entregar <style font-color:red>tarde</style> + enviar respuesta <style color:red>tarde</style> + re-entregar <style color:red>tarde</style> No hay tareas para este paquete. No hay tareas que evaluar para este paquete. Solo debe de haber una instancia de evaluaci�n para prop�sitos administrativos Index: openacs-4/packages/evaluation-portlet/catalog/evaluation-portlet.pt_BR.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/catalog/evaluation-portlet.pt_BR.ISO-8859-1.xml,v diff -u -r1.5 -r1.6 --- openacs-4/packages/evaluation-portlet/catalog/evaluation-portlet.pt_BR.ISO-8859-1.xml 10 Dec 2007 09:12:33 -0000 1.5 +++ openacs-4/packages/evaluation-portlet/catalog/evaluation-portlet.pt_BR.ISO-8859-1.xml 9 Nov 2008 23:29:25 -0000 1.6 @@ -34,8 +34,8 @@ <small>Pontua��o total nesta categoria: %total_grade%/%max_grade%<br /> Esta categoria de notas representa %grade_weight%% de 100% da classe <small> TOTAL <text class="blue">%grade_plural_name%:</text> TOTAIS <text class="blue">%grade_plural_name%:</text> - enviar resposta <style font-color:red>late</style> - Enviar resposta <style font-color:red>atrasada</style> de novo + enviar resposta <style color:red>late</style> + Enviar resposta <style color:red>atrasada</style> de novo N�o h� tarefas para este pacote. N�o h� tarefas para avaliar para este pacote. Deve haver apenas uma inst�ncia para fins de administra��o Index: openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.tcl,v diff -u -r1.15 -r1.16 --- openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.tcl 15 May 2007 20:14:34 -0000 1.15 +++ openacs-4/packages/evaluation-portlet/lib/evaluations-chunk.tcl 9 Nov 2008 23:29:25 -0000 1.16 @@ -15,7 +15,7 @@ set bulk_actions "" db_1row get_grade_info { *SQL* } -set submitted_label "
      [_ evaluation-portlet.lt_smallTotal_points_in__1]
      " +set submitted_label "[_ evaluation-portlet.lt_smallTotal_points_in__1]" if { $admin_p } { if { $simple_p } { @@ -48,34 +48,34 @@ if { $simple_p } { lappend elements perfect_score \ [list label "[_ evaluation-portlet.points_value]" \ - display_template {
      @grade_tasks_admin.perfect_score@
      } \ + display_template { @grade_tasks_admin.perfect_score@ } \ orderby_asc {perfect_score asc} \ aggregate "" \ aggregate_label "@max_grade_label;noquote@" \ orderby_desc {perfect_score desc}] } lappend elements task_weight \ [list label "[_ evaluation-portlet.Weight_]" \ - display_template {
      @grade_tasks_admin.task_weight@%
      } \ + display_template {@grade_tasks_admin.task_weight@% } \ orderby_asc {task_weight asc} \ orderby_desc {task_weight desc} \ aggregate "" \ aggregate_label "@max_weight_label;noquote@"] if { $simple_p } { lappend elements solution \ - [list label "
      [_ evaluation-portlet.solution]
      " \ - display_template "
      @grade_tasks_admin.solution@
      " \ + [list label "[_ evaluation-portlet.solution]" \ + display_template "@grade_tasks_admin.solution@" \ link_url_col solution_url \ aggregate "" \ aggregate_label "@solution_label;noquote@"] lappend elements grade \ [list label "[_ evaluation-portlet.grade]" \ link_url_col grade_url \ - display_template {
      [_ evaluation-portlet.evaluate]
      } ] + display_template {[_ evaluation-portlet.evaluate] } ] lappend elements edit \ [list label "" \ sub_class narrow \ - display_template {
      [_ evaluation-portlet.edit]
      [_ evaluation-portlet.delete]
      }] + display_template {[_ evaluation-portlet.edit]
      [_ evaluation-portlet.delete]}] } else { lappend elements audit_info \ [list label "" \ @@ -85,34 +85,34 @@ } set multirow_name grade_tasks_admin - set actions "\#evaluation-portlet.Add_grade_name_\#\#evaluation-portlet.edit_grade_scale\#" + set actions "\#evaluation-portlet.Add_grade_name_\#\#evaluation-portlet.edit_grade_scale\#" } else { #student if { $simple_p } { lappend elements submitted \ - [list label "
      [_ evaluation-portlet.Submitted]
      " \ - display_template {
      @grade_tasks.submitted_date;noquote@
      } \ + [list label "[_ evaluation-portlet.Submitted]" \ + display_template {@grade_tasks.submitted_date;noquote@ } \ aggregate "" \ link_url_col submitted_date_url \ aggregate_label "@submitted_label;noquote@" ] lappend elements task_grade \ [list label "[_ evaluation-portlet.Points]" \ - display_template {
      @grade_tasks.task_grade@
      } \ + display_template {@grade_tasks.task_grade@ } \ aggregate "" \ aggregate_label "@max_grade_label;noquote@" ] lappend elements task_weight \ [list label "[_ evaluation-portlet.Total_Points]" \ - display_template {
      @grade_tasks.perfect_score@
      } \ + display_template {@grade_tasks.perfect_score@ } \ orderby_asc {task_weight asc} \ orderby_desc {task_weight desc} \ aggregate "" \ aggregate_label "@max_weight_label;noquote@"] } lappend elements grade \ [list label "[_ evaluation-portlet.Grade_over_100_]" \ - display_template {
      @grade_tasks.grade@
      } \ + display_template {@grade_tasks.grade@} \ aggregate "" \ aggregate_label "@grade_of_label;noquote@"] @@ -124,7 +124,7 @@ if {!$simple_p} { lappend elements task_weight \ [list label "[_ evaluation-portlet.Net_Value]" \ - display_template {
      @grade_tasks.task_weight@
      } \ + display_template {@grade_tasks.task_weight@ } \ orderby_asc {task_weight asc} \ orderby_desc {task_weight desc}] @@ -179,11 +179,11 @@ set max_weight [format %0.2f [expr $max_weight + $task_weight]] set task_weight [format %0.2f $task_weight] set max_grade [expr $max_grade + $perfect_score] - set max_grade_label "
      $max_grade pts.
      " - set solution_label "[_ evaluation-portlet.weight_possible_of_grade_] $low_name )" + set max_grade_label "$max_grade pts." + set solution_label "[_ evaluation-portlet.weight_possible_of_grade_] $low_name )" if { $simple_p } { - set max_weight_label "
      $max_weight %
      " + set max_weight_label "$max_weight %" } if { [db_0or1row solution_info { *SQL* }] } { set solution_mode display @@ -286,8 +286,8 @@ set answer "" } set max_weight [expr $max_weight + $perfect_score] - set max_grade_label "
      $max_grade pts.
      " - set max_weight_label "
      $max_weight %
      " + set max_grade_label "$max_grade pts." + set max_weight_label "$max_weight %" if { [empty_string_p $submitted_date]} { if { [string eq $online_p "t"] } { Index: openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl,v diff -u -r1.15 -r1.16 --- openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl 15 May 2007 20:14:34 -0000 1.15 +++ openacs-4/packages/evaluation-portlet/lib/tasks-chunk.tcl 9 Nov 2008 23:29:25 -0000 1.16 @@ -39,19 +39,19 @@ lappend elements view \ [list label "" \ sub_class narrow \ - display_template {[_ evaluation-portlet.View_task_]} \ + display_template {[_ evaluation-portlet.View_task_]} \ link_url_eval {[export_vars -base "${base_url}admin/tasks/task-add-edit" { grade_id task_id mode return_url }]} \ link_html { title "[_ evaluation-portlet.View_task_]" }] lappend elements edit \ [list label "" \ sub_class narrow \ - display_template {[_ evaluation-portlet.Edit_task_]} \ + display_template {[_ evaluation-portlet.Edit_task_]} \ link_url_eval {[export_vars -base "${base_url}admin/tasks/task-add-edit" { grade_id return_url item_id task_id }]} \ link_html { title "[_ evaluation-portlet.Edit_task_]" }] lappend elements delete \ [list label "" \ sub_class narrow \ - display_template {[_ evaluation-portlet.Delete_task_]} \ + display_template {[_ evaluation-portlet.Delete_task_]} \ link_url_eval {[export_vars -base "${base_url}admin/tasks/task-delete" { grade_id task_id return_url }]} \ link_html { title "[_ evaluation-portlet.Delete_task_]" }] @@ -67,7 +67,7 @@ lappend elements view \ [list label "" \ sub_class narrow \ - display_template {[_ evaluation-portlet.View_task_]} \ + display_template {[_ evaluation-portlet.View_task_]} \ link_url_eval {[export_vars -base "${base_url}task-view" { grade_id task_id return_url }]} \ link_html { title "[_ evaluation-portlet.View_task_]" }] set multirow_name tasks Index: openacs-4/packages/evaluation-portlet/www/evaluation-assignments-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/www/evaluation-assignments-portlet.adp,v diff -u -r1.6 -r1.7 --- openacs-4/packages/evaluation-portlet/www/evaluation-assignments-portlet.adp 15 Dec 2006 22:45:31 -0000 1.6 +++ openacs-4/packages/evaluation-portlet/www/evaluation-assignments-portlet.adp 9 Nov 2008 23:29:25 -0000 1.7 @@ -8,9 +8,9 @@
    • #evaluation-portlet.lt_There_are_no_tasks_fo#
      • -
    • @grades.grade_plural_name@
      +
    • @grades.grade_plural_name@
      -

      +

      • Index: openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet.adp,v diff -u -r1.8 -r1.9 --- openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet.adp 15 May 2007 20:14:34 -0000 1.8 +++ openacs-4/packages/evaluation-portlet/www/evaluation-evaluations-portlet.adp 9 Nov 2008 23:29:25 -0000 1.9 @@ -33,7 +33,7 @@
    • @grades.grade_plural_name;noquote@ -

      +

    Index: openacs-4/packages/faq/faq.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/faq.info,v diff -u -r1.22 -r1.23 --- openacs-4/packages/faq/faq.info 7 Oct 2007 22:37:00 -0000 1.22 +++ openacs-4/packages/faq/faq.info 9 Nov 2008 23:29:25 -0000 1.23 @@ -19,9 +19,9 @@ #faq.FAQs# - - - + + + Index: openacs-4/packages/faq/www/admin/faq-disable.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/faq-disable.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/faq/www/admin/faq-disable.tcl 15 May 2007 20:14:35 -0000 1.4 +++ openacs-4/packages/faq/www/admin/faq-disable.tcl 9 Nov 2008 23:29:25 -0000 1.5 @@ -6,11 +6,16 @@ } { faq_id:naturalnum,notnull + referer:optional } set package_id [ad_conn package_id] permission::require_permission -object_id $package_id -privilege faq_delete_faq db_dml disable_faq {} -ad_returnredirect "." +if { ![info exists referer] } { + set referer "index" +} + +ad_returnredirect $referer Index: openacs-4/packages/faq/www/admin/faq-edit.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/faq-edit.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/faq/www/admin/faq-edit.adp 22 May 2003 14:54:51 -0000 1.5 +++ openacs-4/packages/faq/www/admin/faq-edit.adp 9 Nov 2008 23:29:25 -0000 1.6 @@ -3,8 +3,7 @@ @title;noquote@
    - -
    +
    @@ -30,6 +29,5 @@
    #faq.Name#
    -
    Index: openacs-4/packages/faq/www/admin/faq-enable.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/faq-enable.tcl,v diff -u -r1.3 -r1.4 --- openacs-4/packages/faq/www/admin/faq-enable.tcl 28 Nov 2003 16:55:15 -0000 1.3 +++ openacs-4/packages/faq/www/admin/faq-enable.tcl 9 Nov 2008 23:29:25 -0000 1.4 @@ -6,6 +6,7 @@ } { faq_id:naturalnum,notnull + referer:optional } set package_id [ad_conn package_id] @@ -15,4 +16,8 @@ update faqs set disabled_p = 'f' where faq_id = :faq_id } -ad_returnredirect "index" +if { ![info exists referer] } { + set referer "index" +} + +ad_returnredirect $referer Index: openacs-4/packages/faq/www/admin/faq-new.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/faq-new.adp,v diff -u -r1.7 -r1.8 --- openacs-4/packages/faq/www/admin/faq-new.adp 15 May 2007 20:14:35 -0000 1.7 +++ openacs-4/packages/faq/www/admin/faq-new.adp 9 Nov 2008 23:29:25 -0000 1.8 @@ -1,12 +1,12 @@ - + @context;noquote@ @title;noquote@ faq.faq_name

    Create an FAQ:

    - +
    Index: openacs-4/packages/faq/www/admin/q_and_a-new.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq/www/admin/Attic/q_and_a-new.adp,v diff -u -r1.10 -r1.11 --- openacs-4/packages/faq/www/admin/q_and_a-new.adp 29 Jun 2004 10:18:18 -0000 1.10 +++ openacs-4/packages/faq/www/admin/q_and_a-new.adp 9 Nov 2008 23:29:25 -0000 1.11 @@ -4,15 +4,15 @@ question.question +
    +
    - -
    @@ -29,6 +29,5 @@
    -
    Index: openacs-4/packages/faq-portlet/faq-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/faq-portlet.info,v diff -u -r1.23 -r1.24 --- openacs-4/packages/faq-portlet/faq-portlet.info 8 Jan 2008 13:04:51 -0000 1.23 +++ openacs-4/packages/faq-portlet/faq-portlet.info 9 Nov 2008 23:29:26 -0000 1.24 @@ -7,14 +7,14 @@ f t - + OpenACS - 2008-01-08 + 2008-10-18 OpenACS - + - + Index: openacs-4/packages/faq-portlet/www/faq-admin-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/www/faq-admin-portlet.adp,v diff -u -r1.9 -r1.10 --- openacs-4/packages/faq-portlet/www/faq-admin-portlet.adp 15 May 2007 20:14:36 -0000 1.9 +++ openacs-4/packages/faq-portlet/www/faq-admin-portlet.adp 9 Nov 2008 23:29:26 -0000 1.10 @@ -25,10 +25,10 @@
  • @faqs.faq_name@ - (#faq-portlet.Disabled# | #faq-portlet.Enable#) + (#faq-portlet.Disabled# | #faq-portlet.Enable#) - (#faq-portlet.Disable#) + (#faq-portlet.Disable#)
    • Index: openacs-4/packages/faq-portlet/www/faq-admin-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/www/faq-admin-portlet.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/faq-portlet/www/faq-admin-portlet.tcl 4 Dec 2002 09:53:40 -0000 1.7 +++ openacs-4/packages/faq-portlet/www/faq-admin-portlet.tcl 9 Nov 2008 23:29:26 -0000 1.8 @@ -38,14 +38,19 @@ set package_id [lindex $list_of_package_ids 0] -db_multirow faqs select_faqs { +db_multirow -extend {faq_enable_url faq_disable_url} faqs select_faqs { select f.faq_id, f.faq_name, f.disabled_p from faqs f, acs_objects o where f.faq_id = o.object_id and o.context_id = :package_id +} { + + set faq_enable_url [export_vars -base "faq/admin/faq-enable" {faq_id referer}] + set faq_disable_url [export_vars -base "faq/admin/faq-disable" {faq_id referer}] + } set url [lindex [site_node::get_url_from_object_id -object_id $package_id] 0] Index: openacs-4/packages/faq-portlet/www/faq-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/faq-portlet/www/faq-portlet.tcl,v diff -u -r1.16 -r1.17 --- openacs-4/packages/faq-portlet/www/faq-portlet.tcl 15 May 2007 20:14:36 -0000 1.16 +++ openacs-4/packages/faq-portlet/www/faq-portlet.tcl 9 Nov 2008 23:29:26 -0000 1.17 @@ -35,9 +35,9 @@ item { label "" display_template { - @faqs.parent_name@
    + @faqs.parent_name@
    - » @faqs.faq_name@
    + » @faqs.faq_name@
     } } Index: openacs-4/packages/file-storage/file-storage.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/file-storage.info,v diff -u -r1.49 -r1.50 --- openacs-4/packages/file-storage/file-storage.info 29 Jan 2008 22:37:45 -0000 1.49 +++ openacs-4/packages/file-storage/file-storage.info 9 Nov 2008 23:29:26 -0000 1.50 @@ -7,7 +7,7 @@ f f - + OpenACS Collaborative document storage 2007-06-15 @@ -16,11 +16,11 @@ 0 #file-storage.file-storage# - - - - - + + + + + @@ -42,7 +42,7 @@ - + Index: openacs-4/packages/file-storage/catalog/file-storage.es_ES.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/catalog/file-storage.es_ES.ISO-8859-1.xml,v diff -u -r1.21 -r1.22 --- openacs-4/packages/file-storage/catalog/file-storage.es_ES.ISO-8859-1.xml 11 Jan 2008 17:07:14 -0000 1.21 +++ openacs-4/packages/file-storage/catalog/file-storage.es_ES.ISO-8859-1.xml 9 Nov 2008 23:29:26 -0000 1.22 @@ -3,7 +3,6 @@ Revisi�n Opciones - Por favor, selecciona un archivo para copiar. Opciones: Opciones Si sube un documento con el mismo nombre que otro documento ya existente en esta carpeta, se a�adir� al nombre de su documento un sufijo incremental (p.e. "mydoc.doc" -&gt; "mydoc-1.doc"). Notese que el t�tulo del documento no ser� cambiado. Es el nombre de documento el que debe ser �nico en cada carpeta. @@ -15,6 +14,7 @@ Volver a la vista de carpeta Volver al proyecto bytes + Categor�as Renombrar Cambiar el l�mite para subir archivos Seleccionar carpeta destino @@ -37,12 +37,16 @@ Borrar versi�n Descripci�n: Descargar + Descargar en un ZIP + Descargar elementos seleccionados en un ZIP Editar editar + Editar documento Editar carpeta Editar URL Fichero Archivo + Documentos Eliminar %title% Archivo borrado Renombrar %title% @@ -142,6 +146,7 @@ Ninguna carpeta destino v�lida PDF Permisos + Por favor, selecciona un archivo para copiar. Documentos propiedades Renombrar Index: openacs-4/packages/file-storage/tcl/file-storage-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-callback-procs.tcl,v diff -u -r1.8 -r1.9 --- openacs-4/packages/file-storage/tcl/file-storage-callback-procs.tcl 7 Oct 2007 22:37:00 -0000 1.8 +++ openacs-4/packages/file-storage/tcl/file-storage-callback-procs.tcl 9 Nov 2008 23:29:26 -0000 1.9 @@ -100,16 +100,6 @@ } ad_proc -public -callback search::url -impl file_storage_object { - -object_id:required -} { - Return the URL to the file_storage_object -} { - set item_id [content::revision::item_id -revision_id $object_id] - set name [db_string item "select name from cr_items where item_id = :item_id" -default ""] - return "/file/$item_id/$name" -} - -ad_proc -public -callback search::url -impl file_storage_object { -object_id:required } { Return the URL to the file_storage_object Index: openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql,v diff -u -r1.33 -r1.34 --- openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql 8 Aug 2006 21:26:48 -0000 1.33 +++ openacs-4/packages/file-storage/tcl/file-storage-procs-oracle.xql 9 Nov 2008 23:29:26 -0000 1.34 @@ -130,7 +130,7 @@ select case when file_storage.get_content_type(i.item_id) = 'content_folder' then :folder_url || '?folder_id=' else :file_url || '?file_id=' - end || i.item_id, + end || i.item_id || :extra_vars, file_storage.get_title(i.item_id) from cr_items i where item_id not in (select i2.item_id Index: openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql,v diff -u -r1.44 -r1.45 --- openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql 8 Aug 2006 21:26:48 -0000 1.44 +++ openacs-4/packages/file-storage/tcl/file-storage-procs-postgresql.xql 9 Nov 2008 23:29:26 -0000 1.45 @@ -120,7 +120,7 @@ select (case when file_storage__get_content_type(i.item_id) = 'content_folder' then :folder_url || '?folder_id=' else :file_url || '?file_id=' - end) || i.item_id, + end) || i.item_id || :extra_vars, file_storage__get_title(i.item_id) from (select tree_ancestor_keys(cr_items_get_tree_sortkey(:start_id)) as tree_sortkey) parents, (select tree_sortkey from cr_items where item_id = :root_folder_id) root, Index: openacs-4/packages/file-storage/tcl/file-storage-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/tcl/file-storage-procs.tcl,v diff -u -r1.65 -r1.66 --- openacs-4/packages/file-storage/tcl/file-storage-procs.tcl 10 Jun 2008 22:07:28 -0000 1.65 +++ openacs-4/packages/file-storage/tcl/file-storage-procs.tcl 9 Nov 2008 23:29:26 -0000 1.66 @@ -167,15 +167,17 @@ && !($item_id == $root_folder_id)} { # don't get title for last element if we are in the # root folder - set start_id [db_string parent_id " - select parent_id from cr_items where item_id = :item_id"] - set final [db_exec_plsql title "begin - :1 := file_storage.get_title(:item_id); - end;"] + set start_id [db_string parent_id " + select parent_id from cr_items where item_id = :item_id"] + set final [db_exec_plsql title "begin + :1 := file_storage.get_title(:item_id); + end;"] } else { - set start_id $item_id + set start_id $item_id } + set extra_vars [concat &$extra_vars] + set context_bar [db_list_of_lists context_bar {}] if {!($item_id == $root_folder_id)} { lappend context_bar $final Index: openacs-4/packages/file-storage/www/file.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/file.tcl,v diff -u -r1.30 -r1.31 --- openacs-4/packages/file-storage/www/file.tcl 11 Jan 2008 18:20:57 -0000 1.30 +++ openacs-4/packages/file-storage/www/file.tcl 9 Nov 2008 23:29:26 -0000 1.31 @@ -116,11 +116,9 @@ set title "[_ file-storage.untitled]" } if {![string equal $version_id $live_revision]} { - set version_url "view/${file_url}?[export_vars {{revision_id $version_id}}]" - set version_url [export_vars -base "download/$title" {version_id}] + set version_url [export_vars -base "download/$title" {version_id}] } else { - set version_url "view/${file_url}" - set version_url [export_vars -base "download/$title" {file_id}] + set version_url [export_vars -base "download/$title" {file_id}] } set version_delete [_ file-storage.Delete_Version] set version_delete_url "version-delete?[export_vars version_id]" Index: openacs-4/packages/file-storage/www/folder-add.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-add.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/file-storage/www/folder-add.adp 2 Aug 2006 10:19:30 -0000 1.2 +++ openacs-4/packages/file-storage/www/folder-add.adp 9 Nov 2008 23:29:26 -0000 1.3 @@ -2,6 +2,4 @@ @title;noquote@ @context;noquote@ -
    -
    \ No newline at end of file Index: openacs-4/packages/file-storage/www/folder-chunk.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-chunk.adp,v diff -u -r1.29 -r1.30 --- openacs-4/packages/file-storage/www/folder-chunk.adp 11 Jan 2008 17:07:15 -0000 1.29 +++ openacs-4/packages/file-storage/www/folder-chunk.adp 9 Nov 2008 23:29:26 -0000 1.30 @@ -1,6 +1,6 @@

    #file-storage.Categories#: @category_links;noquote@

     - +

    Index: openacs-4/packages/file-storage/www/folder-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-chunk.tcl,v diff -u -r1.45 -r1.46 --- openacs-4/packages/file-storage/www/folder-chunk.tcl 24 Jul 2008 15:11:28 -0000 1.45 +++ openacs-4/packages/file-storage/www/folder-chunk.tcl 9 Nov 2008 23:29:26 -0000 1.46 @@ -116,7 +116,7 @@ orderby_asc {fs_objects.sort_key, fs_objects.pretty_type asc}] \ name \ [list label [_ file-storage.Name] \ - display_template {@contents.name@@contents.title@
    @contents.name@    } \ + display_template {@contents.name@@contents.title@
    @contents.name@    } \ orderby_desc {fs_objects.name desc} \ orderby_asc {fs_objects.name asc}] \ short_name \ @@ -180,7 +180,7 @@ } template::list::create \ - -name contents \ + -name contents_${folder_id} \ -multirow contents \ -key object_id \ -actions $actions \ @@ -207,7 +207,7 @@ } \ -elements $elements -set orderby [template::list::orderby_clause -orderby -name contents] +set orderby [template::list::orderby_clause -orderby -name contents_${folder_id}] if {[string equal $orderby ""]} { set orderby " order by fs_objects.sort_key, fs_objects.name asc" Index: openacs-4/packages/file-storage/www/folder-zip-add.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/folder-zip-add.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/file-storage/www/folder-zip-add.adp 15 May 2007 20:14:37 -0000 1.3 +++ openacs-4/packages/file-storage/www/folder-zip-add.adp 9 Nov 2008 23:29:26 -0000 1.4 @@ -2,6 +2,5 @@ @title;noquote@ @context;noquote@

    #file-storage.lt_Upload_compressed_fol#

    -
    + -
    \ No newline at end of file Index: openacs-4/packages/file-storage/www/admin/rss-subscrs.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/admin/rss-subscrs.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/file-storage/www/admin/rss-subscrs.adp 13 Jan 2005 13:58:13 -0000 1.2 +++ openacs-4/packages/file-storage/www/admin/rss-subscrs.adp 9 Nov 2008 23:29:26 -0000 1.3 @@ -4,7 +4,7 @@ @context;noquote@ -
    *Rebuilt feed: @rebuild_short_name@
    +

    *Rebuilt feed: @rebuild_short_name@

    Configuring RSS for @folder_name@

    Index: openacs-4/packages/file-storage/www/download/index.vuh =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/file-storage/www/download/index.vuh,v diff -u -r1.9 -r1.10 --- openacs-4/packages/file-storage/www/download/index.vuh 15 May 2007 20:14:37 -0000 1.9 +++ openacs-4/packages/file-storage/www/download/index.vuh 9 Nov 2008 23:29:26 -0000 1.10 @@ -19,9 +19,12 @@ } } -if {![exists_and_not_null version_id]} { +if {![exists_and_not_null version_id] && [info exists file_id]} { set version_id [item::get_live_revision $file_id] -} +} +if { ![exists_and_not_null file_id] && [info exists version_id] } { + set file_id [content::revision::item_id -revision_id $version_id] +} set user_id [ad_conn user_id] permission::require_permission -party_id $user_id -object_id $version_id -privilege read @@ -31,4 +34,3 @@ } cr_write_content -revision_id $version_id - Index: openacs-4/packages/forums/forums.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/forums.info,v diff -u -r1.39 -r1.40 --- openacs-4/packages/forums/forums.info 20 Sep 2008 12:10:27 -0000 1.39 +++ openacs-4/packages/forums/forums.info 9 Nov 2008 23:29:26 -0000 1.40 @@ -17,11 +17,11 @@ #forums.Forums# - - - + + + - + @@ -32,7 +32,6 @@ - Index: openacs-4/packages/forums/catalog/forums.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/catalog/forums.en_US.ISO-8859-1.xml,v diff -u -r1.40 -r1.41 --- openacs-4/packages/forums/catalog/forums.en_US.ISO-8859-1.xml 2 Sep 2008 22:12:31 -0000 1.40 +++ openacs-4/packages/forums/catalog/forums.en_US.ISO-8859-1.xml 9 Nov 2008 23:29:26 -0000 1.41 @@ -24,6 +24,7 @@ Charter exceeds maximum length (4000 characters) closed Collapse + Collapse message Confirm? Confirm Delete: Confirm Move to @@ -53,6 +54,7 @@ Enter a list of email addresses, optionally with first and last names. They will be subscribed to this forum. As an example: Entire Thread Expand + Expand message First Post Flat Flat Index: openacs-4/packages/forums/catalog/forums.es_ES.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/catalog/forums.es_ES.ISO-8859-1.xml,v diff -u -r1.18 -r1.19 --- openacs-4/packages/forums/catalog/forums.es_ES.ISO-8859-1.xml 10 Dec 2007 09:12:34 -0000 1.18 +++ openacs-4/packages/forums/catalog/forums.es_ES.ISO-8859-1.xml 9 Nov 2008 23:29:26 -0000 1.19 @@ -15,6 +15,7 @@ Archivos adjuntos: Autor Foros disponibles + Mensajes disponibles Regresar a %forum.name% <a href="%thread_url%">Volver</a> a %forum.name% Cuerpo del mensaje @@ -24,6 +25,7 @@ La tem�tica no puede superar el l�mite de 4000 caracteres cerrado Contraer + Colapsar mensaje �Es correcto? Confirmaci�n para eliminar: Confirmar mover mensaje @@ -53,6 +55,7 @@ Ingrese una lista de correos electr�nicos, si desea agregue nombres y apellidos. Ellos ser�n suscritos autom�ticamente a este foro. Por ejemplo: Hilo completo Expandir + Expandir mensaje Primer mensaje Sin hilos Plano @@ -98,6 +101,7 @@ Administrar Administrar Foro de Discusi�n: Administrar/Moderar + Marcar todos como le�dos Mensaje ID T�tulo Moderar @@ -143,6 +147,7 @@ Enviar un mensaje Enviar un nuevo mensaje Enviar una respuesta + Postear de forma an�nima Enviar al foro: Enviados Enviado por Index: openacs-4/packages/forums/lib/forums-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/forums-portlet.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/forums/lib/forums-portlet.adp 27 Jan 2005 14:56:06 -0000 1.1 +++ openacs-4/packages/forums/lib/forums-portlet.adp 9 Nov 2008 23:29:26 -0000 1.2 @@ -5,14 +5,14 @@

    Hot topics

    None

    - @hot_topics.name@
    + @hot_topics.name@

    New topics

    None

    - @new_topics.name@
    + @new_topics.name@

         @@ -22,14 +22,14 @@

    Hot Topics

    None

    - @hot_topics.name@
    + @hot_topics.name@

    New Topics

    None

    - @new_topics.name@
    + @new_topics.name@

     Index: openacs-4/packages/forums/lib/forums/forums-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/forums/forums-chunk.tcl,v diff -u -r1.11 -r1.12 --- openacs-4/packages/forums/lib/forums/forums-chunk.tcl 28 Feb 2008 06:51:49 -0000 1.11 +++ openacs-4/packages/forums/lib/forums/forums-chunk.tcl 9 Nov 2008 23:29:26 -0000 1.12 @@ -23,7 +23,7 @@ set unread_or_new_query_clause [db_map unread_or_new_query] } else { set unread_or_new_query_clause { - case when last_post > (current_date - interval '1 day') then 't' else 'f' end as new_p + case when last_post > (current_date - interval '1' day) then 't' else 'f' end as new_p } } Index: openacs-4/packages/forums/lib/message/attachment-list.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/attachment-list.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/forums/lib/message/attachment-list.adp 17 Dec 2003 15:45:29 -0000 1.1 +++ openacs-4/packages/forums/lib/message/attachment-list.adp 9 Nov 2008 23:29:26 -0000 1.2 @@ -1,7 +1,5 @@ - + Index: openacs-4/packages/forums/lib/message/attachment-list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/attachment-list.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/forums/lib/message/attachment-list.tcl 29 Jun 2004 10:18:28 -0000 1.2 +++ openacs-4/packages/forums/lib/message/attachment-list.tcl 9 Nov 2008 23:29:26 -0000 1.3 @@ -15,7 +15,12 @@ } # get the attachments -set attachments [attachments::get_attachments -object_id $message(message_id)] +template::multirow create attachments url name +foreach attachment [attachments::get_attachments -object_id $message(message_id)] { + set url [lindex $attachment 2] + set name [lindex $attachment 1] + template::multirow append attachments $url $name +} set attachment_graphic [attachments::graphic_url] Index: openacs-4/packages/forums/lib/message/post-confirm.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/post-confirm.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/forums/lib/message/post-confirm.adp 15 Mar 2005 20:06:44 -0000 1.3 +++ openacs-4/packages/forums/lib/message/post-confirm.adp 9 Nov 2008 23:29:26 -0000 1.4 @@ -1,6 +1,6 @@

    #forums.lt_Please_confirm_the_fo#

    - +
    @@ -11,9 +11,9 @@ #forums.Yes# -
    #forums.lt_Note_that_you_are_alr# +
    #forums.lt_Note_that_you_are_alr#     - - + +
    Index: openacs-4/packages/forums/lib/message/row2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/row2.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/forums/lib/message/row2.adp 28 Jun 2006 20:30:28 -0000 1.1 +++ openacs-4/packages/forums/lib/message/row2.adp 9 Nov 2008 23:29:26 -0000 1.2 @@ -35,11 +35,11 @@
    - + + + - #forums.Expand_only_direct_reply_of_message# - #forums.Expand_all_messages# - #forums.Collapse_all_messages# + #forums.Expand_only_direct_reply_of_message# + #forums.Expand_all_messages# + #forums.Collapse_all_messages#
    Index: openacs-4/packages/forums/lib/message/thread-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/thread-chunk.tcl,v diff -u -r1.10 -r1.11 --- openacs-4/packages/forums/lib/message/thread-chunk.tcl 20 Sep 2008 12:10:28 -0000 1.10 +++ openacs-4/packages/forums/lib/message/thread-chunk.tcl 9 Nov 2008 23:29:26 -0000 1.11 @@ -144,7 +144,7 @@ # this is needed to make the javascript work lappend one_children_list "null" } - append response_arrays_stub " replies\[$one_parent_id\] = new Array([join $one_children_list ","]);\n" + append response_arrays_stub " forums_replies\[$one_parent_id\] = new Array([join $one_children_list ","]);\n" } append response_arrays_stub "--> Index: openacs-4/packages/forums/lib/message/threads-chunk-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/Attic/threads-chunk-oracle.xql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/forums/lib/message/threads-chunk-oracle.xql 15 Jun 2007 18:58:54 -0000 1.5 +++ openacs-4/packages/forums/lib/message/threads-chunk-oracle.xql 9 Nov 2008 23:29:26 -0000 1.6 @@ -63,7 +63,7 @@ - case when fm.last_child_post > sysdate-1 then 't' else 'f' end as unread_p + case when fm.last_child_post > sysdate-1 then 't' else 'f' end as new_p Index: openacs-4/packages/forums/lib/message/threads-chunk.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/lib/message/threads-chunk.tcl,v diff -u -r1.13 -r1.14 --- openacs-4/packages/forums/lib/message/threads-chunk.tcl 20 Sep 2008 12:10:28 -0000 1.13 +++ openacs-4/packages/forums/lib/message/threads-chunk.tcl 9 Nov 2008 23:29:26 -0000 1.14 @@ -61,8 +61,8 @@ lappend actions [_ forums.ManageModerate] [export_vars -base "${base_url}moderate/forum" { forum_id }] [_ forums.ManageModerate] } -if {$user_id != 0} { - lappend actions [_ forums.mark_all_as_read] [export_vars -base "${base_url}mark_all_readed" { forum_id }] {} +if { $useReadingInfo } { + lappend actions [_ forums.mark_all_as_read] [export_vars -base "${base_url}mark-all-read" { forum_id }] {} } template::list::create \ @@ -76,21 +76,23 @@ -elements { subject { label "#forums.Subject#" - link_url_col message_url - link_html {title "\#forums.goto_thread_subject\#"} display_template { - - - @messages.subject@ - - @messages.subject@ - - - - @messages.subject@ - - @messages.subject@ - +

    + + + + @messages.subject@ + + @messages.subject@ + + + + @messages.subject@ + + @messages.subject@ + + +

    } } state_pretty { Index: openacs-4/packages/forums/sql/oracle/forums-reading-info-drop.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/sql/oracle/forums-reading-info-drop.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/forums/sql/oracle/forums-reading-info-drop.sql 1 Jun 2007 15:59:02 -0000 1.1 +++ openacs-4/packages/forums/sql/oracle/forums-reading-info-drop.sql 9 Nov 2008 23:29:26 -0000 1.2 @@ -12,7 +12,6 @@ -- Tables to reading information +drop package forum_reading_info; drop table forums_reading_info_user; -drop index forums_reading_info_forum_idx; -drop index forums_reading_info_user_index; drop table forums_reading_info; \ No newline at end of file Index: openacs-4/packages/forums/sql/oracle/forums-reading-info-package-create.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/sql/oracle/forums-reading-info-package-create.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/forums/sql/oracle/forums-reading-info-package-create.sql 15 Jun 2007 10:35:52 -0000 1.1 +++ openacs-4/packages/forums/sql/oracle/forums-reading-info-package-create.sql 9 Nov 2008 23:29:26 -0000 1.2 @@ -50,7 +50,7 @@ ); -- recount reading_info_user from reading_info --- procedure repair_reading_info (); + procedure repair_reading_info; end forum_reading_info; / @@ -65,78 +65,103 @@ p_message_id in forums_messages.message_id%TYPE ) is - v_forum_id integer; + v_forum_id forums_messages.forum_id%TYPE; cursor c_reading is select user_id from forums_reading_info where root_message_id = p_message_id; + begin - select forum_id into v_forum_id from forums_messages where message_id = p_message_id; + + --Exception no_data_found if select into hasn't rows + begin + select forum_id into v_forum_id from forums_messages where message_id = p_message_id; + exception + when no_data_found then + v_forum_id := null; + end; + for v_reading in c_reading loop + delete from forums_reading_info where root_message_id = p_message_id and user_id = v_reading.user_id; update forums_reading_info_user set threads_read=threads_read-1 where forum_id=v_forum_id and user_id=v_reading.user_id; + end loop; + + end remove_msg; -- mark_all_read: - procedure user_add_forum ( - p_forum_id in forums_forums.forum_id%TYPE, - p_user_id in users.user_id%TYPE - ) - is - v_message forums_messages_approved%ROWTYPE; - v_read_p forums_reading_info%ROWTYPE; - begin - for v_message in (select message_id + + procedure user_add_forum ( + p_forum_id in forums_forums.forum_id%TYPE, + p_user_id in users.user_id%TYPE + ) + is + v_message forums_messages_approved%ROWTYPE; + v_read_p integer; + begin + + for v_message in (select message_id from forums_messages_approved where forum_id = p_forum_id and parent_id is null) - loop - begin - select * into v_read_p from forums_reading_info where user_id = p_user_id and root_message_id = v_message.message_id; - exception - when others then - if sql%notfound then -- check for 'no data found' - insert into forums_reading_info - (root_message_id,user_id) - values - (v_message.message_id,p_user_id); + loop + select count(*) into v_read_p from forums_reading_info where user_id = p_user_id and root_message_id = v_message.message_id; + + if v_read_p = 0 then + insert into forums_reading_info + (root_message_id,user_id) + values + (v_message.message_id,p_user_id); end if; - end; - end loop; - end user_add_forum; + end loop; + + delete from forums_reading_info_user where forum_id = p_forum_id and user_id = p_user_id; + insert into forums_reading_info_user (forum_id,user_id,threads_read) VALUES (p_forum_id,p_user_id,(select approved_thread_count from forums_forums where forum_id = p_forum_id)); + end user_add_forum; + -- mark message read for user - procedure user_add_msg ( - p_root_message_id in forums_messages.message_id%TYPE, - p_user_id in users.user_id%TYPE - ) - is - v_forum_id integer; - v_read_p varchar(1); - v_exists varchar(1); - begin - select forum_id into v_forum_id from forums_messages where message_id = p_root_message_id; - begin - select 1 into v_read_p from forums_reading_info where user_id = p_user_id and root_message_id = p_root_message_id; - insert into forums_reading_info (root_message_id,user_id) values (p_root_message_id,p_user_id); - exception - when others then - if sql%notfound then -- check for 'no data found' - insert into forums_reading_info (root_message_id,user_id) values (p_root_message_id,p_user_id); - begin - INSERT INTO forums_reading_info_user(forum_id,user_id,threads_read) VALUES (v_forum_id,p_user_id,1); - SELECT 1 into v_exists FROM forums_reading_info_user WHERE forum_id=v_forum_id AND user_id=p_user_id; - exception - when others then - if sql%notfound then -- check for 'no data found' - UPDATE forums_reading_info_user SET threads_read=threads_read+1 WHERE forum_id=v_forum_id AND user_id=p_user_id; - end if; - end; - end if; - end; - end user_add_msg; + procedure user_add_msg ( + p_root_message_id in forums_messages.message_id%TYPE, + p_user_id in users.user_id%TYPE + ) + is + v_forum_id integer; + v_read_p integer; + v_exists integer; + begin + begin + select forum_id into v_forum_id from forums_messages where message_id = p_root_message_id; + exception + when no_data_found then + v_forum_id := null; + end; + select count(*) into v_read_p from forums_reading_info where user_id = p_user_id and root_message_id = p_root_message_id; + + if v_read_p = 0 then + + insert into forums_reading_info (root_message_id,user_id) values (p_root_message_id,p_user_id); + SELECT count(*) into v_exists FROM forums_reading_info_user WHERE forum_id=v_forum_id AND user_id=p_user_id; + + if v_exists > 0 then + + UPDATE forums_reading_info_user SET threads_read=threads_read+1 WHERE forum_id=v_forum_id AND user_id=p_user_id; + + else + + INSERT INTO forums_reading_info_user(forum_id,user_id,threads_read) VALUES (v_forum_id,p_user_id,1); + + end if; + + end if; + + end user_add_msg; + + + -- move thread to other forum procedure move_update ( p_message_id in forums_messages.message_id%TYPE, @@ -146,18 +171,25 @@ v_users forums_reading_info%ROWTYPE; v_threads integer; begin + for v_users in (select user_id from forums_reading_info where root_message_id = p_message_id) + loop -- down the number of threads read in old forum update forums_reading_info_user set threads_read=threads_read-1 where forum_id=p_old_forum_id and user_id=v_users.user_id; -- up the number of thread read in new forum select count(*) into v_threads from forums_reading_info_user where forum_id = p_new_forum_id and user_id = v_users.user_id; - if v_threads = 0 then + + if v_threads = 0 then + insert into forums_reading_info_user (forum_id,user_id,threads_read) values (p_new_forum_id,v_users.user_id,1); + else + update forums_reading_info_user set threads_read = threads_read + 1 where forum_id = p_new_forum_id and user_id = v_users.user_id; + end if; end loop; @@ -172,20 +204,36 @@ v_target_forum_id forums_forums.forum_id%TYPE; v_users forums_reading_info%ROWTYPE; begin - select forum_id into v_target_forum_id from forums_messages where message_id = p_target_message_id; + begin + select forum_id into v_target_forum_id from forums_messages where message_id = p_target_message_id; + exception + when no_data_found then + v_target_forum_id := null; + end; + -- for all users that have read target, but not the source, remove target_info + for v_users in (select user_id from forums_reading_info fri where root_message_id = p_target_message_id and not exists (select 1 from forums_reading_info where root_message_id = p_source_message_id and user_id = fri.user_id)) + loop + delete from forums_reading_info where root_message_id = p_target_message_id and user_id = v_users.user_id; -- down the number of threads read in target forum update forums_reading_info_user set threads_read=threads_read-1 where forum_id = v_target_forum_id and user_id = v_users.user_id; + end loop; -- for all users that have read source, down the nummber of thread in source forum and remove reading info four source message since it no longer is root_message_id + for v_users in (select user_id from forums_reading_info where root_message_id = p_source_message_id) + loop + delete from forums_reading_info where root_message_id=p_source_message_id and user_id=v_users.user_id; + update forums_reading_info_user set threads_read=threads_read-1 where forum_id = p_source_forum_id and user_id = v_users.user_id; + end loop; + end move_thread_th_update; -- move message to other thread @@ -197,17 +245,52 @@ v_target_forum_id forums_forums.forum_id%TYPE; v_users forums_reading_info%ROWTYPE; begin - select forum_id from forums_messages where message_id = p_target_message_id into v_target_forum_id; + begin + select forum_id into v_target_forum_id from forums_messages where message_id = p_target_message_id; + exception + when no_data_found then + v_target_forum_id := null; + end; + + for v_users in (select user_id from forums_reading_info fri where root_message_id = p_target_message_id and not exists(select 1 from forums_reading_info where root_message_id = p_source_old_root_message_id and user_id = fri.user_id)) loop + delete from forums_reading_info where root_message_id = p_target_message_id and user_id = v_users.user_id; -- down the number of threads read in target forum + update forums_reading_info_user set threads_read = threads_read-1 where forum_id = v_target_forum_id and user_id = v_users.user_id; end loop; end move_thread_update; + procedure repair_reading_info is + cursor c1 is + select user_id, forum_id, count(root_message_id) as threads_read + from ( + select user_id, + (select forum_id from forums_messages where message_id = root_message_id) as forum_id, + root_message_id + from forums_reading_info + ) f + group by forum_id,user_id; + + begin + + delete from forums_reading_info_user; + + for v_users in c1 + loop + + insert into forums_reading_info_user (forum_id,user_id,threads_read) + values + (v_users.forum_id,v_users.user_id,v_users.threads_read); + + end loop; + + end repair_reading_info; + end forum_reading_info; / show errors \ No newline at end of file Index: openacs-4/packages/forums/sql/postgresql/upgrade/upgrade-1.3d5-1.3d6.sql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/sql/postgresql/upgrade/upgrade-1.3d5-1.3d6.sql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/forums/sql/postgresql/upgrade/upgrade-1.3d5-1.3d6.sql 22 May 2007 09:43:45 -0000 1.1 +++ openacs-4/packages/forums/sql/postgresql/upgrade/upgrade-1.3d5-1.3d6.sql 9 Nov 2008 23:29:26 -0000 1.2 @@ -1 +1 @@ -\i forums-reading-info-create.sql \ No newline at end of file +\i ../forums-reading-info-create.sql \ No newline at end of file Index: openacs-4/packages/forums/tcl/forums-callback-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/forums-callback-procs.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/forums/tcl/forums-callback-procs.tcl 20 Sep 2008 12:10:28 -0000 1.7 +++ openacs-4/packages/forums/tcl/forums-callback-procs.tcl 9 Nov 2008 23:29:26 -0000 1.8 @@ -190,6 +190,37 @@ return "[ad_url][db_string select_forums_package_url {}]message-view?message_id=$message_id" } +ad_proc -public -callback search::datasource -impl forums_forum {} { + + returns a datasource for the search package + this is the content that will be indexed by the full text + search engine. + + @author Jeff Davis davis@xarg.net + @creation_date 2004-04-01 +} { + + set forum_id $object_id + + if {![db_0or1row datasource {} -column_array datasource]} { + return {object_id {} name {} charter {} mime {} storage_type {}} + } + + return [array get datasource] +} + +ad_proc -public -callback search::url -impl forums_forum {} { + + returns a url for a forum to the search package + + @author Jeff Davis davis@xarg.net + @creation_date 2004-04-01 + +} { + set forum_id $object_id + return "[ad_url][db_string select_forums_package_url {}]forum-view?forum_id=$forum_id" +} + ad_proc -callback application-track::getApplicationName -impl forums {} { callback implementation } { Index: openacs-4/packages/forums/tcl/forums-callback-procs.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/forums-callback-procs.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/forums/tcl/forums-callback-procs.xql 8 Aug 2006 21:26:52 -0000 1.2 +++ openacs-4/packages/forums/tcl/forums-callback-procs.xql 9 Nov 2008 23:29:26 -0000 1.3 @@ -33,4 +33,18 @@ + + + select + forum_id as object_id, + name as title, + charter as content, + 'text/plain' as mime, + 'text' as storage_type, + '' as keywords + from forums_forums + where forum_id = :forum_id + + + Index: openacs-4/packages/forums/tcl/forums-sc-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/forums-sc-procs.tcl,v diff -u -r1.10 -r1.11 --- openacs-4/packages/forums/tcl/forums-sc-procs.tcl 20 Sep 2008 12:10:28 -0000 1.10 +++ openacs-4/packages/forums/tcl/forums-sc-procs.tcl 9 Nov 2008 23:29:26 -0000 1.11 @@ -1,6 +1,10 @@ ad_library { Forums Library - Search Service Contracts + + This library is DEPRECATED and NOT USED. search is implemented using + callbacks now. See forums-callback-procs.tcl + This library will be definitely removed in 5.5 @creation-date 2002-08-07 @author Dave Bauer Index: openacs-4/packages/forums/tcl/messages-format-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/tcl/messages-format-procs.tcl,v diff -u -r1.5 -r1.6 --- openacs-4/packages/forums/tcl/messages-format-procs.tcl 11 Aug 2006 23:40:01 -0000 1.5 +++ openacs-4/packages/forums/tcl/messages-format-procs.tcl 9 Nov 2008 23:29:26 -0000 1.6 @@ -8,13 +8,22 @@ Generates a subject string for a reply to an existing message. + The prefix is always added using the system-wide locale to avoid + the uncontrollable growth of the subject in a multi-language + environment. + } { - set subject "[_ forums.Re] $parent_subject" - - # trim multiple leading Re: - regsub {^(\s*Re:\s*)*} $subject {Re: } subject + set prefix [lang::message::lookup [lang::system::site_wide_locale] forums.Re] + set prefix "[string trim $prefix] " + + # trim multiple leading prefixes: + regsub "^($prefix)+" $parent_subject {} parent_subject + + set subject [concat $prefix $parent_subject] + return $subject + } ad_proc emoticons { Index: openacs-4/packages/forums/www/forum-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/forum-view.tcl,v diff -u -r1.30 -r1.31 --- openacs-4/packages/forums/www/forum-view.tcl 20 Sep 2008 12:10:28 -0000 1.30 +++ openacs-4/packages/forums/www/forum-view.tcl 9 Nov 2008 23:29:26 -0000 1.31 @@ -58,10 +58,13 @@ -url [ad_conn url]?forum_id=$forum_id \ ] +template::head::add_css -href /resources/forums/forums.css -media all +template::head::add_css -href /resources/forums/print.css -media print + set page_title "[_ forums.Forum_1] $forum(name)" set context [list [ad_quotehtml $forum(name)]] set type_id [notification::type::get_type_id -short_name forums_forum_notif] set notification_count [notification::request::request_count \ -type_id $type_id \ - -object_id $forum_id] \ No newline at end of file + -object_id $forum_id] Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/forums/www/mark-all-read-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/forums/www/mark-all-read-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/forums/www/mark-all-read.tcl'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/forums/www/mark_all_readed-oracle.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2 refers to a dead (removed) revision in file `openacs-4/packages/forums/www/mark_all_readed-postgresql.xql'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3 refers to a dead (removed) revision in file `openacs-4/packages/forums/www/mark_all_readed.tcl'. Fisheye: No comparison available. Pass `N' to diff? Index: openacs-4/packages/forums/www/message-post.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-post.tcl,v diff -u -r1.39 -r1.40 --- openacs-4/packages/forums/www/message-post.tcl 23 Oct 2008 16:53:56 -0000 1.39 +++ openacs-4/packages/forums/www/message-post.tcl 9 Nov 2008 23:29:26 -0000 1.40 @@ -83,7 +83,7 @@ lappend context [_ forums.Post_a_Reply] } } else { - set context [list [list "./forum-view?forum_id=$forum_id" [ad_quotehtml $forum(name)]]] + set context [list [list "./forum-view?forum_id=$forum(forum_id)" [ad_quotehtml $forum(name)]]] lappend context "[_ forums.Post_a_Message]" ad_return_template "message-post-confirm" Index: openacs-4/packages/forums/www/message-view.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-view.adp,v diff -u -r1.38 -r1.39 --- openacs-4/packages/forums/www/message-view.adp 22 Feb 2008 07:17:42 -0000 1.38 +++ openacs-4/packages/forums/www/message-view.adp 9 Nov 2008 23:29:26 -0000 1.39 @@ -9,11 +9,6 @@ -
    - #forums.display_as# - #forums.expand# -   -
    Index: openacs-4/packages/forums/www/message-view.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/message-view.tcl,v diff -u -r1.46 -r1.47 --- openacs-4/packages/forums/www/message-view.tcl 20 Sep 2008 12:10:28 -0000 1.46 +++ openacs-4/packages/forums/www/message-view.tcl 9 Nov 2008 23:29:26 -0000 1.47 @@ -101,43 +101,23 @@ set thread_url [export_vars -base forum-view { { forum_id $message(forum_id) } }] -set dynamic_script " - -" - if {$forum(presentation_type) eq "flat"} { set display_mode flat } # stylesheets set lang [ad_conn language] template::head::add_css -href /resources/forums/forums.css -media all -lang $lang -#template::head::add_css -alternate -href /resources/forums/collapse.css -media all -lang $lang -title "collapse" -#template::head::add_css -alternate -href /resources/forums/expand.css -media all -lang $lang -title "expand" -#template::head::add_css -alternate -href /resources/forums/print.css -media print -lang $lang +template::head::add_css -href /resources/forums/print.css -media print -lang $lang +# set vars for i18n +template::head::add_script -type "text/javascript" -script [subst { + var collapse_alt_text='[_ forums.collapse]'; + var expand_alt_text='[_ forums.expand]'; + var collapse_link_title='[_ forums.collapse_message]'; + var expand_link_title='[_ forums.expand_message]';}] -order 1 + # js scripts -template::head::add_script -type "text/javascript" -src "/resources/forums/forums.js" -template::head::add_script -type "text/javascript" -src "/resources/forums/dynamic-comments.js" -template::head::add_script -type "text/javascript" -script $dynamic_script +template::head::add_script -type "text/javascript" -src "/resources/forums/forums.js" -order 2 -# cookie handling for the expand/collpase -set onunload_script { - saveMsgsState(); -} - -set onload_script { - loadMsgsState(); -} - -template::add_body_handler -event onunload -script $onunload_script -template::add_body_handler -event onload -script $onload_script - set page_title "#forums.Thread_title#" Index: openacs-4/packages/forums/www/admin/subscribe-others-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/admin/subscribe-others-2.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/forums/www/admin/subscribe-others-2.tcl 20 Sep 2008 12:10:28 -0000 1.4 +++ openacs-4/packages/forums/www/admin/subscribe-others-2.tcl 9 Nov 2008 23:29:26 -0000 1.5 @@ -48,7 +48,7 @@ } foreach subscriber_id $subscriber_ids { - ns_write "subscribing [party::name -party_id $subscriber_id]
    " + ns_write "subscribing [party::name -party_id $subscriber_id]
    " notification::request::new \ -type_id $type_id \ -user_id $subscriber_id \ @@ -96,7 +96,7 @@ } - ns_write "
    Name:$fname $lname" + ns_write "
    Name:$fname $lname" # user_id is blank if the account doesn't exist or if the @@ -108,7 +108,7 @@ if {[string is true $create_new_users_p]} { if {[util_email_valid_p $email]} { - ns_write "creating new user: $fname $lname ($email)
    " + ns_write "creating new user: $fname $lname ($email)
    " # create new user set user_exists_p [db_0or1row user_id "select party_id from parties where email = lower(:email) limit 1"] @@ -137,7 +137,7 @@ if {$request_id ne ""} { ns_write "
    already subscribed ($fname $lname ($email)
    " } else { - ns_write "subscribing ($fname $lname ($email)
    " + ns_write "subscribing ($fname $lname ($email)
    " notification::request::new \ -type_id $type_id \ -user_id $user_id \ @@ -151,4 +151,4 @@ } ns_write "

    Complete

    " -ns_write "return" \ No newline at end of file +ns_write "return" Index: openacs-4/packages/forums/www/moderate/message-delete.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/moderate/message-delete.tcl,v diff -u -r1.13 -r1.14 --- openacs-4/packages/forums/www/moderate/message-delete.tcl 4 Jan 2008 17:27:47 -0000 1.13 +++ openacs-4/packages/forums/www/moderate/message-delete.tcl 9 Nov 2008 23:29:26 -0000 1.14 @@ -18,22 +18,11 @@ # Select the stuff forum::message::get -message_id $message_id -array message -set dynamic_script " - -" # stylesheets set lang [ad_conn language] template::head::add_css -href /resources/forums/forums.css -media all -lang $lang # js scripts template::head::add_script -type "text/javascript" -src "/resources/forums/forums.js" -template::head::add_script -type "text/javascript" -script $dynamic_script ad_return_template Index: openacs-4/packages/forums/www/resources/forums.css =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums/www/resources/forums.css,v diff -u -r1.5 -r1.6 --- openacs-4/packages/forums/www/resources/forums.css 22 Feb 2008 07:17:42 -0000 1.5 +++ openacs-4/packages/forums/www/resources/forums.css 9 Nov 2008 23:29:27 -0000 1.6 @@ -6,10 +6,9 @@ } #forum-thread .action-list { - float: right; - text-align: right; - margin-top: 8px; - margin-right: 8px; + position: absolute; + right: 0.2em; + top: 0.2em; } #forum-thread .details { @@ -70,10 +69,12 @@ } #forum-thread .odd { + position: relative; background: #e9effb; } #forum-thread .even { + position: relative; background: #f3f3f3; } @@ -114,3 +115,8 @@ .details img { border-style: none; } + +h2.forum-heading { + font-size: 1.0em; + font-weight: normal; +} Index: openacs-4/packages/forums-portlet/forums-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums-portlet/forums-portlet.info,v diff -u -r1.14 -r1.15 --- openacs-4/packages/forums-portlet/forums-portlet.info 8 Jan 2008 13:04:51 -0000 1.14 +++ openacs-4/packages/forums-portlet/forums-portlet.info 9 Nov 2008 23:29:27 -0000 1.15 @@ -7,15 +7,15 @@ f t - + OpenACS - 2008-01-08 + 2008-10-18 OpenACS 0 - - - + + + Index: openacs-4/packages/forums-portlet/www/forums-portlet-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums-portlet/www/Attic/forums-portlet-oracle.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/forums-portlet/www/forums-portlet-oracle.xql 28 Feb 2008 06:51:49 -0000 1.3 +++ openacs-4/packages/forums-portlet/www/forums-portlet-oracle.xql 9 Nov 2008 23:29:27 -0000 1.4 @@ -12,7 +12,7 @@ where site_nodes.object_id = forums_forums.package_id) as url, forums_forums.forum_id, forums_forums.name, - case when last_post > (sysdate - 1) then 't' else 'f' end as new_p + $unread_or_new_query from forums_forums_enabled forums_forums, acs_objects where acs_objects.object_id = forums_forums.forum_id and @@ -23,4 +23,4 @@ - \ No newline at end of file + Index: openacs-4/packages/forums-portlet/www/forums-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums-portlet/www/forums-portlet.adp,v diff -u -r1.20 -r1.21 --- openacs-4/packages/forums-portlet/www/forums-portlet.adp 15 May 2007 20:14:41 -0000 1.20 +++ openacs-4/packages/forums-portlet/www/forums-portlet.adp 9 Nov 2008 23:29:27 -0000 1.21 @@ -19,7 +19,31 @@ %> - + + +

    @forums.parent_name@

    +
      + +
    • + + + @forums.name@ + (@forums.count_unread@) + + + @forums.name@ + + #forums-portlet.resources_acs-subsite_new_gif# + + +
      • +       +
    +     +     + +

    #forums.No_Forums#

    +     #new-portal.when_portlet_shaded# Index: openacs-4/packages/forums-portlet/www/forums-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/forums-portlet/www/forums-portlet.tcl,v diff -u -r1.16 -r1.17 --- openacs-4/packages/forums-portlet/www/forums-portlet.tcl 28 Feb 2008 06:51:49 -0000 1.16 +++ openacs-4/packages/forums-portlet/www/forums-portlet.tcl 9 Nov 2008 23:29:27 -0000 1.17 @@ -37,8 +37,8 @@ set useReadingInfo [forum::use_ReadingInfo_p] if { $useReadingInfo } { set unread_or_new_query { - approved_thread_count-COALESCE((SELECT forums_reading_info_user.threads_read WHERE - forums_reading_info_user.forum_id=forums_forums_enabled.forum_id AND forums_reading_info_user.user_id=:user_id),0) + approved_thread_count-coalesce((SELECT forums_reading_info_user.threads_read from forums_reading_info_user WHERE + forums_reading_info_user.forum_id=forums_forums.forum_id AND forums_reading_info_user.user_id=:user_id),0) as count_unread } } else { @@ -47,38 +47,4 @@ } } -template::list::create -name forums -multirow forums -key forum_id -pass_properties { - useReadingInfo -} -elements { - item { - label "" - display_template { - @forums.parent_name@
    - - - - - - » @forums.name@ - - (@forums.count_unread@) - - - - - » @forums.name@ - - #forums-portlet.resources_acs-subsite_new_gif#
    -     -     - - » @forums.name@
    -     -     - -     - } - } -} - db_multirow forums $query {} Index: openacs-4/packages/fs-portlet/fs-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/fs-portlet.info,v diff -u -r1.23 -r1.24 --- openacs-4/packages/fs-portlet/fs-portlet.info 8 Jan 2008 13:04:51 -0000 1.23 +++ openacs-4/packages/fs-portlet/fs-portlet.info 9 Nov 2008 23:29:27 -0000 1.24 @@ -7,14 +7,14 @@ f t - + OpenACS - 2008-01-08 + 2008-10-18 OpenACS - - - + + + Index: openacs-4/packages/fs-portlet/www/fs-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-portlet.adp,v diff -u -r1.34 -r1.35 --- openacs-4/packages/fs-portlet/www/fs-portlet.adp 28 Aug 2008 20:35:16 -0000 1.34 +++ openacs-4/packages/fs-portlet/www/fs-portlet.adp 9 Nov 2008 23:29:27 -0000 1.35 @@ -40,17 +40,18 @@     + +

    @notification_chunk;noquote@

    + + +

    #file-storage.Folder_available_via_WebDAV_at#

     + + #new-portal.when_portlet_shaded#
    -

    @notification_chunk;noquote@

    - - -

    #file-storage.Folder_available_via_WebDAV_at#

    -     - Index: openacs-4/packages/fs-portlet/www/fs-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/fs-portlet/www/fs-portlet.tcl,v diff -u -r1.23 -r1.24 --- openacs-4/packages/fs-portlet/www/fs-portlet.tcl 28 Aug 2008 20:35:16 -0000 1.23 +++ openacs-4/packages/fs-portlet/www/fs-portlet.tcl 9 Nov 2008 23:29:27 -0000 1.24 @@ -91,71 +91,60 @@ template::list::create -name folders -multirow folders -key forum_id -pass_properties { } -elements { - icon { - label "" - display_template { - - - #file-storage.Folder# - - - - #file-storage.File# - - - - #file-storage.File# - - } - } - name { - label "" - display_template { - - @folders.name@ - - - @folders.name@ - - - @folders.name@ - - } - } - type { - label "" - display_template { - - #file-storage.folder_type_pretty_name# - - - @folders.type@ - - } - } - size { - label "" - display_template { - - - 0 #fs-portlet.items# - - - @folders.content_size@ #fs-portlet.items# - - - @folders.content_size@ #fs-portlet.item# - - - - n/a - - - @folders.content_size@ #fs-portlet.byte##fs-portlet.bytes# - \[#fs-portlet.view_details#\] - - } - } + icon { + label "[_ file-storage.Type]" + display_template { + + #file-storage.Folder# + #file-storage.folder_type_pretty_name# + + + #file-storage.File# + @folders.type@ + + + #file-storage.File# + @folders.type@ + + } + } + name { + label "[_ file-storage.Name]" + display_template { + + @folders.name@ + + + @folders.name@ + + + @folders.name@ + + } + } + size { + label "[_ file-storage.Size]" + display_template { + + + 0 #fs-portlet.items# + + + @folders.content_size@ #fs-portlet.items# + + + @folders.content_size@ #fs-portlet.item# + + + + n/a + + + @folders.content_size@ #fs-portlet.byte##fs-portlet.bytes# + \[#fs-portlet.view_details#\] + + } + } } db_multirow folders $query { Index: openacs-4/packages/general-comments/www/comment-ae-2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/comment-ae-2.adp,v diff -u -r1.8 -r1.9 --- openacs-4/packages/general-comments/www/comment-ae-2.adp 6 Jul 2003 20:30:20 -0000 1.8 +++ openacs-4/packages/general-comments/www/comment-ae-2.adp 9 Nov 2008 23:29:27 -0000 1.9 @@ -4,10 +4,8 @@ #general-comments.lt_Here_is_how_your_comm# -

    @title@

    @html_content;noquote@ -
    #general-comments.lt_Note_if_the_text_abov# @@ -16,13 +14,11 @@ #general-comments.lt_Note_if_the_text_abov_1# -
    <%= [export_form_vars comment_id object_id object_name context_id title content comment_mime_type category return_url] %>

    -
    Index: openacs-4/packages/general-comments/www/comment-ae.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/Attic/comment-ae.adp,v diff -u -r1.8 -r1.9 --- openacs-4/packages/general-comments/www/comment-ae.adp 24 Feb 2004 12:54:51 -0000 1.8 +++ openacs-4/packages/general-comments/www/comment-ae.adp 9 Nov 2008 23:29:27 -0000 1.9 @@ -3,31 +3,47 @@ @context;noquote@ comment.title -
    -
    -<%= [export_form_vars comment_id object_id object_name context_id return_url] %> -#general-comments.Title#
    - -

    -#general-comments.Comment#
    -
    -#general-comments.Text_above_is# - +

    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    - -
    • -
    -
    - -
    +
    + +
    Index: openacs-4/packages/general-comments/www/delete.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/delete.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/general-comments/www/delete.adp 6 Apr 2007 07:47:23 -0000 1.1 +++ openacs-4/packages/general-comments/www/delete.adp 9 Nov 2008 23:29:27 -0000 1.2 @@ -4,7 +4,7 @@ #general-comments.lt_Do_you_really_wish_to# -
    + @title@ (#general-comments.details#)

    <%= [util_convert_plaintext_to_html $content] %> @@ -14,8 +14,7 @@

    -- @author@ (@pretty_date@) -
    -
    +
    @@ -32,7 +31,7 @@
    -
    + Index: openacs-4/packages/general-comments/www/file-ae.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/file-ae.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/general-comments/www/file-ae.adp 22 May 2003 14:58:48 -0000 1.5 +++ openacs-4/packages/general-comments/www/file-ae.adp 9 Nov 2008 23:29:27 -0000 1.6 @@ -3,9 +3,9 @@ @context;noquote@ @parent_id;noquote@ -
    -<%= [export_form_vars attach_id parent_id return_url] %> -
    + +
    <%= [export_form_vars attach_id parent_id return_url] %>
    + @@ -16,19 +16,17 @@
    #general-comments.Title#
    - #general-comments.lt_Use_the_Browse_button# + #general-comments.lt_Use_the_Browse_button#     @file_name@
    -
    -

    -

    +

    -

    +

    Index: openacs-4/packages/general-comments/www/test.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/test.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/general-comments/www/test.adp 9 Oct 2003 13:14:58 -0000 1.4 +++ openacs-4/packages/general-comments/www/test.adp 9 Nov 2008 23:29:27 -0000 1.5 @@ -80,14 +80,14 @@

    #general-comments.Full_Comments#

    -
    +
  • #general-comments.none# @full_comments@ -
    • +

    @link@ Index: openacs-4/packages/general-comments/www/url-ae.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/url-ae.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/general-comments/www/url-ae.adp 22 May 2003 14:58:48 -0000 1.5 +++ openacs-4/packages/general-comments/www/url-ae.adp 9 Nov 2008 23:29:27 -0000 1.6 @@ -4,8 +4,8 @@ @parent_id;noquote@

    -<%= [export_form_vars attach_id parent_id return_url] %> -
    +
    <%= [export_form_vars attach_id parent_id return_url] %>
    + @@ -15,14 +15,12 @@
    #general-comments.Label# #general-comments.URL#
    - #general-comments.lt_Example_httpwwwarsdig# + #general-comments.lt_Example_httpwwwarsdig#
    -

    -

    +

    -

    -
    +

    Index: openacs-4/packages/general-comments/www/view-comment.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/view-comment.adp,v diff -u -r1.7 -r1.8 --- openacs-4/packages/general-comments/www/view-comment.adp 21 Sep 2003 22:17:41 -0000 1.7 +++ openacs-4/packages/general-comments/www/view-comment.adp 9 Nov 2008 23:29:27 -0000 1.8 @@ -5,41 +5,36 @@ @object_name;noquote@ -[#general-comments.lt_Go_back_to_where_you_#]
    +

    [#general-comments.lt_Go_back_to_where_you_#]

     -
    -

    @title@

    +

    @title@

    @html_content;noquote@ -

    +

    -- #general-comments.you# - - #general-comments.edit_your_comment#

    + + #general-comments.edit_your_comment# +

    - -- @author@ +

    -- @author@

     -
    - - - -

    #general-comments.Attachments#

    +

    #general-comments.Attachments#

    -

    #general-comments.Actions#

    +

    #general-comments.Actions#

     -

    #general-comments.Revisions#

    +

    #general-comments.Revisions#

     - - - #general-comments.lt_This_revision_is_not_# +

    @pre_text@ - (#general-comments.lt_approve_this_revision#) + (@admin_toggle_text@) - - - - - #general-comments.lt_This_revision_is_live# - - (#general-comments.reject_this_revision#) - - - - +

    Index: openacs-4/packages/general-comments/www/view-comment.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/view-comment.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/general-comments/www/view-comment.tcl 24 Jan 2005 00:40:36 -0000 1.7 +++ openacs-4/packages/general-comments/www/view-comment.tcl 9 Nov 2008 23:29:27 -0000 1.8 @@ -96,7 +96,7 @@ } } -db_multirow attachments get_attachments { +db_multirow -extend {file_edit_url delete_attachment_url view_image_url} attachments get_attachments { select r.title, r.mime_type, i.name, @@ -105,19 +105,27 @@ cr_revisions r where i.parent_id = :comment_id and r.revision_id = i.live_revision +} { + set file_edit_url [export_vars -base "file-edit" {{attach_id $item_id} {parent_id $comment_id} return_url}] + set delete_attachment_url [export_vars -base "delete-attachment" {{attach_id $item_id} {parent_id $comment_id} return_url}] + set view_image_url [export_vars -base "view-image" {{image_id $item_id} {return_url return_url_view}}] } -db_multirow links get_links { +db_multirow -extend {url_edit_url delete_attachment_url} links get_links { select i.item_id, e.label, e.url from cr_items i, cr_extlinks e where i.parent_id = :comment_id and e.extlink_id = i.item_id +} { + set url_edit_url [export_vars -base "url-edit" {{attach_id $item_id} {parent_id $comment_id} return_url}] + set delete_attachment_url [export_vars -base "delete-attachment" {{attach_id $item_id} {parent_id $comment_id} return_url}] } -db_multirow revisions get_revisions {*SQL*} { +db_multirow -extend {view_comment_url} revisions get_revisions {*SQL*} { set revision_date [lc_time_fmt $revision_date %c] + set view_comment_url [export_vars -base "view-comment" {comment_id revision_id return_url}] } set allow_file_p [ad_parameter AllowFileAttachmentsP {general-comments} {t}] @@ -129,12 +137,36 @@ set comment_on_id [db_string get_object_id "select object_id from general_comments where comment_id = :comment_id"] set page_title "[_ general-comments.View_comment_on]: [acs_object_name $comment_on_id]" set context "\"[_ general-comments.View_comment]\"" -set return_url_view "[ad_urlencode view-comment?[export_ns_set_vars url]]" +set return_url_view "view-comment?[export_ns_set_vars url]" set is_creator_p "f" if { $user_id == $creation_user } { set is_creator_p "t" } -set html_content [ad_html_text_convert -from $mime_type -- $content] +if { $mime_type ne "text/html" } { + set html_content "

    [ad_html_text_convert -from $mime_type -- $content]

    " +} else { + set html_content $content +} +set comment_edit_url [export_vars -base "comment-edit" {comment_id revision_id return_url}] + +# Actions section +set action_file_add_url [export_vars -base "file-add" {{parent_id $comment_id} return_url}] +set action_url_add_url [export_vars -base "url-add" {{parent_id $comment_id} return_url}] + +# Revisions section +set return_url_view "../${return_url_view}" +if { $live_revision ne $revision_id } { + set font_color "red" + set pre_text [_ general-comments.lt_This_revision_is_not_] + set admin_toggle_url [export_vars -base "admin/toggle-approval" {comment_id revision_id {return_url $return_url_view}}] + set admin_toggle_text [_ general-comments.lt_approve_this_revision] +} else { + set font_color "green" + set pre_text [_ general-comments.lt_This_revision_is_live] + set admin_toggle_url [export_vars -base "admin/toggle-approval" {comment_id revision_id {return_url $return_url_view}}] + set admin_toggle_text [_ general-comments.reject_this_revision] +} + ad_return_template Index: openacs-4/packages/general-comments/www/admin/delete.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/general-comments/www/admin/delete.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/general-comments/www/admin/delete.adp 22 May 2003 14:59:46 -0000 1.5 +++ openacs-4/packages/general-comments/www/admin/delete.adp 9 Nov 2008 23:29:27 -0000 1.6 @@ -4,7 +4,7 @@ #general-comments.lt_Do_you_really_wish_to# -
    + @title@ (#general-comments.details#)

    <%= [util_convert_plaintext_to_html $content] %> @@ -14,8 +14,7 @@

    -- @author@ (@pretty_date@) -
    -
    +
    @@ -32,7 +31,7 @@
    -
    + Index: openacs-4/packages/imsld-portlet/imsld-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld-portlet/imsld-portlet.info,v diff -u -r1.7 -r1.8 --- openacs-4/packages/imsld-portlet/imsld-portlet.info 17 Mar 2008 16:59:30 -0000 1.7 +++ openacs-4/packages/imsld-portlet/imsld-portlet.info 9 Nov 2008 23:29:27 -0000 1.8 @@ -7,13 +7,13 @@ f t - + Eduardo Pérez Ureta - 2007-04-12 + 2008-10-18 0 - - + + Index: openacs-4/packages/imsld-portlet/catalog/imsld-portlet.es_ES.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/imsld-portlet/catalog/imsld-portlet.es_ES.ISO-8859-1.xml,v diff -u -r1.1 -r1.2 --- openacs-4/packages/imsld-portlet/catalog/imsld-portlet.es_ES.ISO-8859-1.xml 5 Oct 2005 15:28:08 -0000 1.1 +++ openacs-4/packages/imsld-portlet/catalog/imsld-portlet.es_ES.ISO-8859-1.xml 9 Nov 2008 23:29:27 -0000 1.2 @@ -1,5 +1,7 @@ - + + A�adir un LD + No hay unidades de aprendizaje en este curso Administraci�n de Unidades de Aprendizaje Index: openacs-4/packages/lars-blogger/lars-blogger.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/lars-blogger.info,v diff -u -r1.46 -r1.47 --- openacs-4/packages/lars-blogger/lars-blogger.info 8 Jan 2008 13:04:51 -0000 1.46 +++ openacs-4/packages/lars-blogger/lars-blogger.info 9 Nov 2008 23:29:27 -0000 1.47 @@ -7,20 +7,20 @@ f f - + Lars Pind Individual or collaborative web logs. - 2008-01-08 + 2008-10-18 OpenACS Weblog creation and management with notifications, RSS, trackpack, technorati, blogroll, pings, archives, draft and published entries, includable templates for presenting on other pages, and permissioning for multiple users. 0 - + - - + + - + Index: openacs-4/packages/lars-blogger/www/blog.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/blog.adp,v diff -u -r1.24 -r1.25 --- openacs-4/packages/lars-blogger/www/blog.adp 8 Aug 2006 21:26:57 -0000 1.24 +++ openacs-4/packages/lars-blogger/www/blog.adp 9 Nov 2008 23:29:27 -0000 1.25 @@ -1,5 +1,3 @@ - - @@ -16,5 +14,5 @@ - XML + XML Index: openacs-4/packages/lars-blogger/www/blog.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/blog.tcl,v diff -u -r1.26 -r1.27 --- openacs-4/packages/lars-blogger/www/blog.tcl 5 Apr 2005 12:08:47 -0000 1.26 +++ openacs-4/packages/lars-blogger/www/blog.tcl 9 Nov 2008 23:29:27 -0000 1.27 @@ -254,6 +254,8 @@ set rss_file_url [lars_blogger::get_rss_file_url -package_id $package_id] +template::head::add_css -href $stylesheet_url + if { [exists_and_not_null display_template] } { ad_return_template $display_template } Index: openacs-4/packages/lars-blogger/www/entry-headline.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/entry-headline.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/lars-blogger/www/entry-headline.adp 13 Jan 2005 13:58:22 -0000 1.2 +++ openacs-4/packages/lars-blogger/www/entry-headline.adp 9 Nov 2008 23:29:27 -0000 1.3 @@ -13,7 +13,7 @@ @blog.title;noquote@     -
    @blog.posted_time_pretty@ +
    @blog.posted_time_pretty@
    Index: openacs-4/packages/lars-blogger/www/entry-headline.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/entry-headline.tcl,v diff -u -r1.2 -r1.3 --- openacs-4/packages/lars-blogger/www/entry-headline.tcl 13 Jan 2005 13:58:22 -0000 1.2 +++ openacs-4/packages/lars-blogger/www/entry-headline.tcl 9 Nov 2008 23:29:27 -0000 1.3 @@ -59,7 +59,7 @@ lars_blogger::entry::htmlify \ -max_content_length $max_content_length \ - -more [ad_decode [ad_return_url] $blog(permalink_url) {} "
    (more)"] \ + -more [ad_decode [ad_return_url] $blog(permalink_url) {} "
    (more)"] \ -array blog Index: openacs-4/packages/lars-blogger/www/headerstuff.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/headerstuff.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/lars-blogger/www/headerstuff.adp 8 Dec 2003 05:29:07 -0000 1.1 +++ openacs-4/packages/lars-blogger/www/headerstuff.adp 9 Nov 2008 23:29:27 -0000 1.2 @@ -1,9 +1,9 @@ - + - + - + Index: openacs-4/packages/lars-blogger/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/index.adp,v diff -u -r1.41 -r1.42 --- openacs-4/packages/lars-blogger/www/index.adp 17 Dec 2007 18:33:14 -0000 1.41 +++ openacs-4/packages/lars-blogger/www/index.adp 9 Nov 2008 23:29:27 -0000 1.42 @@ -93,7 +93,7 @@

    #lars-blogger.Syndication_Feed#

    - XML + XML
    Index: openacs-4/packages/lars-blogger/www/admin/migrate-categories.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lars-blogger/www/admin/migrate-categories.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/lars-blogger/www/admin/migrate-categories.adp 8 Aug 2006 21:26:58 -0000 1.2 +++ openacs-4/packages/lars-blogger/www/admin/migrate-categories.adp 9 Nov 2008 23:29:27 -0000 1.3 @@ -6,12 +6,11 @@ #lars-blogger.lt_Proceed_only_if_you_a#

    - +
    +

    #lars-blogger.lt_Migration_Script_Sour#

    -
     @meat;noquote@
    -
    Index: openacs-4/packages/lorsm-portlet/lorsm-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/lorsm-portlet/lorsm-portlet.info,v diff -u -r1.10 -r1.11 --- openacs-4/packages/lorsm-portlet/lorsm-portlet.info 17 Oct 2008 10:58:15 -0000 1.10 +++ openacs-4/packages/lorsm-portlet/lorsm-portlet.info 9 Nov 2008 23:29:27 -0000 1.11 @@ -9,7 +9,7 @@ Ernie Ghiglione - 2008-09-16 + 2008-10-18 OpenACS Index: openacs-4/packages/new-portal/new-portal.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/new-portal.info,v diff -u -r1.33 -r1.34 --- openacs-4/packages/new-portal/new-portal.info 4 Mar 2008 20:49:49 -0000 1.33 +++ openacs-4/packages/new-portal/new-portal.info 9 Nov 2008 23:29:27 -0000 1.34 @@ -8,14 +8,14 @@ t portal - + OpenACS Portals. - 2008-01-08 + 2008-10-18 OpenACS New Portal Package aka NPP. Portals are used to aggregate content from different sources within a single page. Props to Ian Baker for "Portal". - + Index: openacs-4/packages/new-portal/catalog/new-portal.es_ES.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/catalog/new-portal.es_ES.ISO-8859-1.xml,v diff -u -r1.14 -r1.15 --- openacs-4/packages/new-portal/catalog/new-portal.es_ES.ISO-8859-1.xml 10 Dec 2007 09:12:37 -0000 1.14 +++ openacs-4/packages/new-portal/catalog/new-portal.es_ES.ISO-8859-1.xml 9 Nov 2008 23:29:27 -0000 1.15 @@ -22,6 +22,8 @@ Administrar Portlets Personalizados No hay portlets en esta p�gina Ninguno. No puede a�adir portlets a esta p�gina ya que est�n siendo utilizados todos. + Nota: por favor, sea paciente + Revertir todos los portales a esta plantilla Volver a la configuraci�n por defecto Debe especificar un t�tulo para la p�gina. Mover abajo @@ -42,6 +44,7 @@ Borrar el portlet Renombrar p�gina Volver a configuraci�n por defecto + Revertir todo Mostrar esta p�gina Composici�n a 1 columna Sencilla a 1 columna Index: openacs-4/packages/new-portal/tcl/portal-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.tcl,v diff -u -r1.186 -r1.187 --- openacs-4/packages/new-portal/tcl/portal-procs.tcl 11 Mar 2008 19:31:30 -0000 1.186 +++ openacs-4/packages/new-portal/tcl/portal-procs.tcl 9 Nov 2008 23:29:27 -0000 1.187 @@ -406,39 +406,37 @@ set template " -

    - $return_text -

    " +

    $return_text

    " # # Theme selection chunk # set theme_chunk "
    - - - [_ new-portal.Change_Theme] -
    " +
    +
    +

    [_ new-portal.Change_Theme]

    " + set current_theme_id [portal::get_theme_id -portal_id $portal_id] foreach theme [get_theme_info_not_cached] { set theme_id [ns_set get $theme theme_id] set name [ns_set get $theme name] set description [ns_set get $theme description] - append theme_chunk "
    " } - append theme_chunk "" + append theme_chunk "
    " if {$allow_theme_change_p} { append template "$theme_chunk" } @@ -464,7 +462,7 @@ set tab_toggle_label [lang::util::localize "\#new-portal.Hide_in_main_navigation\#"] } - append template "" + append template "
    " # # Page rename chunk @@ -477,25 +475,25 @@ - @@ -529,7 +527,7 @@ append template " - Index: openacs-4/packages/photo-album/www/base-photo.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/base-photo.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/photo-album/www/base-photo.adp 28 Mar 2004 14:39:33 -0000 1.4 +++ openacs-4/packages/photo-album/www/base-photo.adp 9 Nov 2008 23:29:28 -0000 1.5 @@ -5,7 +5,7 @@ @photo_id@ @photo_nav_html;noquote@
    -@title@ +@title@

    @caption@
    @@ -18,4 +18,3 @@ - Index: openacs-4/packages/photo-album/www/clipboard-view.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/clipboard-view.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/photo-album/www/clipboard-view.adp 18 Nov 2003 18:27:53 -0000 1.3 +++ openacs-4/packages/photo-album/www/clipboard-view.adp 9 Nov 2008 23:29:28 -0000 1.4 @@ -12,11 +12,11 @@
    - - - - - + + + + + @@ -38,7 +38,7 @@
    - @images.caption@ @images.taken@ + @images.caption@ @images.taken@
    Index: openacs-4/packages/photo-album/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/index.adp,v diff -u -r1.7 -r1.8 --- openacs-4/packages/photo-album/www/index.adp 24 Feb 2005 11:02:33 -0000 1.7 +++ openacs-4/packages/photo-album/www/index.adp 9 Nov 2008 23:29:28 -0000 1.8 @@ -38,13 +38,13 @@     - + - + +@child.name@
    @child.description@
    -
    - - - - - - + +
    +
    +
    +
    +
    +
    - - - - - +
    +
    +
    +
    +
    + \"\"
    - +
    " } @@ -601,16 +599,16 @@ set layout_id [ns_set get $layout layout_id] set layout_name [ns_set get $layout layout_name] set layout_description [ns_set get $layout layout_description] - set one_layout_chunk " $layout_name - $layout_description" - append layout_chunk "" } @@ -619,16 +617,13 @@ " @@ -658,13 +653,13 @@ @@ -680,12 +675,12 @@ @@ -699,14 +694,14 @@ Index: openacs-4/packages/new-portal/www/place-element-other-page.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/place-element-other-page.adp,v diff -u -r1.10 -r1.11 --- openacs-4/packages/new-portal/www/place-element-other-page.adp 23 Oct 2003 12:29:00 -0000 1.10 +++ openacs-4/packages/new-portal/www/place-element-other-page.adp 9 Nov 2008 23:29:27 -0000 1.11 @@ -18,20 +18,21 @@ %> - - - + +
    +
    - - - +
    +
    +
    +
    - +
    Index: openacs-4/packages/new-portal/www/place-element.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/place-element.adp,v diff -u -r1.45 -r1.46 --- openacs-4/packages/new-portal/www/place-element.adp 15 May 2007 20:14:48 -0000 1.45 +++ openacs-4/packages/new-portal/www/place-element.adp 9 Nov 2008 23:29:27 -0000 1.46 @@ -23,9 +23,9 @@
    - - - +
    +
    +
    @@ -39,7 +39,7 @@ [ - #new-portal.remove# + #new-portal.remove# ] @@ -48,7 +48,7 @@ [ - #new-portal.move_up# + #new-portal.move_up# ] @@ -57,7 +57,7 @@ [ - #new-portal.move_down# + #new-portal.move_down# ] @@ -68,7 +68,7 @@ [ - #new-portal.move_right# + #new-portal.move_right# ] @@ -77,13 +77,13 @@ [ - #new-portal.move_left# + #new-portal.move_left# ] [ - #new-portal.move_right# + #new-portal.move_right# ] @@ -92,7 +92,7 @@ [ - #new-portal.move_left# + #new-portal.move_left# ] Index: openacs-4/packages/new-portal/www/show-here.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/show-here.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/new-portal/www/show-here.adp 15 May 2007 20:14:48 -0000 1.5 +++ openacs-4/packages/new-portal/www/show-here.adp 9 Nov 2008 23:29:27 -0000 1.6 @@ -7,16 +7,20 @@
    - - - - - - - +
    +
    +
    +
    +
    +
    +
    + @show_html;noquote@ - - + +
    +
    + +
    Index: openacs-4/packages/new-portal/www/admin/portal-config.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/admin/portal-config.adp,v diff -u -r1.11 -r1.12 --- openacs-4/packages/new-portal/www/admin/portal-config.adp 13 Jan 2005 13:58:25 -0000 1.11 +++ openacs-4/packages/new-portal/www/admin/portal-config.adp 9 Nov 2008 23:29:27 -0000 1.12 @@ -28,8 +28,6 @@ @rendered_page;noquote@
    -

    #new-portal.Custom_Portlets#

    #new-portal.lt_-_Note_custom_portlet# +

    #new-portal.Custom_Portlets#

    +

    #new-portal.lt_-_Note_custom_portlet#

    - - - Index: openacs-4/packages/new-portal/www/layouts/simple1.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/layouts/simple1.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/new-portal/www/layouts/simple1.adp 9 Aug 2002 20:56:30 -0000 1.5 +++ openacs-4/packages/new-portal/www/layouts/simple1.adp 9 Nov 2008 23:29:27 -0000 1.6 @@ -22,7 +22,7 @@
    -
    +
    [_ new-portal.lt_No_Elements_on_this_p]
    [export_vars -form { portal_id page_id return_url { anchor $page_id } }] - +
    -
    +

    - - [_ new-portal.Change_page_layout] -
    - - - - +

    [_ new-portal.Change_page_layout]

    +
    +
    +
    +
    $layout_chunk - -     +
    - - - -
    +
    +
    +
    +
    -
    +
    - - +
    +

    [_ new-portal.lt_Revert_the_entire_por]

    -
    +
    -
    +
    - - +
    +

    [_ new-portal.lt_Revert_all_portals_us]

    -
    +
    -
    +
    [_ new-portal.lt_Note_Please_be_patien] -
    +
    - - - - Index: openacs-4/packages/news/news.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/news.info,v diff -u -r1.26 -r1.27 --- openacs-4/packages/news/news.info 27 Jun 2007 22:29:19 -0000 1.26 +++ openacs-4/packages/news/news.info 9 Nov 2008 23:29:27 -0000 1.27 @@ -7,7 +7,7 @@ ff - + OpenACS Used for announcements and news items. 2007-06-15 @@ -16,12 +16,12 @@ 0 #news.News# - - + + - + - + Index: openacs-4/packages/news/catalog/news.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/catalog/news.en_US.ISO-8859-1.xml,v diff -u -r1.23 -r1.24 --- openacs-4/packages/news/catalog/news.en_US.ISO-8859-1.xml 10 Dec 2007 09:12:37 -0000 1.23 +++ openacs-4/packages/news/catalog/news.en_US.ISO-8859-1.xml 9 Nov 2008 23:29:27 -0000 1.24 @@ -36,6 +36,7 @@ Going live in %n_days_until_publish% days, scheduled for archive in %n_days_until_archive% days History HTML + Image Image must be one of the following types: It will go live on It will move into the archive on @@ -98,7 +99,7 @@ Preview news item Publication Date Publish - + Incorrect publish date Published Published, not scheduled for archive Published, archived in %n_days_until_archive% days Index: openacs-4/packages/news/catalog/news.es_ES.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/catalog/news.es_ES.ISO-8859-1.xml,v diff -u -r1.16 -r1.17 --- openacs-4/packages/news/catalog/news.es_ES.ISO-8859-1.xml 10 Dec 2007 09:12:37 -0000 1.16 +++ openacs-4/packages/news/catalog/news.es_ES.ISO-8859-1.xml 9 Nov 2008 23:29:27 -0000 1.17 @@ -36,6 +36,7 @@ Ser� publicada en %n_days_until_publish% d�as, agendada para archivar en %n_days_until_archive% d�as Hist�rico HTML + Image La imagen debe ser de algunos de los tipos siguientes: Saldr� publicado el Se mover� al archivo el @@ -94,6 +95,7 @@ Vista previa de la noticia Fecha de publicaci�n Publicar + Fecha de publicaci�n incorrecta Publicado Publicada, no agendada para archivar Publicada, se archivar� en %n_days_until_archive% d�as Index: openacs-4/packages/news/lib/latest-news.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/lib/latest-news.adp,v diff -u -r1.1 -r1.2 --- openacs-4/packages/news/lib/latest-news.adp 27 Jan 2005 15:13:35 -0000 1.1 +++ openacs-4/packages/news/lib/latest-news.adp 9 Nov 2008 23:29:27 -0000 1.2 @@ -16,7 +16,7 @@

    @news.title@

    -

    @news.lead@
    @news.date@

    +

    @news.lead@
    @news.date@

    More news...

    Index: openacs-4/packages/news/tcl/news-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/tcl/news-procs.tcl,v diff -u -r1.27 -r1.28 --- openacs-4/packages/news/tcl/news-procs.tcl 21 Dec 2006 21:12:51 -0000 1.27 +++ openacs-4/packages/news/tcl/news-procs.tcl 9 Nov 2008 23:29:28 -0000 1.28 @@ -393,14 +393,14 @@ set html_content [ad_html_text_convert "$title\n\n$lead"] if {$html_p} { append new_content "\n\n[ad_html_text_convert -from text/html -to text/plain $body]" - append html_content "

    $body" + append html_content "

    $body" } else { append new_content "\n\n$body" - append html_content "

    [ad_html_text_convert "$body"]" + append html_content "

    [ad_html_text_convert "$body"]" } append new_content "\n\n[string repeat - 70]" append new_content "\n\n[parameter::get_from_package_key -package_key acs-kernel -parameter SystemURL][news_util_get_url $news_package_id]]item?item_id=$item_id \n\n" - append html_content "

    [ad_html_text_convert "\n [parameter::get_from_package_key -package_key acs-kernel -parameter SystemURL][news_util_get_url $news_package_id]item?item_id=$item_id"]

    " + append html_content "

    [ad_html_text_convert "\n [parameter::get_from_package_key -package_key acs-kernel -parameter SystemURL][news_util_get_url $news_package_id]item?item_id=$item_id"]

    " } # Notifies the users that requested notification for the specific news item Index: openacs-4/packages/news/www/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/index.adp,v diff -u -r1.16 -r1.17 --- openacs-4/packages/news/www/index.adp 9 Jul 2007 11:16:20 -0000 1.16 +++ openacs-4/packages/news/www/index.adp 9 Nov 2008 23:29:28 -0000 1.17 @@ -2,57 +2,16 @@ @context;noquote@ @title;noquote@ - - - + - - -

    #news.lt_There_are_no_news_ite#

    + +

    @notification_chunk;noquote@

     - - -
    #news.Search# -
    - - - -
    -     - - -

    @notification_chunk;noquote@ - - -

    @news_items.publish_date@: @news_items.publish_title@ -
    @news_items.publish_lead@

    - - - -

    #rss-support.Syndication_Feed# Subscribe via RSS

     - -

    @pagination_link;noquote@

    -     - - + +

    + + Subscribe via RSS + #rss-support.Syndication_Feed# + +

    - - - - - - - -
      -
    • @view_switch_link;noquote@
      • -
    -     - - - - Index: openacs-4/packages/news/www/index.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/index.tcl,v diff -u -r1.15 -r1.16 --- openacs-4/packages/news/www/index.tcl 15 Dec 2006 22:45:38 -0000 1.15 +++ openacs-4/packages/news/www/index.tcl 9 Nov 2008 23:29:28 -0000 1.16 @@ -10,8 +10,8 @@ } { - {start:integer "1"} {view:trim "live"} + page:optional } -properties { @@ -21,10 +21,6 @@ news_admin_p:onevalue news_create_p:onevalue news_items:multirow - allow_search_p:onevalue - pagination_link:onevalue - item_create_link:onevalue - view_switch_link:onevalue } @@ -34,92 +30,77 @@ set context {} +set actions_list [list] -# switches for privilege-enabled links: admin for news_admin, submit for registered users -set news_admin_p [ad_permission_p $package_id news_admin] -set news_create_p [ad_permission_p $package_id news_create] - - -# switch for showing interface to site-wide-search for news -set allow_search_p [parameter::get -package_id $package_id -parameter ShowSearchInterfaceP -default 1] -set search_url [site_node_closest_ancestor_package_url -package_key search -default ""] - # view switch in live | archived news if { [string equal "live" $view] } { set title [apm_instance_name_from_id $package_id] set view_clause [db_map view_clause_live] - if { [db_string archived_p " - select decode(count(*),0,0,1) - from news_items_approved - where publish_date < sysdate - and archive_date < sysdate - and package_id = :package_id"]} { - set view_switch_link "[_ news.Show_archived_news]" - } else { - set view_switch_link "" + if { [db_string archived_p {}]} { + lappend actions_list [_ news.Show_archived_news] \ + [export_vars -base [ad_conn url] {{view archive}}] \ + [_ news.Show_archived_news] } } else { set title [apm_instance_name_from_id $package_id] set view_clause [db_map view_clause_archived] - if { [db_string live_p " - select decode(count(*),0,0,1) - from news_items_approved - where publish_date < sysdate - and (archive_date is null - or archive_date > sysdate) - and package_id = :package_id"] } { - set view_switch_link "[_ news.Show_live_news]" - } else { - set view_switch_link "" - } + if { [db_string live_p {}] } { + lappend actions_list [_ news.Show_live_news] \ + [export_vars -base [ad_conn url] {{view live}}] \ + [_ news.Show_live_news] + } } +# switches for privilege-enabled links: admin for news_admin, submit for registered users +set news_admin_p [ad_permission_p $package_id news_admin] +set news_create_p [ad_permission_p $package_id news_create] -set max_dspl [ad_parameter DisplayMax "news" 10] - -# make list of approved news items, paging included -set count 0 - -# use template::query to limit result to allowed number of rows. - -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"] +if { $news_admin_p } { + lappend actions_list [_ news.Create_a_news_item] \ + "item-create" \ + [_ news.Create_a_news_item] + lappend actions_list [_ news.Administer] \ + "admin/" \ + [_ news.Administer] +} else { + if { $news_create_p } { + lappend actions_list [_ news.Submit_a_news_item] \ + "item-create" \ + [_ news.Submit_a_news_item] + } } -# make paging links -if { $count < [expr $start + $max_dspl] } { - set next_start "" -} else { - set next_start "Next" -} +# build the multirow for the list -if { $start == 1 } { - set prev_start "" -} else { - set prev_start "Previous" +db_multirow -extend { publish_date news_item_url } news_items item_list {} { + set publish_date [lc_time_fmt $publish_date_ansi "%q"] + set news_item_url [export_vars -base "item" {item_id}] } -if { ![empty_string_p $next_start] && ![empty_string_p $prev_start] } { - set divider " | " -} else { - set divider "" +# TODO: pagination +set max_dspl [ad_parameter DisplayMax "news" 10] +template::list::create -name news -multirow news_items -actions $actions_list -no_data [_ news.lt_There_are_no_news_ite] -elements { + publish_date { + label "[_ news.Release_Date]" + } + publish_title { + label "[_ news.Title]" + display_col publish_title + link_url_col news_item_url + link_html {title "#news.show_content_news_items_publish_title#"} + } + publish_lead { + label "[_ news.Lead]" + } } -set pagination_link "$prev_start$divider$next_start" +# Footer links set rss_exists [rss_support::subscription_exists \ -summary_context_id $package_id \ -impl_name news] @@ -132,9 +113,3 @@ -url [ad_return_url] \ ] ad_return_template - - - - - - Index: openacs-4/packages/news/www/item-create-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/Attic/item-create-oracle.xql,v diff -u -r1.1 -r1.2 --- openacs-4/packages/news/www/item-create-oracle.xql 15 Oct 2001 13:41:03 -0000 1.1 +++ openacs-4/packages/news/www/item-create-oracle.xql 9 Nov 2008 23:29:28 -0000 1.2 @@ -3,11 +3,12 @@ oracle8.1.6 - - - select sysdate + [ad_parameter ActiveDays "news" 14] from dual - - + + + select to_char(sysdate + [ad_parameter ActiveDays "news" 14], 'YYYY-MM-DD') as date_proj, + to_char(sysdate, 'YYYY-MM-DD') as date_today + from dual + + - Index: openacs-4/packages/news/www/item-create-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/Attic/item-create-postgresql.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/news/www/item-create-postgresql.xql 18 Aug 2003 10:40:55 -0000 1.2 +++ openacs-4/packages/news/www/item-create-postgresql.xql 9 Nov 2008 23:29:28 -0000 1.3 @@ -3,11 +3,12 @@ postgresql7.1 - - - select to_char(current_timestamp + interval '[ad_parameter ActiveDays "news" 14] days', 'YYYY-MM-DD') - - + + + select + to_char(current_timestamp + interval '[ad_parameter ActiveDays "news" 14] days', 'YYYY-MM-DD') as date_proj, + to_char(current_timestamp, 'YYYY-MM-DD') as date_today + + - Index: openacs-4/packages/news/www/item-create.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/item-create.adp,v diff -u -r1.10 -r1.11 --- openacs-4/packages/news/www/item-create.adp 15 May 2007 20:14:50 -0000 1.10 +++ openacs-4/packages/news/www/item-create.adp 9 Nov 2008 23:29:28 -0000 1.11 @@ -5,50 +5,4 @@

    @title;noquote@

    -

    Use the following form to define your news item.Note that the fields marked with * are required. -When you're done click 'Preview' to see how the news item will look and to choose an image for the article.

    - - -
    - -

    *

    -

    - -

    -

    - -

    *

    -


    -
     -


     -#news.The_text_is_formatted_as#   - checked>   - checked> -

    - - -

    -

    @publish_date_select;noquote@

    - -

    -

    @archive_date_select;noquote@
    - checked> #news.show_it_permanently#

    -

    -     - -

    - - -

    - - - - - - - - - - - - + Index: openacs-4/packages/news/www/item-create.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/item-create.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/news/www/item-create.tcl 24 Feb 2005 18:03:05 -0000 1.4 +++ openacs-4/packages/news/www/item-create.tcl 9 Nov 2008 23:29:28 -0000 1.5 @@ -41,18 +41,56 @@ set title "[_ news.Create_News_Item]" set context [list $title] -if { ![empty_string_p $archive_date_ansi] } { - set proj_archival_date $archive_date_ansi -} else { - set proj_archival_date [db_string week "select sysdate + [ad_parameter ActiveDays news 14] from dual"] -} +set lc_format [lc_get formbuilder_date_format] -set publish_date_select [dt_widget_datetime -default $publish_date_ansi publish_date days] -set archive_date_select [dt_widget_datetime -default $proj_archival_date archive_date days] +db_1row get_dates {} -ad_return_template +if { $publish_date_ansi eq "" || $publish_date_ansi eq "now"} { + set publish_date_ansi $date_today +} +if { $archive_date_ansi eq "" } { + set archive_date_ansi $date_proj +} +ad_form -name "news" -action "preview" -html {enctype "multipart/form-data"} -form { + {action:text(hidden) + {value "News Item"}} + {publish_title:text(text) + {label "[_ news.Title]"} + {html {maxlength 400 size 61}} + {value $publish_title}} + {publish_lead:text(textarea),optional + {label "[_ news.Lead]"} + {html {cols 60 rows 3}} + {value $publish_lead}} + {publish_body:text(textarea),optional + {label "[_ news.Body]"} + {html {cols 60 rows 20}} + {value $publish_body}} + {text_file:text(file),optional + {label "[_ news.or_upload_text_file]"}} + {html_p:text(radio) + {label "[_ news.The_text_is_formatted_as]"} + {options {{"#news.Plain_text#" f} {"#news.HTML#" t}}} + {value $html_p}} +} +if { $immediate_approve_p } { + ad_form -extend -name "news" -form { + {publish_date:date,optional + {label "[_ news.Release_Date]"} + {value "[split $publish_date_ansi -]"} + {format {$lc_format}} + } + {archive_date:date,optional + {label "[_ news.Archive_Date]"} + {value "[split $archive_date_ansi -]"} + {format {$lc_format}} + } + {Permanent_p:text(checkbox),optional + {label "[_ news.never]"} + {options {{"#news.show_it_permanently#" t}}}} + } +} - - +ad_return_template Index: openacs-4/packages/news/www/item-postgresql.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/Attic/item-postgresql.xql,v diff -u -r1.5 -r1.6 --- openacs-4/packages/news/www/item-postgresql.xql 8 Aug 2006 21:27:04 -0000 1.5 +++ openacs-4/packages/news/www/item-postgresql.xql 9 Nov 2008 23:29:28 -0000 1.6 @@ -17,4 +17,12 @@ + + + select content + from cr_revisions + where revision_id = :live_revision + + + Index: openacs-4/packages/news/www/item.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/item.adp,v diff -u -r1.14 -r1.15 --- openacs-4/packages/news/www/item.adp 15 May 2007 20:14:50 -0000 1.14 +++ openacs-4/packages/news/www/item.adp 9 Nov 2008 23:29:28 -0000 1.15 @@ -3,10 +3,7 @@ @context;noquote@

    @title;noquote@

    - -

    #news.lt_Could_not_find_the_re#

    -     - + -
      - -
    • @comment_link;noquote@
      • -       - -
    • @edit_link;noquote@
      • -       -
    - -     - - - - - + +
    +
      +
    • @footer_links;noquote@
      • +
    +
    +     \ No newline at end of file Index: openacs-4/packages/news/www/item.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/item.tcl,v diff -u -r1.15 -r1.16 --- openacs-4/packages/news/www/item.tcl 15 May 2007 20:14:50 -0000 1.15 +++ openacs-4/packages/news/www/item.tcl 9 Nov 2008 23:29:28 -0000 1.16 @@ -35,17 +35,8 @@ # live view of a news item in its active revision -set item_exist_p [db_0or1row one_item " -select item_id, - live_revision, - publish_title, - html_p, - publish_date, - '' || item_creator || '' as creator_link -from news_items_live_or_submitted -where item_id = :item_id"] +set item_exist_p [db_0or1row one_item {}] - if { $item_exist_p } { # workaround to get blobs with >4000 chars into a var, content.blob_to_string fails! @@ -54,70 +45,53 @@ # RAL: publish_body is already snagged in the 1st query above for postgres. # set get_content [db_map get_content] - if {![string match "" $get_content]} { - set publish_body [db_string get_content "select content - from cr_revisions - where revision_id = :live_revision"] + if { $get_content ne "" } { + set publish_body [db_string get_content {}] } # text-only body - if {[info exists html_p] && [string equal $html_p "f"]} { - set publish_body [ad_text_to_html -- $publish_body] + if { !$html_p } { + set publish_body "

    [ad_text_to_html -- $publish_body]

    " } + # Footer actions + set footer_links [list] + if { [ad_parameter SolicitCommentsP "news" 0] && [ad_permission_p $item_id general_comments_create] } { - set comment_link [general_comments_create_link $item_id "[ad_conn package_url]item?item_id=$item_id"] - set comments [general_comments_get_comments -print_content_p 1 -print_attachments_p 1 \ - $item_id "[ad_conn package_url]item?item_id=$item_id"] + + lappend footer_links [general_comments_create_link \ + -link_attributes { class="button" } \ + $item_id \ + "[ad_conn package_url]item?item_id=$item_id"] + + set comments [general_comments_get_comments \ + -print_content_p 1 \ + -print_attachments_p 1 \ + $item_id "[ad_conn package_url]item?item_id=$item_id"] } else { - set comment_link "" set comments "" } if {[permission::permission_p -object_id $item_id -privilege write] } { - set edit_link "[_ news.Revise]" - } else { - set edit_link "" + lappend footer_links "[_ news.Revise]" } + set footer_links [join $footer_links "\n
  • "] set title $publish_title set context [list $title] set publish_title {} set image_id [news_get_image_id $item_id] set publish_image "" - if {![empty_string_p $image_id]} { + if { $image_id ne "" } { set image_url "image/$image_id" set publish_image $image_url - ns_log Notice "$image_url" + ns_log Debug "$image_url" } } else { - set context {} - set title "[_ news.Error]" + set title [_ news.Error] + set contect [list $title] + ad_return_complaint 1 [_ news.lt_Could_not_find_the_re] } - - - - - - - - - - - - - - - - - - - - - - - - Index: openacs-4/packages/news/www/news.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/news.adp,v diff -u -r1.7 -r1.8 --- openacs-4/packages/news/www/news.adp 26 Mar 2005 13:49:55 -0000 1.7 +++ openacs-4/packages/news/www/news.adp 9 Nov 2008 23:29:28 -0000 1.8 @@ -1,5 +1,5 @@ This is the default template to render news items in admin/. Comments are not shown here -

    @publish_title@

     +

    @publish_title@

     News image

    @publish_lead@
    @publish_body;noquote@
    Index: openacs-4/packages/news/www/preview.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/preview.adp,v diff -u -r1.10 -r1.11 --- openacs-4/packages/news/www/preview.adp 15 May 2007 20:14:50 -0000 1.10 +++ openacs-4/packages/news/www/preview.adp 9 Nov 2008 23:29:28 -0000 1.11 @@ -29,16 +29,18 @@ creator_link = @creator_link;noquote@> -

    +

    @form_action;noquote@ - @hidden_vars;noquote@ - - +
    @hidden_vars;noquote@
    +
    + - @edit_action;noquote@ @image_vars;noquote@ - + @edit_action;noquote@ +
    @image_vars;noquote@
    +
    +     -

    +
    Index: openacs-4/packages/news/www/preview.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/preview.tcl,v diff -u -r1.18 -r1.19 --- openacs-4/packages/news/www/preview.tcl 4 Mar 2008 13:08:38 -0000 1.18 +++ openacs-4/packages/news/www/preview.tcl 9 Nov 2008 23:29:28 -0000 1.19 @@ -171,10 +171,10 @@ } if { ![template::util::date::validate $publish_date_ansi ""] } { - set publish_date_pretty [lc_time_fmt $publish_date_ansi "%x"] + set publish_date_pretty [lc_time_fmt $publish_date_ansi "%Q"] } if { ![template::util::date::validate $archive_date_ansi ""] } { - set archive_date_pretty [lc_time_fmt $archive_date_ansi "%x"] + set archive_date_pretty [lc_time_fmt $archive_date_ansi "%Q"] } if { [dt_interval_check $archive_date_ansi $publish_date_ansi] >= 0 } { @@ -212,8 +212,8 @@ set image_vars [export_form_vars publish_title publish_lead publish_body \ publish_date_ansi archive_date_ansi html_p \ permanent_p action] - set form_action "
    " - set edit_action "" + set form_action "" + set edit_action "" } else { @@ -223,8 +223,8 @@ set image_vars [export_form_vars publish_title publish_lead publish_body \ publish_date_ansi archive_date_ansi html_p \ permanent_p action item_id revision_log] - set form_action "" - set edit_action "" + set form_action "" + set edit_action "" } # creator link Index: openacs-4/packages/news/www/admin/approve.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/approve.adp,v diff -u -r1.8 -r1.9 --- openacs-4/packages/news/www/admin/approve.adp 24 Feb 2005 18:03:05 -0000 1.8 +++ openacs-4/packages/news/www/admin/approve.adp 9 Nov 2008 23:29:28 -0000 1.9 @@ -34,7 +34,7 @@

    @publish_date_select;noquote@

    -

    @archive_date_select;noquote@
    +

    @archive_date_select;noquote@
    #news.show_it_permanently#

    Index: openacs-4/packages/news/www/admin/index.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/index.adp,v diff -u -r1.15 -r1.16 --- openacs-4/packages/news/www/admin/index.adp 15 May 2007 20:14:50 -0000 1.15 +++ openacs-4/packages/news/www/admin/index.adp 9 Nov 2008 23:29:28 -0000 1.16 @@ -4,10 +4,10 @@ @title;noquote@

    @@ -39,9 +39,9 @@

    • - - - + + + Index: openacs-4/packages/news/www/admin/item.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/item.adp,v diff -u -r1.7 -r1.8 --- openacs-4/packages/news/www/admin/item.adp 24 Feb 2005 18:03:05 -0000 1.7 +++ openacs-4/packages/news/www/admin/item.adp 9 Nov 2008 23:29:28 -0000 1.8 @@ -2,60 +2,4 @@ @context;noquote@@title;noquote@ - - -

    #news.Add_a_new_revision#

    - -
    +
    + + +
    - @name;noquote@ @name;noquote@ - @@ -78,11 +76,11 @@

    - +
    - +
    @news_items.item_id@@news_items.publish_title@ (#news.rev# @news_items.revision_no@) #news.revise#@news_items.item_creator@@news_items.item_id@@news_items.publish_title@ (#news.rev# @news_items.revision_no@) #news.revise#@news_items.item_creator@ @news_items.publish_date_pretty@ @news_items.archive_date_pretty@ @news_items.pretty_status@
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Revision ##news.Active_Revision##news.Title##news.Author##news.Log_Entry##news.Status#
    - - <%= [expr @item:rowcount@ - @item.rownum@ +1] %> - - #news.active# - - - - #news.make_active# - - - @item.publish_title@@item.item_creator@@item.log_entry@@item.status@ - - | #news.approve# - - - | #news.revoke# - -
    - - - - - + Index: openacs-4/packages/news/www/admin/item.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/item.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/news/www/admin/item.tcl 23 Aug 2003 22:25:11 -0000 1.4 +++ openacs-4/packages/news/www/admin/item.tcl 9 Nov 2008 23:29:28 -0000 1.5 @@ -34,33 +34,69 @@ set title "[_ news.One_Item]" set context [list $title] +set return_url [export_vars -base "item" {item_id}] # get revisions of the item -db_multirow item item_revs_list { -select - item_id, - revision_id, - live_revision as item_live_revision_id, - publish_title, - log_entry, - package_id, - approval_needed_p, - creation_user, - item_creator, - status -from - news_item_revisions -where - item_id = :item_id -order by revision_id desc -} +set counter 1 +db_multirow -extend {revision revision_url set_active_url active_revision author_url action action_url} item item_revs_list {} { -ad_return_template + set revision $counter + set revision_url [export_vars -base "revision" {item_id revision_id}] + if { $item_live_revision_id eq $revision_id } { + set active_revision [_ news.active] + set set_active_url "" + } else { + set active_revision [_ news.make_active] + set set_active_url [export_vars -base "revision-set-active" {item_id {new_rev_id $revision_id}}] + } + set author_url [export_vars -base "/shared/community-member" {{user_id $creation_user}}] + if { $approval_needed_p } { + set action_url [export_vars -base "approve" {return_url revision_id {n_items $item_id}}] + set action [_ news.approve] + } else { + set action_url [export_vars -base "revoke" {revision_id item_id}] + set action [_ news.revoke] + } + incr counter +} +template::multirow foreach item { + set revision [expr { $counter - $revision }] +} +template::list::create -name news_items -multirow item -actions [list [_ news.Add_a_new_revision] [export_vars -base "revision-add" {item_id}] [_ news.Add_a_new_revision]] -elements { + revision { + label "[_ news.Revision]" + link_url_col revision_url + } + active_revision { + label "[_ news.Active_Revision]" + link_url_col set_active_url + } + publish_title { + label "[_ news.Title]" + link_url_col revision_url + } + item_creator { + label "[_ news.Author]" + link_url_col author_url + } + log_entry { + label "[_ news.Log_Entry]" + } + status { + label "[_ news.Status]" + } + action { + label "[_ acs-kernel.common_Actions]" + link_url_col action_url + } +} + +ad_return_template Index: openacs-4/packages/news/www/admin/news.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/news.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/news/www/admin/news.adp 24 Feb 2005 18:03:05 -0000 1.4 +++ openacs-4/packages/news/www/admin/news.adp 9 Nov 2008 23:29:28 -0000 1.5 @@ -1,14 +1,12 @@ <% # This is the default template to render news items in admin/. Comments are not shown here %> -

    @publish_title@

    @publish_lead@

     @publish_body;noquote@

    #news.Contributed_by# @creator_link;noquote@ -

    Index: openacs-4/packages/news/www/admin/process.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/process.adp,v diff -u -r1.7 -r1.8 --- openacs-4/packages/news/www/admin/process.adp 22 Oct 2003 16:12:39 -0000 1.7 +++ openacs-4/packages/news/www/admin/process.adp 9 Nov 2008 23:29:28 -0000 1.8 @@ -4,7 +4,7 @@

    #news.Error#

    - #news.The_action# @action@ #news.lt_cannot_be_applied_to_# + #news.The_action# @action@ #news.lt_cannot_be_applied_to_#
    • @unapproved.publish_title@ - @unapproved.creation_date_pretty@ @@ -16,12 +16,12 @@ #news.lt_Manage_the_items_indi# - #news.lt_Do_you_really_want_to# @action_pretty@
      #news.lt_on_the_following_news#       + #news.lt_Do_you_really_want_to# @action_pretty@
      #news.lt_on_the_following_news#       -

      + @hidden_vars;noquote@ -
      +
      Index: openacs-4/packages/news/www/admin/revision-add-oracle.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/Attic/revision-add-oracle.xql,v diff -u -r1.3 -r1.4 --- openacs-4/packages/news/www/admin/revision-add-oracle.xql 24 Feb 2005 18:03:05 -0000 1.3 +++ openacs-4/packages/news/www/admin/revision-add-oracle.xql 9 Nov 2008 23:29:28 -0000 1.4 @@ -24,13 +24,4 @@ - - - select content -from cr_revisions -where revision_id = :revision_id - - - - Index: openacs-4/packages/news/www/admin/revision-add.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/revision-add.adp,v diff -u -r1.10 -r1.11 --- openacs-4/packages/news/www/admin/revision-add.adp 15 May 2007 20:14:50 -0000 1.10 +++ openacs-4/packages/news/www/admin/revision-add.adp 9 Nov 2008 23:29:28 -0000 1.11 @@ -4,57 +4,4 @@

      @title;noquote@

      -

      #news.Use_the_following_form_to_define#

      - -
      -@hidden_vars;noquote@ - -

      *

      -

      - -

      -

      - -

      *

      -


      -
       -


       -#news.The_text_is_formatted_as#   - -   - - - -   - - -

      - -

      Image

      -

      - [#news.use_preview_to_revise_image#] -

      - -

      #news.Release_Date#

      -

      @publish_date_select;noquote@

      - -

      #news.Archive_Date#

      -

      @archive_date_select;noquote@
      - #news.show_it_permanently#

      - -

      *

      -

      - - - -

      -

      -
      - - - - - - - - + Index: openacs-4/packages/news/www/admin/revision-add.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/revision-add.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/news/www/admin/revision-add.tcl 24 Feb 2005 18:03:05 -0000 1.6 +++ openacs-4/packages/news/www/admin/revision-add.tcl 9 Nov 2008 23:29:28 -0000 1.7 @@ -29,69 +29,80 @@ hidden_vars:onevalue } -db_1row news_item_info { - select - item_name, - creator_id, - item_creator - from - news_item_full_active - where item_id = :item_id -} +db_1row news_item_info {} -set title "Add revision" +set title [_ news.Add_a_new_revision] set context [list $title] # get active revision of news item -db_1row item " -select - item_id, - package_id, - revision_id, - publish_title, - publish_lead, - html_p, - publish_date, - NVL(archive_date, sysdate+[ad_parameter ActiveDays "news" 14]) as archive_date, - status -from - news_item_full_active -where - item_id = :item_id" +db_1row item {} # workaround to get blobs with >4000 chars into a var, content.blob_to_string fails! # when this'll work, you get publish_body by selecting 'publish_body' directly from above view # set get_content [db_map get_content] -if {![string match $get_content ""]} { - set publish_body [db_string get_content "select content - from cr_revisions - where revision_id = :revision_id"] +if { $get_content ne "" } { + set publish_body [db_string get_content {}] } +set lc_format [lc_get formbuilder_date_format] -set never_checkbox "" - - -set publish_date_select [dt_widget_datetime -default $publish_date publish_date days] -set archive_date_select [dt_widget_datetime -default $archive_date archive_date days] - - set action "[_ news.Revision]" -set hidden_vars [export_form_vars item_id action] set image_id [news_get_image_id $item_id] -if {![empty_string_p $image_id]} { set image_url "../image/$image_id" } +set image_html "" +if { $image_id ne "" } { + set image_url "../image/$image_id" + set image_html [subst {
      }] +} -ad_return_template +ad_form -name "news_revision" -export {item_id action} -html {enctype "multipart/form-data"} -action "../preview" -form { + {publish_title:text(text) + {label "[_ news.Title]"} + {html {size 61 maxlength 400}} + {value $publish_title} + } + {publish_lead:text(textarea),optional + {label "[_ news.Lead]"} + {html {cols 60 rows 3}} + {value $publish_lead} + } + {publish_body:text(textarea),optional + {label "[_ news.Body]"} + {html {cols 60 rows 20}} + {value $publish_body} + } + {text_file:file(file),optional + {label "[_ news.or_upload_text_file]"} + } + {html_p:text(radio) + {label "[_ news.The_text_is_formatted_as]"} + {options {{"#news.Plain_text#" f} {"#news.HTML#" t}}} + {value $html_p} + } + {news_image:text(inform) + {label "[_ news.Image]"} + {value "[_ news.use_preview_to_revise_image]\n$image_html"} + } + {publish_date:date,optional + {label "[_ news.Release_Date]"} + {value "[split $publish_date -]"} + {format {$lc_format}} + } + {archive_date:date,optional + {label "[_ news.Archive_Date]"} + {value "[split $archive_date -]"} + {format {$lc_format}} + } + {permanent_p:text(checkbox),optional + {label "[_ news.never]"} + {options {{"#news.show_it_permanently#" t}}} + } + {revision_log:text(text) + {label "[_ news.Revision_log]"} + {html {size 61 maxlength 400}} + } +} - - - - - +ad_return_template Index: openacs-4/packages/news/www/admin/revision-add.xql =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/revision-add.xql,v diff -u -r1.2 -r1.3 --- openacs-4/packages/news/www/admin/revision-add.xql 16 Oct 2001 10:10:19 -0000 1.2 +++ openacs-4/packages/news/www/admin/revision-add.xql 9 Nov 2008 23:29:28 -0000 1.3 @@ -1,7 +1,7 @@ - + select @@ -13,7 +13,14 @@ where item_id = :item_id - + + + + select content + from cr_revisions + where revision_id = :revision_id + + Index: openacs-4/packages/news/www/admin/revision.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/revision.adp,v diff -u -r1.7 -r1.8 --- openacs-4/packages/news/www/admin/revision.adp 24 Feb 2005 18:03:05 -0000 1.7 +++ openacs-4/packages/news/www/admin/revision.adp 9 Nov 2008 23:29:28 -0000 1.8 @@ -3,18 +3,14 @@ @title;noquote@ - -

      #news.lt_Could_not_find_corres#

      -       -

      - #news.Author#: @creator_link;noquote@
      - #news.Revision_number#: @revision_no@
      - #news.Creation_Date#: @creation_date@
      - #news.Creation_IP#: @creation_ip@
      - #news.Release_Date#: @publish_date@
      - #news.Archive_Date#: @archive_date@ + #news.Author#: @creator_link;noquote@
      + #news.Revision_number#: @revision_no@
      + #news.Creation_Date#: @creation_date_pretty@
      + #news.Creation_IP#: @creation_ip@
      + #news.Release_Date#: @publish_date_pretty@
      + #news.Archive_Date#: @archive_date_pretty@

      -       - - - - - - - - - - - - - - - - - - - - - - - - - - - - Index: openacs-4/packages/news/www/admin/revision.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news/www/admin/revision.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/news/www/admin/revision.tcl 24 Feb 2005 18:03:05 -0000 1.7 +++ openacs-4/packages/news/www/admin/revision.tcl 9 Nov 2008 23:29:28 -0000 1.8 @@ -30,32 +30,16 @@ # Access a news item in a particular revision -set item_exist_p [db_0or1row one_item " - select item_id, - revision_id, - content_revision.get_number(:revision_id) as revision_no, - publish_title, - publish_lead, - html_p, - publish_date, - archive_date, - creation_ip, - creation_date, - '' || item_creator || '' as creator_link - from news_item_revisions - where item_id = :item_id - and revision_id = :revision_id"] +set item_exist_p [db_0or1row one_item {}] if { $item_exist_p } { # workaround to get blobs with >4000 chars into a var, content.blob_to_string fails! # when this'll work, you get publish_body by selecting 'publish_body' directly from above view # set get_content [db_map get_content] - if {![string match $get_content ""]} { - set publish_body [db_string get_content "select content - from cr_revisions - where revision_id = :revision_id"] + if { $get_content ne "" } { + set publish_body [db_string get_content {}] } # text-only body @@ -65,17 +49,19 @@ #if {[info exists html_p] && ![string equal $html_p "t"]} { # set publish_body "[ad_quotehtml $publish_body]" #} - if {[info exists html_p] && [string equal $html_p "f"]} { + if { !$html_p } { set publish_body [ad_text_to_html -- $publish_body] } - set title "Revision" + set title [_ news.Revision] set context [list [list "item?[export_vars -url item_id]" [_ news.One_Item]] $title] + + set creation_date_pretty [lc_time_fmt $creation_date %q] + set publish_date_pretty [lc_time_fmt $publish_date %q] + set archive_date_pretty [lc_time_fmt $archive_date %q] } else { - set context {} - set title "[_ news.Error]" + ad_return_complaint 1 [_ news.lt_Could_not_find_corres] } ad_return_template - Index: openacs-4/packages/news-portlet/news-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/news-portlet.info,v diff -u -r1.21 -r1.22 --- openacs-4/packages/news-portlet/news-portlet.info 8 Jan 2008 13:04:52 -0000 1.21 +++ openacs-4/packages/news-portlet/news-portlet.info 9 Nov 2008 23:29:28 -0000 1.22 @@ -7,14 +7,14 @@ f t - + OpenACS - 2008-01-08 + 2008-10-18 OpenACS - - - + + + Index: openacs-4/packages/news-portlet/www/news-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/www/news-portlet.adp,v diff -u -r1.16 -r1.17 --- openacs-4/packages/news-portlet/www/news-portlet.adp 15 May 2007 20:14:51 -0000 1.16 +++ openacs-4/packages/news-portlet/www/news-portlet.adp 9 Nov 2008 23:29:28 -0000 1.17 @@ -18,30 +18,41 @@ %> - + + +
      + +
      + @notification_chunk;noquote@ + +
      + Subscribe via RSS#rss-support.Syndication_Feed# +       +
      +
      +       + + - - - - - - - - + + + + + + + + - + #news-portlet.No_News# - #news-portlet.No_News# + + #new-portal.when_portlet_shaded# + - - - - #new-portal.when_portlet_shaded# - - -
      #news-portlet.Add_a_News_Item#       Index: openacs-4/packages/news-portlet/www/news-portlet.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/www/news-portlet.tcl,v diff -u -r1.19 -r1.20 --- openacs-4/packages/news-portlet/www/news-portlet.tcl 15 May 2007 20:14:51 -0000 1.19 +++ openacs-4/packages/news-portlet/www/news-portlet.tcl 9 Nov 2008 23:29:28 -0000 1.20 @@ -45,7 +45,17 @@ set display_subgroup_items_p [parameter::get_from_package_key -package_key news-portlet -parameter display_subgroup_items_p -default 0] set display_item_attribution_p [parameter::get_from_package_key -package_key news-portlet -parameter display_item_attribution_p -default 1] +if { $inside_comm_p } { + set package_id $config(package_id) + set rss_exists [rss_support::subscription_exists -summary_context_id $package_id -impl_name news] + set rss_url "[news_util_get_url $package_id]rss/rss.xml" + + # add news email notification + set notification_chunk [notification::display::request_widget -type one_news_item_notif -object_id $package_id -pretty_name "News" -url [ad_return_url] ] +} + if { $inside_comm_p && $display_subgroup_items_p } { + db_foreach select_subgroup_package_ids {} { set one_instance_p 0 lappend list_of_package_ids $package_id @@ -59,54 +69,36 @@ set content_column "" } -template::list::create -name news -multirow news_items -key item_id -html {width 100%} -pass_properties { - display_item_content_p - one_instance_p -} -elements { - item { - label "" - html {valign top} - display_template { - @news_items.parent_name@
       - - -

      @news_items.publish_body;noquote@

      - -

      #news-portlet.Contributed_by# @news_items.item_creator@ - - - - » @news_items.publish_title@ - @news_items.publish_date@ - - - Subscribe via RSS -
      - - } - } - action { - label "" - html {valign top} - display_template { - @news_items.notification_chunk;noquote@ - } - } -} - -db_multirow -extend { publish_date view_url rss_exists rss_url notification_chunk} news_items select_news_items {} { - set publish_date [lc_time_fmt $publish_date_ansi "%x"] +db_multirow -extend { publish_date view_url } news_items select_news_items {} { + set publish_date [lc_time_fmt $publish_date_ansi "%q"] set view_url [export_vars -base "${url}item" { item_id }] - set rss_exists [rss_support::subscription_exists -summary_context_id $package_id -impl_name news] - set rss_url "[news_util_get_url $package_id]rss/rss.xml" - # add news email notification - set notification_chunk [notification::display::request_widget -type one_news_item_notif -object_id $package_id -pretty_name "News" -url [ad_return_url] ] - + # text-only body - if {$display_item_content_p && [string equal $html_p "f"]} { + if {$display_item_content_p && $html_p eq "f" } { set publish_body "[ad_text_to_html $publish_body]" } if { $display_item_attribution_p } { set creator_url [acs_community_member_url -user_id $creation_user] } } + +set elms { + publish_date { + label "[_ news.Release_Date]" + } + publish_title { + label "[_ news.Title]" + link_url_col view_url + } +} + +if { !$inside_comm_p } { + lappend elms parent_name {label "[_ acs-kernel.Group]"} +} + +template::list::create -name news -multirow news_items -key item_id -pass_properties { + display_item_content_p + one_instance_p +} -elements $elms + + Index: openacs-4/packages/news-portlet/www/summary.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/www/summary.adp,v diff -u -r1.9 -r1.10 --- openacs-4/packages/news-portlet/www/summary.adp 15 May 2007 20:14:51 -0000 1.9 +++ openacs-4/packages/news-portlet/www/summary.adp 9 Nov 2008 23:29:28 -0000 1.10 @@ -1,9 +1,9 @@ <% # This is the default template to render news items in admin/. Comments are not shown here %>

      @publish_title@ - @publish_date@

      -
      + @publish_body;noquote@ @more_link;noquote@ +

      #news-portlet.Contributed_by# @item_creator@

       -
      Index: openacs-4/packages/news-portlet/www/summary.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/news-portlet/www/summary.tcl,v diff -u -r1.6 -r1.7 --- openacs-4/packages/news-portlet/www/summary.tcl 9 Jul 2007 11:05:38 -0000 1.6 +++ openacs-4/packages/news-portlet/www/summary.tcl 9 Nov 2008 23:29:28 -0000 1.7 @@ -76,9 +76,11 @@ set summary_length [news_portlet::get_summary_length] if { [string length $publish_body] > $summary_length } { set publish_body [string_truncate -len $summary_length -- $publish_body] - set more_link "
      » [_ news-portlet.Read_more]" + set more_link "

      » [_ news-portlet.Read_more]

      " } -set publish_body [ad_convert_to_html -html_p $html_p $publish_body] +if { !$html_p } { + set publish_body "

      [ad_html_text_convert -from "text/plain" -to "text/html" -- $publish_body]

      " +} set display_item_attribution_p [parameter::get_from_package_key -package_key news-portlet -parameter display_item_attribution_p -default 1] Index: openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl,v diff -u -r1.9 -r1.10 --- openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl 4 Mar 2008 13:20:46 -0000 1.9 +++ openacs-4/packages/oacs-dav/tcl/tDAV-procs.tcl 9 Nov 2008 23:29:28 -0000 1.10 @@ -1319,7 +1319,7 @@ # #

      Created

      #

      Collection [ns_conn url] has been created.

      -#
      +#
      #
      # " Index: openacs-4/packages/photo-album/www/album-chunk.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/album-chunk.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/photo-album/www/album-chunk.adp 18 Nov 2003 18:27:52 -0000 1.2 +++ openacs-4/packages/photo-album/www/album-chunk.adp 9 Nov 2008 23:29:28 -0000 1.3 @@ -1,19 +1,19 @@ - - + + - + - + +@child.name@
      @child.description@
      #photo-album.Name##photo-album.Description##photo-album.Name##photo-album.Description#
      @child.name@@child.name@ @child.name@@child.name@@child.name@@child.name@ -@child.name@
      @child.description@
      Index: openacs-4/packages/photo-album/www/album.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/album.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/photo-album/www/album.adp 29 Jun 2004 10:18:45 -0000 1.5 +++ openacs-4/packages/photo-album/www/album.adp 9 Nov 2008 23:29:28 -0000 1.6 @@ -19,7 +19,7 @@
    @child_photo.caption@
    +    		@child_photo.caption@
    @child_photo.caption@
    @child.name@@child.name@ @child.name@@child.name@@child.name@@child.name@ -@child.name@
    @child.description@
    Index: openacs-4/packages/photo-album/www/latest-photo.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/latest-photo.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/photo-album/www/latest-photo.adp 8 Aug 2006 21:27:09 -0000 1.2 +++ openacs-4/packages/photo-album/www/latest-photo.adp 9 Nov 2008 23:29:28 -0000 1.3 @@ -1,4 +1,4 @@ - + \ No newline at end of file Index: openacs-4/packages/photo-album/www/photo.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/photo.adp,v diff -u -r1.9 -r1.10 --- openacs-4/packages/photo-album/www/photo.adp 24 Mar 2005 20:15:38 -0000 1.9 +++ openacs-4/packages/photo-album/www/photo.adp 9 Nov 2008 23:29:28 -0000 1.10 @@ -7,17 +7,17 @@ @photo_nav_html;noquote@
    - @title@ + @title@ - @title@ + @title@
      -
    • #photo-album.thumbnail_with_link# <a href="@photo_base_url@photo?photo_id=@photo_id@"><img src="@photo_base_url@images/@path@/@thumb_image_id@" height="@thumb_height@" width="@thumb_width@" alt="@caption@" /></a> +
    • #photo-album.thumbnail_with_link# <a href="@photo_base_url@photo?photo_id=@photo_id@"><img src="@photo_base_url@images/@path@/@thumb_image_id@" height="@thumb_height@" width="@thumb_width@" alt="@caption@"></a> -
    • #photo-album.image_only# <img src="@photo_base_url@images/@path@/@title@" height="@height@" width="@width@" alt="@title@" /> +
    • #photo-album.image_only# <img src="@photo_base_url@images/@path@/@title@" height="@height@" width="@width@" alt="@title@"> -
    • #photo-album.image_with_link# <a href="@photo_base_url@photo?photo_id=@photo_id@"><img src="@photo_base_url@images/@path@/@title@" height="@height@" width="@width@" alt="@title@" /></a> +
    • #photo-album.image_with_link# <a href="@photo_base_url@photo?photo_id=@photo_id@"><img src="@photo_base_url@images/@path@/@title@" height="@height@" width="@width@" alt="@title@"></a>
    @@ -81,13 +81,13 @@ #photo-album.lt_Save_this_photo_to_pr_1# - + - + @@ -97,7 +97,7 @@ -
    #photo-album.lt_View_all_your_clipboa# +
    #photo-album.lt_View_all_your_clipboa#     Index: openacs-4/packages/photo-album/www/random-photo.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album/www/random-photo.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/photo-album/www/random-photo.adp 12 Jul 2004 14:50:05 -0000 1.2 +++ openacs-4/packages/photo-album/www/random-photo.adp 9 Nov 2008 23:29:28 -0000 1.3 @@ -1,4 +1,4 @@ - + Index: openacs-4/packages/photo-album-portlet/photo-album-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album-portlet/photo-album-portlet.info,v diff -u -r1.9 -r1.10 --- openacs-4/packages/photo-album-portlet/photo-album-portlet.info 8 Jan 2008 13:04:52 -0000 1.9 +++ openacs-4/packages/photo-album-portlet/photo-album-portlet.info 9 Nov 2008 23:29:28 -0000 1.10 @@ -7,13 +7,13 @@ f t - + Jeff Davis Xarg - 2008-01-08 - + 2008-10-18 + - + Index: openacs-4/packages/photo-album-portlet/www/photo-album-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/photo-album-portlet/www/photo-album-portlet.adp,v diff -u -r1.2 -r1.3 --- openacs-4/packages/photo-album-portlet/www/photo-album-portlet.adp 24 Feb 2005 13:33:24 -0000 1.2 +++ openacs-4/packages/photo-album-portlet/www/photo-album-portlet.adp 9 Nov 2008 23:29:28 -0000 1.3 @@ -2,7 +2,7 @@ - #photo-album-portlet.Add_photos# +

    #photo-album-portlet.Add_photos#

     Index: openacs-4/packages/profile-provider/profile-provider.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/profile-provider/profile-provider.info,v diff -u -r1.13 -r1.14 --- openacs-4/packages/profile-provider/profile-provider.info 8 Jan 2008 13:04:52 -0000 1.13 +++ openacs-4/packages/profile-provider/profile-provider.info 9 Nov 2008 23:29:28 -0000 1.14 @@ -7,12 +7,12 @@ f t - + OpenACS OpenACS - 2008-01-08 + 2008-10-18 - + Index: openacs-4/packages/random-photo-portlet/random-photo-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/random-photo-portlet/random-photo-portlet.info,v diff -u -r1.7 -r1.8 --- openacs-4/packages/random-photo-portlet/random-photo-portlet.info 8 Jan 2008 13:04:52 -0000 1.7 +++ openacs-4/packages/random-photo-portlet/random-photo-portlet.info 9 Nov 2008 23:29:28 -0000 1.8 @@ -7,12 +7,12 @@ f f - + Gerardo Morales - 2008-01-08 + 2008-10-18 - - + + Index: openacs-4/packages/random-photo-portlet/www/random-photo-portlet.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/random-photo-portlet/www/random-photo-portlet.adp,v diff -u -r1.4 -r1.5 --- openacs-4/packages/random-photo-portlet/www/random-photo-portlet.adp 15 May 2007 20:14:53 -0000 1.4 +++ openacs-4/packages/random-photo-portlet/www/random-photo-portlet.adp 9 Nov 2008 23:29:28 -0000 1.5 @@ -11,14 +11,13 @@
  • Click to find out.
      -#random-photo-portlet.Name# @full_name@
      +
    • #random-photo-portlet.Name# @full_name@
      • -About: @random_user_bio;noquote@
      +
    • About: @random_user_bio;noquote@
      •  -Groups: @random_user_groups;noquote@
      +
    • Groups: @random_user_groups;noquote@
      •  -
    • @@ -41,4 +40,3 @@ #random-photo-portlet.lt_There_are_no_photos_t# - Index: openacs-4/packages/static-portlet/static-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/static-portlet/static-portlet.info,v diff -u -r1.22 -r1.23 --- openacs-4/packages/static-portlet/static-portlet.info 8 Jan 2008 13:04:52 -0000 1.22 +++ openacs-4/packages/static-portlet/static-portlet.info 9 Nov 2008 23:29:28 -0000 1.23 @@ -7,14 +7,14 @@ f f - + OpenACS - 2008-01-08 + 2008-10-18 OpenACS - - - + + + Index: openacs-4/packages/survey/survey.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/survey.info,v diff -u -r1.15 -r1.16 --- openacs-4/packages/survey/survey.info 15 May 2007 20:14:54 -0000 1.15 +++ openacs-4/packages/survey/survey.info 9 Nov 2008 23:29:28 -0000 1.16 @@ -15,7 +15,7 @@ Expanded functionality survey package derived from simple-survey. - + Index: openacs-4/packages/survey/tcl/survey-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/tcl/survey-procs.tcl,v diff -u -r1.7 -r1.8 --- openacs-4/packages/survey/tcl/survey-procs.tcl 5 Mar 2008 21:05:23 -0000 1.7 +++ openacs-4/packages/survey/tcl/survey-procs.tcl 9 Nov 2008 23:29:28 -0000 1.8 @@ -215,7 +215,7 @@ if { $presentation_alignment == "beside" } { append html [join $choices " "] } else { - append html "
    \n[join $choices "
    \n"]\n
    " + append html "

    \n[join $choices "
    \n"]\n

    " } } @@ -231,7 +231,7 @@ if { $presentation_alignment == "beside" } { append html [join $choices " "] } else { - append html "
    \n[join $choices "
    \n"]\n
    " + append html "

    \n[join $choices "
    \n"]\n

    " } } } Index: openacs-4/packages/survey/www/process-response.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/process-response.adp,v diff -u -r1.5 -r1.6 --- openacs-4/packages/survey/www/process-response.adp 21 Jan 2005 17:24:28 -0000 1.5 +++ openacs-4/packages/survey/www/process-response.adp 9 Nov 2008 23:29:28 -0000 1.6 @@ -1,9 +1,8 @@ #survey.Response_Submitted# @context;noquote@ -
    +

    #survey.lt_Response_submitted_Th#

    #survey.Return# #survey.lt_to_the_survey_index_p#

    -
    Index: openacs-4/packages/survey/www/admin/one.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/one.adp,v diff -u -r1.10 -r1.11 --- openacs-4/packages/survey/www/admin/one.adp 5 Mar 2008 21:43:07 -0000 1.10 +++ openacs-4/packages/survey/www/admin/one.adp 9 Nov 2008 23:29:28 -0000 1.11 @@ -92,7 +92,7 @@ -
    @questions.question_display;noquote@
    +
    @questions.question_display;noquote@
    Index: openacs-4/packages/survey/www/admin/process-response.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/process-response.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/survey/www/admin/process-response.adp 21 Jan 2005 17:24:28 -0000 1.3 +++ openacs-4/packages/survey/www/admin/process-response.adp 9 Nov 2008 23:29:28 -0000 1.4 @@ -2,8 +2,6 @@ @survey_id@ #survey.lt_Response_submitted_Th# @context;noquote@ -
    +

    #survey.lt_Response_submitted_Th#

    #survey.lt_Return_to_survey_admi#.

    - -
    Index: openacs-4/packages/survey/www/admin/responses.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/responses.tcl,v diff -u -r1.4 -r1.5 --- openacs-4/packages/survey/www/admin/responses.tcl 5 Mar 2008 21:43:07 -0000 1.4 +++ openacs-4/packages/survey/www/admin/responses.tcl 9 Nov 2008 23:29:28 -0000 1.5 @@ -38,7 +38,7 @@ db_foreach survey_question_list {} { append results "
  • #$sort_order $question_text -
    +

    " switch -- $abstract_data_type { "date" - @@ -74,7 +74,7 @@ } } } - append results "

    \n" + append results "

    \n" } Index: openacs-4/packages/survey/www/admin/survey-create-confirm.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey/www/admin/survey-create-confirm.adp,v diff -u -r1.3 -r1.4 --- openacs-4/packages/survey/www/admin/survey-create-confirm.adp 13 Jan 2005 13:58:46 -0000 1.3 +++ openacs-4/packages/survey/www/admin/survey-create-confirm.adp 9 Nov 2008 23:29:28 -0000 1.4 @@ -3,9 +3,9 @@ #survey.Survey_Name_name#

    #survey.lt_Here_is_how_your_surv# -

    +

    +

    @description;noquote@ -

    Index: openacs-4/packages/survey-portlet/survey-portlet.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/survey-portlet/survey-portlet.info,v diff -u -r1.10 -r1.11 --- openacs-4/packages/survey-portlet/survey-portlet.info 8 Jan 2008 13:04:53 -0000 1.10 +++ openacs-4/packages/survey-portlet/survey-portlet.info 9 Nov 2008 23:29:28 -0000 1.11 @@ -7,14 +7,14 @@ f t - + dave bauer Survey package portlet for new-portal - 2008-01-08 + 2008-10-18 Survey package portlet for new-portal - - + + Index: openacs-4/packages/theme-selva/theme-selva.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/theme-selva.info,v diff -u -r1.20 -r1.21 --- openacs-4/packages/theme-selva/theme-selva.info 8 Jan 2008 13:04:53 -0000 1.20 +++ openacs-4/packages/theme-selva/theme-selva.info 9 Nov 2008 23:29:28 -0000 1.21 @@ -8,14 +8,14 @@ f theme-selva - + Rafael Calvo - 2008-01-08 + 2008-10-18 0 - - + + Index: openacs-4/packages/theme-selva/www/selva-lrn-master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-selva/www/selva-lrn-master.adp,v diff -u -r1.7 -r1.8 --- openacs-4/packages/theme-selva/www/selva-lrn-master.adp 4 Jan 2008 18:47:18 -0000 1.7 +++ openacs-4/packages/theme-selva/www/selva-lrn-master.adp 9 Nov 2008 23:29:28 -0000 1.8 @@ -6,7 +6,7 @@ @doc_type;noquote@ -
    @youarehere;noquote@

     +
    @youarehere;noquote@
    Index: openacs-4/packages/theme-zen/theme-zen.info =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/theme-zen.info,v diff -u -r1.4 -r1.5 --- openacs-4/packages/theme-zen/theme-zen.info 8 Jan 2008 13:04:53 -0000 1.4 +++ openacs-4/packages/theme-zen/theme-zen.info 9 Nov 2008 23:29:28 -0000 1.5 @@ -8,14 +8,14 @@ t theme-zen - + Rafael Calvo - 2008-01-08 + 2008-10-18 0 - - + + Index: openacs-4/packages/theme-zen/catalog/theme-zen.en_US.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/catalog/theme-zen.en_US.ISO-8859-1.xml,v diff -u -r1.2 -r1.3 --- openacs-4/packages/theme-zen/catalog/theme-zen.en_US.ISO-8859-1.xml 15 May 2007 20:14:55 -0000 1.2 +++ openacs-4/packages/theme-zen/catalog/theme-zen.en_US.ISO-8859-1.xml 9 Nov 2008 23:29:28 -0000 1.3 @@ -1,29 +1,49 @@ - + ACC + Access Key + Access Keys + Access keys can be used to move quickly through the main sections of the site. If you are using Windows, press the "Alt" key and the corresponding access key. Mac users have to press the "ctrl" key instead of the "Alt" one. Depending on the browser you're using, you might have to press also "Enter" afterwards. + Accessibility Note that no software can check completely the accessibility of your website. + Accessibility Page Class Admin + Associated Page Begin Footer Begin Main Content Begin Main Navigation Begin Sub Navigation + Change Contrast Communities Control Panel Classes + Default colors .LRN Home .LRN Project Central Go to Admin page A Go to %pretty_name% page Go to %name% HC + High contrast Logout My Space online Preferences Skip To Main Content + Standards Compliance + All user pages comply with the + <abbr title="HyperText Markup Language">HTML</abbr> Strict 4.01 specification + and use structured semantic markup. <abbr title="Cascading Style Sheets">CSS</abbr> + are used to format and layout the content. We consider that user pages are + <abbr title="Web Content Accessibility Guidelines">WCAG</abbr> 1.0 + level <abbr title="Doble-A">AA</abbr> and <abbr title="United States">U.S.</abbr> Federal Government Section 508 + compliant. STD + Switch to default colors + Switch to high contrast + The following styles are available: Tools Upgrade The upgrade to the Zen theme has been successfully completed. Index: openacs-4/packages/theme-zen/catalog/theme-zen.es_ES.ISO-8859-1.xml =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/catalog/theme-zen.es_ES.ISO-8859-1.xml,v diff -u -r1.2 -r1.3 --- openacs-4/packages/theme-zen/catalog/theme-zen.es_ES.ISO-8859-1.xml 15 May 2007 20:14:55 -0000 1.2 +++ openacs-4/packages/theme-zen/catalog/theme-zen.es_ES.ISO-8859-1.xml 9 Nov 2008 23:29:28 -0000 1.3 @@ -1,29 +1,44 @@ - + ACC + Atajo de Teclado + Atajos de Teclado + Puede utilizar atajos de teclado para moverse con comodidad por todo el sitio. Si est� utilizando Windows, presiona la tecla "Alt" junto con el atajo que corresponda, para consultar la p�gina a la que quiera acceder. Los usuarios de Macintosh han de presionar, sin embargo, la tecla "Ctrl". Con algunos navegadores tendr�, adem�s, que presionar la tecla "Intro". + Accesibilidad Notese que ning�n software puede comprobar totalmente la accesibilidad de su sitio web. + P�gina sobre Accesibilidad Admin + P�gina Asociada Inicio del Pie de P�gina Inicio del Contenido Principal Inicio de la Navegaci�n Principal Inicio de la Subnavegaci�n + Cambiar el Contraste Comunidades Panel de Control Cursos + Colores por defecto Sitio web de .LRN Proyecto .LRN Ir a la p�gina de administraci�n A Ir a %pretty_name% Ir a %name% HC + Alto contraste Salir Mi Espacio conectado Preferencias Saltar al Contenido Principal + Est�ndares + Las p�ginas de usuarios cumplen con la especificaci�n <abbr title="HyperText Markup Language" lang="en">HTML</abbr> Strict 4.01 y utilizan marcado sem�ntico para estructurar sus contenidos. Se utilizan <abbr title="Cascading Style Sheets" lang="en">CSS</abbr> para formatear los contenidos y el aspecto de las p�ginas. Consideramos que las p�ginas de usuarios cumplen con las <abbr title="Web Content Accessibility Guidelines" lang="en">WCAG</abbr> 1.0 + level <abbr title="Doble-A">AA</abbr> y la <span lang="en"><abbr title="United States">U.S.</abbr> Federal Government Section 508</span>. STD + Usar colores por defecto + Usar alto contraste + Los siguientes estilos est�n disponibles: Herramientas Actualizar La actualizaci�n del tema Zen ha sido completada con �xito. Index: openacs-4/packages/theme-zen/lib/lrn-master.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/lib/lrn-master.adp,v diff -u -r1.7 -r1.8 --- openacs-4/packages/theme-zen/lib/lrn-master.adp 11 Jan 2008 16:36:26 -0000 1.7 +++ openacs-4/packages/theme-zen/lib/lrn-master.adp 9 Nov 2008 23:29:28 -0000 1.8 @@ -4,8 +4,16 @@ @focus;noquote@ doc + +
    -
  • - #acs-subsite.Welcome_user# | + #acs-subsite.Welcome_user#
  • - @num_users_online@ + | @num_users_online@ #acs-subsite.Member# #acs-subsite.Members# - #theme-zen.online# | + #theme-zen.online#
    • -     -
  • - - - #theme-zen.std# - -
    • -
  • - - #theme-zen.hc# - | -
    • -
  • - + | + #acs-subsite.Logout#
    • @@ -63,12 +57,13 @@