svn commit: r671843 - in /ofbiz/trunk/applications/part
Locked
 
|
Author: hansbak
Date: Thu Jun 26 03:16:51 2008 New Revision: 671843 URL: http://svn.apache.org/viewvc?rev=671843&view=rev Log: replace link with a menu, added screenlet and other cosmetic changes Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml Modified: ofbiz/trunk/applications/party/config/PartyUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/config/PartyUiLabels.xml?rev=671843&r1=671842&r2=671843&view=diff ============================================================================== --- ofbiz/trunk/applications/party/config/PartyUiLabels.xml (original) +++ ofbiz/trunk/applications/party/config/PartyUiLabels.xml Thu Jun 26 03:16:51 2008 @@ -2186,6 +2186,9 @@ <value xml:lang="th">à¹à¸à¸¥à¸µà¹à¸¢à¸à¸à¸¥à¸¸à¹à¸¡à¸à¸¹à¹à¹à¸à¹</value> <value xml:lang="zh">ä¿®æ¹ä¼å</value> </property> + <property key="PartyChildCommunicationEvents"> + <value xml:lang="en">Child Communication Events</value> + </property> <property key="PartyChildShoppingList"> <value xml:lang="en">Child Shopping List</value> <value xml:lang="es">Lista de compras hijas</value> Modified: ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml?rev=671843&r1=671842&r2=671843&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommForms.xml Thu Jun 26 03:16:51 2008 @@ -327,8 +327,7 @@ </actions> </form> - <form name="ListChildCommEvents" type="list" extends="ListCommEvents" paginate-target="EditCommunicationEvent" - odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> + <form name="ListChildCommEvents" type="list" extends="ListCommEvents" paginate-target="EditCommunicationEvent"> <actions> <entity-condition entity-name="CommunicationEvent"> <condition-list combine="or"> Modified: ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml?rev=671843&r1=671842&r2=671843&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/communication/CommMenus.xml Thu Jun 26 03:16:51 2008 @@ -52,4 +52,16 @@ <link target="pendingCommunications?partyId=${partyId}&communicationEventId=${communicationEventId}" url-mode="intra-app"/> </menu-item> </menu> + + <menu name="CommSubTabBar" menu-container-style="button-bar button-style-2"> + <menu-item name="new" title="${uiLabelMap.PartyNewCommunication}"> + <link target="EditCommunicationEvent?partyId=${partyId}&partyIdFrom=${partyId}"/> + </menu-item> + <menu-item name="reply" title="${uiLabelMap.PartyReply}"> + <condition> + <not><if-empty field-name="communicationEventId"/></not> + </condition> + <link target="EditCommunicationEvent?partyId=${partyId}&parentCommEventId=${communicationEventId}"/> + </menu-item> + </menu> </menus> Modified: ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml?rev=671843&r1=671842&r2=671843&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/CommunicationScreens.xml Thu Jun 26 03:16:51 2008 @@ -133,8 +133,8 @@ <include-menu location="component://party/widget/partymgr/PartyMenus.xml" name="ProfileTabBar"/> </widgets> </section> + <include-menu name="CommSubTabBar" location="component://party/webapp/partymgr/communication/CommMenus.xml"/> <screenlet title="${uiLabelMap.PartyFindCommunicationEvents}" collapsible="true" name="FindCommunicationEvents"> - <container><link style="smallSubmit" target="EditCommunicationEvent" text="${uiLabelMap.PartyNewCommunication}"/></container> <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="findCommEvents"/> </screenlet> <screenlet title="${uiLabelMap.PartyFoundCommunicationEvents}" navigation-form-name="ListLookupCommEvents"> @@ -240,11 +240,7 @@ <decorator-section name="body"> <section> <widgets> - <container style="button-bar"> - <link style="smallSubmit" target="EditCommunicationEvent?partyId=${partyId}&partyIdFrom=${partyId}" text="${uiLabelMap.PartyNewCommunication}"/> - <link style="smallSubmit" target="EditCommunicationEvent?partyId=${partyId}&parentCommEventId=${communicationEventId}" text="${uiLabelMap.PartyReply}"/> - <!--<link style="smallSubmit" target="EditCommunicationEvent?communicationEventTypeId=${communicationEvent.communicationEventTypeId}&contactMechIdTo=${communicationEvent.contactMechIdFrom}&contactMechIdFrom=${communicationEvent.contactMechIdTo}&partyId=${partyId}&partyIdTo=${partyId}&partyIdFrom=${userLogin.partyId}&parentCommEventId=${communicationEventId}&toString=${communicationEvent.fromString}" text="${uiLabelMap.PartyReply}"/>--> - </container> + <include-menu name="CommSubTabBar" location="component://party/webapp/partymgr/communication/CommMenus.xml"/> </widgets> </section> <section> @@ -255,13 +251,17 @@ <screenlet id="EditCommunicationEventPanel" title="${uiLabelMap.PartyEditCommunicationEvent}" collapsible="true"> <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="EditCommEvent"/> </screenlet> - <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListChildCommEvents"/> + <screenlet title="${uiLabelMap.PartyChildCommunicationEvents}" navigation-form-name="ListChildCommEvents"> + <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListChildCommEvents"/> + </screenlet> </widgets> <fail-widgets> <screenlet id="ViewPartyNewCommunicationPanel" title="${uiLabelMap.PartyNewCommunication}" collapsible="true"> <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ViewCommEvent"/> </screenlet> - <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListChildCommEvents"/> + <screenlet title="${uiLabelMap.PartyChildCommunicationEvents}" navigation-form-name="ListChildCommEvents"> + <include-form location="component://party/webapp/partymgr/communication/CommForms.xml" name="ListChildCommEvents"/> + </screenlet> </fail-widgets> </section> </decorator-section> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |