svn commit: r660429 - in /ofbiz/trunk/applications: marketing/webapp/sfa/WEB-INF/a
Locked
 
|
Author: hansbak
Date: Tue May 27 01:50:08 2008 New Revision: 660429 URL: http://svn.apache.org/viewvc?rev=660429&view=rev Log: some more button fixing and Apache headers Modified: ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/action/cloneLead.bsh ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/action/mergeContacts.bsh ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Modified: ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/action/cloneLead.bsh URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/action/cloneLead.bsh?rev=660429&r1=660428&r2=660429&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/action/cloneLead.bsh (original) +++ ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/action/cloneLead.bsh Tue May 27 01:50:08 2008 @@ -1,9 +1,28 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.entity.util.EntityUtil; import org.ofbiz.party.contact.ContactHelper; -partyId = parameters.get("leadPartyId"); +partyId = parameters.get("partyId"); if(UtilValidate.isNotEmpty(partyId)) { party = delegator.findOne("Party", UtilMisc.toMap("partyId", partyId), false); person = party.getRelatedOne("Person"); Modified: ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/action/mergeContacts.bsh URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/action/mergeContacts.bsh?rev=660429&r1=660428&r2=660429&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/action/mergeContacts.bsh (original) +++ ofbiz/trunk/applications/marketing/webapp/sfa/WEB-INF/action/mergeContacts.bsh Tue May 27 01:50:08 2008 @@ -1,3 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + import org.ofbiz.base.util.UtilValidate; import org.ofbiz.base.util.UtilMisc; import org.ofbiz.entity.util.EntityUtil; Modified: ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml?rev=660429&r1=660428&r2=660429&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/CommonScreens.xml Tue May 27 01:50:08 2008 @@ -277,7 +277,6 @@ <not><if-empty field-name="accountDescription"/></not> </condition> <widgets> - <!--label style="h1" text="Party ${party.partyId} in the Role of ${accountDescription}"/--> <container style="profile-left"> <include-screen name="Party" location="component://party/widget/partymgr/ProfileScreens.xml"/> <include-screen name="Contact" location="component://party/widget/partymgr/ProfileScreens.xml"/> @@ -296,7 +295,6 @@ <not><if-empty field-name="leadDescription"/></not> </condition> <widgets> - <label style="h1" text="Party ${party.partyId} in the Role of ${leadDescription}"/> <container style="profile-left"> <include-screen name="Party" location="component://party/widget/partymgr/ProfileScreens.xml"/> <include-screen name="Contact" location="component://party/widget/partymgr/ProfileScreens.xml"/> Modified: ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml?rev=660429&r1=660428&r2=660429&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/LeadScreens.xml Tue May 27 01:50:08 2008 @@ -109,6 +109,7 @@ <section> <actions> <set field="headerItem" value="Leads"/> + <set field="tabButtonItem" value="ConvertLead"/> </actions> <widgets> <decorator-screen name="CommonPartyDecorator" location="${parameters.mainDecoratorLocation}"> @@ -139,6 +140,7 @@ <section> <actions> <set field="headerItem" value="Leads"/> + <set field="tabButtonItem" value="CloneLead"/> <script location="component://marketing/webapp/sfa/WEB-INF/action/cloneLead.bsh"/> </actions> <widgets> Modified: ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml?rev=660429&r1=660428&r2=660429&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml Tue May 27 01:50:08 2008 @@ -64,10 +64,10 @@ <link target="viewprofile?partyId=${parameters.partyId}"/> </menu-item> <menu-item name="ConvertLead" title="${uiLabelMap.SfaConvertLead}"> - <link target="ConvertLead?leadPartyId=${parameters.partyId}"/> + <link target="ConvertLead?partyId=${parameters.partyId}"/> </menu-item> <menu-item name="CloneLead" title="${uiLabelMap.SfaCloneLead}"> - <link target="CloneLead?leadPartyId=${parameters.partyId}"/> + <link target="CloneLead?partyId=${parameters.partyId}"/> </menu-item> <menu-item name="MergeLeads" title="${uiLabelMap.SfaMergeLeads}"> <link target="MergeLeads"/> Modified: ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml?rev=660429&r1=660428&r2=660429&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/forms/LeadForms.xml Tue May 27 01:50:08 2008 @@ -82,7 +82,7 @@ <form name="ConvertLead" type="single" target="convertLead" id="ConvertLead" > <actions> - <set field="leadPartyId" from-field="parameters.leadPartyId"></set> + <set field="leadPartyId" from-field="parameters.PartyId"></set> </actions> <field name="leadPartyId" title="${uiLabelMap.SfaCreateContactForLead}"><display description="${bsh:org.ofbiz.party.party.PartyHelper.getPartyName(delegator, "${leadPartyId}", false)} : [${leadPartyId}]"/></field> <field name="partyId" title="${uiLabelMap.SfaAccountName}" tooltip="${uiLabelMap.SfaSelectExistingAccountOrLeaveBlankToCreateNew}"> Modified: ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml?rev=660429&r1=660428&r2=660429&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/CommonScreens.xml Tue May 27 01:50:08 2008 @@ -74,6 +74,8 @@ </condition> <widgets> <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="ProfileTabBar"/> + <label text="<br/>"/> + <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="ProfileSubTabBar"/> </widgets> </section> </decorator-section> Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=660429&r1=660428&r2=660429&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Tue May 27 01:50:08 2008 @@ -74,7 +74,15 @@ <link target="FindEmploymentApp?partyId=${partyId}&&referredByPartyId=${partyId}"/> </menu-item> </menu> - + <menu name="ProfileSubTabBar" menu-container-style="button-bar button-style-2" default-selected-style="selected"> + <menu-item name="createNew" title="${uiLabelMap.CommonCreateNew}" > + <condition> + <if-has-permission permission="PARTYMGR" action="_VIEW"/> + </condition> + <link target="/accounting/control/FindBillingAccount?partyId=${partyId}" url-mode="inter-app" + text="${uiLabelMap.AccountingBillingAccount}"/> + </menu-item> + </menu> <menu name="create-new-party" type="simple" menu-container-style="basic-nav"> <menu-item name="create-party-group" title="${uiLabelMap.PartyCreateNewPartyGroup}"> <link target="editpartygroup?create_new=Y"/> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |