Author: jleroux Date: Sun Apr 25 18:49:01 2010 New Revision: 937852 URL: http://svn.apache.org/viewvc?rev=937852&view=rev Log: Closes "Replace popup lookups by layer lookups" (https://issues.apache.org/jira/browse/OFBIZ-3442) - OFBIZ-3442
Not all cases have been resolved but this patch takes this into account and should not introduce any not known issues. These issues are identified at "Layer popup umbrella main task" (https://issues.apache.org/jira/browse/OFBIZ-3445). They will be resolved later and are actually bugs so will be committed later when fixed. They are * "Allow to open a layer lookup from a layer lookup" (https://issues.apache.org/jira/browse/OFBIZ-3446) and its specific case "Allow to open a layer lookup from a layer lookup recursively" (https://issues.apache.org/jira/browse/OFBIZ-3693) * "The minimize/enlarge buttons (+ -) blocks the layer" (https://issues.apache.org/jira/browse/OFBIZ-3692) * "When you get disconnected (time out) from a layered lookup, you then get afterward ugly screens" (https://issues.apache.org/jira/browse/OFBIZ-3450) Modified: ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml ofbiz/trunk/applications/content/widget/content/ContentForms.xml ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml ofbiz/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml ofbiz/trunk/applications/party/widget/partymgr/LookupForms.xml ofbiz/trunk/applications/workeffort/widget/LookupForms.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml ofbiz/trunk/framework/common/webcommon/includes/htmlTemplate.ftl ofbiz/trunk/framework/widget/dtd/widget-form.xsd ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl Modified: ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml?rev=937852&r1=937851&r2=937852&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml (original) +++ ofbiz/trunk/applications/accounting/widget/FieldLookupForms.xml Sun Apr 25 18:49:01 2010 @@ -123,8 +123,8 @@ under the License. header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="Payment" default-field-type="hidden"/> <field name="paymentId" title="${uiLabelMap.AccountingPaymentID}"><text-find/></field> - <field name="partyIdFrom"><lookup target-form-name="LookupPartyName"/></field> - <field name="partyIdTo"><lookup target-form-name="LookupPartyName"/></field> + <field name="partyIdFrom"><lookup presentation="window" target-form-name="LookupPartyName"/></field> + <field name="partyIdTo"><lookup presentation="window" target-form-name="LookupPartyName"/></field> <field name="amountApplied"><text-find default-value=""></text-find> </field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> @@ -166,8 +166,8 @@ under the License. </entity-options> </drop-down> </field> - <field position="1" name="partyIdFrom"><lookup target-form-name="LookupPartyName"/></field> - <field position="2" name="partyId" title="${uiLabelMap.AccountingPartyIdTo}"><lookup target-form-name="LookupPartyName"/></field> + <field position="1" name="partyIdFrom"><lookup presentation="window" target-form-name="LookupPartyName"/></field> + <field position="2" name="partyId" title="${uiLabelMap.AccountingPartyIdTo}"><lookup presentation="window" target-form-name="LookupPartyName"/></field> <field position="1" name="Datefrom" title="${uiLabelMap.CommonFromDate}"><date-time/></field> <field position="2" name="DateThru" title="${uiLabelMap.CommonThruDate}"><date-time/></field> @@ -285,7 +285,7 @@ under the License. header-row-style="header-row" default-table-style="basic-table"> <field name="glReconciliationId" title="${uiLabelMap.FormFieldTitle_glReconciliationId}"><text-find/></field> <field name="glReconciliationName" title="${uiLabelMap.FormFieldTitle_glReconciliationName}"><text-find/></field> - <field name="organizationPartyId" title="${uiLabelMap.FormFieldTitle_organizationPartyId}"><lookup target-form-name="LookupPartyName"/></field> + <field name="organizationPartyId" title="${uiLabelMap.FormFieldTitle_organizationPartyId}"><lookup presentation="window" target-form-name="LookupPartyName"/></field> <field name="description" title="${uiLabelMap.CommonDescription}"><text-find/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> Modified: ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml?rev=937852&r1=937851&r2=937852&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/lookup/LookupForms.xml Sun Apr 25 18:49:01 2010 @@ -51,13 +51,13 @@ under the License. <text-find/> </field> <field name="createdByUserLogin"> - <lookup target-form-name="LookupPerson"/> + <lookup presentation="window" target-form-name="LookupPerson"/> </field> <field name="createdDate"> <date-find/> </field> <field name="lastModifiedByUserLogin"> - <lookup target-form-name="LookupParty"/> + <lookup presentation="window" target-form-name="LookupParty"/> </field> <field name="lastModifiedDate"> <date-find/> Modified: ofbiz/trunk/applications/content/widget/content/ContentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentForms.xml?rev=937852&r1=937851&r2=937852&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/content/ContentForms.xml (original) +++ ofbiz/trunk/applications/content/widget/content/ContentForms.xml Sun Apr 25 18:49:01 2010 @@ -43,10 +43,10 @@ under the License. </drop-down> </field> <field name="dataResourceId" position="1"> - <lookup target-form-name="LookupDataResource"/> + <lookup presentation="window" target-form-name="LookupDataResource"/> </field> <field name="ownerContentId" position="2"> - <lookup target-form-name="LookupContent"/> + <lookup presentation="window" target-form-name="LookupContent"/> </field> <field name="statusId"> <drop-down allow-empty="true"> @@ -56,7 +56,7 @@ under the License. </entity-options> </drop-down> </field> - <field name="createdByUserLogin" position="2"><lookup target-form-name="LookupPerson"/></field> + <field name="createdByUserLogin" position="2"><lookup presentation="window" target-form-name="LookupPerson"/></field> <field name="localeString"> <drop-down allow-empty="true"> <entity-options entity-name="CountryCode" description="${countryName} [${countryCode}]" key-field-name="countryCode"> Modified: ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml?rev=937852&r1=937851&r2=937852&view=diff ============================================================================== --- ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml (original) +++ ofbiz/trunk/applications/humanres/widget/forms/LookupForms.xml Sun Apr 25 18:49:01 2010 @@ -29,7 +29,7 @@ under the License. <entity-options description="${description}" key-field-name="budgetTypeId" entity-name="BudgetType"></entity-options> </drop-down> </field> - <field name="customTimePeriodId"><lookup target-form-name="LookupCustomTimePeriod"/></field> + <field name="customTimePeriodId"><lookup presentation="window" target-form-name="LookupCustomTimePeriod"/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> @@ -57,7 +57,7 @@ under the License. <entity-options description="${description}" key-field-name="budgetItemTypeId" entity-name="BudgetItemType"></entity-options> </drop-down> </field> - <field name="budgetId"><lookup target-form-name="LookupBudget"/></field> + <field name="budgetId"><lookup presentation="window" target-form-name="LookupBudget"/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> @@ -90,9 +90,9 @@ under the License. <entity-options description="${description}" key-field-name="emplPositionTypeId" entity-name="EmplPositionType"></entity-options> </drop-down> </field> - <field name="partyId"><lookup target-form-name="LookupPartyName"/></field> - <field name="budgetId"><lookup target-form-name="LookupBudget"/></field> - <field name="budgetItemSeqId"><lookup target-form-name="LookupBudgetItem"/></field> + <field name="partyId"><lookup presentation="window" target-form-name="LookupPartyName"/></field> + <field name="budgetId"><lookup presentation="window" target-form-name="LookupBudget"/></field> + <field name="budgetItemSeqId"><lookup presentation="window" target-form-name="LookupBudgetItem"/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> Modified: ofbiz/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml?rev=937852&r1=937851&r2=937852&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/FieldLookupForms.xml Sun Apr 25 18:49:01 2010 @@ -47,7 +47,7 @@ under the License. </entity-options> </drop-down> </field> - <field name="productStoreId"><lookup target-form-name="/marketing/control/LookupProductStore"/></field> + <field name="productStoreId"><lookup presentation="window" target-form-name="/marketing/control/LookupProductStore"/></field> <field name="currencyUom"> <drop-down allow-empty="true" no-current-selected-key="${defaultOrganizationPartyCurrencyUomId}"> <entity-options key-field-name="uomId" description="${description} - ${abbreviation}" entity-name="Uom"> @@ -215,7 +215,7 @@ under the License. </drop-down> </field> --> - <field name="partyId"><lookup target-form-name="LookupPartyName"/></field> + <field name="partyId"><lookup presentation="window" target-form-name="LookupPartyName"/></field> <field name="custRequestCategoryId"><hidden/></field> <field name="priority"><hidden/></field> <field name="description"><hidden/></field> @@ -302,7 +302,7 @@ under the License. <entity-options description="${description}" entity-name="QuoteType" key-field-name="quoteTypeId"/> </drop-down> </field> - <field name="partyId"><lookup target-form-name="LookupPartyName"/></field> + <field name="partyId"><lookup presentation="window" target-form-name="LookupPartyName"/></field> <field name="issueDate" title="${uiLabelMap.OrderOrderQuoteIssueDate}"></field> <field name="statusId" title="${uiLabelMap.CommonStatus}"> <drop-down allow-empty="false"> @@ -365,8 +365,8 @@ under the License. <field name="quoteId"><hidden/></field> <field name="isPromo"><hidden/></field> <field name="quoteItemSeqId" title="${uiLabelMap.OrderOrderQuoteItemSeqId}"><display/></field> - <field name="productId"><lookup target-form-name="LookupProduct"/></field> - <field name="productFeatureId"><lookup target-form-name="LookupProductFeature"/></field> + <field name="productId"><lookup presentation="window" target-form-name="LookupProduct"/></field> + <field name="productFeatureId"><lookup presentation="window" target-form-name="LookupProductFeature"/></field> <field name="deliverableTypeId" title="${uiLabelMap.OrderOrderQuoteDeliverableTypeId}"> <drop-down allow-empty="true"> <entity-options description="${description}" entity-name="DeliverableType" key-field-name="deliverableTypeId"/> @@ -466,7 +466,7 @@ under the License. </drop-down> </field> <field name="productId"> - <lookup target-form-name="LookupProduct"/> + <lookup presentation="window" target-form-name="LookupProduct"/> </field> <field name="description" title="${uiLabelMap.CommonDescription}"><text-find/></field> <field name="requirementStartDate" title="${uiLabelMap.OrderRequirementStartDate}"><date-find type="date"/></field> Modified: ofbiz/trunk/applications/party/widget/partymgr/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/LookupForms.xml?rev=937852&r1=937851&r2=937852&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/LookupForms.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/LookupForms.xml Sun Apr 25 18:49:01 2010 @@ -317,8 +317,8 @@ under the License. <form name="LookupCommEvent" type="single" target="LookupCommEvent" header-row-style="header-row" default-table-style="basic-table"> <field name="communicationEventId" title="${uiLabelMap.MarketingContactListCommEventId}"><text-find/></field> - <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}"><lookup target-form-name="LookupPartyName"/></field> - <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}"><lookup target-form-name="LookupPartyName"/></field> + <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}"><lookup presentation="window" target-form-name="LookupPartyName"/></field> + <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}"><lookup presentation="window" target-form-name="LookupPartyName"/></field> <field name="statusId" title="${uiLabelMap.CommonStatus}"> <drop-down allow-empty="true"> <entity-options description="${description}" entity-name="StatusItem"> @@ -347,7 +347,7 @@ under the License. </entity-options> </drop-down> </field> - <field name="custRequestId" title="${uiLabelMap.PartyServicemgntCustRequestId}"><lookup size="20" target-form-name="LookupCustRequest"/></field> + <field name="custRequestId" title="${uiLabelMap.PartyServicemgntCustRequestId}"><lookup presentation="window" size="20" target-form-name="LookupCustRequest"/></field> <field name="datetimeStarted" title="${uiLabelMap.CommonStartDate}"><date-find/></field> <field name="datetimeEnded" title="${uiLabelMap.CommonFinishDate}"><date-find/></field> <field map-name="subjectMap" name="subject" title="${uiLabelMap.PartyCommEventSubject}"><text-find/></field> Modified: ofbiz/trunk/applications/workeffort/widget/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/LookupForms.xml?rev=937852&r1=937851&r2=937852&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/LookupForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/LookupForms.xml Sun Apr 25 18:49:01 2010 @@ -58,9 +58,9 @@ under the License. </entity-options> </drop-down> </field> - <field name="workEffortParentId"><lookup target-form-name="LookupWorkEffort"/></field> - <field name="facilityId"><lookup target-form-name="LookupFacility"/></field> - <field name="fixedAssetId"><lookup target-form-name="LookupFixedAsset"/></field> + <field name="workEffortParentId"><lookup presentation="window" target-form-name="LookupWorkEffort"/></field> + <field name="facilityId"><lookup presentation="window" target-form-name="LookupFacility"/></field> + <field name="fixedAssetId"><lookup presentation="window" target-form-name="LookupFixedAsset"/></field> <field name="scopeEnumId"> <drop-down allow-empty="true"> <entity-options entity-name="Enumeration" key-field-name="enumId" description="${description}"> @@ -126,9 +126,9 @@ under the License. </entity-options> </drop-down> </field> - <field name="workEffortParentId"><lookup target-form-name="LookupWorkEffort"/></field> - <field name="facilityId"><lookup target-form-name="LookupFacility"/></field> - <field name="fixedAssetId"><lookup target-form-name="LookupFixedAsset"/></field> + <field name="workEffortParentId"><lookup presentation="window" target-form-name="LookupWorkEffort"/></field> + <field name="facilityId"><lookup presentation="window" target-form-name="LookupFacility"/></field> + <field name="fixedAssetId"><lookup presentation="window" target-form-name="LookupFixedAsset"/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> @@ -157,8 +157,8 @@ under the License. header-row-style="header-row" default-table-style="basic-table"> <auto-fields-entity entity-name="Timesheet" default-field-type="find"/> <field name="timesheetId" title="${uiLabelMap.WorkEffortTimesheetTimesheetId}"><text-find/></field> - <field name="partyId"><lookup target-form-name="LookupPartyName"/></field> - <field name="clientPartyId"><lookup target-form-name="LookupPartyName"/></field> + <field name="partyId"><lookup presentation="window" target-form-name="LookupPartyName"/></field> + <field name="clientPartyId"><lookup presentation="window" target-form-name="LookupPartyName"/></field> <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="buttontext"><submit button-type="text-link"/></field> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml?rev=937852&r1=937851&r2=937852&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortForms.xml Sun Apr 25 18:49:01 2010 @@ -136,11 +136,11 @@ under the License. </drop-down> </field> - <field name="estimatedMilliSeconds" position="1"><lookup target-form-name="LookupTimeDuration"/></field> - <field name="estimatedSetupMillis" position="2"><lookup target-form-name="LookupTimeDuration"/></field> - <field name="actualMilliSeconds" position="1"><lookup target-form-name="LookupTimeDuration"/></field> - <field name="actualSetupMillis" position="2"><lookup target-form-name="LookupTimeDuration"/></field> - <field name="totalMilliSecondsAllowed" position="1"><lookup target-form-name="LookupTimeDuration"/></field> + <field name="estimatedMilliSeconds" position="1"><lookup target-form-name="LookupTimeDuration" presentation="window"/></field> + <field name="estimatedSetupMillis" position="2"><lookup target-form-name="LookupTimeDuration" presentation="window"/></field> + <field name="actualMilliSeconds" position="1"><lookup target-form-name="LookupTimeDuration" presentation="window"/></field> + <field name="actualSetupMillis" position="2"><lookup target-form-name="LookupTimeDuration" presentation="window"/></field> + <field name="totalMilliSecondsAllowed" position="1"><lookup target-form-name="LookupTimeDuration" presentation="window"/></field> <field name="totalMoneyAllowed" position="2"/> <field name="quantityToProduce" position="1"/> @@ -1325,7 +1325,7 @@ under the License. <field name="reminderDateTime"><date-time/></field> <field name="repeatCount"><text/></field> <field name="repeatInterval"><text/></field> - <field name="reminderOffset"><lookup target-form-name="LookupTimeDuration"/></field> + <field name="reminderOffset"><lookup target-form-name="LookupTimeDuration" presentation="window"/></field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deleteWorkEffortEventReminder"> @@ -1346,7 +1346,7 @@ under the License. <field name="reminderDateTime"><date-time/></field> <field name="repeatCount"><text/></field> <field name="repeatInterval"><text/></field> - <field name="reminderOffset"><lookup target-form-name="LookupTimeDuration"/></field> + <field name="reminderOffset"><lookup target-form-name="LookupTimeDuration" presentation="window"/></field> <field name="submitButton" title="${uiLabelMap.CommonAdd}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> Modified: ofbiz/trunk/framework/common/webcommon/includes/htmlTemplate.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/htmlTemplate.ftl?rev=937852&r1=937851&r2=937852&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/includes/htmlTemplate.ftl (original) +++ ofbiz/trunk/framework/common/webcommon/includes/htmlTemplate.ftl Sun Apr 25 18:49:01 2010 @@ -19,7 +19,7 @@ under the License. <#include "component://widget/templates/htmlFormMacroLibrary.ftl"/> -<#macro lookupField className="" alert="" name="" value="" size="20" maxlength="20" id="" event="" action="" disabled="" autocomplete="" descriptionFieldName="" formName="" fieldFormName="" targetParameterIter="" imgSrc="" ajaxUrl="" ajaxEnabled="" presentation="" width="20" height="20" position="" fadeBackground="" clearText="" showDescription=""> +<#macro lookupField className="" alert="" name="" value="" size="20" maxlength="20" id="" event="" action="" disabled="" autocomplete="" descriptionFieldName="" formName="" fieldFormName="" targetParameterIter="" imgSrc="" ajaxUrl="" ajaxEnabled="" presentation="" width="20" height="20" position="topleft" fadeBackground="" clearText="" showDescription=""> <#if (!ajaxEnabled?has_content)> <#assign javascriptEnabled = Static["org.ofbiz.base.util.UtilHttp"].isJavaScriptEnabled(request) /> <#if (javascriptEnabled)> Modified: ofbiz/trunk/framework/widget/dtd/widget-form.xsd URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/dtd/widget-form.xsd?rev=937852&r1=937851&r2=937852&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/dtd/widget-form.xsd (original) +++ ofbiz/trunk/framework/widget/dtd/widget-form.xsd Sun Apr 25 18:49:01 2010 @@ -917,8 +917,8 @@ under the License. </xs:restriction> </xs:simpleType> </xs:attribute> - <xs:attribute name="presentation" default="window"> - <xs:annotation><xs:documentation>Shows the lookup as moveable and resizable layer or window. For layer lookups use the 'LookupLayerPopupDecorator'</xs:documentation></xs:annotation> + <xs:attribute name="presentation" default="layer"> + <xs:annotation><xs:documentation>Shows the lookup as moveable and resizable layer or window. Default to layer which uses the 'LookupLayerPopupDecorator'</xs:documentation></xs:annotation> <xs:simpleType> <xs:restriction base="xs:string"> <xs:enumeration value="layer"/> @@ -932,8 +932,8 @@ under the License. <xs:attribute type="xs:string" name="width"> <xs:annotation><xs:documentation>Only layer width. I.e. 250px, 12%</xs:documentation></xs:annotation> </xs:attribute> - <xs:attribute name="position" default="normal"> - <xs:annotation><xs:documentation>Only layer position. Normal sets the layer under the target field.</xs:documentation></xs:annotation> + <xs:attribute name="position" default="topleft"> + <xs:annotation><xs:documentation>Only for layer position. Default to topleft, normal sets the layer just under the target field, like for the calendar.</xs:documentation></xs:annotation> <xs:simpleType> <xs:restriction base="xs:string"> <xs:enumeration value="normal"/> @@ -947,7 +947,7 @@ under the License. </xs:simpleType> </xs:attribute> <xs:attribute name="fade-background" default="true"> - <xs:annotation><xs:documentation>True = The window Background will be faded.</xs:documentation></xs:annotation> + <xs:annotation><xs:documentation>If true the window background will be faded, default to true.</xs:documentation></xs:annotation> <xs:simpleType> <xs:restriction base="xs:string"> <xs:enumeration value="true"/> Modified: ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=937852&r1=937851&r2=937852&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl (original) +++ ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl Sun Apr 25 18:49:01 2010 @@ -428,14 +428,14 @@ ${item.description}</span> <#macro renderLookupField className alert name value size maxlength id event action disabled autocomplete descriptionFieldName formName fieldFormName targetParameterIter imgSrc ajaxUrl ajaxEnabled presentation width height position fadeBackground clearText showDescription> <span class="field-lookup"> <#if size?has_content && size=="0"><input type="hidden" <#if name?has_content> name="${name}"/></#if><#else><input type="text" <@renderClass className alert /><#if name?has_content> name="${name}"</#if><#if value?has_content> value="${value}"</#if><#if size?has_content> size="${size}"</#if><#if maxlength?has_content> maxlength="${maxlength}"</#if><#if id?has_content> id="${id}"</#if><#rt/><#if disabled?has_content && disabled> disabled="disabled"</#if><#rt/><#if event?has_content && action?has_content> ${event}="${action}"</#if><#rt/><#if autocomplete?has_content> autocomplete="off"</#if>/><#rt/></#if> -<#if presentation?has_content && descriptionFieldName?has_content && presentation == "layer"> - <a href="javascript:call_fieldlookupLayer3(document.${formName?html}.${name?html}, document.${formName?html}.${descriptionFieldName},'${fieldFormName}','${width}','${height}','${position}', '${fadeBackground}'<#rt/> -<#elseif presentation?has_content && presentation == "layer"> - <a href="javascript:call_fieldlookupLayer(document.${formName?html}.${name?html},'${fieldFormName}','${width}','${height}','${position}', '${fadeBackground}'<#rt/> -<#elseif descriptionFieldName?has_content> +<#if presentation?has_content && descriptionFieldName?has_content && presentation == "window"> <a href="javascript:call_fieldlookup3(document.${formName?html}.${name?html}, document.${formName?html}.${descriptionFieldName},'${fieldFormName}'<#rt/> -<#else> +<#elseif presentation?has_content && presentation == "window"> <a href="javascript:call_fieldlookup2(document.${formName}.${name},'${fieldFormName}'<#rt/> +<#elseif descriptionFieldName?has_content> + <a href="javascript:call_fieldlookupLayer3(document.${formName?html}.${name?html}, document.${formName?html}.${descriptionFieldName},'${fieldFormName}','${width}','${height}','${position}', '${fadeBackground}'<#rt/> +<#else> + <a href="javascript:call_fieldlookupLayer(document.${formName?html}.${name?html},'${fieldFormName}','${width}','${height}','${position}', '${fadeBackground}'<#rt/> </#if> <#if targetParameterIter?has_content> <#list targetParameterIter as item>
