Re: svn commit: r687279 - in /ofbiz/trunk/applications/orde
Locked
Re: svn commit: r687279 - in /ofbiz/trunk/applications/orde
 
Administrator
|
Hi Hans,
There is a little thing weird in this commit. You added PageTitleRequestItems in OrderUiLabels.xml but there is already a such labels. As I saw it's about Notes, I replaced it by <property key="PageTitleRequestItemsNotes"> <value xml:lang="en">Request Item Notes</value> <value xml:lang="fr">Notes sur la demande d'articles</value> </property> But then I found that you are using it in as an already existing PageTitleRequestItems labels used in ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml So at this point I'm confused... Jacques > Author: hansbak > Date: Wed Aug 20 01:03:43 2008 > New Revision: 687279 > > URL: http://svn.apache.org/viewvc?rev=687279&view=rev > Log: > several improvements to the customer request screens > > Modified: > ofbiz/trunk/applications/order/config/OrderUiLabels.xml > ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml > ofbiz/trunk/applications/order/widget/ordermgr/RequestMenus.xml > ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml > > Modified: ofbiz/trunk/applications/order/config/OrderUiLabels.xml > URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/config/OrderUiLabels.xml?rev=687279&r1=687278&r2=687279&view=diff > ============================================================================== > --- ofbiz/trunk/applications/order/config/OrderUiLabels.xml (original) > +++ ofbiz/trunk/applications/order/config/OrderUiLabels.xml Wed Aug 20 01:03:43 2008 > @@ -9004,6 +9004,9 @@ > <value xml:lang="th">หัวà¸à¹à¸à¸à¸²à¸£à¸£à¹à¸à¸à¸à¸</value> > <value xml:lang="zh">请æ±æç»</value> > </property> > + <property key="PageTitleRequestItems"> > + <value xml:lang="en">Request Item Notes</value> > + </property> > <property key="PageTitleRequestRoles"> > <value xml:lang="de">Anfrage Rollen</value> > <value xml:lang="en">Request Roles</value> > > Modified: ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml > URL: > http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml?rev=687279&r1=687278&r2=687279&view=diff > ============================================================================== > --- ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml (original) > +++ ofbiz/trunk/applications/order/widget/ordermgr/CommonScreens.xml Wed Aug 20 01:03:43 2008 > @@ -62,31 +62,18 @@ > <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}"> > <decorator-section name="body"> > <section> > - <!-- > <condition> > - <if-has-permission permission="ORDERMGR" action="_VIEW"/> > + <not><if-empty field-name="custRequest"/></not> > </condition> > - --> > <widgets> > - <platform-specific> > - <html><html-template > location="component://order/webapp/ordermgr/request/RequestTabBar.ftl"/></html> > - </platform-specific> > - <container> > - <container> > - <link target="request" text="${uiLabelMap.OrderNewRequest}" style="buttontext"/> > - <link target="createQuoteFromCustRequest?custRequestId=${custRequestId}" > text="${uiLabelMap.OrderNewQuote}" style="buttontext"/> > - </container> > - > - <label style="h1">[${uiLabelMap.CommonId}:${custRequest.custRequestId}] > ${custRequest.custRequestName}</label> > - </container> > - <decorator-section-include name="body"/> > + <include-menu name="RequestTabBar" > location="component://order/widget/ordermgr/RequestMenus.xml"/> > </widgets> > - <!-- > - <fail-widgets> > - <label style="h3">${uiLabelMap.OrderViewPermissionError}</label> > - </fail-widgets> > - --> > </section> > + <include-menu name="RequestSubTabBar" location="component://order/widget/ordermgr/RequestMenus.xml"/> > + <container> > + <label style="h1">[${uiLabelMap.CommonId}:${custRequest.custRequestId}] > ${custRequest.custRequestName}</label> > + </container> > + <decorator-section-include name="body"/> > </decorator-section> > </decorator-screen> > </widgets> > > Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequestMenus.xml > URL: > http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequestMenus.xml?rev=687279&r1=687278&r2=687279&view=diff > ============================================================================== > --- ofbiz/trunk/applications/order/widget/ordermgr/RequestMenus.xml (original) > +++ ofbiz/trunk/applications/order/widget/ordermgr/RequestMenus.xml Wed Aug 20 01:03:43 2008 > @@ -21,19 +21,30 @@ > <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" > xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd"> > > - <menu name="editRequest" default-selected-style="selected" type="simple" > + <menu name="RequestTabBar" default-selected-style="selected" type="simple" > selected-menuitem-context-field-name="tabButtonItem" > menu-container-style="button-bar tab-bar"> > + <menu-item name="ViewRequest" title="Overview" > > + <link target="ViewRequest?custRequestId=${custRequest.custRequestId}"/> > + </menu-item> > <menu-item name="request" title="Request" > > - <link id="requestheader" target="request?custRequestId=${custRequest.custRequestId}"/> > + <link target="request?custRequestId=${custRequest.custRequestId}"/> > </menu-item> > <menu-item name="requestroles" title="Request Roles" > > - <link id="requestroles" target="requestroles?custRequestId=${custRequest.custRequestId}"/> > + <link target="requestroles?custRequestId=${custRequest.custRequestId}"/> > </menu-item> > <menu-item name="requestitems" title="Request Items" > > - <link id="requestitems" target="/requestitems?custRequestId=${custRequest.custRequestId}"> > - </link> > + <link target="/requestitems?custRequestId=${custRequest.custRequestId}"/> > + </menu-item> > + </menu> > + <menu name="RequestSubTabBar" type="simple" menu-container-style="button-bar button-style-2"> > + <menu-item name="newRequest" title="${uiLabelMap.OrderNewRequest}"> > + <link target="request"/> > + </menu-item> > + <menu-item name="createQuoteFromRequest" title="Create Quote from request" > > + <link target="createQuoteFromCustRequest?custRequestId=${custRequest.custRequestId}"/> > </menu-item> > </menu> > + > > <menu name="editrequestitemmenu" default-selected-style="selected" type="simple" > menu-container-style="button-bar tab-bar"> > @@ -50,5 +61,16 @@ > <link id="workeffortrequirements" > target="requestitemrequirements?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}"/> > </menu-item> > </menu> > + <menu name="requestItemNoteMmenu" default-selected-style="selected" type="simple" menu-container-style="button-bar tab-bar"> > + <menu-item name="requestitemnotes" title="Request Item Notes" > > + <link id="requestitemnotes" > target="requestitemnotes?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}"/> > + </menu-item> > + <menu-item name="requestitemquotes" title="Request Item Quotes" > > + <link id="requestitemquotes" > target="RequestItemQuotes?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}"/> > + </menu-item> > + <menu-item name="workeffortrequirements" title="WorkEffort Requirements" > > + <link id="workeffortrequirements" > target="requestitemrequirements?custRequestId=${custRequest.custRequestId}&custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}"/> > + </menu-item> > + </menu> > </menus> > > > Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml > URL: > http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml?rev=687279&r1=687278&r2=687279&view=diff > ============================================================================== > --- ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml (original) > +++ ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml Wed Aug 20 01:03:43 2008 > @@ -75,9 +75,12 @@ > <platform-specific> > <html><html-template location="component://order/webapp/ordermgr/request/requestInfo.ftl"/></html> > </platform-specific> > - <screenlet title="${uiLabelMap.PageTitleRequestItems}"> > - <include-form name="OverviewRequestItems" > 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> > </container> > <container style="righthalf"> > <platform-specific> > > |
«
Return to OFBiz - Dev
|
1 view|%1 views
| Free forum by Nabble | Edit this page |