svn commit: r940427 - in /ofbiz/branches/release10.04: ./ applications/order/script/org/
Locked
svn commit: r940427 - in /ofbiz/branches/release10.04: ./ applications/order/script/org/
 
|
Author: jleroux
Date: Mon May 3 12:11:51 2010 New Revision: 940427 URL: http://svn.apache.org/viewvc?rev=940427&view=rev Log: "Applied fix from trunk for revision: 940425" ------------------------------------------------------------------------ r940425 | jleroux | 2010-05-03 14:06:02 +0200 (lun. 03 mai 2010) | 3 lignes A patch from Sascha Rodekamp "Missing Buttons on LookUp Search" (https://issues.apache.org/jira/browse/OFBIZ-3745) - OFBIZ-3745 This fixes the calendar issue in bluelight and remove the (X) button that broke the calendar layout (strangely was only from layered 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/images/webapp/images/calendarDateSelect/calendar_date_select.js 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 Mon May 3 12:11:51 2010 @@ -1,3 +1,3 @@ /ofbiz/branches/addbirt:831210-885099,885686-886087 /ofbiz/branches/multitenant20100310:921280-927264 -/ofbiz/trunk:939988,939990,939999,940025,940234,940248,940309,940401,940410 +/ofbiz/trunk:939988,939990,939999,940025,940234,940248,940309,940401,940410,940425 Propchange: ofbiz/branches/release10.04/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 3 12:11:51 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,940234,940248,940309,940401,940410 +/ofbiz/trunk/applications/order/script/org/ofbiz/order/customer/CheckoutMapProcs.xml:939988,939990,939999,940025,940234,940248,940309,940401,940410,940425 Propchange: ofbiz/branches/release10.04/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 3 12:11:51 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,940234,940248,940309,940401,940410 +/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/actions/party/PartyFinancialHistory.groovy:939988,939990,939999,940025,940234,940248,940309,940401,940410,940425 Propchange: ofbiz/branches/release10.04/applications/product/script/org/ofbiz/product/test/InventoryTests.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 3 12:11:51 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,940234,940248,940309,940401,940410 +/ofbiz/trunk/applications/product/script/org/ofbiz/product/test/InventoryTests.xml:939988,939990,939999,940025,940234,940248,940309,940401,940410,940425 Propchange: ofbiz/branches/release10.04/framework/common/widget/HelpScreens.xml ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 3 12:11:51 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,940234,940248,940309,940401,940410 +/ofbiz/trunk/framework/common/widget/HelpScreens.xml:939988,939990,939999,940025,940234,940248,940309,940401,940410,940425 Modified: ofbiz/branches/release10.04/framework/images/webapp/images/calendarDateSelect/calendar_date_select.js URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/framework/images/webapp/images/calendarDateSelect/calendar_date_select.js?rev=940427&r1=940426&r2=940427&view=diff ============================================================================== --- ofbiz/branches/release10.04/framework/images/webapp/images/calendarDateSelect/calendar_date_select.js (original) +++ ofbiz/branches/release10.04/framework/images/webapp/images/calendarDateSelect/calendar_date_select.js Mon May 3 12:11:51 2010 @@ -166,7 +166,9 @@ CalendarDateSelect.prototype = { }, initHeaderDiv: function() { var header_div = this.header_div; - this.close_button = header_div.build("a", { innerHTML: "x", href:"#", onclick:function () { this.close(); return false; }.bindAsEventListener(this), className: "close" }); + // mod for ofbiz + //this.close_button = header_div.build("a", { innerHTML: "x", href:"#", onclick:function () { this.close(); return false; }.bindAsEventListener(this), className: "close" }); + // end mod this.next_month_button = header_div.build("a", { innerHTML: ">", href:"#", onclick:function () { this.navMonth(this.date.getMonth() + 1 ); return false; }.bindAsEventListener(this), className: "next" }); this.prev_month_button = header_div.build("a", { innerHTML: "<", href:"#", onclick:function () { this.navMonth(this.date.getMonth() - 1 ); return false; }.bindAsEventListener(this), className: "prev" }); Propchange: ofbiz/branches/release10.04/specialpurpose/ebaystore/lib/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 3 12:11:51 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,940234,940248,940309,940401,940410 +/ofbiz/trunk/specialpurpose/ebaystore/lib:939988,939990,939999,940025,940234,940248,940309,940401,940410,940425 Propchange: ofbiz/branches/release10.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 3 12:11:51 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,940234,940248,940309,940401,940410 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:939988,939990,939999,940025,940234,940248,940309,940401,940410,940425 Propchange: ofbiz/branches/release10.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 3 12:11:51 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,940234,940248,940309,940401,940410 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:939988,939990,939999,940025,940234,940248,940309,940401,940410,940425 Propchange: ofbiz/branches/release10.04/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon May 3 12:11:51 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,940234,940248,940309,940401,940410 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:939988,939990,939999,940025,940234,940248,940309,940401,940410,940425 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=940427&r1=940426&r2=940427&view=diff ============================================================================== --- ofbiz/branches/release10.04/themes/bluelight/webapp/bluelight/style.css (original) +++ ofbiz/branches/release10.04/themes/bluelight/webapp/bluelight/style.css Mon May 3 12:11:51 2010 @@ -2242,15 +2242,15 @@ Lookups } #fieldLookupContent td span a { - background: url(/bluelight/images/application_view_list.png) no-repeat; display: inline-block; } + #fieldLookupContent td span div a { background: none; + padding: 0px; } #fieldLookupContent td a { - background: none; cursor: pointer; padding: 0.4em 0.6em; display: inline; 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=940427&r1=940426&r2=940427&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 Mon May 3 12:11:51 2010 @@ -2223,6 +2223,10 @@ Lookups display: inline-block; } + #fieldLookupContent td span div a { + padding: 0px; + } + #fieldLookupContent td a { background: none; cursor: pointer; |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |