Index: openacs-4/packages/acs-templating/acs-templating.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/acs-templating.info,v
diff -u -r1.56.2.3 -r1.56.2.4
--- openacs-4/packages/acs-templating/acs-templating.info 28 Aug 2015 09:06:02 -0000 1.56.2.3
+++ openacs-4/packages/acs-templating/acs-templating.info 3 Sep 2015 19:29:01 -0000 1.56.2.4
@@ -9,7 +9,7 @@
f
t
-
+
OpenACS
Templating library.
2013-09-24
@@ -27,7 +27,7 @@
GPL version 2
3
-
+
Index: openacs-4/packages/acs-templating/tcl/list-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/list-procs.tcl,v
diff -u -r1.60.2.3 -r1.60.2.4
--- openacs-4/packages/acs-templating/tcl/list-procs.tcl 28 Aug 2015 09:02:38 -0000 1.60.2.3
+++ openacs-4/packages/acs-templating/tcl/list-procs.tcl 3 Sep 2015 19:29:01 -0000 1.60.2.4
@@ -1911,6 +1911,18 @@
specified in the 'pass_properties' argument to the template::list::create.
+ display_template_name: theme-able template. If a
+ display_template_name is specified, and a file with this name is
+ available from the ressource directory in the display_templates
+ section, then take its countent as display_template. The resouce
+ directory is taken from the ResourceDir of the theme (parameter of
+ acs-sub-site) or from the "resources" directory in acs-templating.
+ The display_template_name acts similar to the query names in
+ the database interface: When display_template_name is specified
+ and the file is available, it overrules display_template, which
+ acts as a default.
+
+
link_url_col: Name of column in the multirow which contains the URL to which the cell contents should point.
If either link_url_col or link_url_eval is specified, the cell's contents will be made a link to the specified URL, if that
URL is non-empty.
@@ -1983,6 +1995,7 @@
html {}
display_col {}
display_template {}
+ display_template_name {}
link_url_col {}
link_url_eval {}
link_html {}
@@ -2199,8 +2212,14 @@
# We ignore if the element doesn't exist, 'cause then we'll just hope it exists in the multirow and display the value directly
get_reference -create -list_name $list_name -element_name $element_name
- if { [info exists element_properties(display_template)] && $element_properties(display_template) ne "" } {
- set output $element_properties(display_template)
+ if { [info exists element_properties(display_template_name)] && $element_properties(display_template_name) ne "" } {
+ set stub [template::resource_path -type display_templates -style $element_properties(display_template_name)]
+ if {[file readable $stub.adp]} {
+ set output [template::util::read_file $stub.adp]
+ }
+ }
+ if { ![info exists output] && [info exists element_properties(display_template)] && $element_properties(display_template) ne "" } {
+ set output $element_properties(display_template)
} elseif { [info exists element_properties(display_col)] && $element_properties(display_col) ne "" } {
set output "@$multirow.$element_properties(display_col)@"
} else {