You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by ha...@apache.org on 2009/05/05 06:02:11 UTC
svn commit: r771546 - in /ofbiz/trunk:
applications/order/webapp/ordermgr/request/
applications/order/widget/ordermgr/
specialpurpose/projectmgr/webapp/projectmgr/request/
specialpurpose/projectmgr/widget/
Author: hansbak
Date: Tue May 5 04:02:10 2009
New Revision: 771546
URL: http://svn.apache.org/viewvc?rev=771546&view=rev
Log:
better formatting of customer request overview
Modified:
ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml
ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl
ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml?rev=771546&r1=771545&r2=771546&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/request/RequestForms.xml Tue May 5 04:02:10 2009
@@ -121,7 +121,7 @@
<parameter param-name="custRequestItemSeqId"/>
</hyperlink>
</field>
- <field name="story"></field>
+ <field name="story"><textarea read-only="true"/></field>
<field name="productId" title="${uiLabelMap.ProductProductId}">
<display-entity entity-name="Product" key-field-name="productId" description="${productId} - ${internalName}"/>
</field>
Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml?rev=771546&r1=771545&r2=771546&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml (original)
+++ ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml Tue May 5 04:02:10 2009
@@ -85,11 +85,8 @@
<screenlet title="${uiLabelMap.OrderRequest} ${custRequest.custRequestId} ${uiLabelMap.CommonInformation}">
<include-form name="requestInfo" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
</screenlet>
- <screenlet title="${uiLabelMap.PageTitleRequestItems}">
- <include-form name="OverviewRequestItems" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
- </screenlet>
- <screenlet title="${uiLabelMap.PageTitleRequestItemNotes}">
- <include-form name="ListRequestItemNotes" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ <screenlet title="${uiLabelMap.OrderRequestRoles}">
+ <include-form name="ViewRequestRoles" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
</screenlet>
</container>
<container style="righthalf">
@@ -99,9 +96,6 @@
<platform-specific>
<html><html-template location="component://order/webapp/ordermgr/request/requestContactMech.ftl"/></html>
</platform-specific>
- <screenlet title="${uiLabelMap.OrderRequestRoles}">
- <include-form name="ViewRequestRoles" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
- </screenlet>
<screenlet title="${uiLabelMap.PartyListCommunicationEvents}" navigation-form-name="ViewRequest">
<include-form name="ViewRequestCommunicationEvents" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
</screenlet>
@@ -112,6 +106,13 @@
<include-form name="ListCustRequestContent" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
</screenlet>
</container>
+ <container style="clear"/>
+ <screenlet title="${uiLabelMap.PageTitleRequestItems}">
+ <include-form name="OverviewRequestItems" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ </screenlet>
+ <screenlet title="${uiLabelMap.PageTitleRequestItemNotes}">
+ <include-form name="ListRequestItemNotes" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
+ </screenlet>
</decorator-section>
</decorator-screen>
</widgets>
Modified: ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl?rev=771546&r1=771545&r2=771546&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl Tue May 5 04:02:10 2009
@@ -33,7 +33,7 @@
</td>
<td>
</td>
- </tr>
+ </tr>
<#list custRequestItems as custRequestItemList>
<#if custRequestItemList.custRequestItemSeqId?has_content>
<tr class="header-row">
@@ -50,7 +50,7 @@
</td>
<td colspan="2">
<#if custRequestItemList.story?has_content>
- ${custRequestItemList.story}
+ <textarea readonly="readonly" rows="15" cols="72">${custRequestItemList.story}</textarea>
</#if>
</td>
<td>
Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml?rev=771546&r1=771545&r2=771546&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/projectmgr/widget/RequestScreens.xml Tue May 5 04:02:10 2009
@@ -113,9 +113,6 @@
<screenlet title="${uiLabelMap.OrderRequest} ${custRequest.custRequestId} ${uiLabelMap.CommonInformation}">
<include-form name="requestInfo" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
</screenlet>
- <platform-specific>
- <html><html-template location="component://projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl"/></html>
- </platform-specific>
</container>
<container style="righthalf">
<platform-specific>
@@ -137,6 +134,10 @@
<include-form name="ListCustRequestContent" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
</screenlet>
</container>
+ <container style="clear"/>
+ <platform-specific>
+ <html><html-template location="component://projectmgr/webapp/projectmgr/request/overViewRequestItems.ftl"/></html>
+ </platform-specific>
</decorator-section>
</decorator-screen>
</widgets>