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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
- <version name="5.2.2" url="http://openacs.org/apms/acs-datetime-5.2.2.apm">
+ <version name="5.4.3b1" url="http://openacs.org/apms/acs-datetime-5.4.3b1.apm">
<owner url="http://openacs.org">OpenACS</owner>
<summary>An API for date and time functions</summary>
<release-date>2006-02-18</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
<description format="text/html">Note: this version of the package requires acs-event(s) for a helper function. This requirement may go away in the future. </description>
<maturity>0</maturity>
- <provides url="acs-datetime" version="5.2.2"/>
+ <provides url="acs-datetime" version="5.4.3b1"/>
<requires url="acs-events" version="0.6d2"/>
<requires url="acs-kernel" version="5.3.1a1"/>
<requires url="acs-templating" version="5.3.1a1"/>
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 @@
<tr class=\"table-header\" bgcolor=lavender>
<td align=center>
[subst $prev_week_template]
- <FONT face=\"Arial,Helvetica\" SIZE=-1>
+ <span style=\"font-family:Arial,Helvetica; size: smaller\">
<B>
[util_AnsiDatetoPrettyDate $sunday_date] - [util_AnsiDatetoPrettyDate $saturday_date]
</B>
- </FONT>
+ </span>
[subst $next_week_template]
</td>
</tr>
@@ -120,9 +120,9 @@
append return_html "
<tr>
<td class=\"cal-week-event\">
- <font size=-1>
+ <span style=\"font-size: smaller\">
[ns_set value $calendar_details $index]
- </font>
+ </span>
</td>
</tr>
"
@@ -251,8 +251,8 @@
set start_time ""
set odd_row_p 0
set display_hour "<img border=0 align=\"center\" src=\"/resources/acs-subsite/diamond.gif\" alt=\"[_ acs-datetime.All_day]\">"
- append return_html "<tr class=\"odd\"><td class=\"center\" align=\"left\" width=\"60\" \"nowrap\"><font size=-1>[subst $hour_template]</font></td>"
- append return_html "<td colspan=\"$max_n_events\"><font size=-1>"
+ append return_html "<tr class=\"odd\"><td class=\"center\" align=\"left\" width=\"60\" \"nowrap\"><span style=\"font-size: smaller\">[subst $hour_template]</span></td>"
+ append return_html "<td colspan=\"$max_n_events\"><span style=\"font-size: smaller\">"
# Go through events
while {1} {
@@ -270,7 +270,7 @@
ns_set delete $calendar_details $index
}
- append return_html "</font>
+ append return_html "</span>
</td></tr>"
for {set hour $start_hour} {$hour <= $end_hour} {incr hour} {
@@ -319,7 +319,7 @@
}
set display_hour [subst $hour_template]
- append return_html "<tr class=\"$class\"><td class=\"center\" align=left width=\"60\" \"nowrap\"><nobr><font size=-2>$display_hour</font></nobr></td>\n"
+ append return_html "<tr class=\"$class\"><td class=\"center\" align=left width=\"60\" \"nowrap\"><nobr><span style=\"font-size: smaller\">$display_hour</span></nobr></td>\n"
set n_processed_events 0
@@ -359,7 +359,7 @@
set colspan 1
}
- append return_html "<td valign=top rowspan=[expr $hour_diff + 1] colspan=$colspan><font size=-1>[lindex $one_item_val 2]</font></td>"
+ append return_html "<td valign=top rowspan=[expr $hour_diff + 1] colspan=$colspan><span style=\"font-size: smaller\">[lindex $one_item_val 2]</span></td>"
} else {
append return_html "[ns_set value $calendar_details $index]<br>\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 {<!--$julian_date--><font size=1>$day_number</font>}
+ -day_number_template {<!--$julian_date-->$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 "
- <td colspan=7 align=center>
- <font size=$header_text_size color=$header_text_color><b>$month_heading</b></font>
- </td>\n"
+ set title [subst {
+ <td colspan=7 align="center">
+ <span style="font-size:$header_text_size; color:$header_text_color; background:inherit; font-weight:bold">
+ $month_heading
+ </span>
+ </td>\n}]
} else {
- set title "
- <td class=\"no-border\" colspan=7>
- <table width=100% cellpadding=0 cellspacing=0 border=0>
- <tr class=\"table-header\">
- <td align=left>$prev_month_url</td>
- <td align=center><font size=$header_text_size color=$header_text_color>
- <b>$month_heading</b></font>
- </td>
- <td align=right>$next_month_url</td>
- </tr>
- </table>
- </td>\n"
+ set title [subst {
+ <td class=\"no-border\" colspan=7>
+ <table width=100% cellpadding=0 cellspacing=0 border=0>
+ <tr class=\"table-header\">
+ <td align=left>$prev_month_url</td>
+ <td align=center>
+ <span style="font-size:$header_text_size; color:$header_text_color; background:inherit; font-weight:bold">
+ $month_heading
+ </span>
+ </td>
+ <td align=right>$next_month_url</td>
+ </tr>
+ </table>
+ </td>\n}]
}
# Write out the header and the days of the week
- append output "
- <table class=\"table-display\" bgcolor=$master_bgcolor cellpadding=0 cellspacing=0 border=1 width=$calendar_width>
- <tr bgcolor=$header_bgcolor> $title </tr>
- <tr bgcolor=$day_header_bgcolor class=\"table-header\">\n"
+ append output [subst {
+ <table class=\"table-display\" style="background:$master_bgcolor; color:inherit;" cellpadding=0 cellspacing=0 border=1 width=$calendar_width>
+ <tr style="background:$header_bgcolor; color:inherit;"> $title </tr>
+ <tr style="background:$day_header_bgcolor; color:inherit;" class=\"table-header\">\n}]
foreach day_of_week $days_of_week {
- append output "
- <td width=14% align=center class=\"no-border\">
- <font face=\"Verdana,Arial,Helvetica\" size=$day_header_size color=$day_text_color>
- <b>$day_of_week</b>
- </font>
- </td>\n"
+ append output [subst {
+ <td style="width:14%" align=center class=\"no-border\">
+ <span style="font-family: Verdana,Arial,Helvetica; font-size:$day_header_size; color:$day_text_color; background:inherit; font-weight:bold;">
+ $day_of_week
+ </span>
+ </td>\n}]
}
- append output "</tr><tr>\n"
+ append output "</tr>\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 "<tr>\n"
- }
+ if { $day_of_week == 1} {
+ append output "<tr>\n"
+ }
- set skip_day 0
+ set skip_day 0
- if {$before_month_p || $after_month_p} {
- append output "<td class=\"no-border\" bgcolor=$empty_bgcolor align=right valign=top> "
- 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 "<td class=\"no-border\" style=\"background:$empty_bgcolor; color:inherit;\" align=right valign=top> "
+ 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 "<td class=$the_class bgcolor=$the_bgcolor align=left valign=top>[subst $day_number_template] "
- }
+ append output "<td class=\"$the_class\" style=\"background:$the_bgcolor; color:inherit;\" align=left valign=top>[subst $day_number_template] "
+ }
- if { (!$skip_day) && $large_calendar_p == 1 } {
- append output "<div align=left>"
+ if { (!$skip_day) && $large_calendar_p == 1 } {
+ append output "<div align=left>"
- 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 "</div>"
- }
+ set calendar_day_index [ns_set find $calendar_details $julian_date]
+ }
+ append output "</div>"
+ }
- append output "</td>\n"
+ append output "</td>\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 "</tr>\n"
- }
+ if { $day_of_week > 7 } {
+ set day_of_week 1
+ append output "</tr>\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 "
- <tr bgcolor=white>
- <td align=center colspan=7>$prev_month_url$next_month_url</td>
- </tr>\n"
+ append output [subst {
+ <tr style="background:white; color:inherit;">
+ <td align=center colspan=7>$prev_month_url$next_month_url</td>
+ </tr>\n}]
}
return [concat $output "</table>\n"]
@@ -217,7 +221,7 @@
-header_bgcolor "black"
-header_text_color "white"
-header_text_size "+1"
- -day_number_template {<!--$julian_date--><font size=1>$day_number</font>}
+ -day_number_template {<!--$julian_date-->$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 {<!--$julian_date--><font size=1>$day_number</font>}
+ -day_number_template {<!--$julian_date-->$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 {<!--$julian_date--><font size=1>$day_number</font>}
+ -day_number_template {<!--$julian_date-->$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 {<!--$julian_date--><font size=1>$day_number</font>}
+ -day_number_template {<!--$julian_date-->$day_number}
-day_header_size 1
-day_header_bgcolor "#666666"
-calendar_width 0
@@ -451,13 +455,13 @@
if { $viewname == $view } {
# current view
append result "<td class=\"selected\">
- <font size=-1><b>$text</b></font>
+ <span style=\"font-size: smaller\; font-weight: bold\">$text</span>
</td>
"
} else {
append result "<td class=\"no-border\">
<a href=\"$base_url" "view=$viewname&date=$date\" title=\"$viewdesc\">
- <font size=-1><b>$text</b></font></a>
+ <span style=\"font-size: smaller; font-weight: bold\">$text</span></a>
</td>
"
}
@@ -589,7 +593,7 @@
}
append results "
- <font size=-1><b>$curr_month</b></font>"
+ <span style=\"font-size: smaller; font-weight: bold\">$curr_month</span>"
# 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 "
<td>
- <font size=-1 color=red>$month</font>
+ <span style=\"font-size: smaller; color: red\">$month</span>
</td>\n"
} else {
set target_date [clock format \
@@ -699,7 +703,7 @@
append output "
<td>
<a href=\"$base_url" "view=month&date=[ns_urlencode $target_date]\">
- <font size=-1 color=blue>$month</font></a>
+ <span style=\"font-size: smaller; color: blue;\">$month</span></a>
</td>\n"
}
}
@@ -724,12 +728,12 @@
for {set year [expr $curr_year - 2]} {$year <= $end_year} {incr year} {
if {$year == $curr_year} {
append output "
- <td><font size=-1 color=red>$year</font></td>\n"
+ <td><span style=\"font-size: smaller; color: red\">$year</span></td>\n"
} else {
append output "
<td>
<a href=\"$base_url" "view=year&date=[ns_urlencode "$year-$monthday"]\">
- <font size=-1 color=blue>$year</font></a>
+ <span style=\"font-size: smaller; color: blue;\">$year</span></a>
</td>\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 "<td align=right><font size=-1><b>$day_of_week</b></td>\n"
+ append output "<td align=right><span style=\"font-size: smaller; font-weight: bold;\">$day_of_week</span></td>\n"
}
append output "</tr><tr><td colspan=7><hr></td></tr>"
@@ -791,18 +795,18 @@
append output "
<td align=right>
<a href=\"$base_url" "view=$view&date=[ns_urlencode $ansi_date]\">
- <font color=gray>$day_number</font></a>
+ <span style=\"color: gray\">$day_number</span></a>
</td>"
} elseif {$julian_date == $julian_date_today} {
append output "
<td align=right>
- <b>$day_number</b>
+ <strong>$day_number</strong>
</td>"
} else {
append output "
<td align=right>
<a href=\"$base_url" "view=$view&date=[ns_urlencode $ansi_date]\">
- <font color=blue>$day_number</font></a>
+ <span style=\"color: blue\">$day_number</span></a>
</td>"
}
@@ -833,21 +837,23 @@
<tr class=\"table-header\"><td align=center colspan=5>
<table cellspacing=0 cellpadding=0 border=0>
<tr><td nowrap>
- <font size=-2>"
+ <span style=\"font-size: smaller\">"
if { $view == "day" && [dt_sysdate] == $date } {
- append output "<b>Today</b>"
+ append output "<strong>Today</strong>"
} else {
append output "<a href=\"$today_url\">
- <b>Today</b></a> "
+ <strong>Today</strong></a> "
}
append output "
- is [dt_ansi_to_pretty]</font></td></tr>
+ is [dt_ansi_to_pretty]</span></td></tr>
<tr><td align=center><br>
<form method=get action=$base_url>
- <INPUT TYPE=text name=date size=10><INPUT type=image src=\"/resources/acs-subsite/go.gif\" alt=\"Go\" border=0> <br><font size=-2>Date as YYYYMMDD</font>
+ <div>
+ <INPUT TYPE=text name=date size=10><INPUT type=image src=\"/resources/acs-subsite/go.gif\" alt=\"Go\" border=0> <br><span style=\"font-size:smaller\">Date as YYYYMMDD</span>
<INPUT TYPE=hidden name=view value=day>
+ </div>
"
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 @@
<singleton-p>t</singleton-p>
<auto-mount>ds</auto-mount>
- <version name="5.2.0d1" url="http://openacs.org/repository/download/apm/acs-developer-support-5.2.0d1.apm">
+ <version name="5.4.3b1" url="http://openacs.org/repository/download/apm/acs-developer-support-5.4.3b1.apm">
<owner url="mailto:lars@pinds.com">Lars Pind</owner>
<summary>Profiling for requests including database timing information.</summary>
<release-date>2005-02-04</release-date>
@@ -18,7 +18,7 @@
</description>
<maturity>0</maturity>
- <provides url="acs-developer-support" version="5.2.0d1"/>
+ <provides url="acs-developer-support" version="5.4.3b1"/>
<requires url="acs-kernel" version="5.3.1a1"/>
<requires url="acs-templating" version="5.4.0d1"/>
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 @@
</if>
<if @comments:rowcount@ gt 0>
<multiple name="comments">
- <b>Comment:</b> <pre style="display: inline;">@comments.text@</pre><br />
+ <b>Comment:</b> <pre style="display: inline;">@comments.text@</pre><br>
</multiple>
- <hr />
+ <hr>
</if>
<if @user_switching_p@ true>
<form action="@set_user_url@">
@export_vars;noquote@
- Real user: @real_user_name@ (@real_user_email@) [user_id #@real_user_id@]<br />
+ Real user: @real_user_name@ (@real_user_email@) [user_id #@real_user_id@]<br>
<if @real_user_id@ ne @fake_user_id@>
- Faked user: @fake_user_name@ <if @fake_user_email@ not nil>(@fake_user_email@)</if> [user_id #@fake_user_id@] <a href="@unfake_url@">(Unfake)</a><br />
+ Faked user: @fake_user_name@ <if @fake_user_email@ not nil>(@fake_user_email@)</if> [user_id #@fake_user_id@] <a href="@unfake_url@">(Unfake)</a><br>
</if>
<else>
- Faked user: <i>Not faking.</i><br />
+ Faked user: <i>Not faking.</i><br>
</else>
Change faked user: <if @search_p@ eq "0"><select name="user_id">
<multiple name="users">
@@ -26,17 +26,17 @@
</select></if><else><input type="text" name="keyword"><input type="hidden" name="target" value="@target@"></else>
<input type="submit" value="Go">
</form>
- <hr />
+ <hr>
</if>
<if @profiling:rowcount@ gt 0>
<h3>Profiling Information</h3>
<listtemplate name="profiling"></listtemplate>
<if @page_fragment_cache_p@ true>
<p>
<form name="searchfrags" action="@ds_url@search">
- <input type="hidden" name="request" value="@request@"/>
- <input type="text" name="expression" value="" />
- <input type="submit" name="search" value="Search"/>
+ <input type="hidden" name="request" value="@request@">
+ <input type="text" name="expression" value="">
+ <input type="submit" name="search" value="Search">
</form>
</p></if>
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 "<small>You are currently <strong>not logged in</strong></small><br />"
- set you_are_really "<small>You are really <strong>not logged in</strong></small><br />"
+ set you_are "<small>You are currently <strong>not logged in</strong></small><br>"
+ set you_are_really "<small>You are really <strong>not logged in</strong></small><br>"
} 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 @@
<td align="right" id="developer-search">
<form action="@base_url@/api-doc/proc-search">
- <input type="hidden" name="search_type" value="All+matches"/>
- <input type="hidden" name="name_weight" value="5"/>
- <input type="hidden" name="param_weight" value="3"/>
- <input type="hidden" name="doc_weight" value="2"/>
+ <input type="hidden" name="search_type" value="All+matches">
+ <input type="hidden" name="name_weight" value="5">
+ <input type="hidden" name="param_weight" value="3">
+ <input type="hidden" name="doc_weight" value="2">
<input name="query_string" onfocus="if(this.value=='Search API')this.value='';" onblur="if(this.value=='')this.value='Search API';" value="Search API">
<input type="submit" value="Go">
</form>
Index: openacs-4/packages/acs-developer-support/lib/toolbar.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/lib/toolbar.tcl,v
diff -u -r1.11 -r1.12
--- openacs-4/packages/acs-developer-support/lib/toolbar.tcl 7 Oct 2007 22:36:53 -0000 1.11
+++ openacs-4/packages/acs-developer-support/lib/toolbar.tcl 9 Nov 2008 23:29:22 -0000 1.12
@@ -77,7 +77,7 @@
# Retrieve all CSS files loaded on this page
-# Generate the <link /> tag multirow
+# Generate the <link > tag multirow
variable ::template::head::links
set css_list [list]
Index: openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl,v
diff -u -r1.47 -r1.48
--- openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl 19 Jan 2008 21:01:43 -0000 1.47
+++ openacs-4/packages/acs-developer-support/tcl/acs-developer-support-procs.tcl 9 Nov 2008 23:29:22 -0000 1.48
@@ -189,7 +189,7 @@
set ds_url [ds_support_url]
if {![empty_string_p $ds_url]} {
- append out "<a href=\"${ds_url}\">Developer Support Home</a> - <a href=\"${ds_url}request-info?request=$ad_conn(request)\">Request Information</a><br />"
+ append out "<a href=\"${ds_url}\">Developer Support Home</a> - <a href=\"${ds_url}request-info?request=$ad_conn(request)\">Request Information</a><br>"
} else {
ns_log Error "ACS-Developer-Support: Unable to offer link to Developer Support \
because it is not mounted anywhere."
@@ -205,31 +205,31 @@
}
}
if { $counter > 0 } {
- append out "$counter database command[ad_decode $counter 1 " taking" "s totalling"] [format "%.f" [expr { $total }]] ms<br />"
+ append out "$counter database command[ad_decode $counter 1 " taking" "s totalling"] [format "%.f" [expr { $total }]] ms<br>"
}
}
if { [nsv_exists ds_request "$ad_conn(request).conn"] } {
array set conn [nsv_get ds_request "$ad_conn(request).conn"]
if { [info exists conn(startclicks)] } {
- append out "Page served in [format "%.f" [expr { ([clock clicks -milliseconds] - $conn(startclicks)) }]] ms<br />\n"
+ append out "Page served in [format "%.f" [expr { ([clock clicks -milliseconds] - $conn(startclicks)) }]] ms<br>\n"
}
}
if { [ad_parameter -package_id [ds_instance_id] ShowCommentsInlineP acs-developer-support 0] } {
- append out "Comments: <b>On</b> | <a href=\"[export_vars -base "${ds_url}comments-toggle" { { return_url [ad_return_url] } }]\">Off</a><br />"
+ append out "Comments: <b>On</b> | <a href=\"[export_vars -base "${ds_url}comments-toggle" { { return_url [ad_return_url] } }]\">Off</a><br>"
if { [nsv_exists ds_request "$ad_conn(request).comment"] } {
foreach comment [nsv_get ds_request "$ad_conn(request).comment"] {
- append out "<b>Comment:</b> $comment<br />\n"
+ append out "<b>Comment:</b> $comment<br>\n"
}
}
} else {
- append out "Comments: <a href=\"[export_vars -base "${ds_url}comments-toggle" { { return_url [ad_return_url] } }]\">On</a> | <b>Off</b><br />"
+ append out "Comments: <a href=\"[export_vars -base "${ds_url}comments-toggle" { { return_url [ad_return_url] } }]\">On</a> | <b>Off</b><br>"
}
}
if { [ds_user_switching_enabled_p] } {
- append out "[ds_user_select_widget]<br />"
+ append out "[ds_user_select_widget]<br>"
}
return $out
@@ -438,8 +438,8 @@
if { $user_id == 0 } {
set selected " selected"
- set you_are "<small>You are currently <strong>not logged in</strong></small><br />"
- set you_are_really "<small>You are really <strong>not logged in</strong></small><br />"
+ set you_are "<small>You are currently <strong>not logged in</strong></small><br>"
+ set you_are_really "<small>You are really <strong>not logged in</strong></small><br>"
} else {
set selected {}
}
@@ -456,12 +456,12 @@
} {
if { $user_id == $user_id_from_db } {
set selected " selected"
- set you_are "<small>You are testing as <strong>$name ($email)</strong></small><br />"
+ set you_are "<small>You are testing as <strong>$name ($email)</strong></small><br>"
} else {
set selected {}
}
if { $real_user_id == $user_id_from_db } {
- set you_are_really "<small>You are really <strong>$name ($email)</strong></small><br />"
+ set you_are_really "<small>You are really <strong>$name ($email)</strong></small><br>"
}
append options "<option value=\"$user_id_from_db\"$selected>$name ($email)</option>"
}
@@ -473,7 +473,7 @@
$you_are_really
Change user: <select name=\"user_id\">
$options
- </select>[export_form_vars return_url]<input type=submit value=\"Go\" /></form>"
+ </select>[export_form_vars return_url]<input type=submit value=\"Go\"></form>"
} else {
ns_log Error "ACS-Developer-Support: Unable to offer link to Developer Support \
because it is not mounted anywhere."
Index: openacs-4/packages/acs-developer-support/www/css-list.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/css-list.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-developer-support/www/css-list.adp 5 Oct 2007 12:02:38 -0000 1.1
+++ openacs-4/packages/acs-developer-support/www/css-list.adp 9 Nov 2008 23:29:22 -0000 1.2
@@ -1,4 +1,4 @@
<master>
<multiple name="css_multirow">
- <a href="@css_multirow.css_location;noquote@">@css_multirow.file_location;noquote@</a> || <a href="@css_multirow.edit_url;noquote@">Edit</a><br />
+ <a href="@css_multirow.css_location;noquote@">@css_multirow.file_location;noquote@</a> || <a href="@css_multirow.edit_url;noquote@">Edit</a><br>
</multiple>
\ No newline at end of file
Index: openacs-4/packages/acs-developer-support/www/request-info.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/request-info.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/acs-developer-support/www/request-info.adp 4 Feb 2005 13:34:40 -0000 1.4
+++ openacs-4/packages/acs-developer-support/www/request-info.adp 9 Nov 2008 23:29:22 -0000 1.5
@@ -5,9 +5,9 @@
<if @page_fragment_cache_p@ true>
<p>
<form name="searchfrags" action="/ds/search">
- <input type="hidden" name="request" value="@request@"/>
- <input type="text" name="expression" value="" />
- <input type="submit" name="search" value="Search"/>
+ <input type="hidden" name="request" value="@request@">
+ <input type="text" name="expression" value="">
+ <input type="submit" name="search" value="Search">
</form>
</p></if>
Index: openacs-4/packages/acs-developer-support/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-developer-support/www/search.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/acs-developer-support/www/search.adp 4 Feb 2005 15:26:12 -0000 1.2
+++ openacs-4/packages/acs-developer-support/www/search.adp 9 Nov 2008 23:29:22 -0000 1.3
@@ -2,7 +2,13 @@
<property name="title">Search</property>
<property name="context">@context;noquote@</property>
- <p><form name="searchfrags" action="search"><input type="hidden" name="request" value="@request@"/><input type="text" name="expression" value="@expression@" /><input type="submit" name="search" value="Search"/></form></p>
+ <p>
+ <form name="searchfrags" action="search">
+ <input type="hidden" name="request" value="@request@">
+ <input type="text" name="expression" value="@expression@">
+ <input type="submit" name="search" value="Search">
+ </form>
+ </p>
<if @gone_p@ false>
<if @matches:rowcount@ gt 0>
Index: openacs-4/packages/assessment-portlet/assessment-portlet.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment-portlet/assessment-portlet.info,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/assessment-portlet/assessment-portlet.info 8 Jan 2008 13:04:47 -0000 1.6
+++ openacs-4/packages/assessment-portlet/assessment-portlet.info 9 Nov 2008 23:29:22 -0000 1.7
@@ -7,12 +7,12 @@
<initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/assessment-portlet-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/assessment-portlet-2.5.0d1.apm">
<owner url="mailto:jopez@galileo.edu">Jose Pablo Escobedo Del Cid</owner>
- <release-date>2008-01-08</release-date>
+ <release-date>2008-10-18</release-date>
- <provides url="assessment-portlet" version="2.4.0d1"/>
- <requires url="assessment" version="0.22d3"/>
+ <provides url="assessment-portlet" version="2.5.0d1"/>
+ <requires url="assessment" version="0.22d7"/>
<callbacks>
<callback type="after-install" proc="apm::assessment_portlet::after_install"/>
Index: openacs-4/packages/assessment-portlet/www/assessment-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment-portlet/www/assessment-portlet.adp,v
diff -u -r1.9 -r1.10
--- openacs-4/packages/assessment-portlet/www/assessment-portlet.adp 21 Feb 2008 14:52:52 -0000 1.9
+++ openacs-4/packages/assessment-portlet/www/assessment-portlet.adp 9 Nov 2008 23:29:22 -0000 1.10
@@ -1,5 +1,5 @@
-<if @assessments:rowcount@ gt 0 or @sessions:rowcount@ gt 0>
- <if @shaded_p@ false>
+<if @shaded_p@ false>
+ <if @assessments:rowcount@ gt 0 or @sessions:rowcount@ gt 0>
<if @assessments:rowcount@ gt 0>
<b>#assessment.Open_Assessments#</b>
<listtemplate name="assessments"></listtemplate>
@@ -11,9 +11,9 @@
</if>
</if>
<else>
- #new-portal.when_portlet_shaded#
+
</else>
</if>
<else>
-
+ #new-portal.when_portlet_shaded#
</else>
Index: openacs-4/packages/assessment-portlet/www/assessment-portlet.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/assessment-portlet/www/assessment-portlet.tcl,v
diff -u -r1.15 -r1.16
--- openacs-4/packages/assessment-portlet/www/assessment-portlet.tcl 26 Feb 2008 15:57:16 -0000 1.15
+++ openacs-4/packages/assessment-portlet/www/assessment-portlet.tcl 9 Nov 2008 23:29:22 -0000 1.16
@@ -21,22 +21,22 @@
set elements [list]
if {!$one_instance_p} {
set elements [list community_name \
- [list \
- label "[_ dotlrn.Community]" \
- display_template {<if @assessments.community_name@ not nil>@assessments.community_name@</if><else> </else>}]]
+ [list \
+ label "[_ dotlrn.Community]" \
+ display_template {<if @assessments.community_name@ not nil>@assessments.community_name@</if><else> </else>}]]
}
lappend elements title \
[list \
- label "[_ assessment.Title]" \
- display_template {<a href="@assessments.assessment_url@">@assessments.title@</a><if @assessments.anonymous_p@ eq "t">(#assessment.anonymous#)</if>}]
+ label "[_ assessment.Title]" \
+ display_template {<a href="@assessments.assessment_url@">@assessments.title@</a><if @assessments.anonymous_p@ eq "t"><br>(#assessment.anonymous#)</if>}]
lappend elements status {
label "[_ assessment.Status]"
- display_template {<if @assessments.status@ eq in_progress>#assessment.Incomplete#</if><if @assessments.status@ eq "finished">#assessment.Finished#</if><if @assessments.status@ eq untaken>#assessment.Untaken#</if><if @assessments.anonymous_p@ eq "t"><br />(#assessment.anonymous#)</if>}
+ display_template {<if @assessments.status@ eq in_progress>#assessment.Incomplete#</if><if @assessments.status@ eq "finished">#assessment.Finished#</if><if @assessments.status@ eq untaken>#assessment.Untaken#</if>}
}
lappend elements take {
- label ""
+ label "[_ acs-kernel.common_Actions]"
display_template {<if @assessments.status@ eq in_progress><a href="@assessments.assessment_url@">#assessment.Finish#</a></if><else><if @assessments.status@ eq untaken><a href="@assessments.assessment_url@">#assessment.Take#</a></if><else><if @assessments.completed_p@ lt @assessments.number_tries@><a href="@assessments.assessment_url@">#assessment.Retake#</a></if></else></else>}
}
if {[llength $list_of_package_ids]==1} {
@@ -56,16 +56,16 @@
lappend elements session \
[list \
- label {} \
+ label "[_ assessment.Review]" \
display_template {<if @assessments.status@ ne "untaken"><a href="@assessments.community_url@assessment/session?assessment_id=@assessments.assessment_id@">[_ assessment.Review]</a></if>}]
lappend elements admin {
- label ""
+ label "[_ acs-kernel.common_Administration]"
display_template {<if @assessments.admin_p@ true><a href="@assessments.community_url@assessment/asm-admin/one-a?assessment_id=@assessments.assessment_id@">\#acs-kernel.common_Administration\#</a></if>}
}
lappend elements results {
- label ""
+ label "[_ assessment.Results]"
display_template {<if @assessments.admin_p@ true><a href="@assessments.community_url@assessment/asm-admin/results-users?assessment_id=@assessments.assessment_id@">\#assessment.Results\#</a></if><else></else>}
}
@@ -75,7 +75,6 @@
-multirow assessments \
-key assessment_id \
-elements $elements \
- -main_class narrow \
-no_data "\#assessment.No_open_assessments\#"
# get the information of all open assessments
@@ -125,16 +124,16 @@
lappend elements session \
[list \
- label {} \
+ label "[_ assessment.Review]" \
display_template {<a href="@sessions.session_url@">[_ assessment.Review]</a>}]
lappend elements admin {
- label ""
+ label "[_ acs-kernel.common_Administration]"
display_template {<if @sessions.admin_p@ true><a href="@sessions.community_url@assessment/asm-admin/one-a?assessment_id=@sessions.assessment_id@">\#acs-kernel.common_Administration\#</a></if>}
}
lappend elements results {
- label ""
+ label "[_ assessment.Results]"
display_template {<if @sessions.admin_p@ true><a href="@sessions.community_url@assessment/asm-admin/results-users?assessment_id=@sessions.assessment_id@">\#assessment.Results\#</a></if><else></else>}
}
@@ -144,7 +143,6 @@
-multirow sessions \
-key assessment_id \
-elements $elements \
- -main_class narrow \
-no_data "\#assessment.No_answered_assessments\#"
# get the information of all assessments store in the database
Index: openacs-4/packages/attachments/attachments.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/attachments.info,v
diff -u -r1.17 -r1.18
--- openacs-4/packages/attachments/attachments.info 15 May 2007 20:14:19 -0000 1.17
+++ openacs-4/packages/attachments/attachments.info 9 Nov 2008 23:29:22 -0000 1.18
@@ -16,7 +16,7 @@
<description format="text/plain">Provide widgets and datamodel to support attachments on arbitrary objects. Used by forums.</description>
<provides url="attachments" version="0.10"/>
- <requires url="file-storage" version="5.3.0d1"/>
+ <requires url="file-storage" version="5.4.0d7"/>
<parameters>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="RelativeUrl" default="attach" description="The relative url of this package when mounted under a client."/>
Index: openacs-4/packages/attachments/tcl/attachments-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/tcl/attachments-procs.tcl,v
diff -u -r1.14 -r1.15
--- openacs-4/packages/attachments/tcl/attachments-procs.tcl 16 Aug 2006 17:54:23 -0000 1.14
+++ openacs-4/packages/attachments/tcl/attachments-procs.tcl 9 Nov 2008 23:29:22 -0000 1.15
@@ -205,13 +205,15 @@
} else {
set cbar_html "[_ attachments.Top] > "
}
-
+ set length_list [llength $cbar_list]
+ set aux 1
foreach el $cbar_list {
- if {[llength $el] < 2} {
+ if {$aux == $length_list } {
append cbar_html "$el"
} else {
append cbar_html "<a href=\"[lindex $el 0]\">[lindex $el 1]</a> > "
}
+ incr aux
}
return $cbar_html
Index: openacs-4/packages/attachments/www/attach.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/attachments/www/attach.adp,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/attachments/www/attach.adp 8 Aug 2006 21:26:14 -0000 1.10
+++ openacs-4/packages/attachments/www/attach.adp 9 Nov 2008 23:29:22 -0000 1.11
@@ -90,6 +90,6 @@
</table>
</if>
<else>
- <p><blockquote><i>#attachments.lt_Folder_folder_name_is#</i></blockquote></p>
+ <p><em>#attachments.lt_Folder_folder_name_is#</em></p>
</else>
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 @@
<property name="title">#attachments.lt_Upload_New_Attachment#</property>
<property name="context">@context;noquote@</property>
-#attachments.you_are_attaching_document_to_object#
+<p>#attachments.you_are_attaching_document_to_object#</p>
<form enctype=multipart/form-data method=POST action="file-add-2">
+<div>
<input type=hidden name="folder_id" value="@folder_id@">
<input type=hidden name="object_id" value="@object_id@">
<input type=hidden name="return_url" value="@return_url@">
+</div>
<table border=0>
<tr>
<td align=right>#attachments.Version_filename_# </td>
-<td><input type=file name=upload_file size=20></tr>
+<td><input type=file name=upload_file size=20></td>
</tr>
<tr>
<td> </td>
-<td><font size=-1>#attachments.lt_Use_the_Browse_button# </font></td>
+<td>#attachments.lt_Use_the_Browse_button#</td>
</tr>
<tr>
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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/bm-portlet-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/bm-portlet-2.5.0d1.apm">
<owner url="http://openacs.org">OpenACS</owner>
- <release-date>2008-01-08</release-date>
+ <release-date>2008-10-18</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
- <provides url="bm-portlet" version="2.4.0d1"/>
+ <provides url="bm-portlet" version="2.5.0d1"/>
<requires url="bulk-mail" version="0.5.1d7"/>
- <requires url="new-portal" version="2.4.0d1"/>
+ <requires url="new-portal" version="2.5.0d1"/>
<parameters>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="pretty_name" default="#bm-portlet.pretty_name#" description="Name of the bulk mail portlet to display everywhere"/>
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 "<blockquote><i>[_ bulk-mail.lt_No_bulk_mail_messages]</i></blockquote>" \
+ -Tmissing_text "<p><em>[_ bulk-mail.lt_No_bulk_mail_messages]</em></p>" \
-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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>f</singleton-p>
- <version name="2.4.0" url="http://openacs.org/repository/download/apm/calendar-2.4.0.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/calendar-2.5.0d1.apm">
<owner url="mailto:openacs-calendar@dirkgomez.de">Dirk Gomez</owner>
<summary>Personal and shared event calendars.</summary>
<release-date>2008-06-12</release-date>
@@ -16,7 +16,7 @@
<maturity>0</maturity>
<package_instance_name>#calendar.Calendar#</package_instance_name>
- <provides url="calendar" version="2.4.0"/>
+ <provides url="calendar" version="2.5.0d1"/>
<requires url="attachments" version="0.10"/>
<requires url="acs-datetime" version="5.2.2"/>
<requires url="acs-events" version="0.6d2"/>
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 @@
<msg key="Current_Permissions">Current Permissions</msg>
<msg key="Date">Date:</msg>
<msg key="Date_1">Date</msg>
+ <msg key="Day">Day</msg>
<msg key="day">day</msg>
<msg key="day_rolling_period">day rolling period</msg>
<description key="day_rolling_period">Please, could you give more info of the context for this, thanks</description>
@@ -87,6 +88,7 @@
<msg key="is_recurring">Item is recurring.</msg>
<msg key="Item">Item</msg>
<msg key="last_week">last week</msg>
+ <msg key="List">List</msg>
<msg key="lt_Are_you_sure_you_want">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.</msg>
@@ -148,6 +150,7 @@
<msg key="lt_You_have_no_party_wid">You have no party wide calendars</msg>
<msg key="Manage_Item_Types">Manage Item Types</msg>
<msg key="Monday">Monday</msg>
+ <msg key="Month">Month</msg>
<msg key="New_Type">New Type:</msg>
<msg key="next_day">Next day</msg>
<msg key="next_month">Next Month</msg>
@@ -191,6 +194,7 @@
<msg key="sync_with_Outlook">sync with Outlook</msg>
<msg key="Thursday">Thursday</msg>
<msg key="Time">Time:</msg>
+ <msg key="Time_1">Time</msg>
<msg key="Title">Title:</msg>
<msg key="Title_1">Title</msg>
<msg key="to">to</msg>
@@ -201,6 +205,7 @@
<msg key="Use_Hours_Below">Use Hours Below:</msg>
<msg key="view">View</msg>
<msg key="Wednesday">Wednesday</msg>
+ <msg key="Week">Week</msg>
<msg key="Week_of">Week of</msg>
<msg key="y-m-d">y-m-d</msg>
<msg key="year">year</msg>
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 @@
<msg key="Current_Permissions">Permisos actuales</msg>
<msg key="Date">Fecha:</msg>
<msg key="Date_1">Fecha</msg>
+ <msg key="Day">D�a</msg>
<msg key="day">d�a</msg>
<msg key="day_rolling_period">d�as</msg>
<msg key="day_s">d�a(s)</msg>
@@ -77,6 +78,7 @@
<msg key="is_recurring">El evento se repite</msg>
<msg key="Item">Evento</msg>
<msg key="last_week">semana anterior</msg>
+ <msg key="List">Lista</msg>
<msg key="lt_Are_you_sure_you_want">�Desea realmente borrar este calendario? Todos los eventos y permisos asociados ser�n borrados tambi�n.</msg>
<msg key="lt_Are_you_sure_you_want_1">�Desea realmente borrar este evento?</msg>
<msg key="lt_Audiences_for_calenda">Audiencias del calendario</msg>
@@ -130,6 +132,7 @@
<msg key="lt_You_have_no_party_wid">No tiene acceso a calendarios algunos</msg>
<msg key="Manage_Item_Types">Administrar los tipos de eventos</msg>
<msg key="Monday">Lunes</msg>
+ <msg key="Month">Mes</msg>
<msg key="New_Type">Categor�a nueva:</msg>
<msg key="next_day">D�a siguiente</msg>
<msg key="next_month">Mes siguiente</msg>
@@ -171,6 +174,7 @@
<msg key="sync_with_Outlook">sincronizar con Outlook:</msg>
<msg key="Thursday">Jueves</msg>
<msg key="Time">Hora:</msg>
+ <msg key="Time_1">Hora</msg>
<msg key="Title">T�tulo:</msg>
<msg key="Title_1">T�tulo</msg>
<msg key="to">a</msg>
@@ -181,6 +185,7 @@
<msg key="Use_Hours_Below">Horario:</msg>
<msg key="view">Vista</msg>
<msg key="Wednesday">Mi�rcoles</msg>
+ <msg key="Week">Semana</msg>
<msg key="Week_of">Semana</msg>
<msg key="y-m-d">aaaa-mm-dd</msg>
<msg key="year">a�o</msg>
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 @@
-<table class="cal-table-list" cellpadding="1" cellspacing="2" width="75%">
-<tr><td align="right">
+<div style="text-align: right">
[ <a href="@period_url_1@" title="#calendar.events_over_1d#">1</a>
|
<a href="@period_url_7@" title="#calendar.events_over_7d#">7</a>
@@ -12,61 +11,6 @@
|
<a href="@period_url_60@" title="#calendar.events_over_60d#">60</a> ]
<formtemplate id="frmdays"></formtemplate>
-</td></tr>
-<tr>
- <td align="center" valign="top">
- <h1>@start_month@ @start_day@ @start_year@ – @end_month@ @end_day@ @end_year@</h1>
- </td>
-</tr>
+</div>
-<if @items:rowcount@ gt 0>
-
-<tr>
- <td>
-
- <multiple name="items">
-
- <div class="list-entry-item @items.container_style_class@">
-
- <table class="cal-table-list" cellpadding="0" cellspacing="0" border="0" width="100%">
- <thead>
- <tr>
- <td>
- @items.weekday@, @items.start_date@ <if @items.start_time@ ne @items.end_time@>@items.start_time@ – @items.end_time@</if>
- </td>
- </tr>
- </thead>
- <tbody>
- <tr>
- <td class="@items.name_style_class@">
- <strong>#calendar.Event#</strong> <a href="@items.event_url@" title="#calendar.goto_items_event_name#">@items.event_name@</a>
- <if @show_calendar_name_p@>
- (@items.calendar_name@)
- </if>
-
- </td>
- </tr>
- <tr>
- <td class="@items.description_style_class@">
- <strong>#calendar.Description#</strong>
- <if @items.description@ eq ""><em>none</em></if><else>@items.description;noquote@</else>
-
- <a href="@items.event_print_url@" onclick="return calOpenPrintView('@items.event_print_url@');" title="#calendar.Print#"><img src="/resources/calendar/images/print-list-icon.gif" style=" text-align: right; border: 0;" alt="#calendar.Print#"></a>
- </td>
- </tr>
- </tbody>
- </table>
-
- </div>
-
- </multiple>
-
- </td>
-</tr>
-
-</if>
-<else>
-<tr><td valign="top"><i>#calendar.No_Items#</i></td></tr>
-</else>
-
-</table>
+<listtemplate name="items-list"></listtemplate>
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 {
+ <if @items.start_time@ ne @items.end_time@>
+ @items.start_time@ – @items.end_time@
+ </if>
+ <else>
+ #calendar.All_Day_Event#
+ </else>
+ }
+ }
+ 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 @@
<div style="border: 1px solid #ccc;">
<div style="background-color: #ddd; padding: 5px;">
<span style="color: maroon; font-weight: bold;">@items.event_name@</span><br>
- <span style="font-weight: bold;">#calendar.Date#</span> @items.weekday@, @items.start_date@ <if @items.start_time@ ne @items.end_time@>@items.start_time@ – @items.end_time@</if>
+ <span style="font-weight: bold;">#calendar.Date#</span> @items.start_date@ <if @items.start_time@ ne @items.end_time@>@items.start_time@ – @items.end_time@</if>
<div style="font-size:85%; color: #666; border-bottom: 1px solid #666; border-top: 1px solid #666; margin-top: 3px; margin-bottom: 3px; padding-bottom: 2px; padding-top: 2px;">
@items.calendar_name@
</div>
@@ -28,4 +28,4 @@
</multiple>
</if>
</body>
-</html>
\ No newline at end of file
+</html>
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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/calendar-portlet-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/calendar-portlet-2.5.0d1.apm">
<owner url="http://openacs.org">OpenACS</owner>
- <release-date>2008-01-08</release-date>
+ <release-date>2008-10-18</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
- <provides url="calendar-portlet" version="2.4.0d1"/>
- <requires url="calendar" version="2.1.0b7"/>
- <requires url="new-portal" version="2.4.0d1"/>
+ <provides url="calendar-portlet" version="2.5.0d1"/>
+ <requires url="calendar" version="2.5.0d1"/>
+ <requires url="new-portal" version="2.5.0d1"/>
<callbacks>
<callback type="after-upgrade" proc="calendar-portlet::after_upgrade"/>
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@">
+ <p>
<if @create_p@>
<a href="@add_item_url@" title="#calendar-portlet.Add_an_item#" class="button">#calendar-portlet.Add_an_item#</a>
</if>
<if @admin_p@>
<a href="calendar/calendar-item-types?calendar_id=@force_calendar_id@" title="#calendar-portlet.Manage_Item_Types#" class="button">#calendar-portlet.Manage_Item_Types#</a>
</if>
-
+ </p>
</td>
<td valign=top>
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 @@
<property name="change_locale">f</property>
<property name="focus">category_form.name</property>
-<blockquote>
<formtemplate id="category_form"></formtemplate>
-</blockquote>
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 {
- <if @tree.backward_exists_p@ true><img src="/resources/acs-subsite/left.gif" height="16" width="16" alt="backward link" border="0"></if>
- <if @tree.forward_exists_p@ true><img src="/resources/acs-subsite/right.gif" height="16" width="16" alt="forward link" border="0"></if>
+ <if @tree.backward_exists_p@ true><img src="/resources/acs-subsite/left.gif" height="16" width="16" alt="backward link" style="border:0"></if>
+ <if @tree.forward_exists_p@ true><img src="/resources/acs-subsite/right.gif" height="16" width="16" alt="forward link" style="border:0"></if>
}
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 {
- <if @category_links.direction@ eq f><img src="/resources/acs-subsite/right.gif" height="16" width="16" alt="forward link" border="0"></if>
- <else><img src="/resources/acs-subsite/left.gif" height="16" width="16" alt="backward link" border="0"></else>
+ <if @category_links.direction@ eq f><img src="/resources/acs-subsite/right.gif" height="16" width="16" alt="forward link" style="border:0"></if>
+ <else><img src="/resources/acs-subsite/left.gif" height="16" width="16" alt="backward link" style="border:0"></else>
}
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 {
- <if @category_links.direction@ eq f><img src="/resources/acs-subsite/right.gif" height="16" width="16" alt="forward link" border="0"></if>
- <else><img src="/resources/acs-subsite/left.gif" height="16" width="16" alt="backward link" border="0"></else>
+ <if @category_links.direction@ eq f><img src="/resources/acs-subsite/right.gif" height="16" width="16" alt="forward link" style="border:0"></if>
+ <else><img src="/resources/acs-subsite/left.gif" height="16" width="16" alt="backward link" style="border:0"></else>
}
html {align center}
}
@@ -85,7 +85,7 @@
delete {
sub_class narrow
display_template {
- <img src="/resources/acs-subsite/Delete16.gif" height="16" width="16" alt="Delete" border="0">
+ <img src="/resources/acs-subsite/Delete16.gif" height="16" width="16" alt="Delete" style="border:0">
}
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 @@
<if @change_locale@ eq t and @languages@ not nil>
<div style="float: right;">
- <formtemplate id="locale_form"></formtemplate>
+ <formtemplate id="locale_form">
+ @form_vars;noquote@
+ <table cellspacing="2" cellpadding="2" border="0">
+ <tr class="form-element"><td class="form-label">Language</td>
+ <td class="form-widget"><formwidget id="locale"></td></tr>
+ <tr class="form-element">
+ <td align="right" colspan="2"><formwidget id="formbutton:ok"></td></tr>
+ </table>
+ </formtemplate>
</div>
</if>
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 @@
<property name="change_locale">f</property>
<property name="focus">synonym_form.name</property>
-<blockquote>
<formtemplate id="synonym_form"></formtemplate>
-</blockquote>
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 {
- <img src="/resources/acs-subsite/Edit16.gif" height="16" width="16" alt="Edit" border="0">
+ <img src="/resources/acs-subsite/Edit16.gif" height="16" width="16" alt="Edit" style="border:0">
}
link_url_col edit_url
link_html {title "Edit this synonym"}
@@ -79,7 +79,7 @@
delete {
sub_class narrow
display_template {
- <img src="/resources/acs-subsite/Delete16.gif" height="16" width="16" alt="Delete" border="0">
+ <img src="/resources/acs-subsite/Delete16.gif" height="16" width="16" alt="Delete" style="border:0">
}
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 @@
<property name="change_locale">f</property>
<property name="focus">tree_form.tree_name</property>
-<blockquote>
- <include src="/packages/categories/lib/tree-form" &="tree_id" &="locale" &="ctx_id" &="object_id">
-</blockquote>
+<include src="/packages/categories/lib/tree-form" &="tree_id" &="locale">
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 @@
<property name="change_locale">f</property>
<property name="focus">tree_map_form.assign_single_p</property>
-<blockquote>
<formtemplate id="tree_map_form"></formtemplate>
-</blockquote>
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 {
- <img src="/resources/acs-subsite/Edit16.gif" height="16" width="16" alt="Edit" border="0">
+ <img src="/resources/acs-subsite/Edit16.gif" height="16" width="16" alt="Edit" style="border:0">
}
link_url_col edit_url
link_html {title "Edit this category"}
@@ -100,7 +100,7 @@
lappend elements add_child {
sub_class narrow
display_template {
- <img src="/resources/acs-subsite/Add16.gif" height="16" width="16" alt="Add" border="0">
+ <img src="/resources/acs-subsite/Add16.gif" height="16" width="16" alt="Add" style="border:0">
}
link_url_col add_url
link_html { title "Add subcategory" }
@@ -123,7 +123,7 @@
lappend elements delete {
sub_class narrow
display_template {
- <img src="/resources/acs-subsite/Delete16.gif" height="16" width="16" alt="Delete" border="0">
+ <img src="/resources/acs-subsite/Delete16.gif" height="16" width="16" alt="Delete" style="border:0">
}
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 @@
<provides url="chat" version="5.0d7"/>
<requires url="acs-kernel" version="5.0d13"/>
- <requires url="xotcl-core" version="0.36"/>
+ <requires url="xotcl-core" version="0.83"/>
<callbacks>
</callbacks>
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 @@
<msg key="Edit">Edit</msg>
<msg key="Edit_room">Edit Room</msg>
<msg key="Edit_transcript">Edit transcript</msg>
+ <msg key="Enter_html_pretty_name">Enter chat room using the HTML client</msg>
+ <msg key="Enter_rooms_pretty_name">Enter chat room</msg>
<msg key="exit_msg">exit chat room</msg>
<msg key="Extreme_Actions">Extreme Actions</msg>
<msg key="from">from</msg>
@@ -87,6 +89,7 @@
<msg key="revoke">revoke</msg>
<msg key="Revoke_moderator">Revoke moderator</msg>
<msg key="Revoke_user">Revoke user</msg>
+ <msg key="Room_active">Room active</msg>
<msg key="room_admin">Admin</msg>
<msg key="Room_deactivate">Deactive Room</msg>
<msg key="Room_Information">Room Information</msg>
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 @@
<msg key="Edit">Editar</msg>
<msg key="Edit_room">Editar sala</msg>
<msg key="Edit_transcript">Editar transcripci�n</msg>
+ <msg key="Enter_html_pretty_name">Entrar con el cliente HTML</msg>
+ <msg key="Enter_rooms_pretty_name">Entrar en el chat</msg>
<msg key="exit_msg">Salir de la sala</msg>
<msg key="Extreme_Actions">Acciones extremas</msg>
<msg key="from">de</msg>
@@ -87,6 +89,7 @@
<msg key="revoke">revocar</msg>
<msg key="Revoke_moderator">Revocar moderador</msg>
<msg key="Revoke_user">Revocar usuario</msg>
+ <msg key="Room_active">Sala activa</msg>
<msg key="room_admin">Admin</msg>
<msg key="Room_deactivate">Desactivar la sala</msg>
<msg key="Room_Information">Informaci�n de sala</msg>
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 @@
<if @edit_p@ eq 1>
-<a class="button" href="transcript-edit?transcript_id=@transcript_id@&room_id=@room_id@">#chat.Edit#</a>
+<p><a class="button" href="@edit_url@">#chat.Edit#</a></p>
</if>
<table border="0" cellpadding="2" cellspacing="2">
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 {
<if @transcript_delete_p@ eq "1">
- <a href="transcript-delete?transcript_id=@chat_transcripts.transcript_id@&room_id=@room_id@">
- <img src="/shared/images/Delete16.gif" border="0">
+ <a href="transcript-delete?transcript_id=@chat_transcripts.transcript_id@&room_id=@room_id@">
+ <img src="/shared/images/Delete16.gif" alt="#chat.Delete_transcript#">
</a>
</if>
}
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 "\
- <script type='text/javascript' language='javascript'>
+ 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 "\
+ <script type='text/javascript'>
$js
// register the data sources (for sending messages, receiving updates)
- var pushMessage = registerDataConnection(pushReceiver, '$path/ajax/chat?m=get_new&$context', false);
- var pullUpdates = registerDataConnection(updateReceiver, '$path/ajax/chat?m=get_updates&$context', true);
+ var pushMessage = registerDataConnection(pushReceiver, '$path/ajax/chat?m=get_new&$context', false);
+ var pullUpdates = registerDataConnection(updateReceiver, '$path/ajax/chat?m=get_updates&$context', true);
// register an update function to refresh the data sources every 5 seconds
var updateInterval = setInterval(updateDataConnections,5000);
</script>
<form id='ichat_form' name='ichat_form' action='#' onsubmit='pushMessage.chatSendMsg(\"$send_url\"); return false;'>
<iframe name='ichat' id='ichat' frameborder='0' src='$login_url'
- style='width:70%; border:1px solid black; margin-right:15px;' height='257'></iframe>
+ style='width:70%; border:1px solid black; margin-right:15px;' height='257'>
+ </iframe>
<iframe name='ichat-users' id='ichat-users' frameborder='0' src='$users_url'
- style='width:25%; border:1px solid black;' height='257'></iframe>
+ style='width:25%; border:1px solid black;' height='257'>
+ </iframe>
<div style='margin-top:10px;'>
#chat.message# <input tabindex='1' type='text' size='80' name='msg' id='chatMsg'>
<input type='submit' value='#chat.Send_Refresh#'>
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 @@
<master>
-<property name="context">@context_bar;noquote@</property>
-<property name="title">@room_name;noquote@</property>
+<property name="context">@context;noquote@</property>
+<property name="&doc">doc</property>
<property name="focus">ichat_form.msg</property>
<p>
<a href="room-exit?room_id=@room_id@" class="button" title="#chat.exit_msg#">#chat.Log_off#</a>
<a href="chat-transcript?room_id=@room_id@" class="button" title="#chat.transcription_msg#">#chat.Transcript#</a>
-<a href="room-enter?room_id=@room_id@&client=html" class="button" title="#chat.html_client_msg#">#chat.Hml#</a>
+<a href="@html_room_url@" class="button" title="#chat.html_client_msg#">#chat.Hml#</a>
</p>
@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 @@
<master>
-<property name="context">@context_bar;noquote@</property>
+<property name="context">@context;noquote@</property>
<property name="title">#chat.transcript_of_room# "@room_name;noquote@"</property>
-<style type='text/css'>
-#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;}
-</style>
-
<if @transcript_id@ eq 0>
<include src="/packages/chat/lib/current-messages" room_id=@room_id@>
</if>
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) {<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">}
+
+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 @@
<master>
-<property name="context">@context_bar;noquote@</property>
-<property name="title">@room_name;noquote@</property>
+<property name="context">@context;noquote@</property>
+<property name="&doc">doc</property>
-<style type='text/css'>
-#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; }
-</style>
-
<p>
<a href="room-exit?room_id=@room_id@" class=button title="#chat.exit_msg#">#chat.Log_off#</a>
<a href="chat-transcript?room_id=@room_id@" class=button title="#chat.transcription_msg#" >#chat.Transcript#</a>
-<a href="room-enter?room_id=@room_id@&client=@richclient.short@#xj220" class=button title="@richclient.msg@" >@richclient.title@</a>
+<a href="@room_enter_url@" class=button title="@richclient.msg@" >@richclient.title@</a>
</p>
<div id='messages'>
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$
-->
<master>
-<property name="context">#chat.Chat_main_page#</property>
-<property name="title">#chat.Chat_main_page#</property>
+<property name="&doc">doc</property>
<if @warning@ not nil>
<div style="border: 1px solid red; padding: 5px; margin: 10px;">
@warning;noquote@
</div>
</if>
-<if @rooms:rowcount@ eq 0>
-<p><i>#chat.There_are_no_rooms_available#</i></p>
-<if @room_create_p@ eq 1><p><a class="button" href="room-edit">#chat.Create_a_new_room#</a></p></if>
-</if>
-<else>
<listtemplate name="rooms"></listtemplate>
-</else>
-
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 {
<if @rooms.active_p@ eq t>
- <div style="padding-top:5px;">
- <img src="/resources/chat/active.png">
- </div>
+ <img src="/resources/chat/active.png" alt="#chat.Room_active#">
</if>
<else>
- <div style="padding-top:5px;">
- <img src="/resources/chat/inactive.png">
- </div>
+ <img src="/resources/chat/inactive.png" alt="#chat.Room_no_active#">
</else>
}
}
pretty_name {
label "#chat.Room_name#"
- html { width 400px }
- display_template {
- <if @rooms.active_p@ eq t>
- <a href="room-enter?room_id=@rooms.room_id@&client=$default_client">@rooms.pretty_name@</a> \[<a href="room-enter?room_id=@rooms.room_id@&client=html">#chat.HTML_chat#</a>\]
- </if>
- <else>
- @rooms.pretty_name@
- </else>
- <div style="float:left">@rooms.description@</div>
- }
+ 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 @@
<property name="title">#chat.Confirm_message_delete#</property>
<form method="post" action="message-delete-2">
-<input type=hidden name=room_id value=@room_id@>
-#chat.Are_you_sure_you_want_to_delete# @message_count@ #chat.messages_in# @pretty_name@?
-<p><input type=submit value=#acs-kernel.common_Yes#>
+<div><input type=hidden name=room_id value=@room_id@></div>
+<p>#chat.Are_you_sure_you_want_to_delete# @message_count@ #chat.messages_in# @pretty_name@?</p>
+<div><input type=submit value=#acs-kernel.common_Yes#></div>
</form>
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 @@
<property name="title">#chat.Confirm_room_delete#</property>
<form method="post" action="room-delete-2">
-<input type=hidden name=room_id value=@room_id@>
-#chat.Are_you_sure_you_want_to_delete# @pretty_name@?
-<p><input type=submit value=#acs-kernel.common_Yes#>
+<div><input type=hidden name=room_id value=@room_id@></div>
+<p>#chat.Are_you_sure_you_want_to_delete# @pretty_name@?</p>
+<div><input type=submit value=#acs-kernel.common_Yes#></div>
</form>
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 @@
<master>
<property name="title">@title@</property>
+<property name="context">@context;noquote@</property>
<formtemplate id="edit-room"></formtemplate>
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 @@
<property name="context">@context_bar;noquote@</property>
<property name="title">#chat.Room_Information#</property>
-<h4>#chat.Room_Information#</h4>
+<h1>#chat.Room_Information#</h1>
<if @room_view_p@ eq "1">
<table border="0" cellpadding="2" cellspacing="2">
<tr class="form-element">
@@ -42,28 +42,22 @@
</tr>
</table>
<if @room_edit_p@ eq "1">
-<p>
-<a class="button" href="room-edit?room_id=@room_id@">#chat.Edit#</a>
-<a class="button" href="/permissions/one?object_id=@room_id@">#acs-kernel.common_Permissions#</a>
+ <a class="button" href="room-edit?room_id=@room_id@">#chat.Edit#</a>
+ <a class="button" href="/permissions/one?object_id=@room_id@">#acs-kernel.common_Permissions#</a>
</if>
<if @room_delete_p@ eq "1">
-<a class="button" href="message-delete?room_id=@room_id@">#chat.Delete_all_messages_in_the_room#</a>
-<a class="button" href="room-delete?room_id=@room_id@">#chat.Delete_room#</a>
+ <a class="button" href="message-delete?room_id=@room_id@">#chat.Delete_all_messages_in_the_room#</a>
+ <a class="button" href="room-delete?room_id=@room_id@">#chat.Delete_room#</a>
</if>
</if>
<else>
-<p><i>#chat.No_information_available#.
+ <p><i>#chat.No_information_available#</i></p>
</else>
-<p><b>#chat.Users_ban#</b></p>
+<h2>#chat.Users_ban#</h2>
<listtemplate name="banned_users"></listtemplate>
-<if @user_ban_p@ eq "1">
-<p><a class="button" href="search?room_id=@room_id@&type=ban">#chat.Ban_user#</a>
-</if>
-<p><b>#chat.Transcripts#</b>
-<include src="/packages/chat/lib/transcripts" room_id=@room_id@>
+<h2>#chat.Transcripts#</h2>
<if @transcript_create_p@ eq "1">
-<p><a class="button" href="transcript-new?room_id=@room_id@">#chat.Create_transcript#</a>
+<include src="/packages/chat/lib/transcripts" room_id=@room_id@>
</if>
-
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 {
- <if @user_unban_p@ eq "1">
- <a href="user-unban?room_id=@room_id@&party_id=@banned_users.party_id@">
- <img src="/shared/images/Delete16.gif" border="0">
- </a>
- </if>
- }
+ 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 @@
<property name="title">#chat.Add_user_to_room#</property>
<property name="context">@context;noquote@</property>
-<if @search_type@ eq "keyword">
-
- #dotlrn.lt_The_results_of_your_s#<BR>
+<p>
+ <if @search_type@ eq "keyword">
+ #dotlrn.lt_The_results_of_your_s#<BR>
(#chat.What_search# @SQL_LIMIT@)
- </if><else>
- <if @search_type@ eq "email">
- for email "@email@"
- </if><else>
- for last name "@last_name@"
-</else></else>
+ </if>
+ <else>
+ <if @search_type@ eq "email">
+ for email "@email@"
+ </if>
+ <else>
+ for last name "@last_name@"
+ </else>
+ </else>
+</p>
<ul>
<multiple name="user_search">
<li>
- <a href="search-3?room_id=@room_id@&type=@type@&party_id=@user_search.user_id@">
+ <a href="@user_search.url@">
@user_search.first_names@ @user_search.last_name@ (@user_search.email@)
</a>
</li>
</multiple>
<if @user_search:rowcount@ eq 0>
- <li>No users found.
+ <li>No users found.</li>
</if>
</ul>
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 @@
<property name="context">@context;noquote@</property>
<FORM METHOD=get ACTION=search-2>
- <input type="hidden" name="room_id" value="@room_id@" />
- <input type="hidden" name="target" value="one" />
- <input type="hidden" name="type" value="@type@" />
- <input type="text" size="15" name="keyword" />
- <input type="submit" value="#acs-subsite.Search_For_Exist_User#" />
+ <div>
+ <input type="hidden" name="room_id" value="@room_id@">
+ <input type="hidden" name="target" value="one">
+ <input type="hidden" name="type" value="@type@">
+ </div>
+ <p>
+ <input type="text" size="15" name="keyword">
+ <input type="submit" value="#acs-subsite.Search_For_Exist_User#">
+ </p>
</FORM>
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$
-->
<master>
-<property name="context">@context_bar;noquote@</property>
+<property name="context">@context;noquote@</property>
<property name="title">#chat.Confirm_chat_transcript_delete#</property>
<form method="post" action="transcript-delete-2">
+<div>
<input type="hidden" name="transcript_id" value="@transcript_id@">
<input type="hidden" name="room_id" value="@room_id@">
-#chat.Are_you_sure_you_want_to_delete# <b>Replace with transcript name</b>?
-<p><input type="submit" value="#acs-kernel.common_Yes#">
+</div>
+<p>#chat.Are_you_sure_you_want_to_delete# <b>Replace with transcript name</b>?</p>
+<p><input type="submit" value="#acs-kernel.common_Yes#"></p>
</form>
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$
-->
<master>
-<property name="context">@context_bar;noquote@</property>
+<property name="context">@context;noquote@</property>
<property name="title">@title;noquote@</property>
-<form action="@action@" method="post">
+<form action="@action@" method="post" class="margin-form">
+ <div>
<input type="hidden" name="transcript_id" value="@transcript_id@">
<input type="hidden" name="room_id" value="@room_id@">
<input type="hidden" name="contents" value="@contents@">
- <table border="0" cellpadding="2" cellspacing="2">
- <tr class="form-element">
- <td class="form-label">#chat.Transcript_name#</th>
- <td><input size="50" name="transcript_name" value="@transcript_name@"></td>
- </tr>
- <tr class="form-element">
- <td class="form-label">#chat.Delete_messages#</td>
- <td><input type="checkbox" name="delete_messages">
- <div class="form-help-text">
- <img src="/shared/images/info.gif" alt="[i]" title="Help text" border="0" height="9" width="12">
+ </div>
+ <div class="form-item-wrapper">
+ <div class="form-label">
+ <label for="transcript_name">#chat.Transcript_name#</label>
+ </div>
+ <div class="form-widget">
+ <input size="50" name="transcript_name" id="transcript_name" value="@transcript_name@">
+ </div>
+ </div>
+ <div class="form-item-wrapper">
+ <div class="form-label">
+ <label for="delete_messages">#chat.Delete_messages#</label>
+ </div>
+ <div class="form-widget">
+ <input type="checkbox" name="delete_messages" id="delete_messages">
+ </div>
+ <div class="form-help-text">
+ <img src="/shared/images/info.gif" alt="Help text" height="9" width="12">
#chat.delete_messages_after_transcript#
+ </div>
+ </div>
+ <if @active_p@ eq "t">
+ <div class="form-item-wrapper">
+ <div class="form-label">
+ <label for="deactivate_room">#chat.Room_deactivate#</label>
</div>
- </td>
- </tr>
- <if @active_p@ eq "t">
- <tr class="form-element">
- <td class="form-label">#chat.Room_deactivate#</td>
- <td><input type="checkbox" name="deactivate_room">
+ <div class="form-widget">
+ <input type="checkbox" name="deactivate_room" id="deactivate_room">
+ </div>
<div class="form-help-text">
- <img src="/shared/images/info.gif" alt="[i]" title="Help text" border="0" height="9" width="12">
+ <img src="/shared/images/info.gif" alt="Help text" height="9" width="12">
#chat.deactivate_room_after_transcript#
</div>
- </td>
- </tr>
- </if>
- <tr class="form-element">
- <td class="form-label">#chat.Description#</th>
- <td><textarea name="description" rows=6 cols=65>@description@</textarea>
- </tr>
- <tr class="form-element">
- <td class="form-label">#chat.Contents#</th>
- <td><div style="border: 1px solid #A4B97F; padding:3px; color: #666666;">@contents;noquote@</div>
- </tr>
- <tr class="form-element">
- <td><input type="submit" value="@submit_label@">
- </table>
-
+ </div>
+ </if>
+ <div class="form-item-wrapper">
+ <div class="form-label">
+ <label for="description">#chat.Description#</label>
+ </div>
+ <div class="form-widget">
+ <textarea name="description" id="description" rows=6 cols=65>@description@</textarea>
+ </div>
+ </div>
+ <div class="form-item-wrapper">
+ <div class="form-label">#chat.Contents#</div>
+ <div class="form-widget">
+ <div style="border: 1px solid #222; padding: 3px">@contents;noquote@</div>
+ </div>
+ </div>
+ <div class="form-button">
+ <input type="submit" value="@submit_label@">
+ </div>
</form>
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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/chat-portlet-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/chat-portlet-2.5.0d1.apm">
<owner url="http://opeancs.org">OpenACS</owner>
- <release-date>2006-12-31</release-date>
+ <release-date>2008-10-18</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
- <provides url="chat-portlet" version="2.4.0d1"/>
- <requires url="dotlrn" version="2.4.0d1"/>
- <requires url="new-portal" version="2.4.0d1"/>
- <requires url="chat" version="5.0d6"/>
+ <provides url="chat-portlet" version="2.5.0d1"/>
+ <requires url="dotlrn" version="2.5.0d1"/>
+ <requires url="new-portal" version="2.5.0d1"/>
+ <requires url="chat" version="5.0d7"/>
</version>
</package>
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
</querytext>
</fullquery>
@@ -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
</querytext>
</fullquery>
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
</querytext>
</fullquery>
@@ -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
</querytext>
</fullquery>
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 @@
#
%>
-<property name="context">@context;noquote@</property>
-<property name="title">#chat.Chat_main_page#</property>
-
-<if @community_id@ gt 0 and @room_create_p@ ne 0>
-[<a href="@chat_url@room-edit" title="#chat.Create_a_new_room#">#chat.Create_a_new_room#</a>]
+<if @shaded_p@ false>
+ <listtemplate name="chat_rooms"></listtemplate>
</if>
-
-<if @rooms:rowcount@ eq 0 or @num_rooms@ eq 0>
-<p><i>#chat.There_are_no_rooms_available#</i></p>
-</if>
<else>
- <table border=0>
- <multiple name=rooms>
- <if @rooms.can_see_p@ eq 1>
- <tr>
- <td valign=top><a href="@rooms.base_url@room-enter?room_id=@rooms.room_id@&client=@default_mode@">@rooms.pretty_name@</a></td>
- <td valign=top>
- [ <a href="@rooms.base_url@room-enter?room_id=@rooms.room_id@&client=html">#chat-portlet.html_mode#</a> ]
- </td>
- <td valign=top>
- <if @rooms.admin_p@ eq "t">
- [<a href="@rooms.base_url@room?room_id=@rooms.room_id@">#chat.room_admin#</a>]
- </if>
- <if @rooms.active_p@ ne "t">
- (NO #chat.Active#)
- </if>
- <td valign=top>
- <I>@rooms.description@</I>
- </td>
- </tr>
- </if>
- </multiple>
- </table>
+ #new-portal.when_portlet_shaded#
</else>
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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>f</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/dotlrn-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/dotlrn-2.5.0d1.apm">
<owner url="http://openacs.org">OpenACS</owner>
<summary>A Course Management System</summary>
- <release-date>2008-01-08</release-date>
+ <release-date>2008-10-18</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
<description format="text/html">Course Management</description>
- <provides url="dotlrn" version="2.4.0d1"/>
- <requires url="acs-kernel" version="5.3.1a1"/>
- <requires url="acs-lang" version="5.3.1a1"/>
+ <provides url="dotlrn" version="2.5.0d1"/>
+ <requires url="acs-kernel" version="5.4.2"/>
+ <requires url="acs-lang" version="5.4.2"/>
<requires url="attachments" version="0.10"/>
- <requires url="new-portal" version="2.4.0d1"/>
- <requires url="user-profile" version="2.4.0d1"/>
+ <requires url="new-portal" version="2.5.0d1"/>
+ <requires url="user-profile" version="2.5.0d1"/>
<callbacks>
<callback type="after-install" proc="dotlrn::apm::after_install"/>
- <callback type="before-uninstall" proc="dotlrn::apm::before_uninstall"/>
<callback type="after-instantiate" proc="dotlrn::apm::after_instantiate"/>
<callback type="after-upgrade" proc="dotlrn::apm::after_upgrade"/>
+ <callback type="before-uninstall" proc="dotlrn::apm::before_uninstall"/>
</callbacks>
<parameters>
- <parameter datatype="string" min_n_values="1" max_n_values="1" name="DefaultSiteTemplate" default="#new-portal.sloan_theme_name#" description="The name of the default site template"/>
<parameter datatype="number" min_n_values="1" max_n_values="1" name="AdminChangeSiteTemplate_p" default="1" description="desc" section_name=".LRN Portal Types"/>
- <parameter datatype="string" min_n_values="1" max_n_values="1" name="admin_page_name" default="#dotlrn.admin_page_name#" description="The name of the admin page"/>
- <parameter datatype="string" min_n_values="1" max_n_values="1" name="admin_layout_name" default="#new-portal.simple_2column_layout_name#" description="The layout of the admin page"/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="AutoAddAuthorities" default="*" description="A comma-separated list of short-names of authorities for which users should be automatically added to .LRN, or '*' for all. In order for users to be auto-added, AutoAddUsersP needs to be set to 1, and this needs to be set to * or include the relevant authority short_names. Example: 'local,ldap'." section_name="Auto-Adding Users to .LRN"/>
<parameter datatype="number" min_n_values="1" max_n_values="1" name="AutoAddUsersP" default="0" description="Automatically add OpenACS users to .LRN. 1 = yes, 0 = no. In order for users to be auto-added, this needs to be set to 1, and AutoAddAuthorities needs to be set to * or include the relevant authority short_names." section_name="Auto-Adding Users to .LRN"/>
- <parameter datatype="string" min_n_values="1" max_n_values="1" name="auto_dotlrn_user_email_patterns" description="Automatic dotLRN user email patterns"/>
<parameter datatype="number" min_n_values="1" max_n_values="1" name="AutoUserAccessLevel" default="1" description="The access level of auto-added users. 1 = Full access user, 0 = Limited access user" section_name="Auto-Adding Users to .LRN"/>
<parameter datatype="number" min_n_values="1" max_n_values="1" name="AutoUserReadPrivateDataP" default="1" description="Auto-added user's guest status. 1 = Not a guest , 0 = Guest." section_name="Auto-Adding Users to .LRN"/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="AutoUserType" default="student" description="The user type for auto-approved users." section_name="Auto-Adding Users to .LRN"/>
- <parameter datatype="string" min_n_values="1" max_n_values="1" name="classes_pretty_name" default="#dotlrn.classes_pretty_name#" description="used to display everywhere in the ui"/>
- <parameter datatype="string" min_n_values="1" max_n_values="1" name="classes_pretty_plural" default="#dotlrn.classes_pretty_plural#" description="used everywhere in the ui"/>
+ <parameter datatype="number" min_n_values="1" max_n_values="1" name="CommDefaultSiteTemplate_p" default="0" description="This is the site_template_id used by default when creating a community. If you want to change this parameter go to Dotlrn Admin and Click in Site Templates; then Choose wich is the Site Template for default when creating users." section_name=".LRN Portal Types"/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="ConvertBinPath" default="/usr/bin/convert" description="path to the ImageMagick convert binary"/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="DefaultCommunityJoinMailP" default="0" description="If there is no welcome mail for new members in the database, should a default one be send?" section_name="Communities"/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="DefaultMaster_p" default="/packages/theme-zen/lib/lrn-master" description="Default master for public pages ( user_id = 0 )" section_name=".LRN Portal Types"/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="DefaultSiteTemplate" default="#theme-zen.Zen_Theme#" description="The name of the default site template"/>
+ <parameter datatype="number" min_n_values="1" max_n_values="1" name="SelfRegistrationP" default="1" description="Allow a user to join/leave communities or classes."/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="SelfRegistrationRedirectTo" default="/dotlrn" description="URL to redirect to if user is not allowed to join/leave a community or class instead of displaying the 'Not Allowed' page."/>
+ <parameter datatype="number" min_n_values="1" max_n_values="1" name="UserChangeSiteTemplate_p" default="0" description="Indicates if all users are able to change their Site Template. A value of 0 indicates that users cannot change it. A value of 1 indicates that users can." section_name=".LRN Portal Types"/>
+ <parameter datatype="number" min_n_values="1" max_n_values="1" name="UserDefaultSiteTemplate_p" default="0" description="This is the site_template_id used by default when creating a user. If you want to change this parameter go to Dotlrn Admin and Click in Site Templates; then Choose wich is the Site Template for default when creating users." section_name=".LRN Portal Types"/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="admin_layout_name" default="#theme-zen.Zen_2_column#" description="The layout of the admin page"/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="admin_page_name" default="#dotlrn.admin_page_name#" description="The name of the admin page"/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="auto_dotlrn_user_email_patterns" description="Automatic dotLRN user email patterns"/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="class_group_type_key" default="dotlrn_class" description="Class Group Type"/>
- <parameter datatype="string" min_n_values="1" max_n_values="1" name="class_instance_pages_csv" default="#dotlrn.class_page_home_title#,#new-portal.simple_2column_layout_name#,#dotlrn.class_page_home_accesskey#;#dotlrn.class_page_calendar_title#,#new-portal.simple_1column_layout_name#,#dotlrn.class_page_calendar_accesskey#;#dotlrn.class_page_file_storage_title#,#new-portal.simple_1column_layout_name#,#dotlrn.class_page_file_storage_accesskey#" description="cvs list of the page_name/layout to create"/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="class_instance_pages_csv" default="#dotlrn.class_page_home_title#,#theme-zen.Zen_thin_thick#,#dotlrn.class_page_home_accesskey#;#dotlrn.class_page_calendar_title#,#theme-zen.Zen_1_column#,#dotlrn.class_page_calendar_accesskey#;#dotlrn.class_page_file_storage_title#,#theme-zen.Zen_1_column#,#dotlrn.class_page_file_storage_accesskey#" description="cvs list of the page_name/layout to create"/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="class_instance_portal_pretty_name" default="#dotlrn.class_instance_portal_pretty_name#" description="the nice name for the class instance portal template"/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="class_instances_pretty_name" default="#dotlrn.class_instances_pretty_name#" description="used to display everywhere in the ui"/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="class_instances_pretty_plural" default="#dotlrn.class_instances_pretty_plural#" description="used everywhere in the ui"/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="classes_pretty_name" default="#dotlrn.classes_pretty_name#" description="used to display everywhere in the ui"/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="classes_pretty_plural" default="#dotlrn.classes_pretty_plural#" description="used everywhere in the ui"/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="club_group_type_key" default="dotlrn_club" description="Class Group Type"/>
- <parameter datatype="string" min_n_values="1" max_n_values="1" name="club_pages_csv" default="#dotlrn.club_page_home_title#,#new-portal.simple_2column_layout_name#,#dotlrn.club_page_home_accesskey#;#dotlrn.club_page_calendar_title#,#new-portal.simple_1column_layout_name#,#dotlrn.club_page_calendar_accesskey#;#dotlrn.club_page_file_storage_title#,#new-portal.simple_1column_layout_name#,#dotlrn.club_page_file_storage_accesskey#;#dotlrn.club_page_people_title#,#new-portal.simple_1column_layout_name#,#dotlrn.club_page_people_accesskey#" description="same"/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="club_pages_csv" default="#dotlrn.club_page_home_title#,#theme-zen.Zen_thin_thick#,#dotlrn.club_page_home_accesskey#;#dotlrn.club_page_calendar_title#,#theme-zen.Zen_1_column#,#dotlrn.club_page_calendar_accesskey#;#dotlrn.club_page_file_storage_title#,#theme-zen.Zen_1_column#,#dotlrn.club_page_file_storage_accesskey#;#dotlrn.club_page_people_title#,#theme-zen.Zen_1_column#,#dotlrn.club_page_people_accesskey#" description="same"/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="clubs_pretty_name" default="#dotlrn.clubs_pretty_name#" description="used everywhere in the ui"/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="clubs_pretty_plural" default="#dotlrn.clubs_pretty_plural#" description="used everywhere in the ui"/>
- <parameter datatype="number" min_n_values="1" max_n_values="1" name="CommDefaultSiteTemplate_p" default="0" description="This is the site_template_id used by default when creating a community. If you want to change this parameter go to Dotlrn Admin and Click in Site Templates; then Choose wich is the Site Template for default when creating users." section_name=".LRN Portal Types"/>
<parameter datatype="number" min_n_values="1" max_n_values="1" name="community_level_p" description="Whether this is a Class Instance Level instantiation of the package"/>
<parameter datatype="number" min_n_values="1" max_n_values="1" name="community_type_level_p" description="Whether this is a Class Level instance of the package"/>
- <parameter datatype="string" min_n_values="1" max_n_values="1" name="ConvertBinPath" default="/usr/bin/convert" description="path to the ImageMagick convert binary"/>
- <parameter datatype="string" min_n_values="1" max_n_values="1" name="default_class_instance_applets" default="dotlrn_dotlrn,dotlrn_fs,dotlrn_forums,dotlrn_calendar,dotlrn_faq,dotlrn_news,dotlrn_research,dotlrn_static,dotlrn_bm,dotlrn_syllabus,dotlrn_homework_applet,dotlrn_survey" description="dotLRN applets to add by default to each new community"/>
- <parameter datatype="string" min_n_values="1" max_n_values="1" name="default_club_applets" default="dotlrn_dotlrn,dotlrn_fs,dotlrn_forums,dotlrn_calendar,dotlrn_faq,dotlrn_news,dotlrn_static,dotlrn_bm,dotlrn_survey,dotlrn_expense_tracking,dotlrn_attendance" description="the applets to add when making a new club"/>
- <parameter datatype="string" min_n_values="1" max_n_values="1" name="DefaultMaster_p" default="/packages/dotlrn/www/dotlrn-master" description="Default master for public pages ( user_id = 0 )" section_name=".LRN Portal Types"/>
- <parameter datatype="string" min_n_values="1" max_n_values="1" name="default_subcomm_applets" default="dotlrn_dotlrn,dotlrn_fs,dotlrn_forums,dotlrn_calendar,dotlrn_faq,dotlrn_news,dotlrn_static,dotlrn_bm,dotlrn_survey" description="see above"/>
- <parameter datatype="string" min_n_values="1" max_n_values="1" name="default_user_portal_applets" default="dotlrn_dotlrn,dotlrn_calendar,dotlrn_forums,dotlrn_faq,dotlrn_fs,dotlrn_news,dotlrn_survey" description="a csv list of the applets to call when creating the user portal template"/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="default_class_instance_applets" default="dotlrn_dotlrn,dotlrn_fs,dotlrn_forums,dotlrn_calendar,dotlrn_faq,dotlrn_news,dotlrn_static,dotlrn_bm,dotlrn_syllabus,dotlrn_homework_applet" description="dotLRN applets to add by default to each new community"/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="default_club_applets" default="dotlrn_dotlrn,dotlrn_fs,dotlrn_forums,dotlrn_calendar,dotlrn_faq,dotlrn_news,dotlrn_static,dotlrn_bm" description="the applets to add when making a new club"/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="default_subcomm_applets" default="dotlrn_dotlrn,dotlrn_fs,dotlrn_forums,dotlrn_calendar,dotlrn_faq,dotlrn_news,dotlrn_static,dotlrn_bm" description="The applets to add when making a new subgroup"/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="default_user_portal_applets" default="dotlrn_dotlrn,dotlrn_calendar,dotlrn_forums,dotlrn_faq,dotlrn_fs,dotlrn_news" description="a csv list of the applets to call when creating the user portal template"/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="departments_pretty_name" default="#dotlrn.departments_pretty_name#" description="used everywhere in the ui"/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="departments_pretty_plural" default="#dotlrn.departments_pretty_plural#" description="used everywhere in the ui"/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="dotlrn_admin_pretty_name" default="#dotlrn.dotlrn_admin_pretty_name#" description="What is dotlrn administration displayed as? Some might want 'Site Wide Administration' and some might with 'dotLRN Administration'"/>
@@ -67,24 +72,19 @@
<parameter datatype="number" min_n_values="1" max_n_values="1" name="dotlrn_level_p" description="Whether this is the top-level instantiation of the DotLRN package"/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="dotlrn_main_portlet_pretty_name" default="#dotlrn.dotlrn_main_portlet_pretty_name#" description="The pretty name for the dotlrn main portlet (aka "My Groups")"/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="dotlrn_main_portlet_region" default="2" description="The region of the user's workspace portal to put the dotlrn main portlet into. 1 is the leftmost. 2 is the next region to the left. etc."/>
- <parameter datatype="number" min_n_values="1" max_n_values="1" name="dotlrn_toolbar_enabled_p" default="1" description="Enable or disable the dotlrn toolbar" section_name="Toolbar"/>
+ <parameter datatype="number" min_n_values="1" max_n_values="1" name="dotlrn_toolbar_enabled_p" default="0" description="Enable or disable the dotlrn toolbar" section_name="Toolbar"/>
<parameter datatype="number" min_n_values="1" max_n_values="1" name="dotlrn_toolbar_show_info_p" default="0" description="Show relevant information to developpers." section_name="Toolbar"/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="group_type_key" default="dotlrn_community" description="Class Group Type"/>
<parameter datatype="number" min_n_values="1" max_n_values="1" name="hide_personal_portal_p" default="0" description="Some systems may wish to keep the personal portal hidden. Setting this value to 1 will cause dotlrn to exclude navigation to the personal portal from community portals, and disable the entire navbar on non-community portal pages."/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="non_member_layout_name" default="#theme-zen.Zen_2_column#" description="The name of the not a member page"/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="non_member_page_name" default="#dotlrn.non_member_page_name#" description="The name of the not a member page"/>
- <parameter datatype="string" min_n_values="1" max_n_values="1" name="non_member_layout_name" default="#new-portal.simple_2column_layout_name#" description="The name of the not a member page"/>
<parameter datatype="number" min_n_values="1" max_n_values="1" name="show_portrait_p" default="1" description="Should we show and solicit user portraits? 1=Yes, 0=No"/>
- <parameter datatype="string" min_n_values="1" max_n_values="1" name="subcomm_pages_csv" default="#dotlrn.subcomm_page_home_title#,#new-portal.simple_2column_layout_name#,#dotlrn.subcomm_page_home_accesskey#;#dotlrn.subcomm_page_info_title#,#new-portal.simple_1column_layout_name#,#dotlrn.subcomm_page_info_accesskey#;#dotlrn.subcomm_page_calendar_title#,#new-portal.simple_1column_layout_name#,#dotlrn.subcomm_page_calendar_accesskey#;#dotlrn.subcomm_page_file_storage_title#,#new-portal.simple_1column_layout_name#,#dotlrn.subcomm_page_file_storage_accesskey#" description="default page names and layouts for subcomms"/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="subcomm_pages_csv" default="#dotlrn.subcomm_page_home_title,#theme-zen.Zen_thin_thick#,#dotlrn.subcomm_page_home_accesskey#;#dotlrn.subcomm_page_info_title#,#theme-zen.Zen_1_column#,#dotlrn.subcomm_page_info_accesskey#;#dotlrn.subcomm_page_calendar_title#,#theme-zen.Zen_1_column#,#dotlrn.subcomm_page_calendar_accesskey#;#dotlrn.subcomm_page_file_storage_title#,#theme-zen.Zen_1_column#,#dotlrn.subcomm_page_file_storage_accesskey#" description="default page names and layouts for subcomms"/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="subcommunities_pretty_name" default="#dotlrn.subcommunities_pretty_name#" description="what subcomms are called"/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="subcommunities_pretty_plural" default="#dotlrn.subcommunities_pretty_plural#" description="the plural"/>
<parameter datatype="number" min_n_values="1" max_n_values="1" name="user" default="user" description="Defines which subtype of dotlrn portal type is going to be used by default when creating a new User portal." section_name=".LRN Portal Types"/>
- <parameter datatype="number" min_n_values="1" max_n_values="1" name="UserChangeSiteTemplate_p" default="0" description="Indicates if all users are able to change their Site Template. A value of 0 indicates that users cannot change it. A value of 1 indicates that users can." section_name=".LRN Portal Types"/>
- <parameter datatype="number" min_n_values="1" max_n_values="1" name="UserDefaultSiteTemplate_p" default="0" description="This is the site_template_id used by default when creating a user. If you want to change this parameter go to Dotlrn Admin and Click in Site Templates; then Choose wich is the Site Template for default when creating users." section_name=".LRN Portal Types"/>
- <parameter datatype="string" min_n_values="1" max_n_values="1" name="user_portal_pages_csv" default="#dotlrn.user_portal_page_home_title#,#new-portal.simple_2column_layout_name#,#dotlrn.user_portal_page_home_accesskey#;#dotlrn.user_portal_page_calendar_title#,#new-portal.simple_1column_layout_name#,#dotlrn.user_portal_page_calendar_accesskey#;#dotlrn.user_portal_page_file_storage_title#,#new-portal.simple_1column_layout_name#,#dotlrn.user_portal_page_file_storage_accesskey#" description="a csv list of the other pages to create on the user wsp by default"/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="user_portal_pages_csv" default="#dotlrn.user_portal_page_home_title#,#theme-zen.Zen_thin_thick#,#dotlrn.user_portal_page_home_accesskey#;#dotlrn.user_portal_page_calendar_title#,#theme-zen.Zen_1_column#,#dotlrn.user_portal_page_calendar_accesskey#;#dotlrn.user_portal_page_file_storage_title#,#theme-zen.Zen_1_column#,#dotlrn.user_portal_page_file_storage_accesskey#" description="a csv list of the other pages to create on the user wsp by default"/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="user_portal_pretty_name" default="#dotlrn.user_portal_pretty_name#" description="the pretty name for the user portal"/>
- <parameter datatype="string" min_n_values="1" max_n_values="1" name="DefaultCommunityJoinMailP" default="0" description="If there is no welcome mail for new members in the database, should a default one be send?" section_name="Communities"/>
- <parameter datatype="number" min_n_values="1" max_n_values="1" name="SelfRegistrationP" default="1" description="Allow a user to join/leave communities or classes."/>
- <parameter datatype="string" min_n_values="1" max_n_values="1" name="SelfRegistrationRedirectTo" default="/dotlrn" description="URL to redirect to if user is not allowed to join/leave a community or class instead of displaying the 'Not Allowed' page."/>
</parameters>
</version>
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 @@
<msg key="Administer">Administer</msg>
<msg key="administer_link"><img border=0 src="/resources/dotlrn/admin.gif" alt="Administer"></msg>
<msg key="Administration">Administration</msg>
- <msg key="Administration_Accesskey">a</msg>
+ <msg key="Administration_Accesskey">9</msg>
<msg key="Administration_Cockpit">Administration Cockpit</msg>
<msg key="Administrator">Administrator</msg>
<msg key="Administrators">Administrators</msg>
@@ -116,9 +116,10 @@
<msg key="clubs_pretty_name">Community</msg>
<msg key="clubs_pretty_plural">Communities</msg>
<msg key="Cockpit">Cockpit</msg>
+ <msg key="Collapse_list">Collapse list</msg>
<msg key="Comma_Separated_Values">Comma Separated Values</msg>
<msg key="Communities">Communities</msg>
- <msg key="Communities_Accesskey">m</msg>
+ <msg key="Communities_Accesskey">6</msg>
<msg key="Community">Community</msg>
<msg key="community_header_name">%clubs_pretty_name% Name</msg>
<msg key="Community_ID">Community ID</msg>
@@ -140,17 +141,18 @@
<msg key="Confirm_Drop">Confirm Drop</msg>
<msg key="Confirmation">Confirmation</msg>
<msg key="control_panel">Control Panel</msg>
- <msg key="control_panel_accesskey">p</msg>
+ <msg key="control_panel_accesskey">7</msg>
<msg key="Copy">Copy</msg>
<msg key="couldnt_find_user_id">We couldn't find user #%user_id%; perhaps this person was deleted?</msg>
<msg key="course_admin_role_pretty_name">Course Administrator</msg>
<msg key="course_admin_role_pretty_plural">Course Administrators</msg>
<msg key="course_assistant_role_pretty_name">Course Assistant</msg>
<msg key="course_assistant_role_pretty_plural">Course Assistants</msg>
<msg key="Courses">Courses</msg>
- <msg key="Courses_Accesskey">r</msg>
+ <msg key="Courses_Accesskey">5</msg>
<msg key="Create_A_New_User">Create A New User</msg>
<msg key="Create_a_Web_Log">Create a Web Log</msg>
+ <msg key="Create_and_add_a_member">Create and add a member</msg>
<msg key="Create_Club">Create Club</msg>
<msg key="Created">Created</msg>
<msg key="CSV_File_Format">CSV File Format</msg>
@@ -199,7 +201,7 @@
<msg key="Drop">Drop</msg>
<msg key="Drop_from_subgroup_name">Drop from subgroup %subgroup_name%</msg>
<msg key="Drop_Membership">Drop Membership</msg>
- <msg key="drop_membership_link"><img src="/resources/dotlrn/drop.gif" alt="Drop Membership" border=0></msg>
+ <msg key="drop_membership_link"><img src="/resources/dotlrn/drop.gif" alt="Drop Membership" style="border:0"></msg>
<msg key="Drop_selected_members">Drop selected members</msg>
<msg key="Edit">Edit</msg>
<msg key="Edit_a_User">Edit a User</msg>
@@ -229,6 +231,8 @@
<msg key="End_date_help">Actual end date</msg>
<msg key="Error_sending_mail">Error sending mail</msg>
<msg key="Example_File">Example File</msg>
+ <msg key="Expand_list">Expand list</msg>
+ <msg key="Export_members_list_to_CSV">Export members list to a CSV file</msg>
<msg key="External_URL">External URL</msg>
<msg key="External_URL_1">External URL:</msg>
<msg key="Extra_Large">Extra Large</msg>
@@ -276,7 +280,7 @@
<msg key="help">Help</msg>
<msg key="hide_lrn_toolbar">Hide .LRN toolbar</msg>
<msg key="Home">Home</msg>
- <msg key="Home_Accesskey">h</msg>
+ <msg key="Home_Accesskey">1</msg>
<msg key="HTML">HTML</msg>
<msg key="ID">ID:</msg>
<msg key="ID_1">ID</msg>
@@ -325,7 +329,7 @@
<msg key="lt_Communitys_Web_Addres">Community's Web Address</msg>
<msg key="lt_Current_clubs_pretty_">Current %clubs_pretty_plural%</msg>
<msg key="lt_Delete_class">Delete subject</msg>
- <msg key="lt_do_not_use_p_tags"><font color="red">Do not use P tags for paragraphs</font></msg>
+ <msg key="lt_do_not_use_p_tags">Do not use P tags for paragraphs</msg>
<msg key="lt_Do_you_really_want_to">Do you really want to remove the following members?</msg>
<msg key="lt_Do_you_really_want_to_1">Do you really want to remove %num_users% users?</msg>
<msg key="lt_dotLRN_properties_for">dotLRN properties for this user.</msg>
@@ -612,6 +616,8 @@
<msg key="show_lrn_toolbar">Show .LRN Toolbar</msg>
<msg key="silver">silver</msg>
<msg key="Site-wide_Admin">Site-wide Admin?</msg>
+ <msg key="Site_Map">Site Map</msg>
+ <msg key="Site_Map_Title">Go to the Site Map</msg>
<msg key="Site_Template_Add">Add New Site Template</msg>
<msg key="Site_Template_Adding">Add Site Template</msg>
<msg key="Site_Template_AdminParams">Admin Parameters for Site Templating</msg>
@@ -673,6 +679,7 @@
preceded by the *@ string which match
&lt;anything&gt;@&lt;email-domain&gt;). For example, you might use:</msg>
<msg key="The_name">The name</msg>
+ <msg key="The_users_have_been_added_">The user(s) have been added to the selected community. You can send an email to welcome the users to the community.</msg>
<msg key="there_are_no_users_matching">There are no users matching %search_text%.</msg>
<msg key="this_user_is_deleted">this user is deleted</msg>
<msg key="To">Member types to email:</msg>
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 @@
<msg key="Administer">Administrar</msg>
<msg key="administer_link"><img border=0 valign="bottom" src="graphics/admin.gif" alt="Administrar"></msg>
<msg key="Administration">Administraci�n</msg>
- <msg key="Administration_Accesskey">a</msg>
+ <msg key="Administration_Accesskey">9</msg>
<msg key="Administration_Cockpit">Administraci�n Cockpit</msg>
<msg key="Administrator">Administrador</msg>
<msg key="Administrators">Administradores</msg>
@@ -109,9 +109,10 @@
<msg key="clubs_pretty_name">Comunidad</msg>
<msg key="clubs_pretty_plural">Comunidades</msg>
<msg key="Cockpit">Cockpit</msg>
+ <msg key="Collapse_list">Colapsar lista</msg>
<msg key="Comma_Separated_Values">Exportar en formato CSV</msg>
<msg key="Communities">Comunidades</msg>
- <msg key="Communities_Accesskey">c</msg>
+ <msg key="Communities_Accesskey">6</msg>
<msg key="Community">Comunidad</msg>
<msg key="community_header_name">T�tulo de %clubs_pretty_name%</msg>
<msg key="Community_ID">Identificador de la comunidad</msg>
@@ -130,17 +131,18 @@
<msg key="Confirm_Drop">Confirmar borrado</msg>
<msg key="Confirmation">Confirmaci�n</msg>
<msg key="control_panel">Panel de control</msg>
- <msg key="control_panel_accesskey">p</msg>
+ <msg key="control_panel_accesskey">7</msg>
<msg key="Copy">Copiar</msg>
<msg key="couldnt_find_user_id">El usuario %user_id% no ha podido ser encontrado. Es posible que haya sido borrado.</msg>
<msg key="course_admin_role_pretty_name">Administrador del curso</msg>
<msg key="course_admin_role_pretty_plural">Administradores del curso</msg>
<msg key="course_assistant_role_pretty_name">Tutor</msg>
<msg key="course_assistant_role_pretty_plural">Tutores</msg>
<msg key="Courses">Cursos</msg>
- <msg key="Courses_Accesskey">r</msg>
+ <msg key="Courses_Accesskey">5</msg>
<msg key="Create_A_New_User">Crear un nuevo usuario</msg>
<msg key="Create_a_Web_Log">Crear un weblog</msg>
+ <msg key="Create_and_add_a_member">Crear y a�adir usuario</msg>
<msg key="Create_Club">Crear comunidad</msg>
<msg key="Created">Creado</msg>
<msg key="CSV_File_Format">Formato CSV</msg>
@@ -216,6 +218,8 @@
<msg key="End_date_help">Fecha de finalizaci�n actual</msg>
<msg key="Error_sending_mail">Error al enviar el correo</msg>
<msg key="Example_File">Archivo ejemplo</msg>
+ <msg key="Expand_list">Expandir lista</msg>
+ <msg key="Export_members_list_to_CSV">Exportar lista de usuarios a un fichero CSV</msg>
<msg key="External_URL">Servidor web propio</msg>
<msg key="External_URL_1">Servidor propio:</msg>
<msg key="Extra_Large">Muy grande</msg>
@@ -263,7 +267,7 @@
<msg key="help">Ayuda</msg>
<msg key="hide_lrn_toolbar">Esconder la barra de .LRN</msg>
<msg key="Home">Inicio</msg>
- <msg key="Home_Accesskey">h</msg>
+ <msg key="Home_Accesskey">1</msg>
<msg key="HTML">HTML</msg>
<msg key="ID">Identificador:</msg>
<msg key="ID_1">Identificador</msg>
@@ -307,7 +311,7 @@
<msg key="lt_Communitys_Web_Addres">Direcci�n web de la comunidad</msg>
<msg key="lt_Current_clubs_pretty_">%clubs_pretty_plural% actuales</msg>
<msg key="lt_Delete_class">Borrar asignatura</msg>
- <msg key="lt_do_not_use_p_tags"><font color="red">No use etiquetas P para los p�rrafos</font></msg>
+ <msg key="lt_do_not_use_p_tags">No use etiquetas P para los p�rrafos</msg>
<msg key="lt_Do_you_really_want_to">�Desea realmente borrar los miembros siguientes?</msg>
<msg key="lt_Do_you_really_want_to_1">�Desea realmente borrar estos %num_users% usuarios?</msg>
<msg key="lt_dotLRN_properties_for">Propiedades dotLRN para este usuario.</msg>
@@ -550,6 +554,8 @@
<msg key="show_lrn_toolbar">Mostrar bara .LRN</msg>
<msg key="silver">plateado</msg>
<msg key="Site-wide_Admin">�Administrador del sitio?</msg>
+ <msg key="Site_Map">Mapa del sitio</msg>
+ <msg key="Site_Map_Title">Ir al Mapa del Sitio</msg>
<msg key="Site_Template_Add">A�adir una nueva plantilla</msg>
<msg key="Site_Template_Adding">A�adir plantilla general</msg>
<msg key="Site_Template_AdminParams">Par�metros de administraci�n para plantillas generales</msg>
@@ -610,6 +616,7 @@
<msg key="the_format_of_email_domains">Introducir una lista de dominios separados por comas. Por ejemplo:
</msg>
<msg key="The_name">El nombre</msg>
+ <msg key="The_users_have_been_added_">El usuario ha sido a�adido a la comunidad seleccionada. Puede enviarle un correo electr�nico para darle la bienvenida a la mencionada comunidad.</msg>
<msg key="there_are_no_users_matching">No hay usuarios que coincidan con %search_text%.</msg>
<msg key="this_user_is_deleted">este usuario ha sido borrado</msg>
<msg key="To">A</msg>
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 @@
-<br clear="all" />
-<br />
+<br>
+<br>
<if @user_id@>
<h3>@user.name;noquote@
<if @edit_bio_url@ not nil>
<a href="@edit_bio_url@" class="button">#dotlrn.Edit_Biography#</a>
</if>
</h3>
-<br />
+<br>
<if @portrait_p@>
-<img @widthheight@ src="/shared/portrait-bits.tcl?@export_vars@" alt="Portrait of @user.name@" align="left" style="padding-right: 10px;">
+<img @widthheight@ src="/shared/portrait-bits.tcl?@export_vars@" alt="Portrait of @user.name@" style="padding-right: 10px;">
</if>
@user.bio;noquote@
</if>
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) <br />"
+ append available_vars_help "$var $available_vars($var) <br>"
}
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 @@
<a href="@dotlrn_admin_url@/" title="Dotlrn admin">#dotlrn.Admin#</a>
<span style="color: #cccccc;">|</span>
- <a href="@dotlrn_admin_url@/toolbar-actions?action=@info_action@&return_url=@return_url@" title="@info_title@">@info_title@</a>
+ <a href="@info_url@" title="@info_title@">@info_title@</a>
</td>
- <td id="search">
- <form action="@dotlrn_admin_url@/toolbar-actions" method="POST">
- <input type="hidden" name="action" value="search" />
- <label for="keyword">#dotlrn.Search#</label>
- <input name="keyword" onfocus="if(this.value=='#dotlrn.Search_Text#')this.value='';" onblur="if(this.value=='')this.value='#dotlrn.Search_Text#';" value="#dotlrn.Search_Text#" />
- in:<select name="search_type"><option value="users">#dotlrn.Users#</option><option value="departments">#dotlrn.departments_pretty_plural#</option><option value="subjects">#dotlrn.classes_pretty_plural#</option><option value="classes">#dotlrn.Classes#</option></select>
- <input type="submit" value="#dotlrn.Search#" />
- </form>
- </td>
+ <td id="search">
+ <form action="@dotlrn_admin_url@/toolbar-actions" method="POST">
+ <input type="hidden" name="action" value="search" />
+ <label for="keyword">#dotlrn.Search#</label>
+ <input id="keyword" name="keyword" onfocus="if(this.value=='#dotlrn.Search_Text#')this.value='';" onblur="if(this.value=='')this.value='#dotlrn.Search_Text#';" value="#dotlrn.Search_Text#" />
+ in:<select name="search_type"><option value="users">#dotlrn.Users#</option><option value="departments">#dotlrn.departments_pretty_plural#</option><option value="subjects">#dotlrn.classes_pretty_plural#</option><option value="classes">#dotlrn.Classes#</option></select>
+ <input type="submit" value="#dotlrn.Search#" />
+ </form>
+ </td>
<td>
- <a href="@dotlrn_admin_url@/toolbar-actions?action=hide&return_url=@return_url@" style="font-size:80%;" title="Hide me">Hide me</a>
+ <a href="@hide_me_url@" style="font-size:80%;" title="Hide me">Hide me</a>
</td>
</tr>
@@ -54,6 +54,7 @@
<li><i>context_id:</i> <span> @package_id@ </span></li>
<li><i>community_id:</i> <span> @community_id@ </span> </li>
<li><i>portal_id:</i> <span> @portal_id@ </span> </li>
+ <li><i>package_id:</i> <span>@package_id@</span> </li>
</ul>
</td>
</tr>
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 "
<p>
Failed to deliver to $email because:
-<blockquote>
[ad_quotehtml $errmsg]
-</blockquote>
</p>
"
}
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" "<blockquote> You don't have permission to view this page. </blockquote>"
+ ad_return_forbidden "Permission Denied" "<p> You don't have permission to view this page. </p>"
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 @@
<div class="portlet-wrapper">
<div class="portlet-header">
<div class="portlet-title-no-controls">
- @portlet_title@
+ <h1>@portlet_title@</h1>
</div> <!-- portlet-title -->
</div>
<div class="portlet">
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 @@
<li>[_ dotlrn.lt_You_tried_to_upload_a]
<li>[_ dotlrn.lt_You_double-clicked_th]
</ul>
- <p>
- [_ dotlrn.lt_Here_is_the_actual_er]
- <blockquote>
+ <p>[_ dotlrn.lt_Here_is_the_actual_er]</p>
<pre>
$errmsg
- </pre>
- </blockquote>"
+ </pre>"
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 @@
<table bgcolor=#99CCFF cellspacing=0 cellpadding=2 border=0>
<tr>
<td><b>#dotlrn.Header_Font#</b> </td>
- <td nowrap><input type="text" name="header_font" size="50" value="@header_font@" /></td>
+ <td nowrap><input type="text" name="header_font" size="50" value="@header_font@"></td>
</tr>
<tr>
@@ -56,12 +56,12 @@
<tr>
<td><b>#dotlrn.Header_Font_Color#</b> </td>
<td nowrap>
- <input type="text" name="header_font_color" value="@header_font_color@" size="50" /></td>
+ <input type="text" name="header_font_color" value="@header_font_color@" size="50"></td>
</tr>
<tr>
<td><b>#dotlrn.header_logo#</b> </td>
- <td><img src=@header_url@></tr>
+ <td><img src="@header_url@"></tr>
</tr>
<tr>
@@ -72,11 +72,11 @@
<tr>
<td><b>#dotlrn.Header_Alternate_Text#</b> </td>
<td nowrap>
- <input type="text" name="header_alt_text" value="@header_alt_text@" size="50" /></td>
+ <input type="text" name="header_alt_text" value="@header_alt_text@" size="50"></td>
</tr>
<tr><td align=center colspan=2>
- <input type="submit" name="preview_button" value="#dotlrn.Preview#" /></td>
+ <input type="submit" name="preview_button" value="#dotlrn.Preview#"></td>
</tr>
</table>
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 @@
<if @member_state@ eq "deleted">
- <blockquote><font color="red">#dotlrn.this_user_is_deleted#</font></blockquote>
+ <p><strong>#dotlrn.this_user_is_deleted#</strong></p>
</if>
<else><if @member_state@ eq "banned">
- <blockquote><font color="red">#dotlrn.lt_this_user_is_deleted_#</font></blockquote>
+ <p><strong>#dotlrn.lt_this_user_is_deleted_#</strong></p>
</if></else>
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 @@
<if @account_status@ eq "closed">
#acs-subsite.Account_closed_workspace_msg#
</if>
+
+ <if @notifications_url@ not nil>
+ <a href="@notifications_url@" title="#acs-subsite.Manage_your_notifications#" class="button">#acs-subsite.Manage_your_notifications#</a>
+ </if>
+
<if @allowed_to_change_site_template_p@>
<a href="change-site-template?referer=@dotlrn_url@/control-panel" title="#dotlrn.Customize_Template#" class="button">#dotlrn.Customize_Template#</a>
</if>
+ <a href="configure" title="#dotlrn.Customize_Layout#" class="button">#dotlrn.Customize_Layout#</a>
+
<if @change_locale_url@ not nil>
<a href="@change_locale_url@" title="#acs-subsite.Change_locale_label#" class="button">#acs-subsite.Change_locale_label#</a>
</if>
- <if @notifications_url@ not nil>
- <a href="@notifications_url@" title="#acs-subsite.Manage_your_notifications#" class="button">#acs-subsite.Manage_your_notifications#</a>
- </if>
-
- <a href="configure" title="#dotlrn.Customize_Layout#" class="button">#dotlrn.Customize_Layout#</a>
-
<a href="../user/password-update" title="#acs-subsite.Change_my_Password#" class="button">#acs-subsite.Change_my_Password#</a>
<if @account_status@ ne "closed">
<a href="/pvt/unsubscribe" title="#acs-subsite.Close_your_account#" class="button">#acs-subsite.Close_your_account#</a>
</if>
- <if @admin_p@>
- <a href="@admin_url@" title="#dotlrn.goto_admin_pretty_name#" class="button">@admin_pretty_name@</a>
- </if>
</div> <!-- /portlet -->
</div><!-- /portlet-wrapper -->
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 @@
<div class="portlet-wrapper">
<div class="portlet-header">
<div class="portlet-title-no-controls">
- @portlet_title@
+ <h1>@portlet_title@</h1>
</div>
</div>
<div class="portlet">
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 @@
<master>
<property name="title">#dotlrn.help#</property>
-<font face="Verdana, Arial, Helvetica, sans-serif">
<H1>
- <center>
Group Administrator FAQ
- </center>
</H1>
+
<p>
- <center>
(For user information, please read the Help page in your Control Panel)
- </center>
<p>This FAQ contains these sections:
<p><a href="../Members"><b>Dealing with Members</b></a><br>
<a href="../Content"><b>Managing Content</b></a><br>
<b><a href="../Next%20Term">Preparing for Next Term </a></b>
<p>
If your question is not answered, please email your site administrator.
-<p>
+
<H2><a name="Members">Dealing with Members</a></H2>
+<p>
<b>Q. Who will have access to my dotlearn class?</b><br>
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.</p>
-<p>
+
<H2><a name="Members">Managing Content</a></H2>
-<br>
+<p>
<b>Q. Do all the administrators of the class have the same privileges?</b> <br>
A. Yes, all administrator roles have full control over the content and membership
of the community.<br>
@@ -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.
</p>
+
<H2><a name="Next Term">Preparing for Next Term</a></H2>
-<br>
+<p>
<b>Q. What happens to my class at the end of the semester?</b><br>
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. </p>
-</font>
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@
<ul class="mktree" style="padding-left: 5px;"><li id="dotlrn-main-@communities.simple_community_type@">
-<h3 style="display: inline; margin: 5px 0 0 0;">
+<h2 style="display: inline; margin: 5px 0 0 0;">
<if @communities.simple_community_type@ eq "dotlrn_class_instance">
<%= [parameter::get -localize -parameter class_instances_pretty_plural] %>
</if>
<else>
<%= [parameter::get -localize -parameter clubs_pretty_plural] %>
</else>
-</h3><small>( <a href="#" style="text-decoration: none; border: 0;" onClick="expandTree('tree-@communities.simple_community_type@'); this.parentNode.parentNode.className = nodeOpenClass; return false;">++</a> | <a href="#" style="text-decoration: none; border: 0;" onClick="collapseTree('tree-@communities.simple_community_type@'); this.parentNode.parentNode.className = nodeClosedClass; return false;">--</a> )</small>
+</h2><small>( <a href="#" title="#dotlrn.Expand_list#" style="text-decoration: none; border: 0;" onClick="expandTree('tree-@communities.simple_community_type@'); this.parentNode.parentNode.className = nodeOpenClass; return false;">++</a> | <a href="#" title="#dotlrn.Collapse_list#" style="text-decoration: none; border: 0;" onClick="collapseTree('tree-@communities.simple_community_type@'); this.parentNode.parentNode.className = nodeClosedClass; return false;">--</a> )</small>
<ul id="tree-@communities.simple_community_type@"><li>
<group column="simple_community_type">
@communities.intra_type_ul_tags;noquote@
<a href="@communities.url@" title="#dotlrn.goto_communities_pretty_name_portal#">@communities.pretty_name@</a>
- <if @communities.archived_p@><font color=red>Archived</font></if>
+ <if @communities.archived_p@><span style="color:red">Archived</span></if>
<if @show_buttons_p@ eq 1>
<if @show_drop_button_p@ eq 1>
<small>
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 @@
<master src="@dotlrn_master@">
+ <if @doc_type@ not nil><property name="doc_type">@doc_type;noquote@</property></if>
<if @title@ not nil><property name="title">@title;noquote@</property></if>
+
+ <if @doc@ defined><property name="&doc">doc</property></if>
+
<if @context@ not nil><property name="context">@context;noquote@</property></if>
<if @context_bar@ not nil><property name="context_bar">@context_bar;noquote@</property></if>
<if @focus@ not nil><property name="focus">@focus;noquote@</property></if>
- <if @doc_type@ not nil><property name="doc_type">@doc_type;noquote@</property></if>
<if @link_control_panel@ not nil><property name="link_control_panel">@link_control_panel;noquote@</property></if>
<if @hide_feedback@ not nil><property name="hide_feedback">@hide_feedback@</property></if>
- <if @title@ not nil><property name="title">@title;noquote@</property></if>
<if @portal_page_p@ not nil><property name="portal_page_p">@portal_page_p;noquote@</property></if>
<slave>
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 @@
<master>
<property name="title">#dotlrn.help#</property>
-<font face="Verdana, Arial, Helvetica, sans-serif">
-<H1>dotlrn User FAQ</H1><br>
+<H1>dotlrn User FAQ</H1>
+<p>
<b>Q: How do I change my password? </b><br>
A: Go to your Control Panel page or to the Help icon in the page banner. Select
"Change Password."<br>
@@ -75,4 +75,3 @@
open before these steps are executed.
</p>
-</font>
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 @@
<master>
<property name="title">#dotlrn.Add_A_Member#</property>
<property name="context">#dotlrn.Add_A_Member#</property>
+<property name="focus">member-add-2.rel_type</property>
<h1>#dotlrn.Add_A_Member#</h1>
@@ -33,10 +34,10 @@
#dotlrn.lt_You_are_adding_strong#<p>
</else>
-<form method="get" action="member-add-3">
+<form method="get" action="member-add-3" name="member-add-2">
<input type="hidden" name="user_id" value="@user_id@">
<input type="hidden" name="referer" value="@referer@">
- #dotlrn.Role#
+ <label for="rel_type">#dotlrn.Role#</label>
<select name="rel_type">
<if @allowed_to_add_student@ false and @dotlrn_admin@ false>
Index: openacs-4/packages/dotlrn/www/member-add-3.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-add-3.tcl,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/dotlrn/www/member-add-3.tcl 16 Nov 2007 20:58:55 -0000 1.13
+++ openacs-4/packages/dotlrn/www/member-add-3.tcl 9 Nov 2008 23:29:23 -0000 1.14
@@ -30,59 +30,58 @@
set community_id [dotlrn_community::get_community_id]
# See if the user is already in the group
-foreach uid $user_id {
- set member_p [dotlrn_community::member_p $community_id $uid]
+foreach member_id $user_id {
+ set member_p [dotlrn_community::member_p $community_id $member_id]
set skip_p 0
if {$member_p} {
- # get the rel_info
- db_1row get_rel_info ""
-
+ # get the rel_info
+ db_1row get_rel_info ""
+
# if new rel type is same as old then
# no sense in doing anything
- if {$rel_type eq $old_rel_type} {
+ if {$rel_type eq $old_rel_type} {
set skip_p 1
}
-
+
if {!$skip_p} {
# this is just a change rel
# so we do not want to call remove_user
# as that removes subgroup rels as well
relation_remove $rel_id
util_memoize_flush "dotlrn_community::list_users_not_cached -rel_type $rel_type -community_id $community_id"
- set change_rel_p 1
+ set change_rel_p 1
}
} else {
- # if the user is not a member
- # then we could not possibly be
- # changing the rel_type so set to 0
- set change_rel_p 0
+ # if the user is not a member
+ # then we could not possibly be
+ # changing the rel_type so set to 0
+ set change_rel_p 0
}
-
+
# Add the relation
if {!$skip_p} {
- if {$change_rel_p} {
- # if this is just a change rel then
- # no need to call add_user as the user
- # has already been added before and
- # add_user_to_community should have
- # taken care of everything
- set extra_vars [ns_set create]
- ns_set put $extra_vars user_id $uid
- ns_set put $extra_vars community_id $community_id
- ns_set put $extra_vars class_instance_id $community_id
+ if {$change_rel_p} {
+ # if this is just a change rel then
+ # no need to call add_user as the user
+ # has already been added before and
+ # add_user_to_community should have
+ # taken care of everything
+ set extra_vars [ns_set create]
+ ns_set put $extra_vars user_id $member_id
+ ns_set put $extra_vars community_id $community_id
+ ns_set put $extra_vars class_instance_id $community_id
- relation_add \
- -member_state "approved" \
- -extra_vars $extra_vars \
- $rel_type \
- $community_id \
- $uid
- util_memoize_flush "dotlrn_community::list_users_not_cached -rel_type $rel_type -community_id $community_id"
- } else {
- dotlrn_community::add_user -rel_type $rel_type $community_id $uid
- }
+ relation_add \
+ -member_state "approved" \
+ -extra_vars $extra_vars \
+ $rel_type \
+ $community_id \
+ $member_id
+ util_memoize_flush "dotlrn_community::list_users_not_cached -rel_type $rel_type -community_id $community_id"
+ } else {
+ dotlrn_community::add_user -rel_type $rel_type $community_id $member_id
+ }
}
}
ad_returnredirect $referer
-
Index: openacs-4/packages/dotlrn/www/member-add-3.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-add-3.xql,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/dotlrn/www/member-add-3.xql 16 Nov 2007 20:45:52 -0000 1.1
+++ openacs-4/packages/dotlrn/www/member-add-3.xql 9 Nov 2008 23:29:23 -0000 1.2
@@ -10,7 +10,7 @@
select rel_id, rel_type as old_rel_type
from dotlrn_member_rels_full
where community_id = :community_id
- and user_id = :uid
+ and user_id = :member_id
</querytext>
</fullquery>
</queryset>
\ No newline at end of file
Index: openacs-4/packages/dotlrn/www/member-add-oracle.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-add-oracle.xql,v
diff -u -r1.7 -r1.8
--- openacs-4/packages/dotlrn/www/member-add-oracle.xql 8 Aug 2006 21:26:24 -0000 1.7
+++ openacs-4/packages/dotlrn/www/member-add-oracle.xql 9 Nov 2008 23:29:23 -0000 1.8
@@ -12,6 +12,7 @@
email
from dotlrn_users
where lower(last_name) like lower('%' || :search_text || '%')
+ or lower(first_names) like lower('%' || :search_text || '%')
or lower(email) like lower('%' || :search_text || '%')
and user_id not in (select user_id
from dotlrn_member_rels_full
Index: openacs-4/packages/dotlrn/www/member-confirm.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/member-confirm.adp,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/dotlrn/www/member-confirm.adp 15 May 2007 20:14:25 -0000 1.3
+++ openacs-4/packages/dotlrn/www/member-confirm.adp 9 Nov 2008 23:29:23 -0000 1.4
@@ -5,5 +5,5 @@
<h1>@page_title@</h1>
<p>@confirm_message;noquote@
-<br /><br />
+<br><br>
<input type="button" value="Yes" onClick="window.location='@action_url;noquote@'"> <input type="button" value="No" onClick="javascript: history.go(-1)">
\ 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 @@
<h1>@page_title@</h1>
-<p>The user(s) have been added to the selected community. You can send an email to welcome the users to the community. </p>
+<p>#dotlrn.The_users_have_been_added_#</p>
<include src="/packages/dotlrn/lib/member-email-confirm" &=community_id>
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 @@
<h3>#dotlrn.Add_New_Members#</h3>
- <blockquote>
<p>
#dotlrn.lt_The_following_members#
</p>
<p>
#dotlrn.lt_First_check_the_box_o#
</p>
- </blockquote>
<formtemplate id="parent_users_form">
<table width="75%" border="0">
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 @@
<h3>#dotlrn.Add_New_Members#</h3>
- <blockquote>
<p>
#dotlrn.lt_The_following_members#
</p>
<p>
#dotlrn.lt_First_check_the_box_o#
</p>
- </blockquote>
<formtemplate id="parent_users_form">
<table width="75%" border="0">
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 @@
<property name="link_all">1</property>
<property name="context">@context;noquote@</property>
-<if @spam_p@ true>
-<p>
- <a href="spam-recipients?community_id=@community_id@">#dotlrn.Email_Members#</a>
-</p>
-</if>
+<h1>#dotlrn.Manage_Membership#</h1>
<if @admin_p@ eq 1 and @subcomm_p@ eq 0>
-<form method="get" action="member-add">
- #dotlrn.Add_A_Member# <input type="text" name="search_text"><input
- type="submit" value="#dotlrn.search#">
- <input type="hidden" name="referer" value="@return_url@">
-</form>
-<a href="@add_member_url;noquote@" class="button">Create and add a member</a>
-<p />
+ <div style="padding: 5px 0px;">
+ <form method="get" action="member-add" class="inline-form">
+ <div><input type="hidden" name="referer" value="@return_url@"></div>
+ <div class="form-item-wrapper">
+ <label for="search_text">
+ #dotlrn.Add_A_Member#
+ <input type="text" name="search_text" id="search_text">
+ </label>
+ </div>
+ <div class="form-button">
+ <input type="submit" value="#dotlrn.search#">
+ </div>
+ </form>
+ </div>
</if>
<listtemplate name="members"></listtemplate>
<if @admin_p@ eq 1>
<if @pending_users:rowcount@ gt 0 or @approval_policy_p@ eq 1>
- <h1>#dotlrn.Membership_Requests#</h1>
+ <h2>#dotlrn.Membership_Requests#</h2>
<listtemplate name="pending_users"></listtemplate>
</if>
</if>
<if @admin_p@ eq 1 and @subcomm_p@ eq 1 and @n_parent_users@ gt 0>
- <hr>
+ <h2>#dotlrn.Add_New_Members#</h2>
- <h1>#dotlrn.Add_New_Members#</h1>
-
- <blockquote>
<p>
#dotlrn.lt_The_following_members#
</p>
<p>
#dotlrn.lt_First_check_the_box_o#
</p>
- </blockquote>
<formtemplate id="parent_users_form">
- <table width="75%" border="0">
+ <table>
- <tr>
- <td width="15%" align="center"><strong>#dotlrn.Dont_Add#</strong></td>
- <td width="15%" align="center"><strong>#dotlrn.Member#</strong></td>
- <td width="15%" align="center"><strong>#dotlrn.Administrator#</strong></td>
- <td> </td>
- </tr>
+ <thead>
+ <tr>
+ <th>#dotlrn.Dont_Add#</th>
+ <th>#dotlrn.Member#</th>
+ <th>#dotlrn.Administrator#</th>
+ <th>#dotlrn.Users#</th>
+ </tr>
+ </thead>
+ <tbody>
<%
foreach user $parent_user_list {
@@ -84,23 +86,20 @@
%>
<tr>
-<formgroup id="selected_user.@this_user_id@" cols="3">
- <td width="15%" align="center">@formgroup.widget;noquote@</td>
+<formgroup id="selected_user.@this_user_id@">
+ <td align="center">@formgroup.widget;noquote@</td>
</formgroup>
- <td>@this_last_name@, @this_first_names@ (@this_email@)</td>
+ <td>@this_last_name@, @this_first_names@</td>
</tr>
<%
}
%>
- <tr><td colspan="4"> </td></tr>
-
<tr>
- <td><input type="submit" value="#dotlrn.add_selected_members#"></td>
- <td colspan="3"> </td>
+ <td colspan="4" align="center"><input type="submit" value="#dotlrn.add_selected_members#"></td>
</tr>
-
+ </tbody>
</table>
</formtemplate>
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" "<blockquote>
-# You don't have permission to view this page.
-# </blockquote>"
-# 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 {
- <if @members.portrait_p@ true or @members.bio_p@ true>
- <a href="@members.member_url@">
- <img src="/resources/acs-subsite/profile-16.png" height="16" width="16" alt="#acs-subsite.Profile#" title="#acs-subsite.lt_User_has_portrait_title#" border="0">
- </a>
- </if>
- <if @members.update_bio_p@ eq 1>
- <br><a href=bio-update?user_id=@members.user_id@&return_url=$return_url>Update bio</a>
- </if>
-
- }
- } last_name {
- label "[_ acs-subsite.Last_name]"
- html "align left"
- display_template {
- <a href="@members.member_url@">@members.last_name;noquote@</a>
- }
- } first_names {
- label "[_ acs-subsite.First_names]"
- html "align left"
- display_template {
- <a href="@members.member_url@">@members.first_names@</a>
- }
- } email {
- label "[_ dotlrn.Email_1]"
- html "align left"
- display_template {
- <a href="mailto:@members.email@">@members.email@</a>
- }
- } role {
- label "[_ dotlrn.Role]"
- html "align left"
- }
+ portrait {
+ label ""
+ html "align right"
+ display_template {
+ <if @members.portrait_p@ true>
+ <a href="@members.member_url@">
+ <img src="/resources/acs-subsite/profile-16.png" height="16" width="16" alt="#acs-subsite.Profile#" title="#acs-subsite.lt_User_has_portrait_title#" style="border:0">
+ </a>
+ </if>
+ }
+ hide_p $csv_p
+ } last_name {
+ label "[_ acs-subsite.Last_name]"
+ html "align left"
+ display_template {
+ <a href="@members.member_url@">@members.last_name;noquote@</a>
+ }
+ } first_names {
+ label "[_ acs-subsite.First_names]"
+ html "align left"
+ display_template {
+ <a href="@members.member_url@">@members.first_names@</a>
+ }
+ } 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 {
- <if @members.user_id@ ne \"\">
- <a href="member-confirm?user_id=@members.user_id@&referer=@members.member_referer@">#dotlrn.Drop_Membership#</a> |
- <a href="member-add-2?user_id=@members.user_id@&referer=@members.member_referer@">#dotlrn.User_Admin_Page#</a>
- </if>
- }
- }
+ label "[_ dotlrn.Actions]"
+ html "align left"
+ display_template {
+ <if @members.user_id@ ne \"\">
+ <a href="member-confirm?user_id=@members.user_id@&referer=@members.member_referer@">#dotlrn.Drop_Membership#</a> |
+ <a href="member-add-2?user_id=@members.user_id@&referer=@members.member_referer@">#dotlrn.User_Admin_Page#</a>
+ </if>
+ }
+ }
}
# 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 "<select name=\"rel_type\">"
-# foreach role $rel_types {
-# append selection "<option value=\"[lindex $role 0]\">[lang::util::localize [lindex $role 2]]</option>"
-# }
-# append selection "</select>"
-# 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 {
- <a href="@pending_users.member_url@">@pending_users.last_name;noquote@</a>
- }
+ label "[_ acs-subsite.Last_name]"
+ html "align left"
+ display_template {
+ <a href="@pending_users.member_url@">@pending_users.last_name;noquote@</a>
+ }
} first_names {
- label "[_ acs-subsite.First_names]"
- html "align left"
- display_template {
- <a href="@pending_users.member_url@">@pending_users.first_names@</a>
- }
+ label "[_ acs-subsite.First_names]"
+ html "align left"
+ display_template {
+ <a href="@pending_users.member_url@">@pending_users.first_names@</a>
+ }
} email {
- label "[_ dotlrn.Email_1]"
- html "align left"
- display_template {
- <a href="mailto:@pending_users.email@">@pending_users.email@</a>
- }
+ label "[_ dotlrn.Email_1]"
+ html "align left"
+ display_template {
+ <a href="mailto:@pending_users.email@">@pending_users.email@</a>
+ }
} role {
- label "[_ dotlrn.Role]"
- html "align left"
+ label "[_ dotlrn.Role]"
+ html "align left"
} action {
- label "[_ dotlrn.Actions]"
- html "align left"
- display_template {
- <a href="approve?user_id=@pending_users.user_id@&referer=@pending_users.pending_user_referer@">#dotlrn.Approve#</a> |
- <a href="reject?user_id=@pending_users.user_id@&referer=@pending_users.pending_user_referer@">#dotlrn.Reject#</a>
- }
+ label "[_ dotlrn.Actions]"
+ html "align left"
+ display_template {
+ <a href="approve?user_id=@pending_users.user_id@&referer=@pending_users.pending_user_referer@">#dotlrn.Approve#</a> |
+ <a href="reject?user_id=@pending_users.user_id@&referer=@pending_users.pending_user_referer@">#dotlrn.Reject#</a>
+ }
}
}
-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 @@
<property name="context_bar">@context_bar@</property>
<property name="title">@title@</property>
-<p></p>
-
-<blockquote>
+<p>
@description@
-</blockquote>
+</p>
-<p></p>
-
-<blockquote>
<include src="community-types-chunk" title="@community_type_title@">
-</blockquote>
<if @self_registration_p@>
-<p></p>
-
-<blockquote>
<include src="communities-chunk" title="@communities_title@" community_type="@community_type@">
-</blockquote>
</if>
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 @@
%>
-<blockquote>
-
<table>
<tr>
@@ -64,7 +62,6 @@
</table>
-</blockquote>
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]
-<blockquote><pre>
+<pre>
[ad_quotehtml $errmsg]
-</pre></blockquote>"
+</pre>"
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 @@
<h1>#dotlrn.lt_Add_a_new_user_to_Slo#</h1>
<if @community_p@ eq 1>
-<blockquote>
+<p>
#dotlrn.lt_Note_use_this_feature#
+</p>
<ol>
<li>#dotlrn.lt_If_this_person_is_a_M#
<li>#dotlrn.lt_Be_sure_that_the_pers#
@@ -44,7 +45,6 @@
</else>
</ul>
</ol>
-</blockquote>
</if>
<include src="/packages/acs-subsite/lib/user-new" next_url="@next_url;noquote@" self_register_p="0"/>
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 @@
<form action="class" method="GET">
#dotlrn.Search_classes_with#
- <input name="keyword" onfocus="if(this.value=='#dotlrn.Please_type_a_keyword#')this.value='';" onblur="if(this.value=='')this.value='#dotlrn.Please_type_a_keyword#';" value="#dotlrn.Please_type_a_keyword#" />
- <input type="hidden" name="class_key" value="@class_key@" />
- <input type="hidden" name="term_id" value="@term_id@" />
- <input type="submit" value="#dotlrn.Go#" />
+ <input name="keyword" onfocus="if(this.value=='#dotlrn.Please_type_a_keyword#')this.value='';" onblur="if(this.value=='')this.value='#dotlrn.Please_type_a_keyword#';" value="#dotlrn.Please_type_a_keyword#">
+ <input type="hidden" name="class_key" value="@class_key@">
+ <input type="hidden" name="term_id" value="@term_id@">
+ <input type="submit" value="#dotlrn.Go#">
</form>
<br>
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 @@
</th>
</tr>
</table>
- <br/>
+ <br>
<div style="text-align:center;">
<form action="classes" method="GET">
#dotlrn.Search_subjects_with#
- <input name="keyword" onfocus="if(this.value=='#dotlrn.Please_type_a_keyword#')this.value='';" onblur="if(this.value=='')this.value='#dotlrn.Please_type_a_keyword#';" value="#dotlrn.Please_type_a_keyword#" />
+ <input name="keyword" onfocus="if(this.value=='#dotlrn.Please_type_a_keyword#')this.value='';" onblur="if(this.value=='')this.value='#dotlrn.Please_type_a_keyword#';" value="#dotlrn.Please_type_a_keyword#">
- <input type="hidden" name="department_key" value="@department_key@" />
- <input type="hidden" name="page" value="@page@" />
- <input type="submit" value="#dotlrn.Go#" />
+ <input type="hidden" name="department_key" value="@department_key@">
+ <input type="hidden" name="page" value="@page@">
+ <input type="submit" value="#dotlrn.Go#">
</form>
</div>
<if @classes:rowcount@ gt 0>
- <br />
+ <br>
<listtemplate name="classes"></listtemplate>
</if>
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 @@
<property name="title">#dotlrn.lt_Add_community_name_Me#</property>
<property name="context_bar">@context_bar@</property>
-<strong><font color=red>#dotlrn.Note#</font></strong>
+<p style="color:red"><strong>#dotlrn.Note#</strong></p>
-#dotlrn.lt_This_action_will_take_1#
+<p>#dotlrn.lt_This_action_will_take_1#</p>
-<p></p>
-
<formtemplate id="select_community"></formtemplate>
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 @@
<center>
<form action="departments" method="GET">
#dotlrn.Search_departments_with#
- <input name="keyword" onfocus="if(this.value=='#dotlrn.Please_type_a_keyword#')this.value='';" onblur="if(this.value=='')this.value='#dotlrn.Please_type_a_keyword#';" value="#dotlrn.Please_type_a_keyword#" />
+ <input name="keyword" onfocus="if(this.value=='#dotlrn.Please_type_a_keyword#')this.value='';" onblur="if(this.value=='')this.value='#dotlrn.Please_type_a_keyword#';" value="#dotlrn.Please_type_a_keyword#">
<input type="submit" value="#dotlrn.Go#">
</form>
</center>
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$
-->
-<master src="dotlrn-admin-master">
-<property name="title">@admin_pretty_name@</property>
+<master>
+<property name="doc(title)">@admin_pretty_name@</property>
<property name="context_bar">@context_bar@</property>
<div class="portlet-wrapper">
<div class="portlet-header">
<div class="portlet-title-no-controls">
- @admin_pretty_name@
+ <h1>@admin_pretty_name@</h1>
</div>
</div>
<div class="portlet">
-<ul>
- <li><a href="dotlrn-admins" title="#dotlrn.Administrators#">#dotlrn.Administrators#</a></li>
- <li><a href="users" title="#dotlrn.users#">#dotlrn.users#</a></li>
- <li><a href="terms" title="#dotlrn.terms#">#dotlrn.terms#</a></li>
- <li><a href="departments" title="@departments_pretty_plural@">@departments_pretty_plural@</a></li>
- <li><a href="classes" title="@subjects_pretty_plural@">@subjects_pretty_plural@</a></li>
- <li><a href="term?term_id=-1" title="@class_instances_pretty_plural@">@class_instances_pretty_plural@</a></li>
- <li><a href="clubs" title="@clubs_pretty_plural@">@clubs_pretty_plural@</a></li>
- <li><a href="portal-templates" title="#dotlrn.portal_templates#">#dotlrn.portal_templates#</a></li>
- <li><a href="site-templates" title="#dotlrn.site_templates#">#dotlrn.site_templates#</a></li>
- <li><a href="archived-communities" title="#dotlrn.archived_classes_and_communities#">#dotlrn.archived_classes_and_communities#</a></li>
- <li><a href="edit-preapproved-emails" title="#dotlrn.edit_approved_email_servers#">#dotlrn.edit_approved_email_servers#</a></li>
- <li><a href="@parameters_url@" title="#dotlrn.edit_parameters#">#dotlrn.edit_parameters#</a></li>
- <li><a href="@parameters_d_url@" title="#dotlrn.edit_community_parameters#">#dotlrn.edit_community_parameters#</a></li>
- <li><a href="@toolbar_actions_url@" title="@dotlrn_toolbar_action@">@dotlrn_toolbar_action@</a></li>
- </ul>
-
- <if @oacs_site_wide_admin_p@ true>
- <ul>
- <li><a href="/acs-admin/" title="#dotlrn.goto_oacs_swa#">OpenACS Site-Wide Administration</a></li>
- </ul>
- </if>
- </div>
+ <include src="/packages/dotlrn/lib/admin-chunk">
</div>
-
-
+</div>
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" \
- "<blockquote>
+ "<p>
[_ acs-admin.lt_You_dont_have_permiss]
- </blockquote>"
+ </p>"
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 @@
<div style="text-align:center;">
<form action="term" method="GET">
#dotlrn.Search_classes_with#
- <input name="keyword" onfocus="if(this.value=='#dotlrn.Please_type_a_keyword#')this.value='';" onblur="if(this.value=='')this.value='#dotlrn.Please_type_a_keyword#';" value="#dotlrn.Please_type_a_keyword#" />
- <input type="hidden" name="term_id" value="@term_id@" />
- <input type="hidden" name="department_key" value="@department_key@" />
- <input type="submit" value="#dotlrn.Go#" />
+ <input name="keyword" onfocus="if(this.value=='#dotlrn.Please_type_a_keyword#')this.value='';" onblur="if(this.value=='')this.value='#dotlrn.Please_type_a_keyword#';" value="#dotlrn.Please_type_a_keyword#">
+ <input type="hidden" name="term_id" value="@term_id@">
+ <input type="hidden" name="department_key" value="@department_key@">
+ <input type="submit" value="#dotlrn.Go#">
</form>
</div>
<br>
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 @@
<property name="title">#dotlrn.Edit_a_User#</property>
<property name="context_bar">@context_bar@</property>
-#dotlrn.Youre_editing# <strong>@first_names@ @last_name@</strong>.
-<p>
-<font color=red>#dotlrn.Note_if_you_make#</font>
+<p>#dotlrn.Youre_editing# <strong>@first_names@ @last_name@</strong>.</p>
-<p></p>
+<p style="color:red">#dotlrn.Note_if_you_make#</p>
<formtemplate id="edit_user"></formtemplate>
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 @@
<p>
-#dotlrn.lt_Well_we_tried_to_nuke#
<p>
-<blockquote>
+#dotlrn.lt_Well_we_tried_to_nuke#
+</p>
<pre>
@error_msg@
</pre>
-</blockquote>
<p>
<a href="@referer@">#dotlrn.lt_Return_to_where_you_w#</a>
+</p>
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 @@
</ul>
<if @member_classes:rowcount@ gt 0>
- <blockquote>
<h4>#dotlrn.class_memberships#</h4>
<ul>
@@ -136,11 +135,9 @@
</li>
</multiple>
</ul>
- </blockquote>
</if>
<if @member_clubs:rowcount@ gt 0>
- <blockquote>
<h4>#dotlrn.community_memberships#</h4>
<ul>
@@ -151,11 +148,9 @@
</li>
</multiple>
</ul>
- </blockquote>
</if>
<if @member_subgroups:rowcount@ gt 0>
- <blockquote>
<h4>#dotlrn.subcommunity_memberships#</h4>
<ul>
@@ -166,7 +161,6 @@
</li>
</multiple>
</ul>
- </blockquote>
</if>
<ul>
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 @@
<property name="context_bar">@context_bar@</property>
-<strong><font color=red>#dotlrn.Note#</font></strong>
-#dotlrn.lt_This_action_will_take# <strong><%= [expr [llength $users] * 3] %></strong> #dotlrn.seconds#
+<p style="color:red"><strong>#dotlrn.Note#</strong></p>
-<p></p>
+<p>#dotlrn.lt_This_action_will_take# <strong><%= [expr [llength $users] * 3] %></strong> #dotlrn.seconds#</p>
<formtemplate id="select_community"></formtemplate>
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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/dotlrn-assessment-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/dotlrn-assessment-2.5.0d1.apm">
<owner url="mailto:jopez@galileo.edu">Jose Pablo Escobedo Del Cid</owner>
- <release-date>2008-01-08</release-date>
+ <release-date>2008-10-18</release-date>
- <provides url="dotlrn-assessment" version="2.4.0d1"/>
- <requires url="dotlrn" version="2.4.0d1"/>
- <requires url="assessment-portlet" version="2.4.0d1"/>
+ <provides url="dotlrn-assessment" version="2.5.0d1"/>
+ <requires url="dotlrn" version="2.5.0d1"/>
+ <requires url="assessment-portlet" version="2.5.0d1"/>
<callbacks>
<callback type="before-uninstall" proc="dotlrn_assessment::uninstall"/>
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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/dotlrn-bm-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/dotlrn-bm-2.5.0d1.apm">
<owner url="http://openacs.org">OpenACS</owner>
- <release-date>2008-01-08</release-date>
+ <release-date>2008-10-18</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
- <provides url="dotlrn-bm" version="2.4.0d1"/>
- <requires url="bm-portlet" version="2.4.0d1"/>
- <requires url="dotlrn" version="2.4.0d1"/>
+ <provides url="dotlrn-bm" version="2.5.0d1"/>
+ <requires url="bm-portlet" version="2.5.0d1"/>
+ <requires url="dotlrn" version="2.5.0d1"/>
<parameters>
<!-- No version parameters -->
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 {<blockquote><i>No bulk mail messages to display.</i></blockquote>} \
+ -Tmissing_text {<p><em>No bulk mail messages to display.</em></p>} \
-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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/dotlrn-calendar-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/dotlrn-calendar-2.5.0d1.apm">
<owner url="http://openacs.org">OpenACS</owner>
- <release-date>2008-01-08</release-date>
+ <release-date>2008-10-18</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
- <provides url="dotlrn-calendar" version="2.4.0d1"/>
- <requires url="calendar-portlet" version="2.4.0d1"/>
- <requires url="dotlrn" version="2.4.0d1"/>
- <requires url="dotlrn-fs" version="2.4.0d1"/>
+ <provides url="dotlrn-calendar" version="2.5.0d1"/>
+ <requires url="calendar-portlet" version="2.5.0d1"/>
+ <requires url="dotlrn" version="2.5.0d1"/>
+ <requires url="dotlrn-fs" version="2.5.0d1"/>
<parameters>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="main_calendar_package_id" description="The package_id of calendar mounted right under dotLRN"/>
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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/dotlrn-chat-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/dotlrn-chat-2.5.0d1.apm">
<owner url="http://openacs.org">OpenACS</owner>
<release-date>2007-04-22</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
- <provides url="dotlrn-chat" version="2.4.0d1"/>
- <requires url="dotlrn" version="2.4.0d1"/>
- <requires url="chat-portlet" version="2.4.0d1"/>
- <requires url="chat" version="5.0d6"/>
+ <provides url="dotlrn-chat" version="2.5.0d1"/>
+ <requires url="dotlrn" version="2.5.0d1"/>
+ <requires url="chat-portlet" version="2.5.0d1"/>
+ <requires url="chat" version="5.0d7"/>
</version>
</package>
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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/dotlrn-dotlrn-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/dotlrn-dotlrn-2.5.0d1.apm">
<owner url="http://openasc.org">OpenACS</owner>
<summary>Helper routines for dotLRN applets</summary>
- <release-date>2008-01-08</release-date>
+ <release-date>2008-10-18</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
- <provides url="dotlrn-dotlrn" version="2.4.0d1"/>
- <requires url="dotlrn" version="2.4.0d1"/>
- <requires url="dotlrn-portlet" version="2.4.0d1"/>
+ <provides url="dotlrn-dotlrn" version="2.5.0d1"/>
+ <requires url="dotlrn" version="2.5.0d1"/>
+ <requires url="dotlrn-portlet" version="2.5.0d1"/>
<callbacks>
<callback type="after-install" proc="dotlrn_dotlrn::apm::after_install"/>
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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/dotlrn-evaluation-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/dotlrn-evaluation-2.5.0d1.apm">
<owner url="mailto:jopez@galileo.edu">Jose Pablo Escobedo Del Cid</owner>
- <release-date>2008-01-08</release-date>
+ <release-date>2008-10-18</release-date>
- <provides url="dotlrn-evaluation" version="2.4.0d1"/>
- <requires url="dotlrn" version="2.4.0d1"/>
- <requires url="evaluation-portlet" version="2.4.0d1"/>
+ <provides url="dotlrn-evaluation" version="2.5.0d1"/>
+ <requires url="dotlrn" version="2.5.0d1"/>
+ <requires url="evaluation-portlet" version="2.5.0d1"/>
<callbacks>
<callback type="before-uninstall" proc="dotlrn_evaluation::uninstall"/>
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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/dotlrn-faq-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/dotlrn-faq-2.5.0d1.apm">
<owner url="http://openacs.org">OpenACS</owner>
- <release-date>2008-01-08</release-date>
+ <release-date>2008-10-18</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
- <provides url="dotlrn-faq" version="2.4.0d1"/>
- <requires url="dotlrn" version="2.4.0d1"/>
- <requires url="faq-portlet" version="2.4.0d1"/>
+ <provides url="dotlrn-faq" version="2.5.0d1"/>
+ <requires url="dotlrn" version="2.5.0d1"/>
+ <requires url="faq-portlet" version="2.5.0d1"/>
<parameters>
<!-- No version parameters -->
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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/dotlrn-forums-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/dotlrn-forums-2.5.0d1.apm">
<owner url="http://openacs.org">OpenACS</owner>
- <release-date>2008-01-08</release-date>
+ <release-date>2008-10-18</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
<maturity>0</maturity>
- <provides url="dotlrn-forums" version="2.4.0d1"/>
- <requires url="dotlrn" version="2.4.0d1"/>
- <requires url="forums-portlet" version="2.4.0d1"/>
+ <provides url="dotlrn-forums" version="2.5.0d1"/>
+ <requires url="dotlrn" version="2.5.0d1"/>
+ <requires url="forums-portlet" version="2.5.0d1"/>
<callbacks>
</callbacks>
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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/dotlrn-fs-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/dotlrn-fs-2.5.0d1.apm">
<owner url="http://openacs.org">OpenACS</owner>
- <release-date>2008-01-08</release-date>
+ <release-date>2008-10-18</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
- <provides url="dotlrn-fs" version="2.4.0d1"/>
- <requires url="dotlrn" version="2.4.0d1"/>
- <requires url="file-storage" version="5.3.0d1"/>
- <requires url="fs-portlet" version="2.4.0d1"/>
+ <provides url="dotlrn-fs" version="2.5.0d1"/>
+ <requires url="dotlrn" version="2.5.0d1"/>
+ <requires url="file-storage" version="5.4.0d7"/>
+ <requires url="fs-portlet" version="2.5.0d1"/>
<callbacks>
<callback type="after-upgrade" proc="dotlrn_fs::install::upgrade"/>
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 "<blockquote><i>[_ dotlrn-fs.No_contents_found]</i></blockquote>" \
+ -Tmissing_text "<p><em>[_ dotlrn-fs.No_contents_found]</em></p>" \
-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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>f</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/dotlrn-homework-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/dotlrn-homework-2.5.0d1.apm">
<owner url="mailto:dhogaza@pacifier.com">Don Baccus</owner>
<summary>Provides a homework assignment dropboxes for dotLRN classes.</summary>
- <release-date>2008-01-08</release-date>
+ <release-date>2008-10-18</release-date>
<vendor url="http://www.furfly.net">furfly.net, LLC</vendor>
- <provides url="dotlrn-homework" version="2.4.0d1"/>
- <requires url="dotlrn" version="2.4.0d1"/>
- <requires url="dotlrn-fs" version="2.4.0d1"/>
- <requires url="new-portal" version="2.4.0d1"/>
+ <provides url="dotlrn-homework" version="2.5.0d1"/>
+ <requires url="dotlrn" version="2.5.0d1"/>
+ <requires url="dotlrn-fs" version="2.5.0d1"/>
+ <requires url="new-portal" version="2.5.0d1"/>
<callbacks>
<callback type="after-install" proc="dotlrn_homework::apm_callbacks::package_install"/>
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 @@
<tr class="z_light">
</else>
<if @folders.content_type@ eq "content_folder">
- <td align="left">@folders.spaces;noquote@<img border="0" src="@file_storage_url@/graphics/folder.gif" alt="#file-storage.Folder#"></td>
+ <td align="left">@folders.spaces;noquote@<img style="border:0" src="@file_storage_url@/graphics/folder.gif" alt="#file-storage.Folder#"></td>
<td colspan="3"><a href="@folders.contents_url@">@folders.name@</a></td>
</if>
<else>
- <td align="left">@folders.spaces;noquote@<a href="@folders.download_url@"><img border="0" src="@file_storage_url@/graphics/file.gif"></a></td>
+ <td align="left">@folders.spaces;noquote@<a href="@folders.download_url@"><img style="border:0" src="@file_storage_url@/graphics/file.gif"></a></td>
<td><a href="@folders.download_url@">@folders.name@</a><br><if @folders.name@ ne @folders.title@><span style="color: \#999;">@folders.title@</span></if></td>
<td>
<if @show_users_p@ true>
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 @@
<property name="title">#dotlrn-homework.lt_Upload_New_Version_of#</property>
<property name="context_bar">@context_bar@</property>
-<font size=\"-1\">#dotlrn-homework.lt_use_browse#</font><p>
+<p>#dotlrn-homework.lt_use_browse#</p>
<formtemplate id="version-add" style="plainest"></formtemplate>
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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/dotlrn-imsld-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/dotlrn-imsld-2.5.0d1.apm">
<owner url="mailto:eperez@it.uc3m.es">Eduardo Pérez Ureta</owner>
- <release-date>2005-09-26</release-date>
+ <release-date>2008-10-18</release-date>
- <provides url="dotlrn-imsld" version="2.4.0d1"/>
- <requires url="dotlrn" version="2.4.0d1"/>
- <requires url="imsld-portlet" version="2.4.0d1"/>
+ <provides url="dotlrn-imsld" version="2.5.0d1"/>
+ <requires url="dotlrn" version="2.5.0d1"/>
+ <requires url="imsld-portlet" version="2.5.0d1"/>
<callbacks>
<callback type="before-uninstall" proc="dotlrn_imsld::uninstall"/>
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 @@
<version name="2.5.0d1" url="http://openacs.org/repository/download/apm/dotlrn-lorsm-2.5.0d1.apm">
<owner url="mailto:ErnieG@mm.st">Ernie Ghiglione</owner>
- <release-date>2008-09-16</release-date>
+ <release-date>2008-10-18</release-date>
<vendor url="http://www.openacs.org">OpenACS</vendor>
<provides url="dotlrn-lorsm" version="2.5.0d1"/>
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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/dotlrn-news-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/dotlrn-news-2.5.0d1.apm">
<owner url="http://openacs.org">OpenACS</owner>
- <release-date>2008-01-08</release-date>
+ <release-date>2008-10-18</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
- <provides url="dotlrn-news" version="2.4.0d1"/>
- <requires url="dotlrn" version="2.4.0d1"/>
- <requires url="news-portlet" version="2.4.0d1"/>
+ <provides url="dotlrn-news" version="2.5.0d1"/>
+ <requires url="dotlrn" version="2.5.0d1"/>
+ <requires url="news-portlet" version="2.5.0d1"/>
<parameters>
<!-- No version parameters -->
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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/dotlrn-photo-album-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/dotlrn-photo-album-2.5.0d1.apm">
<owner url="mailto:davis@xarg.net">Jeff Davis</owner>
<vendor url="http://xarg.net">Xarg</vendor>
- <release-date>2008-01-08</release-date>
+ <release-date>2008-10-18</release-date>
- <provides url="dotlrn-photo-album" version="2.4.0d1"/>
- <requires url="dotlrn" version="2.4.0d1"/>
+ <provides url="dotlrn-photo-album" version="2.5.0d1"/>
+ <requires url="dotlrn" version="2.5.0d1"/>
<requires url="photo-album" version="5.2.3"/>
- <requires url="photo-album-portlet" version="2.4.0d1"/>
+ <requires url="photo-album-portlet" version="2.5.0d1"/>
<callbacks>
<callback type="after-install" proc="dotlrn_photo_album::install"/>
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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/dotlrn-portlet-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/dotlrn-portlet-2.5.0d1.apm">
<owner url="http://openacs.org">OpenACS</owner>
- <release-date>2008-01-08</release-date>
+ <release-date>2008-10-18</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
- <provides url="dotlrn-portlet" version="2.4.0d1"/>
- <requires url="dotlrn" version="2.4.0d1"/>
- <requires url="new-portal" version="2.4.0d1"/>
+ <provides url="dotlrn-portlet" version="2.5.0d1"/>
+ <requires url="dotlrn" version="2.5.0d1"/>
+ <requires url="new-portal" version="2.5.0d1"/>
<callbacks>
<callback type="before-uninstall" proc="dotlrn_portlet::apm::before_uninstall"/>
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"\
- "<blockquote>
+ "<p>
You don't have permission to see this page.
- </blockquote>"
+ </p>"
}
}
}
@@ -130,9 +130,9 @@
ns_log notice "user has tried to see /dotlrn/www/members without permission"
ad_return_forbidden \
"Permission Denied"\
- "<blockquote>
+ "<p>
You don't have permission to see this page.
- </blockquote>"
+ </p>"
}
}
}
@@ -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"\
- "<blockquote>
+ "<p>
You don't have permission to see this page.
- </blockquote>"
+ </p>"
}
}
}
@@ -154,9 +154,9 @@
ns_log notice "user has tried to see /dotlrn/www/user-add without permission"
ad_return_forbidden \
"Permission Denied"\
- "<blockquote>
+ "<p>
You don't have permission to see this page.
- </blockquote>"
+ </p>"
}
}
}
@@ -166,9 +166,9 @@
ns_log notice "user has tried to see /dotlrn/www/user-add without permission"
ad_return_forbidden \
"Permission Denied"\
- "<blockquote>
+ "<p>
You don't have permission to see this page.
- </blockquote>"
+ </p>"
}
}
}
@@ -178,9 +178,9 @@
ns_log notice "user has tried to see /dotlrn/www/applets without permission"
ad_return_forbidden \
"Permission Denied"\
- "<blockquote>
+ "<p>
You don't have permission to see this page.
- </blockquote>"
+ </p>"
}
}
}
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 @@
%>
-<if @dotlrn_admin_p@ eq 1>
+
+<comment>Group properties section</comment>
+
<ul>
- <li><a href="@dotlrn_admin_url@" title="#dotlrn-portlet.goto_admin_pretty_name#">@admin_pretty_name@</a></li>
- <li><a href="dotlrn-group-admin-faq" title="#dotlrn-portlet.goto_Administrator_FAQ#">#dotlrn-portlet.Administrator_FAQ#</a></li>
- <li><a href="clone" title="#dotlrn-portlet.Copy_this_group#">#dotlrn-portlet.Copy_this_group#</a></li>
- <if @archived_p@ eq t>
- <li><a href="@dotlrn_admin_url@/archived-communities" title="#dotlrn-portlet.goto_archived_communities#"><font color=red>#dotlrn-portlet.lt_This_group_is_archive#</font></a></li>
- </if>
- <else>
- <li><a href="subcommunity-archive" title="#dotlrn-portlet.Archive_this_group#">#dotlrn-portlet.Archive_this_group#</a></li>
- </else>
- <if @club_p@ eq 0>
- <li><a href="class-term-change?pretty_name=@pretty_name;noquote@" title="#dotlrn-portlet.Change_term_of_pretty_name#">#dotlrn-portlet.Change_term#</a></li>
- </if>
- <li>
- #dotlrn-portlet.lt_Guests_Can_View_Membership_Info# -
- <if @guests_can_view_private_data_p@><b>#acs-kernel.common_yes#</b> | <a href="privacy-policy-toggle?policy=no" title="#dotlrn-portlet.Toggle_privacy_policy_to_no#">#acs-kernel.common_No#</a></if><else><a href="privacy-policy-toggle?policy=yes" title="#dotlrn-portlet.Toggle_privacy_policy_to_yes#">#acs-kernel.common_Yes#</a> | <b>#acs-kernel.common_no#</b></else>
+ <li><a href="community-edit" title="#dotlrn-portlet.edit_gr_props#">#dotlrn-portlet.edit_gr_props#</a> - #dotlrn-portlet.change_name_etc#
+ <ul>
+<if @customize_portal_layout_p@ eq 1 or @dotlrn_admin_p@ eq 1 >
+ <li><a href="one-community-portal-configure" title="#dotlrn-portlet.lt_Customize_Portal_Layo#">#dotlrn-portlet.lt_Customize_Portal_Layo#</a></li>
+ <li><a href="element-list" title="#dotlrn-portlet.lt_Change_Name_Portlet#">#dotlrn-portlet.lt_Change_Name_Portlet#</a></li>
+</if>
+ <li><a href="change-site-template?referer=@referer@" title="#dotlrn.Customize_Template#">#dotlrn.Customize_Template#</a></li>
+ <li>
+ #dotlrn-portlet.lt_Change_Bulk_Mail_Poli# -
+ <if @members_can_spam_p@ true><b>#dotlrn-portlet.All_members#</b></if><else><a href="spam-policy-toggle?policy=all" title="#dotlrn-portlet.change_bm_policy_to_all_members#">#dotlrn-portlet.All_members#</a></else>
+ | <if @members_can_spam_p@ false><b>#dotlrn-portlet.Only_admins#</b></if><else><a href="spam-policy-toggle?policy=admins" title="#dotlrn-portlet.change_bm_policy_to_only_admins#">#dotlrn-portlet.Only_admins#</a></else>
+ #dotlrn-portlet.lt_can_send_bulk_mail_to#
+ </li>
+ </ul>
</li>
</ul>
-</if>
+<comment>Membership section</comment>
+
<ul>
<if @manage_membership_p@ eq 1 or @dotlrn_admin_p@ eq 1 >
- <li><a href="members" title="#dotlrn-portlet.goto_Manage_Membership#">#dotlrn-portlet.Manage_Membership#</a> - #dotlrn-portlet.lt_AddRemove_pretty_name#</li>
- <if @member_email_enabled_p@ defined>
- <li><a href="member-email" title="#dotlrn-portlet.Edit_Welcome_Message#">#dotlrn-portlet.Edit_Welcome_Message#</a>
+ <li><a href="members" title="#dotlrn-portlet.goto_Manage_Membership#">#dotlrn-portlet.Manage_Membership#</a> - #dotlrn-portlet.lt_AddRemove_pretty_name#
+ <ul>
+ <if @member_email_enabled_p@ defined>
+ <li><a href="member-email" title="#dotlrn-portlet.Edit_Welcome_Message#">#dotlrn-portlet.Edit_Welcome_Message#</a>
- <if @member_email_enabled_p@ eq "t"><b>#acs-subsite.Enabled#</b></if>
<else><a href="member-email-toggle" title="#dotlrn-portlet.enable_welcome_message#">#acs-subsite.Enabled#</a></else> |
<if @member_email_enabled_p@ ne "t"><b>#acs-subsite.Disabled#</b></if>
<else><a href="member-email-toggle" title="#dotlrn-portlet.disable_welcome_message#">#acs-subsite.Disabled#</a></else>
- </if>
- <else>
- <li><a href="member-email" title="#dotlrn-portlet.lt_Create_Welcome_Messag#">#dotlrn-portlet.lt_Create_Welcome_Messag#</a>
- </else></li>
+ </if>
+ <else>
+ <li><a href="member-email" title="#dotlrn-portlet.lt_Create_Welcome_Messag#">#dotlrn-portlet.lt_Create_Welcome_Messag#</a>
+ </else>
+ </li>
</if>
<if @enrollment_policy_p@ eq 1 or @dotlrn_admin_p@ eq 1 >
@@ -62,26 +66,7 @@
| <if @join_policy@ eq "needs approval"><b>#dotlrn-portlet.Needs_Approval#</b></if><else><a href="join-policy-toggle?policy=needs%20approval" title="#dotlrn-portlet.set_policy_approval#">#dotlrn-portlet.Needs_Approval#</a></else>
</li>
</if>
-</ul>
-
-<ul>
-<if @customize_portal_layout_p@ eq 1 or @dotlrn_admin_p@ eq 1 >
- <li><a href="one-community-portal-configure" title="#dotlrn-portlet.lt_Customize_Portal_Layo#">#dotlrn-portlet.lt_Customize_Portal_Layo#</a></li>
- <li><a href="element-list" title="#dotlrn-portlet.lt_Change_Name_Portlet#">#dotlrn-portlet.lt_Change_Name_Portlet#</a></li>
-</if>
- <li><a href="change-site-template?referer=@referer@" title="#dotlrn.Customize_Template#">#dotlrn.Customize_Template#</a></li>
- <li>
- #dotlrn-portlet.lt_Change_Bulk_Mail_Poli# -
- <if @members_can_spam_p@ true><b>#dotlrn-portlet.All_members#</b></if><else><a href="spam-policy-toggle?policy=all" title="#dotlrn-portlet.change_bm_policy_to_all_members#">#dotlrn-portlet.All_members#</a></else>
- | <if @members_can_spam_p@ false><b>#dotlrn-portlet.Only_admins#</b></if><else><a href="spam-policy-toggle?policy=admins" title="#dotlrn-portlet.change_bm_policy_to_only_admins#">#dotlrn-portlet.Only_admins#</a></else>
- #dotlrn-portlet.lt_can_send_bulk_mail_to#
- </li>
- <li><a href="community-edit" title="#dotlrn-portlet.edit_gr_props#">#dotlrn-portlet.edit_gr_props#</a> - #dotlrn-portlet.change_name_etc#</li>
-</ul>
-
<if @subcommunity_p@ eq 0>
-<ul>
-
<if @club_p@ eq 0>
<if @create_limited_user_p@ eq 1 or @dotlrn_admin_p@ eq 1 >
<li>
@@ -93,32 +78,61 @@
<if @create_guest_user_p@ eq 1 or @dotlrn_admin_p@ eq 1 >
<li><a href="@club_limited_user_add_url@" title="#dotlrn-portlet.lt_Create_a_new_Limited__1#">#dotlrn-portlet.lt_Create_a_new_Limited__1#</a>
- #dotlrn-portlet.lt_Only_use_this_to_crea_1#
- </li>
+ </li>
</if>
-</ul>
</if>
+ </ul>
+ </li>
+</ul>
-<ul>
+<comment>subgroups section</comment>
+<ul>
<li>@sub_pretty_plural@
<ul>
<multiple name="subgroups">
<li>
<a href="@subgroups.url@" title="#dotlrn-portlet.goto_subgroups_pretty_name#">@subgroups.pretty_name@</a>
- <nobr>[
+ [
<a href="@subgroups.url@one-community-admin" title="#dotlrn-portlet.Administer#">#dotlrn-portlet.Administer#</a>
|
<a href="subcommunity-archive?community_id=@subgroups.community_id@" title="#dotlrn-portlet.Archive#">#dotlrn-portlet.Archive#</a>
- ]</nobr>
+ ]
</li>
</multiple>
- <li><p><a href="subcommunity-new" title="#dotlrn-portlet.New_sub_pretty_name#">#dotlrn-portlet.New_sub_pretty_name#</a></p></li>
- </ul>
+ <li><p><a href="subcommunity-new" title="#dotlrn-portlet.New_sub_pretty_name#">#dotlrn-portlet.New_sub_pretty_name#</a></p></li>
+ </ul>
</li>
- </ul>
+</ul>
+<comment>manage applets section </comment>
<if @manage_applets_p@ eq 1 or @dotlrn_admin_p@ eq 1 >
<ul>
<li><a href="applets" title="#dotlrn-portlet.Manage_Applets#">#dotlrn-portlet.Manage_Applets#</a></li>
</ul>
</if>
+
+<comment>.LRN admin actions section</comment>
+<if @dotlrn_admin_p@ eq 1>
+<ul>
+ <li><a href="@dotlrn_admin_url@" title="#dotlrn-portlet.goto_admin_pretty_name#">@admin_pretty_name@</a>
+ <ul>
+ <li><a href="dotlrn-group-admin-faq" title="#dotlrn-portlet.goto_Administrator_FAQ#">#dotlrn-portlet.Administrator_FAQ#</a></li>
+ <li><a href="clone" title="#dotlrn-portlet.Copy_this_group#">#dotlrn-portlet.Copy_this_group#</a></li>
+ <if @archived_p@ eq t>
+ <li><a href="@dotlrn_admin_url@/archived-communities" title="#dotlrn-portlet.goto_archived_communities#"><span style="color:red">#dotlrn-portlet.lt_This_group_is_archive#</span></a></li>
+ </if>
+ <else>
+ <li><a href="subcommunity-archive" title="#dotlrn-portlet.Archive_this_group#">#dotlrn-portlet.Archive_this_group#</a></li>
+ </else>
+ <if @club_p@ eq 0>
+ <li><a href="class-term-change?pretty_name=@pretty_name;noquote@" title="#dotlrn-portlet.Change_term_of_pretty_name#">#dotlrn-portlet.Change_term#</a></li>
+ </if>
+ <li>
+ #dotlrn-portlet.lt_Guests_Can_View_Membership_Info# -
+ <if @guests_can_view_private_data_p@><b>#acs-kernel.common_yes#</b> | <a href="privacy-policy-toggle?policy=no" title="#dotlrn-portlet.Toggle_privacy_policy_to_no#">#acs-kernel.common_No#</a></if><else><a href="privacy-policy-toggle?policy=yes" title="#dotlrn-portlet.Toggle_privacy_policy_to_yes#">#acs-kernel.common_Yes#</a> | <b>#acs-kernel.common_no#</b></else>
+ </li>
+ </ul>
+ </li>
+</ul>
+</if>
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 {
<if @users.portrait_p@ true or @users.bio_p@ true>
- <a href="@users.community_member_url@" title="#acs-subsite.lt_User_has_portrait_title#"><img src="/resources/acs-subsite/profile-16.png" height="16" width="16" alt="#acs-subsite.Profile#" title="#acs-subsite.lt_User_has_portrait_title#" border="0"></a>
+ <a href="@users.community_member_url@" title="#acs-subsite.lt_User_has_portrait_title#"><img src="/resources/acs-subsite/profile-16.png" height="16" width="16" alt="#acs-subsite.Profile#" title="#acs-subsite.lt_User_has_portrait_title#" style="border:0"></a>
</if>
}
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 @@
<li>
<%= [acs_community_member_link -user_id $users(user_id) -label "$users(first_names) $users(last_name)"] %>
<if @read_private_data_p@ eq 1 or @user_id@ eq @users.user_id@>
- (<%= [email_image::get_user_email -user_id $users(user_id)] %>)
+ (<%= [email_image::get_user_email -user_id $users(user_id) -return_url @return_url@] %>)
</if>
</li>
</if>
@@ -50,7 +50,7 @@
<li>
<%= [acs_community_member_link -user_id $users(user_id) -label "$users(first_names) $users(last_name)"] %>
<if @read_private_data_p@ eq 1 or @user_id@ eq @users.user_id@>
- (<%= [email_image::get_user_email -user_id $users(user_id)] %>)
+ (<%= [email_image::get_user_email -user_id $users(user_id) -return_url @return_url@] %>)
</if>
</li>
</if>
@@ -66,7 +66,7 @@
<li>
<%= [acs_community_member_link -user_id $users(user_id) -label "$users(first_names) $users(last_name)"] %>
<if @read_private_data_p@ eq 1 or @user_id@ eq @users.user_id@>
- (<%= [email_image::get_user_email -user_id $users(user_id)] %>)
+ (<%= [email_image::get_user_email -user_id $users(user_id) -return_url @return_url@] %>)
</if>
</li>
</if>
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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>f</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/dotlrn-random-photo-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/dotlrn-random-photo-2.5.0d1.apm">
<owner url="mailto:gmorales@galileo.edu">Gerardo Morales</owner>
- <release-date>2008-01-08</release-date>
+ <release-date>2008-10-18</release-date>
- <provides url="dotlrn-random-photo" version="2.4.0d1"/>
- <requires url="random-photo-portlet" version="2.4.0d1"/>
+ <provides url="dotlrn-random-photo" version="2.5.0d1"/>
+ <requires url="random-photo-portlet" version="2.5.0d1"/>
<callbacks>
<callback type="after-install" proc="dotlrn_random_photo::install"/>
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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/dotlrn-static-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/dotlrn-static-2.5.0d1.apm">
<owner url="http://openacs.org">OpenACS</owner>
- <release-date>2008-01-08</release-date>
+ <release-date>2008-10-18</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
- <provides url="dotlrn-static" version="2.4.0d1"/>
- <requires url="dotlrn" version="2.4.0d1"/>
- <requires url="static-portlet" version="2.4.0d1"/>
+ <provides url="dotlrn-static" version="2.5.0d1"/>
+ <requires url="dotlrn" version="2.5.0d1"/>
+ <requires url="static-portlet" version="2.5.0d1"/>
<parameters>
<!-- No version parameters -->
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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/dotlrn-survey-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/dotlrn-survey-2.5.0d1.apm">
<owner url="mailto:dave@thedesignexperience.org">dave bauer</owner>
<summary>dotLRN applet for Survey package</summary>
<description format="text/html">dotLRN applet for Survey package</description>
- <release-date>2008-01-08</release-date>
+ <release-date>2008-10-18</release-date>
- <provides url="dotlrn-survey" version="2.4.0d1"/>
- <requires url="dotlrn" version="2.4.0d1"/>
- <requires url="survey-portlet" version="2.4.0d1"/>
+ <provides url="dotlrn-survey" version="2.5.0d1"/>
+ <requires url="dotlrn" version="2.5.0d1"/>
+ <requires url="survey-portlet" version="2.5.0d1"/>
<parameters>
<!-- No version parameters -->
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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>f</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/dotlrn-syllabus-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/dotlrn-syllabus-2.5.0d1.apm">
<owner url="http://openacs.org">OpenACS</owner>
- <release-date>2008-01-08</release-date>
+ <release-date>2008-10-18</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
- <provides url="dotlrn-syllabus" version="2.4.0d1"/>
+ <provides url="dotlrn-syllabus" version="2.5.0d1"/>
<requires url="acs-service-contract" version="5.3.1a1"/>
- <requires url="dotlrn" version="2.4.0d1"/>
+ <requires url="dotlrn" version="2.5.0d1"/>
<callbacks>
</callbacks>
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 @@
<msg key="Edit">Edit</msg>
<msg key="Go_to">Go to</msg>
<msg key="Go_to_the_Syllabus">Go to the Syllabus</msg>
+ <msg key="Link_to_a_syllabus">Add a link to a syllabus</msg>
<msg key="lt_a_hrefupload_urlUploa"><a href="%upload_url%">Upload</a> or <a href="%link_to_url%">link</a> to a Syllabus</msg>
<msg key="No_Syllabus_Found">No Syllabus Found</msg>
<msg key="or">or</msg>
<msg key="pretty_name">Syllabus</msg>
+ <msg key="Upload_new_syllabus">Upload a new syllabus</msg>
</message_catalog>
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 @@
<msg key="Edit">Editar</msg>
<msg key="Go_to">Ir a</msg>
<msg key="Go_to_the_Syllabus">Ir al programa</msg>
+ <msg key="Link_to_a_syllabus">A�adir enlace a un programa de estudios</msg>
<msg key="lt_a_hrefupload_urlUploa"><a href="%upload_url%">Subir</a> o <a href="%link_to_url%">enlazar</a> a un programa</msg>
<msg key="No_Syllabus_Found">Sin programa</msg>
<msg key="or">o</msg>
<msg key="pretty_name">Programa de estudios</msg>
+ <msg key="Upload_new_syllabus">Subir uno nuevo programa de estudios</msg>
</message_catalog>
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 @@
%>
-<ul>
-
<if @community_id@ eq "">
<small>No community specified</small>
</if>
<else>
<if @syllabus_id@ not eq "">
+ <ul>
<if @type@ eq url>
<li><a href="file-storage/url-goto?url_id=@syllabus_id@" title="#dotlrn-syllabus.Go_to# #dotlrn-syllabus.pretty_name#">#dotlrn-syllabus.Go_to#</a> #dotlrn-syllabus.or#
<a href="file-storage/simple-edit?object_id=@syllabus_id@" title="#dotlrn-syllabus.Edit# #dotlrn-syllabus.pretty_name#">#dotlrn-syllabus.Edit#</a> #dotlrn-syllabus.pretty_name#
- </li>
+ </li>
</if>
<else>
<li><a href="file-storage/file?file_id=@syllabus_id@" title="#dotlrn-syllabus.Go_to_the_Syllabus#">#dotlrn-syllabus.Go_to_the_Syllabus#</a></li>
</else>
+ </ul>
</if>
<else>
- <li>#dotlrn-syllabus.lt_a_hrefupload_urlUploa#</li>
+ <ul>
+ <li>
+ <a href="@upload_url@" title="#dotlrn-syllabus.Upload_new_syllabus#">#dotlrn-syllabus.Upload_new_syllabus#</a>
+ </li>
+ <li>
+ <a href="@link_to_url@" title="#dotlrn-syllabus.Link_to_a_syllabus#">#dotlrn-syllabus.Link_to_a_syllabus#</a>
+ </li>
+ </ul>
</else>
</else>
-</ul>
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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/dotlrn-weblogger-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/dotlrn-weblogger-2.5.0d1.apm">
<owner url="mailto:simon@bcuni.net">Simon Carstensen</owner>
- <release-date>2008-01-08</release-date>
+ <release-date>2008-10-18</release-date>
<vendor url="http://www.collaboraid.biz">Collaboraid</vendor>
- <provides url="dotlrn-weblogger" version="2.4.0d1"/>
- <requires url="dotlrn" version="2.4.0d1"/>
- <requires url="weblogger-portlet" version="2.4.0d1"/>
+ <provides url="dotlrn-weblogger" version="2.5.0d1"/>
+ <requires url="dotlrn" version="2.5.0d1"/>
+ <requires url="weblogger-portlet" version="2.5.0d1"/>
<callbacks>
<callback type="after-install" proc="dotlrn_weblogger::install"/>
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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>f</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/evaluation-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/evaluation-2.5.0d1.apm">
<owner url="mailto:jopez@galileo.edu">Jose Pablo Escobedo Del Cid</owner>
<summary>This package allows the users (professors and students) to use the system to submit and grade the tasks.</summary>
- <release-date>2008-01-08</release-date>
+ <release-date>2008-10-18</release-date>
<description format="text/html">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.</description>
<maturity>0</maturity>
<package_instance_name>#evaluation.Evaluations#</package_instance_name>
- <provides url="evaluation" version="2.4.0d1"/>
- <requires url="calendar" version="2.1.0b7"/>
- <requires url="dotlrn" version="2.4.0d1"/>
- <requires url="notifications" version="5.3.0d1"/>
+ <provides url="evaluation" version="2.5.0d1"/>
+ <requires url="calendar" version="2.5.0d1"/>
+ <requires url="dotlrn" version="2.5.0d1"/>
+ <requires url="notifications" version="5.4.2"/>
<callbacks>
<callback type="after-install" proc="evaluation::apm::package_install"/>
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 @@
-<blockquote>
<listtemplate name="grade_tasks"></listtemplate>
-</blockquote>
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 @@
-<blockquote>
<listtemplate name="student_grades"></listtemplate>
<p>#evaluation.lt_Total_points_in_this__2# <br>
#evaluation.lt_grade_plural_name_rep#</p>
-</blockquote>
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 @@
<if @evaluations_wa:rowcount@ gt 0>
<form action="evaluate-students-2" method="post">
@export_vars;noquote@
+ <div>
<input type=hidden name=task_id value="@task_id@">
<input type=hidden name=max_grade value="@max_grade@">
<input type=submit value="#evaluation.Grade_1#" > <input type=button value="#evaluation.Go#" onClick="history.go(-1)">
- <blockquote>
+ </div>
<table>
<multiple name="evaluations_wa">
<if @evaluations_wa.rownum@ odd><table bgcolor="#EAF2FF"></if><else><table bgcolor="white"></else>
@@ -22,17 +23,20 @@
</table>
</multiple>
</table>
- </blockquote>
+ <div>
<input type=submit value="#evaluation.Grade_1#" > <input type=button value="#evaluation.Go#" onClick="history.go(-1)">
+ </div>
</form>
</if>
<if @evaluations_na:rowcount@ gt 0>
<form action="evaluate-students-2" method="post">
@export_vars;noquote@
+ <div>
<input type=hidden name=task_id value="@task_id@">
<input type=hidden name=max_grade value="@max_grade@">
<input type=submit value="#evaluation.Grade_1#" >
- <blockquote>
+ </div>
+
<table>
<multiple name="evaluations_na">
<if @evaluations_na.rownum@ odd> <table bgcolor="#EAF2FF"> </if>
@@ -45,19 +49,22 @@
</table>
</multiple>
</table>
- </blockquote>
+ <div>
<input type=submit value="#evaluation.Grade_1#" >
<input type=button value="#evaluation.Go#" onClick="history.go(-1)">
+ </div>
</form>
</if>
<if @evaluations:rowcount@ gt 0>
<form action="evaluate-students-2" method="post">
@export_vars;noquote@
+ <div>
<input type=hidden name=task_id value="@task_id@">
<input type=hidden name=max_grade value="@max_grade@">
<input type=submit value="#evaluation.Confirm#">
- <blockquote>
+ </div>
+
<table>
<multiple name="evaluations">
<if @evaluations.rownum@ odd><table bgcolor="#EAF2FF"></if><else><table bgcolor="white"></else>
@@ -69,8 +76,9 @@
</table>
</multiple>
</table>
- </blockquote>
+ <div>
<input type=submit value="#evaluation.Confirm#">
+ </div>
</form>
</if>
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 @@
<if @evaluated_students:rowcount@ gt 0>
<form action="evaluate-students" method="POST">
- <input type=hidden name=task_id value="@task_id@" />
+ <div><input type=hidden name=task_id value="@task_id@"></div>
@export_vars;noquote@
- <blockquote><listtemplate name="evaluated_students"></listtemplate></blockquote>
- <input type=submit value="#evaluation.Edit#">
+ <listtemplate name="evaluated_students"></listtemplate>
+ <div><input type=submit value="#evaluation.Edit#"></div>
</form>
- <blockquote>
+
<form name="grades_sheet_form" enctype="multipart/form-data" method="POST" action="grades-sheet-parse.tcl">
- <input type="hidden" name="grades_sheet_item_id" value="@grades_sheet_item_id@" />
- <input type="hidden" name="task_id" value="@task_id@" />
+ <div>
+ <input type="hidden" name="grades_sheet_item_id" value="@grades_sheet_item_id@">
+ <input type="hidden" name="task_id" value="@task_id@">
+ </div>
<table>
<tr>
<th style="text-align:right;">#evaluation.lt_Grade_students_using_file#</th>
@@ -26,9 +28,9 @@
</tr>
</table>
</form>
- </blockquote>
+
</if><else>
-<p>#evaluation.lt_There_are_no_edit#
+<p>#evaluation.lt_There_are_no_edit#</p>
</else>
-</p>
+
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 @@
<if @evaluations_gs:rowcount@ gt 0>
<form enctype="multipart/form-data" action="evaluate-students-2" method="post">
@export_vars;noquote@
- <blockquote>
+
<table>
<multiple name="evaluations_gs">
<if @evaluations_gs.rownum@ odd><table bgcolor="#EAF2FF"></if><else><table bgcolor="white"></else>
@@ -19,8 +19,9 @@
</table>
</multiple>
</table>
- </blockquote>
+ <div>
<input type=submit value="#evaluation.Grade_1#"> <input type=button value="#evaluation.Go_Back#" onClick="history.go(-1)">
+ </div>
</form>
</if><else>
#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 @@
<p>#evaluation.lt_These_are_the_grades_#</p>
-<blockquote><listtemplate name="grades_sheets"></listtemplate></blockquote>
+<listtemplate name="grades_sheets"></listtemplate>
+<p>
<a href=@return_url;noquote@?task_id=@task_id@>Go Back</a>
-
+</p>
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 @@
<h2>#evaluation.lt_Evaluated_Students_to#</h2>
<p>#evaluation.Theese#</p>
</else>
-<blockquote><listtemplate name="evaluated_students"></listtemplate></blockquote>
+<listtemplate name="evaluated_students"></listtemplate>
<br>
<if @forums_related_p@ eq f>
<if @simple_p@ eq 1>
@@ -125,7 +125,7 @@
<form action="evaluate-students" method="post">
<div><input type=hidden name=task_id value="@task_id@"></div>
<div><input type=hidden name=grade_id value="@grade_id@"></div>
- <blockquote>
+
<listtemplate name="not_evaluated_wa"></listtemplate>
<if @simple_p@ eq 1>
<br>
@@ -136,9 +136,9 @@
</else>
<div><input type=submit value="#evaluation.Grade_1#"></div>
</else>
- </blockquote>
+
</form>
-<blockquote>
+
<if @simple_p@ eq 0>
<form name="grades_sheet_form" enctype="multipart/form-data" method="POST" action="grades-sheet-parse.tcl">
<div><input type="hidden" name="grades_sheet_item_id" value=@grades_sheet_item_id@></div>
@@ -161,7 +161,7 @@
<ul>
<li class="arrow"><text class="blue">#evaluation.download#<b><a href="grades-sheet-csv-@task_id@.csv">#evaluation.students_ready#</a></b>#evaluation.spreadsheet#<br></text>
<li class="arrow"><text class="blue">#evaluation.upload_graded##evaluation.students_ready#</text>
-<blockquote>
+
<form name="grades_sheet_form" enctype="multipart/form-data" method="POST" action="grades-sheet-parse.tcl">
<div><input type="hidden" name="grades_sheet_item_id" value=@grades_sheet_item_id@></div>
<div><input type="hidden" name="task_id" value=@task_id@></div>
@@ -175,13 +175,13 @@
</form>
-</blockquote>
+
<li class="arrow"><a href="grades-sheets?task_id=@task_id@"><text class="blue">#evaluation.lt_See_grades_sheets_ass#</text></a>
<li class="arrow"><a href="grades-sheet-explanation?task_id=@task_id@"><text class="blue">#evaluation.How_does_this_work#</text></a>
</ul>
</else>
-</blockquote>
+
</if><else>
<p>#evaluation.lt_There_are_no_students#</p>
</else>
@@ -216,7 +216,7 @@
</if>
<form action="evaluate-students" method="post">
<div><input type=hidden name=task_id value=@task_id@></div>
- <blockquote>
+
<listtemplate name="not_evaluated_na"></listtemplate>
<table width="100%">
<tr>
@@ -227,10 +227,10 @@
</else></td><td align=left><input type=checkbox name="grade_all"><text class=blue>#evaluation.lt_Grade_students_with_0#</text></td>
</tr>
</table>
- </blockquote>
+
</form>
<br>
-<blockquote>
+
<if @simple_p@ eq 0>
<form name="grades_sheet_form" enctype="multipart/form-data" method="POST" action="grades-sheet-parse.tcl">
<div><input type="hidden" name="grades_sheet_item_id" value="@grades_sheet_item_id@"></div>
@@ -255,8 +255,8 @@
<li class="arrow"><text class="blue">#evaluation.upload_graded##evaluation.students_without_subm#</text>
</ul>
<br>
-<blockquote>
+
<form name="grades_sheet_form" enctype="multipart/form-data" method="POST" action="grades-sheet-parse.tcl">
<div><input type="hidden" name="grades_sheet_item_id" value="@grades_sheet_item_id@"></div>
<div><input type="hidden" name="task_id" value=@task_id@></div>
@@ -272,7 +272,7 @@
<li class="arrow"><a href="grades-sheet-explanation?task_id=@task_id@"><text class="blue">#evaluation.How_does_this_work#</text></a>
</ul>
</else>
-</blockquote>
+
</if><else>
<p>#evaluation.lt_There_are_no_students_1#</p>
<if @number_of_members@ gt 0 and @total_processed@ eq 0>
@@ -303,7 +303,7 @@
<form action="evaluate-students" method="post">
<div><input type=hidden name=task_id value="@task_id@"></div>
<div><input type=hidden name=grade_id value="@grade_id@"></div>
- <blockquote>
+
<listtemplate name="class_students"></listtemplate>
<if @simple_p@ eq 1>
<br>
@@ -318,7 +318,7 @@
<div><input type=submit value="#evaluation.Grade_1#"></div>
<div><input type=checkbox name="grade_all">#evaluation.lt_Grade_students_with_0#</div>
</else>
- </blockquote>
+
</form>
<if @simple_p@ eq 0>
<form name="grades_sheet_form" enctype="multipart/form-data" method="POST" action="grades-sheet-parse.tcl">
@@ -343,10 +343,12 @@
<ul>
<li class="arrow"><text class="blue">#evaluation.download# <b><a href="grades-sheet-csv-@task_id@.csv">#evaluation.class_students#</a></b>#evaluation.spreadsheet#<br></text>
<li class="arrow"><text class="blue">#evaluation.upload_graded# #evaluation.class_students#</text>
-<blockquote>
+
<form name="grades_sheet_form" enctype="multipart/form-data" method="POST" action="grades-sheet-parse.tcl">
+ <div>
<input type="hidden" name="grades_sheet_item_id" value=@grades_sheet_item_id@>
<input type="hidden" name="task_id" value=@task_id@>
+ </div>
<table>
<tr>
<th style="text-align:right;"><text class="blue">#evaluation.lt_Grade_students_using_#</text></th>
@@ -358,7 +360,7 @@
</form>
-</blockquote>
+
<li class="arrow"><a href="grades-sheets?task_id=@task_id@"><text class="blue">#evaluation.lt_See_grades_sheets_ass#</text></a>
<li class="arrow"><a href="grades-sheet-explanation?task_id=@task_id@"><text class="blue">#evaluation.How_does_this_work#</text></a>
</ul>
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# <br>
#evaluation.lt_If_you_click_on_the_s#
</p>
-<blockquote><listtemplate name="grades_report"></listtemplate></blockquote>
+<listtemplate name="grades_report"></listtemplate>
+
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#
</p>
-
-<blockquote><listtemplate name="grade_tasks"></listtemplate></blockquote>
-
-
+<listtemplate name="grade_tasks"></listtemplate>
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 @@
</div>
</if>
-<blockquote><listtemplate name="grades"></listtemplate></blockquote>
+<listtemplate name="grades"></listtemplate>
<p>@notice;noquote@</p>
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 @@
<property name="context">@context;noquote@</property>
<if @evaluation_groups:rowcount@ gt 0>
-<h2>#evaluation.lt_Please_select_the_gro#</h2>
-<blockquote>
-<listtemplate name="evaluation_groups"></listtemplate>
-</blockquote>
-</form>
-</if><else>
-<p>#evaluation.There#</p>
+ <h2>#evaluation.lt_Please_select_the_gro#</h2>
+ <listtemplate name="evaluation_groups"></listtemplate>
+</if>
+<else>
+ <p>#evaluation.There#</p>
</else>
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 @@
<tr>
<input type=hidden name=task_id value="@task_id@">
<input type=hidden name=evaluation_group_id value="@evaluation_group_id@">
- <blockquote>
+
<td></td>
<td>
<table>
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 @@
<p>#evaluation.lt_Click_on_the_task_tha#</p>
-<blockquote><listtemplate name="groups"></listtemplate></blockquote>
-
+<listtemplate name="groups"></listtemplate>
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 @@
<form action="group-rename">
@export_vars;noquote@
- <blockquote>
+
<table>
<tr><th align="right">#evaluation.Group_name#</th>
<td><input type="text" name="group_name" value="@group_name@" size=20></td>
@@ -28,7 +28,7 @@
<td></td>
</tr>
</table>
- </blockquote>
+
</if>
<else>
#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 @@
</tr>
</table>
<form action="group-new">
- <input type=hidden name=task_id value="@task_id@">
- <blockquote>
+ <div><input type=hidden name=task_id value="@task_id@"></div>
+
<table>
<tr>
<td><input type=submit value="#evaluation.Create_Group_#"></td>
@@ -28,19 +28,19 @@
</td>
</tr>
</table>
- </blockquote>
+
</form>
</if>
<if @task_groups:rowcount@ gt 0>
<a name="groups">
<h2>#evaluation.lt_Already_created_group#</h2>
- <blockquote>
+
<listtemplate name="task_groups"></listtemplate>
- </blockquote>
+
</if>
<if @return_url@ not nil>
-<a href="@return_url@">#evaluation.Go#</a>
+<p><a href="@return_url@">#evaluation.Go#</a></p>
</if>
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 @@
<if @communities_count@ gt 0>
<p>#evaluation.lt_The_assignment_task_n# <br>#evaluation.lt_Check_the_rest_of_com#</p>
-<blockquote><formtemplate id="communities"></formtemplate></blockquote>
-</if><else> no rregreso nada?!?!??! @communities_count@ :p</else>
+<formtemplate id="communities"></formtemplate>
+</if>
+
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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/evaluation-portlet-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/evaluation-portlet-2.5.0d1.apm">
<owner url="mailto:jopez@galileo.edu">Jose Pablo Escobedo Del Cid</owner>
- <release-date>2008-01-08</release-date>
+ <release-date>2008-10-18</release-date>
- <provides url="evaluation-portlet" version="2.4.0d1"/>
- <requires url="evaluation" version="2.4.0d1"/>
+ <provides url="evaluation-portlet" version="2.5.0d1"/>
+ <requires url="evaluation" version="2.5.0d1"/>
<callbacks>
<callback type="after-install" proc="evaluation_portlet::after_install"/>
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 @@
<msg key="lt_Evaluation_Assignment">Admin Portlet f�r Aufgabenzuweisungen</msg>
<msg key="lt_Groups_administration">Gruppen administrieren</msg>
<msg key="lt_smallTotal_points_in_"><small>Gesamtpunkte in dieser Kategorie: %total_grade%/%max_grade%<br /> Diese Bewertungskategorie macht %grade_weight%% von 100% der Gesamtklassenleistung aus</small> </msg>
- <msg key="lt_submit_answer_style_f">Antwort abschicken <style font-color:red>late</style> </msg>
- <msg key="lt_submit_answer_style_f_1">Antwort nochmal abschicken <style font-color:red>late</style></msg>
+ <msg key="lt_submit_answer_style_f">Antwort abschicken <style color:red>late</style> </msg>
+ <msg key="lt_submit_answer_style_f_1">Antwort nochmal abschicken <style color:red>late</style></msg>
<msg key="lt_There_are_no_tasks_fo">F�r diese Paket liegen keine Aufgaben vor.</msg>
<msg key="lt_There_are_no_tasks_to">F�r diese Paket liegen keine zu bewertenden Aufgaben vor.</msg>
<msg key="lt_There_should_be_only_">Aus Admininstrationsgr�nden sollte nur eine Instanz des Moduls "Evaluations" genutzt werden.</msg>
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></msg>
<msg key="lt_smallTotal_points_in__1"><text class="blue">%grade_plural_name% TOTAL:</text></msg>
<msg key="lt_smallWeight_used_in_g"><text class="blue"><b>%grade_plural_name% TOTALS:</text></msg>
- <msg key="lt_submit_answer_style_f">submit answer <style font-color:red>late</style> </msg>
- <msg key="lt_submit_answer_style_f_1">submit answer <style font-color:red>late</style> again </msg>
+ <msg key="lt_submit_answer_style_f">submit answer <style color:red>late</style> </msg>
+ <msg key="lt_submit_answer_style_f_1">submit answer <style color:red>late</style> again </msg>
<msg key="lt_There_are_no_tasks_fo">There are no tasks for this package.</msg>
<msg key="lt_There_are_no_tasks_to">There are no tasks to evaluate for this package.</msg>
<msg key="lt_There_should_be_only_">There should be only one instance of evaluation for admin purposes </msg>
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 @@
<msg key="lt_smallTotal_points_in_"><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></msg>
<msg key="lt_smallTotal_points_in__1"><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></msg>
<msg key="lt_smallWeight_used_in_g"><text class="blue"><b>%grade_plural_name% TOTALES:</text</msg>
- <msg key="lt_submit_answer_style_f">enviar respuesta <style font-color:red>tarde</style></msg>
- <msg key="lt_submit_answer_style_f_1">re-entregar <style font-color:red>tarde</style></msg>
+ <msg key="lt_submit_answer_style_f">enviar respuesta <style color:red>tarde</style></msg>
+ <msg key="lt_submit_answer_style_f_1">re-entregar <style color:red>tarde</style></msg>
<msg key="lt_There_are_no_tasks_fo">No hay tareas para este paquete.</msg>
<msg key="lt_There_are_no_tasks_to">No hay tareas que evaluar para este paquete.</msg>
<msg key="lt_There_should_be_only_">Solo debe de haber una instancia de evaluaci�n para prop�sitos administrativos</msg>
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 @@
<msg key="lt_Groups_administration">Administraci�n de Grupos</msg>
<msg key="lt_smallTotal_points_in_"><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></msg>
<msg key="lt_smallTotal_points_in__1"><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></msg>
- <msg key="lt_submit_answer_style_f">enviar respuesta <style font-color:red>tarde</style></msg>
- <msg key="lt_submit_answer_style_f_1">re-entregar <style font-color:red>tarde</style></msg>
+ <msg key="lt_submit_answer_style_f">enviar respuesta <style color:red>tarde</style></msg>
+ <msg key="lt_submit_answer_style_f_1">re-entregar <style color:red>tarde</style></msg>
<msg key="lt_There_are_no_tasks_fo">No hay tareas para este paquete.</msg>
<msg key="lt_There_are_no_tasks_to">No hay tareas que evaluar para este paquete.</msg>
<msg key="lt_There_should_be_only_">Solo debe de haber una instancia de evaluaci�n para prop�sitos administrativos</msg>
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 @@
<msg key="lt_smallTotal_points_in_"><small>Pontua��o total nesta categoria: %total_grade%/%max_grade%<br /> Esta categoria de notas representa %grade_weight%% de 100% da classe <small></msg>
<msg key="lt_smallTotal_points_in__1">TOTAL <text class="blue">%grade_plural_name%:</text></msg>
<msg key="lt_smallWeight_used_in_g">TOTAIS <text class="blue">%grade_plural_name%:</text></msg>
- <msg key="lt_submit_answer_style_f">enviar resposta <style font-color:red>late</style></msg>
- <msg key="lt_submit_answer_style_f_1">Enviar resposta <style font-color:red>atrasada</style> de novo</msg>
+ <msg key="lt_submit_answer_style_f">enviar resposta <style color:red>late</style></msg>
+ <msg key="lt_submit_answer_style_f_1">Enviar resposta <style color:red>atrasada</style> de novo</msg>
<msg key="lt_There_are_no_tasks_fo">N�o h� tarefas para este pacote.</msg>
<msg key="lt_There_are_no_tasks_to">N�o h� tarefas para avaliar para este pacote.</msg>
<msg key="lt_There_should_be_only_">Deve haver apenas uma inst�ncia para fins de administra��o</msg>
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 "<center>[_ evaluation-portlet.lt_smallTotal_points_in__1]</center>"
+set submitted_label "<span style=\"text-align:center\">[_ evaluation-portlet.lt_smallTotal_points_in__1]</span>"
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 { <center>@grade_tasks_admin.perfect_score@</center> } \
+ 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 { <center>@grade_tasks_admin.task_weight@%</center> } \
+ display_template {<span style="text-align:center">@grade_tasks_admin.task_weight@%</span> } \
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 "<center>[_ evaluation-portlet.solution]</center>" \
- display_template "<center>@grade_tasks_admin.solution@</center>" \
+ [list label "<span style=\"text-align:center\">[_ evaluation-portlet.solution]</span>" \
+ display_template "<span style=\"text-align:center\">@grade_tasks_admin.solution@</span>" \
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 { <center>[_ evaluation-portlet.evaluate]</center> } ]
+ display_template {<span style="text-align:center">[_ evaluation-portlet.evaluate]</span> } ]
lappend elements edit \
[list label "" \
sub_class narrow \
- display_template {<center><a href=${base_url}admin/tasks/task-add-edit?grade_id=$grade_id&return_url=$return_url&task_id=@grade_tasks_admin.task_id@>[_ evaluation-portlet.edit]</a><br><a href=${base_url}admin/tasks/task-delete?grade_id=$grade_id&return_url=$return_url&task_id=@grade_tasks_admin.task_id@>[_ evaluation-portlet.delete]</a></center>}]
+ display_template {<a href=${base_url}admin/tasks/task-add-edit?grade_id=$grade_id&return_url=$return_url&task_id=@grade_tasks_admin.task_id@>[_ evaluation-portlet.edit]</a><br><a href=${base_url}admin/tasks/task-delete?grade_id=$grade_id&return_url=$return_url&task_id=@grade_tasks_admin.task_id@>[_ evaluation-portlet.delete]</a>}]
} else {
lappend elements audit_info \
[list label "" \
@@ -85,34 +85,34 @@
}
set multirow_name grade_tasks_admin
- set actions "<a href=\"${base_url}admin/tasks/task-add-edit?grade_id=$grade_id&return_url=$return_url\" class=\"tlmidnav\"><img src=\"/resources/evaluation/cross.gif\" width=\"10\" height=\"9\" hspace=\"5\" vspace=\"1\" border=\"0\" align=\"absmiddle\">\#evaluation-portlet.Add_grade_name_\#</a><a href=\"${base_url}admin/grades/distribution-edit?grade_id=$grade_id\" class=\"tlmidnav\"><img src=\"/resources/evaluation/cross.gif\" width=\"10\" height=\"9\" hspace=\"5\" vspace=\"1\" border=\"0\" align=\"absmiddle\">\#evaluation-portlet.edit_grade_scale\#</a>"
+ set actions "<a href=\"${base_url}admin/tasks/task-add-edit?grade_id=$grade_id&return_url=$return_url\" class=\"tlmidnav\"><img src=\"/resources/evaluation/cross.gif\" width=\"10\" height=\"9\" hspace=\"5\" vspace=\"1\" style=\"border:0\" align=\"absmiddle\">\#evaluation-portlet.Add_grade_name_\#</a><a href=\"${base_url}admin/grades/distribution-edit?grade_id=$grade_id\" class=\"tlmidnav\"><img src=\"/resources/evaluation/cross.gif\" width=\"10\" height=\"9\" hspace=\"5\" vspace=\"1\" style=\"border:0\" align=\"absmiddle\">\#evaluation-portlet.edit_grade_scale\#</a>"
} else {
#student
if { $simple_p } {
lappend elements submitted \
- [list label "<center>[_ evaluation-portlet.Submitted]</center>" \
- display_template { <center>@grade_tasks.submitted_date;noquote@</center> } \
+ [list label "<span style=\"text-align:center\">[_ evaluation-portlet.Submitted]</span>" \
+ display_template {<span style="text-align:center">@grade_tasks.submitted_date;noquote@</span> } \
aggregate "" \
link_url_col submitted_date_url \
aggregate_label "@submitted_label;noquote@" ]
lappend elements task_grade \
[list label "[_ evaluation-portlet.Points]" \
- display_template { <center>@grade_tasks.task_grade@</center> } \
+ display_template {<span style="text-align:center">@grade_tasks.task_grade@</span> } \
aggregate "" \
aggregate_label "@max_grade_label;noquote@" ]
lappend elements task_weight \
[list label "[_ evaluation-portlet.Total_Points]" \
- display_template { <center>@grade_tasks.perfect_score@</center> } \
+ display_template {<span style="text-align:center">@grade_tasks.perfect_score@</span> } \
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 { <center>@grade_tasks.grade@</center> } \
+ display_template {<span style="text-align:center">@grade_tasks.grade@</span>} \
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 { <center>@grade_tasks.task_weight@</center> } \
+ display_template {<span style="text-align:center">@grade_tasks.task_weight@</span> } \
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 "<center><text class=blue>$max_grade pts.</text></center>"
- set solution_label "[_ evaluation-portlet.weight_possible_of_grade_] <text class=blue>$low_name )</text>"
+ set max_grade_label "<span class=blue>$max_grade pts.</span>"
+ set solution_label "[_ evaluation-portlet.weight_possible_of_grade_] <span class=blue>$low_name )</span>"
if { $simple_p } {
- set max_weight_label "<center><text class=blue>$max_weight %</text></center>"
+ set max_weight_label "<span class=blue>$max_weight %</span>"
}
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 "<center><text class=blue>$max_grade pts.</text></center>"
- set max_weight_label "<center><text class=blue>$max_weight %</text></center>"
+ set max_grade_label "<span class=blue>$max_grade pts.</span>"
+ set max_weight_label "<span class=blue>$max_weight %</span>"
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 {<img src="/resources/acs-subsite/Zoom16.gif" width="16" height="16" border="0" alt="[_ evaluation-portlet.View_task_]">} \
+ display_template {<img src="/resources/acs-subsite/Zoom16.gif" width="16" height="16" style="border:0" alt="[_ 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 {<img src="/resources/acs-subsite/Edit16.gif" width="16" height="16" border="0" alt="[_ evaluation-portlet.Edit_task_]">} \
+ display_template {<img src="/resources/acs-subsite/Edit16.gif" width="16" height="16" style="border:0" alt="[_ 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 {<img src="/resources/acs-subsite/Delete16.gif" width="16" height="16" border="0" alt="[_ evaluation-portlet.Delete_task_]">} \
+ display_template {<img src="/resources/acs-subsite/Delete16.gif" width="16" height="16" style="border:0" alt="[_ 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 {<img src="/resources/acs-subsite/Zoom16.gif" width="16" height="16" border="0" alt="[_ evaluation-portlet.View_task_]">} \
+ display_template {<img src="/resources/acs-subsite/Zoom16.gif" width="16" height="16" style="border:0" alt="[_ 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 @@
<li>#evaluation-portlet.lt_There_are_no_tasks_fo#</li>
</if><else>
<multiple name="grades">
- <li><strong>@grades.grade_plural_name@</strong> <br />
+ <li><strong>@grades.grade_plural_name@</strong> <br>
<include src="../lib/tasks-chunk" grade_id=@grades.grade_id@ grade_item_id=@grades.grade_item_id@ assignments_orderby=@assignments_orderby@ page_num=@page_num@>
- <br /><br />
+ <br><br>
</li>
</multiple>
</else>
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 @@
<li><strong>@grades.grade_plural_name;noquote@</strong>
</if>
<include src="../lib/evaluations-chunk" grade_id=@grades.grade_id@ grade_item_id=@grades.grade_item_id@ evaluations_orderby=@evaluations_orderby@ page_num=@page_num@>
- <br/><br/>
+ <br><br>
<if @simple_p@ eq 0></li></if>
</multiple>
</ul>
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 @@
<package_instance_name>#faq.FAQs#</package_instance_name>
<provides url="faq" version="5.2.0d5"/>
- <requires url="acs-kernel" version="5.3.2"/>
- <requires url="categories" version="1.1"/>
- <requires url="notifications" version="5.3.0d1"/>
+ <requires url="acs-kernel" version="5.4.2"/>
+ <requires url="categories" version="1.1.2d3"/>
+ <requires url="notifications" version="5.4.2"/>
<callbacks>
<callback type="after-install" proc="faq::install::package_install"/>
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 @@
<property name="title">@title;noquote@</property>
<form action="@action@">
- <input type="hidden" name="faq_id" value="@faq_id@">
- <blockquote>
+ <div><input type="hidden" name="faq_id" value="@faq_id@"></div>
<table>
<tr>
<th align="right">#faq.Name#</th>
@@ -30,6 +29,5 @@
<th></th>
<td><input type="submit" value="@submit_label@"></td>
</table>
- </blockquote>
</form>
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 @@
-<master></master>
+<master>
<property name="context">@context;noquote@</property>
<property name="title">@title;noquote@</property>
<property name="focus">faq.faq_name</property>
<h1>Create an FAQ:</h1>
<form action="@action@" name="faq" class="margin-form">
- <input type="hidden" name="faq_id" value="@faq_id@">
+ <div><input type="hidden" name="faq_id" value="@faq_id@"></div>
<fieldset>
<div class="form-item-wrapper">
<div class="form-label">
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 @@
<property name="focus">question.question</property>
<form action="@target@" name="question">
+ <div>
<input type="hidden" name="insert_p" value="@insert_p@">
<input type="hidden" name="faq_id" value="@faq_id@">
+ </div>
-
<if @insert_p@ eq "t">
<input type="hidden" name="entry_id" value="@entry_id@">
</if>
- <blockquote>
<table>
<tr valign="top">
@@ -29,6 +29,5 @@
<td><input type="submit" value="@submit_label@"></td>
</tr>
</table>
- </blockquote>
</form>
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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/faq-portlet-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/faq-portlet-2.5.0d1.apm">
<owner url="http://openacs.org">OpenACS</owner>
- <release-date>2008-01-08</release-date>
+ <release-date>2008-10-18</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
- <provides url="faq-portlet" version="2.4.0d1"/>
+ <provides url="faq-portlet" version="2.5.0d1"/>
<requires url="faq" version="5.2.0d4"/>
- <requires url="new-portal" version="2.4.0d1"/>
+ <requires url="new-portal" version="2.5.0d1"/>
<parameters>
<parameter datatype="number" min_n_values="1" max_n_values="1" name="faq_portlet_force_region" default="1" description="the portal region to put the faq portlet into"/>
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 @@
<li>
<a href="@url@admin/one-faq?faq_id=@faqs.faq_id@" title="#faq-portlet.goto_faqs_faq_name_admin#">@faqs.faq_name@</a>
<if @faqs.disabled_p@ eq "t">
- (#faq-portlet.Disabled# | <a href="faq/admin/faq-enable?faq_id=@faqs.faq_id@&referer=@referer@" title="#faq-portlet.enable_faqs_faq_name#">#faq-portlet.Enable#</a>)
+ (#faq-portlet.Disabled# | <a href="@faqs.faq_enable_url@" title="#faq-portlet.enable_faqs_faq_name#">#faq-portlet.Enable#</a>)
</if>
<else>
- (<a href="faq/admin/faq-disable?faq_id=@faqs.faq_id@&referer=@referer@" title="#faq-portlet.disable_faqs_faq_name#">#faq-portlet.Disable#</a>)
+ (<a href="@faqs.faq_disable_url@" title="#faq-portlet.disable_faqs_faq_name#">#faq-portlet.Disable#</a>)
</else>
</li>
</multiple>
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 {
- <b>@faqs.parent_name@</b><br/>
+ <b>@faqs.parent_name@</b><br>
<group column="package_id">
- » <a href="@faqs.url@one-faq?faq_id=@faqs.faq_id@">@faqs.faq_name@</a><br/>
+ » <a href="@faqs.url@one-faq?faq_id=@faqs.faq_id@">@faqs.faq_name@</a><br>
</group>
}
}
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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>f</singleton-p>
- <version name="5.4.0d6" url="http://openacs.org/repository/download/apm/file-storage-5.4.0d6.apm">
+ <version name="5.4.0d7" url="http://openacs.org/repository/download/apm/file-storage-5.4.0d7.apm">
<owner url="http://openacs.org">OpenACS</owner>
<summary>Collaborative document storage</summary>
<release-date>2007-06-15</release-date>
@@ -16,11 +16,11 @@
<maturity>0</maturity>
<package_instance_name>#file-storage.file-storage#</package_instance_name>
- <provides url="file-storage" version="5.4.0d6"/>
- <requires url="acs-content-repository" version="5.3.1a1"/>
- <requires url="acs-kernel" version="5.3.1a1"/>
- <requires url="categories" version="1.1"/>
- <requires url="notifications" version="5.3.0d1"/>
+ <provides url="file-storage" version="5.4.0d7"/>
+ <requires url="acs-content-repository" version="5.4.2"/>
+ <requires url="acs-kernel" version="5.4.2"/>
+ <requires url="categories" version="1.1.2d3"/>
+ <requires url="notifications" version="5.4.2"/>
<requires url="oacs-dav" version="1.1b1"/>
<requires url="rss-support" version="0.3"/>
@@ -42,7 +42,7 @@
<parameter datatype="number" min_n_values="1" max_n_values="1" name="ExposeRssP" default="0" description="Should we offer navigation to set up RSS feeds for folders?"/>
<parameter datatype="number" min_n_values="1" max_n_values="1" name="GeneralCommentsP" default="0" description="Allow comments to be attached to a file."/>
<parameter datatype="number" min_n_values="1" max_n_values="1" name="MaximumFileSize" default="524288000" description="The maximum size, in bytes, of files that users are allowed to upload. Should not be set larger than the systemwide AOLServer parameter maxinput."/>
- <parameter datatype="number" min_n_values="1" max_n_values="1" name="MoveByCopyDeleteP" default="1" description="Move files by copying and then deleting the original? Default: Normal move"/>
+ <parameter datatype="number" min_n_values="1" max_n_values="1" name="MoveByCopyDeleteP" default="0" description="Move files by copying and then deleting the original? Default is false, use normal move"/>
<parameter datatype="number" min_n_values="1" max_n_values="1" name="ShowAdministerPermissionsLinkP" default="1" description="Whether or not to show a link to administer permissions on the file storage object."/>
<parameter datatype="number" min_n_values="1" max_n_values="1" name="StoreFilesInDatabaseP" default="0" description="Flag to determine the storage type. A flag of 1 (true) will store the files in the database. If 0 (false) files are stored in the filesystem. ***This parameter should only be changed at package instance creation.***"/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="UnzipBinary" default="unzip" description="The path and name of the unzip binary to unpack zip files containing multiple files."/>
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 @@
<msg key="_Upload">Revisi�n</msg>
<msg key="Action">Opciones</msg>
- <msg key="Please_select_at_least_one_item_to_copy.">Por favor, selecciona un archivo para copiar.</msg>
<msg key="Actions">Opciones:</msg>
<msg key="Actions_1">Opciones</msg>
<msg key="Add_Dup_As_New_File">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.</msg>
@@ -15,6 +14,7 @@
<msg key="back_to_folder_view">Volver a la vista de carpeta</msg>
<msg key="back_to_project">Volver al proyecto</msg>
<msg key="bytes">bytes</msg>
+ <msg key="Categories">Categor�as</msg>
<msg key="Change_Name">Renombrar</msg>
<msg key="Change_upload_limit">Cambiar el l�mite para subir archivos</msg>
<msg key="Choose_Destination_Folder">Seleccionar carpeta destino</msg>
@@ -37,12 +37,16 @@
<msg key="Delete_Version">Borrar versi�n</msg>
<msg key="Description">Descripci�n:</msg>
<msg key="Download">Descargar</msg>
+ <msg key="Download_ZIP">Descargar en un ZIP</msg>
+ <msg key="Download_ZIP_Checked_Items">Descargar elementos seleccionados en un ZIP</msg>
<msg key="Edit">Editar</msg>
<msg key="edit">editar</msg>
+ <msg key="Edit_File">Editar documento</msg>
<msg key="Edit_Folder">Editar carpeta</msg>
<msg key="Edit_URL">Editar URL</msg>
<msg key="File">Fichero</msg>
<msg key="file">Archivo</msg>
+ <msg key="file-storage">Documentos</msg>
<msg key="file_delete_page_title">Eliminar %title%</msg>
<msg key="File_deleted">Archivo borrado</msg>
<msg key="file_edit_page_title">Renombrar %title%</msg>
@@ -142,6 +146,7 @@
<msg key="No_valid_destination_folders_exist">Ninguna carpeta destino v�lida</msg>
<msg key="PDF">PDF</msg>
<msg key="Permissions">Permisos</msg>
+ <msg key="Please_select_at_least_one_item_to_copy.">Por favor, selecciona un archivo para copiar.</msg>
<msg key="pretty_name">Documentos</msg>
<msg key="properties">propiedades</msg>
<msg key="Rename">Renombrar</msg>
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 @@
<property name="title">@title;noquote@</property>
<property name="context">@context;noquote@</property>
-<blockquote>
<formtemplate id="file_add"></formtemplate>
-</blockquote>
\ 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 @@
<if @categories_p@><if @category_links@><p>#file-storage.Categories#: @category_links;noquote@</p></if></if>
-<listtemplate name="contents"></listtemplate>
+<listtemplate name="contents_@folder_id@"></listtemplate>
<if @content_size_total@ gt 0>
<p>
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 {<a @target_attr@ href="@contents.file_url@" title="\#file-storage.view_contents\#"><if @contents.title@ nil>@contents.name@</a></if><else>@contents.title@</a><br><if @contents.name@ ne @contents.title@><span style="color: \#999;">@contents.name@</span></if></else>} \
+ display_template {<a @target_attr@ href="@contents.file_url@" title="\#file-storage.view_contents\#"><if @contents.title@ nil>@contents.name@</a></if><else>@contents.title@</a><br><if @contents.name@ ne @contents.title@><i>@contents.name@</i></if></else>} \
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 @@
<property name="title">@title;noquote@</property>
<property name="context">@context;noquote@</property>
<h1>#file-storage.lt_Upload_compressed_fol#</h1>
-<blockquote>
+
<formtemplate id="file_add"></formtemplate>
-</blockquote>
\ 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 @@
<property name="context">@context;noquote@</property>
<if @rebuild_short_name@ not nil>
-<blockquote>*Rebuilt feed: @rebuild_short_name@</blockquote>
+<p>*Rebuilt feed: @rebuild_short_name@</p>
</if>
<p>Configuring RSS for <a href="../?folder_id=@folder_id@">@folder_name@</a></p>
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 @@
<package_instance_name>#forums.Forums#</package_instance_name>
<provides url="forums" version="1.3d8"/>
- <requires url="acs-kernel" version="5.3.1a1"/>
- <requires url="acs-mail-lite" version="5.3.1a1"/>
- <requires url="acs-subsite" version="5.3.1a1"/>
+ <requires url="acs-kernel" version="5.4.2"/>
+ <requires url="acs-mail-lite" version="5.4.2"/>
+ <requires url="acs-subsite" version="5.4.2"/>
<requires url="attachments" version="0.10"/>
- <requires url="notifications" version="5.3.0d1"/>
+ <requires url="notifications" version="5.4.2"/>
<callbacks>
<callback type="before-upgrade" proc="forum::install::package_upgrade"/>
@@ -32,7 +32,6 @@
<parameter datatype="number" min_n_values="1" max_n_values="1" name="DisplayEmoticonsAsImagesP" default="1" description="Automatically convert smileys like :-) and similar constructs to images when displaying messages in the browser."/>
<parameter datatype="number" min_n_values="1" max_n_values="1" name="ForumsSearchBoxP" default="1" description="Whether to display a forums specific searchbox within the page body (not desirable when there is a sitewide search in the header)."/>
<parameter datatype="number" min_n_values="1" max_n_values="1" name="UseIntermediaForSearchP" default="0" description="Should we use intermedia for searching forums? Intermedia is more scalable, but interprets searches differently from standard search."/>
- <parameter datatype="number" min_n_values="1" max_n_values="1" name="UseReadingInfo" default="0" description="Should ReadingInfo be stored and displayed for this forum"/>
<parameter datatype="number" min_n_values="1" max_n_values="1" name="UseScreenNameP" default="0" description="Weather the real user name or only the (anonymous) screenName will be shown in forums. Do not revert to 0 if once set to 1, since this will discard the beforehand granted anonymity."/>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="table_bgcolor" default="#eeeeee" description="This is the color of the first message / table row"/>
<parameter datatype="number" min_n_values="1" max_n_values="1" name="table_border_color" default="#dddddd" description="The color of the table borders and between the cells, try #ffffff for a cool look"/>
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 @@
<msg key="charter_max_chars">Charter exceeds maximum length (4000 characters)</msg>
<msg key="closed">closed</msg>
<msg key="collapse">Collapse</msg>
+ <msg key="collapse_message">Collapse message</msg>
<msg key="Confirm">Confirm?</msg>
<msg key="Confirm_Delete">Confirm Delete:</msg>
<msg key="Confirm_Move_to">Confirm Move to</msg>
@@ -53,6 +54,7 @@
<msg key="Enter_a_list_of_email">Enter a list of email addresses, optionally with first and last names. They will be subscribed to this forum. As an example:</msg>
<msg key="Entire_Thread">Entire Thread</msg>
<msg key="expand">Expand</msg>
+ <msg key="expand_message">Expand message</msg>
<msg key="First_Post">First Post</msg>
<msg key="Flat">Flat</msg>
<msg key="flat">Flat</msg>
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 @@
<msg key="Attachments">Archivos adjuntos:</msg>
<msg key="Author">Autor</msg>
<msg key="Available_Forums">Foros disponibles</msg>
+ <msg key="Available_Messages">Mensajes disponibles</msg>
<msg key="Back_to_thread_label">Regresar a %forum.name%</msg>
<msg key="Back_to_thread_link"><a href="%thread_url%">Volver</a> a %forum.name%</msg>
<msg key="Body">Cuerpo del mensaje</msg>
@@ -24,6 +25,7 @@
<msg key="charter_max_chars">La tem�tica no puede superar el l�mite de 4000 caracteres</msg>
<msg key="closed">cerrado</msg>
<msg key="collapse">Contraer</msg>
+ <msg key="collapse_message">Colapsar mensaje</msg>
<msg key="Confirm">�Es correcto?</msg>
<msg key="Confirm_Delete">Confirmaci�n para eliminar:</msg>
<msg key="Confirm_Move_to">Confirmar mover mensaje</msg>
@@ -53,6 +55,7 @@
<msg key="Enter_a_list_of_email">Ingrese una lista de correos electr�nicos, si desea agregue nombres y apellidos. Ellos ser�n suscritos autom�ticamente a este foro. Por ejemplo:</msg>
<msg key="Entire_Thread">Hilo completo</msg>
<msg key="expand">Expandir</msg>
+ <msg key="expand_message">Expandir mensaje</msg>
<msg key="First_Post">Primer mensaje</msg>
<msg key="Flat">Sin hilos</msg>
<msg key="flat">Plano</msg>
@@ -98,6 +101,7 @@
<msg key="Manage">Administrar</msg>
<msg key="Manage_Forum">Administrar Foro de Discusi�n:</msg>
<msg key="ManageModerate">Administrar/Moderar</msg>
+ <msg key="mark_all_as_read">Marcar todos como le�dos</msg>
<msg key="Message_ID">Mensaje ID</msg>
<msg key="Message_Subject">T�tulo</msg>
<msg key="Moderate">Moderar</msg>
@@ -143,6 +147,7 @@
<msg key="Post_a_Message">Enviar un mensaje</msg>
<msg key="Post_a_New_Message">Enviar un nuevo mensaje</msg>
<msg key="Post_a_Reply">Enviar una respuesta</msg>
+ <msg key="post_anonymously">Postear de forma an�nima</msg>
<msg key="Post_to_Forum">Enviar al foro:</msg>
<msg key="Posted">Enviados</msg>
<msg key="Posted_by">Enviado por</msg>
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 @@
<h4>Hot topics</h4>
<if @hot_topics:rowcount@ eq 0><p>None</p></if><else>
<p><multiple name="hot_topics">
- <a href="@hot_topics.url@">@hot_topics.name@</a><br />
+ <a href="@hot_topics.url@">@hot_topics.name@</a><br>
</multiple></p>
</else>
<h4>New topics</h4>
<if @new_topics:rowcount@ eq 0><p>None</p></if><else>
<p><multiple name="new_topics">
- <a href="@new_topics.url@">@new_topics.name@</a><br />
+ <a href="@new_topics.url@">@new_topics.name@</a><br>
</multiple></p>
</else>
</if>
@@ -22,14 +22,14 @@
<h3>Hot Topics</h3>
<if @hot_topics:rowcount@ eq 0><p>None</p></if><else>
<p><multiple name="hot_topics">
- <a href="@hot_topics.url@">@hot_topics.name@</a><br />
+ <a href="@hot_topics.url@">@hot_topics.name@</a><br>
</multiple></p>
</else>
<h3>New Topics</h3>
<if @new_topics:rowcount@ eq 0><p>None</p></if><else>
<p><multiple name="new_topics">
- <a href="@new_topics.url@">@new_topics.name@</a><br />
+ <a href="@new_topics.url@">@new_topics.name@</a><br>
</multiple></p>
</else>
</else>
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 @@
- <ul>
-<%
- foreach attachment $attachments {
- template::adp_puts "<li><a href=\"[lindex $attachment 2]\">[lindex $attachment 1]</a></li>"
- }
-%>
- </ul>
+ <ul>
+ <multiple name="attachments">
+ <li><a href="@attachments.url@">@attachments.name@</a></li>
+ </multiple>
+ </ul>
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 @@
<p>#forums.lt_Please_confirm_the_fo#</p>
<div id="forum-thread">
- <include src="row" &message="message" preview="1" />
+ <include src="row" &message="message" preview="1">
</div>
<form action="message-post" method="post">
<input type="hidden" name="form:id" value="message">
@@ -11,9 +11,9 @@
<input type="radio" name="subscribe_p" value="1">#forums.Yes#</input>
<if @forum_notification_p@>
- <br /><small>#forums.lt_Note_that_you_are_alr#</small>
+ <br><small>#forums.lt_Note_that_you_are_alr#</small>
</if>
</if>
- <input type="submit" name="formbutton:post" value="#forums.Post#" />
- <input type="submit" name="formbutton:edit" value="#forums.Edit_again#" />
+ <input type="submit" name="formbutton:post" value="#forums.Post#">
+ <input type="submit" name="formbutton:edit" value="#forums.Edit_again#">
</form>
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 @@
<div class="details">
<div style="float: left; background-color:#f0f0f0;">
- <a id="toggle@message.message_id@" href="#" onclick="dynamicExpand('@message.message_id@');return false;"><img src="/resources/forums/Collapse16.gif" width="16" height="16" alt="+"/></a>
+ <a id="toggle@message.message_id@" href="#" onclick="dynamicExpand('@message.message_id@');return false;"><img src="/resources/forums/Collapse16.gif" width="16" height="16" alt="+"></a>
<if @total_number_messages@ le @max_number_messages@>
- <a href="#" title="#forums.Expand_only_direct_reply_of_message#" onclick="expandChilds('@message.message_id@','@children_direct_list@'); return false;"><img src="/resources/forums/expand.png" width="20" height="20" alt="#forums.Expand_only_direct_reply_of_message#" border="none"/></a>
- <a href="#" title="Expand all messages" onclick="expandChilds('@message.message_id@','@children_string@'); return false;"><img src="/resources/forums/ExpandAll16.gif" width="15" height="15" alt="#forums.Expand_all_messages#" border="none"/></a>
- <a href="#" title="Collapse all messages" onclick="collapseChilds('@message.message_id@','@children_string@'); return false;"><img src="/resources/forums/CollapseAll16.gif" width="15" height="15" alt="#forums.Collapse_all_messages#" border="none"/></a>
+ <a href="#" title="#forums.Expand_only_direct_reply_of_message#" onclick="expandChilds('@message.message_id@','@children_direct_list@'); return false;"><img src="/resources/forums/expand.png" width="20" height="20" alt="#forums.Expand_only_direct_reply_of_message#" style="border:0"></a>
+ <a href="#" title="Expand all messages" onclick="expandChilds('@message.message_id@','@children_string@'); return false;"><img src="/resources/forums/ExpandAll16.gif" width="15" height="15" alt="#forums.Expand_all_messages#" style="border:0"></a>
+ <a href="#" title="Collapse all messages" onclick="collapseChilds('@message.message_id@','@children_string@'); return false;"><img src="/resources/forums/CollapseAll16.gif" width="15" height="15" alt="#forums.Collapse_all_messages#" style="border:0"></a>
</if>
</div>
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 "-->
</script>
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 @@
<partialquery name="new_query">
<querytext>
- 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
</querytext>
</partialquery>
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 {
- <if @useReadingInfo@>
- <if @messages.unread_p@>
- <b>@messages.subject@</b>
- </if>
- <else>@messages.subject@</else>
- </if>
- <else>
- <if @messages.new_p@>
- <b>@messages.subject@</b>
- </if>
- <else>@messages.subject@</else>
- </else>
+ <h2 class="forum-heading">
+ <a href="@messages.message_url@" title="#forums.goto_thread_subject#">
+ <if @useReadingInfo@>
+ <if @messages.unread_p@>
+ <b>@messages.subject@</b>
+ </if>
+ <else>@messages.subject@</else>
+ </if>
+ <else>
+ <if @messages.new_p@>
+ <b>@messages.subject@</b>
+ </if>
+ <else>@messages.subject@</else>
+ </else>
+ </a>
+ </h2>
}
}
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 @@
</querytext>
</fullquery>
+ <fullquery name="callback::search::datasource::impl::forums_forum.datasource">
+ <querytext>
+ 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
+ </querytext>
+ </fullquery>
+
</queryset>
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 <dave@thedesignexperience.org>
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 @@
<include src="/packages/forums/lib/search/search-form" forum_id="@message.forum_id@">
</if>
- <div class="displayLinks" style="float: right;">
- #forums.display_as# <a href="#" onclick="setActiveStyleSheet('collapse'); return false;" title="#forums.just_display_subjects#" class="button" id="collapse" style="display: none;">#forums.collapse#</a>
- <a href="#" onclick="setActiveStyleSheet('expand'); return false;" title="'#forums.display_full_posts#" class="button" id="expand">#forums.expand#</a>
-
- </div>
<ul class="action-links">
<li><a href="@thread_url@" title="#forums.Back_to_thread_label#">#forums.Back_to_thread_label#</a></li>
</ul>
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 "
- <!--
- collapse_symbol = '<img src=\"/resources/forums/Collapse16.gif\" width=\"16\" height=\"16\" ALT=\"collapse message\" border=\"0\" title=\"collapse message\">';
- expand_symbol = '<img src=\"/resources/forums/Expand16.gif\" width=\"16\" height=\"16\" ALT=\"expand message\" border=\"0\" title=\"expand message\">';
- loading_symbol = '<img src=\"/resources/forums/dyn_wait.gif\" width=\"12\" height=\"16\" ALT=\"x\" border=\"0\">';
- loading_message = 'Loading...';
- rootdir = 'messages-get';
- sid = '$message(root_message_id)';
- //-->
-"
-
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]<br />"
+ ns_write "subscribing [party::name -party_id $subscriber_id]<br>"
notification::request::new \
-type_id $type_id \
-user_id $subscriber_id \
@@ -96,7 +96,7 @@
}
- ns_write "<br />Name:$fname $lname"
+ ns_write "<br>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)<br />"
+ ns_write "creating new user: $fname $lname ($email)<br>"
# 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 "<br>already subscribed ($fname $lname ($email)<br />"
} else {
- ns_write "subscribing ($fname $lname ($email)<br />"
+ ns_write "subscribing ($fname $lname ($email)<br>"
notification::request::new \
-type_id $type_id \
-user_id $user_id \
@@ -151,4 +151,4 @@
}
ns_write "<p>Complete</p>"
-ns_write "<a href=\"$return_url\">return</a>"
\ No newline at end of file
+ns_write "<a href=\"$return_url\">return</a>"
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 "
- <!--
- collapse_symbol = '<img src=\"/resources/forums/Collapse16.gif\" width=\"16\" height=\"16\" ALT=\"collapse message\" style=\"border:0\" title=\"collapse message\">';
- expand_symbol = '<img src=\"/resources/forums/Expand16.gif\" width=\"16\" height=\"16\" ALT=\"expand message\" style=\"border:0\" title=\"expand message\">';
- loading_symbol = '<img src=\"/resources/forums/dyn_wait.gif\" width=\"12\" height=\"16\" ALT=\"x\" style=\"border:0\">';
- loading_message = 'Loading...';
- rootdir = 'messages-get';
- sid = '$message(root_message_id)';
- //-->
-"
# 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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/forums-portlet-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/forums-portlet-2.5.0d1.apm">
<owner url="http://openacs.org">OpenACS</owner>
- <release-date>2008-01-08</release-date>
+ <release-date>2008-10-18</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
<maturity>0</maturity>
- <provides url="forums-portlet" version="2.4.0d1"/>
- <requires url="forums" version="1.3d5"/>
- <requires url="new-portal" version="2.4.0d1"/>
+ <provides url="forums-portlet" version="2.5.0d1"/>
+ <requires url="forums" version="1.3d7"/>
+ <requires url="new-portal" version="2.5.0d1"/>
<callbacks>
</callbacks>
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 @@
</querytext>
</fullquery>
-</queryset>
\ No newline at end of file
+</queryset>
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 @@
%>
<if @shaded_p@ false>
- <listtemplate name="forums"></listtemplate>
+ <if @forums:rowcount@ gt 0>
+ <multiple name="forums">
+ <h2>@forums.parent_name@</h2>
+ <ul>
+ <group column="package_id">
+ <li>
+ <if @useReadingInfo@>
+ <if @forums.count_unread@ gt 0><strong></if>
+ <a href="@forums.url@forum-view?forum_id=@forums.forum_id@">@forums.name@</a>
+ <if @forums.count_unread@ gt 0></strong>(@forums.count_unread@)</if>
+ </if>
+ <else>
+ <a href="@forums.url@forum-view?forum_id=@forums.forum_id@">@forums.name@</a>
+ <if @forums.new_p@ eq t>
+ <span class="new_flag">#forums-portlet.resources_acs-subsite_new_gif#</span>
+ </if>
+ </else>
+ </li>
+ </group>
+ </ul>
+ </multiple>
+ </if>
+ <else>
+ <p>#forums.No_Forums#</p>
+ </else>
</if>
<else>
#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 {
- <b>@forums.parent_name@</b><br>
- <group column="package_id">
- <if @useReadingInfo@>
- <if @forums.count_unread@ gt 0>
- <strong>
- </if>
- » <a href="@forums.url@forum-view?forum_id=@forums.forum_id@">@forums.name@</a>
- <if @forums.count_unread@ gt 0>
- </strong>(@forums.count_unread@)
- </if>
- </if>
- <else>
- <if @forums.new_p@ eq t>
- » <a href="@forums.url@forum-view?forum_id=@forums.forum_id@">@forums.name@</a>
- <span class="new_flag">
- #forums-portlet.resources_acs-subsite_new_gif#<br>
- </span>
- </if>
- <else>
- » <a href="@forums.url@forum-view?forum_id=@forums.forum_id@">@forums.name@</a><br>
- </else>
- </else>
-
- </group>
- }
- }
-}
-
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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/fs-portlet-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/fs-portlet-2.5.0d1.apm">
<owner url="http://openacs.org">OpenACS</owner>
- <release-date>2008-01-08</release-date>
+ <release-date>2008-10-18</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
- <provides url="fs-portlet" version="2.4.0d1"/>
- <requires url="file-storage" version="5.3.0d1"/>
- <requires url="new-portal" version="2.4.0d1"/>
+ <provides url="fs-portlet" version="2.5.0d1"/>
+ <requires url="file-storage" version="5.4.0d7"/>
+ <requires url="new-portal" version="2.5.0d1"/>
<parameters>
<parameter datatype="number" min_n_values="1" max_n_values="1" name="ShowParametersLinkP" default="1" description="Should we link to the file-storage instance's parameter settings page?"/>
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 @@
</if>
<listtemplate name="folders"></listtemplate>
</else>
+
+<p>@notification_chunk;noquote@</p>
+
+<if @webdav_url@ not nil>
+ <p>#file-storage.Folder_available_via_WebDAV_at#</p>
</if>
+
+</if>
<else>
<small>
#new-portal.when_portlet_shaded#
</small>
</else>
</div>
-<p>@notification_chunk;noquote@</p>
-
-<if @webdav_url@ not nil>
- <p>#file-storage.Folder_available_via_WebDAV_at#</p>
-</if>
-
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 {
- <if @folders.type@ eq "folder">
- <a href="@folders.url@?folder_id=@folders.object_id@">
- <img border="0" src="/resources/file-storage/folder.gif" height="16" width="16" alt="#file-storage.Folder#">
- </a>
- </if>
- <elseif @folders.type@ eq "url">
- <a href="@folders.url@url-goto?url_id=@folders.object_id@"><img border="0" src="/resources/file-storage/file.gif" alt="#file-storage.File#"></a>
- </elseif>
- <else>
- <a href="@folders.url@download/@folders.file_upload_name@?version_id=@folders.live_revision@">
- <img border="0" src="/resources/file-storage/file.gif" alt="#file-storage.File#"></a>
- </else>
- }
- }
- name {
- label ""
- display_template {
- <if @folders.type@ eq "folder">
- <a href="@folders.url@?folder_id=@folders.object_id@">@folders.name@</a>
- </if>
- <elseif @folders.type@ eq "url">
- <a href="@folders.url@url-goto?url_id=@folders.object_id@">@folders.name@</a>
- </elseif>
- <else>
- <a href="@folders.url@download/@folders.file_upload_name@?version_id=@folders.live_revision@">@folders.name@</a>
- </else>
- }
- }
- type {
- label ""
- display_template {
- <if @folders.type@ eq "folder">
- #file-storage.folder_type_pretty_name#
- </if>
- <else>
- @folders.type@
- </else>
- }
- }
- size {
- label ""
- display_template {
- <if @folders.type@ eq "folder">
- <if @folders.content_size@ eq 0>
- 0 #fs-portlet.items#
- </if>
- <elseif @folders.content_size@ gt 1>
- @folders.content_size@ #fs-portlet.items#
- </elseif>
- <else>
- @folders.content_size@ #fs-portlet.item#
- </else>
- </if>
- <elseif @folders.type@ eq "url">
- <i>n/a</i>
- </elseif>
- <else>
- @folders.content_size@ <if @folders.content_size eq 1>#fs-portlet.byte#</if><else>#fs-portlet.bytes#</else>
- \[<a href="@folders.url@file?file_id=@folders.object_id@">#fs-portlet.view_details#</a>\]
- </else>
- }
- }
+ icon {
+ label "[_ file-storage.Type]"
+ display_template {
+ <if @folders.type@ eq "folder">
+ <img src="/resources/file-storage/folder.gif" height="16" width="16" alt="#file-storage.Folder#" style="border:0">
+ #file-storage.folder_type_pretty_name#
+ </if>
+ <elseif @folders.type@ eq "url">
+ <img src="/resources/file-storage/file.gif" alt="#file-storage.File#" style="border:0">
+ @folders.type@
+ </elseif>
+ <else>
+ <img src="/resources/file-storage/file.gif" alt="#file-storage.File#" style="border:0">
+ @folders.type@
+ </else>
+ }
+ }
+ name {
+ label "[_ file-storage.Name]"
+ display_template {
+ <if @folders.type@ eq "folder">
+ <a href="@folders.url@?folder_id=@folders.object_id@">@folders.name@</a>
+ </if>
+ <elseif @folders.type@ eq "url">
+ <a href="@folders.url@url-goto?url_id=@folders.object_id@">@folders.name@</a>
+ </elseif>
+ <else>
+ <a href="@folders.url@download/@folders.file_upload_name@?version_id=@folders.live_revision@">@folders.name@</a>
+ </else>
+ }
+ }
+ size {
+ label "[_ file-storage.Size]"
+ display_template {
+ <if @folders.type@ eq "folder">
+ <if @folders.content_size@ eq 0>
+ 0 #fs-portlet.items#
+ </if>
+ <elseif @folders.content_size@ gt 1>
+ @folders.content_size@ #fs-portlet.items#
+ </elseif>
+ <else>
+ @folders.content_size@ #fs-portlet.item#
+ </else>
+ </if>
+ <elseif @folders.type@ eq "url">
+ <i>n/a</i>
+ </elseif>
+ <else>
+ @folders.content_size@ <if @folders.content_size eq 1>#fs-portlet.byte#</if><else>#fs-portlet.bytes#</else>
+ \[<a href="@folders.url@file?file_id=@folders.object_id@">#fs-portlet.view_details#</a>\]
+ </else>
+ }
+ }
}
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#
-<blockquote>
<h4>@title@</h4>
@html_content;noquote@
-</blockquote>
<if @mime_type@ eq text/html>
#general-comments.lt_Note_if_the_text_abov#
@@ -16,13 +14,11 @@
#general-comments.lt_Note_if_the_text_abov_1#
</else>
-<center>
<form action="@target@" method=post>
<%= [export_form_vars comment_id object_id object_name context_id title content comment_mime_type category return_url] %>
<input type=submit name=submit value="#general-comments.Confirm#">
<p>
<input type="checkbox" name="attach_p" id="attach_ck"><label for="attach_ck">#general-comments.lt_I_would_like_to_uploa#</label>
</form>
-</center>
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 @@
<property name="context">@context;noquote@</property>
<property name="focus">comment.title</property>
-<blockquote>
-<form action="@target@" method="post" name="comment">
-<%= [export_form_vars comment_id object_id object_name context_id return_url] %>
-#general-comments.Title#<br>
-<input type=text name=title maxlength=200 size=50 value="@title@">
-<p>
-#general-comments.Comment#<br>
-<textarea name=content cols=80 rows=20 wrap=soft>@content@</textarea><br>
-#general-comments.Text_above_is#
-<select name=comment_mime_type>
-<if @comment_mime_type@ eq text/html >
- <option value="text/plain">#general-comments.Plain_text#</option>
- <option selected value="text/html">#general-comments.HTML#</option>
-</if>
-<else>
- <option selected value="text/plain">#general-comments.Plain_text#</option>
- <option value="text/html">#general-comments.HTML#</option>
-</else>
+<form action="@target@" method="post" name="comment" class="margin-form">
+<div>
+ <%= [export_form_vars comment_id object_id object_name context_id return_url] %>
+</div>
+<div class="form-item-wrapper">
+ <label for="title" class="form-label">
+ #general-comments.Title#
+ </label>
+ <div class="form-widget">
+ <input id=title type=text name=title maxlength=200 size=50 value="@title@">
+ </div>
+</div>
+<div class="form-item-wrapper">
+ <label for="content" class="form-label">
+ #general-comments.Comment#
+ </label>
+ <div class="form-widget">
+ <textarea id=content name=content cols=80 rows=20>@content@</textarea>
+ </div>
+</div>
+<div class="form-item-wrapper">
+ <label for="comment_mime_type" class="form-label">
+ #general-comments.Text_above_is#
+ </label>
+ <div class="form-widget">
+ <select id="comment_mime_type" name=comment_mime_type>
+ <if @comment_mime_type@ eq text/html >
+ <option value="text/plain">#general-comments.Plain_text#</option>
+ <option selected value="text/html">#general-comments.HTML#</option>
+ </if>
+ <else>
+ <option selected value="text/plain">#general-comments.Plain_text#</option>
+ <option value="text/html">#general-comments.HTML#</option>
+ </else>
+ </select>
+ </div>
+</div>
-</select>
-</blockquote>
-<br>
-<center>
-<input type=submit name=submit value="#general-comments.Proceed#">
-</center>
+<div class="form-button">
+ <input type=submit name=submit value="#general-comments.Proceed#">
+</div>
</form>
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#
-<blockquote>
+
<b>@title@</b> (<a href="../view-comment?comment_id=@comment_id@">#general-comments.details#</a>)<br><br>
<if @mime_type@ eq text/plain>
<%= [util_convert_plaintext_to_html $content] %>
@@ -14,8 +14,7 @@
</else>
<br><br>-- <a href="/shared/community-member?user_id=@creation_user@">@author@</a>
(@pretty_date@)
-</blockquote>
-<center>
+
<table>
<tr>
<td>
@@ -32,7 +31,7 @@
</td
</tr>
</table>
-</center>
+
</form>
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 @@
<property name="context">@context;noquote@</property>
<property name="parent_id">@parent_id;noquote@</property>
-<form enctype=multipart/form-data method=POST action="@target@">
-<%= [export_form_vars attach_id parent_id return_url] %>
-<blockquote>
+<form enctype="multipart/form-data" method=POST action="@target@">
+<div><%= [export_form_vars attach_id parent_id return_url] %></div>
+
<table>
<tr>
<td valign=top align=right>#general-comments.Title#</td>
@@ -16,19 +16,17 @@
<td>
<if @target@ eq file-add-2>
<input type=file name=upload_file size=40><br>
- <font size=-1>#general-comments.lt_Use_the_Browse_button#</font>
+ #general-comments.lt_Use_the_Browse_button#
</if>
<else>
<b><code>@file_name@</code></b>
</else>
</td>
</tr>
</table>
-</blockquote>
-<p>
-<center>
+<p style="text-align:center">
<input type=submit value="#general-comments.Proceed#">
-</center>
+</p>
</form>
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 @@
</ul>
<p>
<h3>#general-comments.Full_Comments#</h3>
- <blockquote>
+
<if @full_comments@ eq "">
<li>#general-comments.none#
</if>
<else>
@full_comments@
</else>
- </blockquote>
+
<p>
@link@
</if>
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 @@
<property name="parent_id">@parent_id;noquote@</property>
<form method=POST action= "@target@">
-<%= [export_form_vars attach_id parent_id return_url] %>
-<blockquote>
+<div><%= [export_form_vars attach_id parent_id return_url] %></div>
+
<table>
<tr>
<td valign=top align=right>#general-comments.Label# </td>
@@ -15,14 +15,12 @@
<td valign=top align=right>#general-comments.URL# </td>
<td>
<input size=40 name=url value="@url@"><br>
- <font size=-1>#general-comments.lt_Example_httpwwwarsdig#</font>
+ #general-comments.lt_Example_httpwwwarsdig#
</td>
</tr>
</table>
-<p>
-<center>
+<p style="text-align:center">
<input type=submit value="#general-comments.Proceed#">
-</center>
-</blockquote>
+</p>
</form>
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 @@
<property name="object_name">@object_name;noquote@</property>
<if @return_url@ ne "">
-[<a href="@return_url@">#general-comments.lt_Go_back_to_where_you_#</a>]<br>
+<p>[<a href="@return_url@">#general-comments.lt_Go_back_to_where_you_#</a>]</p>
</if>
-<blockquote>
-<h4>@title@</h4>
+<h1>@title@</h1>
@html_content;noquote@
-<br><br>
<if @is_creator_p@ eq t>
+ <p>
-- #general-comments.you#
- <a href="comment-edit?comment_id=@comment_id@&revision_id=@revision_id@&return_url=@return_url@">
- #general-comments.edit_your_comment#</a><br><br>
+ <a href="@comment_edit_url@">
+ #general-comments.edit_your_comment#</a>
+ </p>
</if>
<else>
- -- <a href="/shared/community-member?user_id=@creation_user@">@author@</a>
+ <p>-- <a href="/shared/community-member?user_id=@creation_user@">@author@</a></p>
</else>
-</blockquote>
-
-
-
-<h4>#general-comments.Attachments#</h4>
+<h2>#general-comments.Attachments#</h2>
<ul>
<% set counter 0 %>
<multiple name=attachments>
<% incr counter %>
<li>
<if @is_creator_p@ eq t>
- ( <a href="file-edit?attach_id=@attachments.item_id@&parent_id=@comment_id@&return_url=@return_url@">#general-comments.edit#</a> |
-<a href="delete-attachment?attach_id=@attachments.item_id@&parent_id=@comment_id@&return_url=@return_url@">#general-comments.delete#</a> )
+ ( <a href="@attachments.file_edit_url@">#general-comments.edit#</a> | <a href="@attachments.delete_attachment_url@">#general-comments.delete#</a> )
</if>
<if @attachments.mime_type@ eq image/gif or @attachments.mime_type@ eq image/jpeg>
@attachments.title@
- (<a href="view-image?image_id=@attachments.item_id@&return_url=@return_url_view@">@attachments.name@</a>)
+ (<a href="@attachments.view_image_url@">@attachments.name@</a>)
</if>
<else>
@attachments.title@
@@ -50,8 +45,7 @@
<% incr counter %>
<li>
<if @is_creator_p@ eq t>
- ( <a href="url-edit?attach_id=@links.item_id@&parent_id=@comment_id@&return_url=@return_url@">#general-comments.edit#</a> |
-<a href="delete-attachment?attach_id=@links.item_id@&parent_id=@comment_id@&return_url=@return_url@">#general-comments.delete#</a> )
+ ( <a href="links.url_edit_url@">#general-comments.edit#</a> | <a href="@links.delete_attachment_url@">#general-comments.delete#</a> )
</if>
<a href="@links.url@">@links.label@</a>
</multiple>
@@ -61,26 +55,26 @@
</ul>
<if @is_creator_p@ eq t and @allow_attach_p@ eq t>
- <h4>#general-comments.Actions#</h4>
+ <h2>#general-comments.Actions#</h2>
<ul>
<if @allow_file_p@ eq t>
- <li><a href="file-add?parent_id=@comment_id@&return_url=@return_url@">#general-comments.lt_Attach_a_file_or_pict#</a><br>
+ <li><a href="@action_file_add_url@">#general-comments.lt_Attach_a_file_or_pict#</a><br>
</if>
<if @allow_link_p@ eq t>
- <li><a href="url-add?parent_id=@comment_id@&return_url=@return_url@">#general-comments.Attach_a_web_link#</a><br>
+ <li><a href="@action_url_add_url@">#general-comments.Attach_a_web_link#</a><br>
</if>
</ul>
</if>
<if @write_perm_p@ eq 1>
- <h4>#general-comments.Revisions#</h4>
+ <h2>#general-comments.Revisions#</h2>
<ul>
<multiple name=revisions>
<if @revision_id@ eq @revisions.revision_id@>
<li>@revisions.revision_date@
</if>
<else>
- <li><a href="view-comment?comment_id=@comment_id@&revision_id=@revisions.revision_id@&return_url=@return_url@">@revisions.revision_date@</a>
+ <li><a href="@revisions.view_comment_url@">@revisions.revision_date@</a>
</else>
<if @revisions.revision_id@ eq @live_revision@>
#general-comments.live#
@@ -89,20 +83,8 @@
</ul>
</if>
-<if @live_revision@ ne @revision_id@>
- <font size=-1 color=red>
- #general-comments.lt_This_revision_is_not_#
+ <p><span style="color:@font_color@">@pre_text@</span>
<if @admin_p@ eq 1>
- (<a href="admin/toggle-approval?comment_id=@comment_id@&revision_id=@revision_id@&return_url=../@return_url_view@">#general-comments.lt_approve_this_revision#</a>)
+ (<a href="@admin_toggle_url@">@admin_toggle_text@</a>)
</if>
- </font>
-</if>
-<else>
- <font size=-1 color=green>
- #general-comments.lt_This_revision_is_live#
- <if @admin_p@ eq 1>
- (<a href="admin/toggle-approval?comment_id=@comment_id@&revision_id=@revision_id@&return_url=../@return_url_view@">#general-comments.reject_this_revision#</a>)
- </if>
- </font>
-</else>
-
+ </p>
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 "<p>[ad_html_text_convert -from $mime_type -- $content]</p>"
+} 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#
-<blockquote>
+
<b>@title@</b> (<a href="../view-comment?comment_id=@comment_id@">#general-comments.details#</a>)<br><br>
<if @mime_type@ eq text/plain>
<%= [util_convert_plaintext_to_html $content] %>
@@ -14,8 +14,7 @@
</else>
<br><br>-- <a href="/shared/community-member?user_id=@creation_user@">@author@</a>
(@pretty_date@)
-</blockquote>
-<center>
+
<table>
<tr>
<td>
@@ -32,7 +31,7 @@
</td
</tr>
</table>
-</center>
+
</form>
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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/imsld-portlet-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/imsld-portlet-2.5.0d1.apm">
<owner url="mailto:eperez@it.uc3m.es">Eduardo Pérez Ureta</owner>
- <release-date>2007-04-12</release-date>
+ <release-date>2008-10-18</release-date>
<maturity>0</maturity>
- <provides url="imsld-portlet" version="2.4.0d1"/>
- <requires url="imsld" version="1.1d"/>
+ <provides url="imsld-portlet" version="2.5.0d1"/>
+ <requires url="imsld" version="1.2d"/>
<callbacks>
<callback type="after-install" proc="apm::imsld_portlet::after_install"/>
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 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="imsld-portlet" package_version="0.1d" locale="es_ES" charset="ISO-8859-1">
+<message_catalog package_key="imsld-portlet" locale="es_ES" charset="ISO-8859-1">
+ <msg key="imsld_add">A�adir un LD</msg>
+ <msg key="There_are_no_units-of-learning_for_this_course">No hay unidades de aprendizaje en este curso</msg>
<msg key="units-of-learning_admin">Administraci�n de Unidades de Aprendizaje</msg>
</message_catalog>
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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>f</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/lars-blogger-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/lars-blogger-2.5.0d1.apm">
<owner url="mailto:lars@pinds.com">Lars Pind</owner>
<summary>Individual or collaborative web logs.</summary>
- <release-date>2008-01-08</release-date>
+ <release-date>2008-10-18</release-date>
<vendor url="http://www.openacs.org">OpenACS</vendor>
<description format="text/html">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.</description>
<maturity>0</maturity>
- <provides url="lars-blogger" version="2.4.0d1"/>
+ <provides url="lars-blogger" version="2.5.0d1"/>
<requires url="acs-datetime" version="5.2.2"/>
- <requires url="acs-tcl" version="5.3.1a1"/>
- <requires url="categories" version="1.1"/>
+ <requires url="acs-tcl" version="5.4.2"/>
+ <requires url="categories" version="1.1.2d3"/>
<requires url="general-comments" version="5.2.0"/>
- <requires url="notifications" version="5.3.0d1"/>
+ <requires url="notifications" version="5.4.2"/>
<requires url="rss-support" version="0.3"/>
<requires url="trackback" version="0.1"/>
<requires url="xml-rpc" version="0.3"/>
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 @@
-<link rel="stylesheet" type="text/css" href="@stylesheet_url@" />
-
<multiple name="blog">
<include src="@entry_chunk@" &="blog" package_id="@package_id@" screen_name="@screen_name@" max_content_length="@max_content_length@" unpublish_p="@unpublish_p@" manageown_p="@manageown_p@" />
</multiple>
@@ -16,5 +14,5 @@
</ul>
<if @rss_file_url@ not nil>
- <a href="@rss_file_url@" title="RSS 2.0 feed"><img src="/resources/lars-blogger/xml.gif" width="36" height="14" border="0" alt="XML"></a>
+ <a href="@rss_file_url@" title="RSS 2.0 feed"><img src="/resources/lars-blogger/xml.gif" width="36" height="14" style="border:0" alt="XML"></a>
</if>
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 @@
<a href="@blog.permalink_url@" title="Permanent URL for this entry"><b>@blog.title;noquote@</b></a>
</else>
</if>
- <br/> @blog.posted_time_pretty@
+ <br> @blog.posted_time_pretty@
</div>
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) {} "<br/><a href=\"$blog(permalink_url)\">(more)</a>"] \
+ -more [ad_decode [ad_return_url] $blog(permalink_url) {} "<br><a href=\"$blog(permalink_url)\">(more)</a>"] \
-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 @@
<if @rss_file_url@ ne "">
- <link rel="alternate" type="application/rss+xml" title="RSS" href="@rss_file_url@" />
+ <link rel="alternate" type="application/rss+xml" title="RSS" href="@rss_file_url@">
</if>
<if @rsd_url@ ne "">
- <link rel="EditURI" type="application/rsd+xml" title="RSD" href="@rsd_url@" />
+ <link rel="EditURI" type="application/rsd+xml" title="RSD" href="@rsd_url@">
</if>
-<link rel="stylesheet" type="text/css" href="@stylesheet_url@" />
+<link rel="stylesheet" type="text/css" href="@stylesheet_url@">
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 @@
<if @rss_file_url@ not nil>
<div class="lars_blogger_portlet">
<h2>#lars-blogger.Syndication_Feed#</h2>
- <a href="@rss_file_url@" title="RSS 2.0 feed"><img src="/resources/lars-blogger/xml.gif" width="36" height="14" border="0" alt="XML"></a>
+ <a href="@rss_file_url@" title="RSS 2.0 feed"><img src="/resources/lars-blogger/xml.gif" width="36" height="14" style="border:0" alt="XML"></a>
</div>
</if>
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#
<p>
<form method="post" action="migrate-categories-1">
-<input type="submit" value="Start Migration - Execute code listed below">
+<div><input type="submit" value="Start Migration - Execute code listed below"></div>
</form>
+
<h2>#lars-blogger.lt_Migration_Script_Sour#</h2>
-<blockquote>
<pre>
@meat;noquote@
</pre>
-</blockquote>
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 @@
<version name="2.5.0d1" url="http://openacs.org/repository/download/apm/lorsm-portlet-2.5.0d1.apm">
<owner url="mailto:ErnieG@mm.st">Ernie Ghiglione</owner>
- <release-date>2008-09-16</release-date>
+ <release-date>2008-10-18</release-date>
<vendor url="http://www.openacs.org">OpenACS</vendor>
<provides url="lorsm-portlet" version="2.5.0d1"/>
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 @@
<singleton-p>t</singleton-p>
<auto-mount>portal</auto-mount>
- <version name="2.4.0d2" url="http://openacs.org/repository/download/apm/new-portal-2.4.0d2.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/new-portal-2.5.0d1.apm">
<owner url="http://openacs.org">OpenACS</owner>
<summary>Portals.</summary>
- <release-date>2008-01-08</release-date>
+ <release-date>2008-10-18</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
<description format="text/plain">New Portal Package aka NPP. Portals are used to aggregate content from different sources within a single page. Props to Ian Baker for "Portal".</description>
- <provides url="new-portal" version="2.4.0d2"/>
+ <provides url="new-portal" version="2.5.0d1"/>
<requires url="acs-kernel" version="5.3.1a1"/>
<callbacks>
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 @@
<msg key="lt_Manage_Custom_Portlet">Administrar Portlets Personalizados</msg>
<msg key="lt_No_Elements_on_this_p">No hay portlets en esta p�gina</msg>
<msg key="lt_None_You_can_not_add_">Ninguno. No puede a�adir portlets a esta p�gina ya que est�n siendo utilizados todos.</msg>
+ <msg key="lt_Note_Please_be_patien">Nota: por favor, sea paciente</msg>
+ <msg key="lt_Revert_all_portals_us">Revertir todos los portales a esta plantilla</msg>
<msg key="lt_Revert_the_entire_por">Volver a la configuraci�n por defecto</msg>
<msg key="lt_You_must_enter_new_na">Debe especificar un t�tulo para la p�gina.</msg>
<msg key="move_down">Mover abajo</msg>
@@ -42,6 +44,7 @@
<msg key="remove_portlet">Borrar el portlet</msg>
<msg key="Rename_Page">Renombrar p�gina</msg>
<msg key="Revert">Volver a configuraci�n por defecto</msg>
+ <msg key="Revert_All">Revertir todo</msg>
<msg key="Show_in_main_navigation">Mostrar esta p�gina</msg>
<msg key="simple_1column_layout_description">Composici�n a 1 columna</msg>
<msg key="simple_1column_layout_name">Sencilla a 1 columna</msg>
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 "
<master src=\"@master_template@\">
- <p>
- $return_text
- <p>"
+ <p>$return_text</p>"
#
# Theme selection chunk
#
set theme_chunk "
<form method=post action=@action_string@>
- <input type=hidden name=portal_id value=@portal_id@>
- <input type=hidden name=return_url value=\"@return_url@\">
- <strong>[_ new-portal.Change_Theme]</strong>
- <br>"
+ <div><input type=hidden name=portal_id value=@portal_id@></div>
+ <div><input type=hidden name=return_url value=\"@return_url@\"></div>
+ <p><strong>[_ new-portal.Change_Theme]</strong></p>"
+
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 "<label><input type=radio name=theme_id value=$theme_id"
+ append theme_chunk "<div><label><input type=radio name=theme_id value=$theme_id"
set one_theme_chunk " $name - $description"
if {$current_theme_id == $theme_id } {
append theme_chunk " checked><b>$one_theme_chunk</b>"
} else {
append theme_chunk ">$one_theme_chunk"
}
- append theme_chunk "</label><br>\n"
+ append theme_chunk "</label></div>"
}
- append theme_chunk "<input type=submit name=\"op_change_theme\" value=\"[_ new-portal.Change_Theme_1]\"></form>"
+ append theme_chunk "<div><input type=submit name=\"op_change_theme\" value=\"[_ new-portal.Change_Theme_1]\"></div></form>"
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 "<table bgcolor=\"#eeeeee\" border=0 width=\"100%\">"
+ append template "<table style=\"background-color:#eeeeee\" border=0 width=\"100%\">"
#
# Page rename chunk
@@ -477,25 +475,25 @@
</td>
<td align=right>
<a name=$page_id></a>
- <form name=\"op_rename_page\" method=post action=@action_string@>
- <input type=hidden name=portal_id value=@portal_id@>
- <input type=hidden name=page_id value=$page_id>
- <input type=hidden name=return_url value=\"@return_url@#$page_id\">
- <input type=hidden name=anchor value=$page_id>
- <input type=submit name=\"op_rename_page\" value=\"[_ new-portal.Rename_Page]\">
- <input type=text name=pretty_name value=\"[ad_quotehtml $page_name]\">
+ <form name=\"op_rename_page\" method=post action=@action_string@ class=\"inline-form\">
+ <div><input type=hidden name=portal_id value=@portal_id@></div>
+ <div><input type=hidden name=page_id value=$page_id></div>
+ <div><input type=hidden name=return_url value=\"@return_url@#$page_id\"></div>
+ <div><input type=hidden name=anchor value=$page_id></div>
+ <div><input type=submit name=\"op_rename_page\" value=\"[_ new-portal.Rename_Page]\"></div>
+ <div><input type=text name=pretty_name value=\"[ad_quotehtml $page_name]\"></div>
</form>
<form name=\"op_toggle_tab_visibility\" method=post action=@action_string@>
- <input type=hidden name=portal_id value=@portal_id@>
- <input type=hidden name=page_id value=$page_id>
- <input type=hidden name=return_url value=\"@return_url@#$page_id\">
- <input type=hidden name=anchor value=$page_id>
- <input type=submit name=\"op_toggle_tab_visibility\" value=\"$tab_toggle_label\">
+ <div><input type=hidden name=portal_id value=@portal_id@></div>
+ <div><input type=hidden name=page_id value=$page_id></div>
+ <div><input type=hidden name=return_url value=\"@return_url@#$page_id\"></div>
+ <div><input type=hidden name=anchor value=$page_id></div>
+ <div><input type=submit name=\"op_toggle_tab_visibility\" value=\"$tab_toggle_label\"></div>
</form>
</td>
</tr>
<tr>
- <td colspan=2 class=\"bottom-border\" height=\"1\">
+ <td colspan=2 class=\"bottom-border\">
<img src=\"/resources/acs-subsite/spacer.gif\" height=1 alt=\"\">
</td>
</tr>
@@ -529,7 +527,7 @@
append template "
<tr>
<td>
- <table class=\"portal-page-config\" bgcolor=\"#eeeeee\" border=0 width=\"100%\">
+ <table class=\"portal-page-config\" style=\"background-color:#eeeeee\" border=0 width=\"100%\">
<tr valign=middle>
<td valign=middle>
<include src=\"$layout\"
@@ -580,13 +578,13 @@
append template "
<tr valign=middle>
<td valign=middle>
- <center>
+ <div style=\"text-align:center\">
[_ new-portal.lt_No_Elements_on_this_p]
<form method=post action=@action_string@>
[export_vars -form { portal_id page_id return_url { anchor $page_id } }]
- <input type=submit name=\"op_remove_empty_page\" value=\"[_ new-portal.Remove_Empty_Page]\">
+ <div><input type=submit name=\"op_remove_empty_page\" value=\"[_ new-portal.Remove_Empty_Page]\"></div>
</form>
- </center>
+ </div>
</td>
</tr>"
}
@@ -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 "<small> $layout_name - $layout_description</small>"
- append layout_chunk "<label><input type=radio name=layout_id value=$layout_id"
+ set one_layout_chunk " $layout_name - $layout_description"
+ append layout_chunk "<div><label><input type=radio name=layout_id value=$layout_id"
if {$page_layout_id == $layout_id} {
append layout_chunk " checked><b>$one_layout_chunk</b>"
} else {
append layout_chunk ">$one_layout_chunk"
}
- append layout_chunk "</label><br>"
+ append layout_chunk "</label></div>"
}
@@ -619,16 +617,13 @@
<td>
<br>
<form method=post action=@action_string@>
- <small>
- <b>[_ new-portal.Change_page_layout]</b>
- <br>
- <input type=hidden name=portal_id value=$portal_id>
- <input type=hidden name=page_id value=$page_id>
- <input type=hidden name=return_url value=\"@return_url@\">
- <input type=hidden name=anchor value=$page_id>
+ <p><b>[_ new-portal.Change_page_layout]</b></p>
+ <div><input type=hidden name=portal_id value=$portal_id></div>
+ <div><input type=hidden name=page_id value=$page_id></div>
+ <div><input type=hidden name=return_url value=\"@return_url@\"></div>
+ <div><input type=hidden name=anchor value=$page_id></div>
$layout_chunk
- <input type=submit name=\"op_change_page_layout\" value=\"[_ new-portal.Change_Page_Layout]\">
- </small>
+ <div><input type=submit name=\"op_change_page_layout\" value=\"[_ new-portal.Change_Page_Layout]\"></div>
</form>
</td>
</tr>"
@@ -658,13 +653,13 @@
<td>
<a name=add_a_new_page></a>
<form name=\"op_add_page\" method=post action=@action_string@>
- <input type=hidden name=portal_id value=@portal_id@>
- <input type=hidden name=return_url value=\"@return_url@#$page_id\">
- <input type=hidden name=anchor value=add_a_new_page>
- <center>
+ <div><input type=hidden name=portal_id value=@portal_id@></div>
+ <div><input type=hidden name=return_url value=\"@return_url@#$page_id\"></div>
+ <div><input type=hidden name=anchor value=add_a_new_page></div>
+ <div style=\"text-align:center\">
<input type=text name=pretty_name value=\"[_ new-portal.Page] $new_page_num\">
<input type=submit name=\"op_add_page\" value=\"[_ new-portal.Add_Page]\">
- </center>
+ </div>
</form>
</td>
</tr>
@@ -680,12 +675,12 @@
<tr>
<td>
<form name=\"op_revert\" method=post action=@action_string@>
- <input type=hidden name=portal_id value=@portal_id@>
- <input type=hidden name=return_url value=\"@return_url@\">
+ <div><input type=hidden name=portal_id value=@portal_id@></div>
+ <div><input type=hidden name=return_url value=\"@return_url@\"></div>
<h2 class=\"portal-page-name\">[_ new-portal.lt_Revert_the_entire_por]</h2>
- <center>
+ <div style=\"text-align:center\">
<input type=submit name=\"op_revert\" value=\"[_ new-portal.Revert]\">
- </center>
+ </div>
</form>
</td>
</tr>
@@ -699,14 +694,14 @@
<tr>
<td>
<form name=\"op_revert_all\" method=post action=@action_string@>
- <input type=hidden name=portal_id value=@portal_id@>
- <input type=hidden name=return_url value=\"@return_url@\">
+ <div><input type=hidden name=portal_id value=@portal_id@></div>
+ <div><input type=hidden name=return_url value=\"@return_url@\"></div>
<h2 class=\"portal-page-name\">[_ new-portal.lt_Revert_all_portals_us]</h2>
- <center>
+ <div style=\"text-align:center\">
<input type=submit name=\"op_revert_all\" value=\"[_ new-portal.Revert_All]\">
- <br />
+ <br>
<i>[_ new-portal.lt_Note_Please_be_patien]</i>
- </center>
+ </div>
</form>
</td>
</tr>
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 @@
%>
-<form name="op_move_to_page" method=post action=@action_string@>
-<input type=hidden name=portal_id value=@portal_id@>
-<input type=hidden name=return_url value=@return_url@>
+<form name="op_move_to_page" method=post action=@action_string@ class="inline-form">
+<div><input type=hidden name=portal_id value=@portal_id@></div>
+<div><input type=hidden name=return_url value=@return_url@></div>
<if @other_page_avail_p@ ne 0>
- <input type=hidden name=element_id value=@element_id@>
- <input type=hidden name=anchor value=@page_id@>
- <input type=submit name="op_move_to_page" value="#new-portal.Move_to_page#">
+ <div><input type=hidden name=element_id value=@element_id@></div>
+ <div><input type=hidden name=anchor value=@page_id@></div>
+ <div><input type=submit name="op_move_to_page" value="#new-portal.Move_to_page#"></div>
+ <div>
<select name=page_id>
<multiple name=pages>
<option value=@pages.page_id@><%= [lang::util::localize "@pages.pretty_name@"] %></option>
</multiple>
</select>
-
+ </div>
</if>
</form>
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 @@
<if @element_multi.rownum@ eq 1>
<form method=post action=@action_string@>
- <input type=hidden name=portal_id value=@portal_id@>
- <input type=hidden name=region value=@region@>
- <input type=hidden name=page_id value=@page_id@>
+ <div><input type=hidden name=portal_id value=@portal_id@></div>
+ <div><input type=hidden name=region value=@region@></div>
+ <div><input type=hidden name=page_id value=@page_id@></div>
</if>
<div class="portlet-header">
<div class="portlet-title">
@@ -39,7 +39,7 @@
<!-- hide_remove_url -->
<span class="screen-reader-only">[</span>
<a href="@element_multi.hide_remove_url@" title="#new-portal.remove_portlet#">
- <img src="@imgdir@/delete.gif" border=0 alt="#new-portal.remove#">
+ <img src="@imgdir@/delete.gif" style="border:0" alt="#new-portal.remove#">
</a>
<span class="screen-reader-only">]</span>
@@ -48,7 +48,7 @@
<!-- move_up_url -->
<span class="screen-reader-only">[</span>
<a href="@element_multi.move_up_url@" title="#new-portal.move_portlet_up#">
- <img border="0" src="@imgdir@/arrow-up.gif" alt="#new-portal.move_up#">
+ <img style="border:0" src="@imgdir@/arrow-up.gif" alt="#new-portal.move_up#">
</a>
<span class="screen-reader-only">]</span>
</if>
@@ -57,7 +57,7 @@
<!-- move_down_url -->
<span class="screen-reader-only">[</span>
<a href="@element_multi.move_down_url@" title="#new-portal.move_portlet_down#">
- <img border="0" src="@imgdir@/arrow-down.gif" alt="#new-portal.move_down#">
+ <img style="border:0" src="@imgdir@/arrow-down.gif" alt="#new-portal.move_down#">
</a>
<span class="screen-reader-only">]</span>
</if>
@@ -68,7 +68,7 @@
<!-- move_right_with_anchor_url -->
<span class="screen-reader-only">[</span>
<a href="@element_multi.move_right_wa_url@" title="#new-portal.move_portlet_right#">
- <img border="0" src="@imgdir@/arrow-right.gif" alt="#new-portal.move_right#">
+ <img style="border:0" src="@imgdir@/arrow-right.gif" alt="#new-portal.move_right#">
</a>
<span class="screen-reader-only">]</span>
</if>
@@ -77,13 +77,13 @@
<!-- move_left_with_anchor_url -->
<span class="screen-reader-only">[</span>
<a href="@element_multi.move_left_wa_url@" title="#new-portal.move_portlet_left#">
- <img border="0" src="@imgdir@/arrow-left.gif" alt="#new-portal.move_left#">
+ <img style="border:0" src="@imgdir@/arrow-left.gif" alt="#new-portal.move_left#">
</a>
<span class="screen-reader-only">]</span>
<!-- move_right_url -->
<span class="screen-reader-only">[</span>
<a href="@element_multi.move_right_url@" title="#new-portal.move_portlet_right#">
- <img border="0" src="@imgdir@/arrow-right.gif" alt="#new-portal.move_right#">
+ <img style="border:0" src="@imgdir@/arrow-right.gif" alt="#new-portal.move_right#">
</a>
<span class="screen-reader-only">]</span>
</if>
@@ -92,7 +92,7 @@
<!-- move_left_with_anchor_url -->
<span class="screen-reader-only">[</span>
<a href="@element_multi.move_left_wa_url@" title="#new-portal.move_portlet_left#">
- <img border="0" src="@imgdir@/arrow-left.gif" alt="#new-portal.move_left#">
+ <img style="border:0" src="@imgdir@/arrow-left.gif" alt="#new-portal.move_left#">
</a>
<span class="screen-reader-only">]</span>
</if>
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 @@
<div class="portlet">
<if @show_avail_p@ ne 0>
<form method="post" action="@action_string@">
- <input type=hidden name=portal_id value=@portal_id@>
- <input type=hidden name=region value=@region@>
- <input type=hidden name=page_id value=@page_id@>
- <input type=hidden name=return_url value=@return_url@>
- <input type=hidden name="op_show_here" value="Show Here">
- <input type=hidden name=anchor value=@page_id@>
- <!--<select>-->
+ <div><input type=hidden name=portal_id value=@portal_id@></div>
+ <div><input type=hidden name=region value=@region@></div>
+ <div><input type=hidden name=page_id value=@page_id@></div>
+ <div><input type=hidden name=return_url value=@return_url@></div>
+ <div><input type=hidden name="op_show_here" value="Show Here"></div>
+ <div><input type=hidden name=anchor value=@page_id@></div>
+ <div>
+ <!--<select>-->
@show_html;noquote@
- </select>
- <input type=submit name="op_show_here" value="#new-portal.lt_Add_This_Portlet_Here#">
+ </select>
+ </div>
+ <div>
+ <input type=submit name="op_show_here" value="#new-portal.lt_Add_This_Portlet_Here#">
+ </div>
</form>
</if>
<else>
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@
<hr>
-<a name="custom"><h2></a>#new-portal.Custom_Portlets#</h2><font size=2> #new-portal.lt_-_Note_custom_portlet#</font>
+<a name="custom"><h2></a>#new-portal.Custom_Portlets#</h2>
+<p> #new-portal.lt_-_Note_custom_portlet#</p>
<include src="/packages/static-portlet/www/static-admin-portlet" package_id="@portal_id@" template_portal_id="@portal_id@" return_url="@return_url@">
-
-
-
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 @@
<table border=0 width="100%">
<tr>
- <td valign=top width="50%">
+ <td valign=top style="width:50%">
<list name="element_ids_1">
<include src="@element_src@"
element_id="@element_ids_1:item@"
Index: openacs-4/packages/new-portal/www/layouts/simple3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/layouts/simple3.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/new-portal/www/layouts/simple3.adp 9 Aug 2002 20:56:30 -0000 1.4
+++ openacs-4/packages/new-portal/www/layouts/simple3.adp 9 Nov 2008 23:29:27 -0000 1.5
@@ -22,7 +22,7 @@
<table border="0" width="100%">
<tr>
- <td valign="top" width="33%">
+ <td valign="top" style="width:33%">
<list name="element_ids_1">
<include src="@element_src@"
element_id="@element_ids_1:item@"
@@ -38,7 +38,7 @@
<br>
</list>
</td>
- <td valign="top" width="33%">
+ <td valign="top" style="width:33%">
<list name="element_ids_2">
<include src="@element_src@"
element_id="@element_ids_2:item@"
@@ -54,7 +54,7 @@
<br>
</list>
</td>
- <td valign="top" width="33%">
+ <td valign="top" style="width:33%">
<list name="element_ids_3">
<include src="@element_src@"
element_id="@element_ids_3:item@"
Index: openacs-4/packages/new-portal/www/themes/deco-theme.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/themes/deco-theme.adp,v
diff -u -r1.8 -r1.9
--- openacs-4/packages/new-portal/www/themes/deco-theme.adp 8 Aug 2006 21:27:00 -0000 1.8
+++ openacs-4/packages/new-portal/www/themes/deco-theme.adp 9 Nov 2008 23:29:27 -0000 1.9
@@ -34,13 +34,11 @@
<tbody>
<tr>
<td align=left valign=middle width=88% bgcolor="#eeeee7">
- <font face="verdana,arial,helvetica" size="+1">
<if @link_hideable_p@ eq "t" and @hide_links_p@ eq "t">
<b>@name;noquote@</b>
</if><else>
<a style="text-decoration: none" href=@link@><b>@name;noquote@</b></a>
</else>
- </font>
</td>
<if @user_editable_p@ eq "t">
<td align=right width="7%">
@@ -78,11 +76,11 @@
<tr>
<td align="left" valign="middle" bgcolor="#ffffff">
<br>
-<font face="verdana,arial,helvetica" color="#333333">
+<div style="font-family:verdana,arial,helvetica; color:#333333">
<!-- Content: '@name@' begin -->
<slave>
<!-- Content: '@name@' end @dir@ -->
-</font>
+</div>
</td>
</tr>
<tr>
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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>f</singleton-p>
- <version name="5.2.0d7" url="http://openacs.org/repository/download/apm/news-5.2.0d7.apm">
+ <version name="5.2.0b1" url="http://openacs.org/repository/download/apm/news-5.2.0b1.apm">
<owner url="http://opeancs.org">OpenACS</owner>
<summary>Used for announcements and news items.</summary>
<release-date>2007-06-15</release-date>
@@ -16,12 +16,12 @@
<maturity>0</maturity>
<package_instance_name>#news.News#</package_instance_name>
- <provides url="news" version="5.2.0d7"/>
- <requires url="acs-content-repository" version="5.3.1a1"/>
+ <provides url="news" version="5.2.0b1"/>
+ <requires url="acs-content-repository" version="5.4.2"/>
<requires url="acs-datetime" version="5.2.2"/>
- <requires url="acs-kernel" version="5.3.1a1"/>
+ <requires url="acs-kernel" version="5.4.2"/>
<requires url="general-comments" version="5.2.0"/>
- <requires url="notifications" version="5.3.0d1"/>
+ <requires url="notifications" version="5.4.2"/>
<requires url="rss-support" version="0.3"/>
<callbacks>
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 @@
<msg key="going_live_with_archive">Going live in %n_days_until_publish% days, scheduled for archive in %n_days_until_archive% days</msg>
<msg key="History">History</msg>
<msg key="HTML">HTML</msg>
+ <msg key="Image">Image</msg>
<msg key="Image_must_be_one_of_the_following_types">Image must be one of the following types: </msg>
<msg key="It_will_go_live_on">It will go live on</msg>
<msg key="It_will_move_into_archive_on">It will move into the archive on</msg>
@@ -98,7 +99,7 @@
<msg key="Preview_news_item">Preview news item</msg>
<msg key="Publication_Date">Publication Date</msg>
<msg key="Publish">Publish</msg>
- <msg key="Publish_archive_dates_incorrect"></msg>
+ <msg key="Publish_archive_dates_incorrect">Incorrect publish date</msg>
<msg key="Published">Published</msg>
<msg key="published_no_archive">Published, not scheduled for archive</msg>
<msg key="published_scheduled_for_archive">Published, archived in %n_days_until_archive% days</msg>
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 @@
<msg key="going_live_with_archive">Ser� publicada en %n_days_until_publish% d�as, agendada para archivar en %n_days_until_archive% d�as</msg>
<msg key="History">Hist�rico</msg>
<msg key="HTML">HTML</msg>
+ <msg key="Image">Image</msg>
<msg key="Image_must_be_one_of_the_following_types">La imagen debe ser de algunos de los tipos siguientes:</msg>
<msg key="It_will_go_live_on">Saldr� publicado el</msg>
<msg key="It_will_move_into_archive_on">Se mover� al archivo el</msg>
@@ -94,6 +95,7 @@
<msg key="Preview_news_item">Vista previa de la noticia</msg>
<msg key="Publication_Date">Fecha de publicaci�n</msg>
<msg key="Publish">Publicar</msg>
+ <msg key="Publish_archive_dates_incorrect">Fecha de publicaci�n incorrecta</msg>
<msg key="Published">Publicado</msg>
<msg key="published_no_archive">Publicada, no agendada para archivar</msg>
<msg key="published_scheduled_for_archive">Publicada, se archivar� en %n_days_until_archive% d�as</msg>
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 @@
<h3><a href="@news.url@">@news.title@</a></h3>
</else>
- <p>@news.lead@<br />@news.date@</p>
+ <p>@news.lead@<br>@news.date@</p>
</multiple>
<p><a href="@base_url@">More news...</a></p>
</else>
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 "<br /><br />$body"
+ append html_content "<br><br>$body"
} else {
append new_content "\n\n$body"
- append html_content "<br /><br />[ad_html_text_convert "$body"]"
+ append html_content "<br><br>[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 "<br /><br /><hr />[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"]<br /><br />"
+ append html_content "<br><br><hr>[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"]<br><br>"
}
# 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 @@
<property name="context">@context;noquote@</property>
<property name="title">@title;noquote@</property>
- <if @news_admin_p@ ne 0>
- <div style="float: right;">[<a href="admin/" title="#news.Administer#">#news.Administer#</a>]</div>
- </if>
+ <listtemplate name="news"></listtemplate>
-
- <if @news_items:rowcount@ eq 0>
- <p><i>#news.lt_There_are_no_news_ite#</i></p>
+ <if @notification_chunk@ not nil>
+ <p>@notification_chunk;noquote@</p>
</if>
- <else>
- <if @allow_search_p@ eq "1" and @search_url@ ne "">
- <div>#news.Search#
- <form action="@search_url@search">
- <input type="text" name="q" value="" />
- <input type="submit" name="search" value="Search" />
- </form>
- </div>
- </if>
-
- <if @notification_chunk@ not nil >
- <p>@notification_chunk;noquote@</if>
-
- <multiple name=news_items>
- <p> @news_items.publish_date@: <a href="item?item_id=@news_items.item_id@" title="#news.show_content_news_items_publish_title#">@news_items.publish_title@</a></li>
- <if @news_items.publish_lead@ not nil><br />@news_items.publish_lead@</if></p>
- </multiple>
-
- <if @rss_exists@ true>
- <p><a href="@rss_url@" title="#rss-support.Syndication_Feed#">#rss-support.Syndication_Feed# <img
- src="/resources/rss-support/xml.gif" alt="Subscribe via RSS" /></a></p></if>
-
- <p>@pagination_link;noquote@</p>
- </else>
- <if @news_admin_p@ ne 0>
- <ul>
- <li><a href="item-create" title="#news.Create_a_news_item#">#news.Create_a_news_item#</a></li>
- </ul>
+ <if @rss_exists@ true>
+ <p>
+ <a href="@rss_url@" title="#rss-support.Syndication_Feed#">
+ <img src="/resources/rss-support/xml.gif" alt="Subscribe via RSS">
+ #rss-support.Syndication_Feed#
+ </a>
+ </p>
</if>
- <else>
- <if @news_create_p@ ne 0>
- <ul>
- <li><a href="item-create" title="#news.Submit_a_news_item#">#news.Submit_a_news_item#</a></li>
- </ul>
- </if>
- </else>
-
- <if @view_switch_link@ ne "">
- <ul>
- <li>@view_switch_link;noquote@</li>
- </ul>
- </if>
-
-
-
-
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 "<a href=\"?view=archive\" title=\"[_ news.Show_archived_news]\">[_ news.Show_archived_news]</a>"
- } 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 "<a href=?view=live>[_ news.Show_live_news]</a>"
- } 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: <multiple ... -startrow=.. and -max_rows=.. if it worked
- # in Oracle (best for large number of rows): select no .. (select rownum as no.. (select...)))
- #
- incr count
- if { $count < $start } continue
- if { $count >= [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 "<a href=index?start=[expr $start + $max_dspl]&view=$view>Next<a/>"
-}
+# build the multirow for the list
-if { $start == 1 } {
- set prev_start ""
-} else {
- set prev_start "<a href=index?start=[expr $start - $max_dspl]&view=$view>Previous</a>"
+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 @@
<queryset>
<rdbms><type>oracle</type><version>8.1.6</version></rdbms>
-<fullquery name="week">
- <querytext>
- select sysdate + [ad_parameter ActiveDays "news" 14] from dual
- </querytext>
-</fullquery>
+ <fullquery name="get_dates">
+ <querytext>
+ 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
+ </querytext>
+ </fullquery>
-
</queryset>
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 @@
<queryset>
<rdbms><type>postgresql</type><version>7.1</version></rdbms>
-<fullquery name="week">
- <querytext>
- select to_char(current_timestamp + interval '[ad_parameter ActiveDays "news" 14] days', 'YYYY-MM-DD')
- </querytext>
-</fullquery>
+ <fullquery name="get_dates">
+ <querytext>
+ 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
+ </querytext>
+ </fullquery>
-
</queryset>
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 @@
<h1>@title;noquote@</h1>
-<p>Use the following form to define your news item.Note that the fields marked with <span class="formRequired">*</span> are required.
-When you're done click 'Preview' to see how the news item will look and to choose an image for the article.</p>
-
-
-<form action=preview method=post enctype=multipart/form-data name=news>
-
-<p class="formLabel"><label for="publish_title">#news.Title#</label><span class="formRequired">*</span></p>
-<p class="formWidget"><input type=text size=63 maxlength=400 id="publish_title" name=publish_title value="@publish_title@"></p>
-
-<p class="formLabel"><label for="publish_lead">#news.Lead#</label></p>
-<p class="formWidget"><textarea id="publish_lead" name=publish_lead cols=50 rows=3>@publish_lead@</textarea></p>
-
-<p class="formLabel"><label for="publish_body">#news.Body#</label><span class="formRequired">*</span></p>
-<p class="formWidget"><textarea id="publish_body" name=publish_body cols=50 rows=20 wrap=soft>@publish_body@</textarea><br />
-<span class="advancedAdmin"><label for="text_file">#news.or_upload_text_file#</label><br /></span>
-<p class="formWidget"><span class="advancedAdmin"><input type=file id="text_file" name=text_file size=40><br /></span>
-#news.The_text_is_formatted_as#
- <input type=radio name=html_p value="f" id="plain"<if @html_p@ false> checked</if>> <label for="plain">#news.Plain_text#</label>
- <input type=radio name=html_p value="t" id="html"<if @html_p@ true> checked</if>> <label for="html">#news.HTML#</label>
-</p>
-
-<if @immediate_approve_p@ ne 0>
-<p class="formLabel"><label for="publish_date">#news.Release_Date#</label></p>
-<p class="formWidget">@publish_date_select;noquote@</p>
-
-<p class="formLabel"><label for="archive_date">#news.Archive_Date#</label></p>
-<p class="formWidget">@archive_date_select;noquote@<br />
-<input type=checkbox name=permanent_p value=t id="never" <if @permanent_p@ true> checked</if>> <b><label for="never">#news.never#</label></b> #news.show_it_permanently#</p>
-</p>
-</if>
-
-<p>
- <input type=hidden name=action value="News Item">
- <input type=submit value="#news.Preview#">
-</p>
-</form>
-
-
-
-
-
-
-
-
-
-
-
+<formtemplate id="news"></formtemplate>
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 @@
</querytext>
</fullquery>
+ <fullquery name="get_content">
+ <querytext>
+ select content
+ from cr_revisions
+ where revision_id = :live_revision
+ </querytext>
+ </fullquery>
+
</queryset>
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 @@
<property name="context">@context;noquote@</property>
<h1>@title;noquote@</h1>
-<if @item_exist_p@ eq "0">
- <h2>#news.lt_Could_not_find_the_re#</h2>
-</if>
-<else>
+
<include src=news
item_id=@item_id;noquote@
publish_title=@publish_title;noquote@
@@ -18,18 +15,10 @@
@comments;noquote@
</if>
-<ul>
-<if @comment_link@ not nil>
- <li>@comment_link;noquote@</li>
-</if>
-<if @edit_link@ not nil>
- <li>@edit_link;noquote@</li>
-</if>
-</ul>
-
-</else>
-
-
-
-
-
+<if @footer_links@ not nil>
+ <div class="action-list">
+ <ul>
+ <li>@footer_links;noquote@</li>
+ </ul>
+ </div>
+</if>
\ 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,
- '<a href=/shared/community-member?user_id=' || creation_user || '>' || item_creator || '</a>' 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 "<p>[ad_text_to_html -- $publish_body]</p>"
}
+ # 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 "<a href=\"admin/revision-add?item_id=$item_id\">[_ news.Revise]</a>"
- } else {
- set edit_link ""
+ lappend footer_links "<a href=\"admin/revision-add?item_id=$item_id\" class=\"button\">[_ news.Revise]</a>"
}
+ set footer_links [join $footer_links "</li>\n<li>"]
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 @@
<comment>This is the default template to render news items in admin/. Comments are not shown here</comment>
-<if @publish_title@ not nil><h1 class="newsTitle">@publish_title@</h1></if>
+<if @publish_title@ not nil><h1>@publish_title@</h1></if>
<if @publish_image@ not nil><img class="newsImage" src="@publish_image@" alt="News image"></if>
<if @publish_lead@ not nil><p class="newsLead">@publish_lead@</p></if>
<div class="newsBody">@publish_body;noquote@</div>
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@>
-<p>
+<div>
@form_action;noquote@
- @hidden_vars;noquote@
- <input type=submit value="#news.Confirm#">
- </form>
+ <div>@hidden_vars;noquote@</div>
+ <div class="form-button"><input type=submit value="#news.Confirm#"></div>
+ </form>
<if @action@ eq "News Item">
- @edit_action;noquote@ @image_vars;noquote@
- <input type="submit" value="Return to edit">
+ @edit_action;noquote@
+ <div>@image_vars;noquote@</div>
+ <div class="form-button"><input type="submit" value="Return to edit"></div>
+ </form>
</if>
-</p>
+</div>
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 "<form method=post action=item-create-3 enctype=multipart/form-data>"
- set edit_action "<form method=post action=item-create>"
+ set form_action "<form method=post action=item-create-3 enctype=multipart/form-data class=\"inline-form\">"
+ set edit_action "<form method=post action=item-create class=\"inline-form\">"
} 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 "<form method=post action=admin/revision-add-3>"
- set edit_action "<form method=post action=admin/revision-add>"
+ set form_action "<form method=post action=admin/revision-add-3 class=\"inline-form\">"
+ set edit_action "<form method=post action=admin/revision-add class=\"inline-form\">"
}
# 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 @@
<p class="formWidget">@publish_date_select;noquote@</p>
<p class="formLabel"><label for="archive_date">#news.Archive_Date#</p>
-<p class="formWidget">@archive_date_select;noquote@<br />
+<p class="formWidget">@archive_date_select;noquote@<br>
<input type=checkbox name=permanent_p value=t id="never"> <b><label for="never">#news.never#</label></b> #news.show_it_permanently#</p>
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 @@
<property name="title">@title;noquote@</property>
<ul>
- <li><a href="../item-create">#news.Create_a_news_item#</a>
+ <li><a href="../item-create">#news.Create_a_news_item#</a></li>
<li><if @rss_exists@ true>#rss-support.Rss_feed_active# [<a
href="rss">#rss-support.Remove_feed#</a>]</if><else>#rss-support.Rss_feed_inactive#[<a href="rss">
- #rss-support.Create_feed#</a>]</else>
+ #rss-support.Create_feed#</a>]</else></li>
</ul>
<p>
@@ -39,9 +39,9 @@
<tr class="even">
</else>
<td align=center><input type=checkbox name=n_items value=@news_items.item_id@></td>
- <td><a href=item?item_id=@news_items.item_id@>@news_items.item_id@</a></td>
- <td class="adminLink">@news_items.publish_title@ (#news.rev# @news_items.revision_no@) <a href=revision-add?item_id=@news_items.item_id@>#news.revise#</a></td>
- <td><a href=/shared/community-member?user_id=@news_items.creation_user@>@news_items.item_creator@</a></td>
+ <td><a href="item?item_id=@news_items.item_id@">@news_items.item_id@</a></td>
+ <td class="adminLink">@news_items.publish_title@ (#news.rev# @news_items.revision_no@) <a href="revision-add?item_id=@news_items.item_id@">#news.revise#</a></td>
+ <td><a href="/shared/community-member?user_id=@news_items.creation_user@">@news_items.item_creator@</a></td>
<td>@news_items.publish_date_pretty@</td>
<td>@news_items.archive_date_pretty@</td>
<td>@news_items.pretty_status@</td>
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 @@
<property name="context">@context;noquote@</property>
<property name="title">@title;noquote@</property>
-
-
-<p class="adminLink"><a href=revision-add?item_id=@item_id@>#news.Add_a_new_revision#</a></p>
-
- <table>
- <tr>
- <th>Revision #</th>
- <th>#news.Active_Revision#</th>
- <th>#news.Title#</th>
- <th>#news.Author#</th>
- <th>#news.Log_Entry#</th>
- <th>#news.Status#</th>
- </tr>
-
- <multiple name=item>
- <if @item.rownum@ odd>
- <tr class="odd">
- </if>
- <else>
- <tr class="even">
- </else>
- <td align=center>
- <a href=revision?item_id=@item.item_id@&revision_id=@item.revision_id@>
- <%= [expr @item:rowcount@ - @item.rownum@ +1] %> </td>
- </a>
-
- <td>
- <if @item.item_live_revision_id@ eq @item.revision_id@>
- #news.active#
- </if>
- <else>
- <a href="revision-set-active?item_id=@item_id@&new_rev_id=@item.revision_id@">
- #news.make_active#
- </else>
- </td>
-
- <td>
- <a href=revision?item_id=@item.item_id@&revision_id=@item.revision_id@>@item.publish_title@<a/></td>
- <td><a href=/shared/community-member?user_id=@item.creation_user@>@item.item_creator@</a></td>
- <td>@item.log_entry@</td>
- <td class="adminLink">@item.status@
- <if @item.approval_needed_p@ ne 0>
- | <a href=approve?n_items=@item.item_id@&revision_id=@item.revision_id@&return_url=item?item_id=@item.item_id@>#news.approve#</a>
- </if>
- <else>
- | <a href=revoke?revision_id=@item.revision_id@&item_id=@item_id@>#news.revoke#</a>
- </else>
- </td>
- </tr>
- </multiple>
-
- </table>
-
-
-
-
-
+<listtemplate name="news_items"></listtemplate>
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 %>
-<blockquote>
<h3>@publish_title@</h3>
<if @publish_lead@ not nil><p class="newsLead">@publish_lead@</p></if>
@publish_body;noquote@
<p>#news.Contributed_by# @creator_link;noquote@
-</blockquote>
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 @@
<if @halt_p@ not nil and @unapproved:rowcount@ gt 0>
<h3>#news.Error#</h3>
- #news.The_action# <font color=red>@action@</font> #news.lt_cannot_be_applied_to_#
+ #news.The_action# <span style="color:red">@action@</span> #news.lt_cannot_be_applied_to_#
<ul>
<multiple name=unapproved>
<li><b>@unapproved.publish_title@</b> - @unapproved.creation_date_pretty@
@@ -16,12 +16,12 @@
#news.lt_Manage_the_items_indi#
</if>
<else>
- <b>#news.lt_Do_you_really_want_to# <font color=red>@action_pretty@</font><br> #news.lt_on_the_following_news#</b>
+ <b>#news.lt_Do_you_really_want_to# <span style="color:red">@action_pretty@</span><br> #news.lt_on_the_following_news#</b>
- <p><listtemplate name="news_items"></listtemplate></p>
+ <listtemplate name="news_items"></listtemplate>
<form method=post action=process-2>
@hidden_vars;noquote@
- <blockquote><input type=submit value="#news.Yes#"></blockquote>
+ <div><input type=submit value="#news.Yes#"></div>
</form>
</else>
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 @@
</fullquery>
-<fullquery name="get_content">
- <querytext>
- select content
-from cr_revisions
-where revision_id = :revision_id
- </querytext>
-</fullquery>
-
-
</queryset>
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 @@
<h1>@title;noquote@</h1>
-<p>#news.Use_the_following_form_to_define#</p>
-
-<form action="../preview" method="post" enctype="multipart/form-data">
-@hidden_vars;noquote@
-
-<p class="formLabel"><label for="publish_title">#news.Title#</label><span class="formRequired">*</span></p>
-<p class="formWidget"><input type=text size=63 maxlength=400 id="publish_title" name=publish_title value="@publish_title@"></p>
-
-<p class="formLabel"><label for="publish_lead">#news.Lead#</label></p>
-<p class="formWidget"><textarea id="publish_lead" name=publish_lead cols=50 rows=3>@publish_lead@</textarea></p>
-
-<p class="formLabel"><label for="publish_body">#news.Body#</label><span class="formRequired">*</span></p>
-<p class="formWidget"><textarea id="publish_body" name=publish_body cols=50 rows=20>@publish_body@</textarea><br />
-<span class="advancedAdmin"><label for="text_file">#news.or_upload_text_file#</label><br /></span>
-<p class="formWidget"><span class="advancedAdmin"><input type=file id="text_file" name=text_file size=40><br /></span>
-#news.The_text_is_formatted_as#
- <if @html_p@ not nil and @html_p@ ne "f">
- <input type=radio name=html_p value="f" id="plain"> <label for="plain">#news.Plain_text#</label>
- <input type=radio name=html_p value="t" id="html" checked> <label for="html">#news.HTML#</label>
- </if>
- <else>
- <input type=radio name=html_p value="f" id="plain" checked> <label for="plain">#news.Plain_text#</label>
- <input type=radio name=html_p value="t" id="html"> <label for="html">#news.HTML#</label>
- </else>
-</p>
-
-<p class="formLabel">Image</p>
-<p class="formWidget"><if @image_url@ not nil><img src="@image_url@"></if>
- [#news.use_preview_to_revise_image#]
-</p>
-
-<p class="formLabel">#news.Release_Date#</p>
-<p class="formWidget">@publish_date_select;noquote@</p>
-
-<p class="formLabel">#news.Archive_Date#</p>
-<p class="formWidget">@archive_date_select;noquote@<br />
-<input type=checkbox name=permanent_p value=t id="never"> <b><label for="never">#news.never#</label></b> #news.show_it_permanently#</p>
-
-<p class="formLabel"><label for="revision_log">#news.Revision_log#</label><span class="formRequired">*</span></p>
-<p class="formWidget"><input type=text size=63 maxlength=400 id="revision_log" name=revision_log value=""></p>
-
-
-
-<p> <input type=submit value="#news.Preview#">
-</p>
-</form>
-
-
-
-
-
-
-
-
+<formtemplate id="news_revision"></formtemplate>
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 "<input type=checkbox name=permanent_p value=t"
-if {[string equal $status "permanent"]} {
- append never_checkbox "checked"
-}
-append 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 {<br><img src="$image_url">}]
+}
-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 @@
<?xml version="1.0"?>
<queryset>
-<fullquery name="news_item_info">
+ <fullquery name="news_item_info">
<querytext>
select
@@ -13,7 +13,14 @@
where item_id = :item_id
</querytext>
-</fullquery>
+ </fullquery>
+ <fullquery name="get_content">
+ <querytext>
+ select content
+ from cr_revisions
+ where revision_id = :revision_id
+ </querytext>
+ </fullquery>
</queryset>
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 @@
<property name="title">@title;noquote@</property>
-<if @item_exist_p@ eq "0">
- <p>#news.lt_Could_not_find_corres#</p>
-</if>
-<else>
<p>
- #news.Author#: @creator_link;noquote@<br />
- #news.Revision_number#: @revision_no@<br />
- #news.Creation_Date#: @creation_date@<br />
- #news.Creation_IP#: @creation_ip@<br />
- #news.Release_Date#: @publish_date@<br />
- #news.Archive_Date#: @archive_date@
+ #news.Author#: @creator_link;noquote@<br>
+ #news.Revision_number#: @revision_no@<br>
+ #news.Creation_Date#: @creation_date_pretty@<br>
+ #news.Creation_IP#: @creation_ip@<br>
+ #news.Release_Date#: @publish_date_pretty@<br>
+ #news.Archive_Date#: @archive_date_pretty@
</p>
<hr>
<include src="../news"
@@ -23,32 +19,3 @@
publish_body=@publish_body;noquote@
creator_link=@creator_link;noquote@
>
-</else>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
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,
- '<a href=/shared/community-member?user_id=' || creation_user || '>' || item_creator || '</a>' 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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/news-portlet-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/news-portlet-2.5.0d1.apm">
<owner url="http://opeancs.org">OpenACS</owner>
- <release-date>2008-01-08</release-date>
+ <release-date>2008-10-18</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
- <provides url="news-portlet" version="2.4.0d1"/>
- <requires url="new-portal" version="2.4.0d1"/>
- <requires url="news" version="5.2.0d6"/>
+ <provides url="news-portlet" version="2.5.0d1"/>
+ <requires url="new-portal" version="2.5.0d1"/>
+ <requires url="news" version="5.2.0b1"/>
<callbacks>
</callbacks>
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 @@
%>
-<if @shaded_p@ ne "t">
+ <if @shaded_p@ ne "t">
+ <if @inside_comm_p@ >
+ <div style="padding-top:0.2em; padding-bottom:0.3em;">
+ <div style="float:right;">
+ <a href="@news_url@news/item-create" title="#news-portlet.Add_a_News_Item#" class="button">#news-portlet.Add_a_News_Item#</a>
+ </div>
+ <div>
+ @notification_chunk;noquote@
+ <if @rss_exists@ eq 1>
+ <br>
+ <a href="@rss_url@"><img src="/resources/xml.gif" alt="Subscribe via RSS" width="26" height="10" style="border:0; padding-right:3px">#rss-support.Syndication_Feed#</a>
+ </if>
+ </div>
+ </div>
+ </if>
+ <if @news_items:rowcount@ gt 0>
+ <if @news_items:rowcount@ eq 1>
- <if @news_items:rowcount@ gt 0>
-
- <if @news_items:rowcount@ eq 1>
-
- <multiple name="news_items">
- <include src="summary"
- item_id="@news_items.item_id@"
- url="@news_items.view_url@">
- </multiple>
-
+ <multiple name="news_items">
+ <include src="summary"
+ item_id="@news_items.item_id@"
+ url="@news_items.view_url@">
+ </multiple>
+
+ </if>
+ <else>
+ <listtemplate name="news"></listtemplate>
+ </else>
</if>
<else>
- <listtemplate name="news"></listtemplate>
+ <small>#news-portlet.No_News#</small>
</else>
</if>
<else>
- <small>#news-portlet.No_News#</small>
+ <small>
+ #new-portal.when_portlet_shaded#
+ </small>
</else>
-</if>
-<else>
- <small>
- #new-portal.when_portlet_shaded#
- </small>
-</else>
-<if @inside_comm_p@ ><br><a href="@news_url@news/item-create" title="#news-portlet.Add_a_News_Item#">#news-portlet.Add_a_News_Item#</a></if>
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 {
- <if @one_instance_p@ false><b>@news_items.parent_name@</b><br/></if>
- <group column="package_id">
- <if @display_item_content_p@ eq "1">
- <p>@news_items.publish_body;noquote@</p>
- <if @display_item_attribution_p@ eq "1">
- <p>#news-portlet.Contributed_by# <a href="@news_items.creator_url@">@news_items.item_creator@</a>
- </if>
- </if>
- <else>
- » <a href="@news_items.url@item?item_id=@news_items.item_id@">@news_items.publish_title@</a>
- <small>@news_items.publish_date@</small>
- </else>
- <if @news_items.rss_exists@ eq 1>
- <a href="@news_items.rss_url;noquote@"><img src="/resources/xml.gif" alt="Subscribe via RSS" width="26" height="10" border=0 /></a>
- </if><br/>
- </group>
- }
- }
- 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 %>
<h3>@publish_title@ - <small>@publish_date@</small></h3>
-<blockquote>
+
@publish_body;noquote@
@more_link;noquote@
+
<if @display_item_attribution_p@ eq "1">
<p>#news-portlet.Contributed_by# <a href="@creator_url@" title="#news-portlet.goto_item_creator_commpage#">@item_creator@</a></p>
</if>
-</blockquote>
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 "<br><b>»</b> <a href=\"$url\">[_ news-portlet.Read_more]</a>"
+ set more_link "<p><b>»</b> <a href=\"$url\">[_ news-portlet.Read_more]</a></p>"
}
-set publish_body [ad_convert_to_html -html_p $html_p $publish_body]
+if { !$html_p } {
+ set publish_body "<p>[ad_html_text_convert -from "text/plain" -to "text/html" -- $publish_body]</p>"
+}
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 @@
# </head><body>
# <h1>Created</h1>
# <p>Collection [ns_conn url] has been created.</p>
-# <hr />
+# <hr>
# <address></address>
# </body></html>"
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 @@
<table border="1" cellpadding="2" cellspacing="2">
<tr>
- <td bgcolor="#cccccc">#photo-album.Name#</td>
- <td bgcolor="#cccccc">#photo-album.Description#</td>
+ <td style="background-color:#cccccc">#photo-album.Name#</td>
+ <td style="background-color:#cccccc">#photo-album.Description#</td>
</tr>
<multiple name="child">
<tr>
<if @child.type@ eq "Folder">
- <td align="center"><a href="@url@?folder_id=@child.item_id@"><img src="@url@graphics/folder.gif" alt="@child.name@" border="0" /></a></td>
+ <td align="center"><a href="@url@?folder_id=@child.item_id@"><img src="@url@graphics/folder.gif" alt="@child.name@" style="border:0"></a></td>
</if><else>
- <td align="center"><if @child.iconic@ not nil><a href="@url@album?album_id=@child.item_id@"><img src="@url@images/@child.iconic@" alt="@child.name@" border="0" /></if><else><img src="@url@graphics/album.gif" alt="@child.name@" /></else></a></td>
+ <td align="center"><if @child.iconic@ not nil><a href="@url@album?album_id=@child.item_id@"><img src="@url@images/@child.iconic@" alt="@child.name@" style="border:0"></if><else><img src="@url@graphics/album.gif" alt="@child.name@"></else></a></td>
</else>
<td>
<if @child.type@ eq "Folder"><a href="@url@?folder_id=@child.item_id@"></if><else><a href="@url@album?album_id=@child.item_id@"></else>
-@child.name@</a><if @child.description@ not nil><br />@child.description@</if></td>
+@child.name@</a><if @child.description@ not nil><br>@child.description@</if></td>
</tr>
</multiple>
</table>
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 @@
<tr align="center" valign="top">
</if>
<if @child_photo.rownum@ le @child_photo:rowcount@>
-<td><a href="photo?photo_id=@child_photo.photo_id@"><img src="images/@child_photo.thumb_path@" height="@child_photo.thumb_height@" width="@child_photo.thumb_width@" alt="@child_photo.caption@" border="0"/></a><br />
+<td><a href="photo?photo_id=@child_photo.photo_id@"><img src="images/@child_photo.thumb_path@" height="@child_photo.thumb_height@" width="@child_photo.thumb_width@" alt="@child_photo.caption@" style="border:0"></a><br>
<a href="photo?photo_id=@child_photo.photo_id@">@child_photo.caption@</a>
</td>
</if>
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 @@
<property name="displayed_object_id">@photo_id@</property>
@photo_nav_html;noquote@
<div style="text-align: center">
-<img src="images/@path@/@title@" height="@height@" width="@width@" alt="@title@" />
+<img src="images/@path@/@title@" height="@height@" width="@width@" alt="@title@">
<if @caption@ not nil><p>@caption@</p></if>
</div>
<if @description@ not nil>
@@ -18,4 +18,3 @@
<div style="text-align: center">
<a href="album?album_id=@album_id@&page=@page_num@">#photo-album.lt_Imagenbspthumbnailnbs#</a>
| <a href="photo?photo_id=@photo_id@">#photo-album.Smallernbspimage#</a></div>
-
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 @@
<if @shutterfly_p@ eq "t">
<form action="http://www.shutterfly.com/c4p/UpdateCart.jsp" method="POST">
- <input type="hidden" name="addim" value="1" />
- <input type="hidden" name="protocol" value="SFP,100" />
- <input type="hidden" name="pid" value="C4PP" />
- <input type="hidden" name="psid" value="TEST" />
- <input type="hidden" name="imnum" value="@images:rowcount@" />
+ <input type="hidden" name="addim" value="1">
+ <input type="hidden" name="protocol" value="SFP,100">
+ <input type="hidden" name="pid" value="C4PP">
+ <input type="hidden" name="psid" value="TEST">
+ <input type="hidden" name="imnum" value="@images:rowcount@">
<multiple name="images">
<input type="hidden" name="imsel-@images.rownum@" value="1">
<input type="hidden" name="imraw-@images.rownum@" value="@base_url@@images.base_id@">
@@ -38,7 +38,7 @@
<else>
<multiple name="images">
<div class="image" style="display: inline; margin: 10px;">
- <a href="photo?photo_id=@images.photo_id@"><img src="images/@images.image_id@" width="@images.width@" height="@images.height@" alt="@images.caption@ @images.taken@" /></a>
+ <a href="photo?photo_id=@images.photo_id@"><img src="images/@images.image_id@" width="@images.width@" height="@images.height@" alt="@images.caption@ @images.taken@"></a>
</div>
</multiple>
</else>
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 @@
<multiple name="child">
<if @child.rownum@ odd><tr class="list-odd"></if><else><tr class="list-even"></else>
<if @child.type@ eq "Folder">
- <td align="center"><a href="./?folder_id=@child.item_id@"><img src="graphics/folder.gif" alt="@child.name@" border="0" /></a></td>
+ <td align="center"><a href="./?folder_id=@child.item_id@"><img src="graphics/folder.gif" alt="@child.name@" style="border:0"></a></td>
</if><else>
- <td align="center"><if @child.iconic@ not nil><a href="album?album_id=@child.item_id@"><img src="images/@child.iconic@" alt="@child.name@" border="0" /></if><else><img src="graphics/album.gif" alt="@child.name@" /></else></a></td>
+ <td align="center"><if @child.iconic@ not nil><a href="album?album_id=@child.item_id@"><img src="images/@child.iconic@" alt="@child.name@" style="border:0"></if><else><img src="graphics/album.gif" alt="@child.name@"></else></a></td>
</else>
<td>
<if @child.type@ eq "Folder"><a href="./?folder_id=@child.item_id@"></if><else><a href="album?album_id=@child.item_id@"></else>
-@child.name@</a><if @child.description@ not nil><br />@child.description@</if></td>
+@child.name@</a><if @child.description@ not nil><br>@child.description@</if></td>
</tr>
</multiple>
</table>
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 @@
<if found_p ne 0><a href="@url@photo?photo_id=@photo_id@" title="@caption@">
-<img src="@url@images/@thumb_path@" width="@thumb_width@" height="@thumb_height@" />
+<img src="@url@images/@thumb_path@" width="@thumb_width@" height="@thumb_height@">
</a>
</if>
\ 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@
<div style="text-align: center; margin: 1em;">
<if @show_base_link@ eq "t">
- <a href="base-photo?photo_id=@photo_id@"><img src="images/@path@/@title@" height="@height@" width="@width@" alt="@title@" border="0" /></a>
+ <a href="base-photo?photo_id=@photo_id@"><img src="images/@path@/@title@" height="@height@" width="@width@" alt="@title@" style="border:0"></a>
</if><else>
- <img src="images/@path@/@title@" height="@height@" width="@width@" alt="@title@" />
+ <img src="images/@path@/@title@" height="@height@" width="@width@" alt="@title@">
</else>
<if @show_html_p@ eq 1>
<ul style="text-align:left">
- <li>#photo-album.thumbnail_with_link# <code><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></code>
+ <li>#photo-album.thumbnail_with_link# <code><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></code>
- <li>#photo-album.image_only# <code><img src="@photo_base_url@images/@path@/@title@" height="@height@" width="@width@" alt="@title@" /></code>
+ <li>#photo-album.image_only# <code><img src="@photo_base_url@images/@path@/@title@" height="@height@" width="@width@" alt="@title@"></code>
- <li>#photo-album.image_with_link# <code><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></code>
+ <li>#photo-album.image_with_link# <code><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></code>
</ul>
</if>
<if @caption@ not nil>
@@ -81,13 +81,13 @@
</if>
</else>
#photo-album.lt_Save_this_photo_to_pr_1#
- <input type="hidden" name="photo_id" value="@photo_id@"></input>
+ <input type="hidden" name="photo_id" value="@photo_id@">
<select name="collection_id">
<multiple name="clipboards">
<option value="@clipboards.collection_id@" @clipboards.selected@>@clipboards.title@</option>
</multiple>
</select>
- <input type="submit" value="#photo-album._Save#"></input>
+ <input type="submit" value="#photo-album._Save#">
</form>
</if>
<if @clipped:rowcount@ gt 0>
@@ -97,7 +97,7 @@
</multiple>
</if>
<if @clipboards:rowcount@ gt 1>
- <br /><a href="clipboards">#photo-album.lt_View_all_your_clipboa#</a>
+ <br><a href="clipboards">#photo-album.lt_View_all_your_clipboa#</a>
</if>
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 @@
<if found_p ne 0><a href="@url@photo?photo_id=@photo_id@" title="@caption@">
-<img src="@url@images/@thumb_path@" width="@thumb_width@" height="@thumb_height@" alt="" />
+<img src="@url@images/@thumb_path@" width="@thumb_width@" height="@thumb_height@" alt="">
</a>
</if>
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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/photo-album-portlet-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/photo-album-portlet-2.5.0d1.apm">
<owner url="mailto:davis@xarg.net">Jeff Davis</owner>
<vendor url="http://xarg.net">Xarg</vendor>
- <release-date>2008-01-08</release-date>
- <provides url="photo-album-portlet" version="2.4.0d1"/>
+ <release-date>2008-10-18</release-date>
+ <provides url="photo-album-portlet" version="2.5.0d1"/>
<requires url="photo-album" version="5.2.3"/>
- <requires url="new-portal" version="2.4.0d1"/>
+ <requires url="new-portal" version="2.5.0d1"/>
<callbacks>
<callback type="after-install" proc="photo_album_portlet::after_install"/>
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 @@
<if @num_packages@ eq 1>
<include src="/packages/photo-album/www/album-chunk" package_id="@cfa.package_id@">
- <a href="photo-album/">#photo-album-portlet.Add_photos#</a>
+ <p><a href="photo-album/">#photo-album-portlet.Add_photos#</a></p>
</if>
</if>
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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/profile-provider-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/profile-provider-2.5.0d1.apm">
<owner url="http://openacs.org">OpenACS</owner>
<vendor url="http://openacs.org">OpenACS</vendor>
- <release-date>2008-01-08</release-date>
+ <release-date>2008-10-18</release-date>
- <provides url="profile-provider" version="2.4.0d1"/>
+ <provides url="profile-provider" version="2.5.0d1"/>
<requires url="acs-service-contract" version="5.3.1a1"/>
<callbacks>
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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>f</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/random-photo-portlet-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/random-photo-portlet-2.5.0d1.apm">
<owner url="mailto:gmorales@galileo.edu">Gerardo Morales</owner>
- <release-date>2008-01-08</release-date>
+ <release-date>2008-10-18</release-date>
- <provides url="random-photo-portlet" version="2.4.0d1"/>
- <requires url="dotlrn" version="2.4.0d1"/>
+ <provides url="random-photo-portlet" version="2.5.0d1"/>
+ <requires url="dotlrn" version="2.5.0d1"/>
<callbacks>
<callback type="after-install" proc="rphoto_portlet::after_install"/>
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 @@
<li class="liClosed">
Click to find out.
<ul>
-<b>#random-photo-portlet.Name#</b> <a href="/dotlrn/community-member?user_id=@user_id@">@full_name@</a> <br>
+<li><b>#random-photo-portlet.Name#</b> <a href="/dotlrn/community-member?user_id=@user_id@">@full_name@</a></li>
<if @random_user_bio@ ne "">
-<b>About:</b> @random_user_bio;noquote@<br>
+<li><b>About:</b> @random_user_bio;noquote@</li>
</if>
<if @random_user_groups@ ne "">
-<b>Groups:</b> @random_user_groups;noquote@<br>
+<li><b>Groups:</b> @random_user_groups;noquote@</li>
</if>
-</li>
</ul>
</li>
</ul>
@@ -41,4 +40,3 @@
<if @user_p@ eq 0>
#random-photo-portlet.lt_There_are_no_photos_t#
</if>
-
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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>f</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/static-portlet-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/static-portlet-2.5.0d1.apm">
<owner url="http://openacs.org">OpenACS</owner>
- <release-date>2008-01-08</release-date>
+ <release-date>2008-10-18</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
- <provides url="static-portlet" version="2.4.0d1"/>
- <requires url="dotlrn" version="2.4.0d1"/>
- <requires url="new-portal" version="2.4.0d1"/>
+ <provides url="static-portlet" version="2.5.0d1"/>
+ <requires url="dotlrn" version="2.5.0d1"/>
+ <requires url="new-portal" version="2.5.0d1"/>
<parameters>
<parameter datatype="string" min_n_values="1" max_n_values="1" name="static_admin_portlet_pretty_name" default="#static-portlet.admin_portlet_pretty_name#" description="the name for the static admin portlet in the UI"/>
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 @@
<description format="text/plain">Expanded functionality survey package derived from simple-survey.</description>
<provides url="survey" version="5.0.1"/>
- <requires url="notifications" version="5.3.0d1"/>
+ <requires url="notifications" version="5.4.2"/>
<callbacks>
</callbacks>
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 "<blockquote>\n[join $choices "<br>\n"]\n</blockquote>"
+ append html "<p>\n[join $choices "<br>\n"]\n</p>"
}
}
@@ -231,7 +231,7 @@
if { $presentation_alignment == "beside" } {
append html [join $choices " "]
} else {
- append html "<blockquote>\n[join $choices "<br>\n"]\n</blockquote>"
+ append html "<p>\n[join $choices "<br>\n"]\n</p>"
}
}
}
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 @@
<master>
<property name=title>#survey.Response_Submitted#</property>
<property name=context>@context;noquote@</property>
- <blockquote>
+
<p> #survey.lt_Response_submitted_Th#</p>
<p><a href=".">#survey.Return#</a> #survey.lt_to_the_survey_index_p#</p>
- </blockquote>
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 @@
<tr class="even">
</else>
<td colspan="3">
- <blockquote><div>@questions.question_display;noquote@</div></blockquote>
+ <div>@questions.question_display;noquote@</div>
</td></tr>
<if @questions.rownum@ eq @questions:rowcount@>
<if @questions.rownum@ odd>
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 @@
<property name="survey_id">@survey_id@</property>
<property name=title>#survey.lt_Response_submitted_Th#</property>
<property name=context>@context;noquote@</property>
- <blockquote>
+
<p>#survey.lt_Response_submitted_Th#</p>
<p><a href="one-respondent?survey_id=@survey_id@&user_id=@initial_creation_user_id@">#survey.lt_Return_to_survey_admi#</a>.</p>
-
- </blockquote>
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 "<li>#$sort_order $question_text
-<blockquote>
+<p>
"
switch -- $abstract_data_type {
"date" -
@@ -74,7 +74,7 @@
}
}
}
- append results "</blockquote>\n"
+ append results "</p>\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#
<p>
#survey.lt_Here_is_how_your_surv#
-<blockquote>
+</p>
+<p>
@description;noquote@
-</blockquote>
</p>
<include src="/packages/acs-templating/resources/forms/confirm-button">
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 @@
<initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/survey-portlet-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/survey-portlet-2.5.0d1.apm">
<owner url="mailto:dave@thedesignexperience.org">dave bauer</owner>
<summary>Survey package portlet for new-portal</summary>
- <release-date>2008-01-08</release-date>
+ <release-date>2008-10-18</release-date>
<description format="text/html">Survey package portlet for new-portal</description>
- <provides url="survey-portlet" version="2.4.0d1"/>
- <requires url="new-portal" version="2.4.0d1"/>
+ <provides url="survey-portlet" version="2.5.0d1"/>
+ <requires url="new-portal" version="2.5.0d1"/>
<requires url="survey" version="5.0.1"/>
<parameters>
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 @@
<singleton-p>f</singleton-p>
<auto-mount>theme-selva</auto-mount>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/theme-selva-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/theme-selva-2.5.0d1.apm">
<owner url="http:/www.weg.ee.usyd.edu.au">Rafael Calvo</owner>
- <release-date>2008-01-08</release-date>
+ <release-date>2008-10-18</release-date>
<vendor url="http://www.weg.usyd.edu.au"></vendor>
<maturity>0</maturity>
- <provides url="theme-selva" version="2.4.0d1"/>
- <requires url="dotlrn" version="2.4.0d1"/>
+ <provides url="theme-selva" version="2.5.0d1"/>
+ <requires url="dotlrn" version="2.5.0d1"/>
<callbacks>
<callback type="after-upgrade" proc="theme_selva::apm::after_upgrade"/>
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 @@
<if @doc_type@ not nil><property name="doc_type">@doc_type;noquote@</property></if>
-<if @youarehere@ not nil><div id="youarehere">@youarehere;noquote@</div><br /></if>
+<if @youarehere@ not nil><div id="youarehere">@youarehere;noquote@</div><br></if>
<else><div id="youarehere"></div></else>
<div id="portal-navigation">
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 @@
<singleton-p>t</singleton-p>
<auto-mount>theme-zen</auto-mount>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/theme-zen-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/theme-zen-2.5.0d1.apm">
<owner url="http:/www.weg.ee.usyd.edu.au">Rafael Calvo</owner>
- <release-date>2008-01-08</release-date>
+ <release-date>2008-10-18</release-date>
<vendor url="http://www.weg.usyd.edu.au"></vendor>
<maturity>0</maturity>
- <provides url="theme-zen" version="2.4.0d1"/>
- <requires url="dotlrn" version="2.4.0d1"/>
+ <provides url="theme-zen" version="2.5.0d1"/>
+ <requires url="dotlrn" version="2.5.0d1"/>
<callbacks>
<callback type="after-install" proc="theme_zen::apm::after_install"/>
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 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="theme-zen" package_version="2.3.0b1" locale="en_US" charset="ISO-8859-1">
+<message_catalog package_key="theme-zen" locale="en_US" charset="ISO-8859-1">
<msg key="acc">ACC</msg>
+ <msg key="Access_key">Access Key</msg>
+ <msg key="Access_keys">Access Keys</msg>
+ <msg key="Access_keys_can_be_used_">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.</msg>
+ <msg key="Accessibility">Accessibility</msg>
<msg key="accessibility_note">Note that no software can check completely the accessibility of your website.</msg>
+ <msg key="Accessibility_page">Accessibility Page</msg>
<msg key="admin">Class Admin</msg>
+ <msg key="Associated_page">Associated Page</msg>
<msg key="begin_footer">Begin Footer</msg>
<msg key="begin_main_content">Begin Main Content</msg>
<msg key="begin_main_navigation">Begin Main Navigation</msg>
<msg key="begin_sub_navigation">Begin Sub Navigation</msg>
+ <msg key="Change_Contrast">Change Contrast</msg>
<msg key="Communities">Communities</msg>
<msg key="ControlPanel">Control Panel</msg>
<msg key="Courses">Classes</msg>
+ <msg key="Default_Colors">Default colors</msg>
<msg key="dotlrn_Home">.LRN Home</msg>
<msg key="dotlrn_Project_Central">.LRN Project Central</msg>
<msg key="goto_admin_page">Go to Admin page</msg>
<msg key="goto_admin_page_accesskey">A</msg>
<msg key="goto_portal_page_pretty_name">Go to %pretty_name% page</msg>
<msg key="goto_tab_name">Go to %name%</msg>
<msg key="hc">HC</msg>
+ <msg key="High_Contrast">High contrast</msg>
<msg key="Logout">Logout</msg>
<msg key="MySpace">My Space</msg>
<msg key="online">online</msg>
<msg key="Preferences">Preferences</msg>
<msg key="skip_to_main_content">Skip To Main Content</msg>
+ <msg key="Standards_Compliance">Standards Compliance</msg>
+ <msg key="Standards_compliance_text">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.</msg>
<msg key="std">STD</msg>
+ <msg key="switch_to_default_colors">Switch to default colors</msg>
+ <msg key="switch_to_high_contrast">Switch to high contrast</msg>
+ <msg key="The_following_styles_are_">The following styles are available:</msg>
<msg key="Tools">Tools</msg>
<msg key="upgrade">Upgrade</msg>
<msg key="upgrade_finished">The upgrade to the Zen theme has been successfully completed.</msg>
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 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<message_catalog package_key="theme-zen" package_version="2.3.0b1" locale="es_ES" charset="ISO-8859-1">
+<message_catalog package_key="theme-zen" locale="es_ES" charset="ISO-8859-1">
<msg key="acc">ACC</msg>
+ <msg key="Access_key">Atajo de Teclado</msg>
+ <msg key="Access_keys">Atajos de Teclado</msg>
+ <msg key="Access_keys_can_be_used_">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".</msg>
+ <msg key="Accessibility">Accesibilidad</msg>
<msg key="accessibility_note">Notese que ning�n software puede comprobar totalmente la accesibilidad de su sitio web.</msg>
+ <msg key="Accessibility_page">P�gina sobre Accesibilidad</msg>
<msg key="admin">Admin</msg>
+ <msg key="Associated_page">P�gina Asociada</msg>
<msg key="begin_footer">Inicio del Pie de P�gina</msg>
<msg key="begin_main_content">Inicio del Contenido Principal</msg>
<msg key="begin_main_navigation">Inicio de la Navegaci�n Principal</msg>
<msg key="begin_sub_navigation">Inicio de la Subnavegaci�n</msg>
+ <msg key="Change_Contrast">Cambiar el Contraste</msg>
<msg key="Communities">Comunidades</msg>
<msg key="ControlPanel">Panel de Control</msg>
<msg key="Courses">Cursos</msg>
+ <msg key="Default_Colors">Colores por defecto</msg>
<msg key="dotlrn_Home">Sitio web de .LRN</msg>
<msg key="dotlrn_Project_Central">Proyecto .LRN</msg>
<msg key="goto_admin_page">Ir a la p�gina de administraci�n</msg>
<msg key="goto_admin_page_accesskey">A</msg>
<msg key="goto_portal_page_pretty_name">Ir a %pretty_name%</msg>
<msg key="goto_tab_name">Ir a %name%</msg>
<msg key="hc">HC</msg>
+ <msg key="High_Contrast">Alto contraste</msg>
<msg key="Logout">Salir</msg>
<msg key="MySpace">Mi Espacio</msg>
<msg key="online">conectado</msg>
<msg key="Preferences">Preferencias</msg>
<msg key="skip_to_main_content">Saltar al Contenido Principal</msg>
+ <msg key="Standards_Compliance">Est�ndares</msg>
+ <msg key="Standards_compliance_text">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>.</msg>
<msg key="std">STD</msg>
+ <msg key="switch_to_default_colors">Usar colores por defecto</msg>
+ <msg key="switch_to_high_contrast">Usar alto contraste</msg>
+ <msg key="The_following_styles_are_">Los siguientes estilos est�n disponibles:</msg>
<msg key="Tools">Herramientas</msg>
<msg key="upgrade">Actualizar</msg>
<msg key="upgrade_finished">La actualizaci�n del tema Zen ha sido completada con �xito.</msg>
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 @@
<if @focus@ not nil><property name="focus">@focus;noquote@</property></if>
<if @doc@ defined><property name="&doc">doc</property></if>
+<div id="skiptocontent">
+ <p>
+ <a href="#content-wrapper" title="#theme-zen.skip_to_main_content#" accesskey="2">#theme-zen.skip_to_main_content#</a> | <a href="/theme-zen/accessibility" title="#theme-zen.Accessibility_page#" accesskey="0">#theme-zen.Accessibility#</a>
+ <if @user_id@ ne 0>
+ | <a href="@sitemap_url@" title="#dotlrn.Site_Map_Title#" accesskey="4">#dotlrn.Site_Map#</a>
+ </if>
+ </p>
+</div>
+
<div id="wrapper">
- <div id="skiptocontent"><a href="#content-wrapper" title="#theme-zen.skip_to_main_content#" accesskey="k">#theme-zen.skip_to_main_content#</a></div>
<div id="header">
<div id="logo">
<if @img_attrib@ not nil>
@@ -17,37 +25,23 @@
<if @untrusted_user_id@ ne 0>
<li>
<!-- user greeting or login message -->
- #acs-subsite.Welcome_user# |
+ #acs-subsite.Welcome_user#
</li>
<li>
<a href="@whos_online_url@" title="#acs-subsite.Whos_Online_link_label#">
- @num_users_online@
+ | @num_users_online@
<if @num_users_online@ eq 1>
#acs-subsite.Member#
</if>
<else>
#acs-subsite.Members#
</else>
- #theme-zen.online# |
+ #theme-zen.online#
</a>
</li>
- </if>
- <li>
- <!-- DRB: currently std doesn't exist, this just switches to non-alt styles -->
- <a href="#" onclick="setActiveStyleSheet('std'); return false;"
- title="switch to standard layout">
- #theme-zen.std#
- </a>
- </li>
- <li>
- <a href="#" onclick="setActiveStyleSheet('highContrast'); return false;"
- title="switch to High Contrast">
- #theme-zen.hc#
- </a> |
- </li>
- <if @untrusted_user_id@ ne 0>
<li>
- <a href="@logout_url@" title="#acs-subsite.Logout_from_system#" accesskey="L">
+ |
+ <a href="@logout_url@" title="#acs-subsite.Logout_from_system#">
#acs-subsite.Logout#
</a>
</li>
@@ -63,12 +57,13 @@
</div>
<div id="breadcrumbs">
+ <span class="screen-reader-only">#theme-zen.You_are_here#</span>
<ul class="compact">
<if @context:rowcount@ not nil>
<multiple name="context">
<li>
<if @context.url@ not nil>
- <a href="@context.url@">@context.label@</a> :
+ <a href="@context.url@">@context.label@</a> @separator@
</if>
<else>
@context.label@
@@ -123,6 +118,9 @@
<div id="footer">
<div class="block-marker">#theme-zen.begin_footer#</div>
+ <div id="footer-icons">
+ <img src="http://www.w3.org/Icons/valid-html401-blue" alt="Valid HTML 4.01 Strict" height="31" width="88">
+ </div>
<div id="footer-links">
<ul class="compact">
<li>#dotlrn.A_dotlrn_Site#</li>
Index: openacs-4/packages/theme-zen/lib/lrn-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/lib/lrn-master.tcl,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/theme-zen/lib/lrn-master.tcl 13 Mar 2008 17:10:41 -0000 1.10
+++ openacs-4/packages/theme-zen/lib/lrn-master.tcl 9 Nov 2008 23:29:28 -0000 1.11
@@ -5,6 +5,8 @@
set community_id [dotlrn_community::get_community_id]
set dotlrn_url [dotlrn::get_url]
+set sitemap_url "$dotlrn_url/site-map"
+
#----------------------------------------------------------------------
# Display user messages
#----------------------------------------------------------------------
@@ -209,7 +211,7 @@
template::head::add_css -href "/resources/theme-zen/css/main.css" -media "screen" -order 2
template::head::add_css -href "/resources/theme-zen/css/print.css" -media "print" -order 3
template::head::add_css -href "/resources/theme-zen/css/handheld.css" -media "handheld" -order 4
-template::head::add_css -href $css_url -order 5
+template::head::add_css -href $css_url -media "screen" -order 5
template::head::add_css -alternate -href "/resources/theme-zen/css/highContrast.css" -title "highContrast"
template::head::add_css -alternate -href "/resources/theme-zen/css/508.css" -title "508"
@@ -241,6 +243,7 @@
set in_dotlrn_p [expr [string match "[dotlrn::get_url]/*" [ad_conn url]]]
# Context bar
+set separator [parameter::get -package_id [ad_conn subsite_id] -parameter ContextBarSeparator -default ":"]
if { [info exists context] } {
set context_tmp $context
unset context
Index: openacs-4/packages/theme-zen/tcl/navigation-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/tcl/navigation-procs.tcl,v
diff -u -r1.3 -r1.4
--- openacs-4/packages/theme-zen/tcl/navigation-procs.tcl 7 Oct 2007 22:37:05 -0000 1.3
+++ openacs-4/packages/theme-zen/tcl/navigation-procs.tcl 9 Nov 2008 23:29:28 -0000 1.4
@@ -62,7 +62,7 @@
-object_id [dotlrn::get_package_id] \
-privilege admin]
if { $dotlrn_admin_p } {
- set dotlrn_admin_url "${dotlrn_url}/admin/"
+ set dotlrn_admin_url [dotlrn::get_admin_url]
}
if { $sw_admin_p } {
@@ -103,7 +103,7 @@
}
if { $dotlrn_admin_p } {
- lappend tabs_list [list $dotlrn_admin_url #dotlrn.Administration# #dotlrn.Administration_Accesskey#]
+ lappend tabs_list [list $dotlrn_admin_url #dotlrn.Administration# 9]
if { [string first $dotlrn_admin_url $current_url] != -1 } {
set which_tab_selected $which_tab
}
@@ -272,9 +272,9 @@
if { $community_id ne "" && $admin_p } {
if {[string match "*/one-community-admin*" [ad_conn url]]} {
- append subnavbar "\n<li id=\"sub-navigation-active\"><a href=\"${link}one-community-admin\" title=\"[_ theme-zen.goto_admin_page]\" accesskey=\"[_ theme-zen.goto_admin_page_accesskey]\">[_ theme-zen.admin]</a></li>"
+ append subnavbar "\n<li id=\"sub-navigation-active\"><a href=\"${link}one-community-admin\" title=\"[_ theme-zen.goto_admin_page]\" accesskey=\"[_ theme-zen.goto_admin_page_accesskey]\">[_ dotlrn.Admin]</a></li>"
} else {
- append subnavbar "\n<li><a href=\"${link}one-community-admin\" title=\"[_ theme-zen.goto_admin_page]\" accesskey=\"[_ theme-zen.goto_admin_page_accesskey]\">[_ theme-zen.admin]</a></li>"
+ append subnavbar "\n<li><a href=\"${link}one-community-admin\" title=\"[_ theme-zen.goto_admin_page]\" accesskey=\"[_ theme-zen.goto_admin_page_accesskey]\">[_ dotlrn.Admin]</a></li>"
}
}
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/theme-zen/www/accessibility.adp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/theme-zen/www/accessibility.tcl'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `openacs-4/packages/theme-zen/www/index.tcl'.
Fisheye: No comparison available. Pass `N' to diff?
Index: openacs-4/packages/theme-zen/www/resources/css/highContrast.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/www/resources/css/highContrast.css,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/theme-zen/www/resources/css/highContrast.css 15 May 2007 20:14:57 -0000 1.2
+++ openacs-4/packages/theme-zen/www/resources/css/highContrast.css 9 Nov 2008 23:29:28 -0000 1.3
@@ -26,19 +26,19 @@
}
a:link {
- color: #dbdbb0;
+ color: #eee28b;
text-decoration:underline;
}
a:visited {
- color: #dbdbb0;
+ color: #eee28b;
text-decoration:underline;
}
a:hover {
color: #222222;
text-decoration:underline;
- background: #cccc3d;
+ background-color: #cccc3d;
}
/* END OF STANDARD TAGS */
@@ -77,7 +77,7 @@
background: #ffffff url(/resources/theme-zen/images/global/trans.gif) repeat-x top left;/* color */
}
-.portlet-title h1 {
+.portlet-title h1, .portlet-title-no-controls h1 {
color: #222222;
}
@@ -99,7 +99,7 @@
#main-navigation a {
background:url("/resources/theme-zen/images/global/trans.gif") no-repeat right top;
padding-left: 16px;
- color:#dbdbb0;
+ color:#eee28b;
}
@@ -141,7 +141,7 @@
#sub-navigation a {
padding: 4px 15px 5px 16px;
- color:#dbdbb0;
+ color:#eee28b;
}
#sub-navigation li a:hover {
@@ -214,7 +214,8 @@
background-color: #111111;
}
.list-table tr.even, .list-tiny tr.even {
- background-color: #555555;
+ background-color: #343434;
+ color: #eeeeee;
}
.list-table tr.odd, .list-tiny tr.odd {
background-color: #222222;
@@ -229,12 +230,19 @@
border-bottom-color: #ffffff;
}
+.list-table tr.even a:link, .list-table tr.even a:visited {
+ color: #fff59e;
+}
+
+.list-table tr.even a:hover {
+ color: #222222;
+}
/* END OF LISTS */
/* FORMS */
-.form-required-mark {
- color:#fff000;
+.form-required-mark, .form-error {
+ color:#ffff66;
}
/* END OF FORMS */
@@ -272,6 +280,5 @@
}
#forum-thread .subject .reference {
- color: #dbdbb0;
+ color: #eee28b;
}
-
Index: openacs-4/packages/theme-zen/www/resources/css/main.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/www/resources/css/main.css,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/theme-zen/www/resources/css/main.css 15 May 2007 20:14:57 -0000 1.2
+++ openacs-4/packages/theme-zen/www/resources/css/main.css 9 Nov 2008 23:29:28 -0000 1.3
@@ -27,7 +27,7 @@
h1 {
font-size: 1.2em;
font-weight:bold;
- color: #646c61;
+ color: #585858;
}
h2 {
@@ -43,19 +43,19 @@
}
a:link {
- color: #235c96;
+ color: #133f6d;
text-decoration:none;
}
a:visited {
- color: #235c96;
+ color: #133f6d;
text-decoration:none;
}
a:hover {
- color: #235c96;
+ color: #133f6d;
text-decoration:underline;
- background: #f3f1e9;
+ background-color: #f3f1e9;
}
@@ -213,7 +213,7 @@
a.button:hover {
background:url("/resources/theme-zen/images/global/button-background-hover.gif") repeat-x;
text-decoration: underline;
- background-color: #4b68a0;
+ background-color: #334f82;
color: #fff;
}
@@ -255,6 +255,10 @@
border-top: 3px double #c8c8c8;
}
+#footer-icons {
+ float: left;
+}
+
#footer-links {
text-align: right;
}
@@ -268,7 +272,30 @@
/* SKIP */
- #skiptocontent a, #skiptocontent a:hover, #skiptocontent a:visited, .block-marker {
+#skiptocontent p, #skiptocontent a, #skiptocontent a:hover, #skiptocontent a:visited {
+ position:relative;
+ left:0px;
+ top:0px;
+ overflow:hidden;
+ background-color: #eeeeee;
+ color: #000000;
+}
+
+#skiptocontent p {
+ display: block;
+ margin-top: -3px;
+ margin-bottom: 3px;
+ margin-left: -10px;
+ border-bottom-width: 1px;
+ border-bottom-style: solid;
+ border-bottom-color: #999999;
+ text-align: left;
+ width:100%;
+ height: 1.5em;
+ padding-left: 1em;
+}
+
+.block-marker {
position:absolute;
left:0px;
top:-500px;
Index: openacs-4/packages/theme-zen/www/resources/css/navigation.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/www/resources/css/navigation.css,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/theme-zen/www/resources/css/navigation.css 15 May 2007 20:14:57 -0000 1.2
+++ openacs-4/packages/theme-zen/www/resources/css/navigation.css 9 Nov 2008 23:29:28 -0000 1.3
@@ -29,7 +29,7 @@
text-decoration:none;
font-weight:bold;
font-size: .95em;
- color:#666666;
+ color:#555555;
}
@@ -78,7 +78,7 @@
#sub-navigation a {
float:left;
display:block;
- color:#666666;
+ color:#555555;
padding:4px 0px 6px 0px;
text-decoration: none;
font-weight:bold;
Index: openacs-4/packages/theme-zen/www/resources/css/portlets.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/www/resources/css/portlets.css,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/theme-zen/www/resources/css/portlets.css 15 May 2007 20:14:57 -0000 1.2
+++ openacs-4/packages/theme-zen/www/resources/css/portlets.css 9 Nov 2008 23:29:28 -0000 1.3
@@ -11,7 +11,7 @@
.portlet-header {
padding: 3px 5px 3px 5px;
border-top: 1px solid #fff;
- background: #4b68a0 url(/resources/theme-zen/images/portlets/header-bg.gif) repeat-x top left;
+ background: #334f82 url(/resources/theme-zen/images/portlets/header-bg.gif) repeat-x top left;
}
.portlet-title {
Index: openacs-4/packages/theme-zen/www/resources/css/print.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/www/resources/css/print.css,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/theme-zen/www/resources/css/print.css 15 May 2007 20:14:57 -0000 1.2
+++ openacs-4/packages/theme-zen/www/resources/css/print.css 9 Nov 2008 23:29:28 -0000 1.3
@@ -6,31 +6,26 @@
h1 {
font-size: 16pt;
font-weight:bold;
- color: #6E7A6A;
+ color: #000000;
}
h2 {
font-size: 15pt;
font-weight:bold;
- color: #545D51;
+ color: #000000;
}
h3 {
font-size: 14pt;
font-weight:bold;
- color: #444444;
+ color: #000000;
}
-#header-navigation, #main-navigation, #sub-navigation, #skiptocontent, .block-marker, #alert-message, .portlet-controls, #footer, .button {
+#header-navigation, #main-navigation, #sub-navigation, #skiptocontent, .block-marker, #alert-message, .portlet-controls, #footer, .button, .screen-reader-only {
display: none;
}
-#content-wrapper a:after {
- content: " [" attr(href) "] ";
- font-size: 90%;
-}
-
/* LISTS -----------------------------------------------------------*/
ul.compact{
@@ -50,4 +45,4 @@
}
table.standard th { border: 1pt solid #222222; padding: 5pt; background-color: #aaaaaa }
-table.standard td { border: 1pt solid #222222; padding: 5pt; }
\ No newline at end of file
+table.standard td { border: 1pt solid #222222; padding: 5pt; }
Index: openacs-4/packages/theme-zen/www/resources/css/color/blue.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/www/resources/css/color/blue.css,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/theme-zen/www/resources/css/color/blue.css 15 May 2007 20:14:57 -0000 1.2
+++ openacs-4/packages/theme-zen/www/resources/css/color/blue.css 9 Nov 2008 23:29:28 -0000 1.3
@@ -1,5 +1,5 @@
.portlet-header {
- background: #4b68a0 url(/resources/theme-zen/images/color-blue/portlet-header-bg.gif) repeat-x top left;
+ background: #334f82 url(/resources/theme-zen/images/color-blue/portlet-header-bg.gif) repeat-x top left;
}
#main-navigation #main-navigation-active {
Index: openacs-4/packages/theme-zen/www/resources/css/color/green.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/www/resources/css/color/green.css,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/theme-zen/www/resources/css/color/green.css 15 May 2007 20:14:57 -0000 1.2
+++ openacs-4/packages/theme-zen/www/resources/css/color/green.css 9 Nov 2008 23:29:29 -0000 1.3
@@ -1,5 +1,5 @@
.portlet-header {
- background: #6aa364 url(/resources/theme-zen/images/color-green/portlet-header-bg.gif) repeat-x top left;
+ background: #151 url(/resources/theme-zen/images/color-green/portlet-header-bg.gif) repeat-x top left;
}
#main-navigation #main-navigation-active {
Index: openacs-4/packages/theme-zen/www/resources/css/color/purple.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/www/resources/css/color/purple.css,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/theme-zen/www/resources/css/color/purple.css 15 May 2007 20:14:57 -0000 1.2
+++ openacs-4/packages/theme-zen/www/resources/css/color/purple.css 9 Nov 2008 23:29:29 -0000 1.3
@@ -1,5 +1,5 @@
.portlet-header {
- background: #6b4b84 url(/resources/theme-zen/images/color-purple/portlet-header-bg.gif) repeat-x top left;
+ background: #5a3b72 url(/resources/theme-zen/images/color-purple/portlet-header-bg.gif) repeat-x top left;
}
#main-navigation #main-navigation-active {
Index: openacs-4/packages/theme-zen/www/resources/images/color-green/portlet-header-bg.gif
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/www/resources/images/color-green/portlet-header-bg.gif,v
diff -u -r1.2 -r1.3
Binary files differ
Index: openacs-4/packages/user-profile/user-profile.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/user-profile/user-profile.info,v
diff -u -r1.13 -r1.14
--- openacs-4/packages/user-profile/user-profile.info 8 Jan 2008 13:04:53 -0000 1.13
+++ openacs-4/packages/user-profile/user-profile.info 9 Nov 2008 23:29:29 -0000 1.14
@@ -7,13 +7,13 @@
<initial-install-p>f</initial-install-p>
<singleton-p>t</singleton-p>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/user-profile-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/user-profile-2.5.0d1.apm">
<owner url="http://openacs.org">OpenACS</owner>
- <release-date>2008-01-08</release-date>
+ <release-date>2008-10-18</release-date>
<vendor url="http://openacs.org">OpenACS</vendor>
- <provides url="user-profile" version="2.4.0d1"/>
- <requires url="profile-provider" version="2.4.0d1"/>
+ <provides url="user-profile" version="2.5.0d1"/>
+ <requires url="profile-provider" version="2.5.0d1"/>
<parameters>
<!-- No version parameters -->
Index: openacs-4/packages/weblogger-portlet/weblogger-portlet.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/weblogger-portlet/weblogger-portlet.info,v
diff -u -r1.10 -r1.11
--- openacs-4/packages/weblogger-portlet/weblogger-portlet.info 8 Jan 2008 13:04:53 -0000 1.10
+++ openacs-4/packages/weblogger-portlet/weblogger-portlet.info 9 Nov 2008 23:29:29 -0000 1.11
@@ -8,14 +8,14 @@
<singleton-p>t</singleton-p>
<auto-mount>weblogger-portlet</auto-mount>
- <version name="2.4.0d1" url="http://openacs.org/repository/download/apm/weblogger-portlet-2.4.0d1.apm">
+ <version name="2.5.0d1" url="http://openacs.org/repository/download/apm/weblogger-portlet-2.5.0d1.apm">
<owner url="mailto:simon@bcuni.net">Simon Carstensen</owner>
- <release-date>2008-01-08</release-date>
+ <release-date>2008-10-18</release-date>
<vendor url="http://www.collaboraid.biz">Collaboraid</vendor>
- <provides url="weblogger-portlet" version="2.4.0d1"/>
- <requires url="lars-blogger" version="2.4.0d1"/>
- <requires url="new-portal" version="2.4.0d1"/>
+ <provides url="weblogger-portlet" version="2.5.0d1"/>
+ <requires url="lars-blogger" version="2.5.0d1"/>
+ <requires url="new-portal" version="2.5.0d1"/>
<callbacks>
<callback type="after-install" proc="weblogger_portlet::after_install"/>
Index: openacs-4/packages/xml-rpc/www/doc/index.html
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xml-rpc/www/doc/index.html,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/xml-rpc/www/doc/index.html 26 Nov 2003 02:59:14 -0000 1.1
+++ openacs-4/packages/xml-rpc/www/doc/index.html 9 Nov 2008 23:29:29 -0000 1.2
@@ -4,7 +4,7 @@
</head>
<body>
<h2>XML-RPC Server Documentation</h2>
-<hr />
+<hr>
<h3>Overview</h3>
<blockquote>
@@ -277,7 +277,7 @@
what a TCL list is anyways). It makes the code more consistent and makes it
easier to understand how to deal with XML-RPC datatypes.
<blockquote>
-XML-RPC struct = TCL array. <br />
+XML-RPC struct = TCL array. <br>
XML-RPC array = TCL list.
</blockquote>
</p>
@@ -291,7 +291,7 @@
</ul>
</blockquote>
-<hr />
+<hr>
<address><a href="mailto:vinod@kurup.com">Vinod Kurup</a></address>
</body>
</html>
\ No newline at end of file