svn commit: r686714 - in /ofbiz/trunk/applications: ecommerce/webapp/ecommerce/catalog/ ecommerce/widget/ order/webapp/ordermgr/entry/catalog/

[bibryam]

Author: bibryam
Date: Mon Aug 18 02:53:13 2008
New Revision: 686714

URL: http://svn.apache.org/viewvc?rev=686714&view=rev
Log:
Copied productDetail screen files to ecommerce, which should allow customized version of these screens for order manager and ecommerce applications.
This was agreed before some time here http://www.nabble.com/New-field-for-WebSite-entity--to14854979.html#a14854979

Added:
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl
      - copied, changed from r686688, ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl
    ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/productdetail.ftl
      - copied, changed from r686688, ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
Modified:
    ofbiz/trunk/applications/ecommerce/widget/CatalogScreens.xml
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl
    ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl

Copied: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl (from r686688, ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl?p2=ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl&p1=ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl&r1=686688&r2=686714&rev=686714&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl Mon Aug 18 02:53:13 2008
@@ -277,12 +277,10 @@
       </#if>
 
       <#-- show tell a friend details only in ecommerce application -->
-      <#if (isEcommerceScreen?exists && isEcommerceScreen?default("N") == "Y")>
-        <div>&nbsp;</div>
-        <div>
-          <a href="javascript:popUpSmall('<@ofbizUrl>tellafriend?productId=${product.productId}</@ofbizUrl>','tellafriend');" class="buttontext">${uiLabelMap.CommonTellAFriend}</a>
-        </div>
-      </#if>
+      <div>&nbsp;</div>
+      <div>
+        <a href="javascript:popUpSmall('<@ofbizUrl>tellafriend?productId=${product.productId}</@ofbizUrl>','tellafriend');" class="buttontext">${uiLabelMap.CommonTellAFriend}</a>
+      </div>
     
       <#if disFeatureList?exists && 0 < disFeatureList.size()>
         <p>&nbsp;</p>
@@ -609,7 +607,6 @@
   <tr><td colspan="2"><hr class='sepbar'></td></tr>
 
   <#-- Product Reviews -->
-  <#if (isEcommerceScreen?exists && isEcommerceScreen?default("N") == "Y")>
   <tr>
     <td colspan="2">
       <div>${uiLabelMap.OrderCustomerReviews}:</div>
@@ -668,7 +665,6 @@
         <a href="<@ofbizUrl>reviewProduct?category_id=${categoryId?if_exists}&product_id=${product.productId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductBeTheFirstToReviewThisProduct}</a>
       </td>
     </tr>
-  </#if>
 </table>
 </#if>
 

Copied: ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/productdetail.ftl (from r686688, ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl)
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/productdetail.ftl?p2=ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/productdetail.ftl&p1=ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl&r1=686688&r2=686714&rev=686714&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl (original)
+++ ofbiz/trunk/applications/ecommerce/webapp/ecommerce/catalog/productdetail.ftl Mon Aug 18 02:53:13 2008
@@ -400,13 +400,11 @@
       </#if>
 
       <#-- show tell a friend details only in ecommerce application -->
-      <#if (isEcommerceScreen?exists && isEcommerceScreen?default("N") == "Y")>
-        <div>&nbsp;</div>
-        <div>
+      <div>&nbsp;</div>
+      <div>
           <a href="javascript:popUpSmall('<@ofbizUrl>tellafriend?productId=${product.productId}</@ofbizUrl>','tellafriend');" class="buttontext">${uiLabelMap.CommonTellAFriend}</a>
-        </div>
-        <br/>
-      </#if>
+      </div>
+      <br/>
 
       <#if disFeatureList?exists && 0 < disFeatureList.size()>
       <p>&nbsp;</p>
@@ -618,7 +616,6 @@
   <#-- Any attributes/etc may go here -->
 
   <#-- Product Reviews -->
-  <#if (isEcommerceScreen?exists && isEcommerceScreen?default("N") == "Y")>  
     <div id="reviews">
       <div>${uiLabelMap.OrderCustomerReviews}:</div>
       <#if averageRating?exists && (averageRating?double > 0) && numRatings?exists && (numRatings?double > 1)>
@@ -662,7 +659,6 @@
         <div>
             <a href="<@ofbizUrl>reviewProduct?category_id=${categoryId?if_exists}&product_id=${product.productId}</@ofbizUrl>" class="linktext">${uiLabelMap.ProductBeTheFirstToReviewThisProduct}</a>
         </div>
-      </#if>
     </div>
   </#if>
 <#-- Upgrades/Up-Sell/Cross-Sell -->

Modified: ofbiz/trunk/applications/ecommerce/widget/CatalogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/ecommerce/widget/CatalogScreens.xml?rev=686714&r1=686713&r2=686714&view=diff
==============================================================================
--- ofbiz/trunk/applications/ecommerce/widget/CatalogScreens.xml (original)
+++ ofbiz/trunk/applications/ecommerce/widget/CatalogScreens.xml Mon Aug 18 02:53:13 2008
@@ -244,7 +244,6 @@
                 <set field="leftbarScreenName" value="leftbar"/>
                 <set field="rightbarScreenName" value="rightbar"/>
                 <set field="MainColumnStyle" value="center"/>
-                <set field="isEcommerceScreen" value="Y"/>
                 <set field="titleProperty" value="PageTitleProductPage"/>
                 <set field="layoutSettings.javaScripts[]" value="/images/prototypejs/prototype.js" global="true"/>                
                 <set field="configproductdetailScreen" value="component://ecommerce/widget/CatalogScreens.xml#configproductdetail"/>
@@ -279,7 +278,7 @@
             </actions>
             <widgets>
                 <include-screen name="breadcrumbs"/>
-                <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/catalog/productdetail.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/catalog/productdetail.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>
@@ -305,7 +304,7 @@
             </actions>
             <widgets>
                 <include-screen name="breadcrumbs"/>
-                <platform-specific><html><html-template location="component://order/webapp/ordermgr/entry/catalog/configproductdetail.ftl"/></html></platform-specific>
+                <platform-specific><html><html-template location="component://ecommerce/webapp/ecommerce/catalog/configproductdetail.ftl"/></html></platform-specific>
             </widgets>
         </section>
     </screen>

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl?rev=686714&r1=686713&r2=686714&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/configproductdetail.ftl Mon Aug 18 02:53:13 2008
@@ -275,14 +275,6 @@
       <#if daysToShip?exists>
         <div><b>${uiLabelMap.ProductUsuallyShipsIn} <font color='red'>${daysToShip}</font> ${uiLabelMap.CommonDays}!<b></div>
       </#if>
-
-      <#-- show tell a friend details only in ecommerce application -->
-      <#if (isEcommerceScreen?exists && isEcommerceScreen?default("N") == "Y")>
-        <div>&nbsp;</div>
-        <div>
-          <a href="javascript:popUpSmall('<@ofbizUrl>tellafriend?productId=${product.productId}</@ofbizUrl>','tellafriend');" class="buttontext">${uiLabelMap.CommonTellAFriend}</a>
-        </div>
-      </#if>
     
       <#if disFeatureList?exists && 0 < disFeatureList.size()>
         <p>&nbsp;</p>
@@ -608,70 +600,6 @@
   </tr>
   <tr><td colspan="2"><hr class='sepbar'></td></tr>
 
-  <#-- Product Reviews -->
-  <#if (isEcommerceScreen?exists && isEcommerceScreen?default("N") == "Y")>
-  <tr>
-    <td colspan="2">
-      <div>${uiLabelMap.OrderCustomerReviews}:</div>
-      <#if averageRating?exists && (averageRating?double > 0) && numRatings?exists && (numRatings?double > 1)>
-          <div>${uiLabelMap.OrderAverageRating}: ${averageRating} <#if numRatings?exists>(${uiLabelMap.CommonFrom} ${numRatings} ${uiLabelMap.OrderRatings})</#if></div>
-      </#if>
-    </td>
-  </tr>
-  <tr><td colspan="2"><hr class='sepbar'></td></tr>
-  <#if productReviews?has_content>
-    <#list productReviews as productReview>
-      <#assign postedUserLogin = productReview.getRelatedOne("UserLogin")>
-      <#assign postedPerson = postedUserLogin.getRelatedOne("Person")?if_exists>
-      <tr>
-        <td colspan="2">
-          <table border="0" cellpadding="0" cellspacing='0'>
-            <tr>
-              <td>
-                <div><b>${uiLabelMap.CommonBy}: </b><#if productReview.postedAnonymous?default("N") == "Y">${uiLabelMap.OrderAnonymous}<#else>${postedPerson.firstName} ${postedPerson.lastName}</#if></div>
-              </td>
-              <td>
-                <div><b>${uiLabelMap.CommonOn}: </b>${productReview.postedDateTime?if_exists}</div>
-              </td>
-              <td>
-                <div><b>${uiLabelMap.OrderRanking}: </b>${productReview.productRating?if_exists?string}</div>
-              </td>
-            </tr>
-            <tr>
-              <td colspan="3">
-                <div>&nbsp;</div>
-              </td>
-            </tr>
-            <tr>
-              <td colspan="3">
-                <div>${productReview.productReview?if_exists}</div>
-              </td>
-            </tr>
-            <tr><td colspan="3"><hr/></td></tr>
-          </table>
-        </td>
-      </tr>
-    </#list>
-    <tr>
-      <td colspan="2">
-        <a href="<@ofbizUrl>reviewProduct?category_id=${categoryId?if_exists}&product_id=${product.productId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductReviewThisProduct}!</a>
-      </td>
-    </tr>
-  <#else>
-    <tr>
-      <td colspan="2">
-        <div>${uiLabelMap.ProductProductNotReviewedYet}.</div>
-      </td>
-    </tr>
-    <tr>
-      <td colspan="2">
-        <a href="<@ofbizUrl>reviewProduct?category_id=${categoryId?if_exists}&product_id=${product.productId}</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductBeTheFirstToReviewThisProduct}</a>
-      </td>
-    </tr>
-  </#if>
-</table>
-</#if>
-
 <#-- Upgrades/Up-Sell/Cross-Sell -->
   <#macro associated assocProducts beforeName showName afterName formNamePrefix targetRequestName>
   <#assign targetRequest = "product">

Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl?rev=686714&r1=686713&r2=686714&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/productdetail.ftl Mon Aug 18 02:53:13 2008
@@ -399,15 +399,6 @@
         <div><b>${uiLabelMap.ProductUsuallyShipsIn} <font color="red">${daysToShip}</font> ${uiLabelMap.CommonDays}!<b></div>
       </#if>
 
-      <#-- show tell a friend details only in ecommerce application -->
-      <#if (isEcommerceScreen?exists && isEcommerceScreen?default("N") == "Y")>
-        <div>&nbsp;</div>
-        <div>
-          <a href="javascript:popUpSmall('<@ofbizUrl>tellafriend?productId=${product.productId}</@ofbizUrl>','tellafriend');" class="buttontext">${uiLabelMap.CommonTellAFriend}</a>
-        </div>
-        <br/>
-      </#if>
-
       <#if disFeatureList?exists && 0 < disFeatureList.size()>
       <p>&nbsp;</p>
         <#list disFeatureList as currentFeature>
@@ -617,55 +608,7 @@
 
   <#-- Any attributes/etc may go here -->
 
-  <#-- Product Reviews -->
-  <#if (isEcommerceScreen?exists && isEcommerceScreen?default("N") == "Y")>  
-    <div id="reviews">
-      <div>${uiLabelMap.OrderCustomerReviews}:</div>
-      <#if averageRating?exists && (averageRating?double > 0) && numRatings?exists && (numRatings?double > 1)>
-          <div>${uiLabelMap.OrderAverageRating}: ${averageRating} <#if numRatings?exists>(${uiLabelMap.CommonFrom} ${numRatings} ${uiLabelMap.OrderRatings})</#if></div>
-      </#if>
-      <tr><td colspan="2"><hr/></td></tr>
-      <#if productReviews?has_content>
-        <#list productReviews as productReview>
-          <#assign postedUserLogin = productReview.getRelatedOne("UserLogin")>
-          <#assign postedPerson = postedUserLogin.getRelatedOne("Person")?if_exists>
-              <table border="0" cellpadding="0" cellspacing="0">
-                <tr>
-                  <td>
-                    <div><b>${uiLabelMap.CommonBy}: </b><#if productReview.postedAnonymous?default("N") == "Y"> ${uiLabelMap.OrderAnonymous}<#else> ${postedPerson.firstName} ${postedPerson.lastName}&nbsp;</#if></div>
-                  </td>
-                  <td>
-                    <div><b>${uiLabelMap.CommonAt}: </b>${productReview.postedDateTime?if_exists}&nbsp;</div>
-                  </td>
-                  <td>
-                    <div><b>${uiLabelMap.OrderRanking}: </b>${productReview.productRating?if_exists?string}</div>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="3">
-                    <div>&nbsp;</div>
-                  </td>
-                </tr>
-                <tr>
-                  <td colspan="3">
-                    <div>${productReview.productReview?if_exists}</div>
-                  </td>
-                </tr>
-                <tr><td colspan="3"><hr/></td></tr>
-              </table>
-        </#list>
-        <div>
-            <a href="<@ofbizUrl>reviewProduct?category_id=${categoryId?if_exists}&product_id=${product.productId}</@ofbizUrl>" class="linktext">${uiLabelMap.ProductReviewThisProduct}!</a>
-        </div>
-      <#else>
-        <div>${uiLabelMap.ProductProductNotReviewedYet}.</div>
-        <div>
-            <a href="<@ofbizUrl>reviewProduct?category_id=${categoryId?if_exists}&product_id=${product.productId}</@ofbizUrl>" class="linktext">${uiLabelMap.ProductBeTheFirstToReviewThisProduct}</a>
-        </div>
-      </#if>
-    </div>
-  </#if>
-<#-- Upgrades/Up-Sell/Cross-Sell -->
+  <#-- Upgrades/Up-Sell/Cross-Sell -->
   <#macro associated assocProducts beforeName showName afterName formNamePrefix targetRequestName>
   <#assign targetRequest = "product">
   <#if targetRequestName?has_content>