Index: openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl,v
diff -u -N -r1.10.2.1 -r1.10.2.2
--- openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl 1 Aug 2007 21:39:32 -0000 1.10.2.1
+++ openacs-4/packages/xotcl-core/tcl/30-widget-procs.tcl 14 Sep 2007 09:35:22 -0000 1.10.2.2
@@ -593,12 +593,13 @@
Class TABLE2 \
-superclass TABLE \
-instproc render-actions {} {
- html::div -id "actions" -style "float: left" {
- html::ul -style "list-style:none; padding: 10px;" {
- foreach o [[self]::__actions children] {
- html::li -class "button" {$o render}
- }
- }
+ set actions [[self]::__actions children]
+ if {[llength $actions] > 0} {
+ html::div -class "actions" -style "float: left;" {
+ html::ul -style "list-style:none; padding: 10px;" {
+ foreach o $actions { html::li -class "button" {$o render} }
+ }
+ }
}
} \
-instproc render {} {
Index: openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl,v
diff -u -N -r1.9.2.3 -r1.9.2.4
--- openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl 13 Sep 2007 10:46:37 -0000 1.9.2.3
+++ openacs-4/packages/xowiki/tcl/adp-generator-procs.tcl 14 Sep 2007 09:34:38 -0000 1.9.2.4
@@ -53,11 +53,11 @@
@title;noquote@
@context;noquote@
@header_stuff;noquote@[my extra_header_stuff]
-
+
[my ajax_tag_definition]
@header_stuff;noquote@[my extra_header_stuff]
-
+
[my ajax_tag_definition]
}]\n
}
Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -N -r1.32.2.3 -r1.32.2.4
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl 1 Aug 2007 23:04:20 -0000 1.32.2.3
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl 14 Sep 2007 09:34:38 -0000 1.32.2.4
@@ -568,6 +568,8 @@
FormField::richtext::wym instproc initialize {} {
next
my set widget_type richtext
+ }
+ FormField::richtext::wym instproc render_content {} {
::xowiki::Page requireCSS "/resources/xowiki/wymeditor/skins/default/screen.css"
::xowiki::Page requireJS "/resources/xowiki/wymeditor/jquery.js"
::xowiki::Page requireJS "/resources/xowiki/wymeditor/jquery.wymeditor.js"
@@ -577,6 +579,7 @@
$j(".wymeditor").wymeditor();
});
}
+ next
}
###########################################################
Index: openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/Attic/xowiki-portlet-procs.tcl,v
diff -u -N -r1.83.2.7 -r1.83.2.8
--- openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl 13 Sep 2007 12:38:54 -0000 1.83.2.7
+++ openacs-4/packages/xowiki/tcl/xowiki-portlet-procs.tcl 14 Sep 2007 09:34:38 -0000 1.83.2.8
@@ -945,7 +945,11 @@
$item_id $gc_return_url]
set gc_comments [general_comments_get_comments $item_id $gc_return_url]
- return "#general-comments.Comments#
$gc_link
"
+ if {$gc_comments ne ""} {
+ return "#general-comments.Comments#
$gc_link
"
+ } else {
+ return "#general-comments.lt_No_comments_available#
$gc_link
"
+ }
}
Class create digg \
@@ -1613,7 +1617,7 @@
foreach o [$pages children] {
$o instvar page_order title page_id name title
- set level [expr {[regsub {[.]} $page_order . page_order] + 1}]
+ set level [expr {[regsub -all {[.]} $page_order . page_order] + 1}]
set p [::Generic::CrItem instantiate -item_id 0 -revision_id $page_id]
$p destroy_on_cleanup
Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -N -r1.162.2.5 -r1.162.2.6
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 13 Sep 2007 08:15:33 -0000 1.162.2.5
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl 14 Sep 2007 09:34:38 -0000 1.162.2.6
@@ -988,7 +988,7 @@
} else {
set image ""
}
- return "$image[$t asHTML]
\n$description
"
+ return "$image[$t asHTML]\n$description
"
}
PodcastItem instproc get_content {} {
Index: openacs-4/packages/xowiki/www/oacs-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/oacs-view.adp,v
diff -u -N -r1.39.2.3 -r1.39.2.4
--- openacs-4/packages/xowiki/www/oacs-view.adp 13 Sep 2007 12:38:54 -0000 1.39.2.3
+++ openacs-4/packages/xowiki/www/oacs-view.adp 14 Sep 2007 09:34:38 -0000 1.39.2.4
@@ -1,12 +1,12 @@
-
+
@title;noquote@
@context;noquote@
@header_stuff;noquote@
-
+
-
+
-
+
-
+
-
+
-
+
@header_stuff;noquote@
-
+