OFBiz › OFBiz - Commits

svn commit: r736536 - in /ofbiz/trunk/specialpurpose/myportal: config/ script/org/ofbiz/myportal/ templates/email/ webapp/ webapp/myportal/ webapp/myportal/WEB-INF/ widget/

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
hansbak-2
Reply | Threaded
Open this post in threaded view
♦
♦
|

svn commit: r736536 - in /ofbiz/trunk/specialpurpose/myportal: config/ script/org/ofbiz/myportal/ templates/email/ webapp/ webapp/myportal/ webapp/myportal/WEB-INF/ widget/

hansbak-2
Author: hansbak
Date: Wed Jan 21 18:55:12 2009
New Revision: 736536

URL: http://svn.apache.org/viewvc?rev=736536&view=rev
Log:
 another update to replace mypage

Added:
    ofbiz/trunk/specialpurpose/myportal/webapp/myportal/index.jsp   (with props)
Removed:
    ofbiz/trunk/specialpurpose/myportal/webapp/index.jsp
Modified:
    ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml
    ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml
    ofbiz/trunk/specialpurpose/myportal/templates/email/CompletedCustRequestNotification.ftl
    ofbiz/trunk/specialpurpose/myportal/templates/email/CreateCustRequestNotification.ftl
    ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml
    ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
    ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
    ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml
    ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml

Modified: ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml?rev=736536&r1=736535&r2=736536&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml Wed Jan 21 18:55:12 2009
@@ -77,4 +77,211 @@
         <value xml:lang="en">User Login</value>
         <value xml:lang="th">ข้อมูลการลงทะเบียน</value>
     </property>
+    <property key="MyPortalAllEvents">
+        <value xml:lang="en">All Communications</value>
+        <value xml:lang="fr">Toutes les communications</value>
+        <value xml:lang="it">Tutte le comunicazioni</value>
+        <value xml:lang="th">การติดต่อทั้งหมด</value>
+    </property>
+    <property key="MyPortalAppBar">
+        <value xml:lang="en">My Page App Bar</value>
+        <value xml:lang="fr">Menu des applications</value>
+        <value xml:lang="it">Mia pagina</value>
+        <value xml:lang="th">แอปพริเคชันของฉัน</value>
+    </property>
+    <property key="MyPortalCommunicationEventId">
+        <value xml:lang="en">Communication Event id:</value>
+        <value xml:lang="fr">Réf. d'évènement de comm.</value>
+        <value xml:lang="it">Evenuto comunicazioni:</value>
+        <value xml:lang="th">เหตุการณ์ที่ทำการติดต่อ</value>
+    </property>
+    <property key="MyPortalCommunications">
+        <value xml:lang="en">My Communications</value>
+        <value xml:lang="fr">Mes communications</value>
+        <value xml:lang="it">Proprie comunicazioni</value>
+        <value xml:lang="th">การติดต่อฉัน</value>
+    </property>
+    <property key="MyPortalCommunicationsOfParty">
+        <value xml:lang="en">Communications of party</value>
+        <value xml:lang="fr">Communications de l'acteur</value>
+        <value xml:lang="it">Comunicazioni del soggetto</value>
+        <value xml:lang="th">การติดต่อบุคคล</value>
+    </property>
+    <property key="MyPortalCompanyComms">
+        <value xml:lang="en">Company communications</value>
+        <value xml:lang="fr">Communications de l'entreprise</value>
+        <value xml:lang="it">Comunicazioni aziendali</value>
+        <value xml:lang="th">การติดต่อบริษัท</value>
+    </property>
+    <property key="MyPortalCompanyEvents">
+        <value xml:lang="en">Company events</value>
+        <value xml:lang="fr">Evènements de l'entreprise</value>
+        <value xml:lang="it">Eventi aziendali</value>
+        <value xml:lang="th">เหตุการณ์บริษัท</value>
+    </property>
+    <property key="MyPortalEmailsFromKnownOrigin">
+        <value xml:lang="en">Emails from known origin</value>
+        <value xml:lang="fr">Courriel issue d'une origine connue</value>
+        <value xml:lang="it">Emails da origine sconosciuta</value>
+        <value xml:lang="th">อีเมล์ที่อ่านแล้ว</value>
+    </property>
+    <property key="MyPortalEmailsFromUnknownOrigin">
+        <value xml:lang="en">Emails from known origin</value>
+        <value xml:lang="fr">Courriel issue d'une origine inconnue</value>
+        <value xml:lang="it">Emails da origini conosciuta</value>
+        <value xml:lang="th">อีเมล์ที่ไม่ระบุ</value>
+    </property>
+    <property key="MyPortalCompletedCustomerRequests">
+        <value xml:lang="en">My Completed Customer Requests</value>
+        <value xml:lang="fr">Mes demandes de clients terminées</value>
+        <value xml:lang="it">Mie richieste cliente completate</value>
+        <value xml:lang="th">งานที่แก้ไขให้ลูกค้าเรียยร้อยแล้ว</value>
+    </property>
+    <property key="MyPortalCustRequests">
+        <value xml:lang="en">My customer requests</value>
+        <value xml:lang="fr">Mes demandes utilisateur</value>
+        <value xml:lang="it">Proprie richieste cliente</value>
+        <value xml:lang="th">ลูกค้าเรียกร้อง</value>
+    </property>
+    <property key="MyPortalIncomingCustRequests">
+        <value xml:lang="en">Incoming customer requests</value>
+        <value xml:lang="fr">Nouvelles demandes utilisateur</value>
+        <value xml:lang="it">Richiesta cliente in entrata</value>
+        <value xml:lang="th">แสดงรายรับของลูกค้า</value>
+    </property>
+    <property key="MyPortalInformation">
+        <value xml:lang="en">My Information</value>
+        <value xml:lang="fr">Mes informations </value>
+        <value xml:lang="it">Proprie informazioni</value>
+        <value xml:lang="th">ข้อมูลของฉัน</value>
+    </property>
+    <property key="MyPortalNewMessage">
+        <value xml:lang="en">New Message</value>
+        <value xml:lang="fr">Nouveau message</value>
+        <value xml:lang="it">Nuovo messaggio</value>
+        <value xml:lang="th">ข้อความใหม่</value>
+    </property>
+    <property key="MyPortalNoAccess">
+        <value xml:lang="en">You do not have access to this information</value>
+        <value xml:lang="fr">Vous n'avez pas accès à cette information</value>
+        <value xml:lang="it">Tu non hai l'accesso a queste informazioni</value>
+        <value xml:lang="th">คุณไม่มีข้อมูลอยู่ในระบบ</value>
+    </property>
+    <property key="MyPortalNoAccess1">
+        <value xml:lang="en">No Access priviledges has been setup.</value>
+        <value xml:lang="fr">Aucun accès privilégié n'a été paramétré.</value>
+        <value xml:lang="it">Nessun accesso privilegiato è stato configurato.</value>
+        <value xml:lang="th">ไม่สามารถเข้าไปติดตั้งระบบ</value>
+    </property>
+    <property key="MyPortalNoAccess2">
+        <value xml:lang="en">You do not have access to any functions in the MyPortal subsystem, please
+            contact your system admin</value>
+        <value xml:lang="fr">Vous n'avez accès à aucune fonction dans l'application Ma Page,
+            contactez votre administrateur système SVP.</value>
+        <value xml:lang="it">Tu non hai l'accesso a queste funzioni nel sottosistam mia pagina,
+            perfavore contattare il tuo amministratore di sistema</value>
+        <value xml:lang="th">ท่านไม่เข้าถึงฟังก์ชันการทำงานส่วนอื่นๆใน MyPortal ได้,
+            à¸à¸£à¸¸à¸“าติดต่อผู้ดูแลระบบของท่าน</value>
+    </property>
+    <property key="MyPortalNoAccess3">
+        <value xml:lang="en">At least MyPortal_CUSTOMER or MyPortal_EMPLOYEE permission is required</value>
+        <value xml:lang="fr">Au moins une autorisation MyPortal_CUSTOMER ou MyPortal_EMPLOYEE est
+            nécessaire</value>
+        <value xml:lang="it">Al minimo il permesso MyPortal_CUSTOMER o MyPortal_EMPLOYEE è richiesto</value>
+        <value xml:lang="th">อย่างน้อยที่สุด MyPortal_CUSTOMER หรือ MyPortal_EMPLOYEE
+            à¸–ูกกำหนดการใข้สิทธิ์ </value>
+    </property>
+    <property key="MyPortalNoAccess4">
+        <value xml:lang="en">Use the demo userLogin id's 'DemoCustomer' and 'DemoEmployee' for a
+            demo.</value>
+        <value xml:lang="fr">Utilisez l'identifiant de connexion 'DemoCustomer' ou 'DemoEmployee'
+            pour une démonstration.</value>
+        <value xml:lang="it">Usare l'utente demo come 'DemoCustomer' e 'DemoEmployee' per una
+            dimostrazione.</value>
+        <value xml:lang="th">จำลองผู้ใช้เป็น DemoCustomer และ DemoEmployee ในการทำงาน</value>
+    </property>
+    <property key="MyPortalOpenEvents">
+        <value xml:lang="en">Open Communications</value>
+        <value xml:lang="fr">Communications ouvertes</value>
+        <value xml:lang="it">Comunicazioni aperte</value>
+        <value xml:lang="th">เปิดการติดต่อ</value>
+    </property>
+    <property key="MyPortalOpenCustomerRequests">
+        <value xml:lang="en">My Open Customer Requests</value>
+        <value xml:lang="fr">Mes demandes de clients en-cours</value>
+        <value xml:lang="it">Proprie richieste clienti aperte</value>
+        <value xml:lang="th">ความต้องการของลูกค้า</value>
+    </property>
+    <property key="MyPortalOtherCommunications">
+        <value xml:lang="en">Other Communications</value>
+        <value xml:lang="fr">Autres communications</value>
+        <value xml:lang="it">Altre comunicazioni</value>
+        <value xml:lang="th">การติดต่อรูปแบบต่างๆ</value>
+    </property>
+    <property key="MyPortalOtherCompanyCustomerRequests">
+        <value xml:lang="en">Customer Requests from other contacts of my company</value>
+        <value xml:lang="fr">Demandes client depuis d'autres contacts de mon entreprise</value>
+        <value xml:lang="it">Richieste cliente da altri contatti della mia azienda</value>
+        <value xml:lang="th">ลูกค้าต้องการติดต่อรูปแบบอื่นจากบริษัทของเรา</value>
+    </property>
+    <property key="MyPortalPagesVisible">
+        <value xml:lang="en">pages visible on the main screen.</value>
+        <value xml:lang="fr">Pages visibles sur l'écran principal.</value>
+        <value xml:lang="it">pagine visibili dalla pagina principale.</value>
+        <value xml:lang="th">สามารถเห็นหน้าอื่นบนหน้าหลักได้</value>
+    </property>
+    <property key="MyPortalProfile">
+        <value xml:lang="en">My Profile</value>
+        <value xml:lang="fr">Mon Profil</value>
+        <value xml:lang="it">Mio profilo</value>
+        <value xml:lang="th">ประวัติส่วนตัวของฉัน</value>
+    </property>
+    <property key="MyPortalTaskActEndDate">
+        <value xml:lang="en">Task Act End</value>
+        <value xml:lang="fr">Fin réelle de de la tâche</value>
+        <value xml:lang="it">Attuale data fine compito</value>
+        <value xml:lang="th">เสร็จสิ้นการทำ</value>
+    </property>
+    <property key="MyPortalTaskActStartDate">
+        <value xml:lang="en">Task Act Start</value>
+        <value xml:lang="fr">Départ réel de de la tâche</value>
+        <value xml:lang="it">Attuale data inizio compito</value>
+        <value xml:lang="th">เรื่มต้นการทำ</value>
+    </property>
+    <property key="MyPortalTaskPlanEndDate">
+        <value xml:lang="en">Task Plan End</value>
+        <value xml:lang="fr">Fin prévue de la tâche</value>
+        <value xml:lang="it">Datta fine pianificata compito</value>
+        <value xml:lang="th">สิ้นสุดชิ้นงาน</value>
+    </property>
+    <property key="MyPortalTaskPlanStartDate">
+        <value xml:lang="en">Task Plan Start</value>
+        <value xml:lang="fr">Départ prévu de la tâche</value>
+        <value xml:lang="it">Data inizio pianificata compito</value>
+        <value xml:lang="th">เริ่มต้นชิ้นงาน</value>
+    </property>
+    <property key="MyPortalTaskStatus">
+        <value xml:lang="en">Task Status</value>
+        <value xml:lang="fr">Status de la tâche</value>
+        <value xml:lang="it">Stato compito</value>
+        <value xml:lang="th">สถานะของงาน</value>
+    </property>
+    <property key="MyPortalTasks">
+        <value xml:lang="en">My Tasks</value>
+        <value xml:lang="fr">Mes Tâches</value>
+        <value xml:lang="it">Propri compiti</value>
+        <value xml:lang="th">งานของฉัน</value>
+    </property>
+    <property key="MyPortalTimeSheets">
+        <value xml:lang="en">My Time Sheets</value>
+        <value xml:lang="fr">Mes feuilles d'activité</value>
+        <value xml:lang="it">Proprie timbrature</value>
+        <value xml:lang="th">ตารางการทำงานของฉัน</value>
+    </property>
+    <property key="MyPortalToComplete">
+        <value xml:lang="en">->Closed</value>
+        <value xml:lang="fr">->Fermé(e)</value>
+        <value xml:lang="it">->Chiuso</value>
+        <value xml:lang="th">เสร็จสิ้น</value>
+    </property>
 </resource>

Modified: ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml?rev=736536&r1=736535&r2=736536&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml Wed Jan 21 18:55:12 2009
@@ -85,7 +85,7 @@
                     include-user-login="false"/>
                 <else>
                     <add-error>
-                        <fail-property property="MyPageNoAccess" resource="MyPortalUiLabels"/>
+                        <fail-property property="MyPortalNoAccess" resource="MyPortalUiLabels"/>
                     </add-error>
                 </else>
             </if-compare>

Modified: ofbiz/trunk/specialpurpose/myportal/templates/email/CompletedCustRequestNotification.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/templates/email/CompletedCustRequestNotification.ftl?rev=736536&r1=736535&r2=736536&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/templates/email/CompletedCustRequestNotification.ftl (original)
+++ ofbiz/trunk/specialpurpose/myportal/templates/email/CompletedCustRequestNotification.ftl Wed Jan 21 18:55:12 2009
@@ -29,7 +29,7 @@
         <p>Your Customer Request ${custRequest.custRequestName?if_exists} [${custRequest.custRequestId}] has been completed.
         <br/><br/>
         The status and used hours can always be checked at the url: <br/>
-        <a href="${baseUrl?if_exists}/mypage/control/ViewRequest?custRequestId=${custRequest.custRequestId}">${baseUrl?if_exists}/mypage/control/ViewRequest?custRequestId=${custRequest.custRequestId}</a>
+        <a href="${baseUrl?if_exists}/myportal/control/ViewRequest?custRequestId=${custRequest.custRequestId}">${baseUrl?if_exists}/myportal/control/ViewRequest?custRequestId=${custRequest.custRequestId}</a>
         <br/><br/>
         Regards.<br/><br/>
         Thank you for your business.

Modified: ofbiz/trunk/specialpurpose/myportal/templates/email/CreateCustRequestNotification.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/templates/email/CreateCustRequestNotification.ftl?rev=736536&r1=736535&r2=736536&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/templates/email/CreateCustRequestNotification.ftl (original)
+++ ofbiz/trunk/specialpurpose/myportal/templates/email/CreateCustRequestNotification.ftl Wed Jan 21 18:55:12 2009
@@ -31,7 +31,7 @@
         We will solve/implement the request as soon as possible
         <br/><br/>
         The status and used hours can always be checked at the url: <br/>
-        <a href="${baseUrl?if_exists}/mypage/control/ViewRequest?custRequestId=${custRequest.custRequestId}">${baseUrl?if_exists}/mypage/control/ViewRequest?custRequestId=${custRequest.custRequestId}</a>
+        <a href="${baseUrl?if_exists}/myportal/control/ViewRequest?custRequestId=${custRequest.custRequestId}">${baseUrl?if_exists}/myportal/control/ViewRequest?custRequestId=${custRequest.custRequestId}</a>
         <br/><br/>
         Regards.
         <br/><br/>

Modified: ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml?rev=736536&r1=736535&r2=736536&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/webapp/myportal/WEB-INF/controller.xml Wed Jan 21 18:55:12 2009
@@ -66,10 +66,10 @@
         <response name="success" type="view" value="myTimesheet"/>
         <response name="error" type="view" value="myTimesheet"/>
     </request-map>
-    <request-map uri="statusToComplete">
+    <request-map uri="statusToCompleteKey">
         <security https="true" auth="true"/>
         <event type="service" invoke="updateTimesheet"/>
-        <response name="success" type="request" value="getToNextDonePage"/>
+        <response name="success" type="request" value="myTimesheet"/>
         <response name="error" type="request" value="getToNextDonePage"/>
     </request-map>
     
@@ -81,7 +81,7 @@
     <request-map uri="updateTaskAssigment">
         <security https="true" auth="true"/>
         <event type="service" invoke="updateTaskAssigment"/>
-        <response name="success" type="request" value="getToNextDonePage"/>
+        <response name="success" type="request" value="myTasks"/>
         <response name="error" type="request" value="getToNextDonePage"/>
     </request-map>
     
@@ -97,14 +97,13 @@
     <request-map uri="createEvent">
         <security https="true" auth="true"/>
         <event type="service" invoke="createWorkEffort"/>
-        <response name="success" type="request" value="getToNextDonePage"/>
-        <response name="error" type="view" value="newEvent"/>
+        <response name="success" type="request" value="myCompanyComms"/>
+        <response name="error" type="view" value="createEvent"/>
     </request-map>
     <request-map uri="deleteEvent">
         <security https="true" auth="true"/>
         <event type="service" invoke="deleteWorkEffort"/>
-        <response name="success" type="request" value="getToNextDonePage"/>
-        <response name="error" type="request" value="getToNextDonePage"/>
+        <response name="success" type="request" value="myCompanyComms"/>
     </request-map>
     
     <!-- MY COMMUNICATIONS -->
@@ -115,19 +114,18 @@
     <request-map uri="createCommunicationEvent">
         <security https="true" auth="true"/>
         <event type="service" invoke="createCommunicationEvent"/>
-        <response name="success" type="request" value="getToNextDonePage"/>
+        <response name="success" type="request" value="myCommunications"/>
         <response name="error" type="view" value="main"/>
     </request-map>
     <request-map uri="deletePartyCommunicationEvent">
         <security https="true" auth="true"/>
         <event type="service" invoke="deleteCommunicationEvent"/>
-        <response name="success" type="request" value="getToNextDonePage"/>
-        <response name="error" type="view" value="main"/>
+        <response name="success" type="request" value="myCommunications"/>
     </request-map>
     <request-map uri="RemoveCommunicationEventRole">
         <security https="true" auth="true"/>
         <event type="service" invoke="removeCommunicationEventRole"/>
-        <response name="success" type="request" value="getToNextDonePage"/>
+        <response name="success" type="request" value="myCommunications"/>
         <response name="error" type="request" value="getToNextDonePage"/>
     </request-map>
     <request-map uri="allocateMsgToParty">
@@ -140,8 +138,7 @@
     <request-map uri="deleteCommunicationEvents">
         <security https="true" auth="true"/>
         <event type="service-multi" invoke="deleteCommunicationEventWorkEffort"/>
-        <response name="success" type="request" value="getToNextDonePage"/>
-        <response name="error" type="view" value="main"/>
+        <response name="success" type="request" value="myCommunications"/>
     </request-map>
     
     <!-- OTHER COMMUNICATIONS -->
@@ -182,7 +179,6 @@
         <event type="simple" invoke="getToNextDonePage" path="org/ofbiz/myportal/Events.xml"/>
         <response name="main" type="request" value="main"/>
         <response name="ViewCommunicationEvent" type="request" value="ViewCommunicationEvent"/>
-        <response name="myCommunications" type="request" value="myCommunications"/>
         <response name="otherCommunications" type="request" value="otherCommunications"/>
         <response name="myTimesheet" type="request" value="myTimesheet"/>
         <response name="myTasks" type="request" value="myTasks"/>

Added: ofbiz/trunk/specialpurpose/myportal/webapp/myportal/index.jsp
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/webapp/myportal/index.jsp?rev=736536&view=auto
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/webapp/myportal/index.jsp (added)
+++ ofbiz/trunk/specialpurpose/myportal/webapp/myportal/index.jsp Wed Jan 21 18:55:12 2009
@@ -0,0 +1,19 @@
+<%--
+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.
+--%>
+<%response.sendRedirect("control/main");%>

Propchange: ofbiz/trunk/specialpurpose/myportal/webapp/myportal/index.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: ofbiz/trunk/specialpurpose/myportal/webapp/myportal/index.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Rev Author URL Id

Propchange: ofbiz/trunk/specialpurpose/myportal/webapp/myportal/index.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml?rev=736536&r1=736535&r2=736536&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml Wed Jan 21 18:55:12 2009
@@ -25,7 +25,6 @@
             <actions>
                 <!-- base/top/specific map first, then more common map added for shared labels -->
                 <property-map resource="MyPortalUiLabels" map-name="uiLabelMap" global="true"/>
-                <property-map resource="MyPageUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="PartyUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="AccountingUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/>
@@ -36,7 +35,7 @@
                 <property-map resource="ProjectMgrUiLabels" map-name="uiLabelMap" global="true"/>
                 <property-map resource="HumanResUiLabels" map-name="uiLabelMap" global="true"/>
                 
-                <set field="layoutSettings.companyName" from-field="uiLabelMap.MyInformation" global="true"/>
+                <set field="layoutSettings.companyName" from-field="uiLabelMap.MyPortalInformation" global="true"/>
                 <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.PartyCompanySubtitle" global="true"/>
                 <!-- layoutSettings.headerImageUrl can be used to specify an application specific logo; if not set,
                     then the global layoutSettings.commonHeaderImageUrl (specified in GlobalDecorator) will be used. -->
@@ -127,7 +126,20 @@
             </widgets>
         </section>
     </screen>
-
+    
+    <screen name="CommonTaskDecorator">
+        <section>
+            <actions>
+                <set field="headerItem" value="${parameters.portalPageId}"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body"/>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    
     <screen name="CommonMyTaskDecorator">
         <section>
             <actions>
@@ -280,7 +292,54 @@
                 <decorator-screen name="main-decorator"
                     location="${parameters.mainDecoratorLocation}">
                     <decorator-section name="body">
-                        <include-screen name="MyTimesheet"
+                        <include-screen name="MyTimesheet" location="component://myportal/widget/MyPortalScreens.xml"/>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    
+    <screen name="MyCommunications">
+        <section>
+            <actions>
+                <set field="headerItem" from-field="parameters.portalPageId" />
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator"
+                    location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <include-screen name="MyCommunications"
+                            location="component://myportal/widget/MyPortalScreens.xml" />
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="MyTasks">
+        <section>
+            <actions>
+                <set field="headerItem" from-field="parameters.portalPageId" />
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator"
+                    location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                                <include-screen name="MyTasks" location="component://myportal/widget/MyPortalScreens.xml" />
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>
+    <screen name="OtherCommunications">
+        <section>
+            <actions>
+                <set field="headerItem" from-field="parameters.portalPageId" />
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator"
+                    location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <include-screen name="OtherCommunications"
                             location="component://myportal/widget/MyPortalScreens.xml" />
                     </decorator-section>
                 </decorator-screen>

Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml?rev=736536&r1=736535&r2=736536&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml Wed Jan 21 18:55:12 2009
@@ -22,15 +22,15 @@
         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="portalPageId"><hidden value="${parameters.portalPageId}"/></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>
+        <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;portalPageId=${parameters.portalPageId}" description="${uiLabelMap.CommonRemove}"/></field>
         <!-- better set to complete on the timesheet -->
-        <!-- field name="toComplete" title="${uiLabelMap.MyPageToComplete}"><hyperlink target="updateTaskAssigment?workEffortId=${workEffortId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;fromDate=${fromDate}&amp;statusId=PAS_COMPLETED&amp;donePage=${parameters.donePage}" description="${uiLabelMap.MyPageToComplete}"/></field-->
+        <!-- field name="toComplete" title="${uiLabelMap.MyPortalToComplete}"><hyperlink target="updateTaskAssigment?workEffortId=${workEffortId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;fromDate=${fromDate}&amp;statusId=PAS_COMPLETED&amp;donePage=${parameters.donePage}" description="${uiLabelMap.MyPortalToComplete}"/></field-->
     </form>
     
     <form name="EditWeekTimesheet" extends="EditWeekTimesheet" extends-resource="component://projectmgr/widget/forms/TimeSheetForms.xml">
@@ -50,6 +50,29 @@
         <field name="updateButton"><submit/></field>
     </form>
 
+    <form name="WeekTimesheet" type="list" list-name="timeEntries" separate-columns="true"
+        odd-row-style="alternate-row" default-table-style="basic-table hover-bar">
+        <field name="timesheetId"><hidden/></field>
+        <field name="workEffortName" title="${uiLabelMap.ProjectMgrTaskName}">
+            <hyperlink target="/projectmgr/control/taskView?workEffortId=${workEffortId}" target-type="inter-app" target-window="_BLANK" description="${workEffortName}"/>
+        </field>
+        <field name="phaseName" title="${uiLabelMap.ProjectMgrPhaseName}"><display/></field>
+        <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}">
+            <hyperlink target="/projectmgr/control/projectView?projectId=${projectId}" target-type="inter-app" target-window="_BLANK" description="${projectName}"/>
+        </field>
+        <field name="checkComplete" title="${uiLabelMap.ProjectMgrCheckComplete}"><display/></field>
+        <field name="rateTypeId" title="${uiLabelMap.ProjectMgrRateTypeId}"><display-entity entity-name="RateType" description="${description}"/></field>
+        <field name="0" parameter-name="hoursDay0" title="${uiLabelMap.ProjectMgrSun}"><display/></field>
+        <field name="1" parameter-name="hoursDay1" title="${uiLabelMap.ProjectMgrMon}"><display/></field>
+        <field name="2" parameter-name="hoursDay2" title="${uiLabelMap.ProjectMgrTue}"><display/></field>
+        <field name="3" parameter-name="hoursDay3" title="${uiLabelMap.ProjectMgrWen}"><display/></field>
+        <field name="4" parameter-name="hoursDay4" title="${uiLabelMap.ProjectMgrThu}"><display/></field>
+        <field name="5" parameter-name="hoursDay5" title="${uiLabelMap.ProjectMgrFri}"><display/></field>
+        <field name="6" parameter-name="hoursDay6" title="${uiLabelMap.ProjectMgrSat}"><display/></field>
+        <field name="total" title="${uiLabelMap.ProjectMgrActualTotal}"><display/></field>
+        <field name="plannedHours" title="${uiLabelMap.ProjectMgrPlanHours}"><display/></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>
@@ -62,7 +85,7 @@
                 <order-by field-name="actualStartDate"/>
             </entity-condition>
         </actions>
-        <alt-target use-when="headerItem.equals(&quot;main&quot;)" target="deleteEventKey"/>
+        <alt-target use-when="!headerItem.equals(&quot;main&quot;)" target="deleteEvent"/>
         <field name="workEffortId"><hidden/></field>
         <field name="workEffortName" title="${uiLabelMap.WorkEffortEventName}"><display/></field>
         <field name="description" title="${uiLabelMap.CommonDescription}"><display/></field>
@@ -84,26 +107,26 @@
         <row-actions>
             <set field="toComplete" value="${bsh:&quot;COM_ROLE_READ&quot;.equals(roleStatusId)?&quot;toComplete&quot;:&quot;&quot;}"/>
         </row-actions>
-        <field name="donePage"><hidden/></field>
+        <field name="portalPageId"><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}"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="RemoveCommunicationEventRole?partyId=${partyId}&amp;communicationEventId=${communicationEventId}&amp;roleTypeId=${roleTypeId}&amp;deleteCommEventIfLast=Y&amp;delContentDataResource=Y&amp;portalPageId=${parameters.portalPageId}"/>
         </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}"/>
+            <hyperlink description="${subject} " target="ViewCommunicationEvent?communicationEventId=${communicationEventId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;portalPageId=${portalPageId}"/>
         </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.MyPageToComplete}" 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}"/>
+                <sub-hyperlink description="${uiLabelMap.MyPortalToComplete}" 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="portalPageId"><hidden/></field>
         <field name="subject" widget-style="buttontext" widget-area-style="fieldWidth300">
-            <hyperlink description="${subject}" target="ViewCommunicationEvent?communicationEventId=${communicationEventId}&amp;donePage=${parameters.donePage}"/>
+            <hyperlink description="${subject}" target="ViewCommunicationEvent?communicationEventId=${communicationEventId}&amp;portalPageId=${portalPageId}"/>
         </field>
         <field name="_rowSubmit" title="S">
             <check />
@@ -112,11 +135,13 @@
             <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">
@@ -149,6 +174,7 @@
         <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>
@@ -211,7 +237,7 @@
             <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}"/>
+            <hyperlink also-hidden="false" description="${uiLabelMap.CommonDelete}" target="deletePartyCommunicationEvent?partyId=${partyId}&amp;communicationEventId=${communicationEventId}&amp;portalPageId=${portalPageId}"/>
         </field>
     </form>
 

Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml?rev=736536&r1=736535&r2=736536&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml Wed Jan 21 18:55:12 2009
@@ -40,13 +40,13 @@
             <link
                 target="EditCommunicationEvent?communicationEventTypeId=COMMENT_NOTE&amp;portalPageId=${parameters.portalPageId}" />
         </menu-item>
-        <menu-item name="openEvents" title="${uiLabelMap.MyPageOpenEvents}">
+        <menu-item name="openEvents" title="${uiLabelMap.MyPortalOpenEvents}">
             <condition>
                 <if-compare field-name="parameters.all" operator="equals" value="true" />
             </condition>
             <link target="showPortalPage?portalPageId=${parameters.portalPageId}&amp;all=false" />
         </menu-item>
-        <menu-item name="allOtherEvents" title="${uiLabelMap.MyPageAllEvents}">
+        <menu-item name="allOtherEvents" title="${uiLabelMap.MyPortalAllEvents}">
             <condition>
                 <or>
                     <if-compare field-name="parameters.all" operator="equals" value="false" />
@@ -62,7 +62,7 @@
     </menu>
     
     <menu name="MyTimesheetMenu">
-        <menu-item name="setToComplete" title="${uiLabelMap.MyPageToComplete}">
+        <menu-item name="setToComplete" title="${uiLabelMap.MyPortalToComplete}">
             <condition>
                 <and>
                     <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_IN_PROCESS"/>
@@ -71,7 +71,7 @@
             </condition>
             <link target="statusToComplete?timesheetId=${timesheet.timesheetId}&amp;statusId=TIMESHEET_COMPLETED"/>
         </menu-item>
-        <menu-item name="setToCompleteKey" title="${uiLabelMap.MyPageToComplete}">
+        <menu-item name="setToCompleteKey" title="${uiLabelMap.MyPortalToComplete}">
             <condition>
                 <and>
                     <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_IN_PROCESS"/>

Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml?rev=736536&r1=736535&r2=736536&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml Wed Jan 21 18:55:12 2009
@@ -23,7 +23,7 @@
         <screen name="newEvent">
         <section>
             <actions>
-                <set field="portalPageId" from-field="parameters.portalPageId" default-value="myCompanyComms"/>
+                <set field="portalPageId" from-field="parameters.portalPageId" default-value="parameters.portalPageId"/>
                 <set field="headerItem" from-field="parameters.portalPageId"/>
             </actions>
             <widgets>
@@ -46,6 +46,7 @@
     <screen name="MyTimesheet">
         <section>
             <actions>
+                <set field="headerItem" value="myTimesheet"/>
                 <set field="portalPageId" value="parameters.portalPageId"/>
                 <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/EditWeekTimesheet.groovy"/>
             </actions>
@@ -63,7 +64,7 @@
                                     <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/>
                                 </condition>          
                                 <widgets>
-                                    <include-form name="WeekTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
+                                    <include-form name="WeekTimesheet" location="component://myportal/widget/MyPortalForms.xml"/>
                                 </widgets>
                                 <fail-widgets>
                                     <include-form name="EditWeekTimesheet" location="component://myportal/widget/MyPortalForms.xml"/>
@@ -79,7 +80,7 @@
                                     <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_COMPLETED"/>
                                 </condition>          
                                 <widgets>
-                                    <include-form name="WeekTimesheet" location="component://projectmgr/widget/forms/TimeSheetForms.xml"/>
+                                    <include-form name="WeekTimesheet" location="component://myportal/widget/MyPortalForms.xml"/>
                                 </widgets>
                                 <fail-widgets>
                                     <include-form name="EditWeekTimesheet" location="component://myportal/widget/MyPortalForms.xml"/>
@@ -166,10 +167,10 @@
     <screen name="MyCompanyComms">
         <section>
             <actions>
-                <set field="portalPageId" from-field="parameters.portalPageId" default-value="myCompanyComms"/>
+                <set field="portalPageId" from-field="parameters.portalPageId"/>
             </actions>
             <widgets>
-                <screenlet title="${uiLabelMap.MyPageCompanyEvents}" navigation-menu-name="MyCompanyCommsMenu" name="companyEvents" collapsible="true">
+                <screenlet title="${uiLabelMap.MyPortalCompanyEvents}" navigation-menu-name="MyCompanyCommsMenu" name="companyEvents" collapsible="true">
                     <include-menu name="MyCompanyCommsMenu" location="component://myportal/widget/MyPortalMenus.xml"/>
                     <include-form name="MyCompanyComms" location="component://myportal/widget/MyPortalForms.xml"/>
                 </screenlet>
@@ -231,7 +232,7 @@
                 </entity-one>
             </actions>
             <widgets>
-                <screenlet title="${uiLabelMap.MyPageCommunicationsOfParty}: ${partyName.firstName} ${partyName.middleName} ${partyName.lastName} ${partyName.groupName} [${partyId}] "
+                <screenlet title="${uiLabelMap.MyPortalCommunicationsOfParty}: ${partyName.firstName} ${partyName.middleName} ${partyName.lastName} ${partyName.groupName} [${partyId}] "
                     navigation-menu-name="communicationsMenu" navigation-form-name="ListPartyCommEvents"
                     name="myComms">
                     <include-menu name="communicationsMenu"
@@ -243,13 +244,13 @@
                             </not>
                         </condition>
                         <widgets>
-                            <label style="h2" text="${uiLabelMap.MyPageEmailsFromUnknownOrigin}"></label>
+                            <label style="h2" text="${uiLabelMap.MyPortalEmailsFromUnknownOrigin}"></label>
                             <include-form
                                 location="component://myportal/widget/MyPortalForms.xml"
                                 name="ListMyUnknownPartyEmails" />
                         </widgets>
                     </section>
-                    <label style="h2" text="${uiLabelMap.MyPageEmailsFromKnownOrigin}"></label>
+                    <label style="h2" text="${uiLabelMap.MyPortalEmailsFromKnownOrigin}"></label>
                     <include-form name="ListPartyCommEvents"
                         location="component://myportal/widget/MyPortalForms.xml" />
                     <section>
@@ -310,7 +311,7 @@
                             <section>
                                 <widgets>
                                     <label style="h1"
-                                        text="${uiLabelMap.MyPageCommunicationEventId} ${parameters.communicationEventId}"></label>
+                                        text="${uiLabelMap.MyPortalCommunicationEventId} ${parameters.communicationEventId}"></label>
                                     <include-screen name="commEvent"
                                             location="component://party/widget/partymgr/CommunicationScreens.xml" />
                                 </widgets>
@@ -789,7 +790,7 @@
                         <not><if-empty field-name="custRequests"/></not>
                     </condition>
                     <widgets>
-                        <screenlet title="${uiLabelMap.MyPageIncomingCustRequests}" navigation-form-name="ListRequestList">
+                        <screenlet title="${uiLabelMap.MyPortalIncomingCustRequests}" navigation-form-name="ListRequestList">
                             <include-form name="ListRequestList" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
                         </screenlet>
                     </widgets>
@@ -802,6 +803,7 @@
         <section>
             <actions>
                 <set field="partyId" from-field="userLogin.partyId"/>
+                <set field="portalPageId" from-field="parameters.portalPageId"/>
                 <set field="status" from-field="parameters.status" default-value="open"/>
                 <set field="status" value="${bsh:&quot;all&quot;.equals(status)?&quot;%&quot;:&quot;open&quot;}"/>
                 <entity-condition list-name="custRequests" entity-name="CustRequestInfoAndWorkEffortAndPartyRel">
@@ -914,7 +916,7 @@
             <widgets>
                 <section>
                     <widgets>
-                        <screenlet title="${uiLabelMap.MyPageCompletedCustomerRequests}" navigation-form-name="ListCustRequestsCompleted">
+                        <screenlet title="${uiLabelMap.MyPortalCompletedCustomerRequests}" navigation-form-name="ListCustRequestsCompleted">
                             <include-form name="ListCustRequestsCompleted" location="component://myportal/widget/MyPortalForms.xml"/>
                         </screenlet>
                     </widgets>
@@ -976,14 +978,14 @@
             <widgets>
                 <section>
                      <widgets>
-                        <screenlet title="${uiLabelMap.MyPageOtherCompanyCustomerRequests}" navigation-form-name="ListOtherCompanyRequests">
+                        <screenlet title="${uiLabelMap.MyPortalOtherCompanyCustomerRequests}" navigation-form-name="ListOtherCompanyRequests">
                             <include-form name="ListOtherCompanyRequests" location="component://myportal/widget/MyPortalForms.xml"/>
                         </screenlet>
                     </widgets>
                 </section>
                 <section>
                     <widgets>
-                        <screenlet title="${uiLabelMap.MyPageCommunicationsOfParty}: ${partyName.firstName} ${partyName.middleName} ${partyName.lastName} ${partyName.groupName} [${partyId}] "
+                        <screenlet title="${uiLabelMap.MyPortalCommunicationsOfParty}: ${partyName.firstName} ${partyName.middleName} ${partyName.lastName} ${partyName.groupName} [${partyId}] "
                             navigation-menu-name="communicationsMenu" navigation-form-name="ListPartyCommEvents" name="myComms">
                             <include-menu name="communicationsMenu" location="component://myportal/widget/MyPortalMenus.xml" />
                             <include-form name="ListPartyCommEvents" location="component://myportal/widget/MyPortalForms.xml" />
@@ -1535,4 +1537,5 @@
             </widgets>
         </section>
     </screen>
+    
 </screens>


Free forum by Nabble Edit this page