svn commit: r614356 [1/2] - in /ofbiz/trunk/applications/mark
Locked
 
|
Author: mrisaliti
Date: Tue Jan 22 14:18:56 2008 New Revision: 614356 URL: http://svn.apache.org/viewvc?rev=614356&view=rev Log: Segment/Tracking Code/Report forms (ftl/widgets screen) has now the same look and feel (Part of issue OFBIZ-1588) Modified: ofbiz/trunk/applications/marketing/config/MarketingUiLabels.properties ofbiz/trunk/applications/marketing/config/MarketingUiLabels_it.properties ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceForms.xml ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentMenus.xml ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeMenus.xml ofbiz/trunk/applications/marketing/widget/CommonScreens.xml ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml ofbiz/trunk/applications/marketing/widget/MarketingMenus.xml ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml ofbiz/trunk/applications/marketing/widget/ReportForms.xml ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml ofbiz/trunk/applications/marketing/widget/TrackingCodeScreens.xml Modified: ofbiz/trunk/applications/marketing/config/MarketingUiLabels.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/config/MarketingUiLabels.properties?rev=614356&r1=614355&r2=614356&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/config/MarketingUiLabels.properties (original) +++ ofbiz/trunk/applications/marketing/config/MarketingUiLabels.properties Tue Jan 22 14:18:56 2008 @@ -53,6 +53,7 @@ MarketingCampaignSummary=Campaign Summary MarketingMainPage=Main MarketingManagerApplication=Marketing Manager Application +MarketingManagerWelcome=Welcome to the Marketing Manager! MarketingParentCampaignId=Parent Campaign Id MarketingServiceError=There was a problem processing your request. Please try again. If the problem persists, please contact us. MarketingViewPermissionError=View Permission Error Modified: ofbiz/trunk/applications/marketing/config/MarketingUiLabels_it.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/config/MarketingUiLabels_it.properties?rev=614356&r1=614355&r2=614356&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/config/MarketingUiLabels_it.properties (original) +++ ofbiz/trunk/applications/marketing/config/MarketingUiLabels_it.properties Tue Jan 22 14:18:56 2008 @@ -56,6 +56,7 @@ MarketingCampaignSummary=Sommario Campagna MarketingMainPage=Pagina Principale MarketingManagerApplication=Applicazione Gestione Vendite +MarketingManagerWelcome=Benvenuto nell\'Applicazione Gestione Vendite! MarketingParentCampaignId=Codice Campagna Padre MarketingViewPermissionError=Mostra Errore Permessi 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=614356&r1=614355&r2=614356&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactListForms.xml Tue Jan 22 14:18:56 2008 @@ -24,11 +24,11 @@ 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> + <field use-when="contactList!=null" name="contactListId" title="${uiLabelMap.ContactListContactListId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> <field use-when="contactList==null&&contactListId==null" name="contactListId" title="${uiLabelMap.ContactListContactListId}"><ignored/></field> - <field use-when="contactList==null&&contactListId!=null" name="contactListId" title="${uiLabelMap.ContactListContactListId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${contactListId}]" widget-style="tabletext"><display/></field> + <field use-when="contactList==null&&contactListId!=null" name="contactListId" title="${uiLabelMap.ContactListContactListId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${contactListId}]"><display/></field> - <field name="contactListName" widget-style="inputBox" title="${uiLabelMap.ContactListContactListName}"><text/></field> + <field name="contactListName" title="${uiLabelMap.ContactListContactListName}"><text/></field> <field name="contactListTypeId" title="${uiLabelMap.ContactListContactListTypeId}"> <drop-down> <entity-options description="${description}" entity-name="ContactListType" key-field-name="contactListTypeId"> @@ -152,7 +152,7 @@ </entity-options> </drop-down> </field> - <field name="optInVerifyCode" widget-style="inputBox" map-name="parameters" title="${uiLabelMap.ContactListOptInVerifyCode}"><text size="10"/></field> + <field name="optInVerifyCode" map-name="parameters" title="${uiLabelMap.ContactListOptInVerifyCode}"><text size="10"/></field> <field name="preferredContactMechId" title="${uiLabelMap.ContactListPreferredContactMech}"> <lookup target-form-name="LookupPreferredContactMech" target-parameter="partyId"/> @@ -219,7 +219,7 @@ </field> <field name="partyIdFrom" title="${uiLabelMap.PartyPartyFrom}"><lookup target-form-name="LookupPartyName"/></field> - <field name="statusId" use-when="communicationEvent==null" title="${uiLabelMap.CommonStatus}" widget-style="selectBox"> + <field name="statusId" use-when="communicationEvent==null" title="${uiLabelMap.CommonStatus}"> <drop-down allow-empty="false" no-current-selected-key="COM_PENDING"> <entity-options description="${description}" entity-name="StatusItem" key-field-name="statusId"> <entity-constraint name="statusTypeId" operator="equals" value="COM_EVENT_STATUS"/> @@ -227,7 +227,7 @@ </entity-options> </drop-down> </field> - <field name="statusId" use-when="communicationEvent!=null" title="${uiLabelMap.CommonStatus}" widget-style="selectBox"> + <field name="statusId" use-when="communicationEvent!=null" title="${uiLabelMap.CommonStatus}"> <drop-down allow-empty="false" current-description="${uiLabelMap.CommonSelectOne}"> <entity-options entity-name="StatusValidChangeToDetail" key-field-name="statusIdTo" description="${transitionName} (${description})"> <entity-constraint name="statusId" value="${communicationEvent.statusId}"/> 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=614356&r1=614355&r2=614356&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceForms.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/datasource/DataSourceForms.xml Tue Jan 22 14:18:56 2008 @@ -24,9 +24,9 @@ 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> + <field use-when="dataSource!=null" name="dataSourceId" title="${uiLabelMap.DataSourceDataSourceId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> <field use-when="dataSource==null&&dataSourceId==null" name="dataSourceId" title="${uiLabelMap.DataSourceDataSourceId}"><text/></field> - <field use-when="dataSource==null&&dataSourceId!=null" name="dataSourceId" title="${uiLabelMap.DataSourceDataSourceId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${dataSourceId}]" widget-style="tabletext"><display/></field> + <field use-when="dataSource==null&&dataSourceId!=null" name="dataSourceId" title="${uiLabelMap.DataSourceDataSourceId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${dataSourceId}]"><display/></field> <field name="dataSourceTypeId" title="${uiLabelMap.DataSourceDataSourceTypeId}"> <drop-down> @@ -35,7 +35,7 @@ </entity-options> </drop-down> </field> - <field name="description" widget-style="inputBox" title="${uiLabelMap.DataSourceDataSourceDescription}"><text/></field> + <field name="description" title="${uiLabelMap.DataSourceDataSourceDescription}"><text/></field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field> <!-- <field name="DONE_PAGE"><hidden value="${donePage}"/></field> --> @@ -61,9 +61,9 @@ 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> + <field use-when="dataSourceType!=null" name="dataSourceTypeId" title="${uiLabelMap.DataSourceDataSourceTypeId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> <field use-when="dataSourceType==null&&dataSourceTypeId==null" name="dataSourceTypeId" title="${uiLabelMap.DataSourceDataSourceTypeId}"><text/></field> - <field use-when="dataSourceType==null&&dataSourceTypeId!=null" name="dataSourceTypeId" title="${uiLabelMap.DataSourceDataSourceTypeId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${dataSourceTypeId}]" widget-style="tabletext"><display/></field> + <field use-when="dataSourceType==null&&dataSourceTypeId!=null" name="dataSourceTypeId" title="${uiLabelMap.DataSourceDataSourceTypeId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${dataSourceTypeId}]"><display/></field> <field name="description" title="${uiLabelMap.DataSourceTypeDescription}"><text/></field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field> Modified: ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml?rev=614356&r1=614355&r2=614356&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml Tue Jan 22 14:18:56 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"> - <form name="FindSegmentGroup" list-name="listIt" target="" title="" type="list" paginate-target="FindSegmentGroup"> + <form name="FindSegmentGroup" list-name="listIt" target="" title="" type="list" paginate-target="FindSegmentGroup" + 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"/> @@ -40,12 +41,13 @@ </field> </form> - <form name="EditSegmentGroup" type="single" target="updateSegmentGroup" title="" default-map-name="segmentGroup"> + <form name="EditSegmentGroup" type="single" target="updateSegmentGroup" title="" default-map-name="segmentGroup" + header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="segmentGroup==null" target="createSegmentGroup"/> - <field use-when="segmentGroup!=null" name="segmentGroupId" title="${uiLabelMap.SegmentGroupSegmentGroupId}" tooltip="${uiLabelMap.CommonNotModifRecreat}" widget-style="tabletext"><display/></field> + <field use-when="segmentGroup!=null" name="segmentGroupId" title="${uiLabelMap.SegmentGroupSegmentGroupId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> <field use-when="segmentGroup==null&&segmentGroupId==null" name="segmentGroupId" title="${uiLabelMap.SegmentGroupSegmentGroupId}"><ignored/></field> - <field use-when="segmentGroup==null&&segmentGroupId!=null" name="segmentGroupId" title="${uiLabelMap.SegmentGroupSegmentGroupId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${segmentGroupId}]" widget-style="tabletext"><display/></field> + <field use-when="segmentGroup==null&&segmentGroupId!=null" name="segmentGroupId" title="${uiLabelMap.SegmentGroupSegmentGroupId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${segmentGroupId}]"><display/></field> <field name="segmentGroupTypeId" title="${uiLabelMap.SegmentGroupSegmentGroupTypeId}"> <drop-down> @@ -67,7 +69,8 @@ <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> - <form name="AddSegmentGroupClass" type="single" target="createSegmentGroupClassification" title="" default-map-name="segmentGroupClass"> + <form name="AddSegmentGroupClass" type="single" target="createSegmentGroupClassification" title="" default-map-name="segmentGroupClass" + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createSegmentGroupClassification"/> <field name="segmentGroupId"><hidden/></field> @@ -77,7 +80,8 @@ </field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> - <form name="listSegmentGroupClass" list-name="segmentGroupClassList" target="" title="" type="list" paginate-target="listSegmentGroupClass"> + <form name="listSegmentGroupClass" list-name="segmentGroupClassList" 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"/> @@ -91,7 +95,8 @@ </field> </form> - <form name="AddSegmentGroupGeo" type="single" target="createSegmentGroupGeo" title="" default-map-name="segmentGroupGeo"> + <form name="AddSegmentGroupGeo" type="single" target="createSegmentGroupGeo" title="" default-map-name="segmentGroupGeo" + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createSegmentGroupGeo"/> <field name="segmentGroupId"><hidden/></field> @@ -99,7 +104,8 @@ <field name="geoId" title="${uiLabelMap.SegmentGroupGeoId}"><lookup target-form-name="LookupGeo"/></field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> - <form name="listSegmentGroupGeo" list-name="segmentGroupGeos" target="" title="" type="list" paginate-target="listSegmentGroupGeo"> + <form name="listSegmentGroupGeo" list-name="segmentGroupGeos" target="" title="" type="list" paginate-target="listSegmentGroupGeo" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="SegmentGroupGeo"> <field-map field-name="segmentGroupId"/> @@ -113,7 +119,8 @@ </field> </form> - <form name="AddSegmentGroupRole" type="single" target="createSegmentGroupRole" title="" default-map-name="segmentGroupRole"> + <form name="AddSegmentGroupRole" type="single" target="createSegmentGroupRole" title="" default-map-name="segmentGroupRole" + header-row-style="header-row" default-table-style="basic-table"> <auto-fields-service service-name="createSegmentGroupRole"/> <field name="segmentGroupId"><hidden/></field> @@ -128,7 +135,8 @@ </field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> - <form name="listSegmentGroupRole" list-name="listIt" target="" title="" type="list" paginate-target="listSegmentGroupRole"> + <form name="listSegmentGroupRole" list-name="listIt" target="" title="" type="list" paginate-target="listSegmentGroupRole" + 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"/> @@ -148,4 +156,4 @@ description="${uiLabelMap.CommonDelete}" also-hidden="false"/> </field> </form> -</forms> +</forms> \ No newline at end of file Modified: ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentMenus.xml?rev=614356&r1=614355&r2=614356&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentMenus.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentMenus.xml Tue Jan 22 14:18:56 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="SegmentGroupTabBar" default-menu-item-name="Segment" type="simple" selected-menuitem-context-field-name="segmentTabButtonItem"> + <menu name="SegmentGroupTabBar" default-menu-item-name="Segment" type="simple" selected-menuitem-context-field-name="segmentTabButtonItem" + default-selected-style="selected" menu-container-style="button-bar tab-bar"> <menu-item name="SegmentGroup" title="${uiLabelMap.SegmentGroupSegmentGroup}"> <link target="viewSegmentGroup?segmentGroupId=${segmentGroupId}"/> </menu-item> @@ -33,4 +34,4 @@ <link target="listSegmentGroupRole?segmentGroupId=${segmentGroupId}"/> </menu-item> </menu> -</menus> +</menus> \ No newline at end of file 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=614356&r1=614355&r2=614356&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeForms.xml Tue Jan 22 14:18:56 2008 @@ -20,15 +20,16 @@ <forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd"> - <form name="EditTrackingCode" type="single" target="updateTrackingCode" title="" default-map-name="trackingCode"> + <form name="EditTrackingCode" type="single" target="updateTrackingCode" title="" default-map-name="trackingCode" + header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="trackingCode==null" target="createTrackingCode"/> - <field use-when="trackingCode!=null" name="trackingCodeId" title="${uiLabelMap.TrackingCodeTrackingCodeId}" tooltip="${uiLabelMap.CommonNotModifRecreat}" widget-style="tabletext"><display/></field> + <field use-when="trackingCode!=null" name="trackingCodeId" title="${uiLabelMap.TrackingCodeTrackingCodeId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> <field use-when="trackingCode==null&&trackingCodeId==null" name="trackingCodeId" title="${uiLabelMap.TrackingCodeTrackingCodeId}"><text/></field> - <field use-when="trackingCode==null&&trackingCodeId!=null" name="trackingCodeId" title="${uiLabelMap.TrackingCodeTrackingCodeId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${trackingCodeId}]" widget-style="tabletext"><display/></field> + <field use-when="trackingCode==null&&trackingCodeId!=null" name="trackingCodeId" title="${uiLabelMap.TrackingCodeTrackingCodeId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${trackingCodeId}]"><display/></field> - <field name="description" widget-style="inputBox" title="${uiLabelMap.TrackingCodeDescription}"><text/></field> - <field name="comments" widget-style="inputBox" title="${uiLabelMap.TrackingCodeComments}"><textarea/></field> + <field name="description" title="${uiLabelMap.TrackingCodeDescription}"><text/></field> + <field name="comments" title="${uiLabelMap.TrackingCodeComments}"><textarea/></field> <field name="trackingCodeTypeId" title="${uiLabelMap.TrackingCodeTrackingCodeTypeId}"> <drop-down> <entity-options description="${description}" entity-name="TrackingCodeType" key-field-name="trackingCodeTypeId"> @@ -66,7 +67,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="ListTrackingCode" target="ListTrackingCode" title="" type="list"> + <form name="ListTrackingCode" target="ListTrackingCode" title="" type="list" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="TrackingCode"/> </actions> @@ -82,10 +84,12 @@ <hyperlink target="deleteTrackingCode?trackingCodeId=${trackingCodeId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> </field> </form> - <form name="FindTrackingCode" type="single" target="ListTrackingCode" title=""> - <auto-fields-entity entity-name="TrackingCode"/> + <form name="FindTrackingCode" type="single" target="ListTrackingCode" title="" + header-row-style="header-row" default-table-style="basic-table"> + <auto-fields-entity entity-name="TrackingCode"/> </form> - <form name="EditTrackingCodeOrder" type="single" target="updateTrackingCodeOrder" title="" default-map-name="trackingCodeOrder"> + <form name="EditTrackingCodeOrder" type="single" target="updateTrackingCodeOrder" title="" default-map-name="trackingCodeOrder" + header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="trackingCodeOrder==null" target="createTrackingCodeOrder"/> <field name="trackingCodeId" title="${uiLabelMap.TrackingCodeTrackingCodeId}"><display/></field> @@ -107,8 +111,8 @@ <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> - <form name="FindTrackingCodeOrders" type="single" target="ListTrackingCodeOrders" title=""> - + <form name="FindTrackingCodeOrders" type="single" target="ListTrackingCodeOrders" title="" + header-row-style="header-row" default-table-style="basic-table"> <field name="trackingCodeId" title="${uiLabelMap.TrackingCodeTrackingCodeId}"><text-find/></field> <field name="orderId" title="${uiLabelMap.TrackingCodeOrderOrderId}"><lookup target-form-name="LookupOrderName"/></field> <field name="trackingCodeTypeId" title="${uiLabelMap.TrackingCodeTrackingCodeTypeId}"> @@ -121,7 +125,8 @@ <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> - <form name="ListTrackingCodeOrders" type="list" title="" paginate-target="FindTrackingCodeOrders" list-name="listIt"> + <form name="ListTrackingCodeOrders" type="list" title="" paginate-target="FindTrackingCodeOrders" 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"/> @@ -136,13 +141,14 @@ <field name="isBillable" title="${uiLabelMap.TrackingCodeOrderIsBilliable}"><display/></field> </form> - <form name="EditTrackingCodeVisit" default-map-name="visit" target="updateTrackingCodeVisit" title="" type="single"> + <form name="EditTrackingCodeVisit" default-map-name="visit" target="updateTrackingCodeVisit" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <alt-target target="createTrackingCodeVisit" use-when="visit==null"/> <field name="tackingCodeId" title="${uiLabelMap.TrackingCodeTrackingCodeId}"><display/></field> <field name="visitId" title="${uiLabelMap.TrackingCodeVisitVisitId}"><display/></field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field> - <field name="sourceEnumId" title="${uiLabelMap.TrackingCodeVisitSourceEnumId}" widget-style="selectBox"> + <field name="sourceEnumId" title="${uiLabelMap.TrackingCodeVisitSourceEnumId}"> <drop-down> <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId"> <entity-constraint name="enumTypeId" operator="equals" value=" TRACKINGCODE_SRC"/> @@ -152,11 +158,12 @@ <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="FindTrackingCodeVisits" target="ListTrackingCodeVisits" title="" type="single"> + <form name="FindTrackingCodeVisits" target="ListTrackingCodeVisits" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <field name="trackingCodeId" title="${uiLabelMap.TrackingCodeTrackingCodeId}"><text/></field> <field name="visitId" title="${uiLabelMap.TrackingCodeVisitVisitId}"><lookup target-form-name="LookupVisit"/></field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-find/></field> - <field name="sourceEnumId" title="${uiLabelMap.TrackingCodeVisitSourceEnumId}" widget-style="selectBox"> + <field name="sourceEnumId" title="${uiLabelMap.TrackingCodeVisitSourceEnumId}"> <drop-down> <entity-options description="${description}" entity-name="Enumeration" key-field-name="enumId"> <entity-constraint name="enumTypeId" operator="equals" value=" TRACKINGCODE_SRC"/> @@ -165,7 +172,8 @@ </field> <field name="submitButton" title="${uiLabelMap.CommonFind}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> - <form name="ListTrackingCodeVisits" list-name="listIt" title="" paginate-target="FindTrackingCodeVisits" type="list"> + <form name="ListTrackingCodeVisits" list-name="listIt" title="" paginate-target="FindTrackingCodeVisits" 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="requestParameters" field-name="inputFields"/> @@ -182,7 +190,8 @@ <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display/></field> </form> - <form name="LookupTrackingCode" default-map-name="trackingCode" target="LookupTrackingCode" title="" type="single"> + <form name="LookupTrackingCode" default-map-name="trackingCode" target="LookupTrackingCode" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <field name="trackingCodeId" title="${uiLabelMap.TrackingCodeTrackingCodeId}"><text-find/></field> <field name="description" title="${uiLabelMap.TrackingCodeDescription}"><text-find/></field> <field name="trackingCodeTypeId" title="${uiLabelMap.TrackingCodeTrackingCodeTypeId}"> @@ -208,7 +217,8 @@ </field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> - <form name="ListLookupTrackingCode" target="" title="" type="list"> + <form name="ListLookupTrackingCode" 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"/> @@ -224,14 +234,16 @@ <field name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignId}"><display-entity description="${campaignName}" entity-name="MarketingCampaign"/></field> </form> - <form name="LookupVisit" target="LookupVisit" title="" type="single"> + <form name="LookupVisit" target="LookupVisit" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <field name="visitId" title="${uiLabelMap.TrackingCodeVisitVisitId}"><text-find/></field> <field name="partyId" title="${uiLabelMap.TrackingCodeVisitPartyId}"><lookup target-form-name="LookupPartyName"/></field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><date-find/></field> <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><date-find/></field> <field name="submitButton" title="${uiLabelMap.CommonFind}"><submit button-type="button"/></field> </form> - <form name="ListLookupVisit" target="" title="" type="list"> + <form name="ListLookupVisit" 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"/> @@ -257,20 +269,22 @@ <field name="webappName" title="${uiLabelMap.TrackingCodeVisitWebappName}"><display/></field> <field name="sessionId" title="${uiLabelMap.TrackingCodeVisitSessionId}"><display/></field> </form> - <form name="EditTrackingCodeType" type="single" target="updateTrackingCodeType" title="" default-map-name="trackingCodeType"> + <form name="EditTrackingCodeType" type="single" target="updateTrackingCodeType" title="" default-map-name="trackingCodeType" + header-row-style="header-row" default-table-style="basic-table"> <alt-target use-when="trackingCodeType==null" target="createTrackingCodeType"/> - <field use-when="trackingCodeType!=null" name="trackingCodeTypeId" title="${uiLabelMap.TrackingCodeTrackingCodeTypeId}" tooltip="${uiLabelMap.CommonNotModifRecreat}" widget-style="tabletext"><display/></field> + <field use-when="trackingCodeType!=null" name="trackingCodeTypeId" title="${uiLabelMap.TrackingCodeTrackingCodeTypeId}" tooltip="${uiLabelMap.CommonNotModifRecreat}"><display/></field> <field use-when="trackingCodeType==null&&trackingCodeTypeId==null" name="trackingCodeTypeId" title="${uiLabelMap.TrackingCodeTrackingCodeId}"><text/></field> - <field use-when="trackingCodeType==null&&trackingCodeTypeId!=null" name="trackingCodeTypeId" title="${uiLabelMap.TrackingCodeTrackingCodeId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${trackingCodeTypeId}]" widget-style="tabletext"><display/></field> + <field use-when="trackingCodeType==null&&trackingCodeTypeId!=null" name="trackingCodeTypeId" title="${uiLabelMap.TrackingCodeTrackingCodeId}" tooltip="${uiLabelMap.CommonCannotBeFound}: [${trackingCodeTypeId}]"><display/></field> - <field name="description" widget-style="inputBox" title="${uiLabelMap.TrackingCodeTypeDescription}"><text/></field> + <field name="description" title="${uiLabelMap.TrackingCodeTypeDescription}"><text/></field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field> <!-- <field name="DONE_PAGE"><hidden value="${donePage}"/></field> --> <!-- <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="ListTrackingCodeType" target="ListTrackingCodeType" title="" type="list"> + <form name="ListTrackingCodeType" target="ListTrackingCodeType" title="" type="list" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> <actions> <entity-condition entity-name="TrackingCodeType"/> </actions> @@ -283,12 +297,14 @@ <hyperlink target="deleteTrackingCodeType?trackingCodeTypeId=${trackingCodeTypeId}" description="${uiLabelMap.CommonDelete}" also-hidden="false"/> </field> </form> - <form name="LookupTrackingCodeType" default-map-name="trackingCode" target="LookupTrackingCodeType" title="" type="single"> + <form name="LookupTrackingCodeType" default-map-name="trackingCode" target="LookupTrackingCodeType" title="" type="single" + header-row-style="header-row" default-table-style="basic-table"> <field name="trackingCodeTypeId" title="${uiLabelMap.TrackingCodeTrackingCodeTypeId}"><text-find/></field> <field name="description" title="${uiLabelMap.TrackingCodeTypeDescription}"><text-find/></field> <field name="submitButton" title="${uiLabelMap.CommonSave}" widget-style="buttontext"><submit button-type="text-link"/></field> </form> - <form name="ListLookupTrackingCodeType" target="" title="" type="list"> + <form name="ListLookupTrackingCodeType" 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"/> @@ -300,4 +316,4 @@ </field> <field name="description" title="${uiLabelMap.TrackingCodeTypeDescription}"><display/></field> </form> -</forms> +</forms> \ No newline at end of file Modified: ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeMenus.xml?rev=614356&r1=614355&r2=614356&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeMenus.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/trackingcode/TrackingCodeMenus.xml Tue Jan 22 14:18:56 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="TrackingCodeTabBar" default-menu-item-name="TrackingCode" type="simple" selected-menuitem-context-field-name="trackingCodeTabButtonItem"> + <menu name="TrackingCodeTabBar" default-menu-item-name="TrackingCode" type="simple" selected-menuitem-context-field-name="trackingCodeTabButtonItem" + default-selected-style="selected" menu-container-style="button-bar tab-bar"> <menu-item name="TrackingCode" title="${uiLabelMap.TrackingCode}"> <link target="/FindTrackingCode"/> </menu-item> @@ -43,4 +44,4 @@ <link target="/FindTrackingCodeType"/> </menu-item> </menu> -</menus> +</menus> \ 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=614356&r1=614355&r2=614356&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/CommonScreens.xml Tue Jan 22 14:18:56 2008 @@ -91,10 +91,10 @@ <decorator-section name="body"> <container style="screenlet"> <container style="screenlet-header"> - <label style="boxhead" text="Marketing Manager Main Page"/> + <label style="boxhead" text="${uiLabelMap.MarketingManagerApplication}"/> </container> <container style="screenlet-body"> - <container><label style="tabletext" text="Welcome to the Marketing Manager!"/></container> + <container><label style="label" text="${uiLabelMap.MarketingManagerWelcome}"/></container> </container> </container> </decorator-section> Modified: ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml?rev=614356&r1=614355&r2=614356&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/ContactListScreens.xml Tue Jan 22 14:18:56 2008 @@ -188,7 +188,7 @@ <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> + <container><label text="${contactListPartyStatus.statusDate} ${contactListPartyStatus.description} [by: ${contactListPartyStatus.setByUserLoginId}] [code: ${contactListPartyStatus.optInVerifyCode}]"/></container> </widgets> </section> </iterate-section> Modified: ofbiz/trunk/applications/marketing/widget/MarketingMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/MarketingMenus.xml?rev=614356&r1=614355&r2=614356&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/MarketingMenus.xml (original) +++ ofbiz/trunk/applications/marketing/widget/MarketingMenus.xml Tue Jan 22 14:18:56 2008 @@ -19,14 +19,14 @@ --> <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd"> <menu name="MarketingAppBar" default-menu-item-name="main" id="app-navigation" type="simple" title="${uiLabelMap.MarketingManagerApplication}" - default-selected-style="selected"> + default-selected-style="selected" menu-container-style="button-bar tab-bar"> <menu-item name="main" title="${uiLabelMap.MarketingMainPage}"><link target="main"/></menu-item> <menu-item name="DataSource" title="${uiLabelMap.DataSource}"><link target="FindDataSource"/></menu-item> <menu-item name="Campaign" title="${uiLabelMap.MarketingCampaign}"><link target="FindMarketingCampaign"/></menu-item> <menu-item name="Tracking" title="${uiLabelMap.Tracking}"><link target="FindTrackingCode"/></menu-item> <menu-item name="Segment" title="${uiLabelMap.Segment}"><link target="FindSegmentGroup"/></menu-item> <menu-item name="ContactList" title="${uiLabelMap.ContactList}"><link target="FindContactLists"/></menu-item> - + <menu-item name="Reports" title="${uiLabelMap.MarketingReports}"><link target="MarketingReport"/></menu-item> <menu-item name="Logout" title="Logout" align-style="col-right" selected-style="selected"> <condition><not><if-empty field-name="userLogin"/></not></condition> <link target="logout"/> @@ -35,7 +35,5 @@ <condition><if-empty field-name="userLogin"/></condition> <link target="${checkLoginUrl}"/> </menu-item> - <menu-item name="Reports" title="${uiLabelMap.MarketingReports}" align-style="col-right"><link target="MarketingReport"/></menu-item> - </menu> -</menus> +</menus> \ No newline at end of file Modified: ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml?rev=614356&r1=614355&r2=614356&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/MarketingReportScreens.xml Tue Jan 22 14:18:56 2008 @@ -44,25 +44,43 @@ <screen name="MarketingReportList"> <section> <actions> - <set field="title" value="Marketing Reports"/> - <set field="headerItem" value="reports"/> + <set field="titleProperty" value="MarketingReports"/> + <set field="tabButtonItem" value="Reports"/> <!-- <script location="component://order/webapp/ordermgr/WEB-INF/actions/reports/reportlist.bsh"/>--> </actions> <widgets> <decorator-screen name="CommonMarketReportDecorator"> <decorator-section name="body"> - <container> - <label style="head1" text="${uiLabelMap.MarketingReports}"/> + <container style="head1"> + <label text="${uiLabelMap.MarketingReports}"/> </container> - <container> - <label style="head2" text="${uiLabelMap.MarketingTrackingCodeReportTitle}"/> - <include-form name="TrackingCodeReportOptions" - location="component://marketing/widget/ReportForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.MarketingTrackingCodeReportTitle}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="TrackingCodeReportOptions" location="component://marketing/widget/ReportForms.xml"/> + </widgets> + </section> + </container> </container> - <container> - <label style="head2" text="${uiLabelMap.MarketingCampaignReportTitle}"/> - <include-form name="MarketingCampaignOptions" - location="component://marketing/widget/ReportForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.MarketingCampaignReportTitle}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="MarketingCampaignOptions" location="component://marketing/widget/ReportForms.xml"/> + </widgets> + </section> + </container> </container> </decorator-section> </decorator-screen> @@ -73,7 +91,7 @@ <screen name="TrackingCodeReport"> <section> <actions> - <set field="title" value="${uiLabelMap.MarketingTrackingCodeReportTitle}"/> + <set field="titleProperty" value="MarketingTrackingCodeReportTitle"/> <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <script location="component://marketing/webapp/marketing/WEB-INF/actions/reports/TrackingCodeReport.bsh"/> @@ -81,9 +99,20 @@ <widgets> <decorator-screen name="CommonMarketReportDecorator"> <decorator-section name="body"> - <label style="head1" text="${uiLabelMap.MarketingTrackingCodeReportTitle}"></label> - <label style="head1" text="${uiLabelMap.CommonFrom} ${parameters.fromDate} ${uiLabelMap.CommonThru} ${parameters.thruDate}"/> - <include-form name="TrackingCodeReport" location="component://marketing/widget/ReportForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.MarketingTrackingCodeReportTitle} ${uiLabelMap.CommonFrom} ${parameters.fromDate} ${uiLabelMap.CommonThru} ${parameters.thruDate}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="TrackingCodeReport" location="component://marketing/widget/ReportForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -101,12 +130,23 @@ <widgets> <decorator-screen name="CommonMarketReportDecorator"> <decorator-section name="body"> - <label style="head1" text="${uiLabelMap.MarketingCampaignReportTitle}"></label> - <label style="head1" text="${uiLabelMap.CommonFrom} ${parameters.fromDate} ${uiLabelMap.CommonThru} ${parameters.thruDate}"/> - <include-form name="MarketCampaignReport" location="component://marketing/widget/ReportForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.MarketingCampaignReportTitle} ${uiLabelMap.CommonFrom} ${parameters.fromDate} ${uiLabelMap.CommonThru} ${parameters.thruDate}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="MarketCampaignReport" location="component://marketing/widget/ReportForms.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/ReportForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/ReportForms.xml?rev=614356&r1=614355&r2=614356&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/ReportForms.xml (original) +++ ofbiz/trunk/applications/marketing/widget/ReportForms.xml Tue Jan 22 14:18:56 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"> - <form name="TrackingCodeReportOptions" type="single" target="TrackingCodeReport" title="${uiLabelMap.MarketingTrackingCodeReportTitle}"> + <form name="TrackingCodeReportOptions" type="single" target="TrackingCodeReport" title="${uiLabelMap.MarketingTrackingCodeReportTitle}" + header-row-style="header-row" default-table-style="basic-table"> <field name="fromDate" title="${uiLabelMap.CommonFromDate} (${uiLabelMap.CommonDate}>=)"> <date-time type="timestamp"/> </field> @@ -42,7 +43,8 @@ </field> </form> - <form name="MarketingCampaignOptions" type="single" target="MarketingCampaignReport" title="Marketing Campaign Report"> + <form name="MarketingCampaignOptions" type="single" target="MarketingCampaignReport" + header-row-style="header-row" default-table-style="basic-table"> <field name="fromDate" title="${uiLabelMap.CommonFromDate} (${uiLabelMap.CommonDate}>=)"> <date-time type="timestamp"/> </field> @@ -63,8 +65,9 @@ </field> </form> - <form name="TrackingCodeReport" list-name="trackingCodeVisitAndOrders" target="" title="${uiLabelMap.TrackingCodeReportTitle}" type="list" paginate-target="TrackingCodeReport"> - <field name="trackingCodeId" widget-area-style="tabletext" title="${uiLabelMap.TrackingCode}"> + <form name="TrackingCodeReport" list-name="trackingCodeVisitAndOrders" target="" title="${uiLabelMap.TrackingCodeReportTitle}" type="list" paginate-target="TrackingCodeReport" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + <field name="trackingCodeId" title="${uiLabelMap.TrackingCode}"> <display-entity entity-name="TrackingCode" key-field-name="trackingCodeId" description="${description} [${trackingCodeId}]"/> </field> <field name="visits" title="${uiLabelMap.MarketingVisits}"><display/></field> @@ -73,8 +76,9 @@ <field name="conversionRate" title="${uiLabelMap.MarketingConversionRate}"><display/></field> </form> - <form name="MarketCampaignReport" title="${uiLabelMap.MarketingCampaignReportTitle}" type="list" list-name="marketingCampaignVisitAndOrders" target="" paginate-target="MarketCampaignReport"> - <field name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignName}" widget-area-style="tabletext"> + <form name="MarketCampaignReport" title="${uiLabelMap.MarketingCampaignReportTitle}" type="list" list-name="marketingCampaignVisitAndOrders" target="" paginate-target="MarketCampaignReport" + odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + <field name="marketingCampaignId" title="${uiLabelMap.MarketingCampaignName}"> <display-entity entity-name="MarketingCampaign" key-field-name="marketingCampaignId" description="${campaignName} [${marketingCampaignId}]"/> </field> <field name="visits" title="${uiLabelMap.MarketingVisits}"><display/></field> @@ -82,6 +86,4 @@ <field name="orderAmount" title="${uiLabelMap.MarketingOrderAmount}"><display/></field> <field name="conversionRate" title="${uiLabelMap.MarketingConversionRate}"><display/></field> </form> - -</forms> - +</forms> \ No newline at end of file Modified: ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml?rev=614356&r1=614355&r2=614356&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml Tue Jan 22 14:18:56 2008 @@ -48,9 +48,21 @@ <if-has-permission permission="MARKETING" action="_VIEW"/> </condition> <widgets> - <container><label style="head1">${uiLabelMap.PageTitleFindSegmentGroup}</label></container> - <container><link text="${uiLabelMap.SegmentGroupCreate}" target="viewSegmentGroup" style="buttontext"/></container> - <include-form name="FindSegmentGroup" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleFindSegmentGroup}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <container><link text="${uiLabelMap.SegmentGroupCreate}" target="viewSegmentGroup" style="buttontext"/></container> + <include-form name="FindSegmentGroup" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/> + </widgets> + </section> + </container> + </container> </widgets> <fail-widgets> <label style="head3">${uiLabelMap.SegmentGroupMgrViewPermissionError}</label> @@ -116,8 +128,20 @@ <widgets> <decorator-screen name="CommonSegmentGroupDecorator"> <decorator-section name="body"> - <container><label style="head1">${uiLabelMap.PageTitleEditSegmentGroup}</label></container> - <include-form name="EditSegmentGroup" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditSegmentGroup}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="EditSegmentGroup" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/> + </widgets> + </section> + </container> + </container> </decorator-section> </decorator-screen> </widgets> @@ -152,10 +176,34 @@ <if-has-permission permission="MARKETING" action="_VIEW"/> </condition> <widgets> - <container><label style="head1">${uiLabelMap.PageTitleListSegmentGroupClass}</label></container> - <include-form name="listSegmentGroupClass" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/> - <container><label style="head1">${uiLabelMap.SegmentGroupClassCreate}</label></container> - <include-form name="AddSegmentGroupClass" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleListSegmentGroupClass}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="listSegmentGroupClass" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.SegmentGroupClassCreate}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddSegmentGroupClass" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/> + </widgets> + </section> + </container> + </container> </widgets> <fail-widgets> <label style="head3">${uiLabelMap.SegmentGroupMgrViewPermissionError}</label> @@ -194,10 +242,34 @@ <if-has-permission permission="MARKETING" action="_VIEW"/> </condition> <widgets> - <container><label style="head1">${uiLabelMap.PageTitleListSegmentGroupGeo}</label></container> - <include-form name="listSegmentGroupGeo" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/> - <label style="head1">${uiLabelMap.PageTitleEditSegmentGroupGeo}</label> - <include-form name="AddSegmentGroupGeo" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleListSegmentGroupGeo}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="listSegmentGroupGeo" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditSegmentGroupGeo}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddSegmentGroupGeo" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/> + </widgets> + </section> + </container> + </container> </widgets> <fail-widgets> <label style="head3">${uiLabelMap.SegmentGroupMgrViewPermissionError}</label> @@ -236,10 +308,34 @@ <if-has-permission permission="MARKETING" action="_VIEW"/> </condition> <widgets> - <container><label style="head1">${uiLabelMap.PageTitleListSegmentGroupRole}</label></container> - <include-form name="listSegmentGroupRole" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/> - <label style="head1">${uiLabelMap.PageTitleEditSegmentGroupRole}</label> - <include-form name="AddSegmentGroupRole" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleListSegmentGroupRole}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="listSegmentGroupRole" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/> + </widgets> + </section> + </container> + </container> + <container style="screenlet"> + <container style="screenlet-title-bar"> + <container style="head4"> + <label text="${uiLabelMap.PageTitleEditSegmentGroupRole}"/> + </container> + </container> + <container style="screenlet-body"> + <section> + <widgets> + <include-form name="AddSegmentGroupRole" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/> + </widgets> + </section> + </container> + </container> </widgets> <fail-widgets> <label style="head3">${uiLabelMap.SegmentGroupMgrViewPermissionError}</label> @@ -250,4 +346,4 @@ </widgets> </section> </screen> -</screens> +</screens> \ No newline at end of file |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |