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 2009/04/26 15:50:42 UTC
svn commit: r768705 - in /ofbiz/trunk/applications:
marketing/webapp/marketing/campaign/ marketing/webapp/marketing/contact/
marketing/webapp/marketing/datasource/
marketing/webapp/marketing/trackingcode/
party/webapp/partymgr/communication/ product/we...
Author: jleroux
Date: Sun Apr 26 13:50:42 2009
New Revision: 768705
URL: http://svn.apache.org/viewvc?rev=768705&view=rev
Log:
were showing here and there
Modified:
ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml
ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml
ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceForms.xml
ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml
ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml
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?rev=768705&r1=768704&r2=768705&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml Sun Apr 26 13:50:42 2009
@@ -18,7 +18,7 @@
under the License.
-->
-<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
<form name="EditMarketingCampaign" type="single" target="updateMarketingCampaign" title="" default-map-name="marketingCampaign"
header-row-style="header-row" default-table-style="basic-table">
@@ -80,7 +80,7 @@
<field name="parentCampaignId" title="${uiLabelMap.MarketingParentCampaignId}">
<display/>
</field>
- <field name="deleteLink" title="&nbsp;" widget-style="buttontext">
+ <field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink target="removeMarketingCampaign" description="${uiLabelMap.CommonDelete}" also-hidden="false">
<parameter param-name="marketingCampaignId"/>
</hyperlink>
@@ -120,14 +120,14 @@
</sub-hyperlink>
</display-entity>-->
</field>
- <field name="editLink" title="&nbsp;" widget-style="buttontext">
+ <field name="editLink" title=" " widget-style="buttontext">
<hyperlink target="EditMarketingCampaignRoles" description="${uiLabelMap.CommonEdit}" also-hidden="false">
<parameter param-name="marketingCampaignId"/>
<parameter param-name="roleTypeId"/>
<parameter param-name="partyId"/>
</hyperlink>
</field>
- <field name="deleteLink" title="&nbsp;" widget-style="buttontext">
+ <field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink target="removeMarketingCampaignRole" description="${uiLabelMap.CommonDelete}" also-hidden="false">
<parameter param-name="marketingCampaignId"/>
<parameter param-name="roleTypeId"/>
@@ -161,4 +161,4 @@
</hyperlink>
</field>
</form>
-</forms>
\ No newline at end of file
+</forms>
Modified: ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml?rev=768705&r1=768704&r2=768705&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml Sun Apr 26 13:50:42 2009
@@ -131,7 +131,7 @@
<field name="contactMechTypeId" title="${uiLabelMap.MarketingContactListContactMechTypeId}"><display-entity entity-name="ContactMechType"/></field>
<field name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}"><display-entity entity-name="MarketingCampaign" description="${campaignName}"/></field>
<!-- deleting contact lists is a bit more complicated than this... don't like have a link like this for top level entities
- <field name="deleteLink" title="&nbsp;" widget-style="buttontext">
+ <field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink target="removeContactList" description="${uiLabelMap.CommonDelete}" also-hidden="false">
<parameter param-name="contactListId"/>
</hyperlink>
@@ -204,7 +204,7 @@
<field name="preferredContactMechId" title="${uiLabelMap.MarketingContactListPreferredContactMech}">
<display-entity entity-name="ContactMechDetail" key-field-name="contactMechId" description="[${contactMechId}]: [${infoString}] [${tnCountryCode}-${tnAreaCode}-${tnContactNumber}] [${paAddress1}, ${paAddress1}, ${paCity}, ${paStateProvinceGeoId}, ${paPostalCode}, ${paPostalCodeExt} ${paCountryGeoId}]"/>
</field>
- <field name="editLink" title="&nbsp;" widget-style="buttontext">
+ <field name="editLink" title=" " widget-style="buttontext">
<hyperlink target="EditContactListParty" description="${uiLabelMap.CommonEdit}" also-hidden="false">
<parameter param-name="contactListId"/>
<parameter param-name="partyId"/>
Modified: ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceForms.xml?rev=768705&r1=768704&r2=768705&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceForms.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceForms.xml Sun Apr 26 13:50:42 2009
@@ -54,7 +54,7 @@
</field>
<field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
<field name="dataSourceTypeId" title="${uiLabelMap.DataSourceDataSourceTypeId}"><display-entity entity-name="DataSourceType"/></field>
- <field name="deleteLink" title="&nbsp;" widget-style="buttontext">
+ <field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink target="deleteDataSource" description="${uiLabelMap.CommonDelete}" also-hidden="false">
<parameter param-name="dataSourceId"/>
</hyperlink>
@@ -92,12 +92,12 @@
<field name="dataSourceTypeId" title="${uiLabelMap.DataSourceDataSourceTypeId}"><display/></field>
<field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
- <field name="editLink" title="&nbsp;" widget-style="buttontext">
+ <field name="editLink" title=" " widget-style="buttontext">
<hyperlink target="EditDataSourceType" description="${uiLabelMap.CommonEdit}" also-hidden="false">
<parameter param-name="dataSourceTypeId"/>
</hyperlink>
</field>
- <field name="deleteLink" title="&nbsp;" widget-style="buttontext">
+ <field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink target="deleteDataSourceType" description="${uiLabelMap.CommonDelete}" also-hidden="false">
<parameter param-name="dataSourceTypeId"/>
</hyperlink>
Modified: ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml?rev=768705&r1=768704&r2=768705&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml (original)
+++ ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml Sun Apr 26 13:50:42 2009
@@ -82,7 +82,7 @@
<field name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}"><display-entity description="${campaignName}" entity-name="MarketingCampaign"/></field>
<field name="prodCatalogId"><display-entity description="${catalogName}" entity-name="ProdCatalog"/></field>
- <field name="deleteLink" title="&nbsp;" widget-style="buttontext">
+ <field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink target="deleteTrackingCode" description="${uiLabelMap.CommonDelete}" also-hidden="false">
<parameter param-name="trackingCodeId"/>
</hyperlink>
@@ -304,7 +304,7 @@
</field>
<field name="description" title="${uiLabelMap.MarketingTrackingCodeTypeDescription}"><display/></field>
- <field name="deleteLink" title="&nbsp;" widget-style="buttontext">
+ <field name="deleteLink" title=" " widget-style="buttontext">
<hyperlink target="deleteTrackingCodeType" description="${uiLabelMap.CommonDelete}" also-hidden="false">
<parameter param-name="trackingCodeTypeId"/>
</hyperlink>
Modified: ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml?rev=768705&r1=768704&r2=768705&view=diff
==============================================================================
--- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original)
+++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Sun Apr 26 13:50:42 2009
@@ -162,10 +162,10 @@
<field name="subject"><text size="60" default-value="${parameters.subject}"/></field>
<field name="contentMimeTypeId"><hidden value="text/plain"/></field>
<field name="content" title="${uiLabelMap.CommonContent}" encode-output="false"><textarea cols="72" rows="15" default-value="${parameters.content}"/></field>
- <field name="send" title="&nbsp;" position="1" use-when="communicationEvent!=null">
+ <field name="send" title=" " position="1" use-when="communicationEvent!=null">
<hyperlink also-hidden="true" target-type="plain" description="${uiLabelMap.CommonSend}" target="javascript:(document.EditEmail.submit())"/>
</field>
- <field name="save" title="&nbsp;" position="2" use-when="communicationEvent!=null">
+ <field name="save" title=" " position="2" use-when="communicationEvent!=null">
<hyperlink also-hidden="true" target-type="plain" description="${uiLabelMap.CommonSave}" target="javascript:(document.EditEmail.statusId.value='COM_PENDING'),(document.EditEmail.submit())"/>
</field>
<field name="createButton" use-when="communicationEvent==null"><submit/></field>
@@ -189,12 +189,12 @@
<field name="subject"><text size="60" default-value="${parameters.subject}"/></field>
<field name="contentMimeTypeId"><hidden value="text/plain"/></field>
<field name="content" title="${uiLabelMap.CommonContent}"><textarea cols="60" rows="10" default-value="${parameters.content}"/></field>
- <field name="send" title="&nbsp;" position="1" use-when="communicationEvent!=null">
- <hyperlink also-hidden="true"
- target-type="plain" description="${uiLabelMap.CommonSend}"
+ <field name="send" title=" " position="1" use-when="communicationEvent!=null">
+ <hyperlink also-hidden="true"
+ target-type="plain" description="${uiLabelMap.CommonSend}"
target="javascript:(document.EditInternalNote.statusId.value='COM_COMPLETE'),(document.EditInternalNote.submit())"/>
</field>
- <field name="save" title="&nbsp;" position="2" use-when="communicationEvent!=null">
+ <field name="save" title=" " position="2" use-when="communicationEvent!=null">
<hyperlink also-hidden="true" target-type="plain" description="${uiLabelMap.CommonSave}" target="javascript:(document.EditInternalNote.submit())"/>
</field>
<field name="createButton" use-when="communicationEvent==null"><submit/></field>
@@ -356,7 +356,7 @@
<field name="createdStamp" title="${uiLabelMap.CommonCreated}"><display type="date"/></field>
<field name="datetimeStarted" title="${uiLabelMap.CommonSend}"><display type="date"/></field>
</form>
- <form name="ListPartyCommEvents" extends="ListCommEvents" extends-resource="component://party/webapp/partymgr/communication/CommForms.xml"
+ <form name="ListPartyCommEvents" extends="ListCommEvents" extends-resource="component://party/webapp/partymgr/communication/CommForms.xml"
type="list" target="RemoveCommunicationEventRole" header-row-style="header-row-2">
<row-actions>
<set field="toComplete" value="${bsh:"COM_ROLE_READ".equals(roleStatusId)?"PartyToComplete":""}"/>
Modified: ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml?rev=768705&r1=768704&r2=768705&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/ProductForms.xml Sun Apr 26 13:50:42 2009
@@ -18,7 +18,7 @@
under the License.
-->
-<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
<!-- UNUSED FORM
<form name="EditProductSimpleTest" type="single" target="updateProduct" title=""
@@ -33,7 +33,7 @@
<field use-when="product==null" name="isCreate"><hidden value="true"/></field>
- <field position="1" use-when="product!=null" name="productId" title="${uiLabelMap.ProductProductId}" tooltip="&nbsp;${uiLabelMap.ProductNotModificationRecreatingProduct}"><display/></field>
+ <field position="1" use-when="product!=null" name="productId" title="${uiLabelMap.ProductProductId}" tooltip="${uiLabelMap.ProductNotModificationRecreatingProduct}"><display/></field>
<field position="1" use-when="product==null&&productId==null" name="productId" title="${uiLabelMap.ProductProductId}"><text size="20" maxlength="20"/></field>
<field position="1" use-when="product==null&&productId!=null" name="productId" title="${uiLabelMap.ProductProductId}" tooltip="${uiLabelMap.ProductNotFindProductId} [${productId}]"><text size="20" maxlength="20"/></field>
Modified: ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml?rev=768705&r1=768704&r2=768705&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/store/ProductStoreForms.xml Sun Apr 26 13:50:42 2009
@@ -439,7 +439,7 @@
</drop-down>
</field>
- <field name="spacer" title="&nbsp;"><display/></field>
+ <field name="spacer" title=" "><display/></field>
<field name="submit" title="${uiLabelMap.CommonSubmit}" widget-style="smallSubmit"><submit/></field>
</form>