svn commit: r748052 - in /ofbiz/trunk/specialpurpose/myportal: script/org/ofbiz/myportal/Events.xml widget/CommonScreens.xml widget/MyPortalForms.xml

[hansbak-2]

Author: hansbak
Date: Thu Feb 26 07:41:24 2009
New Revision: 748052

URL: http://svn.apache.org/viewvc?rev=748052&view=rev
Log:
captcha picture changed from png to jpg because some archaic browsers (IE6) do not support this format

Modified:
    ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml
    ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
    ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml

Modified: ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml?rev=748052&r1=748051&r2=748052&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml Thu Feb 26 07:41:24 2009
@@ -117,7 +117,6 @@
         <entity-condition list="commEvents" entity-name="CommunicationEvent"/>
         <set field="count" value="0" type="Integer"/>
         <iterate entry="commEvent" list="commEvents">
-            <log level="always" message="====processing: ${commEvent.communicationEventId}"/>
             <get-related value-field="commEvent" relation-name="CommunicationEventRole"
                 list="roles"/>
             <if-empty field="roles">
@@ -167,7 +166,6 @@
                 </calculate>
             </if-empty>
         </iterate>
-        <log level="always" message="========${count} records updated"/>
     </simple-method>
 
     <simple-method method-name="getToNextDonePage"
@@ -315,7 +313,6 @@
     <simple-method method-name="createRegister"
         short-description="Create person when new register" login-required="false">
         <call-bsh><![CDATA[
-            parameters.put("captchaCode",org.ofbiz.common.Captcha.ID_KEY);
             org.ofbiz.common.Captcha.getCodeCaptcha(request,response);
             ]]></call-bsh>
         <if-empty field="parameters.firstName"><property-to-field field="errorMessage" resource="MyPortalUiLabels" property="FirstName_Missing"/><field-to-list field="errorMessage" list="error_list"/></if-empty>

Modified: ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml?rev=748052&r1=748051&r2=748052&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml Thu Feb 26 07:41:24 2009
@@ -180,7 +180,6 @@
                             </actions>
                             <widgets>
                                 <label style="h2" text="${uiLabelMap.RegisterComplete}"/><link target="main" style="h2" text="${uiLabelMap.CommonBeLogged}"></link>
-                                <label style="h2" text="&lt;br&gt;&lt;br&gt;"/>
                                 <screenlet title="${uiLabelMap.PartyPersonalInformation}">
                                     <include-form name="ViewPartyPerson" location="component://myportal/widget/MyPortalForms.xml"/>
                                 </screenlet>
@@ -196,6 +195,7 @@
                                         <section>
                                             <actions>
                                                 <set field="fileName" from-field="parameters.fileName"/>
+                                                <set field="idKey" from-field="parameters.ID_KEY"/>
                                             </actions>
                                             <widgets>
                                                 <include-form name="RegisterPerson" location="component://myportal/widget/MyPortalForms.xml"/>

Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml?rev=748052&r1=748051&r2=748052&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml Thu Feb 26 07:41:24 2009
@@ -316,10 +316,11 @@
         <field name="PASSWORD" title="${uiLabelMap.CommonPassword}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><password size="15" maxlength="250"/></field>
         <field name="CONFIRM_PASSWORD" title="${uiLabelMap.CommonPassword}" tooltip="* ${uiLabelMap.CommonConfirm}" widget-style="required"><password size="15" maxlength="250"/></field>
         <field name="VerifyCaptchaTitle" title="${uiLabelMap.VerifyCaptcha}" title-area-style="group-label"><display description=" " also-hidden="false"/></field>
-        <field name="picOfcaptcha" title="${uiLabelMap.PicCaptcha}"><image value="/tempfiles/captcha/${parameters.fileName}"></image></field>
+        <field name="picOfcaptcha" title="${uiLabelMap.PicCaptcha}TEST:${parameters.ID_KEY}"><image value="/tempfiles/captcha/${parameters.fileName}"></image></field>
         <field name="reload" title=" "><hyperlink target="newRegisterLogin" description="${uiLabelMap.MyPortalReloadImage}"/></field>
         <field name="captcha" title="${uiLabelMap.VerifyCaptcha}" tooltip="${uiLabelMap.CommonRequired}" widget-style="required"><text size="23" maxlength="30"/></field>
         <field name="submitButton" title="${uiLabelMap.CommonSave}" title-area-style="group-label"><submit button-type="button"/></field>
+        <field name="captchaCode"><hidden value="${parameters.ID_KEY}"/></field>
     </form>
     
     <form name="ViewPartyPerson" type="single" default-map-name="lookupPerson" extends="ViewPartyPerson" extends-resource="component://party/webapp/partymgr/party/PartyForms.xml">