Author: hansbak
Date: Thu Oct 22 02:58:41 2009
New Revision: 828284
URL: http://svn.apache.org/viewvc?rev=828284&view=rev
Log:
reverted unwanted change in r820578 and fix display error in opportunity screens
Modified:
ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml
ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml
Modified: ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml?rev=828284&r1=828283&r2=828284&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml
(original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/OpportunityScreens.xml Thu
Oct 22 02:58:41 2009
@@ -70,9 +70,11 @@
<widgets>
<decorator-screen name="CommonOpportunityDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet title="${uiLabelMap.SfaEditOpportunity}">
- <include-form name="EditSalesOpportunity"
location="component://marketing/widget/sfa/forms/OpportunityForms.xml"/>
- </screenlet>
+ <container style="no-clear">
+ <screenlet
title="${uiLabelMap.SfaEditOpportunity}">
+ <include-form name="EditSalesOpportunity"
location="component://marketing/widget/sfa/forms/OpportunityForms.xml"/>
+ </screenlet>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
@@ -100,9 +102,11 @@
<widgets>
<decorator-screen name="CommonOpportunityDecorator"
location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
- <screenlet title="${uiLabelMap.SfaOpportunityInfo}">
- <include-form name="ViewSalesOpportunity"
location="component://marketing/widget/sfa/forms/OpportunityForms.xml"/>
- </screenlet>
+ <container style="no-clear">
+ <screenlet
title="${uiLabelMap.SfaOpportunityInfo}">
+ <include-form name="ViewSalesOpportunity"
location="component://marketing/widget/sfa/forms/OpportunityForms.xml"/>
+ </screenlet>
+ </container>
</decorator-section>
</decorator-screen>
</widgets>
Modified:
ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml?rev=828284&r1=828283&r2=828284&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml
(original)
+++ ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml
Thu Oct 22 02:58:41 2009
@@ -29,7 +29,6 @@
<include
location="component://order/webapp/ordermgr/WEB-INF/controller.xml"/>
<include
location="component://workeffort/webapp/workeffort/WEB-INF/controller.xml"/>
<include
location="component://projectmgr/webapp/projectmgr/WEB-INF/controller.xml"/>
- <include
location="component://marketing/webapp/sfa/WEB-INF/controller.xml"/>
<description>Show personal information in the system</description>
