Author: jleroux Date: Thu Nov 12 12:06:18 2009 New Revision: 835358 URL: http://svn.apache.org/viewvc?rev=835358&view=rev Log: "Applied fix from trunk for revision: 835357" ------------------------------------------------------------------------ r835357 | jleroux | 2009-11-12 13:01:09 +0100 (jeu. 12 nov. 2009) | 9 lignes
A patch from Deepak Dixit "popup.js is missing on product page for order entry." (https://issues.apache.org/jira/browse/OFBIZ-3188) - OFBIZ-3188 Steps to check: 1) Start placing a sales order from order manager application. 2) Then add WG-9943 in to the cart.User will land on page where he need to select feature of the product as "WG-9943". 3) In this page in cross sell and up sell section product images are displayed twice. With the patch Popup is display correctly in blue light and flat grey theme but in bizznesstime theme popup is still not displayed properly. (I have opened https://issues.apache.org/jira/browse/OFBIZ-3189 for this) ------------------------------------------------------------------------ Modified: ofbiz/branches/release09.04/ (props changed) ofbiz/branches/release09.04/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml ofbiz/branches/release09.04/themes/bluelight/webapp/bluelight/style.css ofbiz/branches/release09.04/themes/flatgrey/webapp/flatgrey/maincss.css Propchange: ofbiz/branches/release09.04/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu Nov 12 12:06:18 2009 @@ -1 +1 @@ -/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770308,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810 814,810832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337,821263,821270,822659,823877-823878,823883,823888,823892,824511,825181-825182,826253,827730,828971,829085,829376,829412,829416,829527,830091,830112,830366,830528,830677,830874,830880,831238,831801,832361,832698,832776,832908,833324,833686,833703,834825,835161 +/ofbiz/trunk:765933,766011,766015,766293,766307,766316,766325,766462,766522,766800,767060,767072,767093,767098-767099,767102,767123,767125,767127,767279,767287,767671,767688,767694,767822,767845,768358,768490,768550,768675,768686,768705,768811,768815,768960,769030,769500,770272,770308,770997,771073,772401,772464-772465,773076,773557,773628,773659,773697,774014,774632,774661,774995,775292,775667,776227,776594,776620,776922,777004,777020,777768,777792,777893,777947,778078,778094,778107,778273,778278,778280,778364,778374,778402,778576,778594,778628,779020,779477,779496,779639,779834,779856,779866,779873,780111,780138,780180,780199,780203,780906,780945,781201,781534,781549,781669,781680,781694,782663,783257,783266,783833,783913,783917,785123,785764,785967,786778,787126,787435-787436,787442,787520,788965,788983,788987,789329,789337,789506,789548,796769,799185,800461,800846,801023,802346,804364,805307,806127,806377,808786-808787,808792,809141,810370,810438,810465,810807,810809,810 814,810832,810836,810878,810917,811020,811280,811297,811419,811528,811708,811714,811716,811793,811838,811860,811865,811870,812159,812182,812192,812456,812540,813126,813131,813283,813672,813702,814168,814205,814251,814349,814531,814576,814681,814731,815158,815165,815350,815687,815977,816255,816863,818030,818049,818150,818494,818500,818716,818976,819275-819276,819282,819337,821263,821270,822659,823877-823878,823883,823888,823892,824511,825181-825182,826253,827730,828971,829085,829376,829412,829416,829527,830091,830112,830366,830528,830677,830874,830880,831238,831801,832361,832698,832776,832908,833324,833686,833703,834825,835161,835357 Modified: ofbiz/branches/release09.04/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml?rev=835358&r1=835357&r2=835358&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml (original) +++ ofbiz/branches/release09.04/applications/order/widget/ordermgr/OrderEntryCatalogScreens.xml Thu Nov 12 12:06:18 2009 @@ -132,6 +132,8 @@ <set field="rightbarScreenName" value="rightbar"/> <set field="MainColumnStyle" value="center"/>--> <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/prototype.js" global="true"/> + <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/popup.js" global="true"/> + <set field="layoutSettings.styleSheets[]" value="/images/prototypejs/popup.css" global="true"/> <set field="title-property" value="PageTitleProductPage"/> <set field="configproductdetailScreen" value="component://order/widget/ordermgr/OrderEntryCatalogScreens.xml#configproductdetail"/> <script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Product.groovy"/> Modified: ofbiz/branches/release09.04/themes/bluelight/webapp/bluelight/style.css URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/themes/bluelight/webapp/bluelight/style.css?rev=835358&r1=835357&r2=835358&view=diff ============================================================================== --- ofbiz/branches/release09.04/themes/bluelight/webapp/bluelight/style.css (original) +++ ofbiz/branches/release09.04/themes/bluelight/webapp/bluelight/style.css Thu Nov 12 12:06:18 2009 @@ -530,7 +530,7 @@ border-bottom: #999 solid 0.1em; /* using min-height as an alternative to clear: both; because that, in some browsers, will clear the top-level columns and not just in this div (Mozilla based, namely) */ min-height: 6em; - overflow: auto; + overflow: visible; padding: 0.5em; position: relative; } Modified: ofbiz/branches/release09.04/themes/flatgrey/webapp/flatgrey/maincss.css URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/themes/flatgrey/webapp/flatgrey/maincss.css?rev=835358&r1=835357&r2=835358&view=diff ============================================================================== --- ofbiz/branches/release09.04/themes/flatgrey/webapp/flatgrey/maincss.css (original) +++ ofbiz/branches/release09.04/themes/flatgrey/webapp/flatgrey/maincss.css Thu Nov 12 12:06:18 2009 @@ -521,7 +521,7 @@ border-bottom: #999 solid 0.1em; /* using min-height as an alternative to clear: both; because that, in some browsers, will clear the top-level columns and not just in this div (Mozilla based, namely) */ min-height: 6em; -overflow: auto; +overflow: visible; padding: 0.5em; position: relative; }
