svn commit: r811539 - in /ofbiz/branches/release09.04: ./ applications/order/webapp/orde
Locked
svn commit: r811539 - in /ofbiz/branches/release09.04: ./ applications/order/webapp/orde
 
|
Author: jleroux
Date: Fri Sep 4 20:20:54 2009 New Revision: 811539 URL: http://svn.apache.org/viewvc?rev=811539&view=rev Log: "Applied fix from trunk for revision: 811528" (resolved some conflicts by hand) ------------------------------------------------------------------------ r811528 | jleroux | 2009-09-04 22:01:08 +0200 (ven., 04 sept. 2009) | 2 lines Fix "popup window for image opens then closes immediately" (https://issues.apache.org/jira/browse/OFBIZ-2805) - OFBIZ-2805 Introduce a label in CommonUiLabels.xml ------------------------------------------------------------------------ Modified: ofbiz/branches/release09.04/ (props changed) ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl ofbiz/branches/release09.04/framework/common/config/CommonUiLabels.xml ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl Propchange: ofbiz/branches/release09.04/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Sep 4 20:20:54 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,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,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,810814,810832,810 836,810878,810917,811020,811280,811297,811419 +/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,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,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,810814,810832,810 836,810878,810917,811020,811280,811297,811419,811528 Modified: ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl?rev=811539&r1=811538&r2=811539&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl (original) +++ ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl Fri Sep 4 20:20:54 2009 @@ -58,7 +58,7 @@ function popupDetail() { var defaultDetailImage = "${firstDetailImage?default(mainDetailImageUrl?default("_NONE_"))}"; - if (defaultDetailImage == null || defaultDetailImage == "null") { + if (defaultDetailImage == null || defaultDetailImage == "null" || defaultDetailImage == "") { defaultDetailImage = "_NONE_"; } @@ -67,7 +67,10 @@ } if (detailImageUrl == "_NONE_") { - alert("No detail image available to display."); + hack = document.createElement('span'); + hack.innerHTML="${uiLabelMap.CommonNoDetailImageAvailableToDisplay}"; + alert(hack.innerHTML); + return; return; } popUp("<@ofbizUrl>detailImage?detail=" + detailImageUrl + "</@ofbizUrl>", 'detailImage', '400', '550'); Modified: ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl?rev=811539&r1=811538&r2=811539&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl (original) +++ ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl Fri Sep 4 20:20:54 2009 @@ -26,7 +26,7 @@ function popupDetailInline(inlineCounter) { var imageField = 'detailImage' + inlineCounter; var defaultDetailImage = document.getElementById(imageField); - if (defaultDetailImage == null || defaultDetailImage == "null") { + if (defaultDetailImage == null || defaultDetailImage == "null" || defaultDetailImage == "") { defaultDetailImage = "_NONE_"; } var fieldName = 'detailImageUrl' + inlineCounter; @@ -35,7 +35,10 @@ } if (window[fieldName] == "_NONE_") { - alert("No detail image available to display."); + hack = document.createElement('span'); + hack.innerHTML="${uiLabelMap.CommonNoDetailImageAvailableToDisplay}"; + alert(hack.innerHTML); + return; return; } popUp("<@ofbizUrl>detailImage?detail=" + window[fieldName] + "</@ofbizUrl>", 'detailImage', '400', '550'); Modified: ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl?rev=811539&r1=811538&r2=811539&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl (original) +++ ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl Fri Sep 4 20:20:54 2009 @@ -96,7 +96,7 @@ function popupDetail() { var defaultDetailImage = "${firstDetailImage?default(mainDetailImageUrl?default("_NONE_"))}"; - if (defaultDetailImage == null || defaultDetailImage == "null") { + if (defaultDetailImage == null || defaultDetailImage == "null" || defaultDetailImage == "") { defaultDetailImage = "_NONE_"; } @@ -105,7 +105,10 @@ } if (detailImageUrl == "_NONE_") { - alert("No detail image available to display."); + hack = document.createElement('span'); + hack.innerHTML="${uiLabelMap.CommonNoDetailImageAvailableToDisplay}"; + alert(hack.innerHTML); + return; return; } popUp("<@ofbizUrl>detailImage?detail=" + detailImageUrl + "</@ofbizUrl>", 'detailImage', '400', '550'); Modified: ofbiz/branches/release09.04/framework/common/config/CommonUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/framework/common/config/CommonUiLabels.xml?rev=811539&r1=811538&r2=811539&view=diff ============================================================================== --- ofbiz/branches/release09.04/framework/common/config/CommonUiLabels.xml (original) +++ ofbiz/branches/release09.04/framework/common/config/CommonUiLabels.xml Fri Sep 4 20:20:54 2009 @@ -4099,6 +4099,10 @@ <value xml:lang="th">Custom method name for UoM conversion not found</value> <value xml:lang="zh">没ææ¾å°ç¨äºè´§å¸è½¬æ¢çå®å¶æ¹æ³å称</value> </property> + <property key="CommonNoDetailImageAvailableToDisplay"> + <value xml:lang="en">No detail image available to display.</value> + <value xml:lang="fr">Aucune image détaillée à afficher.</value> + </property> <property key="CommonNoElementFound"> <value xml:lang="ar">Ùا عÙصر Ù ÙجÙد</value> <value xml:lang="de">Kein Element gefunden</value> Modified: ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl?rev=811539&r1=811538&r2=811539&view=diff ============================================================================== --- ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl (original) +++ ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl Fri Sep 4 20:20:54 2009 @@ -58,7 +58,7 @@ function popupDetail() { var defaultDetailImage = "${firstDetailImage?default(mainDetailImageUrl?default("_NONE_"))}"; - if (defaultDetailImage == null || defaultDetailImage == "null") { + if (defaultDetailImage == null || defaultDetailImage == "null" || defaultDetailImage == "") { defaultDetailImage = "_NONE_"; } @@ -67,9 +67,13 @@ } if (detailImageUrl == "_NONE_") { - alert("No detail image available to display."); + hack = document.createElement('span'); + hack.innerHTML="${uiLabelMap.CommonNoDetailImageAvailableToDisplay}"; + alert(hack.innerHTML); + return; return; } + alert(detailImageUrl); popUp("<@ofbizUrl>detailImage?detail=" + detailImageUrl + "</@ofbizUrl>", 'detailImage', '400', '550'); } @@ -429,6 +433,7 @@ <tr><td colspan="2"><hr class='sepbar'></td></tr> + <#-- Long description of product --> <tr> <td colspan="2"> @@ -607,6 +612,7 @@ </tr> <tr><td colspan="2"><hr class='sepbar'></td></tr> + <#-- Product Reviews --> <tr> <td colspan="2"> @@ -727,6 +733,7 @@ <h2>Similar Products That Might Interest You...</h2> <hr/> + <#list commonFeatureResultIds as commonFeatureResultId> <div> ${setRequestAttribute("optProductId", commonFeatureResultId)} Modified: ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl?rev=811539&r1=811538&r2=811539&view=diff ============================================================================== --- ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl (original) +++ ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/catalog/productdetail.ftl Fri Sep 4 20:20:54 2009 @@ -96,7 +96,7 @@ function popupDetail() { var defaultDetailImage = "${firstDetailImage?default(mainDetailImageUrl?default("_NONE_"))}"; - if (defaultDetailImage == null || defaultDetailImage == "null") { + if (defaultDetailImage == null || defaultDetailImage == "null" || defaultDetailImage == "") { defaultDetailImage = "_NONE_"; } @@ -105,7 +105,9 @@ } if (detailImageUrl == "_NONE_") { - alert("No detail image available to display."); + hack = document.createElement('span'); + hack.innerHTML="${uiLabelMap.CommonNoDetailImageAvailableToDisplay}"; + alert(hack.innerHTML); return; } popUp("<@ofbizUrl>detailImage?detail=" + detailImageUrl + "</@ofbizUrl>", 'detailImage', '400', '550'); |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |