OFBiz › OFBiz - Commits

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

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 2 messages Options
jleroux@apache.org
Reply | Threaded
Open this post in threaded view
♦
♦
|

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

jleroux@apache.org
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>


jonesde
Reply | Threaded
Open this post in threaded view
♦
♦
|

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

jonesde

There is no need to have a key like  
"ProductCreateNewProductStoreWebSite" for a simple label like "New Web  
Site" (which is what it should be, BTW, instead of Web Site). In fact,  
there should be a label for that in the content component (where the  
WebSite entity lives) and that should be reused to make it easier to  
write and maintain all of these labels.

Also, unless it is necessary the requestAttributes Map should be  
avoided and the parameters Map used instead.

-David


On Aug 9, 2008, at 3:27 PM, [hidden email] wrote:

> 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>
>
>

Free forum by Nabble Edit this page