svn commit: r614323 - in /ofbiz/trunk/applications/mark
Locked
 
|
Author: mrisaliti
Date: Tue Jan 22 13:07:22 2008 New Revision: 614323 URL: http://svn.apache.org/viewvc?rev=614323&view=rev Log: Marketing Campaign/Contact List/Data Source/Lookup forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1588) Modified: ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListMenus.xml ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceForms.xml ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceMenus.xml ofbiz/trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml ofbiz/trunk/applications/marketing/widget/CommonScreens.xml ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml ofbiz/trunk/applications/marketing/widget/LookupScreens.xml ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.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=614323&r1=614322&r2=614323&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignForms.xml Tue Jan 22 13:07:22 2008 @@ -20,7 +20,8 @@ <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"> + <form name="EditMarketingCampaign" type="single" target="updateMarketingCampaign" title="" default-map-name="marketingCampaign" + header-row-style="header-row" default-table-style="basic-table"> <actions> <property-to-field field="defaultCurrencyUomId" resource="general" property="currency.uom.id.default" default="USD"/> </actions> @@ -65,7 +66,8 @@ <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"> + <form name="ListMarketingCampaign" list-name="" target="" title="" type="list" paginate-target="listMarketingCampaign" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="MarketingCampaign"/> </actions> @@ -82,7 +84,8 @@ </field> </form> - <form name="ListMarketingCampaignRoles" list-name="" target="" title="" type="list" paginate-target="listMarketingCampaignGeo" > + <form name="ListMarketingCampaignRoles" list-name="" target="" title="" type="list" paginate-target="listMarketingCampaignGeo" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="MarketingCampaignRole"> <field-map field-name="marketingCampaignId" env-name="marketingCampaignId" /> @@ -117,7 +120,8 @@ </field> </form> - <form name="EditMarketingCampaignRoles" type="single" target="updateMarketingCampaignRole" title="" default-map-name="marketingCampaignRole"> + <form name="EditMarketingCampaignRoles" type="single" target="updateMarketingCampaignRole" title="" default-map-name="marketingCampaignRole" + header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="marketingCampaignRole==null" target="createMarketingCampaignRole"/> <auto-fields-service service-name="updateMarketingCampaignRole"/> @@ -137,5 +141,4 @@ <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> +</forms> \ No newline at end of file Modified: ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml?rev=614323&r1=614322&r2=614323&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/campaign/MarketingCampaignMenus.xml Tue Jan 22 13:07:22 2008 @@ -19,7 +19,8 @@ --> <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd"> - <menu name="MarketingCampaignTabBar" default-menu-item-name="MarketingCampaign" type="simple" selected-menuitem-context-field-name="campaignTabButtonItem"> + <menu name="MarketingCampaignTabBar" default-menu-item-name="MarketingCampaign" type="simple" selected-menuitem-context-field-name="campaignTabButtonItem" + default-selected-style="selected" menu-container-style="button-bar tab-bar"> <menu-item name="MarketingCampaign" title="${uiLabelMap.MarketingCampaign}"> <link target="/EditMarketingCampaign?marketingCampaignId=${marketingCampaignId}"/> </menu-item> 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=614323&r1=614322&r2=614323&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml Tue Jan 22 13:07:22 2008 @@ -20,7 +20,8 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - <form name="EditContactList" type="single" target="updateContactList" title="" default-map-name="contactList"> + <form name="EditContactList" type="single" target="updateContactList" title="" default-map-name="contactList" + header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="contactList==null" target="createContactList"/> <field use-when="contactList!=null" name="contactListId" title="${uiLabelMap.ContactListContactListId}" tooltip="${uiLabelMap.CommonNotModifRecreat}" widget-style="tabletext"><display/></field> @@ -79,7 +80,8 @@ <!-- <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}" target-type="inter-app"/></field> --> </form> - <form name="FindContactLists" target="ListContactLists" title="" type="single"> + <form name="FindContactLists" target="ListContactLists" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <field name="noConditionFind"><hidden value="Y"/></field> <field name="contactListId" title="${uiLabelMap.ContactListContactListId}"><text size="20" maxlength="20"/></field> <field name="contactListName" title="${uiLabelMap.ContactListContactListName}"><text-find/></field> @@ -107,7 +109,8 @@ <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="smallSubmit"><submit/></field> </form> - <form name="ListContactLists" target="ListContactLists" title="" type="list" list-name="listIt"> + <form name="ListContactLists" target="ListContactLists" title="" type="list" list-name="listIt" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> <field-map field-name="inputFields" env-name="parameters"/> @@ -132,7 +135,8 @@ --> </form> - <form name="EditContactListParty" type="single" target="updateContactListParty" title="" default-map-name="contactListParty"> + <form name="EditContactListParty" type="single" target="updateContactListParty" title="" default-map-name="contactListParty" + header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="contactListParty==null" target="createContactListParty"/> <field name="contactListId"><hidden/></field> @@ -157,8 +161,8 @@ <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> - <form name="FindContactListParties" type="single" target="ListContactListParties" title=""> - + <form name="FindContactListParties" type="single" target="ListContactListParties" title="" + header-row-style="header-row" default-table-style="basic-table"> <field name="contactListId" title="${uiLabelMap.ContactListContactListId}"><text-find/></field> <field name="partyId" title="${uiLabelMap.ContactListPartyId}"><lookup target-form-name="LookupPartyName"/></field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-find/></field> @@ -178,7 +182,8 @@ <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> - <form name="ListContactListParties" type="list" title="" list-name="listIt" paginate-target="ListContactListParties"> + <form name="ListContactListParties" type="list" title="" list-name="listIt" paginate-target="ListContactListParties" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> <field-map field-name="inputFields" env-name="parameters"/> @@ -201,7 +206,8 @@ </field> </form> - <form name="EditContactListCommEvent" default-map-name="communicationEvent" target="updateContactListCommEvent" title="" type="single"> + <form name="EditContactListCommEvent" default-map-name="communicationEvent" target="updateContactListCommEvent" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <alt-target target="createContactListCommEvent" use-when="communicationEvent==null"/> <field name="communicationEventId" use-when="communicationEvent!=null" title="${uiLabelMap.ContactListCommEventId}"><display/></field> <field name="communicationEventTypeId" title="${uiLabelMap.ContactListCommEventTypeId}"> @@ -289,7 +295,8 @@ <field name="submitButton" title="${uiLabelMap.CommonSave}"><submit button-type="button"/> </field> <field name="cancelLink" title="${uiLabelMap.CommonCancel}" widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}"/></field> </form> - <form name="FindContactListCommEvents" target="ListContactListCommEvents" title="" type="single"> + <form name="FindContactListCommEvents" target="ListContactListCommEvents" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <field name="contactListId" title="${uiLabelMap.ContactListContactListId}"><text/></field> <field name="commEventId" title="${uiLabelMap.ContactListCommEventId}"><lookup target-form-name="LookupCommEvent"/></field> <field name="statusId" title="${uiLabelMap.CommonStatus}"> @@ -303,7 +310,8 @@ <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-find/></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> - <form name="ListContactListCommEvents" list-name="listIt" title="" type="list" paginate-target="ListContactListCommEvents"> + <form name="ListContactListCommEvents" list-name="listIt" title="" type="list" paginate-target="ListContactListCommEvents" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service result-map-list-name="listIt" result-map-name="result" service-name="performFind"> <field-map field-name="inputFields" env-name="parameters"/> @@ -323,13 +331,14 @@ <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}"><display-entity description="${description}" entity-name="ContactMechType" key-field-name="contactMechTypeId"/></field> <field name="roleTypeIdFrom" title="${uiLabelMap.PartyRoleTypeIdFrom}"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field> <field name="roleTypeIdTo" title="${uiLabelMap.PartyRoleTypeIdTo}"><display-entity description="${description}" entity-name="RoleType" key-field-name="roleTypeId"/></field> - <field name="custReqestId" position="1"><text size="20"/></field> + <field name="custReqestId" position="1"><display/></field> <field name="datetimeStarted" title="${uiLabelMap.CommonStartDate}"><display/></field> <field name="datetimeEnded" title="${uiLabelMap.CommonFinishDate}"><display/></field> - <field map-name="subjectMap" name="subject" title="${uiLabelMap.PartyCommEventSubject}"><text size="30"/></field> + <field map-name="subjectMap" name="subject" title="${uiLabelMap.PartyCommEventSubject}"><display/></field> </form> - <form name="LookupContactList" default-map-name="contactList" target="LookupContactList" title="" type="single"> + <form name="LookupContactList" default-map-name="contactList" target="LookupContactList" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <field name="contactListId" title="${uiLabelMap.ContactListContactListId}"><text-find/></field> <field name="contactListName" title="${uiLabelMap.ContactListContactListName}"><text-find/></field> <field name="contactListTypeId" title="${uiLabelMap.ContactListContactListTypeId}"> @@ -356,7 +365,8 @@ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="ListLookupContactList" list-name="listIt" target="" title="" type="list"> + <form name="ListLookupContactList" list-name="listIt" target="" title="" type="list" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service result-map-list-name="listIt" result-map-name="result" service-name="performFind"> <field-map env-name="parameters" field-name="inputFields"/> @@ -372,7 +382,8 @@ <field name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}"><display-entity description="${campaignName}" entity-name="MarketingCampaign"/></field> </form> - <form name="LookupCommEvent" target="LookupCommEvent" title="" type="single"> + <form name="LookupCommEvent" target="LookupCommEvent" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <field name="communicationEventId" title="${uiLabelMap.ContactListCommEventId}"><text-find/></field> <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}"><lookup target-form-name="LookupPartyName"/></field> <field name="partyIdTo" title="${uiLabelMap.PartyPartyTo}"><lookup target-form-name="LookupPartyName"/></field> @@ -399,7 +410,8 @@ <field map-name="subjectMap" name="subject" title="${uiLabelMap.PartyCommEventSubject}"><text-find/></field> <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field> </form> - <form name="ListLookupCommEvent" target="" title="" type="list"> + <form name="ListLookupCommEvent" target="" title="" type="list" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service result-map-list-name="listIt" result-map-name="result" service-name="performFind"> <field-map env-name="parameters" field-name="inputFields"/> @@ -423,7 +435,8 @@ <field name="datetimeStarted" title="${uiLabelMap.CommonStartDate}"><display/></field> <field name="datetimeEnded" title="${uiLabelMap.CommonFinishDate}"><display/></field> </form> - <form name="ListPreferredContactMech" target="" title="" type="list"> + <form name="ListPreferredContactMech" target="" title="" type="list" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="PartyAndContactMech"> <field-map field-name="partyId"/> @@ -436,4 +449,4 @@ <field name="contactMechTypeId" title="${uiLabelMap.ContactListContactMechTypeId}"><display-entity entity-name="ContactMechType"/></field> <field name="cmDetail"><display description="[${infoString}] [${tnCountryCode}-${tnAreaCode}-${tnContactNumber}] [${paAddress1}, ${paAddress2}, ${paCity}, ${paStateProvinceGeoId}, ${paPostalCode}, ${paPostalCodeExt} ${paCountryGeoId}]" also-hidden="false"/></field> </form> -</forms> +</forms> \ No newline at end of file Modified: ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListMenus.xml?rev=614323&r1=614322&r2=614323&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListMenus.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListMenus.xml Tue Jan 22 13:07:22 2008 @@ -19,7 +19,8 @@ --> <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd"> - <menu name="ContactListTabBar" default-menu-item-name="ContactList" type="simple"> + <menu name="ContactListTabBar" default-menu-item-name="ContactList" type="simple" + default-selected-style="selected" menu-container-style="button-bar tab-bar"> <menu-item name="ContactList" title="${uiLabelMap.ContactList}"> <link target="/EditContactList?contactListId=${contactListId}"/> </menu-item> 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=614323&r1=614322&r2=614323&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceForms.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceForms.xml Tue Jan 22 13:07:22 2008 @@ -20,7 +20,8 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - <form name="EditDataSource" type="single" target="updateDataSource" title="" default-map-name="dataSource"> + <form name="EditDataSource" type="single" target="updateDataSource" title="" default-map-name="dataSource" + header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="dataSource==null" target="createDataSource"/> <field use-when="dataSource!=null" name="dataSourceId" title="${uiLabelMap.DataSourceDataSourceId}" tooltip="${uiLabelMap.CommonNotModifRecreat}" widget-style="tabletext"><display/></field> @@ -41,7 +42,8 @@ <!-- <field name="cancelLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"><hyperlink target="${donePage}" also-hidden="false" description="${uiLabelMap.CommonCancelDone}" target-type="inter-app"/></field> --> </form> - <form name="ListDataSource" target="ListDataSource" title="" type="list"> + <form name="ListDataSource" target="ListDataSource" title="" type="list" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="DataSource"/> </actions> @@ -55,7 +57,8 @@ </field> </form> - <form name="EditDataSourceType" type="single" target="updateDataSourceType" title="" default-map-name="dataSourceType"> + <form name="EditDataSourceType" type="single" target="updateDataSourceType" title="" default-map-name="dataSourceType" + header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="dataSourceType==null" target="createDataSourceType"/> <field use-when="dataSourceType!=null" name="dataSourceTypeId" title="${uiLabelMap.DataSourceDataSourceTypeId}" tooltip="${uiLabelMap.CommonNotModifRecreat}" widget-style="tabletext"><display/></field> @@ -66,14 +69,15 @@ <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> - <form name="FindDataSourceTypes" type="single" target="ListDataSourceTypes" title=""> - + <form name="FindDataSourceTypes" type="single" target="ListDataSourceTypes" title="" + header-row-style="header-row" default-table-style="basic-table"> <field name="dataSourceTypeId" title="${uiLabelMap.DataSourceDataSourceTypeId}"><text-find/></field> <field name="description" title="${uiLabelMap.DataSourceTypeDescription}"><text-find/></field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> - <form name="ListDataSourceType" type="list" title="" list-name="listIt"> + <form name="ListDataSourceType" type="list" title="" list-name="listIt" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> <field-map field-name="inputFields" env-name="parameters"/> @@ -93,7 +97,8 @@ </field> </form> - <form name="LookupDataSource" default-map-name="dataSource" target="LookupDataSource" title="" type="single"> + <form name="LookupDataSource" default-map-name="dataSource" target="LookupDataSource" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <field name="dataSourceId" title="${uiLabelMap.DataSourceDataSourceId}"><text-find/></field> <field name="description" title="${uiLabelMap.DataSourceDataSourceDescription}"><text-find/></field> <field name="dataSourceTypeId" title="${uiLabelMap.DataSourceDataSourceTypeId}"> @@ -105,7 +110,8 @@ </field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> - <form name="ListLookupDataSource" target="" title="" type="list"> + <form name="ListLookupDataSource" target="" title="" type="list" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service result-map-list-name="listIt" result-map-name="result" service-name="performFind"> <field-map env-name="parameters" field-name="inputFields"/> @@ -119,12 +125,14 @@ <field name="dataSourceTypeId" title="${uiLabelMap.DataSourceDataSourceTypeId}"><display-entity entity-name="DataSourceType"/></field> </form> - <form name="LookupDataSourceType" target="LookupDataSourceType" title="" type="single"> + <form name="LookupDataSourceType" target="LookupDataSourceType" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <field name="dataSourceTypeId" title="${uiLabelMap.DataSourceDataSourceTypeId}"><text-find/></field> <field name="description" title="${uiLabelMap.DataSourceTypeDescription}"><lookup target-form-name="LookupDataSourceType"/></field> <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field> </form> - <form name="ListLookupDataSourceType" target="" title="" type="list"> + <form name="ListLookupDataSourceType" target="" title="" type="list" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service result-map-list-name="listIt" result-map-name="result" service-name="performFind"> <field-map env-name="parameters" field-name="inputFields"/> @@ -136,4 +144,4 @@ </field> <field name="description" title="${uiLabelMap.DataSourceTypeDescription}"><display/></field> </form> -</forms> +</forms> \ No newline at end of file Modified: ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceMenus.xml?rev=614323&r1=614322&r2=614323&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceMenus.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceMenus.xml Tue Jan 22 13:07:22 2008 @@ -19,7 +19,9 @@ --> <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd"> - <menu name="DataSourceTabBar" default-menu-item-name="DataSource" type="simple" selected-menuitem-context-field-name="dataSourceTabButtonItem"> + <menu name="DataSourceTabBar" default-menu-item-name="DataSource" type="simple" + default-selected-style="selected" menu-container-style="button-bar tab-bar" + selected-menuitem-context-field-name="dataSourceTabButtonItem"> <menu-item name="DataSource" title="${uiLabelMap.DataSource}"> <link target="/FindDataSource"/> </menu-item> Modified: ofbiz/trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml?rev=614323&r1=614322&r2=614323&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/lookup/LookupForms.xml Tue Jan 22 13:07:22 2008 @@ -21,7 +21,8 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> <!-- SegmentGroup Lookup forms --> - <form name="LookupSegmentGroup" target="LookupSegmentGroup" title="" type="single"> + <form name="LookupSegmentGroup" target="LookupSegmentGroup" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <field name="segmentGroupId" title="${uiLabelMap.SegmentGroupSegmentGroupId}"><text-find/></field> <field name="segmentGroupTypeId" title="${uiLabelMap.SegmentGroupSegmentGroupTypeId}"><text-find/></field> <field name="description" title="${uiLabelMap.CommonDescription}"><text-find/></field> @@ -29,7 +30,8 @@ <field name="noConditionFind"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field> <field name="submitButton" title="${uiLabelMap.CommonLookup}" widget-style="smallSubmit"><submit button-type="button"/></field> </form> - <form name="listLookupSegmentGroup" list-name="listIt" target="" title="" type="list" paginate-target="LookupSegmentGroup" > + <form name="listLookupSegmentGroup" list-name="listIt" target="" title="" type="list" paginate-target="LookupSegmentGroup" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <service service-name="performFind" result-map-name="result" result-map-list-name="listIt"> <field-map field-name="inputFields" env-name="parameters"/> @@ -44,7 +46,8 @@ <field name="productStoreId" title="${uiLabelMap.SegmentGroupProductStoreId}"><display/></field> </form> - <form name="listSegmentGroupClass" list-name="listIt" target="" title="" type="list" paginate-target="listSegmentGroupClass" > + <form name="listSegmentGroupClass" list-name="listIt" target="" title="" type="list" paginate-target="listSegmentGroupClass" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="SegmentGroupClassification"> <field-map field-name="segmentGroupId" /> @@ -59,4 +62,4 @@ description="[${uiLabelMap.CommonDelete}]" also-hidden="false"/> </field> </form> -</forms> +</forms> \ No newline at end of file Modified: ofbiz/trunk/applications/marketing/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/CommonScreens.xml?rev=614323&r1=614322&r2=614323&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/CommonScreens.xml Tue Jan 22 13:07:22 2008 @@ -68,7 +68,7 @@ <widgets> <include-menu name="ContactListTabBar" location="component://marketing/webapp/marketing/contact/ContactListMenus.xml"/> <container> - <label style="head1">Contact List ${contactList.contactListName} [ID:${contactListId}]</label> + <label style="head1">${uiLabelMap.ContactList} ${contactList.contactListName} [${contactListId}]</label> </container> </widgets> </section> Modified: ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml?rev=614323&r1=614322&r2=614323&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml Tue Jan 22 13:07:22 2008 @@ -24,7 +24,7 @@ <screen name="FindContactLists"> <section> <actions> - <set field="titleProperty" value="PageTitleFindContactLists"/> + <set field="titleProperty" value="ContactListFindContactLists"/> <set field="tabButtonItem" value="ContactList"/> <set field="labelTitleProperty" value="PageTitleFindContactLists"/> <set field="donePage" from-field="parameters.DONE_PAGE" default-value="/marketing/control/FindContactList"/> @@ -32,9 +32,21 @@ <widgets> <decorator-screen name="CommonContactListDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container><label style="head1">${uiLabelMap.ContactListFindContactLists}</label></container> - <container><link text="${uiLabelMap.ContactListCreate}" target="EditContactList?DONE_PAGE=${donePage}" style="buttontext"/></container> - <include-form name="FindContactLists" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.ContactListFindContactLists}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container><link text="${uiLabelMap.ContactListCreate}" target="EditContactList?DONE_PAGE=${donePage}" style="buttontext"/></container> + <include-form name="FindContactLists" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -60,13 +72,37 @@ <not><if-empty field-name="contactList"/></not> </condition> <widgets> - <container><label style="head1">${uiLabelMap.PageTitleEditContactList}</label></container> - <container><link text="${uiLabelMap.ContactListCreate}" target="EditContactList?DONE_PAGE=${donePage}" style="buttontext"/></container> - <include-form name="EditContactList" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditContactList}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container><link text="${uiLabelMap.ContactListCreate}" target="EditContactList?DONE_PAGE=${donePage}" style="buttontext"/></container> + <include-form name="EditContactList" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> + </widgets> + </section> + </container> + </container> </widgets> <fail-widgets> - <label style="head1">${uiLabelMap.PageTitleAddContactList}</label> - <include-form name="EditContactList" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleAddContactList}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="EditContactList" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> + </widgets> + </section> + </container> + </container> </fail-widgets> </section> </decorator-section> @@ -93,9 +129,21 @@ <widgets> <decorator-screen name="CommonContactListDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container><label style="head1">${uiLabelMap.PageTitleEditContactList}</label></container> - <container><link text="${uiLabelMap.ContactListCreate}" target="EditContactList?DONE_PAGE=${donePage}" style="buttontext"/></container> - <include-form name="ListContactLists" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleListContactList}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container><link text="${uiLabelMap.ContactListCreate}" target="EditContactList?DONE_PAGE=${donePage}" style="buttontext"/></container> + <include-form name="ListContactLists" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -125,17 +173,29 @@ <widgets> <decorator-screen name="CommonContactListDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container><label style="head1">${uiLabelMap.PageTitleEditContactListParty}</label></container> - <container><link text="${uiLabelMap.ContactListPartyCreate}" target="EditContactListParty?contactListId=${contactListId}&DONE_PAGE=${donePage}" style="buttontext"/></container> - <include-form name="EditContactListParty" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> - <container><label style="head2" text="${uiLabelMap.CommonStatusHistory}"/></container> - <iterate-section entry-name="contactListPartyStatus" list-name="contactListPartyStatusList"> - <section> - <widgets> - <container><label style="tabletext" text="${contactListPartyStatus.statusDate} ${contactListPartyStatus.description} [by: ${contactListPartyStatus.setByUserLoginId}] [code: ${contactListPartyStatus.optInVerifyCode}]"/></container> - </widgets> - </section> - </iterate-section> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditContactListParty}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container><link text="${uiLabelMap.ContactListPartyCreate}" target="EditContactListParty?contactListId=${contactListId}&DONE_PAGE=${donePage}" style="buttontext"/></container> + <include-form name="EditContactListParty" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> + <container><label style="head2" text="${uiLabelMap.CommonStatusHistory}"/></container> + <iterate-section entry-name="contactListPartyStatus" list-name="contactListPartyStatusList"> + <section> + <widgets> + <container><label style="tabletext" text="${contactListPartyStatus.statusDate} ${contactListPartyStatus.description} [by: ${contactListPartyStatus.setByUserLoginId}] [code: ${contactListPartyStatus.optInVerifyCode}]"/></container> + </widgets> + </section> + </iterate-section> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -159,9 +219,21 @@ <widgets> <decorator-screen name="CommonContactListDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container><label style="head1">${uiLabelMap.PageTitleEditContactList}</label></container> - <container><link text="${uiLabelMap.ContactListPartyCreate}" target="EditContactListParty?contactListId=${contactListId}&DONE_PAGE=${donePage}" style="buttontext"/></container> - <include-form name="ListContactListParties" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleListContactListParty}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container><link text="${uiLabelMap.ContactListPartyCreate}" target="EditContactListParty?contactListId=${contactListId}&DONE_PAGE=${donePage}" style="buttontext"/></container> + <include-form name="ListContactListParties" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -180,9 +252,21 @@ <widgets> <decorator-screen name="CommonContactListDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container><label style="head1">${uiLabelMap.PageTitleFindContactListParty}</label></container> - <container><link text="${uiLabelMap.ContactListPartyCreate}" target="EditContactListParty?contactListId=${contactListId}&DONE_PAGE=${donePage}" style="buttontext"/></container> - <include-form name="FindContactListParties" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleFindContactListParty}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container><link text="${uiLabelMap.ContactListPartyCreate}" target="EditContactListParty?contactListId=${contactListId}&DONE_PAGE=${donePage}" style="buttontext"/></container> + <include-form name="FindContactListParties" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -207,9 +291,21 @@ <widgets> <decorator-screen name="CommonContactListDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container><label style="head1">${uiLabelMap.PageTitleEditContactList}</label></container> - <container><link text="${uiLabelMap.ContactListCommEventCreate}" target="EditContactListCommEvent?contactListId=${contactListId}&DONE_PAGE=${donePage}" style="buttontext"/></container> - <include-form name="EditContactListCommEvent" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditContactList}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container><link text="${uiLabelMap.ContactListCommEventCreate}" target="EditContactListCommEvent?contactListId=${contactListId}&DONE_PAGE=${donePage}" style="buttontext"/></container> + <include-form name="EditContactListCommEvent" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -232,9 +328,21 @@ <widgets> <decorator-screen name="CommonContactListDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container><label style="head1">${uiLabelMap.PageTitleListContactList} ${uiLabelMap.CommonFor} contactListId=${contactListId}</label></container> - <container><link text="${uiLabelMap.ContactListCommEventCreate}" target="EditContactListCommEvent?contactListId=${contactListId}&DONE_PAGE=${donePage}" style="buttontext"/></container> - <include-form name="ListContactListCommEvents" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleListContactList} ${uiLabelMap.CommonFor} contactListId=${contactListId}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container><link text="${uiLabelMap.ContactListCommEventCreate}" target="EditContactListCommEvent?contactListId=${contactListId}&DONE_PAGE=${donePage}" style="buttontext"/></container> + <include-form name="ListContactListCommEvents" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -253,9 +361,21 @@ <widgets> <decorator-screen name="CommonContactListDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <container><label style="head1">${uiLabelMap.PageTitleFindContactListCommEvent}</label></container> - <container><link text="${uiLabelMap.ContactListCommEventCreate}" target="EditContactListCommEvent?contactListId=${contactListId}&DONE_PAGE=${donePage}" style="buttontext"/></container> - <include-form name="FindContactListCommEvents" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleFindContactListCommEvents}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container><link text="${uiLabelMap.ContactListCommEventCreate}" target="EditContactListCommEvent?contactListId=${contactListId}&DONE_PAGE=${donePage}" style="buttontext"/></container> + <include-form name="FindContactListCommEvents" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -274,9 +394,21 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="body"> - <container><label style="head1">${uiLabelMap.PageTitleLookupContactList}</label></container> - <include-form name="LookupContactList" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> - <include-form name="ListLookupContactList" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleLookupContactList}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="LookupContactList" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> + <include-form name="ListLookupContactList" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -297,11 +429,23 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="body"> - <container><label style="head1">${uiLabelMap.PageTitlePreferredContactMech}</label></container> - <include-form name="ListPreferredContactMech" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitlePreferredContactMech}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="ListPreferredContactMech" location="component://marketing/webapp/marketing/contact/ContactListForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> </section> </screen> -</screens> +</screens> \ No newline at end of file Modified: ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml?rev=614323&r1=614322&r2=614323&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/DataSourceScreens.xml Tue Jan 22 13:07:22 2008 @@ -76,13 +76,37 @@ <not><if-empty field-name="dataSource"/></not> </condition> <widgets> - <container><label style="head1">${uiLabelMap.PageTitleEditDataSource}</label></container> - <container><link text="${uiLabelMap.DataSourceCreate}" target="/EditDataSource?DONE_PAGE=${donePage}" style="buttontext"/></container> - <include-form name="EditDataSource" location="component://marketing/webapp/marketing/datasource/DataSourceForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditDataSource}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container><link text="${uiLabelMap.DataSourceCreate}" target="/EditDataSource?DONE_PAGE=${donePage}" style="buttontext"/></container> + <include-form name="EditDataSource" location="component://marketing/webapp/marketing/datasource/DataSourceForms.xml"/> + </widgets> + </section> + </container> + </container> </widgets> <fail-widgets> - <label style="head1">${uiLabelMap.PageTitleAddDataSource}</label> - <include-form name="EditDataSource" location="component://marketing/webapp/marketing/datasource/DataSourceForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleAddDataSource}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="EditDataSource" location="component://marketing/webapp/marketing/datasource/DataSourceForms.xml"/> + </widgets> + </section> + </container> + </container> </fail-widgets> </section> </decorator-section> @@ -105,9 +129,21 @@ <widgets> <decorator-screen name="CommonDataSourceDecorator"> <decorator-section name="body"> - <container><label style="head1">${uiLabelMap.PageTitleEditDataSource}</label></container> - <container><link text="${uiLabelMap.DataSourceCreate}" target="/EditDataSource?DONE_PAGE=${donePage}" style="buttontext"/></container> - <include-form name="ListDataSource" location="component://marketing/webapp/marketing/datasource/DataSourceForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleListDataSource}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container><link text="${uiLabelMap.DataSourceCreate}" target="/EditDataSource?DONE_PAGE=${donePage}" style="buttontext"/></container> + <include-form name="ListDataSource" location="component://marketing/webapp/marketing/datasource/DataSourceForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -133,13 +169,37 @@ <not><if-empty field-name="dataSourceType"/></not> </condition> <widgets> - <container><label style="head1">${uiLabelMap.PageTitleEditDataSourceType}</label></container> - <container><link text="${uiLabelMap.DataSourceTypeCreate}" target="/EditDataSourceType?DONE_PAGE=${donePage}" style="buttontext"/></container> - <include-form name="EditDataSourceType" location="component://marketing/webapp/marketing/datasource/DataSourceForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditDataSourceType}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container><link text="${uiLabelMap.DataSourceTypeCreate}" target="/EditDataSourceType?DONE_PAGE=${donePage}" style="buttontext"/></container> + <include-form name="EditDataSourceType" location="component://marketing/webapp/marketing/datasource/DataSourceForms.xml"/> + </widgets> + </section> + </container> + </container> </widgets> <fail-widgets> - <label style="head1">${uiLabelMap.PageTitleAddDataSourceType}</label> - <include-form name="EditDataSourceType" location="component://marketing/webapp/marketing/datasource/DataSourceForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleAddDataSourceType}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="EditDataSourceType" location="component://marketing/webapp/marketing/datasource/DataSourceForms.xml"/> + </widgets> + </section> + </container> + </container> </fail-widgets> </section> </decorator-section> @@ -162,13 +222,24 @@ <widgets> <decorator-screen name="CommonDataSourceDecorator"> <decorator-section name="body"> - <container><label style="head1">${uiLabelMap.PageTitleEditDataSourceType}</label></container> - <container><link text="${uiLabelMap.DataSourceTypeCreate}" target="/EditDataSourceType?DONE_PAGE=${donePage}" style="buttontext"/></container> - <include-form name="ListDataSourceType" location="component://marketing/webapp/marketing/datasource/DataSourceForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleListDataSourceType}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container><link text="${uiLabelMap.DataSourceTypeCreate}" target="/EditDataSourceType?DONE_PAGE=${donePage}" style="buttontext"/></container> + <include-form name="ListDataSourceType" location="component://marketing/webapp/marketing/datasource/DataSourceForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> </section> </screen> - -</screens> +</screens> \ No newline at end of file Modified: ofbiz/trunk/applications/marketing/widget/LookupScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/LookupScreens.xml?rev=614323&r1=614322&r2=614323&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/LookupScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/LookupScreens.xml Tue Jan 22 13:07:22 2008 @@ -40,11 +40,24 @@ <widgets> <decorator-screen name="LookupDecorator" location="component://common/widget/CommonScreens.xml"> <decorator-section name="body"> - <include-form name="LookupSegmentGroup" location="component://marketing/webapp/marketing/lookup/LookupForms.xml"/> - <include-form name="listLookupSegmentGroup" location="component://marketing/webapp/marketing/lookup/LookupForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleLookupSegmentGroup}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="LookupSegmentGroup" location="component://marketing/webapp/marketing/lookup/LookupForms.xml"/> + <include-form name="listLookupSegmentGroup" location="component://marketing/webapp/marketing/lookup/LookupForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> </section> </screen> -</screens> +</screens> \ No newline at end of file Modified: ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml?rev=614323&r1=614322&r2=614323&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/MarketingCampaignScreens.xml Tue Jan 22 13:07:22 2008 @@ -76,13 +76,37 @@ <not><if-empty field-name="marketingCampaign"/></not> </condition> <widgets> - <container><label style="head1">${uiLabelMap.PageTitleEditMarketingCampaign}</label></container> - <container><link text="${uiLabelMap.MarketingCampaignCreate}" target="/EditMarketingCampaign?DONE_PAGE=${donePage}" style="buttontext"/></container> - <include-form name="EditMarketingCampaign" location="component://marketing/webapp/marketing/campaign/MarketingCampaignForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditMarketingCampaign}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container><link text="${uiLabelMap.MarketingCampaignCreate}" target="/EditMarketingCampaign?DONE_PAGE=${donePage}" style="buttontext"/></container> + <include-form name="EditMarketingCampaign" location="component://marketing/webapp/marketing/campaign/MarketingCampaignForms.xml"/> + </widgets> + </section> + </container> + </container> </widgets> <fail-widgets> - <label style="head1">${uiLabelMap.PageTitleAddMarketingCampaign}</label> - <include-form name="EditMarketingCampaign" location="component://marketing/webapp/marketing/campaign/MarketingCampaignForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleAddMarketingCampaign}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="EditMarketingCampaign" location="component://marketing/webapp/marketing/campaign/MarketingCampaignForms.xml"/> + </widgets> + </section> + </container> + </container> </fail-widgets> </section> </decorator-section> @@ -104,9 +128,21 @@ <widgets> <decorator-screen name="CommonMarketingCampaignDecorator"> <decorator-section name="body"> - <container><label style="head1">${uiLabelMap.PageTitleEditMarketingCampaign}</label></container> - <container><link text="${uiLabelMap.MarketingCampaignCreate}" target="/EditMarketingCampaign?DONE_PAGE=${donePage}" style="buttontext"/></container> - <include-form name="ListMarketingCampaign" location="component://marketing/webapp/marketing/campaign/MarketingCampaignForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleListMarketingCampaign}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container><link text="${uiLabelMap.MarketingCampaignCreate}" target="/EditMarketingCampaign?DONE_PAGE=${donePage}" style="buttontext"/></container> + <include-form name="ListMarketingCampaign" location="component://marketing/webapp/marketing/campaign/MarketingCampaignForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -129,10 +165,22 @@ <widgets> <decorator-screen name="CommonMarketingCampaignDecorator"> <decorator-section name="body"> - <container><label style="head1">${uiLabelMap.PageTitleEditMarketingCampaignRole}</label></container> - <container><link text="${uiLabelMap.MarketingCampaignRoleCreate}" target="/EditMarketingCampaignRoles?marketingCampaignId=${marketingCampaignId}&DONE_PAGE=${donePage}" style="buttontext"/></container> - <include-form name="EditMarketingCampaignRoles" location="component://marketing/webapp/marketing/campaign/MarketingCampaignForms.xml"/> - <container><label style="head2" text="${uiLabelMap.CommonStatusHistory}"/></container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditMarketingCampaignRole}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container><link text="${uiLabelMap.MarketingCampaignRoleCreate}" target="/EditMarketingCampaignRoles?marketingCampaignId=${marketingCampaignId}&DONE_PAGE=${donePage}" style="buttontext"/></container> + <include-form name="EditMarketingCampaignRoles" location="component://marketing/webapp/marketing/campaign/MarketingCampaignForms.xml"/> + <container><label style="head2" text="${uiLabelMap.CommonStatusHistory}"/></container> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -151,9 +199,21 @@ <widgets> <decorator-screen name="CommonMarketingCampaignDecorator"> <decorator-section name="body"> - <container><label style="head1">${uiLabelMap.PageTitleEditMarketingCampaignRole}</label></container> - <container><link text="${uiLabelMap.MarketingCampaignRoleCreate}" target="/EditMarketingCampaignRoles?marketingCampaignId=${marketingCampaignId}&DONE_PAGE=${donePage}" style="buttontext"/></container> - <include-form name="ListMarketingCampaignRoles" location="component://marketing/webapp/marketing/campaign/MarketingCampaignForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleListMarketingCampaignRole}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container><link text="${uiLabelMap.MarketingCampaignRoleCreate}" target="/EditMarketingCampaignRoles?marketingCampaignId=${marketingCampaignId}&DONE_PAGE=${donePage}" style="buttontext"/></container> + <include-form name="ListMarketingCampaignRoles" location="component://marketing/webapp/marketing/campaign/MarketingCampaignForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -172,13 +232,24 @@ <widgets> <decorator-screen name="CommonMarketingCampaignDecorator"> <decorator-section name="body"> - <container><label style="head1">${uiLabelMap.PageTitleFindMarketingCampaignRole}</label></container> - <container><link text="${uiLabelMap.MarketingCampaignRoleCreate}" target="/EditMarketingCampaignRole?marketingCampaignId=${marketingCampaignId}&DONE_PAGE=${donePage}" style="buttontext"/></container> - <include-form name="FindMarketingCampaignRoles" location="component://marketing/webapp/marketing/campaign/MarketingCampaignForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleFindMarketingCampaignRole}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container><link text="${uiLabelMap.MarketingCampaignRoleCreate}" target="/EditMarketingCampaignRole?marketingCampaignId=${marketingCampaignId}&DONE_PAGE=${donePage}" style="buttontext"/></container> + <include-form name="FindMarketingCampaignRoles" location="component://marketing/webapp/marketing/campaign/MarketingCampaignForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> </section> - </screen> - -</screens> + </screen> +</screens> \ No newline at end of file |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |