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.38 -r1.39
--- openacs-4/packages/acs-templating/acs-templating.info	14 May 2007 20:30:26 -0000	1.38
+++ openacs-4/packages/acs-templating/acs-templating.info	25 Jul 2007 12:18:04 -0000	1.39
@@ -7,7 +7,7 @@
     <initial-install-p>t</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="5.3.1" url="http://openacs.org/repository/download/apm/acs-templating-5.3.1.apm">
+    <version name="5.4.0d1" url="http://openacs.org/repository/download/apm/acs-templating-5.4.0d1.apm">
         <owner url="http://openacs.org">OpenACS</owner>
         <summary>Templating library.</summary>
         <release-date>2007-04-22</release-date>
@@ -25,16 +25,16 @@
         <license>GPL version 2</license>
         <maturity>3</maturity>
 
-        <provides url="acs-templating" version="5.3.1"/>
+        <provides url="acs-templating" version="5.4.0d1"/>
         <requires url="acs-kernel" version="5.3.1"/>
 
         <callbacks>
             <callback type="before-upgrade"  proc="template::apm::before_upgrade"/>
         </callbacks>
         <parameters>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DefaultFormStyle"  default="standard" description="The default form template to use if a particular form does not explicitly specify the form style to use."/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DefaultListFilterStyle"  default="filters" description="The default list filter template to use if a particular listfilter tag does not explicitly specify the list filter style to use."/>
-            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DefaultListStyle"  default="table" description="The default list template to use if a particular list does not explicitly specify the list style to use."/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DefaultFormStyle"  default="standard" description="The default form template to use if a particular form does not explicitly specify the form style to use. <br> Relative to [acs_root_dir]/packages/acs-templating/resources/forms. If it starts with '/' then it is relative to [acs_root_dir]"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DefaultListFilterStyle"  default="filters" description="The default list filter template to use if a particular listfilter tag does not explicitly specify the list filter style to use. <br> Relative to [acs_root_dir]/packages/acs-templating/resources/lists. If it starts with '/' then it is relative to [acs_root_dir]"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="DefaultListStyle"  default="table" description="The default list template to use if a particular list does not explicitly specify the list style to use. <br> Relative to [acs_root_dir]/packages/acs-templating/resources/lists. If it starts with '/' then it is relative to [acs_root_dir]"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RefreshCache"  default="as needed" description="When to re-translate templates.  Values: never, as needed, always."/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RichTextEditor"  default="rte" description="Use the specified javascript text editor when UseHtmlAreaForRichtextP is activated. Valid arguments are &quot;rte&quot; or &quot;xinha&quot;."/>
             <parameter datatype="number"  min_n_values="1"  max_n_values="1"  name="ShowCompiledTemplatesP"  default="0" description="Show thecompiled template (for debugging) at .cmp URL"/>
Index: openacs-4/packages/acs-templating/tcl/form-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-templating/tcl/form-procs.tcl,v
diff -u -r1.34 -r1.35
--- openacs-4/packages/acs-templating/tcl/form-procs.tcl	14 May 2007 20:30:27 -0000	1.34
+++ openacs-4/packages/acs-templating/tcl/form-procs.tcl	25 Jul 2007 12:18:04 -0000	1.35
@@ -328,8 +328,13 @@
                                    -default "standard-lars"]]
   }
 
-  set file_stub [template::get_resource_path]/forms/$style
-
+    # Added support for storing form templates outside acs-templating
+    if {[regexp {^/(.*)} $style path]} {
+        set file_stub "[acs_root_dir]$path"
+    } else {
+        set file_stub [template::get_resource_path]/forms/$style  
+    }
+  
   if { ![file exists "${file_stub}.adp"] } {
       # We always have a template named 'standard'
       set file_stub "[template::get_resource_path]/forms/standard"
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.43 -r1.44
--- openacs-4/packages/acs-templating/tcl/list-procs.tcl	14 May 2007 20:30:27 -0000	1.43
+++ openacs-4/packages/acs-templating/tcl/list-procs.tcl	25 Jul 2007 12:18:04 -0000	1.44
@@ -954,7 +954,13 @@
                                    -parameter DefaultListStyle \
                                    -default "table"]]
     }
-    set file_stub "[template::get_resource_path]/lists/$style"
+    
+    # Added support for storing form templates outside acs-templating
+    if {[regexp {^/(.*)} $style path]} {
+        set file_stub "[acs_root_dir]$path"
+    } else {
+        set file_stub [template::get_resource_path]/lists/$style  
+    }
 
     # ensure that the style template has been compiled and is up-to-date
     template::adp_init adp $file_stub
@@ -1533,7 +1539,12 @@
                        -parameter DefaultListFilterStyle \
                        -default "filters"]
     }
-    set file_stub "[template::get_resource_path]/lists/$style"
+    # Added support for storing form templates outside acs-templating
+    if {[regexp {^/(.*)} $style path]} {
+        set file_stub "[acs_root_dir]$path"
+    } else {
+        set file_stub [template::get_resource_path]/lists/$style  
+    }
 
     # ensure that the style template has been compiled and is up-to-date
     template::adp_init adp $file_stub