[OFBiz] SVN: r5948 - in trunk/applications: party/config
workeffort/widget
jonesde at svn.ofbiz.org
jonesde at svn.ofbiz.org
Wed Oct 12 05:23:41 EDT 2005
Author: jonesde
Date: 2005-10-12 04:23:33 -0500 (Wed, 12 Oct 2005)
New Revision: 5948
Modified:
trunk/applications/party/config/PartyUiLabels.properties
trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml
trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml
Log:
A number of cleanups, missing labels, bad/missing styles, etc; especially focus on the WorkEffort related summary screen which could still use some extensions but has all of the main things that are initially sponsored there, also improved links and such on that page
Modified: trunk/applications/party/config/PartyUiLabels.properties
===================================================================
--- trunk/applications/party/config/PartyUiLabels.properties 2005-10-12 08:55:49 UTC (rev 5947)
+++ trunk/applications/party/config/PartyUiLabels.properties 2005-10-12 09:23:33 UTC (rev 5948)
@@ -170,6 +170,8 @@
PartyCreateNewPartyGroup=Create New Party Group
PartyCreateNewPerson=Create New Person
PartyCreateNewProspect=Create Prospect
+PartyCreateNewQuote=Create Quote
+PartyCreateNewCustRequest=Create Request for Quote
PartyCreateNewSecurityGroup=Create New SecurityGroup
PartyCreateUserLogin=Create UserLogin
PartyCurrentShoppingCart=Current Shopping Cart
Modified: trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml
===================================================================
--- trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml 2005-10-12 08:55:49 UTC (rev 5947)
+++ trunk/applications/workeffort/widget/WorkEffortPartyAssignForms.xml 2005-10-12 09:23:33 UTC (rev 5948)
@@ -34,7 +34,7 @@
<field name="workEffortId"><hidden/></field>
<field name="partyId" title="${uiLabelMap.WorkEffortParty}" widget-style="buttontext">
<display-entity entity-name="Person" description="${firstName} ${lastName}">
- <sub-hyperlink target="/party/control/viewprofile?partyId=${partyId}" target-type="inter-app" description="${partyId}" link-style="linktext"/>
+ <sub-hyperlink target="/partymgr/control/viewprofile?partyId=${partyId}" target-type="inter-app" description="${partyId}" link-style="linktext"/>
</display-entity>
</field>
<field name="fromDate"><display/></field>
Modified: trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml
===================================================================
--- trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml 2005-10-12 08:55:49 UTC (rev 5947)
+++ trunk/applications/workeffort/widget/WorkEffortRelatedSummaryScreens.xml 2005-10-12 09:23:33 UTC (rev 5948)
@@ -53,76 +53,62 @@
<widgets>
<decorator-screen name="CommonWorkEffortDecorator" location="component://workeffort/widget/WorkEffortScreens.xml">
<decorator-section name="body">
- <label style="head1">${uiLabelMap.PageTitleWorkEffortRelatedSummary} for workEffortId=${workEffortId}</label>
- <container style="indent10Wrapper"><label style="head1">${uiLabelMap.PartyAssignments}</label></container>
+ <label style="head1">${uiLabelMap.PageTitleWorkEffortRelatedSummary} for ID [${workEffortId}]</label>
+ <container style="indent10Wrapper"><label style="head1">Party Assignments</label></container>
<iterate-section list-name="relatedPartyAssigns" entry-name="partyAssign">
<section>
- <condition>
- <if-compare field-name="partyAssign.partyTypeId" operator="equals" value="PERSON"/>
- </condition>
<widgets>
<container style="treeWrapper">
- <link target="EditWorkEffortPartyAssign?workEffortId=${partyAssign.workEffortId}&partyId=${partyAssign.partyId}" text="[${partyAssign.partyId}]" style="linktext"/>
- <label text="${partyAssign.firstName} ${partyAssign.lastName}"/>
+ <link target="/partymgr/control/viewprofile?partyId=${partyAssign.partyId}" url-mode="inter-app" text="[${partyAssign.partyId}]" style="linktext"/>
+ <label text="${partyAssign.firstName} ${partyAssign.lastName} ${partyAssign.groupName}" style="tabletext"/>
</container>
</widgets>
</section>
- <section>
- <condition>
- <if-compare field-name="partyAssign.partyTypeId" operator="equals" value="PARTY_GROUP"/>
- </condition>
- <widgets>
- <container style="treeWrapper">
- <link target="EditWorkEffortPartyAssign?workEffortId=${partyAssign.workEffortId}&partyId=${partyAssign.partyId}" text="[${partyAssign.partyId}]" style="linktext"/>
- <label text="${partyAssign.groupName}"/>
- </container>
- </widgets>
- </section>
</iterate-section>
- <container style="indent10Wrapper"><label style="head1">${uiLabelMap.CommunicationEvents}</label></container>
+ <container style="indent10Wrapper"><label style="head1">Communication Events</label></container>
<iterate-section list-name="commEvents" entry-name="commEvent">
<section>
<widgets>
<container style="treeWrapper">
- <link target="EditWorkEffortCommEvent?workEffortId=${commEvent.workEffortId}&communicationEventId=${commEvent.communicationEventId}" text="[${commEvent.communicationEventId}]" style="linktext"/>
- <label text="${commEvent.subject} ${commEvent.content}"/>
+ <link target="/partymgr/control/EditCommunicationEvent?communicationEventId=${commEvent.communicationEventId}" url-mode="inter-app" text="[${commEvent.communicationEventId}]" style="linktext"/>
+ <label text="${commEvent.subject}" style="tabletext"/>
</container>
</widgets>
</section>
</iterate-section>
- <container style="indent10Wrapper"><label style="head1">${uiLabelMap.ShoppingLists}</label></container>
+ <container style="indent10Wrapper"><label style="head1">Shopping Lists</label></container>
<iterate-section list-name="shoppingLists" entry-name="shopList">
<section>
<widgets>
<container style="treeWrapper">
- <link target="EditWorkEffortShopList?workEffortId=${shopList.workEffortId}&shoppingListId=${shopList.shoppingListId}" text="[${shopList.shoppingListId}]" style="linktext"/>
- <label text="${shopList.listName} ${shopList.description}"/>
+ <link target="/partymgr/control/editShoppingList?shoppingListId=${shopList.shoppingListId}" url-mode="inter-app" text="[${shopList.shoppingListId}]" style="linktext"/>
+ <label text="${shopList.listName} ${shopList.description}" style="tabletext"/>
</container>
</widgets>
</section>
</iterate-section>
- <container style="indent10Wrapper"><label style="head1">${uiLabelMap.Quotes}</label></container>
+ <container style="indent10Wrapper"><label style="head1">Quotes</label></container>
<iterate-section list-name="quotes" entry-name="quote">
<section>
<widgets>
<container style="treeWrapper">
- <link target="EditWorkEffortQuote?workEffortId=${quote.workEffortId}&quoteId=${quote.quoteId}" text="[${quote.quoteId}]" style="linktext"/>
- <label text="${quote.quoteName} ${quote.description}"/>
+ <link target="/ordermgr/control/EditQuote?quoteId=${quote.quoteId}" url-mode="inter-app" text="[${quote.quoteId}]" style="linktext"/>
+ <label text="${quote.quoteName} ${quote.description}" style="tabletext"/>
</container>
</widgets>
</section>
</iterate-section>
- <container style="indent10Wrapper"><label style="head1">${uiLabelMap.OrderHeaders}</label></container>
+ <container style="indent10Wrapper"><label style="head1">Orders</label></container>
<iterate-section list-name="orderHeaders" entry-name="orderHeader">
<section>
<widgets>
<container style="treeWrapper">
- <link target="EditWorkEffortOrderHeader?workEffortId=${orderHeader.workEffortId}&orderId=${orderHeader.orderId}"
- text="[${orderHeader.orderId}] orderType: ${orderHeader.orderTypeDescription}, status: ${orderHeader.statusItemDescription}, orderDate: ${orderHeader.orderDate}" style="linktext"/>
+ <link target="/ordermgr/control/orderview?orderId=${orderHeader.orderId}&order_id=${orderHeader.orderId}" url-mode="inter-app" text="[${orderHeader.orderId}]" style="linktext"/>
+ <label text="type: ${orderHeader.orderTypeDescription}, status: ${orderHeader.statusItemDescription}, total: ${orderHeader.grandTotal}, date: ${orderHeader.orderDate}" style="tabletext"/>
</container>
</widgets>
</section>
@@ -132,6 +118,4 @@
</widgets>
</section>
</screen>
-
</screens>
-
More information about the Svn
mailing list