Author: erwan
Date: Tue Oct 23 19:55:49 2012
New Revision: 1401422
URL: http://svn.apache.org/viewvc?rev=1401422&view=rev
Log:
add usage of 4 new icons for PaymentMethod :
- BillingAccount
- CreditCard
- EftAccount
- GiftCard
Modified:
ofbiz/branches/20120329_portletWidget/framework/common/config/iconsPurpose.properties
ofbiz/branches/20120329_portletWidget/specialpurpose/example/config/ExampleUiLabels.xml
ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/ExampleForms.xml
Modified:
ofbiz/branches/20120329_portletWidget/framework/common/config/iconsPurpose.properties
URL:
http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/framework/common/config/iconsPurpose.properties?rev=1401422&r1=1401421&r2=1401422&view=diff
==============================================================================
---
ofbiz/branches/20120329_portletWidget/framework/common/config/iconsPurpose.properties
(original)
+++
ofbiz/branches/20120329_portletWidget/framework/common/config/iconsPurpose.properties
Tue Oct 23 19:55:49 2012
@@ -41,6 +41,7 @@ AppNext=/images/icons/famfamfam/applicat
AppPrev=/images/icons/famfamfam/application_side_contract.png
Associate=/images/icons/famfamfam/application_link.png
Attach=/images/icons/famfamfam/attach.png
+BillingAccount=/images/icons/famfamfam/page_add.png
Cancel=/images/icons/famfamfam/cancel.png
Category=/images/icons/famfamfam/application_cascade.png
ChartBar=/images/icons/famfamfam/chart_bar.png
@@ -48,6 +49,7 @@ ChartPie=/images/icons/famfamfam/chart_p
ChartLine=/images/icons/famfamfam/chart_line.png
Child=/images/icons/famfamfam/shape_move_forwards.png
ContactMech=/images/icons/famfamfam/book_addresses.png
+CreditCard=/images/icons/famfamfam/creditcards.png
Date=/images/icons/famfamfam/date.png
Deactivate=/images/icons/famfamfam/clock_delete.png
Delete=/images/icons/famfamfam/bin.png
@@ -59,6 +61,7 @@ Done=/images/icons/famfamfam/clock.png
Download=/images/icons/famfamfam/page_white_get.png
Duplicate=/images/icons/famfamfam/application_double.png
Edit=/images/icons/famfamfam/application_edit.png
+EftAccount=/images/icons/famfamfam/money_add.png
Email=/images/icons/famfamfam/email.png
EmailAttach=/images/icons/famfamfam/email_attach.png
EmailEdit=/images/icons/famfamfam/email_edit.png
@@ -69,6 +72,7 @@ Expire=/images/icons/famfamfam/clock_sto
Filter=/images/icons/famfamfam/find.png
Gantt=/images/icons/famfamfam/shape_align_left.png
GeoLoc=/images/icons/famfamfam/map.png
+GiftCard=/images/icons/famfamfam/folder_heart.png
Grants=/images/icons/famfamfam/key.png
Group=/images/icons/famfamfam/group.png
Help=/images/icons/famfamfam/help.png
@@ -78,7 +82,7 @@ History=/images/icons/famfamfam/time.png
Items=/images/icons/famfamfam/text_list_bullets.png
Overview=/images/icons/famfamfam/application_form_magnify.png
Pause=/images/icons/famfamfam/control_pause_blue.png
-Payment=/images/icons/famfamfam/creditcards.png
+Payment=/images/icons/famfamfam/money.png
PDF=/images/icons/famfamfam/page_white_acrobat.png
Phone=/images/icons/famfamfam/phone.png
Plan=/images/icons/famfamfam/table_gear.png
Modified:
ofbiz/branches/20120329_portletWidget/specialpurpose/example/config/ExampleUiLabels.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/example/config/ExampleUiLabels.xml?rev=1401422&r1=1401421&r2=1401422&view=diff
==============================================================================
---
ofbiz/branches/20120329_portletWidget/specialpurpose/example/config/ExampleUiLabels.xml
(original)
+++
ofbiz/branches/20120329_portletWidget/specialpurpose/example/config/ExampleUiLabels.xml
Tue Oct 23 19:55:49 2012
@@ -942,6 +942,10 @@
<value xml:lang="en">When Icon explanation start with BP (Best
Practice), put the mouse on icon to read the end-user label </value>
<value xml:lang="fr">Quand l'explication de l'icône est précédée
par BP (Bonne Pratique), positionner la souris sur l'icone pour visualiser ce
que l'utilisateur verra</value>
</property>
+ <property key="BestPractice_UseExistingLabel">
+ <value xml:lang="en">BP: There is no dedicated IconsTooltips, use the
existing label</value>
+ <value xml:lang="fr">BP: Il n'y a pas d'IconsTooltips dédié, il faut
utiliser le label existant</value>
+ </property>
<property key="PageTitleIconsList">
<value xml:lang="en">Icons list</value>
<value xml:lang="fr">Liste des icônes</value>
Modified:
ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/ExampleForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/ExampleForms.xml?rev=1401422&r1=1401421&r2=1401422&view=diff
==============================================================================
---
ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/ExampleForms.xml
(original)
+++
ofbiz/branches/20120329_portletWidget/specialpurpose/example/widget/example/ExampleForms.xml
Tue Oct 23 19:55:49 2012
@@ -299,6 +299,10 @@ under the License.
<field name="Cancel2" title="${uiLabelMap.IconsTooltips_Cancel}"
position="2">
<hyperlink target="" image-location="${iconsPurpose.Cancel}"
image-title="${uiLabelMap.IconsTooltips_Cancel}" also-hidden="false" />
</field>
+ <field name="BillingAccount"><display also-hidden="false"
description=" " size="1"/></field>
+ <field name="BillingAccount2"
title="${uiLabelMap.BestPractice_UseExistingLabel} :
AccountingCreateBillingAccount" position="2">
+ <hyperlink target=""
image-location="${iconsPurpose.BillingAccount}"
image-title="${uiLabelMap.AccountingCreateBillingAccount}" />
+ </field>
<field name="Category"><display also-hidden="false" description=" "
size="1"/></field>
<field name="Category2"
title="${uiLabelMap.BestPractice_IconCategory}" position="2">
<hyperlink target="" image-location="${iconsPurpose.Category}"
image-title="${uiLabelMap.IconsTooltips_Category}" also-hidden="false" />
@@ -319,6 +323,10 @@ under the License.
<field name="ContactMech2"
title="${uiLabelMap.IconsTooltips_ContactMech}" position="2">
<hyperlink target="" image-location="${iconsPurpose.ContactMech}"
image-title="${uiLabelMap.IconsTooltips_ContactMech}" also-hidden="false" />
</field>
+ <field name="CreditCard"><display also-hidden="false" description=" "
size="1"/></field>
+ <field name="CreditCard2"
title="${uiLabelMap.BestPractice_UseExistingLabel} : PartyCreateNewCreditCard"
position="2">
+ <hyperlink target="" image-location="${iconsPurpose.CreditCard}"
image-title="${uiLabelMap.PartyCreateNewCreditCard}" />
+ </field>
<field name="Date"><display also-hidden="false" description=" "
size="1"/></field>
<field name="Date2" title="${uiLabelMap.IconsTooltips_Date}"
position="2">
<hyperlink target="" image-location="${iconsPurpose.Date}"
image-title="${uiLabelMap.IconsTooltips_Date}" />
@@ -359,6 +367,10 @@ under the License.
<field name="Edit2" title="${uiLabelMap.IconsTooltips_Edit}"
position="2">
<hyperlink target="" image-location="${iconsPurpose.Edit}"
image-title="${uiLabelMap.IconsTooltips_Edit}" also-hidden="false" />
</field>
+ <field name="EftAccount"><display also-hidden="false" description=" "
size="1"/></field>
+ <field name="EftAccount2"
title="${uiLabelMap.BestPractice_UseExistingLabel} : PartyCreateNewEftAccount"
position="2">
+ <hyperlink target="" image-location="${iconsPurpose.EftAccount}"
image-title="${uiLabelMap.PartyCreateNewEftAccount}" />
+ </field>
<field name="Email"><display also-hidden="false" description=" "
size="1"/></field>
<field name="Email2" title="${uiLabelMap.IconsTooltips_Email}"
position="2">
<hyperlink target="" image-location="${iconsPurpose.Email}"
image-title="${uiLabelMap.IconsTooltips_Email}" />
@@ -395,6 +407,10 @@ under the License.
<field name="Gantt2" title="${uiLabelMap.IconsTooltips_Gantt}"
position="2">
<hyperlink target="" image-location="${iconsPurpose.Gantt}"
image-title="${uiLabelMap.IconsTooltips_Gantt}" />
</field>
+ <field name="GiftCard"><display also-hidden="false" description=" "
size="1"/></field>
+ <field name="GiftCard2"
title="${uiLabelMap.BestPractice_UseExistingLabel} : PartyCreateNewGiftCard"
position="2">
+ <hyperlink target="" image-location="${iconsPurpose.GiftCard}"
image-title="${uiLabelMap.PartyCreateNewGiftCard}" />
+ </field>
<field name="Grants"><display also-hidden="false" description=" "
size="1"/></field>
<field name="Grants2" title="${uiLabelMap.IconsTooltips_Grants}"
position="2">
<hyperlink target="" image-location="${iconsPurpose.Grants}"
image-title="${uiLabelMap.IconsTooltips_Grants}" />
@@ -698,6 +714,10 @@ under the License.
<sort-field name="Shipment"/><sort-field name="Shipment2"/>
<sort-field name="Accounting"/><sort-field name="Accounting2"/>
<sort-field name="Payment"/><sort-field name="Payment2"/>
+ <sort-field name="CreditCard"/><sort-field name="CreditCard2"/>
+ <sort-field name="GiftCard"/><sort-field name="GiftCard2"/>
+ <sort-field name="EftAccount"/><sort-field name="EftAccount2"/>
+ <sort-field name="BillingAccount"/><sort-field
name="BillingAccount2"/>
</field-group>
</sort-order>
</form>
