Author: hansbak
Date: Tue Mar 3 05:37:19 2009
New Revision: 749536
URL: http://svn.apache.org/viewvc?rev=749536&view=rev
Log:
fix white buttons clear problem, correct sfa demo data, make convert lead
working
Modified:
ofbiz/trunk/applications/marketing/data/sfaDemoData.xml
ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml
ofbiz/trunk/framework/images/webapp/images/maincss.css
Modified: ofbiz/trunk/applications/marketing/data/sfaDemoData.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/data/sfaDemoData.xml?rev=749536&r1=749535&r2=749536&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/data/sfaDemoData.xml (original)
+++ ofbiz/trunk/applications/marketing/data/sfaDemoData.xml Tue Mar 3 05:37:19
2009
@@ -40,6 +40,7 @@
<Party partyId="sfa102" partyTypeId="PARTY_GROUP"
statusId="PARTY_ENABLED"/>
<PartyGroup partyId="sfa102" groupName="A promising Lead Company"/>
<PartyRole partyId="sfa102" roleTypeId="ACCOUNT_LEAD"/>
+ <PartyRole partyId="sfa102" roleTypeId="_NA_"/>
<Party partyId="sfa101" partyTypeId="PERSON" statusId="PARTY_ENABLED"/>
<Person partyId="sfa101" firstName="John" lastName="Lead"/>
<PartyRole partyId="sfa101" roleTypeId="_NA_"/>
@@ -51,7 +52,8 @@
<ContactMech contactMechId="sfa103" contactMechTypeId="EMAIL_ADDRESS"
infoString="[email protected]"/>
<PartyContactMech partyId="sfa101" contactMechId="sfa103"
fromDate="2000-01-01 00:00:00.000"/>
<PartyContactMechPurpose partyId="sfa101" contactMechId="sfa103"
contactMechPurposeTypeId="PRIMARY_EMAIL" fromDate="2000-01-01 00:00:00.000"/>
-
+ <!-- Status Valid Change -->
+ <StatusValidChange statusId="PARTY_ENABLED" statusIdTo="LEAD_CONVERTED"
transitionName="Convert Lead To Contact"/>
</entity-engine-xml>
Modified: ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml?rev=749536&r1=749535&r2=749536&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml Tue Mar 3
05:37:19 2009
@@ -71,6 +71,7 @@
<screen name="leftbar">
<section>
+ <condition><not><if-empty field="userLogin"/></not></condition>
<widgets>
<container style="left">
<screenlet id ="SfaQuickAddContactPanel"
title="${uiLabelMap.SfaQuickAddContact}" collapsible="true">
Modified: ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml?rev=749536&r1=749535&r2=749536&view=diff
==============================================================================
--- ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml (original)
+++ ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml Tue Mar 3
05:37:19 2009
@@ -34,37 +34,28 @@
<section>
<widgets>
<include-menu name="LeadSubTabBar"
location="component://marketing/widget/sfa/SfaMenus.xml"/>
- <section>
- <widgets>
- <platform-specific>
- <html><html-template
location="component://marketing/webapp/sfa/party/findSfaParty.ftl"/></html>
- </platform-specific>
- <container style="screenlet">
- <container
style="screenlet-title-bar">
+ <container style="no-clear">
+ <platform-specific>
+ <html><html-template
location="component://marketing/webapp/sfa/party/findSfaParty.ftl"/></html>
+ </platform-specific>
+ <screenlet
title="${uiLabelMap.SfaFindResults}">
+ <section>
+ <condition>
+ <not>
+ <if-empty
field="partyList"/>
+ </not>
+ </condition>
+ <widgets>
+ <include-form name="ListLeads"
location="component://marketing/widget/sfa/forms/LeadForms.xml"/>
+ </widgets>
+ <fail-widgets>
<container style="h3">
- <label
text="${uiLabelMap.SfaFindResults}"/>
+ <label
text="${uiLabelMap.PartyNoPartiesFound}"/>
</container>
- </container>
- <container style="screenlet-body">
- <section>
- <condition>
- <not>
- <if-empty
field="partyList"/>
- </not>
- </condition>
- <widgets>
- <include-form
name="ListLeads"
location="component://marketing/widget/sfa/forms/LeadForms.xml"/>
- </widgets>
- <fail-widgets>
- <container style="h3">
- <label
text="${uiLabelMap.PartyNoPartiesFound}"/>
- </container>
- </fail-widgets>
- </section>
- </container>
- </container>
- </widgets>
- </section>
+ </fail-widgets>
+ </section>
+ </screenlet>
+ </container>
</widgets>
</section>
</decorator-section>
Modified: ofbiz/trunk/framework/images/webapp/images/maincss.css
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/maincss.css?rev=749536&r1=749535&r2=749536&view=diff
==============================================================================
--- ofbiz/trunk/framework/images/webapp/images/maincss.css (original)
+++ ofbiz/trunk/framework/images/webapp/images/maincss.css Tue Mar 3 05:37:19
2009
@@ -1328,6 +1328,9 @@
}
/* ===== Button style decorator ===== */
+.button-style-2 {
+ display: table;
+}
.button-style-2 ul li {
background-color: #ffffff;
