Author: hansbak
Date: Sat Jul 18 04:03:07 2009 New Revision: 795306 URL: http://svn.apache.org/viewvc?rev=795306&view=rev Log: rename the communication files in the same pattern as the custrequest files Added: ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml - copied, changed from r795304, ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml - copied, changed from r795304, ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml Removed: ofbiz/trunk/applications/party/webapp/partymgr/communication/ ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml Modified: ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml ofbiz/trunk/applications/party/data/PartyPortletData.xml ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Modified: ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml?rev=795306&r1=795305&r2=795306&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/CustRequestForms.xml Sat Jul 18 04:03:07 2009 @@ -175,7 +175,7 @@ </form> <form name="ViewRequestCommunicationEvents" type="list" extends="ListCommEvents" - extends-resource="component://party/webapp/partymgr/communication/CommForms.xml"> + extends-resource="component://party/widget/partymgr/CommunicationEventForms.xml"> <field name="subject"> <hyperlink description="${subject}" target="/partymgr/control/ViewCommunicationEvent" target-type="inter-app"> <parameter param-name="communicationEventId"/> Modified: ofbiz/trunk/applications/party/data/PartyPortletData.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/data/PartyPortletData.xml?rev=795306&r1=795305&r2=795306&view=diff ============================================================================== --- ofbiz/trunk/applications/party/data/PartyPortletData.xml (original) +++ ofbiz/trunk/applications/party/data/PartyPortletData.xml Sat Jul 18 04:03:07 2009 @@ -122,8 +122,8 @@ <PortletCategory portletCategoryId="COMMUNICATIONS" description="Communication(s)"/> <PortalPortlet portalPortletId="MyCommunications" portletName="My Communications" description="IN and outgoing Communication list of a party" screenName="MyCommunicationEvents" - screenLocation="component://party/widget/partymgr/CommunicationScreens.xml" - editFormName="EditCommPortletParams" editFormLocation="component://party/webapp/partymgr/communication/CommForms.xml" + screenLocation="component://party/widget/partymgr/CommunicationEventScreens.xml" + editFormName="EditCommPortletParams" editFormLocation="component://party/widget/partymgr/CommunicationEventForms.xml" screenshot="/images/portlets/MyCommunications.png"/> <PortletPortletCategory portalPortletId="MyCommunications" portletCategoryId="COMMUNICATIONS"/> Modified: ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml?rev=795306&r1=795305&r2=795306&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/WEB-INF/controller.xml Sat Jul 18 04:03:07 2009 @@ -1235,27 +1235,27 @@ <view-map name="editeftaccount" type="screen" page="component://party/widget/partymgr/PaymentMethodScreens.xml#editeftaccount"/> <view-map name="editavsoverride" type="screen" page="component://party/widget/partymgr/PaymentMethodScreens.xml#editavsoverride"/> - <view-map name="ListCommContent" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#ListCommContent"/> - <view-map name="PendingCommunications" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#PendingCommunications"/> - <view-map name="ListPartyCommEvents" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#ListPartyCommEvents"/> - <view-map name="ListUnknownPartyComms" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#ListUnknownPartyComms"/> - <view-map name="MyCommunicationEvents" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#PartyCommunicationEvents"/> - <view-map name="FindCommunicationEvents" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#FindCommunicationEvents"/> - <view-map name="EditCommunicationEvent" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#EditCommunicationEvent"/> - <view-map name="ViewCommunicationEvent" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#ViewCommunicationEvent"/> - <view-map name="UpdateCommPurposes" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#UpdateCommPurposes"/> - <view-map name="UpdateCommRoles" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#UpdateCommRoles"/> + <view-map name="ListCommContent" type="screen" page="component://party/widget/partymgr/CommunicationEventScreens.xml#ListCommContent"/> + <view-map name="PendingCommunications" type="screen" page="component://party/widget/partymgr/CommunicationEventScreens.xml#PendingCommunications"/> + <view-map name="ListPartyCommEvents" type="screen" page="component://party/widget/partymgr/CommunicationEventScreens.xml#ListPartyCommEvents"/> + <view-map name="ListUnknownPartyComms" type="screen" page="component://party/widget/partymgr/CommunicationEventScreens.xml#ListUnknownPartyComms"/> + <view-map name="MyCommunicationEvents" type="screen" page="component://party/widget/partymgr/CommunicationEventScreens.xml#PartyCommunicationEvents"/> + <view-map name="FindCommunicationEvents" type="screen" page="component://party/widget/partymgr/CommunicationEventScreens.xml#FindCommunicationEvents"/> + <view-map name="EditCommunicationEvent" type="screen" page="component://party/widget/partymgr/CommunicationEventScreens.xml#EditCommunicationEvent"/> + <view-map name="ViewCommunicationEvent" type="screen" page="component://party/widget/partymgr/CommunicationEventScreens.xml#ViewCommunicationEvent"/> + <view-map name="UpdateCommPurposes" type="screen" page="component://party/widget/partymgr/CommunicationEventScreens.xml#UpdateCommPurposes"/> + <view-map name="UpdateCommRoles" type="screen" page="component://party/widget/partymgr/CommunicationEventScreens.xml#UpdateCommRoles"/> <!-- TODO - <view-map name="ListCommCustRequests" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#ListCommCustRequests"/> + <view-map name="ListCommCustRequests" type="screen" page="component://party/widget/partymgr/CommunicationEventScreens.xml#ListCommCustRequests"/> --> - <view-map name="ListCommWorkEfforts" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#ListCommWorkEfforts"/> - <view-map name="AddCommEventWorkEffort" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#AddCommEventWorkEffort"/> - <view-map name="EditCommEventWorkEffort" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#EditCommEventWorkEffort"/> - <view-map name="AddCommContent" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#AddCommContent"/> - <view-map name="EditCommContent" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#EditCommContent"/> - <view-map name="EditRequestFromCommEvent" type="screen" page="component://party/widget/partymgr/CommunicationScreens.xml#EditRequestFromCommEvent"/> + <view-map name="ListCommWorkEfforts" type="screen" page="component://party/widget/partymgr/CommunicationEventScreens.xml#ListCommWorkEfforts"/> + <view-map name="AddCommEventWorkEffort" type="screen" page="component://party/widget/partymgr/CommunicationEventScreens.xml#AddCommEventWorkEffort"/> + <view-map name="EditCommEventWorkEffort" type="screen" page="component://party/widget/partymgr/CommunicationEventScreens.xml#EditCommEventWorkEffort"/> + <view-map name="AddCommContent" type="screen" page="component://party/widget/partymgr/CommunicationEventScreens.xml#AddCommContent"/> + <view-map name="EditCommContent" type="screen" page="component://party/widget/partymgr/CommunicationEventScreens.xml#EditCommContent"/> + <view-map name="EditRequestFromCommEvent" type="screen" page="component://party/widget/partymgr/CommunicationEventScreens.xml#EditRequestFromCommEvent"/> <view-map name="ViewRequest" type="screen" page="component://order/widget/ordermgr/CustRequestScreens.xml#ViewRequest"/> <view-map name="CreateNewParty" type="screen" page="component://party/widget/partymgr/PartyScreens.xml#CreateNewParty"/> Copied: ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml (from r795304, ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml) URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml?p2=ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml&p1=ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml&r1=795304&r2=795306&rev=795306&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventForms.xml Sat Jul 18 04:03:07 2009 @@ -892,7 +892,7 @@ <field name="updateButton"><submit/></field> </form> - <form name="ListDraftEmails" type="list" extends="ListCommEvents" extends-resource="component://party/webapp/partymgr/communication/CommForms.xml" target="deleteCommunicationEvent" + <form name="ListDraftEmails" type="list" extends="ListCommEvents" extends-resource="component://party/widget/partymgr/CommunicationEventForms.xml" target="deleteCommunicationEvent" use-row-submit="true" header-row-style="header-row-2" list-name="commEventDraft"> <field name="subject"> <hyperlink description="${subject}" target="EditCommunicationEvent"> Copied: ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml (from r795304, ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml) URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml?p2=ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml&p1=ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml&r1=795304&r2=795306&rev=795306&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationEventScreens.xml Sat Jul 18 04:03:07 2009 @@ -53,7 +53,7 @@ <parameter param-name="partyId"/> </link> </container> - <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListPendingCommEvents"/> + <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="ListPendingCommEvents"/> </widgets> <fail-widgets> <label style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label> @@ -91,7 +91,7 @@ </condition> <widgets> <container style="h1"><label text="${uiLabelMap.PageTitleListCommunications}"/></container> - <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListPartyCommEvents"/> + <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="ListPartyCommEvents"/> </widgets> <fail-widgets> <label style="h3">${uiLabelMap.PartyMgrViewPermissionError}</label> @@ -118,7 +118,7 @@ </condition> <widgets> <screenlet title="${uiLabelMap.PageTitleListUnknownPartyComms}"> - <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListUnknownPartyEmails"/> + <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="ListUnknownPartyEmails"/> </screenlet> </widgets> <fail-widgets> @@ -153,10 +153,10 @@ <include-menu name="CommSubTabBar" location="component://party/widget/partymgr/PartyMenus.xml"/> </decorator-section> <decorator-section name="search-options"> - <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="findCommEvents"/> + <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="findCommEvents"/> </decorator-section> <decorator-section name="search-results"> - <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListLookupCommEvents"/> + <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="ListLookupCommEvents"/> </decorator-section> </decorator-screen> </widgets> @@ -208,7 +208,7 @@ <section> <widgets> <label style="h1" text="${uiLabelMap.FormFieldTitle_communicationEventId} ${parameters.communicationEventId}"/> - <include-screen name="commEvent" location="component://party/widget/partymgr/CommunicationScreens.xml"/> + <include-screen name="commEvent" location="component://party/widget/partymgr/CommunicationEventScreens.xml"/> </widgets> </section> </container> @@ -220,7 +220,7 @@ </condition> <widgets> <screenlet title="${uiLabelMap.PartyCommEventRoles}"> - <include-form name="ViewCommRoles" location="component://party/webapp/partymgr/communication/CommForms.xml"/> + <include-form name="ViewCommRoles" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </screenlet> </widgets> <fail-widgets> @@ -230,7 +230,7 @@ </fail-widgets> </section> <screenlet title="${uiLabelMap.PartyCommContent}"> - <include-form name="listCommContent" location="component://party/webapp/partymgr/communication/CommForms.xml"/> + <include-form name="listCommContent" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </screenlet> <section> <actions> @@ -242,7 +242,7 @@ <widgets> <screenlet title="${uiLabelMap.PartyChildCommunicationEvents}"> <include-form name="ListCommEvents" - location="component://party/webapp/partymgr/communication/CommForms.xml"/> + location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </screenlet> </widgets> </section> @@ -292,14 +292,14 @@ <container> <label style="h2" text="${uiLabelMap.PartyEmailMessage}"/> </container> - <include-form name="allocateMsgToPartyForm" location="component://party/webapp/partymgr/communication/CommForms.xml"/> + <include-form name="allocateMsgToPartyForm" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </screenlet> </widgets> </section> - <include-form name="ViewEmail" location="component://party/webapp/partymgr/communication/CommForms.xml"/> + <include-form name="ViewEmail" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </widgets> <fail-widgets> - <include-form name="ViewCommEvent" location="component://party/webapp/partymgr/communication/CommForms.xml"/> + <include-form name="ViewCommEvent" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </fail-widgets> </section> </screenlet> @@ -335,23 +335,23 @@ </condition> <widgets> <screenlet title="${uiLabelMap.PartyCreateAddEmail} ${uiLabelMap.CommonFrom} ${parameters.partyIdFrom}"> - <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="EditEmail"/> + <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="EditEmail"/> </screenlet> </widgets> <fail-widgets> <screenlet title="${uiLabelMap.CommonFrom}: ${communicationEvent.partyIdFrom}, CommunicationEventId: ${communicationEvent.communicationEventId}"> - <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="EditEmail"/> + <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="EditEmail"/> </screenlet> <container style="lefthalf"> <screenlet title="${uiLabelMap.PartyCommEventRoles}"> - <include-form name="ListCommRoles" location="component://party/webapp/partymgr/communication/CommForms.xml"/> - <include-form name="AddEventRole" location="component://party/webapp/partymgr/communication/CommForms.xml"/> + <include-form name="ListCommRoles" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> + <include-form name="AddEventRole" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </screenlet> </container> <container style="righthalf"> <screenlet title="${uiLabelMap.PartyCommContent}"> - <include-form name="listCommContent" location="component://party/webapp/partymgr/communication/CommForms.xml"/> - <include-form name="uploadContent" location="component://party/webapp/partymgr/communication/CommForms.xml"/> + <include-form name="listCommContent" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> + <include-form name="uploadContent" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </screenlet> </container> </fail-widgets> @@ -373,23 +373,23 @@ </condition> <widgets> <screenlet id="EditCommunicationEventPanel" title="${uiLabelMap.PartyEditCommunicationEvent} ${parameters.communicationEventId}"> - <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="EditInternalNote"/> + <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="EditInternalNote"/> </screenlet> </widgets> <fail-widgets> <container style="lefthalf"> <screenlet id="EditCommunicationEventPanel" title="${uiLabelMap.PartyEditCommunicationEvent} ${parameters.communicationEventId} ${uiLabelMap.CommonFrom} ${communicationEvent.partyIdFrom}"> - <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="EditInternalNote"/> + <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="EditInternalNote"/> </screenlet> </container> <container style="righthalf"> <screenlet title="${uiLabelMap.PartyCommEventRoles}"> - <include-form name="ListCommRoles" location="component://party/webapp/partymgr/communication/CommForms.xml"/> - <include-form name="AddEventRole" location="component://party/webapp/partymgr/communication/CommForms.xml"/> + <include-form name="ListCommRoles" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> + <include-form name="AddEventRole" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.PartyCommContent}"> - <include-form name="listCommContent" location="component://party/webapp/partymgr/communication/CommForms.xml"/> - <include-form name="uploadContent" location="component://party/webapp/partymgr/communication/CommForms.xml"/> + <include-form name="listCommContent" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> + <include-form name="uploadContent" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </screenlet> </container> </fail-widgets> @@ -409,10 +409,10 @@ </condition> <widgets> <screenlet id="EditCommunicationEventPanel" title="${uiLabelMap.PartyEditCommunicationEvent} ${parameters.communicationEventId}"> - <include-form name="EditCommEvent" location="component://party/webapp/partymgr/communication/CommForms.xml"/> + <include-form name="EditCommEvent" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </screenlet> <screenlet title="${uiLabelMap.PartyChildCommunicationEvents}" navigation-form-name="ListChildCommEvents"> - <include-form name="ListChildCommEvents" location="component://party/webapp/partymgr/communication/CommForms.xml"/> + <include-form name="ListChildCommEvents" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </screenlet> </widgets> </section> @@ -434,7 +434,7 @@ <decorator-section name="body"> <screenlet title="${uiLabelMap.PartyEditCustomerRequest}"> <include-form - location="component://party/webapp/partymgr/communication/CommForms.xml" + location="component://party/widget/partymgr/CommunicationEventForms.xml" name="EditRequestFromCommEvent"/> </screenlet> </decorator-section> @@ -465,12 +465,12 @@ <decorator-section name="body"> <screenlet title="${uiLabelMap.PartyCommEventRoles}"> <include-form - location="component://party/webapp/partymgr/communication/CommForms.xml" + location="component://party/widget/partymgr/CommunicationEventForms.xml" name="ListCommRoles"/> </screenlet> <screenlet title="${uiLabelMap.PartyCommEventRoles}"> <include-form - location="component://party/webapp/partymgr/communication/CommForms.xml" + location="component://party/widget/partymgr/CommunicationEventForms.xml" name="AddEventRole"/> </screenlet> </decorator-section> @@ -504,7 +504,7 @@ <parameter param-name="partyId"/> </link> </container> - <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListCommPurposes"/> + <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="ListCommPurposes"/> </screenlet> </decorator-section> </decorator-screen> @@ -533,7 +533,7 @@ <parameter param-name="partyId"/> </link> </container> - <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListCommWorkEfforts"/> + <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="ListCommWorkEfforts"/> </screenlet> </decorator-section> </decorator-screen> @@ -555,7 +555,7 @@ <decorator-screen name="CommonCommunicationEventDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PartyCommWorkEfforts}"> - <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="AddCommEventWorkEffort"/> + <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="AddCommEventWorkEffort"/> </screenlet> </decorator-section> </decorator-screen> @@ -575,7 +575,7 @@ <decorator-screen name="CommonCommunicationEventDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PartyCommWorkEfforts}"> - <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="AddCommEventWorkEffort"/> + <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="AddCommEventWorkEffort"/> </screenlet> </decorator-section> </decorator-screen> @@ -604,10 +604,10 @@ <widgets> <container> <screenlet title="${uiLabelMap.PartyCommContent}"> - <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="listCommContent"/> + <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="listCommContent"/> </screenlet> <screenlet title="${uiLabelMap.PartyAttachContent}"> - <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="uploadContent1"/> + <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="uploadContent1"/> </screenlet> </container> </widgets> @@ -642,7 +642,7 @@ </condition> <widgets> <screenlet title="${uiLabelMap.PartyNewCommContent}"> - <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="addCommContent"/> + <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="addCommContent"/> </screenlet> </widgets> <fail-widgets> @@ -687,7 +687,7 @@ </widgets> </section> <container style="h1"><label text="${uiLabelMap.PageTitleEditCommContent}"/></container> - <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="editCommContent"/> + <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="editCommContent"/> <section> <condition> <if-regexp expr="text.*" field="commEventContentDataResource.drMimeTypeId"/> @@ -707,7 +707,7 @@ <container style="screenlet-body"> <section> <widgets> - <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="editCommTextContent"/> + <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="editCommTextContent"/> </widgets> </section> </container> @@ -730,7 +730,7 @@ <container style="screenlet-body"> <section> <widgets> - <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="uploadCommContent"/> + <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="uploadCommContent"/> <label text="${uiLabelMap.PartyViewImage}" style="h1"/> <content dataresource-id="${commEventContentDataResource.drDataResourceId}"/> </widgets> @@ -812,17 +812,17 @@ </condition> <widgets> <label style="h2" text="${uiLabelMap.PartyEmailsFromUnknownOrigin}"></label> - <include-form name="ListMyUnknownPartyEmails" location="component://party/webapp/partymgr/communication/CommForms.xml"/> + <include-form name="ListMyUnknownPartyEmails" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </widgets> </section> - <include-form name="ListPartyCommEvents" location="component://party/webapp/partymgr/communication/CommForms.xml"/> + <include-form name="ListPartyCommEvents" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> <section> <condition> <not><if-empty field="commEventDraft"/></not> </condition> <widgets> <label style="h2" text="${uiLabelMap.PartyDraftEmails}"></label> - <include-form name="ListDraftEmails" location="component://party/webapp/partymgr/communication/CommForms.xml"/> + <include-form name="ListDraftEmails" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </widgets> </section> <section> @@ -831,7 +831,7 @@ </condition> <widgets> <label style="h2" text="${uiLabelMap.PartyInProgresstEmails}"></label> - <include-form name="ListProgressEmails" location="component://party/webapp/partymgr/communication/CommForms.xml"/> + <include-form name="ListProgressEmails" location="component://party/widget/partymgr/CommunicationEventForms.xml"/> </widgets> </section> </screenlet> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml?rev=795306&r1=795305&r2=795306&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortCommEventForms.xml Sat Jul 18 04:03:07 2009 @@ -47,7 +47,7 @@ </field> </form> <form name="AddWorkEffortCommEvent" default-map-name="communicationEvent" target="createWorkEffortCommEvent" title="" type="single" extends="EditCommEvent" - extends-resource="component://party/webapp/partymgr/communication/CommForms.xml" header-row-style="header-row" default-table-style="basic-table"> + extends-resource="component://party/widget/partymgr/CommunicationEventForms.xml" header-row-style="header-row" default-table-style="basic-table"> <actions> <set field="communicationEvent"/> </actions> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=795306&r1=795305&r2=795306&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Sat Jul 18 04:03:07 2009 @@ -829,18 +829,18 @@ </condition> <widgets> <container style="widget-container"> - <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="EditCommEvent"/> + <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="EditCommEvent"/> </container> <container style="widget-container"> - <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListChildCommEvents"/> + <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="ListChildCommEvents"/> </container> </widgets> <fail-widgets> <container style="widget-container"> - <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ViewCommEvent"/> + <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="ViewCommEvent"/> </container> <container style="widget-container"> - <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListChildCommEvents"/> + <include-form location="component://party/widget/partymgr/CommunicationEventForms.xml" name="ListChildCommEvents"/> </container> </fail-widgets> </section> |
Free forum by Nabble | Edit this page |