Index: openacs-4/packages/contacts/contacts.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/contacts.info,v
diff -u -r1.61 -r1.62
--- openacs-4/packages/contacts/contacts.info	29 Jan 2006 16:18:16 -0000	1.61
+++ openacs-4/packages/contacts/contacts.info	31 Jan 2006 11:49:22 -0000	1.62
@@ -7,14 +7,14 @@
     <initial-install-p>f</initial-install-p>
     <singleton-p>t</singleton-p>
     
-    <version name="1.2b1" url="http://openacs.org/repository/download/apm/contacts-1.2b1.apm">
+    <version name="1.2b2" url="http://openacs.org/repository/download/apm/contacts-1.2b2.apm">
         <owner url="mailto:openacs@geddert.com">Matthew Geddert</owner>
         <summary>This application lets you collaboratively view, edit and categorize contacts.</summary>
         <release-date>2005-11-23</release-date>
         <description format="text/plain">Contacts is an application for managing all those people and or organization you need to keep track of. It has a complete UI for storing and categorizing contacts. Each contact can have an arbitrary number of custom attributes associated with it, including other contacts (i.e. a certain contact &quot;belongs&quot; to a certain organization). It also functions as a service contract provider for attributes related to users in your system</description>
         <maturity>0</maturity>
 
-        <provides url="contacts" version="1.2b1"/>
+        <provides url="contacts" version="1.2b2"/>
         <requires url="acs-tcl" version="5.2.0b3"/>
         <requires url="acs-datetime" version="4.2"/>
         <requires url="acs-events" version="0.5d3"/>
@@ -67,6 +67,7 @@
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="SquareThumbnails"  default="1" description="0 for no, 1 for yes. If yes we crop either the top or the bottom of the image to create square thumbnails and portraits" section_name="Photos"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="ThumbnailSize"  default="125x125" description="Max dimension for thumbnail image" section_name="Photos"/>
             <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="OOMailingPath"  default="/packages//contacts/templates/oo-mailing" description="The directory that contains all files needed for a proper OO mailing. This is the document.odt, content.xml, styles.xml and the banner directory" section_name="Templates"/>
+            <parameter datatype="string"  min_n_values="1"  max_n_values="1"  name="RequireAdminForTemplatesP"  default="0" description="Do we allow users to create templates in the system. If set to 1, only admins can create templates." section_name="Templates"/>
         </parameters>
 
     </version>
Index: openacs-4/packages/contacts/lib/oo_mailing.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/lib/oo_mailing.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/contacts/lib/oo_mailing.tcl	29 Jan 2006 16:09:49 -0000	1.6
+++ openacs-4/packages/contacts/lib/oo_mailing.tcl	31 Jan 2006 11:49:22 -0000	1.7
@@ -41,6 +41,7 @@
 
 set template_path "[acs_root_dir][parameter::get_from_package_key -package_key contacts -parameter OOMailingPath]"
 set banner_options [util::find_all_files -extension jpg -path "${template_path}/banner"]
+set banner_options [concat [list ""] $banner_options]
 
 set date [split [dt_sysdate] "-"]
 append form_elements {
Index: openacs-4/packages/contacts/www/message-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/message-ae.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/contacts/www/message-ae.adp	28 Jul 2005 13:13:52 -0000	1.2
+++ openacs-4/packages/contacts/www/message-ae.adp	31 Jan 2006 11:49:22 -0000	1.3
@@ -1,5 +1,4 @@
 <master src="/packages/contacts/lib/contacts-master" />
 <property name="context">@context;noquote@</property>
 <property name="title">@page_title@</property>
-
 <formtemplate id="rel_type"></formtemplate>
\ No newline at end of file
Index: openacs-4/packages/contacts/www/message-ae.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/message-ae.tcl,v
diff -u -r1.6 -r1.7
--- openacs-4/packages/contacts/www/message-ae.tcl	29 Jan 2006 16:11:29 -0000	1.6
+++ openacs-4/packages/contacts/www/message-ae.tcl	31 Jan 2006 11:49:22 -0000	1.7
@@ -34,6 +34,12 @@
     }
 }
 
+set admin_required_p [parameter::get -parameter "RequireAdminForTemplatesP" -default 0]
+
+if {$admin_required_p} {
+    permission::require_permission -object_id [ad_conn package_id] -privilege "admin"
+}
+
 set message_exists_p 0
 if { [exists_and_not_null item_id] } {
     if { [db_0or1row message_exists_p { select 1 from contact_messages where item_id = :item_id}] } {
@@ -71,6 +77,7 @@
     }
     oo_mailing {
 	set banner_options [util::find_all_files -extension jpg -path "[acs_root_dir][parameter::get_from_package_key -package_key contacts -parameter OOMailingPath]/banner"]
+	set banner_options [concat [list ""] $banner_options]
 	append form_elements {
 	    {banner:text(select),optional
 		{label "[_ contacts.Banner]"}