Author: jleroux
Date: Sun Apr 5 11:08:43 2009 New Revision: 762067 URL: http://svn.apache.org/viewvc?rev=762067&view=rev Log: Secured URLs : random fixes (but not done randomly but using <<param-name=(.*)&>>, so are the last of this kind) Fix some French labels Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml Modified: ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml?rev=762067&r1=762066&r2=762067&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml (original) +++ ofbiz/trunk/applications/accounting/config/AccountingUiLabels.xml Sun Apr 5 11:08:43 2009 @@ -117,7 +117,7 @@ </property> <property key="AccountingAccounting"> <value xml:lang="en">Accounting</value> - <value xml:lang="de">Buchhaltung</value> + <value xml:lang="de">Buchhaltung</value> <value xml:lang="fr">Comptabilité</value> <value xml:lang="it">Contabilità </value> <value xml:lang="nl">Boekhouding</value> @@ -125,7 +125,7 @@ </property> <property key="AccountingAccounts"> <value xml:lang="ar">Øسابات</value> - <value xml:lang="de">Konten</value> + <value xml:lang="de">Konten</value> <value xml:lang="en">Accounts</value> <value xml:lang="es">cuentas</value> <value xml:lang="fr">Comptes</value> @@ -563,7 +563,7 @@ <value xml:lang="de">Vereinbarungsart</value> <value xml:lang="en">Agreement Type Id</value> <value xml:lang="es">Id tipo de acuerdo</value> - <value xml:lang="fr">Réf de type d'accord commercial</value> + <value xml:lang="fr">Réf de type d'accord commercial</value> <value xml:lang="it">Tipo Contratto</value> <value xml:lang="nl">Overeenkomst Type Nr</value> <value xml:lang="ro">Tip Contract</value> @@ -1865,7 +1865,7 @@ <value xml:lang="de">Neuen Gutschein erstellen</value> <value xml:lang="en">Create New Gift Card</value> <value xml:lang="es">Crear nuevo certificado de regalo</value> - <value xml:lang="fr">Créer nouv. carte cadeau</value> + <value xml:lang="fr">Créer une nouvelle carte cadeau</value> <value xml:lang="it">Creare Nuova Carta Omaggio</value> <value xml:lang="nl">Nieuwe cadeaubon aanmaken</value> <value xml:lang="ro">Creare Noua Carte Omagiu</value> Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml?rev=762067&r1=762066&r2=762067&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunForms.xml Sun Apr 5 11:08:43 2009 @@ -359,7 +359,8 @@ </field> <field name="declareLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="smallSubmit" use-when=""PRUN_RUNNING".equals("${currentStatusId}")"> <hyperlink target="ProductionRunDeclaration" description="${uiLabelMap.ManufacturingDeclareProductionRunTask}" also-hidden="false"> - <parameter param-name="actionForm=EditRoutingTask&routingTaskId" from-field="workEffortId"/> + <parameter param-name="actionForm" value="EditRoutingTask"/> + <parameter param-name="routingTaskId" from-field="workEffortId"/> <parameter param-name="productionRunId" from-field="workEffortParentId"/> </hyperlink> </field> Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=762067&r1=762066&r2=762067&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Sun Apr 5 11:08:43 2009 @@ -7,9 +7,9 @@ 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 @@ -19,7 +19,7 @@ --> <menus xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-menu.xsd"> - + <menu name="PartyAppBar" title="${uiLabelMap.PartyManagerApplication}" extends="CommonAppBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="find" title="${uiLabelMap.PartyParties}"><link target="findparty"/></menu-item> <menu-item name="mycomm" title="${uiLabelMap.PartyMyCommunications}"><link target="MyCommunicationEvents"/></menu-item> @@ -35,7 +35,7 @@ <menu-item name="addrmap" title="${uiLabelMap.PageTitleAddressMatchMap}"><link target="addressMatchMap"/></menu-item> <menu-item name="partyinv" title="${uiLabelMap.PartyInvitation}"><link target="partyInvitation"/></menu-item> </menu> - + <menu name="SecurityGroupTabBar" default-menu-item-name="EditSecurityGroup" default-selected-style="selected" menu-container-style="button-bar tab-bar" type="simple" selected-menuitem-context-field-name="tabButtonItem"> <menu-item name="EditSecurityGroup" title="${uiLabelMap.PartySecurityGroups}"> @@ -59,7 +59,7 @@ </link> </menu-item> </menu> - + <menu name="ProfileTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" default-menu-item-name="viewprofile"> <menu-item name="viewprofile" title="${uiLabelMap.PartyProfile}"> @@ -145,7 +145,7 @@ <menu-item name="EditEmploymentApps" title="${uiLabelMap.HumanResEmploymentApp}"> <link target="EditEmploymentApps"> <parameter param-name="partyId" from-field="partyId"/> - <parameter param-name="&referredByPartyId" from-field="partyId"/> + <parameter param-name="referredByPartyId" from-field="partyId"/> </link> </menu-item> <menu-item name="FinancialHistory" title="${uiLabelMap.PartyFinancialHistory}"> @@ -178,7 +178,7 @@ </condition> <link target="/accounting/control/FindFinAccount" url-mode="inter-app"> <parameter param-name="ownerPartyId" from-field="partyId"/> - </link> + </link> </menu-item> <menu-item name="PartyCommEvents" title="${uiLabelMap.PartyCommunications}" > <link target="ListPartyCommEvents"> @@ -190,9 +190,10 @@ <if-has-permission permission="ORDERMGR" action="_VIEW"/> </condition> <link target="/ordermgr/control/FindRequest" url-mode="inter-app"> - <parameter param-name="lookupFlag=Y&fromPartyId" from-field="partyId"/> + <parameter param-name="lookupFlag" value="Y"/> + <parameter param-name="fromPartyId" from-field="partyId"/> <parameter param-name="externaLoginKey" from-field="externalLoginKey"/> - </link> + </link> </menu-item> <menu-item name="findQuote" title="${uiLabelMap.OrderOrderQuotes}" > <condition> @@ -201,7 +202,7 @@ <link target="/ordermgr/control/FindQuote" url-mode="inter-app"> <parameter param-name="partyId" from-field="partyId"/> <parameter param-name="externalLoginKey" from-field="externalLoginKey"/> - </link> + </link> </menu-item> <menu-item name="searchOrder" title="${uiLabelMap.OrderOrders}" > <condition> @@ -214,7 +215,7 @@ <parameter param-name="externalLoginKey" from-field="externalLoginKey"/> <parameter param-name="viewIndex" value="1"/> <parameter param-name="viewSize" value="20"/> - </link> + </link> </menu-item> <menu-item name="newQuote" title="${uiLabelMap.OrderNewQuote}"> <condition> @@ -223,7 +224,7 @@ <link target="/ordermgr/control/EditQuote" url-mode="inter-app"> <parameter param-name="partyId" from-field="partyId"/> <parameter param-name="externaLoginKey" from-field="externalLoginKey"/> - </link> + </link> </menu-item> <menu-item name="newOrder" title="${uiLabelMap.OrderNewOrder}"> <condition> @@ -232,7 +233,7 @@ <link target="/ordermgr/control/checkinits" url-mode="inter-app"> <parameter param-name="partyId" from-field="partyId"/> <parameter param-name="externaLoginKey" from-field="externalLoginKey"/> - </link> + </link> </menu-item> </menu> <menu name="create-new-party" type="simple" menu-container-style="basic-nav"> @@ -256,7 +257,7 @@ <link target="NewEmployee"/> </menu-item> </menu> - + <menu name="PartyInvitationTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="EditPartyInvitation" title="${uiLabelMap.PartyInvitation}"> <link target="editPartyInvitation"> @@ -274,7 +275,7 @@ </link> </menu-item> </menu> - + <menu name="personUpdate"> <menu-item name="update" title="${uiLabelMap.CommonUpdate}"> <link target="editperson"> @@ -282,7 +283,7 @@ </link> </menu-item> </menu> - + <menu name="groupUpdate"> <menu-item name="update" title="${uiLabelMap.CommonUpdate}"> <link target="editpartygroup"> @@ -290,7 +291,7 @@ </link> </menu-item> </menu> - + <menu name="addShipper"> <menu-item name="new" title="${uiLabelMap.CommonCreateNew}"> <condition> @@ -305,7 +306,7 @@ <menu-item name="newEmail" title="${uiLabelMap.PartyNewEmail}"> <condition> <if-has-permission permission="PARTYMGR_CME-EMAIL_CREATE"/> - </condition> + </condition> <link target="NewDraftCommunicationEvent"> <parameter param-name="communicationEventTypeId" value="EMAIL_COMMUNICATION"/> <parameter param-name="my" value="My"/> @@ -315,7 +316,7 @@ <menu-item name="newNote" title="${uiLabelMap.PartyNewInternalNote}"> <condition> <if-has-permission permission="PARTYMGR_CME-NOTE_CREATE"/> - </condition> + </condition> <link target="NewDraftCommunicationEvent"> <parameter param-name="communicationEventTypeId" value="COMMENT_NOTE"/> <parameter param-name="my" value="My"/> @@ -341,7 +342,7 @@ <parameter param-name="all" value="true"/> </link> </menu-item> - </menu> + </menu> <menu name="MyCommSubTabBar" menu-container-style="button-bar button-style-2"> <actions> <script location="component://party/webapp/partymgr/WEB-INF/actions/communication/GetMyCommunicationEventRole.groovy"/> @@ -489,12 +490,12 @@ <parameter param-name="communicationEventId" from-field="parameters.communicationEventId"/> </link> </menu-item> - <!-- TODO! + <!-- TODO! <menu-item name="ListCommCustRequests" title="CustRequests"> - <link target="ListCommCustRequests"> - <parameter param-name="partyId" from-field="partyId"/> - <parameter param-name="communicationEventId" from-field="communicationEventId"/> - </link> + <link target="ListCommCustRequests"> + <parameter param-name="partyId" from-field="partyId"/> + <parameter param-name="communicationEventId" from-field="communicationEventId"/> + </link> </menu-item> --> <menu-item name="ListUnknownPartyComms" title="${uiLabelMap.PartyEmailFromUnknownParties}"> @@ -522,7 +523,7 @@ </link> </menu-item> </menu> - + <menu name="CommSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" menu-container-style="button-bar button-style-2 no-clear"> <menu-item name="new" title="${uiLabelMap.PartyNewCommunication}"> @@ -592,5 +593,5 @@ </link> </menu-item> </menu> - + </menus> Modified: ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml?rev=762067&r1=762066&r2=762067&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/PromoScreens.xml Sun Apr 5 11:08:43 2009 @@ -18,7 +18,7 @@ under the License. --> -<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" +<screens xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/widget-screen.xsd"> <screen name="CommonPromoDecorator"> <section> @@ -40,7 +40,7 @@ <condition><not><if-empty field="productPromoId"/></not></condition> <widgets> <include-menu name="PromoTabBar" location="component://product/widget/catalog/Menus.xml"/> - + <container> <label style="h1">${uiLabelMap[labelTitleProperty]} ${uiLabelMap.CommonFor}: ${productPromo.promoName} [${uiLabelMap.CommonId}:${productPromoId}] ${${extraFunctionName}}</label> </container> @@ -55,7 +55,7 @@ <fail-widgets> <label style="h3">${uiLabelMap.ProductCatalogViewPermissionError}</label> </fail-widgets> - </section> + </section> </decorator-section> </decorator-screen> </widgets> @@ -67,7 +67,7 @@ <set field="titleProperty" value="PageTitleFindProductPromos"/> <set field="headerItem" value="promos"/> <set field="tabButtonItem" value="ProductPromo"/> - + <set field="userEntered" from-field="parameters.userEntered"/> <entity-condition entity-name="ProductPromo" list="productPromos"> <condition-expr field-name="userEntered" from-field="userEntered" ignore-if-empty="true"/> @@ -188,7 +188,7 @@ <condition-expr field-name="productPromoCondSeqId" value="_NA_"/> </condition-list> </entity-condition> - + <!-- General Data for Drop-downs, etc --> <entity-condition entity-name="Enumeration" list="inputParamEnums" use-cache="true"> <condition-expr field-name="enumTypeId" value="PROD_PROMO_IN_PARAM"/> @@ -292,14 +292,16 @@ <widgets> <container> <link target="FindProductPromoCode" text="${uiLabelMap.ProductPromotionManualImported}" style="buttontext"> - <parameter param-name="manualOnly=N&productPromoId" from-field="productPromoId"/> + <parameter param-name="manualOnly" value="N"/> + <parameter param-name="productPromoId" from-field="productPromoId"/> </link> </container> </widgets> <fail-widgets> <container> <link target="FindProductPromoCode" text="${uiLabelMap.ProductPromotionManual}" style="buttontext"> - <parameter param-name="manualOnly=Y&productPromoId" from-field="productPromoId"/> + <parameter param-name="manualOnly" value="Y"/> + <parameter param-name="productPromoId" from-field="productPromoId"/> </link> </container> </fail-widgets> @@ -325,7 +327,7 @@ </decorator-screen> </widgets> </section> - </screen> + </screen> <screen name="EditProductPromoCode"> <section> <actions> Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml?rev=762067&r1=762066&r2=762067&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml (original) +++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml Sun Apr 5 11:08:43 2009 @@ -140,8 +140,8 @@ </condition> <link target="custPreferences"/> </menu-item> - </menu> - + </menu> + <menu name="MyCompanyCommsMenu"> <menu-item name="newEvent" title="${uiLabelMap.WorkEffortNewEvent}"> <link target="newEvent"> @@ -153,22 +153,28 @@ <menu-item name="newEmail" title="${uiLabelMap.PartyNewEmail}"> <condition> <if-has-permission permission="PARTYMGR_CME-EMAIL_CREATE"/> - </condition> - <link - target="NewCommunicationEvent?communicationEventTypeId=EMAIL_COMMUNICATION&donePage=${parameters.donePage}&partyIdFrom=${userLogin.partyId}&statusId=COM_PENDING"/> + </condition> + <link target="NewCommunicationEvent"> + <parameter param-name="communicationEventTypeId" value="EMAIL_COMMUNICATION"/> + <parameter param-name="donePage" from-field="parameters.donePage"/> + <parameter param-name="partyIdFrom" from-field="userLogin.partyId"/> + <parameter param-name="statusId" value="COM_PENDING"/> + </link> </menu-item> <menu-item name="newNote" title="${uiLabelMap.PartyNewInternalNote}"> <condition> <if-has-permission permission="PARTYMGR_CME-NOTE_CREATE"/> - </condition> - <link - target="EditCommunicationEvent?communicationEventTypeId=COMMENT_NOTE&donePage=${parameters.donePage}" /> + </condition> + <link target="EditCommunicationEvent"> + <parameter param-name="communicationEventTypeId" value="COMMENT_NOTE"/> + <parameter param-name="donePage" from-field="parameters.donePage"/> + </link> </menu-item> <menu-item name="openEvents" title="${uiLabelMap.MyPageOpenEvents}"> <condition> <if-compare field="parameters.all" operator="equals" value="true" /> </condition> - <link target="${parameters.donePage}" > + <link target="${parameters.donePage}"> <parameter param-name="donePage" from-field="parameters.donePage"/> <parameter param-name="all" value="false"/> </link> @@ -180,17 +186,19 @@ <if-empty field="parameters.all"/> </or> </condition> - <link target="${parameters.donePage}" > + <link target="${parameters.donePage}"> <parameter param-name="donePage" from-field="parameters.donePage"/> <parameter param-name="all" value="true"/> </link> </menu-item> - </menu> - + </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="${uiLabelMap.MyPageTasks}"><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.MyPageToComplete}"> <condition> @@ -216,7 +224,9 @@ <parameter param-name="statusId" value="TIMESHEET_COMPLETED"/> </link> </menu-item> - <menu-item name="myTime" title="${uiLabelMap.WorkEffortTimesheetMyTime}"><link target="/projectmgr/control/MyTimesheet" url-mode="inter-app"/></menu-item> + <menu-item name="myTime" title="${uiLabelMap.WorkEffortTimesheetMyTime}"> + <link target="/projectmgr/control/MyTimesheet" url-mode="inter-app"/> + </menu-item> </menu> <menu name="CommSubTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" menu-container-style="button-bar button-style-2"> @@ -247,7 +257,8 @@ <if-has-permission permission="PARTYMGR_CME-NOTE_CREATE"/> </condition> <link target="EditCommunicationEvent"> - <parameter param-name="communicationEventTypeId=COMMENT_NOTE&donePage" from-field="parameters.donePage"/> + <parameter param-name="communicationEventTypeId" value="COMMENT_NOTE"/> + <parameter param-name="donePage" from-field="parameters.donePage"/> </link> </menu-item> <menu-item name="reply" title="${uiLabelMap.PartyReply}"> @@ -376,4 +387,4 @@ </link> </menu-item> </menu> -</menus> \ No newline at end of file +</menus> Modified: ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml?rev=762067&r1=762066&r2=762067&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml Sun Apr 5 11:08:43 2009 @@ -364,7 +364,7 @@ </property> <property key="PageTitleFindTimeSheet"> <value xml:lang="en">Find TimeSheet</value> - <value xml:lang="fr">Rechercher une feuilled'activitée</value> + <value xml:lang="fr">Rechercher une feuille d'activitée</value> <value xml:lang="it">Ricerca timbratura</value> <value xml:lang="th">à¸à¹à¸à¸«à¸²à¸à¸²à¸£à¸²à¸à¹à¸§à¸¥à¸²</value> <value xml:lang="zh">æ¥æ¾æ¶é´è¡¨</value> |
Free forum by Nabble | Edit this page |