OFBiz › OFBiz - Commits

svn commit: r735131 [2/5] - in /ofbiz/trunk: applications/accounting/config/ applications/accounting/widget/ applications/manufacturing/config/ applications/marketing/config/ applications/marketing/webapp/marketing/segment/ applications/order/config/ a...

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

svn commit: r735131 [2/5] - in /ofbiz/trunk: applications/accounting/config/ applications/accounting/widget/ applications/manufacturing/config/ applications/marketing/config/ applications/marketing/webapp/marketing/segment/ applications/order/config/ a...

mrisaliti
Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml?rev=735131&r1=735130&r2=735131&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/FixedAssetForms.xml Fri Jan 16 13:03:44 2009
@@ -112,7 +112,7 @@
                 </entity-options>
             </drop-down>
         </field>
-        <field name="productId" title="Part Id*" required-field="true"><lookup target-form-name="LookupPartsProduct"/></field>
+        <field name="productId" title="${uiLabelMap.AssetMaintPartId}*" required-field="true"><lookup target-form-name="LookupPartsProduct"/></field>
         <field name="quantity" position="1" title="${uiLabelMap.CommonQuantity}*"><text size="10"/></field>
         <field name="maintHistSeqId"><hidden/></field>
         <field name="fixedAssetId"><hidden/></field>
@@ -121,7 +121,7 @@
 
     <form name="ListItemIssuance"  title="PageTitleFixedAssetMaintItemIssuance" type="list"  list-name="itemIssuanceList"
         odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar">
-        <field name="productId" title="Part Id"><display/></field>
+        <field name="productId" title="${uiLabelMap.AssetMaintPartId}"><display/></field>
         <field name="quantity" position="1" title="${uiLabelMap.CommonQuantity}"><display/></field>
         <field name="productName" position="1" title="${uiLabelMap.CommonName}"><display/></field>
         <field name="comments" position="1" title="${uiLabelMap.CommonComments}"><display/></field>

Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml?rev=735131&r1=735130&r2=735131&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml (original)
+++ ofbiz/trunk/specialpurpose/assetmaint/widget/forms/WorkEffortForms.xml Fri Jan 16 13:03:44 2009
@@ -165,7 +165,7 @@
         <field name="workEffortName" entry-name="workEffortToName" title="${uiLabelMap.CommonName}">
             <hyperlink also-hidden="false" description="${workEffortToName}" target="EditWorkEfforts?workEffortId=${workEffortIdTo}&amp;workEffortIdFrom=${workEffortId}&amp;fromDate=${fromDate}&amp;workEffortAssocTypeId=${workEffortAssocTypeId}"/>
         </field>
-        <field name="workEffortAssocTypeId" title="${uiLabelMap.WorkEffortWorkEffortAssocTypeId}">
+        <field name="workEffortAssocTypeId">
             <display-entity entity-name="WorkEffortAssocType" description="${description}"/>
         </field>
         <field name="currentStatusId" entry-name="workEffortToCurrentStatusId" title="${uiLabelMap.CommonStatus}">
@@ -174,8 +174,8 @@
         <field name="workEffortPurposeTypeId" entry-name="workEffortToWorkEffortPurposeTypeId" title="${uiLabelMap.CommonPurpose}">
             <display-entity entity-name="WorkEffortPurposeType" description="${description}"/>
         </field>
-        <field name="actualStartDate" entry-name="workEffortToActualStartDate" title="${uiLabelMap.WorkEffortActualStartDate}"><display/></field>
-        <field name="actualCompletionDate"  entry-name="workEffortToActualCompletionDate" title="${uiLabelMap.WorkEffortActualCompletionDate}"><display/></field>
+        <field name="actualStartDate" entry-name="workEffortToActualStartDate"><display/></field>
+        <field name="actualCompletionDate"  entry-name="workEffortToActualCompletionDate"><display/></field>
     </form>
 
     <!-- TimeEntry -->

Modified: ofbiz/trunk/specialpurpose/googlebase/config/GoogleBaseUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/config/GoogleBaseUiLabels.xml?rev=735131&r1=735130&r2=735131&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/googlebase/config/GoogleBaseUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/googlebase/config/GoogleBaseUiLabels.xml Fri Jan 16 13:03:44 2009
@@ -17,7 +17,8 @@
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
---><resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+-->
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <property key="FormFieldTitle_actionType">
         <value xml:lang="en">Action Type</value>
         <value xml:lang="fr">Type d'action</value>
@@ -208,6 +209,7 @@
     <property key="productsExportToGoogle.invalidCountryCode">
         <value xml:lang="en">Country Code must be either US, UK or DE.</value>
         <value xml:lang="fr">Code de pays doit être l'un ou l'autre US, UK ou DE</value>
+        <value xml:lang="it">Codice paese deve essere US, UK o DE.</value>
         <value xml:lang="th">รหัสประเทศต้องเป็น US , UK หรือไม่ก็ DE</value>
     </property>
     <property key="productsExportToGoogle.missingParameterProductCategoryId">

Modified: ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml?rev=735131&r1=735130&r2=735131&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/config/MyPageUiLabels.xml Fri Jan 16 13:03:44 2009
@@ -18,136 +18,202 @@
     under the License.
 -->
 <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <property key="toComplete">
-        <value xml:lang="en">->Closed</value>
-        <value xml:lang="fr">->Fermé(e)</value>
-    </property>
-    <property key="AllEvents">
+    <property key="MyPageAllEvents">
         <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="MyPageAppBar">
+        <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="MyPageCommunicationEventId">
+        <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="MyPageCommunications">
+        <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="CommunicationsOfParty">
+    <property key="MyPageCommunicationsOfParty">
         <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="EmailsFromKnownOrigin">
+    <property key="MyPageCompanyComms">
+        <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="MyPageCompanyEvents">
+        <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="MyPageEmailsFromKnownOrigin">
         <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="EmailsFromUnknownOrigin">
-        <value xml:lang="en">Emails from unknown origin</value>
+    <property key="MyPageEmailsFromUnknownOrigin">
+        <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="CommunicationEventId">
-        <value xml:lang="en">Communication Event id:</value>
-        <value xml:lang="fr">Réf. d'évènement de comm.</value>
+    <property key="MyPageCompletedCustomerRequests">
+        <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="CompanyEvents">
-        <value xml:lang="en">Company events</value>
-        <value xml:lang="fr">Evènements de l'entreprise</value>
+    <property key="MyPageCustRequests">
+        <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="IncomingCustRequests">
+    <property key="MyPageIncomingCustRequests">
         <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="MyCommunications">
-        <value xml:lang="en">My Communications</value>
-        <value xml:lang="fr">Mes communications</value>
-    </property>
-    <property key="MyProfile">
-        <value xml:lang="en">My Profile</value>
-        <value xml:lang="fr">Mon Profil</value>
-    </property>
-    <property key="MyCompanyComms">
-        <value xml:lang="en">Company communications</value>
-        <value xml:lang="fr">Communications de l'entreprise</value>
-    </property>
-    <property key="MyPageAppBar">
-        <value xml:lang="en">My Page App Bar</value>
-        <value xml:lang="fr">Menu des applications</value>
+    <property key="MyPageInformation">
+        <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="MyPageNewMessage">
         <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="MyInformation">
-        <value xml:lang="en">My Information</value>
-        <value xml:lang="fr">Mes informations </value>
-    </property>
-    <property key="MyCompletedCustomerRequests">
-        <value xml:lang="en">My Completed Customer Requests</value>
-        <value xml:lang="fr">Mes demandes de clients terminées</value>
-    </property>
-    <property key="MyOpenCustomerRequests">
-        <value xml:lang="en">My Open Customer Requests</value>
-        <value xml:lang="fr">Mes demandes de clients en-cours</value>
+    <property key="MyPageNoAccess">
+        <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="MyPageNoAccess1">
         <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="MyPageNoAccess2">
         <value xml:lang="en">You do not have access to any functions in the MyPage 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">ท่านไม่เข้าถึงฟังก์ชันการทำงานส่วนอื่นๆใน MyPage ได้, กรุณาติดต่อผู้ดูแลระบบของท่าน</value>
     </property>
     <property key="MyPageNoAccess3">
         <value xml:lang="en">At least MYPAGE_CUSTOMER or MYPAGE_EMPLOYEE permission is required</value>
         <value xml:lang="fr">Au moins une autorisation MYPAGE_CUSTOMER ou MYPAGE_EMPLOYEE est nécessaire</value>
+        <value xml:lang="it">Al minimo il permesso MYPAGE_CUSTOMER o MYPAGE_EMPLOYEE è richiesto</value>
+        <value xml:lang="th">อย่างน้อยที่สุด MYPAGE_CUSTOMER หรือ MYPAGE_EMPLOYEE ถูกกำหนดการใข้สิทธิ์ </value>
     </property>
     <property key="MyPageNoAccess4">
         <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="MyPagePagesVisible">
-        <value xml:lang="en">pages visible on the main screen.</value>
-        <value xml:lang="fr">Pages visibles sur l'écran principal.</value>
-    </property>
-    <property key="MyTasks">
-        <value xml:lang="en">My Tasks</value>
-        <value xml:lang="fr">Mes Tâches</value>
-    </property>
-    <property key="MyTimeSheets">
-        <value xml:lang="en">My Time Sheets</value>
-        <value xml:lang="fr">Mes feuilles d'activité</value>
-    </property>
-    <property key="OpenEvents">
+    <property key="MyPageOpenEvents">
         <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="MyCustRequests">
-        <value xml:lang="en">My customer requests</value>
-        <value xml:lang="fr">Mes demandes utilisateur</value>
+    <property key="MyPageOpenCustomerRequests">
+        <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="OtherCommunications">
+    <property key="MyPageOtherCommunications">
         <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="NoAccess">
-        <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>
-    </property>
-    <property key="OtherCompanyCustomerRequests">
+    <property key="MyPageOtherCompanyCustomerRequests">
         <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="TaskStatus">
-        <value xml:lang="en">Task Status</value>
-        <value xml:lang="fr">Status de la tâche</value>
+    <property key="MyPagePagesVisible">
+        <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="TaskPlanStartDate">
-        <value xml:lang="en">Task Plan Start</value>
-        <value xml:lang="fr">Départ prévu de la tâche</value>
+    <property key="MyPageProfile">
+        <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="TaskPlanEndDate">
-        <value xml:lang="en">Task Plan End</value>
-        <value xml:lang="fr">Fin prévue de la tâche</value>
+    <property key="MyPageTaskActEndDate">
+        <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="TaskActStartDate">
+    <property key="MyPageTaskActStartDate">
         <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="TaskActEndDate">
-        <value xml:lang="en">Task Act End</value>
-        <value xml:lang="fr">Fin réelle de de la tâche</value>
+    <property key="MyPageTaskPlanEndDate">
+        <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="MyPageTaskPlanStartDate">
+        <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="MyPageTaskStatus">
+        <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="MyPageTasks">
+        <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="MyPageTimeSheets">
+        <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="MyPageToComplete">
+        <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/mypage/script/org/ofbiz/mypage/Events.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml?rev=735131&r1=735130&r2=735131&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/script/org/ofbiz/mypage/Events.xml Fri Jan 16 13:03:44 2009
@@ -19,8 +19,8 @@
 -->
 
 <simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods.xsd">
- <simple-method method-name="updatePreferences"
- short-description="Update the user preferences">
+    <simple-method method-name="updatePreferences"
+        short-description="Update the user preferences">
         <if-compare operator="equals" value="Y" field="parameters.myCompanyComms">
             <set field="parameters.userPrefMap.myCompanyComms" value="Y" />
             <else>
@@ -51,11 +51,11 @@
                 <set field="parameters.userPrefMap.otherCommunications" value="N" />
             </else>
         </if-compare>
- <set-service-fields service-name="setUserPreferenceGroup"
- map="parameters" to-map="inMap" />
- <call-service service-name="setUserPreferenceGroup"
- in-map-name="inMap" />
- </simple-method>
+        <set-service-fields service-name="setUserPreferenceGroup"
+            map="parameters" to-map="inMap" />
+        <call-service service-name="setUserPreferenceGroup"
+            in-map-name="inMap" />
+    </simple-method>
 
     <simple-method method-name="updateCustPreferences" short-description="Update the customer preferences">
         <if-compare operator="equals" value="Y" field="parameters.sendCustRequestEmail">
@@ -70,31 +70,31 @@
                 in-map-name="inMap" />
     </simple-method>
     
- <simple-method method-name="setCommEventToRead"
- short-description="">
- <entity-one entity-name="CommunicationEventRole"
- value-field="eventRole" />
- <if-compare operator="equals" value="COM_ROLE_CREATED"
- field="eventRole.statusId">
- <call-simple-method method-name="checkCommEventAccess" />
- <if-compare operator="equals" value="true" field="found">
- <entity-one entity-name="UserLogin" value-field="userLogin">
- <field-map field-name="userLoginId" value="system" />
- </entity-one>
- <set-service-fields service-name="setCommunicationEventRoleStatus"
- map="parameters" to-map="updStat" />
- <set field="updStat.statusId" value="COM_ROLE_READ" />
- <set field="updStat.userLogin" from-field="userLogin" />
- <call-service service-name="setCommunicationEventRoleStatus"
- in-map-name="updStat" include-user-login="false" />
- <else>
- <add-error>
- <fail-property property="NoAccess" resource="MyPageUiLabels" />
- </add-error>
- </else>
- </if-compare>
- </if-compare>
- </simple-method>
+    <simple-method method-name="setCommEventToRead"
+        short-description="">
+        <entity-one entity-name="CommunicationEventRole"
+            value-field="eventRole" />
+        <if-compare operator="equals" value="COM_ROLE_CREATED"
+            field="eventRole.statusId">
+            <call-simple-method method-name="checkCommEventAccess" />
+            <if-compare operator="equals" value="true" field="found">
+                <entity-one entity-name="UserLogin" value-field="userLogin">
+                    <field-map field-name="userLoginId" value="system" />
+                </entity-one>
+                <set-service-fields service-name="setCommunicationEventRoleStatus"
+                    map="parameters" to-map="updStat" />
+                <set field="updStat.statusId" value="COM_ROLE_READ" />
+                <set field="updStat.userLogin" from-field="userLogin" />
+                <call-service service-name="setCommunicationEventRoleStatus"
+                    in-map-name="updStat" include-user-login="false" />
+                <else>
+                    <add-error>
+                        <fail-property property="MyPageNoAccess" resource="MyPageUiLabels" />
+                    </add-error>
+                </else>
+            </if-compare>
+        </if-compare>
+    </simple-method>
 
     <simple-method method-name="checkCommEventAccess" short-description="check if the user has access to the email of this party">
         <set field="found" value="false"/>

Modified: ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml?rev=735131&r1=735130&r2=735131&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/CommonScreens.xml Fri Jan 16 13:03:44 2009
@@ -35,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.MyPageInformation" 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. -->
@@ -219,7 +219,7 @@
                         <not><if-empty field-name="custRequests"/></not>
                     </condition>
                     <widgets>
-                        <screenlet title="${uiLabelMap.IncomingCustRequests}" navigation-form-name="ListRequestList" >
+                        <screenlet title="${uiLabelMap.MyPageIncomingCustRequests}" navigation-form-name="ListRequestList" >
                             <include-form name="ListRequestList" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
                         </screenlet>
                     </widgets>
@@ -332,11 +332,11 @@
                 </service>
             </actions>
             <widgets>
-                <screenlet title="${uiLabelMap.MyOpenCustomerRequests}" navigation-form-name="ListCustRequests" >
+                <screenlet title="${uiLabelMap.MyPageOpenCustomerRequests}" navigation-form-name="ListCustRequests" >
                     <link target="newrequest" text="${uiLabelMap.OrderNewRequest}" style="buttontext"/>
                     <include-form name="ListCustRequests" location="component://mypage/widget/MyPageForms.xml"/>
                 </screenlet>
-                <screenlet title="${uiLabelMap.MyCompletedCustomerRequests}" navigation-form-name="ListCustRequestsCompleted">
+                <screenlet title="${uiLabelMap.MyPageCompletedCustomerRequests}" navigation-form-name="ListCustRequestsCompleted">
                     <include-form name="ListCustRequestsCompleted" location="component://mypage/widget/MyPageForms.xml"/>
                 </screenlet>
                 <section>
@@ -344,12 +344,12 @@
                         <not><if-empty field-name="companyCustRequests"/></not>
                     </condition>
                     <widgets>
-                        <screenlet title="${uiLabelMap.OtherCompanyCustomerRequests}" navigation-form-name="ListOtherCompanyRequests">
+                        <screenlet title="${uiLabelMap.MyPageOtherCompanyCustomerRequests}" navigation-form-name="ListOtherCompanyRequests">
                             <include-form name="ListOtherCompanyRequests" location="component://mypage/widget/MyPageForms.xml"/>
                         </screenlet>
                     </widgets>
                 </section>
-                <screenlet title="${uiLabelMap.CommunicationsOfParty}: ${partyName.firstName} ${partyName.middleName} ${partyName.lastName} ${partyName.groupName} [${partyId}] "
+                <screenlet title="${uiLabelMap.MyPageCommunicationsOfParty}: ${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://mypage/widget/MyPageMenus.xml" />
                     <include-form name="ListPartyCommEvents" location="component://mypage/widget/MyPageForms.xml" />
@@ -361,7 +361,7 @@
     <screen name="mainNoAccess">
         <section>
             <widgets>
-                <screenlet title="${uiLabelMap.CommonNoAccess}" navigation-form-name="ListRequestList" >
+                <screenlet title="${uiLabelMap.MyPageNoAccess}" navigation-form-name="ListRequestList" >
                     <container>
                         <label style="h1" text="${uiLabelMap.MyPageNoAccess1}"></label>
                     </container>

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml?rev=735131&r1=735130&r2=735131&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageForms.xml Fri Jan 16 13:03:44 2009
@@ -30,7 +30,7 @@
         <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-->
+        <!-- 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-->
     </form>
     
     <form name="EditWeekTimesheet" extends="EditWeekTimesheet" extends-resource="component://projectmgr/widget/forms/TimeSheetForms.xml">
@@ -54,8 +54,8 @@
         <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>
+        <field name="actualStartDate" title="${uiLabelMap.MyPageTaskActStartDate}"><display type="date"/></field>
+        <field name="delete" title="${uiLabelMap.FormFieldTitle_deleteButton}"><submit button-type="text-link"/></field>
     </form>
     
     <form name="newEvent" type="single" target="createEvent">
@@ -64,17 +64,17 @@
         <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="actualStartDate" title="${uiLabelMap.MyPageTaskActStartDate}"><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="myCommunications" title="${uiLabelMap.MyPageCommunications}"><check/></field>
+        <field name="otherCommunications" title="${uiLabelMap.MyPageOtherCommunications}"><check/></field>
+        <field name="myCompanyComms" title="${uiLabelMap.MyPageCompanyComms}"><check/></field>
+        <field name="myTasks" title="${uiLabelMap.MyPageTasks}"><check/></field>
+        <field name="myTimesheet" title="${uiLabelMap.MyPageTimeSheets}"><check/></field>
         <field name="updateButton"><submit/></field>
     </form>
     
@@ -98,7 +98,7 @@
         </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}"/>
+                <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}"/>
             </display-entity>
         </field>
         <field name="createdStamp" entry-name="entryDate"/>
@@ -145,11 +145,11 @@
             </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="currentStatusId" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPageTaskStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
+        <field name="estimatedStartDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPageTaskPlanStartDate}"><display type="date"/></field>
+        <field name="estimatedCompletionDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPageTaskPlanEndDate}"><display type="date"/></field>
+        <field name="actualStartDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPageTaskActStartDate}"><display type="date"/></field>
+        <field name="actualCompletionDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPageTaskActEndDate}"><display type="date"/></field>
         <field name="plannedHours" map-name="taskResult.taskInfo"><display/></field>
         <field name="actualHours" map-name="taskResult.taskInfo"><display/></field>
     </form>

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml?rev=735131&r1=735130&r2=735131&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml Fri Jan 16 13:03:44 2009
@@ -27,13 +27,13 @@
             </condition>
             <link target="main?donePage=main"/>
         </menu-item>
-        <menu-item name="viewprofile" title="${uiLabelMap.MyProfile}">
+        <menu-item name="viewprofile" title="${uiLabelMap.MyPageProfile}">
             <condition>
                 <not><if-empty field-name="userLogin"/></not>
             </condition>
             <link target="viewprofile?partyId=${userLogin.partyId}"/>
         </menu-item>
-        <menu-item name="myCommunications" title="${uiLabelMap.MyCommunications}">
+        <menu-item name="myCommunications" title="${uiLabelMap.MyPageCommunications}">
             <condition>
                 <and>
                     <not><if-empty field-name="userLogin"/></not>
@@ -42,7 +42,7 @@
             </condition>
             <link target="myCommunications?donePage=myCommunications"/>
         </menu-item>
-        <menu-item name="otherCommunications" title="${uiLabelMap.OtherCommunications}">
+        <menu-item name="otherCommunications" title="${uiLabelMap.MyPageOtherCommunications}">
             <condition>
                 <and>
                     <not><if-empty field-name="userLogin"/></not>
@@ -55,7 +55,7 @@
             </condition>
             <link target="otherCommunications?donePage=otherCommunications"/>
         </menu-item>
-        <menu-item name="myCompanyComms" title="${uiLabelMap.MyCompanyComms}">
+        <menu-item name="myCompanyComms" title="${uiLabelMap.MyPageCompanyComms}">
             <condition>
                 <and>
                     <not><if-empty field-name="userLogin"/></not>
@@ -68,7 +68,7 @@
             </condition>
             <link target="myCompanyComms"/>
         </menu-item>
-        <menu-item name="myTimesheet" title="${uiLabelMap.MyTimeSheets}">
+        <menu-item name="myTimesheet" title="${uiLabelMap.MyPageTimeSheets}">
             <condition>
                 <and>
                     <not><if-empty field-name="userLogin"/></not>
@@ -81,7 +81,7 @@
             </condition>
             <link target="myTimesheet?donePage=myTimeSheet"/>
         </menu-item>
-        <menu-item name="myTasks" title="${uiLabelMap.MyTasks}">
+        <menu-item name="myTasks" title="${uiLabelMap.MyPageTasks}">
             <condition>
                 <and>
                     <not><if-empty field-name="userLogin"/></not>
@@ -158,13 +158,13 @@
             <link
                 target="EditCommunicationEvent?communicationEventTypeId=COMMENT_NOTE&amp;donePage=${parameters.donePage}" />
         </menu-item>
-        <menu-item name="openEvents" title="${uiLabelMap.OpenEvents}">
+        <menu-item name="openEvents" title="${uiLabelMap.MyPageOpenEvents}">
             <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}">
+        <menu-item name="allOtherEvents" title="${uiLabelMap.MyPageAllEvents}">
             <condition>
                 <or>
                     <if-compare field-name="parameters.all" operator="equals" value="false" />
@@ -176,11 +176,11 @@
     </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-item name="myTasks" title="${uiLabelMap.MyPageTasks}"><link target="/projectmgr/control/MyTasks" url-mode="inter-app"/></menu-item>
     </menu>
     
     <menu name="MyTimesheetMenu">
-        <menu-item name="setToComplete" title="${uiLabelMap.CommonStatustoComplete}">
+        <menu-item name="setToComplete" title="${uiLabelMap.MyPageToComplete}">
             <condition>
                 <and>
                     <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_IN_PROCESS"/>
@@ -189,7 +189,7 @@
             </condition>
             <link target="statusToComplete?timesheetId=${timesheet.timesheetId}&amp;statusId=TIMESHEET_COMPLETED"/>
         </menu-item>
-        <menu-item name="setToCompleteKey" title="${uiLabelMap.CommonStatustoComplete}">
+        <menu-item name="setToCompleteKey" title="${uiLabelMap.MyPageToComplete}">
             <condition>
                 <and>
                     <if-compare field-name="timesheet.statusId" operator="equals" value="TIMESHEET_IN_PROCESS"/>

Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml?rev=735131&r1=735130&r2=735131&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageScreens.xml Fri Jan 16 13:03:44 2009
@@ -169,7 +169,7 @@
                 <set field="donePage" from-field="donePage" default-value="myCompanyComms"/>
             </actions>
             <widgets>
-                <screenlet title="${uiLabelMap.CompanyEvents}" navigation-menu-name="MyCompanyCommsMenu" name="companyEvents" collapsible="true">
+                <screenlet title="${uiLabelMap.MyPageCompanyEvents}" navigation-menu-name="MyCompanyCommsMenu" name="companyEvents" collapsible="true">
                     <include-menu name="MyCompanyCommsMenu" location="component://mypage/widget/MyPageMenus.xml"/>
                     <include-form name="MyCompanyComms" location="component://mypage/widget/MyPageForms.xml"/>
                 </screenlet>
@@ -231,7 +231,7 @@
                 </entity-one>
             </actions>
             <widgets>
-                <screenlet title="${uiLabelMap.CommunicationsOfParty}: ${partyName.firstName} ${partyName.middleName} ${partyName.lastName} ${partyName.groupName} [${partyId}] "
+                <screenlet title="${uiLabelMap.MyPageCommunicationsOfParty}: ${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 +243,13 @@
                             </not>
                         </condition>
                         <widgets>
-                            <label style="h2" text="${uiLabelMap.EmailsFromUnknownOrigin}"></label>
+                            <label style="h2" text="${uiLabelMap.MyPageEmailsFromUnknownOrigin}"></label>
                             <include-form
                                 location="component://mypage/widget/MyPageForms.xml"
                                 name="ListMyUnknownPartyEmails" />
                         </widgets>
                     </section>
-                    <label style="h2" text="${uiLabelMap.EmailsFromKnownOrigin}"></label>
+                    <label style="h2" text="${uiLabelMap.MyPageEmailsFromKnownOrigin}"></label>
                     <include-form name="ListPartyCommEvents"
                         location="component://mypage/widget/MyPageForms.xml" />
                     <section>
@@ -310,7 +310,7 @@
                             <section>
                                 <widgets>
                                     <label style="h1"
-                                        text="${uiLabelMap.CommunicationEventId} ${parameters.communicationEventId}"></label>
+                                        text="${uiLabelMap.MyPageCommunicationEventId} ${parameters.communicationEventId}"></label>
                                     <include-screen name="commEvent"
                                             location="component://party/widget/partymgr/CommunicationScreens.xml" />
                                 </widgets>

Modified: ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml?rev=735131&r1=735130&r2=735131&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/config/MyPortalUiLabels.xml Fri Jan 16 13:03:44 2009
@@ -18,187 +18,26 @@
     under the License.
 -->
 <resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <property key="AllEvents">
-        <value xml:lang="en">All Communications</value>
-        <value xml:lang="fr">Toutes les communications</value>
-        <value xml:lang="th">การติดต่อทั้งหมด</value>
-    </property>
-    <property key="CommunicationsOfParty">
-        <value xml:lang="en">Communications of party</value>
-        <value xml:lang="fr">Communications de l'acteur</value>
-        <value xml:lang="th">การติดต่อบุคคล</value>
-    </property>
-    <property key="CommunicationEventId">
-        <value xml:lang="en">Communication Event id:</value>
-        <value xml:lang="fr">Réf. d'évènement de comm.</value>
-        <value xml:lang="th">เหตุการณ์ที่ทำการติดต่อ</value>
-    </property>
-    <property key="CompanyEvents">
-        <value xml:lang="en">Company events</value>
-        <value xml:lang="fr">Evènements de l'entreprise</value>
-        <value xml:lang="th">เหตุการณ์บริษัท</value>
-    </property>
-    <property key="EmailsFromKnownOrigin">
-        <value xml:lang="en">Emails from known origin</value>
-        <value xml:lang="fr">Courriel issue d'une origine connue</value>
-        <value xml:lang="th">อีเมล์ที่อ่านแล้ว</value>
-    </property>
-    <property key="EmailsFromUnknownOrigin">
-        <value xml:lang="en">Emails from unknown origin</value>
-        <value xml:lang="fr">Courriel issue d'une origine inconnue</value>
-        <value xml:lang="th">อีเมล์ที่ไม่ระบุ</value>
-    </property>
-    <property key="IncomingCustRequests">
-        <value xml:lang="en">Incoming customer requests</value>
-        <value xml:lang="fr">Nouvelles demandes utilisateur</value>
-        <value xml:lang="th">แสดงรายรับของลูกค้า</value>
-    </property>
-    <property key="MyportalDashboard">
+    <property key="MyPortalDashboard">
         <value xml:lang="en">My Portal</value>
         <value xml:lang="fr">Mon portail</value>
+        <value xml:lang="it">Mio portale</value>
         <value xml:lang="th">ส่วนตัว</value>
     </property>
-    <property key="MyCommunications">
-        <value xml:lang="en">My Communications</value>
-        <value xml:lang="fr">Mes communications</value>
-        <value xml:lang="th">การติดต่อฉัน</value>
-    </property>
-    <property key="MyCompanyComms">
-        <value xml:lang="en">Company communications</value>
-        <value xml:lang="fr">Communications de l'entreprise</value>
-        <value xml:lang="th">การติดต่อบริษัท</value>
-    </property>
-    <property key="MyCompletedCustomerRequests">
-        <value xml:lang="en">My Completed Customer Requests</value>
-        <value xml:lang="fr">Mes demandes de clients terminées</value>
-        <value xml:lang="th">งานที่แก้ไขให้ลูกค้าเรียยร้อยแล้ว</value>
-    </property>
-    <property key="MyInformation">
-        <value xml:lang="en">My Information</value>
-        <value xml:lang="fr">Mes informations </value>
-        <value xml:lang="th">ข้อมูลของฉัน</value>
-    </property>
-    <property key="MyOpenCustomerRequests">
-        <value xml:lang="en">My Open Customer Requests</value>
-        <value xml:lang="fr">Mes demandes de clients en-cours</value>
-        <value xml:lang="th">ความต้องการของลูกค้า</value>
-    </property>
-    <property key="MyProfile">
-        <value xml:lang="en">My Profile</value>
-        <value xml:lang="fr">Mon Profil</value>
-        <value xml:lang="th">ประวัติส่วนตัวของฉัน</value>
-    </property>
-    <property key="MyPageAppBar">
-        <value xml:lang="en">My Page App Bar</value>
-        <value xml:lang="fr">Menu des applications</value>
-        <value xml:lang="th">แอปพริเคชันของฉัน</value>
-    </property>
-    <property key="MyPageNewMessage">
-        <value xml:lang="en">New Message</value>
-        <value xml:lang="fr">Nouveau message</value>
-        <value xml:lang="th">ข้อความใหม่</value>
-    </property>
-    <property key="MyPageNoAccess1">
-        <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="th">ไม่สามารถเข้าไปติดตั้งระบบ</value>
-    </property>
-    <property key="MyPageNoAccess2">
-        <value xml:lang="en">You do not have access to any functions in the MyPage 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="th">ท่านไม่เข้าถึงฟังก์ชันการทำงานส่วนอื่นๆใน MyPage ได้, กรุณาติดต่อผู้ดูแลระบบของท่าน</value>
-    </property>
-    <property key="MyPageNoAccess3">
-        <value xml:lang="en">At least MYPAGE_CUSTOMER or MYPAGE_EMPLOYEE permission is required</value>
-        <value xml:lang="fr">Au moins une autorisation MYPAGE_CUSTOMER ou MYPAGE_EMPLOYEE est nécessaire</value>
-        <value xml:lang="th">อย่างน้อยที่สุด MYPAGE_CUSTOMER หรือ MYPAGE_EMPLOYEE ถูกกำหนดการใข้สิทธิ์ </value>
-    </property>
-    <property key="MyPageNoAccess4">
-        <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="th">จำลองผู้ใช้เป็น DemoCustomer และ DemoEmployee ในการทำงาน</value>
-    </property>
-    <property key="MyPagePagesVisible">
-        <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="th">สามารถเห็นหน้าอื่นบนหน้าหลักได้</value>
-    </property>
-    <property key="MyTasks">
-        <value xml:lang="en">My Tasks</value>
-        <value xml:lang="fr">Mes Tâches</value>
-        <value xml:lang="th">งานของฉัน</value>
-    </property>
-    <property key="MyTimeSheets">
-        <value xml:lang="en">My Time Sheets</value>
-        <value xml:lang="fr">Mes feuilles d'activité</value>
-        <value xml:lang="th">ตารางการทำงานของฉัน</value>
-    </property>
-    <property key="MyCustRequests">
-        <value xml:lang="en">My customer requests</value>
-        <value xml:lang="fr">Mes demandes utilisateur</value>
-        <value xml:lang="th">ลูกค้าเรียกร้อง</value>
-    </property>
-    <property key="NoAccess">
-        <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="th">คุณไม่มีข้อมูลอยู่ในระบบ</value>
-    </property>
-    <property key="OpenEvents">
-        <value xml:lang="en">Open Communications</value>
-        <value xml:lang="fr">Communications ouvertes</value>
-        <value xml:lang="th">เปิดการติดต่อ</value>
-    </property>
-    <property key="OtherCommunications">
-        <value xml:lang="en">Other Communications</value>
-        <value xml:lang="fr">Autres communications</value>
-        <value xml:lang="th">การติดต่อรูปแบบต่างๆ</value>
-    </property>
-    <property key="OtherCompanyCustomerRequests">
-        <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="th">ลูกค้าต้องการติดต่อรูปแบบอื่นจากบริษัทของเรา</value>
-    </property>
-    <property key="SendMailEveryCust">
+    <property key="MyPortalSendMailEveryCust">
         <value xml:lang="en">Send Email To Every Customer Request Change</value>
+        <value xml:lang="it">Invia email ad ogni cliente per le modifiche sulla richiesta</value>
         <value xml:lang="th">ส่งอีเมล์ถึงลูกค้าที่เปลี่ยนความต้องการ</value>
     </property>
-    <property key="TaskStatus">
-        <value xml:lang="en">Task Status</value>
-        <value xml:lang="fr">Status de la tâche</value>
-        <value xml:lang="th">สถานะของงาน</value>
-    </property>
-    <property key="TaskActEndDate">
-        <value xml:lang="en">Task Act End</value>
-        <value xml:lang="fr">Fin réelle de de la tâche</value>
-        <value xml:lang="th">เสร็จสิ้นการทำ</value>
-    </property>
-    <property key="TaskActStartDate">
-        <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="th">เรื่มต้นการทำ</value>
-    </property>
-    <property key="TaskPlanEndDate">
-        <value xml:lang="en">Task Plan End</value>
-        <value xml:lang="fr">Fin prévue de la tâche</value>
-        <value xml:lang="th">สิ้นสุดชิ้นงาน</value>
-    </property>
-    <property key="TaskPlanStartDate">
-        <value xml:lang="en">Task Plan Start</value>
-        <value xml:lang="fr">Départ prévu de la tâche</value>
-        <value xml:lang="th">เริ่มต้นชิ้นงาน</value>
-    </property>
-    <property key="TitlePageMyportal">
+    <property key="PageTitleMyPortal">
         <value xml:lang="en">My Portal for : </value>
+        <value xml:lang="it">Mio portale per : </value>
         <value xml:lang="th">ส่วนตัวสำหรับ </value>
     </property>
-    <property key="TitlePageMyportalForNoLogin">
+    <property key="PageTitleMyPortalForNoLogin">
         <value xml:lang="en">My Portal Page</value>
         <value xml:lang="fr">Ma page de portail</value>
+        <value xml:lang="it">Pagina mio portale</value>
         <value xml:lang="th">หน้าส่วนตัวของฉัน</value>
     </property>
-    <property key="toComplete">
-        <value xml:lang="en">->Closed</value>
-        <value xml:lang="fr">->Fermé(e)</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=735131&r1=735130&r2=735131&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/script/org/ofbiz/myportal/Events.xml Fri Jan 16 13:03:44 2009
@@ -85,7 +85,7 @@
                     include-user-login="false"/>
                 <else>
                     <add-error>
-                        <fail-property property="NoAccess" resource="MyPortalUiLabels"/>
+                        <fail-property property="MyPageNoAccess" resource="MyPortalUiLabels"/>
                     </add-error>
                 </else>
             </if-compare>

Modified: ofbiz/trunk/specialpurpose/myportal/templates/appheader.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/templates/appheader.ftl?rev=735131&r1=735130&r2=735131&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/templates/appheader.ftl (original)
+++ ofbiz/trunk/specialpurpose/myportal/templates/appheader.ftl Fri Jan 16 13:03:44 2009
@@ -19,7 +19,7 @@
 
 <#assign selected = headerItem?default("void")>
 <div id="app-navigation">
-  <h2>${uiLabelMap.TitlePageMyportal} ${partyNameView.personalTitle?if_exists} ${partyNameView.firstName?if_exists} ${partyNameView.middleName?if_exists} ${partyNameView.lastName?if_exists} ${partyNameView.groupName?if_exists}</h2>
+  <h2>${uiLabelMap.PageTitleMyPortal} ${partyNameView.personalTitle?if_exists} ${partyNameView.firstName?if_exists} ${partyNameView.middleName?if_exists} ${partyNameView.lastName?if_exists} ${partyNameView.groupName?if_exists}</h2>
   <ul>
     <#if portalPages?has_content>
       <#list portalPages as page>

Modified: ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml?rev=735131&r1=735130&r2=735131&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/CommonScreens.xml Fri Jan 16 13:03:44 2009
@@ -25,6 +25,7 @@
             <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"/>
@@ -53,7 +54,7 @@
                 <entity-one entity-name="PartyNameView" value-name="partyNameView">
                     <field-map field-name="partyId" env-name="userLogin.partyId"/>
                 </entity-one>
-                <set field="applicationTitle" value="${uiLabelMap.TitlePageMyportalForNoLogin}"/>
+                <set field="applicationTitle" value="${uiLabelMap.PageTitleMyPortalForNoLogin}"/>
             </actions>
             <widgets>
                 <include-screen name="GlobalDecorator" location="component://common/widget/CommonScreens.xml"/>
@@ -140,29 +141,29 @@
         </section>
     </screen>
 
- <screen name="main">
-    <section>
-        <actions>
-            <set field="parameters.portalPageId" value="MYPORTAL"/>
-            <script location="component://common/webcommon/WEB-INF/actions/includes/ShowPortalPage.groovy"/>
-            <set field="headerItem" from-field="parameters.portalPageId"/>
-            <!--My Profile From Party-->
-            <set field="titleProperty" value="PageTitleViewPartyProfile"/>
-            <set field="tabButtonItem" value="viewprofile"/>
-            <set field="labelTitleProperty" value="PartyTaxAuthInfos"/>
-            <set field="parameters.partyId" from-field="userLogin.userLoginId"/>
-            <script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/>
-            <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/>
-        </actions>
-        <widgets>
-            <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
-                <decorator-section name="body">
-                    <platform-specific><html><html-template location="component://common/webcommon/portal/showPortalPage.ftl"/></html></platform-specific>
-                </decorator-section>
-            </decorator-screen>
-        </widgets>
-    </section>
- </screen>                
+    <screen name="main">
+        <section>
+            <actions>
+                <set field="parameters.portalPageId" value="MYPORTAL"/>
+                <script location="component://common/webcommon/WEB-INF/actions/includes/ShowPortalPage.groovy"/>
+                <set field="headerItem" from-field="parameters.portalPageId"/>
+                <!--My Profile From Party-->
+                <set field="titleProperty" value="PageTitleViewPartyProfile"/>
+                <set field="tabButtonItem" value="viewprofile"/>
+                <set field="labelTitleProperty" value="PartyTaxAuthInfos"/>
+                <set field="parameters.partyId" from-field="userLogin.userLoginId"/>
+                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/ViewProfile.groovy"/>
+                <script location="component://party/webapp/partymgr/WEB-INF/actions/party/GetUserLoginPrimaryEmail.groovy"/>
+            </actions>
+            <widgets>
+                <decorator-screen name="main-decorator" location="${parameters.mainDecoratorLocation}">
+                    <decorator-section name="body">
+                        <platform-specific><html><html-template location="component://common/webcommon/portal/showPortalPage.ftl"/></html></platform-specific>
+                    </decorator-section>
+                </decorator-screen>
+            </widgets>
+        </section>
+    </screen>                
 
     <screen name="CommonRequestDecorator">
         <section>

Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml?rev=735131&r1=735130&r2=735131&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalForms.xml Fri Jan 16 13:03:44 2009
@@ -30,7 +30,7 @@
         <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-->
+        <!-- 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-->
     </form>
     
     <form name="EditWeekTimesheet" extends="EditWeekTimesheet" extends-resource="component://projectmgr/widget/forms/TimeSheetForms.xml">
@@ -94,7 +94,7 @@
         </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}"/>
+                <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}"/>
             </display-entity>
         </field>
         <field name="createdStamp" entry-name="entryDate"/>
@@ -141,11 +141,11 @@
             </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="currentStatusId" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPageTaskStatus}"><display-entity entity-name="StatusItem" key-field-name="statusId"/></field>
+        <field name="estimatedStartDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPageTaskPlanStartDate}"><display type="date"/></field>
+        <field name="estimatedCompletionDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPageTaskPlanEndDate}"><display type="date"/></field>
+        <field name="actualStartDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPageTaskActStartDate}"><display type="date"/></field>
+        <field name="actualCompletionDate" map-name="taskResult.taskInfo" title="${uiLabelMap.MyPageTaskActEndDate}"><display type="date"/></field>
         <field name="plannedHours" map-name="taskResult.taskInfo"><display/></field>
         <field name="actualHours" map-name="taskResult.taskInfo"><display/></field>
     </form>

Modified: ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml?rev=735131&r1=735130&r2=735131&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalMenus.xml Fri Jan 16 13:03:44 2009
@@ -40,13 +40,13 @@
             <link
                 target="EditCommunicationEvent?communicationEventTypeId=COMMENT_NOTE&amp;portalPageId=${parameters.portalPageId}" />
         </menu-item>
-        <menu-item name="openEvents" title="${uiLabelMap.OpenEvents}">
+        <menu-item name="openEvents" title="${uiLabelMap.MyPageOpenEvents}">
             <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.AllEvents}">
+        <menu-item name="allOtherEvents" title="${uiLabelMap.MyPageAllEvents}">
             <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.CommonStatustoComplete}">
+        <menu-item name="setToComplete" title="${uiLabelMap.MyPageToComplete}">
             <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.CommonStatustoComplete}">
+        <menu-item name="setToCompleteKey" title="${uiLabelMap.MyPageToComplete}">
             <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=735131&r1=735130&r2=735131&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml (original)
+++ ofbiz/trunk/specialpurpose/myportal/widget/MyPortalScreens.xml Fri Jan 16 13:03:44 2009
@@ -169,7 +169,7 @@
                 <set field="portalPageId" from-field="parameters.portalPageId" default-value="myCompanyComms"/>
             </actions>
             <widgets>
-                <screenlet title="${uiLabelMap.CompanyEvents}" navigation-menu-name="MyCompanyCommsMenu" name="companyEvents" collapsible="true">
+                <screenlet title="${uiLabelMap.MyPageCompanyEvents}" 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 +231,7 @@
                 </entity-one>
             </actions>
             <widgets>
-                <screenlet title="${uiLabelMap.CommunicationsOfParty}: ${partyName.firstName} ${partyName.middleName} ${partyName.lastName} ${partyName.groupName} [${partyId}] "
+                <screenlet title="${uiLabelMap.MyPageCommunicationsOfParty}: ${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 +243,13 @@
                             </not>
                         </condition>
                         <widgets>
-                            <label style="h2" text="${uiLabelMap.EmailsFromUnknownOrigin}"></label>
+                            <label style="h2" text="${uiLabelMap.MyPageEmailsFromUnknownOrigin}"></label>
                             <include-form
                                 location="component://myportal/widget/MyPortalForms.xml"
                                 name="ListMyUnknownPartyEmails" />
                         </widgets>
                     </section>
-                    <label style="h2" text="${uiLabelMap.EmailsFromKnownOrigin}"></label>
+                    <label style="h2" text="${uiLabelMap.MyPageEmailsFromKnownOrigin}"></label>
                     <include-form name="ListPartyCommEvents"
                         location="component://myportal/widget/MyPortalForms.xml" />
                     <section>
@@ -310,7 +310,7 @@
                             <section>
                                 <widgets>
                                     <label style="h1"
-                                        text="${uiLabelMap.CommunicationEventId} ${parameters.communicationEventId}"></label>
+                                        text="${uiLabelMap.MyPageCommunicationEventId} ${parameters.communicationEventId}"></label>
                                     <include-screen name="commEvent"
                                             location="component://party/widget/partymgr/CommunicationScreens.xml" />
                                 </widgets>
@@ -789,7 +789,7 @@
                         <not><if-empty field-name="custRequests"/></not>
                     </condition>
                     <widgets>
-                        <screenlet title="${uiLabelMap.IncomingCustRequests}" navigation-form-name="ListRequestList">
+                        <screenlet title="${uiLabelMap.MyPageIncomingCustRequests}" navigation-form-name="ListRequestList">
                             <include-form name="ListRequestList" location="component://order/webapp/ordermgr/request/RequestForms.xml"/>
                         </screenlet>
                     </widgets>
@@ -914,7 +914,7 @@
             <widgets>
                 <section>
                     <widgets>
-                        <screenlet title="${uiLabelMap.MyCompletedCustomerRequests}" navigation-form-name="ListCustRequestsCompleted">
+                        <screenlet title="${uiLabelMap.MyPageCompletedCustomerRequests}" navigation-form-name="ListCustRequestsCompleted">
                             <include-form name="ListCustRequestsCompleted" location="component://myportal/widget/MyPortalForms.xml"/>
                         </screenlet>
                     </widgets>
@@ -976,14 +976,14 @@
             <widgets>
                 <section>
                      <widgets>
-                        <screenlet title="${uiLabelMap.OtherCompanyCustomerRequests}" navigation-form-name="ListOtherCompanyRequests">
+                        <screenlet title="${uiLabelMap.MyPageOtherCompanyCustomerRequests}" navigation-form-name="ListOtherCompanyRequests">
                             <include-form name="ListOtherCompanyRequests" location="component://myportal/widget/MyPortalForms.xml"/>
                         </screenlet>
                     </widgets>
                 </section>
                 <section>
                     <widgets>
-                        <screenlet title="${uiLabelMap.CommunicationsOfParty}: ${partyName.firstName} ${partyName.middleName} ${partyName.lastName} ${partyName.groupName} [${partyId}] "
+                        <screenlet title="${uiLabelMap.MyPageCommunicationsOfParty}: ${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" />

Modified: ofbiz/trunk/specialpurpose/oagis/config/OagisUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/oagis/config/OagisUiLabels.xml?rev=735131&r1=735130&r2=735131&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/oagis/config/OagisUiLabels.xml (original)
+++ ofbiz/trunk/specialpurpose/oagis/config/OagisUiLabels.xml Fri Jan 16 13:03:44 2009
@@ -17,7 +17,8 @@
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
---><resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+-->
+<resource xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
     <property key="OagisApplication">
         <value xml:lang="en">Oagis Implementation</value>
         <value xml:lang="fr">Implémentation Oagis</value>


Free forum by Nabble Edit this page