svn commit: r1305581 [15/36] - in /ofbiz/branches/20111205EmailHandling: ./ applications/accounting/config/ applications/accounting/data/ applications/accounting/entitydef/ applications/accounting/script/org/ofbiz/accounting/finaccount/ applications/ac...

[erwan]

Modified: ofbiz/branches/20111205EmailHandling/applications/party/widget/partymgr/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/party/widget/partymgr/PartyForms.xml?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/party/widget/partymgr/PartyForms.xml (original)
+++ ofbiz/branches/20111205EmailHandling/applications/party/widget/partymgr/PartyForms.xml Mon Mar 26 20:56:02 2012
@@ -134,7 +134,7 @@ under the License.
 
     <form name="ViewPartyGroup" type="single" default-map-name="lookupGroup">
         <auto-fields-entity entity-name="PartyGroup" default-field-type="display"/>
-        <field name="logo" use-when="partyGroupLogoLinkUrl!=null" title="${uiLabelMap.CommonOrganizationLogo}"><image alternate="${uiLabelMap.CommonOrganizationLogo}" value="${partyGroupLogoLinkUrl}"/></field>
+        <field name="logo" use-when="partyGroupLogoLinkUrl!=null" title="${uiLabelMap.CommonOrganizationLogo}"><image alternate="${uiLabelMap.CommonOrganizationLogo}" value="${partyGroupLogoLinkUrl}" style="cssImgStandard"/></field>
         <field name="partyTypeId"><ignored/></field>
         <field name="comments"><ignored/></field>
         <field name="logoImageUrl"><ignored/></field>
@@ -159,6 +159,7 @@ under the License.
     </form>
 
     <form name="ViewPartyPerson" type="single" default-map-name="lookupPerson">
+        <field name="personalImage" use-when="partyContentId!=null" title="${uiLabelMap.FormFieldTitle_personalImage}"><image value="${personalImage}" style="cssImgStandard"/></field>
         <field name="partyId"><display/></field>
         <field name="name" title="${uiLabelMap.PartyName}"><display description="${lookupPerson.personalTitle} ${lookupPerson.firstName} ${lookupPerson.middleName} ${lookupPerson.lastName}"/></field>
         <field name="comments" title="${uiLabelMap.PartyComments}"><display/></field>
@@ -486,7 +487,7 @@ under the License.
         <field use-when="displayPassword!=null" name="USERNAME" title="${uiLabelMap.CommonUsername}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="30" maxlength="250"/></field>
         <field use-when="displayPassword!=null" name="PASSWORD" title="${uiLabelMap.CommonPassword}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><password size="15" maxlength="250"/></field>
         <field use-when="displayPassword!=null" name="CONFIRM_PASSWORD" title="${uiLabelMap.CommonPassword}" tooltip="* ${uiLabelMap.CommonConfirm}" widget-style="required"><password size="15" maxlength="250"/></field>
-        <field name="USERNAME" title="${uiLabelMap.CommonUsername}" tooltip="* ${uiLabelMap.PartyTemporaryPassword}"><text size="30" maxlength="250"/></field>
+        <field name="USERNAME" title="${uiLabelMap.CommonUsername}" tooltip="* ${uiLabelMap.PartyTemporaryPassword}" widget-style="required"><text size="30" maxlength="250"/></field>
         <!--<field name="RequiredNote" title="${uiLabelMap.CommonEmptyHeader}"><display description="${uiLabelMap.PartyRequiredNote}" also-hidden="false"/></field> -->
 
         <field name="PRODUCT_STORE_ID" title="Product Store" tooltip="${uiLabelMap.CommonRequired}" widget-style="required">
@@ -865,7 +866,7 @@ under the License.
         <field name="fromDate"><date-time/></field>
         <field name="thruDate"><date-time/></field>
         <field name="groupId" title="${uiLabelMap.CommonSecurityGroupId}">
-            <drop-down allow-empty="true">
+            <drop-down allow-empty="true" text-size="60">
                 <entity-options entity-name="SecurityGroup" description="${description}">
                     <entity-order-by field-name="description"/>
                 </entity-options>

Modified: ofbiz/branches/20111205EmailHandling/applications/party/widget/partymgr/PartyScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/party/widget/partymgr/PartyScreens.xml?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/party/widget/partymgr/PartyScreens.xml (original)
+++ ofbiz/branches/20111205EmailHandling/applications/party/widget/partymgr/PartyScreens.xml Mon Mar 26 20:56:02 2012
@@ -1254,4 +1254,21 @@ under the License.
             </widgets>
         </section>
     </screen>
+    <screen name="postalAddress">
+        <section>
+            <actions>
+                <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
+                <set field="addressTemplatePath" value="${sys:getProperty('ofbiz.home')}/applications/party/webapp/partymgr/party/contactmechtemplates/"/>
+                <set field="postalAddress" from-field="parameters.postalAddress"/>
+                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetPostalAddressTemplate.groovy"/>
+            </actions>
+            <widgets>
+                <platform-specific>
+                    <html>
+                        <html-template location="component://party/webapp/partymgr/party/contactmechtemplates/${postalAddressTemplate}"/>
+                    </html>
+                </platform-specific>
+            </widgets>
+        </section>
+    </screen>
 </screens>

Modified: ofbiz/branches/20111205EmailHandling/applications/party/widget/partymgr/ProfileScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/party/widget/partymgr/ProfileScreens.xml?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/party/widget/partymgr/ProfileScreens.xml (original)
+++ ofbiz/branches/20111205EmailHandling/applications/party/widget/partymgr/ProfileScreens.xml Mon Mar 26 20:56:02 2012
@@ -43,6 +43,7 @@
                 <set field="partyContentId" from-field="partyContentList[0].contentId"/>
                 <set field="partyContent" value="${groovy: partyContentId!=null?&quot;/content/control/stream?contentId=&quot; + partyContentId : &quot;&quot;}"/>
                 <set field="partyGroupLogoLinkUrl" from-field="partyContent" default-value="${lookupGroup.logoImageUrl}" global="true"/>
+                <set field="personalImage" from-field="partyContent"/>
             </actions>
             <widgets>
                 <section>

Modified: ofbiz/branches/20111205EmailHandling/applications/product/config/ImageProperties.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/20111205EmailHandling/applications/product/config/ImageProperties.xml?rev=1305581&r1=1305580&r2=1305581&view=diff
==============================================================================
--- ofbiz/branches/20111205EmailHandling/applications/product/config/ImageProperties.xml (original)
+++ ofbiz/branches/20111205EmailHandling/applications/product/config/ImageProperties.xml Mon Mar 26 20:56:02 2012
@@ -47,7 +47,7 @@ under the License.
         <dimension name="height" value="112"/>
         <dimension name="width" value="150"/>
     </size>
-   <size name="320x240">
+    <size name="320x240">
         <dimension name="height" value="240"/>
         <dimension name="width" value="320"/>
     </size>