Index: openacs-4/packages/contacts/contacts.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/contacts.info,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/contacts/contacts.info 21 May 2005 21:00:41 -0000 1.5
+++ openacs-4/packages/contacts/contacts.info 25 May 2005 16:23:51 -0000 1.6
@@ -21,7 +21,15 @@
<callbacks>
</callbacks>
<parameters>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="AcceptableFileUploadMIMETypes" default="*" description="* for any. CSV of acceptable MIME Types for File Upload" section_name="File Upload"/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="AcceptablePhotoUploadMIMETypes" default="image/jpeg,image/gif,image/png,image/bmp,image/tiff" description="CSV of acceptable MIME Types for Photo Upload" section_name="Photos"/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="ConverttoJpg" default="1" description="0 for no, 1 for yes. Flag to convert images to jpegs automatically" section_name="Photos"/>
<parameter datatype="number" min_n_values="1" max_n_values="1" name="DefaultViewAttributes" default="{email} {home_phone} {(h)} {work_phone} {(w)} {mobile_phone} {(m)}" description="The default attributes to view on the main contact page. This should be a list of attribute_name display_code to show for the attribute, the display code will only show up if the person/contact has a value for that attribute."/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="ImageMagickPath" default="/usr/local/bin" description="Absolute path from computer root to directory containing ImageMagick executables" section_name="Photos"/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="PortraitSize" default="200x200" description="Max dimensions for portrait" section_name="Photos"/>
+ <parameter datatype="string" min_n_values="1" max_n_values="1" name="PortraitThumbnailSize" default="50x50" description="Max dimensions of portrait thumbnail" section_name="Photos"/>
+ <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"/>
</parameters>
</version>
Index: openacs-4/packages/contacts/resources/forms/inline.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/resources/forms/inline.adp,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/contacts/resources/forms/inline.adp 25 May 2005 16:23:51 -0000 1.1
@@ -0,0 +1,93 @@
+<!-- Form elements -->
+ <multiple name=elements>
+
+ <if @elements.section@ not nil>
+ <span class="form-section">@elements.section@</span>
+ </if>
+
+ <group column="section">
+ <if @elements.widget@ eq "hidden">
+ <noparse><formwidget id=@elements.id@></noparse>
+ </if>
+
+ <else>
+
+ <if @elements.widget@ eq "submit">
+ <span class="form-element">
+ <group column="widget">
+ <noparse><formwidget id="@elements.id@"></noparse>
+ </group>
+ </span>
+ </if>
+
+ <else>
+ <if @elements.label@ not nil>
+ <noparse>
+ <if \@formerror.@elements.id@\@ not nil>
+ <span class="form-label-error">
+ </if>
+ <else>
+ <span class="form-label">
+ </else>
+ </noparse>
+ @elements.label;noquote@
+ <if @form_properties.show_required_p@ true>
+ <if @elements.optional@ nil and @elements.mode@ ne "display" and @elements.widget@ ne "inform" and @elements.widget@ ne "select"><span class="form-required-mark">*</span></if>
+ </if>
+ </span>
+ </if>
+ <else>
+ </else>
+ <noparse>
+ <if \@formerror.@elements.id@\@ not nil>
+ <span class="form-widget-error">
+ </if>
+ <else>
+ <span class="form-widget">
+ </else>
+ </noparse>
+
+ <if @elements.widget@ in radio checkbox>
+ <noparse>
+ <table>
+ <formgroup id="@elements.id@">
+ <tr><td>
+ \@formgroup.widget;noquote@
+ <label for="@elements.form_id@:elements:@elements.id@:\@formgroup.option@">
+ \@formgroup.label@
+ </label>
+
+ </td></tr>
+ </formgroup>
+ </table>
+ </noparse>
+ </if>
+
+ <else>
+ <noparse>
+ <formwidget id="@elements.id@">
+ </noparse>
+ </else>
+
+ <noparse>
+ <formerror id="@elements.id@">
+ <br>
+ <font color="red">
+ <b>\@formerror.@elements.id@;noquote\@<b>
+ </font>
+ </formerror>
+ </noparse>
+
+ <if @elements.help_text@ not nil>
+ <p style="margin-top: 4px; margin-bottom: 2px;">
+ <noparse>
+ <i><formhelp id="@elements.id@"></i>
+ </noparse>
+ </p>
+ </if>
+
+ </else>
+ </else>
+ </group>
+ </multiple>
+
Index: openacs-4/packages/contacts/www/contact-add.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact-add.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/www/contact-add.adp 18 May 2005 16:45:49 -0000 1.1
+++ openacs-4/packages/contacts/www/contact-add.adp 25 May 2005 16:23:51 -0000 1.2
@@ -6,4 +6,4 @@
</property>
<property name="focus">party_ae.first_names</property>
-<formtemplate id="party_ae" style="proper"></formtemplate>
+<formtemplate id="party_ae"></formtemplate>
Index: openacs-4/packages/contacts/www/contact-edit.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact-edit.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/www/contact-edit.adp 18 May 2005 16:45:50 -0000 1.1
+++ openacs-4/packages/contacts/www/contact-edit.adp 25 May 2005 16:23:51 -0000 1.2
@@ -1,5 +1,5 @@
<master src="/packages/contacts/lib/contact-master">
<property name="party_id">@party_id@</property>
-<formtemplate id="party_ae" style="proper"></formtemplate>
+<formtemplate id="party_ae"></formtemplate>
Index: openacs-4/packages/contacts/www/contact-rels.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact-rels.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/contacts/www/contact-rels.adp 21 May 2005 21:00:41 -0000 1.2
+++ openacs-4/packages/contacts/www/contact-rels.adp 25 May 2005 16:23:51 -0000 1.3
@@ -4,7 +4,7 @@
<p>
-<formtemplate id="search" style="proper-inline"></formtemplate>
+<formtemplate id="search" style="../../../contacts/resources/forms/inline"></formtemplate>
</p>
<if @query@ not nil>
Index: openacs-4/packages/contacts/www/contact.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/contact.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/contacts/www/contact.adp 19 May 2005 23:03:23 -0000 1.2
+++ openacs-4/packages/contacts/www/contact.adp 25 May 2005 16:23:51 -0000 1.3
@@ -5,7 +5,7 @@
<tr>
<td valign="top" width="70%">
- <formtemplate id="party_ae" style="proper"></formtemplate>
+ <formtemplate id="party_ae"></formtemplate>
<if @tasks_enabled_p@>
<include src="/packages/tasks/lib/tasks" party_id="@party_id@" hide_form_p="t">
Index: openacs-4/packages/contacts/www/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/index.adp,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/contacts/www/index.adp 19 May 2005 23:03:23 -0000 1.4
+++ openacs-4/packages/contacts/www/index.adp 25 May 2005 16:23:51 -0000 1.5
@@ -16,7 +16,7 @@
</ul>
</div>
-<p><formtemplate id="search" style="proper-inline"></formtemplate></p>
+<p><formtemplate id="search" style="../../../contacts/resources/forms/inline"></formtemplate></p>
<listtemplate name="contacts"></listtemplate>
Index: openacs-4/packages/contacts/www/message.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/message.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/www/message.adp 18 May 2005 16:45:50 -0000 1.1
+++ openacs-4/packages/contacts/www/message.adp 25 May 2005 16:23:51 -0000 1.2
@@ -12,5 +12,5 @@
</else>
<property name="focus">comment_add.comment</property>
-<formtemplate id="message" style="proper"></formtemplate>
+<formtemplate id="message"></formtemplate>
Index: openacs-4/packages/contacts/www/relationship-ae.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/relationship-ae.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/www/relationship-ae.adp 21 May 2005 21:00:41 -0000 1.1
+++ openacs-4/packages/contacts/www/relationship-ae.adp 25 May 2005 16:23:51 -0000 1.2
@@ -1,5 +1,5 @@
<master src="/packages/contacts/lib/contact-master">
<property name="party_id">@party_id@</property>
-<formtemplate id="rel_form" style="proper"></formtemplate>
+<formtemplate id="rel_form"></formtemplate>
Index: openacs-4/packages/contacts/www/search.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/search.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/contacts/www/search.adp 18 May 2005 16:45:50 -0000 1.1
+++ openacs-4/packages/contacts/www/search.adp 25 May 2005 16:23:51 -0000 1.2
@@ -7,7 +7,7 @@
</property>
<p><a href="my-searches" class="button">My Searches</a></p>
-<formtemplate id="advanced_search" style="proper-inline"></formtemplate>
+<formtemplate id="advanced_search" style="../../../contacts/resources/forms/inline"></formtemplate>
<if @query_code@ not nil and @sw_admin_p@>
<h3>Debugging Code - Only SW Admins See This</h3>
Index: openacs-4/packages/contacts/www/resources/contacts.css
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/contacts/www/resources/contacts.css,v
diff -u -r1.4 -r1.5
--- openacs-4/packages/contacts/www/resources/contacts.css 19 May 2005 16:45:52 -0000 1.4
+++ openacs-4/packages/contacts/www/resources/contacts.css 25 May 2005 16:23:51 -0000 1.5
@@ -106,57 +106,6 @@
padding-bottom: 10px;
border-bottom: 1px solid #AAA;
}
-form label {
- float: left;
- width: 25%;
- text-align: right;
- font-size: 90%;
- padding-bottom: 5px;
-}
-form span.element {
- float: right;
- width: 72%;
- text-align: left;
- padding-bottom: 5px;
-}
-form fieldset {
- border-color: #CCC;
- border-style: dotted;
- border-width: 2px 0px 0px 0px;
- margin: 0px 5px 0px 0px;
- clear: both;
-}
-
-form legend {
- color: #AAA;
- margin: 0px 5px 0px 5px;
-}
-form div.element {
- clear: both;
-}
-form span.element input, form span.element textarea {
- border-style: solid;
- border-color: #AAA;
- background-color: #EEE;
- border-width: 0px 0px 1px 0px;
- padding: 1px;
- -moz-border-radius-topright: 0px;
-}
-form span.element select {
- background-color: #EEE;
- }
-form table.selector {
- width: 100%;
-}
-form table.selector td.widget {
- width: 1%;
-}
-form table.selector td.label {
- width: 99%;
-}
-form table.selector label {
- text-align: left;
-}
.address-widget {
width: 300px;
}