Author: jleroux Date: Sun May 2 14:20:46 2010 New Revision: 940235 URL: http://svn.apache.org/viewvc?rev=940235&view=rev Log: "Applied fix from trunk for revision: 940234" ------------------------------------------------------------------------ r940234 | jleroux | 2010-05-02 16:15:34 +0200 (dim. 02 mai 2010) | 5 lignes
A modified patch from Sascha Rodekamp "Missing Buttons on LookUp Search" (https://issues.apache.org/jira/browse/OFBIZ-3745) - OFBIZ-3745 For the pagination issue in bluelight and droppingcrumbs, the calendar issue in bluelight still exists I have also added 2 lookup and calendar test fields in the 2d lookups. ------------------------------------------------------------------------ Modified: ofbiz/branches/release10.04/ (props changed) ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml (props changed) ofbiz/branches/release10.04/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy (props changed) ofbiz/branches/release10.04/applications/product/script/org/ofbiz/product/test/InventoryTests.xml (props changed) ofbiz/branches/release10.04/framework/common/widget/HelpScreens.xml (props changed) ofbiz/branches/release10.04/framework/example/config/ExampleUiLabels.xml ofbiz/branches/release10.04/framework/example/webapp/example/WEB-INF/controller.xml ofbiz/branches/release10.04/framework/example/widget/example/FormWidgetExampleForms.xml ofbiz/branches/release10.04/framework/example/widget/example/FormWidgetExampleLookupForms.xml ofbiz/branches/release10.04/framework/example/widget/example/FormWidgetExampleLookupScreens.xml ofbiz/branches/release10.04/specialpurpose/ebaystore/lib/ (props changed) ofbiz/branches/release10.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy (props changed) ofbiz/branches/release10.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy (props changed) ofbiz/branches/release10.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy (props changed) ofbiz/branches/release10.04/themes/bluelight/webapp/bluelight/style.css ofbiz/branches/release10.04/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css Propchange: ofbiz/branches/release10.04/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun May 2 14:20:46 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:939988,939990,939999,940025 +/ofbiz/trunk:939988,939990,939999,940025,940234 Propchange: ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun May 2 14:20:46 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CheckoutMapProcs.xml:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:921280-927264 -/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:939988,939990,939999,940025 +/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:939988,939990,939999,940025,940234 Propchange: ofbiz/branches/release10.04/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun May 2 14:20:46 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:418499-490456 /ofbiz/branches/multitenant20100310/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:921280-927264 -/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:939988,939990,939999,940025 +/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:939988,939990,939999,940025,940234 Propchange: ofbiz/branches/release10.04/applications/product/script/org/ofbiz/product/test/InventoryTests.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun May 2 14:20:46 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/applications/product/script/org/ofbiz/shipment/test/FacilityTests.xml:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:921280-927264 -/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:939988,939990,939999,940025 +/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:939988,939990,939999,940025,940234 Propchange: ofbiz/branches/release10.04/framework/common/widget/HelpScreens.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun May 2 14:20:46 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/applications/commonext/widget/HelpScreens.xml:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/framework/common/widget/HelpScreens.xml:921280-927264 -/ofbiz/trunk/framework/common/widget/HelpScreens.xml:939988,939990,939999,940025 +/ofbiz/trunk/framework/common/widget/HelpScreens.xml:939988,939990,939999,940025,940234 Modified: ofbiz/branches/release10.04/framework/example/config/ExampleUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/example/config/ExampleUiLabels.xml?rev=940235&r1=940234&r2=940235&view=diff ============================================================================== --- ofbiz/branches/release10.04/framework/example/config/ExampleUiLabels.xml (original) +++ ofbiz/branches/release10.04/framework/example/config/ExampleUiLabels.xml Sun May 2 14:20:46 2010 @@ -58,7 +58,11 @@ <value xml:lang="ru">OFBiz: ÐÑимеÑ</value> <value xml:lang="th">OFBiz: à¸à¸±à¸§à¸à¸¢à¹à¸²à¸</value> <value xml:lang="zh">OFBiz: æ ·ä¾</value> - </property> + </property> + <property key="ExampleCalendarFromLayer"> + <value xml:lang="en">Calendar field (only test purp.)</value> + <value xml:lang="fr">Calendrier (only test)</value> + </property> <property key="ExampleCompanySubtitle"> <!--value xml:lang="ar">جزء ٠٠عائÙØ© Ø£ÙÙبÙز ÙÙبر٠جÙات اÙØرة</value--> <value xml:lang="ar">جزء ٠٠عائÙØ© Ø£ÙÙبÙز ÙÙتطبÙÙات اÙØرة ÙÙتسÙÙر</value> @@ -438,6 +442,10 @@ <value xml:lang="it">Descrizione lunga</value> <value xml:lang="zh">详ç»æè¿°</value> </property> + <property key="ExampleLayerFromLayer"> + <value xml:lang="en">Layered lookup field (only test purp.)</value> + <value xml:lang="fr">Lookup de type layer (only test)</value> + </property> <property key="ExampleLookupFields"> <value xml:lang="en">Examples Lookup Fields (first of type popup, second layered)</value> <value xml:lang="fr">Exemples de champs de recherche (le premier de type popup, le second de type layer)</value> Modified: ofbiz/branches/release10.04/framework/example/webapp/example/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/example/webapp/example/WEB-INF/controller.xml?rev=940235&r1=940234&r2=940235&view=diff ============================================================================== --- ofbiz/branches/release10.04/framework/example/webapp/example/WEB-INF/controller.xml (original) +++ ofbiz/branches/release10.04/framework/example/webapp/example/WEB-INF/controller.xml Sun May 2 14:20:46 2010 @@ -193,8 +193,8 @@ under the License. <request-map uri="FormWidgetExamples"><security https="true" auth="true"/><response name="success" type="view" value="FormWidgetExamples"/></request-map> <request-map uri="LookupExampleFeature"><security https="true" auth="true"/><response name="success" type="view" value="LookupExampleFeature"/></request-map> - <request-map uri="LookupPartyExamplePopup"><security https="true" auth="true"/><response name="success" type="view" value="LookupPartyExamplePopup"/></request-map> - <request-map uri="LookupPartyExamplePopupByName"><security https="true" auth="true"/><response name="success" type="view" value="LookupPartyExamplePopupByName"/></request-map> + <request-map uri="LookupPartyExample"><security https="true" auth="true"/><response name="success" type="view" value="LookupPartyExample"/></request-map> + <request-map uri="LookupPartyExampleByName"><security https="true" auth="true"/><response name="success" type="view" value="LookupPartyExampleByName"/></request-map> <request-map uri="ListExampleFormOnly"><security https="true" auth="false"/><response name="success" type="view" value="ListExampleFormOnly"/></request-map> <request-map uri="CreateExampleFormOnly"><security https="true" auth="false"/><response name="success" type="view" value="CreateExampleFormOnly"/></request-map> @@ -257,8 +257,8 @@ under the License. <view-map name="FormWidgetExamples" type="screen" page="component://example/widget/example/FormWidgetExampleScreens.xml#FormWidgetExamples"/> <view-map name="LookupExampleFeature" type="screen" page="component://example/widget/example/ExampleFeatureScreens.xml#LookupExampleFeature"/> - <view-map name="LookupPartyExamplePopup" type="screen" page="component://example/widget/example/FormWidgetExampleLookupScreens.xml#LookupParty"/> - <view-map name="LookupPartyExamplePopupByName" type="screen" page="component://example/widget/example/FormWidgetExampleLookupScreens.xml#LookupPartyByName"/> + <view-map name="LookupPartyExample" type="screen" page="component://example/widget/example/FormWidgetExampleLookupScreens.xml#LookupParty"/> + <view-map name="LookupPartyExampleByName" type="screen" page="component://example/widget/example/FormWidgetExampleLookupScreens.xml#LookupPartyByName"/> <!-- ajax view mappings --> <view-map name="findExampleAjax" type="screen" page="component://example/widget/example/ExampleAjaxScreens.xml#AjaxExample"/> Modified: ofbiz/branches/release10.04/framework/example/widget/example/FormWidgetExampleForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/example/widget/example/FormWidgetExampleForms.xml?rev=940235&r1=940234&r2=940235&view=diff ============================================================================== --- ofbiz/branches/release10.04/framework/example/widget/example/FormWidgetExampleForms.xml (original) +++ ofbiz/branches/release10.04/framework/example/widget/example/FormWidgetExampleForms.xml Sun May 2 14:20:46 2010 @@ -285,12 +285,12 @@ under the License. <!-- Lookup (in a popup windows, old style) --> <!-- Using separated labels is not recommended (it's better using sentences than words for translation) but here we use only Common labels to avoid dependencies from application to framework --> <field name="partyIdFrom" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonFrom}"> - <lookup target-form-name="LookupPartyExamplePopup" presentation="window"/> + <lookup target-form-name="LookupPartyExample" presentation="window"/> </field> <!-- Standard Lookup in a layer (new style)--> <!-- passes the name in one and the id in another field, the layer is centered --> <field name="partyName" title="${uiLabelMap.CommonName}"> - <lookup target-form-name="LookupPartyExamplePopupByName" description-field-name="partyIdTo" presentation="layer"/> + <lookup target-form-name="LookupPartyExampleByName" description-field-name="partyIdTo" presentation="layer"/> </field> <!-- This field may be hidden and the name rendered in partyName using default-value if partyIdTo exists--> <field name="partyIdTo" title="${uiLabelMap.CommonPartyID} ${uiLabelMap.CommonTo}"><text/></field><!-- the text field is only used for rendering --> Modified: ofbiz/branches/release10.04/framework/example/widget/example/FormWidgetExampleLookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/example/widget/example/FormWidgetExampleLookupForms.xml?rev=940235&r1=940234&r2=940235&view=diff ============================================================================== --- ofbiz/branches/release10.04/framework/example/widget/example/FormWidgetExampleLookupForms.xml (original) +++ ofbiz/branches/release10.04/framework/example/widget/example/FormWidgetExampleLookupForms.xml Sun May 2 14:20:46 2010 @@ -21,7 +21,7 @@ under the License. <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd";> - <form name="lookupPartyName" target="LookupPartyExamplePopup" type="single" + <form name="lookupPartyName" target="LookupPartyExample" type="single" header-row-style="header-row" default-table-style="basic-table"> <!--<auto-fields-entity entity-name="PartyNameView" default-field-type="find"/>--> <field name="partyId" title="${uiLabelMap.PartyPartyId}"><text-find/></field> @@ -36,7 +36,7 @@ under the License. <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}"><submit button-type="button"/></field> </form> - <form name="listLookupPartyName" type="list" list-name="listIt" paginate-target="LookupPartyExamplePopup" + <form name="listLookupPartyName" type="list" list-name="listIt" paginate-target="LookupPartyExample" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <set field="inputFields" from-field="parameters"/> @@ -57,12 +57,12 @@ under the License. </form> <!-- Lookup By Name --> - <form name="lookupPartyNameByName" target="LookupPartyExamplePopupByName" type="single" + <form name="lookupPartyNameByName" target="LookupPartyExampleByName" type="single" header-row-style="header-row" default-table-style="basic-table"> - <!--<auto-fields-entity entity-name="PartyNameView" default-field-type="find"/>--> - <field name="secLayFrom" title="Layer Layer Field"> - <lookup target-form-name="LookupPartyExamplePopup" presentation="layer" position="center" fade-background="false"/> + <field name="LayerFromLayer" title="${uiLabelMap.ExampleLayerFromLayer}"> + <lookup presentation="layer" target-form-name="LookupPartyExample"/> </field> + <field name="CalendarFromLayer" title="${uiLabelMap.ExampleCalendarFromLayer}"><date-time/></field> <field name="partyId" title="${uiLabelMap.PartyPartyId}"><text-find/></field> <field name="partyTypeId" title="${uiLabelMap.PartyTypeId}"> <drop-down allow-empty="true"> @@ -75,7 +75,7 @@ under the License. <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}"><submit button-type="button"/></field> </form> - <form name="listLookupPartyNameByName" type="list" list-name="listIt" paginate-target="LookupPartyExamplePopupByName" + <form name="listLookupPartyNameByName" type="list" list-name="listIt" paginate-target="LookupPartyExampleByName" odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <set field="inputFields" from-field="parameters"/> Modified: ofbiz/branches/release10.04/framework/example/widget/example/FormWidgetExampleLookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/example/widget/example/FormWidgetExampleLookupScreens.xml?rev=940235&r1=940234&r2=940235&view=diff ============================================================================== --- ofbiz/branches/release10.04/framework/example/widget/example/FormWidgetExampleLookupScreens.xml (original) +++ ofbiz/branches/release10.04/framework/example/widget/example/FormWidgetExampleLookupScreens.xml Sun May 2 14:20:46 2010 @@ -71,6 +71,7 @@ under the License. </condition> <actions> <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/> + <property-map resource="ExampleUiLabels" map-name="uiLabelMap" global="true"/> <set field="title" value="${uiLabelMap.PartyLookupPartyByName}"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer" default-value="0"/> Propchange: ofbiz/branches/release10.04/specialpurpose/ebaystore/lib/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun May 2 14:20:46 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt/specialpurpose/ebay/lib:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310/specialpurpose/ebaystore/lib:921280-927264 -/ofbiz/trunk/specialpurpose/ebaystore/lib:939988,939990,939999,940025 +/ofbiz/trunk/specialpurpose/ebaystore/lib:939988,939990,939999,940025,940234 Propchange: ofbiz/branches/release10.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun May 2 14:20:46 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:418499-490456 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:939988,939990,939999,940025 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:939988,939990,939999,940025,940234 Propchange: ofbiz/branches/release10.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun May 2 14:20:46 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:418499-490456 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:939988,939990,939999,940025 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:939988,939990,939999,940025,940234 Propchange: ofbiz/branches/release10.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun May 2 14:20:46 2010 @@ -1,3 +1,3 @@ /incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:418499-490456 /ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-927264 -/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:939988,939990,939999,940025 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:939988,939990,939999,940025,940234 Modified: ofbiz/branches/release10.04/themes/bluelight/webapp/bluelight/style.css URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/themes/bluelight/webapp/bluelight/style.css?rev=940235&r1=940234&r2=940235&view=diff ============================================================================== --- ofbiz/branches/release10.04/themes/bluelight/webapp/bluelight/style.css (original) +++ ofbiz/branches/release10.04/themes/bluelight/webapp/bluelight/style.css Sun May 2 14:20:46 2010 @@ -2234,7 +2234,6 @@ Lookups #fieldLookupContent ul li a { display: inherit; cursor: pointer; - background: none; } #fieldLookupContent td { @@ -2246,6 +2245,9 @@ Lookups background: url(/bluelight/images/application_view_list.png) no-repeat; display: inline-block; } + #fieldLookupContent td span div a { + background: none; + } #fieldLookupContent td a { background: none; Modified: ofbiz/branches/release10.04/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css?rev=940235&r1=940234&r2=940235&view=diff ============================================================================== --- ofbiz/branches/release10.04/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css (original) +++ ofbiz/branches/release10.04/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css Sun May 2 14:20:46 2010 @@ -2211,7 +2211,6 @@ Lookups #fieldLookupContent ul li a { display: inherit; cursor: pointer; - background: none; } #fieldLookupContent td {
