svn commit: r667012 - in /ofbiz/trunk/applications/mark
Locked
 
|
Author: ashish
Date: Thu Jun 12 02:26:02 2008 New Revision: 667012 URL: http://svn.apache.org/viewvc?rev=667012&view=rev Log: Applied patch from JIRA issue https://issues.apache.org/jira/browse/OFBIZ-1839. Container tag to Screenlet conversion is done in this patch. Thanks Parimal Gain for your patch. Special thanks to Ratnesh Upadhyay for helping Parimal. Modified: ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml Modified: ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml?rev=667012&r1=667011&r2=667012&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml (original) +++ ofbiz/trunk/applications/marketing/config/MarketingUiLabels.xml Thu Jun 12 02:26:02 2008 @@ -790,33 +790,6 @@ <value xml:lang="th">รายà¸à¸²à¸£à¸ªà¸à¸²à¸à¸°à¹à¸à¸à¸à¸²à¸£à¸à¸¥à¸²à¸</value> <value xml:lang="zh">å¸åºæ»å¿è§è²å表</value> </property> - <property key="PageTitleListSegmentGroupClass"> - <value xml:lang="en">List Segment Group Classifications</value> - <value xml:lang="es">Mostrar clasificación de segmento</value> - <value xml:lang="fr">Liste des classifications du groupe de segment</value> - <value xml:lang="it">Lista Classificazioni Gruppo Segmento</value> - <value xml:lang="ro">Lista Clasificare Grup Segment</value> - <value xml:lang="th">รายà¸à¸²à¸£à¸ªà¹à¸§à¸à¸à¸à¸à¸à¸²à¸£à¸à¸±à¸à¹à¸à¹à¸à¸à¸£à¸°à¹à¸ à¸à¸à¸¥à¸¸à¹à¸¡</value> - <value xml:lang="zh">ååºç»åç±»å表</value> - </property> - <property key="PageTitleListSegmentGroupGeo"> - <value xml:lang="en">List Segment Group Geos</value> - <value xml:lang="es">Mostrar ubicación de segmento</value> - <value xml:lang="fr">Liste des zones géographiques de groupe de segment</value> - <value xml:lang="it">Lista Gruppo Segmento Geos</value> - <value xml:lang="ro">Lista Grup Segment Geos</value> - <value xml:lang="th">รายà¸à¸²à¸£à¸ªà¹à¸§à¸à¸à¸à¸à¹à¸à¸£à¸à¸ªà¸£à¹à¸²à¸à¸à¸¥à¸¸à¹à¸¡</value> - <value xml:lang="zh">ååºç»å°ç</value> - </property> - <property key="PageTitleListSegmentGroupRole"> - <value xml:lang="en">List Segment Group Roles</value> - <value xml:lang="es">Mostrar roles de segmentos</value> - <value xml:lang="fr">Liste des rôles du groupe de segment</value> - <value xml:lang="it">Visualizza Ruoli Gruppo Segmento</value> - <value xml:lang="ro">Visualizeaza Rol Grup Segment</value> - <value xml:lang="th">รายà¸à¸²à¸£à¸ªà¹à¸§à¸à¸à¸à¸à¸ªà¸à¸²à¸à¸°à¸à¸¥à¸¸à¹à¸¡</value> - <value xml:lang="zh">ååºç»è§è²å表</value> - </property> <property key="PageTitleListTrackingCode"> <value xml:lang="en">List Tracking Code</value> <value xml:lang="es">Mostrar seguimientos</value> 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=667012&r1=667011&r2=667012&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml (original) +++ ofbiz/trunk/applications/marketing/webapp/marketing/segment/SegmentForms.xml Thu Jun 12 02:26:02 2008 @@ -81,7 +81,7 @@ <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" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="SegmentGroupClassification"> <field-map field-name="segmentGroupId"/> @@ -105,7 +105,7 @@ <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" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> <actions> <entity-and entity-name="SegmentGroupGeo"> <field-map field-name="segmentGroupId"/> @@ -136,7 +136,7 @@ <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" - odd-row-style="alternate-row" default-table-style="basic-table hover-bar"> + odd-row-style="alternate-row" header-row-style="header-row-2" 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"/> Modified: ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml?rev=667012&r1=667011&r2=667012&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/SegmentScreens.xml Thu Jun 12 02:26:02 2008 @@ -176,34 +176,10 @@ <if-has-permission permission="MARKETING" action="_VIEW"/> </condition> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <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="h3"> - <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> + <screenlet id="SegmentGroupClassPanel" title="${uiLabelMap.SegmentGroupClassCreate}" collapsible="true"> + <include-form name="AddSegmentGroupClass" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/> + </screenlet> + <include-form name="listSegmentGroupClass" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/> </widgets> <fail-widgets> <label style="h3">${uiLabelMap.SegmentGroupMgrViewPermissionError}</label> @@ -226,7 +202,7 @@ <actions> <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/> - <set field="titleProperty" value="PageTitleListSegmentGroupGeo"/> + <set field="titleProperty" value="PageTitleEditSegmentGroupGeo"/> <set field="segmentTabButtonItem" value="SegmentGroupGeo"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> @@ -242,34 +218,10 @@ <if-has-permission permission="MARKETING" action="_VIEW"/> </condition> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <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="h3"> - <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> + <screenlet id="SegmentGroupGeoPanel" title="${uiLabelMap.PageTitleEditSegmentGroupGeo}" collapsible="true"> + <include-form name="AddSegmentGroupGeo" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/> + </screenlet> + <include-form name="listSegmentGroupGeo" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/> </widgets> <fail-widgets> <label style="h3">${uiLabelMap.SegmentGroupMgrViewPermissionError}</label> @@ -292,7 +244,7 @@ <actions> <property-map resource="MarketingUiLabels" map-name="uiLabelMap" global="true"/> - <set field="titleProperty" value="PageTitleListSegmentGroupRole"/> + <set field="titleProperty" value="PageTitleEditSegmentGroupRole"/> <set field="segmentTabButtonItem" value="SegmentGroupRole"/> <set field="queryString" from-field="result.queryString"/> <set field="viewIndex" from-field="parameters.VIEW_INDEX" type="Integer"/> @@ -308,34 +260,10 @@ <if-has-permission permission="MARKETING" action="_VIEW"/> </condition> <widgets> - <container style="screenlet"> - <container style="screenlet-title-bar"> - <container style="h3"> - <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="h3"> - <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> + <screenlet id="SegmentGroupRolePanel" title="${uiLabelMap.PageTitleEditSegmentGroupRole}" collapsible="true"> + <include-form name="AddSegmentGroupRole" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/> + </screenlet> + <include-form name="listSegmentGroupRole" location="component://marketing/webapp/marketing/segment/SegmentForms.xml"/> </widgets> <fail-widgets> <label style="h3">${uiLabelMap.SegmentGroupMgrViewPermissionError}</label> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |