Index: openacs-4/packages/new-portal/www/render_styles/individual/render-element.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/render_styles/individual/render-element.adp,v
diff -u -N -r1.6 -r1.6.2.1
--- openacs-4/packages/new-portal/www/render_styles/individual/render-element.adp 8 Aug 2006 21:27:00 -0000 1.6
+++ openacs-4/packages/new-portal/www/render_styles/individual/render-element.adp 21 Feb 2007 02:42:55 -0000 1.6.2.1
@@ -23,13 +23,14 @@
@element.name;noquote@
@element.resource_dir@
@element.element_id@
+@element_num@
@element.link@
@element.shadeable_p@
@element.shaded_p@
@element.hideable_p@
@element.user_editable_p@
@element.link_hideable_p@
@hide_links_p@
-
+@element.filename@
@element.content;noquote@
Index: openacs-4/packages/new-portal/www/render_styles/individual/render-element.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/render_styles/individual/render-element.tcl,v
diff -u -N -r1.10 -r1.10.6.1
--- openacs-4/packages/new-portal/www/render_styles/individual/render-element.tcl 20 Apr 2004 21:13:51 -0000 1.10
+++ openacs-4/packages/new-portal/www/render_styles/individual/render-element.tcl 21 Feb 2007 02:42:55 -0000 1.10.6.1
@@ -26,9 +26,20 @@
region:onevalue
}
-# we get element_id, action_string, theme_id, region, portal_id,
+# we get element_id, element_num, element_first_num, action_string, theme_id, region, portal_id,
# edit_p, return_url, hide_links_p, page_id, and layout_id from the layout_template
+# DRB: With the creation of the accessible Zen theme, portlets are numbered for the
+# convenience of reading devices. The numbering is done by the layout template. Since
+# old layouts (in particular custom ones not part of the standard .LRN release)
+# don't number portlets, we check and set a dummy value if it doesn't exist.
+
+if { ![info exists element_num] } {
+ set element_num 0
+} else {
+ incr element_num $element_first_num
+}
+
if { [catch {set element_data [portal::evaluate_element -portal_id $portal_id -edit_p $edit_p $element_id $theme_id] } errmsg ] } {
# An uncaught error happened when trying to evaluate the element.
# If the error is in the element's "show" proc, the error will
Index: openacs-4/packages/theme-zen/lib/layouts/zen1.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/theme-zen/lib/layouts/zen1.adp,v
diff -u -N -r1.1.2.1 -r1.1.2.2
--- openacs-4/packages/theme-zen/lib/layouts/zen1.adp 29 Jan 2007 02:51:36 -0000 1.1.2.1
+++ openacs-4/packages/theme-zen/lib/layouts/zen1.adp 21 Feb 2007 02:42:56 -0000 1.1.2.2
@@ -6,6 +6,8 @@