Author: jleroux
Date: Tue Mar 21 09:19:04 2017 New Revision: 1787912 URL: http://svn.apache.org/viewvc?rev=1787912&view=rev Log: "Applied fix from trunk framework for revision: 1787823" ------------------------------------------------------------------------ r1787823 | deepak | 2017-03-20 19:05:23 +0100 (lun. 20 mars 2017) | 3 lignes Improved: Make Create Menu tab bar for Contact consistent (OFBIZ-8201) Thanks Avnindra Sharma for reporting. ------------------------------------------------------------------------ Modified: ofbiz/branches/release16.11/ (props changed) ofbiz/branches/release16.11/applications/marketing/widget/CommonScreens.xml ofbiz/branches/release16.11/applications/marketing/widget/ContactListScreens.xml Propchange: ofbiz/branches/release16.11/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 21 09:19:04 2017 @@ -10,5 +10,5 @@ /ofbiz/branches/json-integration-refactoring:1634077-1635900 /ofbiz/branches/multitenant20100310:921280-927264 /ofbiz/branches/release13.07:1547657 -/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535 +/ofbiz/ofbiz-framework/trunk:1783202,1783388,1784549,1784558,1784708,1785882,1785925,1786079,1786214,1786525,1787047,1787133,1787176,1787535,1787627,1787823 /ofbiz/trunk:1770481,1770490,1770540,1771440,1771448,1771516,1771935,1772346,1772880,1774772,1775441,1779724,1780659,1781109,1781125,1781979,1782498,1782520 Modified: ofbiz/branches/release16.11/applications/marketing/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/marketing/widget/CommonScreens.xml?rev=1787912&r1=1787911&r2=1787912&view=diff ============================================================================== --- ofbiz/branches/release16.11/applications/marketing/widget/CommonScreens.xml (original) +++ ofbiz/branches/release16.11/applications/marketing/widget/CommonScreens.xml Tue Mar 21 09:19:04 2017 @@ -82,6 +82,11 @@ under the License. <section> <condition><not><if-empty field="contactListId"/></not></condition> <widgets> + <container style="button-bar"> + <link text="${uiLabelMap.MarketingContactListCreate}" target="EditContactList" style="buttontext create"> + <parameter param-name="DONE_PAGE" from-field="donePage"/> + </link> + </container> <container> <label style="h1">${uiLabelMap.MarketingContactList} ${contactList.contactListName} [${contactListId}]</label> </container> Modified: ofbiz/branches/release16.11/applications/marketing/widget/ContactListScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/release16.11/applications/marketing/widget/ContactListScreens.xml?rev=1787912&r1=1787911&r2=1787912&view=diff ============================================================================== --- ofbiz/branches/release16.11/applications/marketing/widget/ContactListScreens.xml (original) +++ ofbiz/branches/release16.11/applications/marketing/widget/ContactListScreens.xml Tue Mar 21 09:19:04 2017 @@ -75,11 +75,6 @@ under the License. </condition> <widgets> <screenlet title="${uiLabelMap.PageTitleEditContactList}"> - <container style="button-bar"> - <link text="${uiLabelMap.MarketingContactListCreate}" target="EditContactList" style="buttontext create"> - <parameter param-name="DONE_PAGE" from-field="donePage"/> - </link> - </container> <include-form name="EditContactList" location="component://marketing/widget/ContactListForms.xml"/> </screenlet> </widgets> |
Free forum by Nabble | Edit this page |