svn commit: r728389 [3/4] - in /ofbiz/trunk: framework/common/data/ framework/common/entitydef/ framework/common/script/org/ofbiz/common/ framework/common/servicedef/ framework/common/webcommon/WEB-INF/ framework/common/webcommon/portal/ framework/comm...

[hansbak-2]

Added: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml?rev=728389&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml (added)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml Sat Dec 20 20:40:27 2008
@@ -0,0 +1,295 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<forms xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-form.xsd">
+
+    <form name="MyTasks" extends="MyTasks" extends-resource="component://projectmgr/widget/forms/TaskForms.xml">
+        <field name="donePage"><hidden value="${parameters.donePage}"/></field>
+        <field name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}" widget-style="buttontext">
+            <hyperlink also-hidden="false" description="${workEffortName}" target="/projectmgr/control/taskView?workEffortId=${workEffortId}" target-type="inter-app" target-window="_BLANK"/>
+        </field>
+        <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}"><hyperlink target="/projectmgr/control/projectView?projectId=${resultProject.projectId}"  target-type="inter-app" target-window="_BLANK" description="${resultProject.projectName}"/></field>
+        <field name="roleTypeId" parameter-name="newRoleTypeId" title="${uiLabelMap.PartyRole}"><hidden value="${roleTypeId}"/></field>
+        <field name="remove" title="${uiLabelMap.CommonRemove}"><hyperlink target="updateTaskAssigment?workEffortId=${workEffortId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;fromDate=${fromDate}&amp;statusId=PAS_ENDED&amp;donePage=${parameters.donePage}" description="${uiLabelMap.CommonRemove}"/></field>
+        <!-- better set to complete on the timesheet -->
+        <!-- field name="toComplete" title="${uiLabelMap.CommonStatustoComplete}"><hyperlink target="updateTaskAssigment?workEffortId=${workEffortId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;fromDate=${fromDate}&amp;statusId=PAS_COMPLETED&amp;donePage=${parameters.donePage}" description="${uiLabelMap.CommonStatustoComplete}"/></field-->
+    </form>
+    
+    <form name="EditWeekTimesheet" extends="EditWeekTimesheet" extends-resource="component://projectmgr/widget/forms/TimeSheetForms.xml">
+            <alt-target use-when="!headerItem.equals(&quot;main&quot;)" target="updateTimesheetKey"/>        
+            <field name="workEffortId" title="${uiLabelMap.ProjectMgrTaskName}">
+            <drop-down allow-empty="true">
+                <entity-options entity-name="ProjectPartyAndPhaseAndTask" description="${projectName} -- ${phaseName} -- ${workEffortName}">
+                    <entity-constraint name="workEffortTypeId" operator="not-equals" value="TASK_TEMPLATE"/>
+                    <entity-constraint name="partyId" env-name="timesheet.partyId"/>
+                    <entity-order-by field-name="projectName"/>
+                    <entity-order-by field-name="phaseName"/>
+                    <entity-order-by field-name="workEffortName"/>
+                </entity-options>
+                <sub-hyperlink target="/projectmgr/control/taskView?workEffortId=${workEffortId}" target-type="inter-app" target-window="_BLANK" link-style="buttontext" description="${bsh:workEffortId != void &amp;&amp; !workEffortId.equals(&quot;Totals&quot;) ? workEffortId : &quot;&quot;}"/>
+            </drop-down>
+        </field>
+        <field name="updateButton"><submit/></field>
+    </form>
+
+    <form name="MyCompanyComms" type="list" list-name="events" target="deleteEvent" paginate-target="FindTask"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <actions>
+            <set field="nowDate" value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString(&quot;yyyy-MM-dd HH:mm:ss.S&quot;)}" type="String"/>
+            <entity-condition entity-name="WorkEffort">
+                <condition-list combine="and">
+                    <condition-expr field-name="workEffortTypeId" operator="equals" value="COMPANY_EVENT"/>
+                    <condition-expr field-name="actualStartDate" operator="greater-equals" env-name="nowDate"/>
+                </condition-list>
+                <order-by field-name="actualStartDate"/>
+            </entity-condition>
+        </actions>
+        <alt-target use-when="!headerItem.equals(&quot;main&quot;)" target="deleteEventKey"/>
+        <field name="workEffortId"><hidden/></field>
+        <field name="workEffortName" title="${uiLabelMap.WorkEffortEventName}"><display/></field>
+        <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
+        <field name="actualStartDate" title="Date"><display type="date"/></field>
+        <field name="delete"><submit button-type="text-link"/></field>
+    </form>
+    
+    <form name="newEvent" type="single" target="createEvent">
+        <field name="donePage"><hidden/></field>
+        <field name="workEffortTypeId"><hidden value="COMPANY_EVENT"/></field>
+        <field name="currentStatusId"><hidden value="_NA_"/></field>
+        <field name="workEffortName" title="${uiLabelMap.WorkEffortEventName}"><text/></field>
+        <field name="description" title="${uiLabelMap.CommonDescription}"><text/></field>
+        <field name="actualStartDate"><date-time type="date"/></field>
+        <field name="add"><submit/></field>
+    </form>
+
+    <form name="preferences" type="single" target="updatePreferences" default-map-name="preferences.userPrefMap">
+        <field name="userPrefGroupTypeId"><hidden value="MyPage"/></field>
+        <field name="myCommunications"><check/></field>
+        <field name="otherCommunications"><check/></field>
+        <field name="myCompanyComms"><check/></field>
+        <field name="myTasks"><check/></field>
+        <field name="myTimesheet"><check/></field>
+        <field name="updateButton"><submit/></field>
+    </form>
+    
+    <form name="custPreferences" type="single" target="updateCustPreferences" default-map-name="preferences.userPrefMap">
+        <field name="userPrefGroupTypeId"><hidden value="MyPage"/></field>
+        <field name="sendCustRequestEmail" title="Send Email To Every Customer Request Change"><check/></field>
+        <field name="updateButton"><submit/></field>
+    </form>
+    
+    <form name="ListPartyCommEvents" extends="ListCommEvents" extends-resource="component://party/webapp/partymgr/communication/CommForms.xml" type="list">
+        <row-actions>
+            <set field="toComplete" value="${bsh:&quot;COM_ROLE_READ&quot;.equals(roleStatusId)?&quot;->Complete&quot;:&quot;&quot;}"/>
+        </row-actions>
+        <field name="donePage"><hidden/></field>
+        <field name="roleTypeId"><display-entity entity-name="RoleType" description="${description}"/></field>
+        <field name="removeLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit">
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="RemoveCommunicationEventRole?partyId=${partyId}&amp;communicationEventId=${communicationEventId}&amp;roleTypeId=${roleTypeId}&amp;deleteCommEventIfLast=Y&amp;delContentDataResource=Y&amp;donePage=${parameters.donePage}"/>
+        </field>
+        <field name="subject" widget-style="buttontext" widget-area-style="fieldWidth300">
+            <hyperlink description="${subject} " target="ViewCommunicationEvent?communicationEventId=${communicationEventId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;donePage=${parameters.donePage}"/>
+        </field>
+        <field name="statusId" entry-name="roleStatusId" widget-style="buttontext" widget-area-style="fieldWidth300">
+            <display-entity entity-name="StatusItem" description="${description}">
+                <sub-hyperlink description="${uiLabelMap.${toComplete}}" target="setCommunicationEventRoleStatus?communicationEventId=${communicationEventId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;statusId=COM_ROLE_COMPLETED&amp;donePage=${parameters.donePage}&amp;VIEW_SIZE=${parameters.VIEWSIZE}&amp;VIEW_INDEX=${parameters.VIEW_INDEX}"/>
+            </display-entity>
+        </field>
+        <field name="createdStamp" entry-name="entryDate"/>
+    </form>
+    <form name="ListMyUnknownPartyEmails" type="multi"
+        extends="ListMyUnknownPartyEmails" extends-resource="component://party/webapp/partymgr/communication/CommForms.xml" use-row-submit="true">
+        <field name="donePage"><hidden/></field>
+        <field name="subject" widget-style="buttontext" widget-area-style="fieldWidth300">
+            <hyperlink description="${subject}" target="ViewCommunicationEvent?communicationEventId=${communicationEventId}&amp;donePage=${parameters.donePage}"/>
+        </field>
+        <field name="_rowSubmit" title="S">
+            <check />
+        </field>
+        <field name="deleteSelectedButton" widget-style="smallSubmit">
+            <submit />
+        </field>
+    </form>
+    <form name="ViewRequestWorkEfforts" extends="ViewRequestWorkEfforts" extends-resource="component://order/webapp/ordermgr/request/RequestForms.xml">
+        <field name="workEffortId">
+            <hyperlink target="/projectmgr/control/taskView?workEffortId=${workEffortId}" description="${workEffortName} [${workEffortId}]" target-type="inter-app"/>
+        </field>
+    </form>
+    <form name="ListCustRequests" type="list"  list-name="custRequests" odd-row-style="alternate-row" default-table-style="basic-table hover-bar" target="updateRequest">
+        <row-actions>
+            <service service-name="getProjectTask" result-map-name="taskResult">
+                <field-map field-name="taskId" env-name="workEffortId"/>
+            </service>
+        </row-actions>
+        <field name="custRequestId"><hidden/></field>
+        <field name="custRequestName"><hyperlink description="${custRequestName} [${custRequestId}]" target="ViewRequest?custRequestId=${custRequestId}"/></field>
+        <field name="custRequestDate" title="Date"><display type="date"/></field>
+        <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+        <field name="priority">
+            <drop-down allow-empty="true">
+                <option key="9"/>
+                <option key="8"/>
+                <option key="7"/>
+                <option key="6"/>
+                <option key="5"/>
+                <option key="4"/>
+                <option key="3"/>
+                <option key="2"/>
+                <option key="1"/>
+            </drop-down>
+        </field>
+        <field name="updateButton" widget-style="smallSubmit"><submit /></field>
+        <field name="currentStatusId" map-name="taskResult.taskInfo" title="${uiLabelMap.TaskStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
+        <field name="estimatedStartDate" map-name="taskResult.taskInfo" title="${uiLabelMap.TaskPlanStartDate}"><display type="date"/></field>
+        <field name="estimatedCompletionDate" map-name="taskResult.taskInfo" title="${uiLabelMap.TaskPlanEndDate}"><display type="date"/></field>
+        <field name="actualStartDate" map-name="taskResult.taskInfo" title="${uiLabelMap.TaskActStartDate}"><display type="date"/></field>
+        <field name="actualCompletionDate" map-name="taskResult.taskInfo" title="${uiLabelMap.TaskActEndDate}"><display type="date"/></field>
+        <field name="plannedHours" map-name="taskResult.taskInfo"><display/></field>
+        <field name="actualHours" map-name="taskResult.taskInfo"><display/></field>
+    </form>
+    <form name="ListCustRequestsCompleted" extends="ListCustRequests" list-name="custRequestsCompleted">
+        <field name="priority"><display/></field>
+        <field name="updateButton"><ignored/></field>
+    </form>
+
+    <form name="ListOtherCompanyRequests" extends="ListCustRequestsCompleted" list-name="companyCustRequests">
+        <field name="fromPartyId">
+            <display-entity entity-name="PartyNameView" key-field-name="partyId" description="${firstName} ${middleName} ${lastName} ${groupName} [${fromPartyId}])"/>
+        </field>
+    </form>
+
+    <form name="EditCustRequest" extends="EditCustRequest" extends-resource="component://projectmgr/widget/forms/RequestForms.xml">
+        <field name="fromPartyId" title="${uiLabelMap.OrderRequestingParty}"><hidden value="${userLogin.partyId}"/></field>
+        <field name="custRequestDate"><ignored/></field>
+        <field name="childWorkEffortId"><ignored/></field>
+        <field name="partyId"><ignored/></field>
+    </form>
+
+    <form name="ListInvoices" type="list" separate-columns="true" paginate-target="listInvoices" list-name="invoices"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <row-actions>
+            <service service-name="getPartyNameForDate" result-map-name="partyNameResultFrom">
+                <field-map field-name="partyId" env-name="partyIdFrom"/>
+                <field-map field-name="compareDate" env-name="invoiceDate"/>
+                <field-map field-name="lastNameFirst" value="Y"/>
+            </service>
+            <service service-name="getPartyNameForDate" result-map-name="partyNameResultTo">
+                <field-map field-name="partyId" env-name="partyId"/>
+                <field-map field-name="compareDate" env-name="invoiceDate"/>
+                <field-map field-name="lastNameFirst" value="Y"/>
+            </service>
+            <script location="component://mypage/webapp/mypage/WEB-INF/actions/ConvertInvoiceCurrency.groovy"/>
+        </row-actions>
+        <field name="invoiceId" widget-style="buttontext">
+            <hyperlink description="${invoiceId}" target="invoice.pdf?invoiceId=${invoiceId}"/>
+        </field>
+        <field name="invoiceTypeId"><display-entity entity-name="InvoiceType" description="${description}"/></field>
+        <field name="invoiceDate"><display/></field>
+        <field name="statusId"><display-entity entity-name="StatusItem" description="${description}"/></field>
+        <field name="description"><display/></field>
+        <field name="partyIdFrom"><display description="${partyNameResultFrom.fullName} [${partyIdFrom}]"/></field>
+        <field name="partyIdTo" parameter-name="partyId"><display description="${partyNameResultTo.fullName} [${partyId}]"/></field>
+        <field name="invoiceDate"><display description="${bsh:invoiceDate.toString().substring(0,10)}"/></field>
+        <field name="total" widget-area-style="align-text"><display type="currency" currency="${currencyUomId}"/></field>
+        <field name="amountToApply" widget-area-style="align-text"><display type="currency" currency="${currencyUomId}"/></field>
+    </form>
+
+    <form name="ListDraftEmails" type="list" extends="ListCommEvents" extends-resource="component://party/webapp/partymgr/communication/CommForms.xml"
+         use-row-submit="true">
+        <actions>
+            <entity-condition entity-name="CommunicationEvent" list-name="commEvents">
+                <condition-list combine="and">
+                    <condition-expr field-name="statusId" operator="equals" value="COM_PENDING"/>
+                    <condition-expr field-name="partyIdFrom" operator="equals" value="${partyId}"/>                        
+                </condition-list>
+                <order-by field-name="-lastUpdatedStamp"/>
+            </entity-condition>
+        </actions>        
+        <field name="subject">
+            <hyperlink description="${subject}" target="EditCommunicationEvent?communicationEventId=${communicationEventId}&amp;communicationEventTypeId=EMAIL_COMMUNICATION&amp;partyId=${userLogin.partyId}"/>
+        </field>
+        <field name="removeLink" title="${uiLabelMap.CommonDelete}" widget-style="smallSubmit">
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deletePartyCommunicationEvent?partyId=${partyId}&amp;communicationEventId=${communicationEventId}"/>
+        </field>
+    </form>
+
+    <form name="MyPageNewEmail" type="single" target="createCommunicationEvent" default-map-name="communicationEvent">
+        <actions>
+            <set field="nowDate" value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString(&quot;yyyy-MM-dd HH:mm:ss.S&quot;)}" type="String"/>            
+            <entity-condition entity-name="PartyContactWithPurpose" list-name="emailAddresses">
+                <condition-list combine="and">
+                    <condition-expr field-name="partyId" value="${userLogin.partyId}"/>
+                    <condition-expr field-name="contactFromDate" operator="less-equals" env-name="nowDate"/>
+                    <condition-list combine="or">
+                        <condition-expr field-name="contactThruDate" env-name="null"/>
+                        <condition-expr field-name="contactThruDate" operator="greater-equals" env-name="nowDate"/>
+                    </condition-list>
+                    <condition-expr field-name="purposeFromDate" operator="less-equals" env-name="nowDate"/>
+                    <condition-list combine="or">
+                        <condition-expr field-name="purposeThruDate" operator="greater-equals" env-name="nowDate"/>
+                        <condition-expr field-name="purposeThruDate" env-name="null"/>
+                    </condition-list>
+                    <condition-expr field-name="contactMechPurposeTypeId" operator="equals" value="PRIMARY_EMAIL"/>
+                    <condition-expr field-name="contactMechTypeId" operator="equals" value="EMAIL_ADDRESS"/>
+                </condition-list>
+                <order-by field-name="infoString"/>
+            </entity-condition>
+            <set field="communicationEventId" from-field="parameters.communicationEventId"/>
+        </actions>
+        <alt-target use-when="communicationEventId!=null" target="updateCommunicationEvent"/>
+        <field name="donePage"><hidden/></field>        
+        <field name="communicationEventId"  use-when="communicationEventId!=null"><hidden/></field>
+        <field name="communicationEventTypeId"><hidden value="AUTO_EMAIL_COMM"/></field>
+        <field name="statusId"><hidden value="COM_IN_PROGRESS"/></field>
+        <field name="parentCommEventId" use-when="parentCommEventId != null"><hidden value="${parameters.parentCommEventId}"/></field>
+        <field name="parentCommEventId" use-when="originalCommEventId != null"><hidden value="${parameters.originalCommEventId}"/></field>
+        <field name="partyIdFrom"><hidden value="${userLogin.partyId}"/></field>
+        <field name="emailAddress" parameter-name="contactMechIdFrom">
+            <drop-down>
+                <list-options list-name="emailAddresses" description="${infoString}" key-name="contactMechId"/>
+            </drop-down>
+        </field>
+        <field name="contactMechIdTo" title="${uiLabelMap.PartyEmailTo}">
+            <lookup target-form-name="LookupPartyEmail" default-value="${parameters.contactMechIdTo}"/>
+        </field>
+        <field name="datetimeStarted" title="${uiLabelMap.CommonSendDate}"><date-time/></field>
+        <field name="subject"><text size="60" default-value="${parameters.subject}"/></field>
+        <field name="fileAttach"><display/></field><field name="fileAttach">
+            <hyperlink target="addAttachmentEmail?communicationEventTypeId=${parameters.communicationEventTypeId}&amp;partyId=${userLogin.partyId}&amp;communicationEventId=${parameters.communicationEventId}" description="Attach File"/>
+        </field>
+        <field name="contentMimeTypeId"><hidden value="text/plain"/></field>
+        <field name="content" title="${uiLabelMap.CommonContent}"><textarea cols="80" rows="20" default-value="${parameters.content}"/></field>
+        <field name="send" title="&amp;nbsp;" position="1">
+            <hyperlink also-hidden="true" target-type="plain" description="Send" target="javascript:(document.MyPageNewEmail.submit())"/>
+        </field>
+        <field name="save" title="&amp;nbsp;" position="2">
+            <hyperlink also-hidden="true" target-type="plain" description="Save" target="javascript:(document.MyPageNewEmail.statusId.value='COM_PENDING'),(document.MyPageNewEmail.submit())"/>
+        </field>
+        <field name="dummy" position="320"><hidden/></field>
+    </form>
+    <form name="ListPhaseInfo" extends="ListPhaseInfo" extends-resource="component://projectmgr/widget/forms/ProjectForms.xml">
+        <field name="phase"><display description="${phaseName}"/></field>
+    </form>
+    <form name="ListTaskInfo" extends="ListTaskInfo" extends-resource="component://projectmgr/widget/forms/ProjectForms.xml">
+        <field name="task"><display description="${workEffortName}"/></field>
+    </form>
+    
+</forms>

Propchange: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml?rev=728389&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml (added)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml Sat Dec 20 20:40:27 2008
@@ -0,0 +1,319 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd">
+    <menu name="MyPageAppBar" id="app-navigation" type="simple" selected-menuitem-context-field-name="headerItem" default-selected-style="selected" title="My Personal Page" menu-container-style="button-bar tab-bar">
+        <menu-item name="main" title="${uiLabelMap.CommonMain}">
+            <condition>
+                <not><if-empty field-name="userLogin"/></not>
+            </condition>
+            <link target="main?donePage=main"/>
+        </menu-item>
+        <menu-item name="viewprofile" title="${uiLabelMap.MyProfile}">
+            <condition>
+                <not><if-empty field-name="userLogin"/></not>
+            </condition>
+            <link target="viewprofile?partyId=${userLogin.partyId}"/>
+        </menu-item>
+        <menu-item name="myCommunications" title="${uiLabelMap.MyCommunications}">
+            <condition>
+                <and>
+                    <not><if-empty field-name="userLogin"/></not>
+                    <if-compare field-name="preferences.userPrefMap.myCommunications" operator="not-equals" value="Y"/>
+                </and>
+            </condition>
+            <link target="myCommunications?donePage=myCommunications"/>
+        </menu-item>
+        <menu-item name="otherCommunications" title="${uiLabelMap.OtherCommunications}">
+            <condition>
+                <and>
+                    <not><if-empty field-name="userLogin"/></not>
+                    <if-compare field-name="preferences.userPrefMap.otherCommunications" operator="not-equals" value="Y"/>
+                    <or>
+                        <if-has-permission permission="MYPAGE_EMPLOYEE"/>
+                        <if-has-permission permission="MYPAGE_EMPL-NOEMAIL"/>
+                    </or>
+                </and>
+            </condition>
+            <link target="otherCommunications?donePage=otherCommunications"/>
+        </menu-item>
+        <menu-item name="myCompanyComms" title="${uiLabelMap.MyCompanyComms}">
+            <condition>
+                <and>
+                    <not><if-empty field-name="userLogin"/></not>
+                    <if-compare field-name="preferences.userPrefMap.myCompanyComms" operator="not-equals" value="Y"/>
+                    <or>
+                        <if-has-permission permission="MYPAGE_EMPLOYEE"/>
+                        <if-has-permission permission="MYPAGE_EMPL-NOEMAIL"/>
+                    </or>
+                </and>
+            </condition>
+            <link target="myCompanyComms"/>
+        </menu-item>
+        <menu-item name="myTimesheet" title="${uiLabelMap.myTimesheet}">
+            <condition>
+                <and>
+                    <not><if-empty field-name="userLogin"/></not>
+                    <if-compare field-name="preferences.userPrefMap.myTimesheet" operator="not-equals" value="Y"/>
+                    <or>
+                        <if-has-permission permission="MYPAGE_EMPLOYEE"/>
+                        <if-has-permission permission="MYPAGE_EMPL-NOEMAIL"/>
+                    </or>
+                </and>
+            </condition>
+            <link target="myTimesheet?donePage=myTimeSheet"/>
+        </menu-item>
+        <menu-item name="myTasks" title="${uiLabelMap.myTasks}">
+            <condition>
+                <and>
+                    <not><if-empty field-name="userLogin"/></not>
+                    <if-compare field-name="preferences.userPrefMap.myTasks" operator="not-equals" value="Y"/>
+                    <or>
+                        <if-has-permission permission="MYPAGE_EMPLOYEE"/>
+                        <if-has-permission permission="MYPAGE_EMPL-NOEMAIL"/>
+                    </or>
+                </and>
+            </condition>
+            <link target="myTasks?donePage=myTasks"/>
+        </menu-item>
+        <menu-item name="invoices" title="${uiLabelMap.AccountingInvoicesMenu}">
+            <condition>
+                <and>
+                    <not><if-empty field-name="userLogin"/></not>
+                    <if-has-permission permission="MYPAGE_CUSTOMER"/>
+                </and>
+            </condition>
+            <link target="listInvoices"/>
+        </menu-item>
+        <menu-item name="projects" title="${uiLabelMap.ProjectMgrProjects}">
+            <condition>
+                <and>
+                    <not><if-empty field-name="userLogin"/></not>
+                    <if-has-permission permission="MYPAGE_CUSTOMER"/>
+                </and>
+            </condition>
+            <link target="listProjects"/>
+        </menu-item>
+        <menu-item name="Logout" title="${uiLabelMap.CommonLogout}" align-style="opposed">
+            <condition><not><if-empty field-name="userLogin"/></not></condition>
+            <link target="logout"/>
+        </menu-item>
+        <menu-item name="Login" title="${uiLabelMap.CommonLogin}" align-style="opposed">
+            <condition><if-empty field-name="userLogin"/></condition>
+            <link target="${checkLoginUrl}"/>
+        </menu-item>
+        <menu-item name="help" title="${uiLabelMap.CommonHelp}" align-style="opposed">
+            <condition><not><if-empty field-name="userLogin"/></not></condition>
+            <link target="http://docs.ofbiz.org/display/OFBENDUSER/My+Page?decorator=printable" url-mode="plain" target-window="new"/>
+        </menu-item>
+        <menu-item name="preferences" title="${uiLabelMap.CommonPreferences}" align-style="opposed">
+            <condition>
+                <if-has-permission permission="MYPAGE_EMPLOYEE"/>
+            </condition>
+            <link target="preferences"/>
+        </menu-item>
+        <menu-item name="custPreferences" title="${uiLabelMap.CommonPreferences}" align-style="opposed">
+            <condition>
+                <if-has-permission permission="MYPAGE_CUSTOMER"/>
+            </condition>
+            <link target="custPreferences"/>
+        </menu-item>
+    </menu>    
+    
+    <menu name="MyCompanyCommsMenu">
+        <menu-item name="newEvent" title="${uiLabelMap.WorkEffortNewEvent}">
+            <link target="newEvent?donePage=${parameters.donePage}"/>
+        </menu-item>
+    </menu>
+    <menu name="communicationsMenu">
+        <menu-item name="newEmail" title="${uiLabelMap.PartyNewEmail}">
+            <condition>
+                <if-has-permission permission="PARTYMGR_CME-EMAIL_CREATE"/>
+            </condition>      
+            <link
+                target="NewCommunicationEvent?communicationEventTypeId=EMAIL_COMMUNICATION&amp;donePage=${parameters.donePage}&amp;partyIdFrom=${userLogin.partyId}&amp;statusId=COM_PENDING"/>
+        </menu-item>
+        <menu-item name="newNote" title="${uiLabelMap.PartyNewInternalNote}">
+            <condition>
+                <if-has-permission permission="PARTYMGR_CME-NOTE_CREATE"/>
+            </condition>      
+            <link
+                target="EditCommunicationEvent?communicationEventTypeId=COMMENT_NOTE&amp;donePage=${parameters.donePage}" />
+        </menu-item>
+        <menu-item name="openEvents" title="${uiLabelMap.OpenEvents}">
+            <condition>
+                <if-compare field-name="parameters.all" operator="equals" value="true" />
+            </condition>
+            <link target="${parameters.donePage}?donePage=${parameters.donePage}&amp;all=false" />
+        </menu-item>
+        <menu-item name="allOtherEvents" title="${uiLabelMap.AllEvents}">
+            <condition>
+                <or>
+                    <if-compare field-name="parameters.all" operator="equals" value="false" />
+                    <if-empty field-name="parameters.all"/>
+                </or>
+            </condition>
+            <link target="${parameters.donePage}?donePage=${parameters.donePage}&amp;all=true" />
+        </menu-item>
+    </menu>    
+    
+    <menu name="MyTasksMenu" type="simple" menu-container-style="button-bar button-style-2" default-selected-style="selected" selected-menuitem-context-field-name="tabButtonItem">
+        <menu-item name="myTasks" title="myTasks"><link target="/projectmgr/control/MyTasks" url-mode="inter-app"/></menu-item>
+    </menu>
+    
+    <menu name="MyTimesheetMenu">
+        <menu-item name="setToComplete" title="${uiLabelMap.CommonStatustoComplete}">
+            <condition>
+                <and>
+                    <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_IN_PROCESS"/>
+                    <if-compare field-name="headerItem" operator="equals" value="main"/>
+                </and>
+            </condition>
+            <link target="statusToComplete?timesheetId=${timesheet.timesheetId}&amp;statusId=TIMESHEET_COMPLETED"/>
+        </menu-item>
+        <menu-item name="setToCompleteKey" title="${uiLabelMap.CommonStatustoComplete}">
+            <condition>
+                <and>
+                    <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_IN_PROCESS"/>
+                    <if-compare field-name="headerItem" operator="not-equals" value="main"/>
+                </and>
+            </condition>
+            <link target="statusToCompleteKey?timesheetId=${timesheet.timesheetId}&amp;statusId=TIMESHEET_COMPLETED"/>
+        </menu-item>
+        <menu-item name="myTime" title="myTime"><link target="/projectmgr/control/MyTimesheet" url-mode="inter-app"/></menu-item>
+    </menu>
+    <menu name="CommSubTabBar" menu-container-style="button-bar button-style-2">
+        <menu-item name="new" title="${uiLabelMap.PartyNewCommunication}">
+            <condition>
+                <and>
+                    <if-has-permission permission="PARTYMGR_CME_CREATE"/>
+                    <if-has-permission permission="PARTYMGR_CME-EMAIL_CREATE"/>
+                </and>
+            </condition>
+            <link target="EditCommunicationEvent?donePage=${parameters.donePage}"/>
+        </menu-item>
+        <menu-item name="newEmail" title="${uiLabelMap.PartyNewEmail}">
+            <condition>
+                <if-has-permission permission="PARTYMGR_CME-EMAIL_CREATE"/>
+            </condition>
+            <link target="NewCommunicationEvent?communicationEventTypeId=EMAIL_COMMUNICATION&amp;donePage=${parameters.donePage}&amp;partyIdFrom=${userLogin.partyId}&amp;statusId=COM_PENDING"/>
+        </menu-item>
+        <menu-item name="newInternalNote" title="${uiLabelMap.PartyNewInternalNote}">
+            <condition>
+                <if-has-permission permission="PARTYMGR_CME-NOTE_CREATE"/>
+            </condition>
+            <link target="EditCommunicationEvent?communicationEventTypeId=COMMENT_NOTE&amp;donePage=${parameters.donePage}"/>
+        </menu-item>
+        <menu-item name="reply" title="${uiLabelMap.PartyReply}">
+            <condition>
+                <and>
+                    <not><if-empty field-name="parameters.communicationEventId"/></not>
+                    <not><if-empty field-name="communicationEvent.partyIdFrom"/></not>
+                    <if-compare field-name="communicationEvent.partyIdFrom" operator="not-equals" value="${userLogin.partyId}"/>
+                    <if-has-permission permission="PARTYMGR_CME-EMAIL_UPDATE"/>
+                    <if-has-permission permission="PARTYMGR_CME-NOTE_CREATE"/>
+                </and>
+            </condition>
+            <link target="NewCommunicationEvents?communicationEventTypeId=EMAIL_COMMUNICATION&amp;parentCommEventId=${parameters.communicationEventId}&amp;donePage=${parameters.donePage}"/>
+        </menu-item>
+        <menu-item name="forward" title="${uiLabelMap.Forward}">
+            <condition>
+                <and>
+                    <not><if-empty field-name="parameters.communicationEventId"/></not>
+                    <not><if-empty field-name="communicationEvent.partyIdFrom"/></not>
+                    <if-compare field-name="communicationEvent.partyIdFrom" operator="not-equals" value="${userLogin.partyId}"/>
+                    <if-has-permission permission="PARTYMGR_CME-EMAIL_UPDATE"/>
+                    <if-has-permission permission="PARTYMGR_CME-NOTE_CREATE"/>
+                </and>
+            </condition>
+            <link target="NewCommunicationEvents?communicationEventTypeId=EMAIL_COMMUNICATION&amp;originalCommEventId=${parameters.communicationEventId}&amp;donePage=${parameters.donePage}"/>
+        </menu-item>
+        <menu-item name="createRequestFromCommEvent" title="${uiLabelMap.PartyCreateRequestFromCommEvent}">
+            <condition>
+                <and>
+                    <not><if-empty field-name="parameters.communicationEventId"/></not>
+                    <not><if-empty field-name="communicationEvent.partyIdFrom"/></not>
+                    <if-has-permission permission="ORDERMGR_CRQ_CREATE"/>
+                </and>
+            </condition>
+            <link target="editRequestFromCommEvent?communicationEventId=${parameters.communicationEventId}"/>
+        </menu-item>
+        <menu-item name="close" title="${uiLabelMap.CommonClose}">
+            <condition>
+                <and>
+                    <not><if-empty field-name="communicationEventRole"/></not>
+                    <if-compare field-name="communicationEventRole.statusId" operator="equals" value="COM_ROLE_READ"/>
+                    <if-has-permission permission="PARTYMGR_CME-EMAIL_CREATE"/>
+                </and>
+            </condition>
+            <link target="setCommunicationEventRoleStatus?communicationEventId=${parameters.communicationEventId}&amp;partyId=${userLogin.partyId}&amp;roleTypeId=${communicationEventRole.roleTypeId}&amp;statusId=COM_ROLE_COMPLETED"/>
+        </menu-item>
+        <menu-item name="send" title="${uiLabelMap.CommonSend}">
+            <condition>
+                <and>
+                    <not><if-empty field-name="parameters.communicationEventId"/></not>
+                    <if-compare field-name="commEvent.statusId" operator="equals" value="COM_PENDING"/>
+                    <if-has-permission permission="PARTYMGR_CME-EMAIL_UPDATE"/>
+                </and>
+            </condition>
+            <link target="updateCommunicationEvent/main?communicationEventId=${parameters.communicationEventId}&amp;statusId=COM_IN_PROGRESS"/>
+        </menu-item>
+        <menu-item name="delete" title="${uiLabelMap.CommonDelete}">
+            <condition>
+                <and>
+                    <not><if-empty field-name="communicationEventRole"/></not>
+                    <if-has-permission permission="PARTYMGR_CME-EMAIL_DELETE"/>
+                </and>
+            </condition>
+            <link target="RemoveCommunicationEventRole?communicationEventId=${parameters.communicationEventId}&amp;roleTypeId=${communicationEventRole.roleTypeId}&amp;partyId=${userLogin.partyId}&amp;deleteCommEventIfLast=Y&amp;delContentDataResource=Y"/>
+        </menu-item>
+    </menu>
+    <menu name="RequestTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">
+        <menu-item name="ViewRequest" title="Overview" >
+            <link target="ViewRequest?custRequestId=${custRequest.custRequestId}"/>
+        </menu-item>
+        <menu-item name="custRequestContent" title="Content">
+            <link target="EditCustRequestContent?custRequestId=${custRequest.custRequestId}"/>
+        </menu-item>
+    </menu>
+    <menu name="RequestSubTabBar" type="simple" menu-container-style="button-bar button-style-2">
+        <menu-item name="cancelledRequest" title="Cancel request" >
+            <condition>
+                <and>
+                    <not><if-empty field-name="custRequest"/></not>
+                    <if-compare field-name="custRequest.statusId" operator="not-equals" value="CRQ_CANCELLED"/>
+                    <if-compare field-name="custRequest.statusId" operator="not-equals" value="CRQ_COMPLETED"/>
+                </and>
+            </condition>
+            <link target="setCustRequestStatus?custRequestId=${custRequestId}&amp;statusId=CRQ_CANCELLED"/>
+        </menu-item>
+        <menu-item name="addContent" title="Add content">
+            <condition>
+                <and>
+                    <not><if-empty field-name="custRequest"/></not>
+                    <if-compare field-name="custRequest.statusId" operator="not-equals" value="CRQ_CANCELLED"/>
+                    <if-compare field-name="custRequest.statusId" operator="not-equals" value="CRQ_COMPLETED"/>
+                </and>
+            </condition>
+            <link target="EditCustRequestContent?custRequestId=${custRequest.custRequestId}"/>
+        </menu-item>
+    </menu>
+</menus>
\ No newline at end of file

Propchange: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml
------------------------------------------------------------------------------
    svn:keywords = "Date Rev Author URL Id"

Propchange: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml