You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2008/08/09 23:27:38 UTC
svn commit: r684348 - in /ofbiz/trunk/applications/product:
config/ProductUiLabels.xml webapp/catalog/store/EditProductStoreWebSites.ftl
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>
Re: svn commit: r684348 - in /ofbiz/trunk/applications/product: config/ProductUiLabels.xml webapp/catalog/store/EditProductStoreWebSites.ftl
Posted by Jacques Le Roux <ja...@les7arts.com>.
From: "David E Jones" <jo...@apache.org>
>
> 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.
Maybe BJ will catch this, I already catched the typo
Jacques
> -David
>
>
> On Aug 9, 2008, at 3:27 PM, jleroux@apache.org 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">Ð'Ð°Ñ Ñ,акже могÑfÑ, зР°Ð¸Ð½Ñ,еÑ?еÑоваÑ,ÑO:</value>
>> - <value xml:lang="th">à¸"ุà¸"ภาà¸^à¸^ภ°à¸ªà¸Tà¹fà¸^à¹fà¸Tสิà¹^à¸?à¸Tีà¹?à¸"ี :</value>
>> - <value xml:lang="zh">ä½ å¯èf½è¿~ä¼s对è¿Täº>æ"Yå
>> ´è¶£ï¼s</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">สรà¹?าà¸?/à¸>รัà¸sà¸>ภ£à¸¸à¸?à¹,à¸"ย</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">Ð'Ð°Ñ Ñ,акже могÑfÑ, зР°Ð¸Ð½Ñ,еÑ?еÑоваÑ,ÑO:</value>
>> + <value xml:lang="th">à¸"ุà¸"ภาà¸^à¸^ภ°à¸ªà¸Tà¹fà¸^à¹fà¸Tสิà¹^à¸?à¸Tีà¹?à¸"ี :</value>
>> + <value xml:lang="zh">ä½ å¯èf½è¿~ä¼s对è¿Täº>æ"Yå
>> ´è¶£ï¼s</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>
>>
>>
>
>
Re: svn commit: r684348 - in /ofbiz/trunk/applications/product: config/ProductUiLabels.xml
webapp/catalog/store/EditProductStoreWebSites.ftl
Posted by BJ Freeman <bj...@free-man.net>.
LOL never done that, not at all.
only like yestarday.
No problem.
:)
Jacques Le Roux sent the following on 8/9/2008 11:56 PM:
> Yes, sorry It was late and I thought about while falling asleep. I mixed
> things because I also made a change you requested (CommonNotFound label)
> related to Content and David spoke about putting this in Content below
>
> Jacques
>
> From: "BJ Freeman" <bj...@free-man.net>
>> I modified the ProductStorewebsite page in products, not content
>>
>>
>> Jacques Le Roux sent the following on 8/9/2008 3:28 PM:
>>> Yes we know all that, there is work in Content component... This was a
>>> 1st step ;o)
>>>
>>> Jacques
>>>
>>> From: "BJ Freeman" <bj...@free-man.net>
>>>> guess there is more to correct since I copied requestAttributes from
>>>> another line in the ftl.
>>>>
>>>> David E Jones sent the following on 8/9/2008 2:41 PM:
>>>>>
>>>>> 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, jleroux@apache.org 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>
>>>>>>
>>>>>>
>>>>>
>>>>>
>>>>>
>>>>>
>>>>
>>>>
>>>>
>>>
>>>
>>>
>>>
>>
>>
>>
>
>
>
>
Re: svn commit: r684348 - in /ofbiz/trunk/applications/product: config/ProductUiLabels.xml webapp/catalog/store/EditProductStoreWebSites.ftl
Posted by Jacques Le Roux <ja...@les7arts.com>.
Yes, sorry It was late and I thought about while falling asleep. I mixed things because I also made a change you requested
(CommonNotFound label) related to Content and David spoke about putting this in Content below
Jacques
From: "BJ Freeman" <bj...@free-man.net>
>I modified the ProductStorewebsite page in products, not content
>
>
> Jacques Le Roux sent the following on 8/9/2008 3:28 PM:
>> Yes we know all that, there is work in Content component... This was a
>> 1st step ;o)
>>
>> Jacques
>>
>> From: "BJ Freeman" <bj...@free-man.net>
>>> guess there is more to correct since I copied requestAttributes from
>>> another line in the ftl.
>>>
>>> David E Jones sent the following on 8/9/2008 2:41 PM:
>>>>
>>>> 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, jleroux@apache.org 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>
>>>>>
>>>>>
>>>>
>>>>
>>>>
>>>>
>>>
>>>
>>>
>>
>>
>>
>>
>
>
>
Re: svn commit: r684348 - in /ofbiz/trunk/applications/product: config/ProductUiLabels.xml
webapp/catalog/store/EditProductStoreWebSites.ftl
Posted by BJ Freeman <bj...@free-man.net>.
I modified the ProductStorewebsite page in products, not content
Jacques Le Roux sent the following on 8/9/2008 3:28 PM:
> Yes we know all that, there is work in Content component... This was a
> 1st step ;o)
>
> Jacques
>
> From: "BJ Freeman" <bj...@free-man.net>
>> guess there is more to correct since I copied requestAttributes from
>> another line in the ftl.
>>
>> David E Jones sent the following on 8/9/2008 2:41 PM:
>>>
>>> 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, jleroux@apache.org 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>
>>>>
>>>>
>>>
>>>
>>>
>>>
>>
>>
>>
>
>
>
>
Re: svn commit: r684348 - in /ofbiz/trunk/applications/product: config/ProductUiLabels.xml webapp/catalog/store/EditProductStoreWebSites.ftl
Posted by Jacques Le Roux <ja...@les7arts.com>.
Yes we know all that, there is work in Content component... This was a 1st step ;o)
Jacques
From: "BJ Freeman" <bj...@free-man.net>
> guess there is more to correct since I copied requestAttributes from
> another line in the ftl.
>
> David E Jones sent the following on 8/9/2008 2:41 PM:
>>
>> 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, jleroux@apache.org 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>
>>>
>>>
>>
>>
>>
>>
>
>
>
Re: svn commit: r684348 - in /ofbiz/trunk/applications/product: config/ProductUiLabels.xml
webapp/catalog/store/EditProductStoreWebSites.ftl
Posted by BJ Freeman <bj...@free-man.net>.
guess there is more to correct since I copied requestAttributes from
another line in the ftl.
David E Jones sent the following on 8/9/2008 2:41 PM:
>
> 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, jleroux@apache.org 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>
>>
>>
>
>
>
>
Re: svn commit: r684348 - in /ofbiz/trunk/applications/product: config/ProductUiLabels.xml webapp/catalog/store/EditProductStoreWebSites.ftl
Posted by David E Jones <jo...@apache.org>.
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, jleroux@apache.org 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>
>
>
Re: svn commit: r684348 - in /ofbiz/trunk/applications/product: config/ProductUiLabels.xml webapp/catalog/store/EditProductStoreWebSites.ftl
Posted by David E Jones <jo...@apache.org>.
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, jleroux@apache.org 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>
>
>