You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jo...@apache.org on 2007/04/05 23:19:28 UTC
svn commit: r525961 - in /ofbiz/trunk/applications:
marketing/webapp/marketing/campaign/ party/config/ party/data/
party/webapp/partymgr/party/ product/webapp/catalog/product/
Author: jonesde
Date: Thu Apr 5 14:19:27 2007
New Revision: 525961
URL: http://svn.apache.org/viewvc?view=rev&rev=525961
Log:
A few cleanups, nothing major and no real functionality changes
Modified:
ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml
ofbiz/trunk/applications/party/config/PartyUiLabels.properties
ofbiz/trunk/applications/party/data/PartyTypeData.xml
ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
ofbiz/trunk/applications/party/webapp/partymgr/party/viewprofile.ftl
ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl
Modified: ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml?view=diff&rev=525961&r1=525960&r2=525961
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml Thu Apr 5 14:19:27 2007
@@ -60,8 +60,8 @@
<hidden value="${donePage}"/>
</field>
- <field name="submitButton" title="[${uiLabelMap.CommonSave}]" widget-style="buttontext"><submit button-type="text-link"/></field>
- <field name="cancelLink" widget-style="buttontext" title="${uiLabelMap.CommonCancel}"><hyperlink target="${donePage}" also-hidden="false" description="[${uiLabelMap.CommonCancelDone}]" target-type="inter-app"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
+ <field name="cancelLink" widget-style="buttontext" title="${uiLabelMap.CommonCancel}"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}" target-type="inter-app"/></field>
</form>
<form name="ListMarketingCampaign" list-name="" target="" title="" type="list" paginate-target="listMarketingCampaign">
@@ -77,7 +77,7 @@
</field>
<field name="deleteLink" title="&nbsp;" widget-style="buttontext">
<hyperlink target="removeMarketingCampaign?marketingCampaignId=${marketingCampaignId}"
- description="[${uiLabelMap.CommonDelete}]" also-hidden="false"/>
+ description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
</form>
@@ -92,19 +92,19 @@
</field>
<field name="partyId" title="${uiLabelMap.PartyPartyId}" use-when=""${lastName}"!=null">
<display-entity entity-name="PartyNameView" description="${firstName} ${lastName}" also-hidden="true">
- <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" description="[${partyId}]" link-style="buttontext" target-type="inter-app"/>
+ <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" description="${partyId}" link-style="buttontext" target-type="inter-app"/>
</display-entity>
</field>
<!-- Currently not working for PartyGroup
<field name="partyId" title="${uiLabelMap.PartyPartyId}" use-when=""${groupName}"!=null">
<display-entity entity-name="PartyNameView" description="${groupName}" also-hidden="true">
- <sub-hyperlink target="/partymgr/control/viewProfile?partyId=${partyId}" description="[${partyId}]" link-style="buttontext"/>
+ <sub-hyperlink target="/partymgr/control/viewProfile?partyId=${partyId}" description="${partyId}" link-style="buttontext"/>
</display-entity>
</field>
-->
<field name="roleTypeId" title="${uiLabelMap.PartyRoleTypeId}">
<display-entity entity-name="RoleType" description="${description}" also-hidden="true"/>
-<!-- <sub-hyperlink target="/partymgr/control/viewProfile?partyId=${partyId}" description="[${partyId}]" link-style="buttontext"/>
+<!-- <sub-hyperlink target="/partymgr/control/viewProfile?partyId=${partyId}" description="${partyId}" link-style="buttontext"/>
</display-entity>-->
</field>
<field name="editLink" title="&nbsp;" widget-style="buttontext">
@@ -112,7 +112,7 @@
</field>
<field name="deleteLink" title="&nbsp;" widget-style="buttontext">
<hyperlink target="removeMarketingCampaignRole?marketingCampaignId=${marketingCampaignId}&roleTypeId=${roleTypeId}&partyId=${partyId}"
- description="[${uiLabelMap.CommonDelete}]" also-hidden="false"/>
+ description="${uiLabelMap.CommonDelete}" also-hidden="false"/>
</field>
</form>
@@ -133,8 +133,8 @@
</entity-options>
</drop-down>
</field>
- <field name="submitButton" title="[${uiLabelMap.CommonSave}]" widget-style="buttontext"><submit button-type="text-link"/></field>
- <field name="cancelLink" widget-style="buttontext" title="${uiLabelMap.CommonCancel}"><hyperlink target="${donePage}?marketingCampaignId=${marketingCampaignId}" also-hidden="false" description="[${uiLabelMap.CommonCancelDone}]"/></field>
+ <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field>
+ <field name="cancelLink" widget-style="buttontext" title="${uiLabelMap.CommonCancel}"><hyperlink target="${donePage}?marketingCampaignId=${marketingCampaignId}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field>
</form>
</forms>
Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.properties?view=diff&rev=525961&r1=525960&r2=525961
==============================================================================
--- ofbiz/trunk/applications/party/config/PartyUiLabels.properties (original)
+++ ofbiz/trunk/applications/party/config/PartyUiLabels.properties Thu Apr 5 14:19:27 2007
@@ -242,7 +242,7 @@
PartyCurrentShoppingCart=Current Shopping Cart
PartyCustomerRequest=Customer Request
PartyCustomerTemporaryPassword=Customer will receive a temporary password by email.
-PartyCybersourceAvsOver=Cybersource AVS Override
+PartyAvsOver=AVS Override (CC Fraud Screening)
PartyDeleteVendorPermissionError=Security Error\: to run deleteVendor you must have the PARTYMGR_CREATE or PARTYMGR_ADMIN permission
PartyDisabled=DISABLED
PartyDomainNameSuccessfullyCreated=Domain Name successfully created.
Modified: ofbiz/trunk/applications/party/data/PartyTypeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/data/PartyTypeData.xml?view=diff&rev=525961&r1=525960&r2=525961
==============================================================================
--- ofbiz/trunk/applications/party/data/PartyTypeData.xml (original)
+++ ofbiz/trunk/applications/party/data/PartyTypeData.xml Thu Apr 5 14:19:27 2007
@@ -214,7 +214,7 @@
<RoleType description="Subsidiary" hasTable="N" parentTypeId="ORGANIZATION_UNIT" roleTypeId="SUBSIDIARY"/>
<RoleType description="Worker" hasTable="N" parentTypeId="EMPLOYEE" roleTypeId="WORKER"/>
- <!-- <PartyClassificationType description="" hasTable="N" parentTypeId="" partyClassificationTypeId="EEOC_CLASSIFICATION"/> -->
+ <PartyClassificationType description="EEOC (Equal Opportunity)" hasTable="N" parentTypeId="" partyClassificationTypeId="EEOC_CLASSIFICATION"/>
<PartyClassificationType description="Minority" hasTable="N" parentTypeId="" partyClassificationTypeId="MINORITY_CLASSIFICAT"/>
<PartyClassificationType description="Income" hasTable="N" parentTypeId="" partyClassificationTypeId="INCOME_CLASSIFICATIO"/>
<PartyClassificationType description="Industry" hasTable="N" parentTypeId="" partyClassificationTypeId="INDUSTRY_CLASSIFICAT"/>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml?view=diff&rev=525961&r1=525960&r2=525961
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/PartyForms.xml Thu Apr 5 14:19:27 2007
@@ -63,6 +63,7 @@
focus-field-name="userLoginId">
<auto-fields-service service-name="createUserLogin"/>
<field name="partyId"><hidden/></field>
+ <field name="enabled"><hidden/></field>
<field name="currentPassword"><password/></field>
<field name="currentPasswordVerify"><password/></field>
<field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="smallSubmit"><submit button-type="text-link"/></field>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/viewprofile.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/viewprofile.ftl?view=diff&rev=525961&r1=525960&r2=525961
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/party/viewprofile.ftl (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/party/viewprofile.ftl Thu Apr 5 14:19:27 2007
@@ -393,7 +393,7 @@
<#-- AVS Strings -->
<div id="partyAVS" class="screenlet">
<div class="screenlet-title-bar">
- <h3>${uiLabelMap.PartyCybersourceAvsOver}</h3>
+ <h3>${uiLabelMap.PartyAvsOver}</h3>
</div>
<div class="screenlet-body">
<span class="label">${uiLabelMap.PartyAvsString}</span>${(avsOverride.avsDeclineString)?default("${uiLabelMap.CommonGlobal}")}
Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl?view=diff&rev=525961&r1=525960&r2=525961
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl Thu Apr 5 14:19:27 2007
@@ -200,11 +200,11 @@
<td><div class="tabletext"><#if curProductAssocType?exists> ${(curProductAssocType.get("description",locale))?if_exists}<#else>${(assocFromProduct.productAssocTypeId)?if_exists}</#if></div></td>
<td>
<a href="<@o...@ofbizUrl>" class="buttontext">
- [${uiLabelMap.CommonDelete}]</a>
+ ${uiLabelMap.CommonDelete}</a>
</td>
<td>
<a href="<@o...@ofbizUrl>" class="buttontext">
- [${uiLabelMap.CommonEdit}]</a>
+ ${uiLabelMap.CommonEdit}</a>
</td>
</tr>
</#list>
@@ -232,7 +232,7 @@
<td><div class="tabletext"><#if curProductAssocType?exists> ${(curProductAssocType.get("description",locale))?if_exists}<#else> ${(assocToProduct.productAssocTypeId)?if_exists}</#if></div></td>
<td>
<a href="<@o...@ofbizUrl>" class="buttontext">
- [${uiLabelMap.CommonDelete}]</a>
+ ${uiLabelMap.CommonDelete}</a>
</td>
</tr>
</#list>