svn commit: r684348 - in /ofbiz/trunk/applications/product: config/ProductUiLabels.xml webapp/catalog/store/EditProductStoreWebSites.ftl

[jleroux]

Author: jleroux
Date: Sat Aug  9 14:27:37 2008
New Revision: 684348

URL: http://svn.apache.org/viewvc?rev=684348&view=rev
Log:
A modified patch from BJ Freeman "Product Store WebSites Change from New 
Product Store to New Web Site" 
(https://issues.apache.org/jira/browse/OFBIZ-1899) - OFBIZ-1899

Modified:
    ofbiz/trunk/applications/product/config/ProductUiLabels.xml
    
ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreWebSites.ftl

Modified: ofbiz/trunk/applications/product/config/ProductUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/config/ProductUiLabels.xml?rev=684348&r1=684347&r2=684348&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/config/ProductUiLabels.xml (original)
+++ ofbiz/trunk/applications/product/config/ProductUiLabels.xml Sat Aug  9 
14:27:37 2008
@@ -5873,15 +5873,6 @@
         <value xml:lang="en">Add Items From Inventory</value>
         <value xml:lang="fr">Ajouter un article depuis le stock</value>
     </property>        
-    <property key="ProductCrossSell">
-        <value xml:lang="en">You might be interested in these as well:</value>
-        <value xml:lang="fr">Vous pourriez aussi être intéressé(e) par ceci 
:</value>
-        <value xml:lang="it">Tu potresti essere interessato anche a 
questi:</value>
-        <value xml:lang="ro">Tu poti sa fii interesat si de aceste:</value>
-        <value xml:lang="ru">Вас также могут 
заинтересовать:</value>
-        <value 
xml:lang="th">คุณอาจจะสนใจในสิ่งนี้ดี
 :</value>
-        <value xml:lang="zh">你可能还会对这些感兴趣：</value>
-    </property>
     <property key="ProductAbbrev">
         <value xml:lang="en">Abbrev</value>
         <value xml:lang="es">Abreviatura</value>
@@ -8290,6 +8281,19 @@
         <value xml:lang="it">creato/modificato da</value>
         <value 
xml:lang="th">สร้าง/ปรับปรุงโดย</value>
     </property>
+    <property key="ProductCreateNewProductStoreWebSite">
+        <value xml:lang="en">New WebSite</value>
+        <value xml:lang="fr">Nouveau site web</value>
+    </property>    
+    <property key="ProductCrossSell">
+        <value xml:lang="en">You might be interested in these as well:</value>
+        <value xml:lang="fr">Vous pourriez aussi être intéressé(e) par ceci 
:</value>
+        <value xml:lang="it">Tu potresti essere interessato anche a 
questi:</value>
+        <value xml:lang="ro">Tu poti sa fii interesat si de aceste:</value>
+        <value xml:lang="ru">Вас также могут 
заинтересовать:</value>
+        <value 
xml:lang="th">คุณอาจจะสนใจในสิ่งนี้ดี
 :</value>
+        <value xml:lang="zh">你可能还会对这些感兴趣：</value>
+    </property>
     <property key="ProductCurrency">
         <value xml:lang="en">Currency</value>
         <value xml:lang="es">Moneda</value>

Modified: 
ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreWebSites.ftl
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreWebSites.ftl?rev=684348&r1=684347&r2=684348&view=diff
==============================================================================
--- 
ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreWebSites.ftl
 (original)
+++ 
ofbiz/trunk/applications/product/webapp/catalog/store/EditProductStoreWebSites.ftl
 Sat Aug  9 14:27:37 2008
@@ -20,7 +20,8 @@
     <div class="screenlet-title-bar">
         <h3>${uiLabelMap.PageTitleEditProductStoreWebSites}</h3>
     </div>
-    <div class="screenlet-body"> 
+    <div class="screenlet-body">
+      <a 
href="/content/control/EditWebSite?productStoreId=${productStoreId}&externalLoginKey=${requestAttributes.externalLoginKey}"
 class="buttontext">${uiLabelMap.ProductCreateNewProductStoreWebSite}</a>
         <table cellspacing="0" class="basic-table">
             <tr class="header-row">
               <td>${uiLabelMap.ProductWebSiteId}</td>
@@ -66,4 +67,4 @@
             <input type="submit" class="smallSubmit" 
value="${uiLabelMap.CommonUpdate}">
         </form>
     </div>
-</div>
\ No newline at end of file
+</div>