From commitsjacobsonlaura@example.net Wed Apr 01 05:50:36 2009 Return-Path: <commitsjacobsonlaura@example.net> Delivered-To: jacobsonlaura@example.net Received: (qmail 47642 invoked from network); 1 Apr 2009 05:50:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Apr 2009 05:50:36 -0000 Received: (qmail 11785 invoked by uid 500); 1 Apr 2009 05:50:35 -0000 Delivered-To: jacobsonlaura@example.net Received: (qmail 11704 invoked by uid 500); 1 Apr 2009 05:50:35 -0000 Mailing-List: contact jacobsonlaura@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:jacobsonlaura@example.net> List-Unsubscribe: <mailto:jacobsonlaura@example.net> List-Post: <mailto:jacobsonlaura@example.net> List-Id: <commits.ofbiz.apache.org> Reply-To: jacobsonlaura@example.net Delivered-To: mailing list jacobsonlaura@example.net Received: (qmail 11695 invoked by uid 99); 1 Apr 2009 05:50:35 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Apr 2009 05:50:35 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Apr 2009 05:50:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 657142388A13; Wed, 1 Apr 2009 05:50:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r760787 - in /ofbiz/trunk: applications/accounting/widget/ applications/content/webapp/content/layout/ applications/content/widget/compdoc/ applications/order/widget/ordermgr/ applications/product/widget/catalog/ applications/product/widget... Date: Wed, 01 Apr 2009 05:50:08 -0000 To: jacobsonlaura@example.net From: jacobsonlaura@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <jacobsonlaura@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: jleroux Date: Wed Apr 1 05:50:07 2009 New Revision: 760787 URL: http://svn.apache.org/viewvc?rev=760787&view=rev Log: Securing URLs, link element in screens and menus : 10th set + tabs to 4 spaces Modified: ofbiz/trunk/applications/accounting/widget/AccountingTrees.xml ofbiz/trunk/applications/content/webapp/content/layout/LayoutMenus.xml ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml ofbiz/trunk/framework/bi/widget/BiScreens.xml ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml Modified: ofbiz/trunk/applications/accounting/widget/AccountingTrees.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AccountingTrees.xml?rev=760787&r1=760786&r2=760787&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/AccountingTrees.xml (original) +++ ofbiz/trunk/applications/accounting/widget/AccountingTrees.xml Wed Apr 1 05:50:07 2009 @@ -31,7 +31,10 @@ </node> <node name="node-body"> <entity-one entity-name="GlAccount" value-field="glAccount"></entity-one> - <link target="GlAccountNavigate?glAccountId=${glAccountId}&amp;trail=${currentNodeTrailPiped}" text="${glAccountId} ${glAccount.accountName} ${postedBalance}"/> + <link target="GlAccountNavigate" text="${glAccountId} ${glAccount.accountName} ${postedBalance}"> + <parameter param-name="glAccountId" from-field="glAccountId"/> + <parameter param-name="trail" from-field="currentNodeTrailPiped"/> + </link> <sub-node node-name="node-body"> <entity-and entity-name="GlAccount"> <field-map field-name="parentGlAccountId" from-field="glAccountId"/> Modified: ofbiz/trunk/applications/content/webapp/content/layout/LayoutMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/layout/LayoutMenus.xml?rev=760787&r1=760786&r2=760787&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/layout/LayoutMenus.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/layout/LayoutMenus.xml Wed Apr 1 05:50:07 2009 @@ -35,7 +35,10 @@ <not><if-empty field="parameters.drDataResourceId"/></not> </and> </condition> - <link target="EditLayout?contentId=${parameters.contentId}&amp;drDataResourceId=${parameters.drDataResourceId}" target-window="_top" style="tabButton" /> + <link target="EditLayout" target-window="_top" style="tabButton" > + <parameter param-name="contentId" from-field="parameters.contentId"/> + <parameter param-name="drDataResourceId" from-field="parameters.drDataResourceId"/> + </link> </menu-item> <menu-item name="EditLayoutSubContent" title="${uiLabelMap.ContentSubContent}" > <condition> @@ -44,7 +47,10 @@ <not><if-empty field="parameters.drDataResourceId"/></not> </and> </condition> - <link target="EditLayoutSubContent?contentId=${parameters.contentId}&amp;drDataResourceId=${parameters.drDataResourceId}" target-window="_top" style="tabButton" /> + <link target="EditLayoutSubContent" target-window="_top" style="tabButton" > + <parameter param-name="contentId" from-field="parameters.contentId"/> + <parameter param-name="drDataResourceId" from-field="parameters.drDataResourceId"/> + </link> </menu-item> <menu-item name="EditLayoutText" title="${uiLabelMap.ContentText}" > <condition> @@ -53,7 +59,10 @@ <not><if-empty field="parameters.drDataResourceId"/></not> </and> </condition> - <link target="EditLayoutText?contentId=${parameters.contentId}&amp;drDataResourceId=${parameters.drDataResourceId}" target-window="_top" style="tabButton" /> + <link target="EditLayoutText" target-window="_top" style="tabButton" > + <parameter param-name="contentId" from-field="parameters.contentId"/> + <parameter param-name="drDataResourceId" from-field="parameters.drDataResourceId"/> + </link> </menu-item> <menu-item name="EditLayoutHtml" title="${uiLabelMap.ContentHtml}" > <condition> @@ -62,7 +71,10 @@ <not><if-empty field="parameters.drDataResourceId"/></not> </and> </condition> - <link target="EditLayoutHtml?contentId=${parameters.contentId}&amp;drDataResourceId=${parameters.drDataResourceId}" target-window="_top" style="tabButton" /> + <link target="EditLayoutHtml" target-window="_top" style="tabButton" > + <parameter param-name="contentId" from-field="parameters.contentId"/> + <parameter param-name="drDataResourceId" from-field="parameters.drDataResourceId"/> + </link> </menu-item> <menu-item name="EditLayoutImage" title="${uiLabelMap.ContentImage}" > <condition> @@ -71,7 +83,10 @@ <not><if-empty field="parameters.drDataResourceId"/></not> </and> </condition> - <link target="EditLayoutImage?contentId=${parameters.contentId}&amp;drDataResourceId=${parameters.drDataResourceId}" target-window="_top" style="tabButton" /> + <link target="EditLayoutImage" target-window="_top" style="tabButton" > + <parameter param-name="contentId" from-field="parameters.contentId"/> + <parameter param-name="drDataResourceId" from-field="parameters.drDataResourceId"/> + </link> </menu-item> <menu-item name="EditLayoutUrl" title="${uiLabelMap.ContentUrl}" > <condition> @@ -80,7 +95,10 @@ <not><if-empty field="parameters.drDataResourceId"/></not> </and> </condition> - <link target="EditLayoutUrl?contentId=${parameters.contentId}&amp;drDataResourceId=${parameters.drDataResourceId}" target-window="_top" style="tabButton" /> + <link target="EditLayoutUrl" target-window="_top" style="tabButton" > + <parameter param-name="contentId" from-field="parameters.contentId"/> + <parameter param-name="drDataResourceId" from-field="parameters.drDataResourceId"/> + </link> </menu-item> </menu> </menus> \ No newline at end of file Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml?rev=760787&r1=760786&r2=760787&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml Wed Apr 1 05:50:07 2009 @@ -539,7 +539,10 @@ <section> <widgets> <container> - <link target="AddRootCompDocInstance?contentId=${rootContentId}&amp;contentRevisionSeqId=${rootContentRevisionSeqId}" text="${uiLabelMap.PageTitleCreateInstanceOfThisTemplate}" style="buttontext"/> + <link target="AddRootCompDocInstance" text="${uiLabelMap.PageTitleCreateInstanceOfThisTemplate}" style="buttontext"> + <parameter param-name="contentId" from-field="rootContentId"/> + <parameter param-name="contentRevisionSeqId" from-field="rootContentRevisionSeqId"/> + </link> <link target="ViewInstances?rootContentId=${rootContentId}&amp;contentRevisionSeqId=${rootContentRevisionSeqId}"/> </container> <include-form name="EditRootCompDocTemplate" location="component://content/widget/compdoc/CompDocForms.xml"/> @@ -1095,8 +1098,14 @@ <decorator-screen name="commonCompDocDecorator" location="component://content/widget/CommonScreens.xml"> <decorator-section name="body"> <container> - <link target="ViewInstances?rootContentId=${rootContentId}&amp;contentRevisionSeqId=${rootContentRevisionSeqId}" text="${uiLabelMap.ContentCompDocViewInstances}" style="buttontext"/> - <link target="AddRootCompDocInstance?rootContentId=${rootContentId}&amp;rootContentRevisionSeqId=${rootContentRevisionSeqId}" text="${uiLabelMap.PageTitleCreateInstanceOfThisTemplate}" style="buttontext"/> + <link target="ViewInstances" text="${uiLabelMap.ContentCompDocViewInstances}" style="buttontext"> + <parameter param-name="rootContentId" from-field="rootContentId"/> + <parameter param-name="contentRevisionSeqId" from-field="rootContentRevisionSeqId"/> + </link> + <link target="AddRootCompDocInstance" text="${uiLabelMap.PageTitleCreateInstanceOfThisTemplate}" style="buttontext"> + <parameter param-name="rootContentId" from-field="rootContentId"/> + <parameter param-name="rootContentRevisionSeqId" from-field="rootContentRevisionSeqId"/> + </link> </container> <include-tree name="CompDocTemplateTree" location="component://content/widget/compdoc/CompDocTemplateTree.xml"/> </decorator-section> Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml?rev=760787&r1=760786&r2=760787&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/RequestScreens.xml Wed Apr 1 05:50:07 2009 @@ -297,7 +297,10 @@ <section> <widgets> <container> - <link target="EditRequirement?custRequestId=${custRequestItem.custRequestId}&amp;custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}" text="${uiLabelMap.OrderNewRequirement}" style="buttontext"/> + <link target="EditRequirement" text="${uiLabelMap.OrderNewRequirement}" style="buttontext"> + <parameter param-name="custRequestId" from-field="custRequestItem.custRequestId"/> + <parameter param-name="custRequestItemSeqId" from-field="custRequestItem.custRequestItemSeqId"/> + </link> </container> <include-form name="ListRequestItemRequirements" location="component://order/webapp/ordermgr/request/RequestForms.xml"/> </widgets> Modified: ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml?rev=760787&r1=760786&r2=760787&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/CommonScreens.xml Wed Apr 1 05:50:07 2009 @@ -85,7 +85,10 @@ <link target="EditProduct" text="${uiLabelMap.ProductNewProduct}" style="buttontext"/> <link target="CreateVirtualWithVariantsForm" text="${uiLabelMap.ProductNewVirtualProduct}" style="buttontext"/> <link target="/ecommerce/control/product?product_id=${productId}" url-mode="inter-app" text="${uiLabelMap.ProductProductPage}" style="buttontext"/> - <link target="ProductBarCode.pdf?productId=${productId}&amp;productName=${productName}" target-window="_blank" text="${uiLabelMap.ProductBarcode}" style="buttontext"/> + <link target="ProductBarCode.pdf" target-window="_blank" text="${uiLabelMap.ProductBarcode}" style="buttontext"> + <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productName" from-field="productName"/> + </link> <link target="javascript:expandAll(true);" text="${uiLabelMap.CommonExpandAll}" style="buttontext" url-mode="plain"/> <link target="javascript:expandAll(false);" text="${uiLabelMap.CommonCollapseAll}" style="buttontext" url-mode="plain"/> Modified: ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml?rev=760787&r1=760786&r2=760787&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/FacilityScreens.xml Wed Apr 1 05:50:07 2009 @@ -897,7 +897,10 @@ </container> <container style="widget-container"> <link target="EditInventoryItem?facilityId=${facilityId}" text="${uiLabelMap.ProductNewInventoryItem}" style="buttontext"/> - <link target="TransferInventoryItem?inventoryItemId=${inventoryItemId}&amp;facilityId=${facilityId}" text="${uiLabelMap.ProductTransferItem}" style="buttontext"/> + <link target="TransferInventoryItem" text="${uiLabelMap.ProductTransferItem}" style="buttontext"> + <parameter param-name="inventoryItemId" from-field="inventoryItemId"/> + <parameter param-name="facilityId" from-field="facilityId"/> + </link> </container> </widgets> <fail-widgets> Modified: ofbiz/trunk/framework/bi/widget/BiScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/bi/widget/BiScreens.xml?rev=760787&r1=760786&r2=760787&view=diff ============================================================================== --- ofbiz/trunk/framework/bi/widget/BiScreens.xml (original) +++ ofbiz/trunk/framework/bi/widget/BiScreens.xml Wed Apr 1 05:50:07 2009 @@ -231,7 +231,10 @@ </label> </container> <container> - <link target="quickInitDataWarehouse?fromDate=${fromDate}&amp;thruDate=${thruDate}" text="${uiLabelMap.BusinessIntelligenceQuickInitDataWarehouse}" style="buttontext"/> + <link target="quickInitDataWarehouse" text="${uiLabelMap.BusinessIntelligenceQuickInitDataWarehouse}" style="buttontext"> + <parameter param-name="fromDate" from-field="fromDate"/> + <parameter param-name="thruDate" from-field="thruDate"/> + </link> <label> (${uiLabelMap.CommonFromDate} ${fromDate} ${uiLabelMap.CommonThruDate} ${thruDate})</label> </container> <container> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml?rev=760787&r1=760786&r2=760787&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/AssetmaintScreens.xml Wed Apr 1 05:50:07 2009 @@ -122,7 +122,10 @@ <widgets> <container style="button-bar"> <link target="EditFixedAssetMaint?fixedAssetId=${fixedAssetId}" text="${uiLabelMap.AccountingNewFixedAssetMaint}" style="buttontext"/> - <link target="printFixedAssetMaint.pdf?fixedAssetId=${fixedAssetId}&amp;maintHistSeqId=${maintHistSeqId}" text="${uiLabelMap.CommonPrint}" style="buttontext"/> + <link target="printFixedAssetMaint.pdf" text="${uiLabelMap.CommonPrint}" style="buttontext"> + <parameter param-name="fixedAssetId" from-field="fixedAssetId"/> + <parameter param-name="maintHistSeqId" from-field="maintHistSeqId"/> + </link> </container> </widgets> </section> Modified: ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml?rev=760787&r1=760786&r2=760787&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ebay/widget/EbayScreens.xml Wed Apr 1 05:50:07 2009 @@ -73,7 +73,10 @@ <link target="EditProduct" text="${uiLabelMap.ProductNewProduct}" style="buttontext"/> <link target="CreateVirtualWithVariantsForm" text="${uiLabelMap.ProductNewVirtualProduct}" style="buttontext"/> <link target="/ecommerce/control/product?product_id=${productId}" url-mode="inter-app" text="${uiLabelMap.ProductProductPage}" style="buttontext"/> - <link target="ProductBarCode.pdf?productId=${productId}&amp;productName=${productName}" target-window="_blank" text="${uiLabelMap.ProductBarcode}" style="buttontext"/> + <link target="ProductBarCode.pdf" target-window="_blank" text="${uiLabelMap.ProductBarcode}" style="buttontext"> + <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productName" from-field="productName"/> + </link> </container> </widgets> </section> Modified: ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml?rev=760787&r1=760786&r2=760787&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml (original) +++ ofbiz/trunk/specialpurpose/googlebase/widget/GoogleBaseScreens.xml Wed Apr 1 05:50:07 2009 @@ -102,7 +102,10 @@ <link target="EditProduct" text="${uiLabelMap.ProductNewProduct}" style="buttontext"/> <link target="CreateVirtualWithVariantsForm" text="${uiLabelMap.ProductNewVirtualProduct}" style="buttontext"/> <link target="/ecommerce/control/product?product_id=${productId}" url-mode="inter-app" text="${uiLabelMap.ProductProductPage}" style="buttontext"/> - <link target="ProductBarCode.pdf?productId=${productId}&amp;productName=${productName}" target-window="_blank" text="${uiLabelMap.ProductBarcode}" style="buttontext"/> + <link target="ProductBarCode.pdf" target-window="_blank" text="${uiLabelMap.ProductBarcode}" style="buttontext"> + <parameter param-name="productId" from-field="productId"/> + <parameter param-name="productName" from-field="productName"/> + </link> </container> </widgets> </section> From commitsjacobsonlaura@example.net Wed Apr 01 06:16:42 2009 Return-Path: <commitsjacobsonlaura@example.net> Delivered-To: jacobsonlaura@example.net Received: (qmail 67573 invoked from network); 1 Apr 2009 06:16:42 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Apr 2009 06:16:42 -0000 Received: (qmail 29275 invoked by uid 500); 1 Apr 2009 06:16:42 -0000 Delivered-To: jacobsonlaura@example.net Received: (qmail 29195 invoked by uid 500); 1 Apr 2009 06:16:41 -0000 Mailing-List: contact jacobsonlaura@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:jacobsonlaura@example.net> List-Unsubscribe: <mailto:jacobsonlaura@example.net> List-Post: <mailto:jacobsonlaura@example.net> List-Id: <commits.ofbiz.apache.org> Reply-To: jacobsonlaura@example.net Delivered-To: mailing list jacobsonlaura@example.net Received: (qmail 29186 invoked by uid 99); 1 Apr 2009 06:16:41 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Apr 2009 06:16:41 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Apr 2009 06:16:38 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id C8DD62388A13; Wed, 1 Apr 2009 06:16:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r760789 - in /ofbiz/trunk: applications/accounting/widget/ applications/content/webapp/content/cms/ applications/content/widget/compdoc/ applications/content/widget/content/ applications/content/widget/forum/ applications/marketing/widget/s... Date: Wed, 01 Apr 2009 06:16:11 -0000 To: jacobsonlaura@example.net From: jacobsonlaura@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <jacobsonlaura@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: jleroux Date: Wed Apr 1 06:16:07 2009 New Revision: 760789 URL: http://svn.apache.org/viewvc?rev=760789&view=rev Log: Securing URLs, link element in screens and menus : 11th set + tabs to 4 spaces Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml ofbiz/trunk/applications/accounting/widget/TaxAuthorityMenus.xml ofbiz/trunk/applications/content/webapp/content/cms/CMSMenus.xml ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml ofbiz/trunk/applications/content/widget/content/ContentMenus.xml ofbiz/trunk/applications/content/widget/forum/ForumMenus.xml ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml ofbiz/trunk/applications/order/widget/ordermgr/RequestMenus.xml ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml ofbiz/trunk/applications/product/widget/facility/Menus.xml ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml ofbiz/trunk/framework/example/widget/example/ExampleMenus.xml ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/Menus.xml ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogMenus.xml ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogScreens.xml ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Modified: ofbiz/trunk/applications/accounting/widget/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/Menus.xml?rev=760789&r1=760788&r2=760789&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/Menus.xml (original) +++ ofbiz/trunk/applications/accounting/widget/Menus.xml Wed Apr 1 06:16:07 2009 @@ -148,7 +148,10 @@ <if-compare-field field="invoice.currencyUomId" operator="not-equals" to-field="defaultOrganizationPartyCurrencyUomId"/> </and> </condition> - <link target="invoice.pdf?invoiceId=${invoice.invoiceId}&amp;currency=${defaultOrganizationPartyCurrencyUomId}" target-window="_BLANK"/> + <link target="invoice.pdf" target-window="_BLANK"> + <parameter param-name="invoiceId" from-field="invoice.invoiceId"/> + <parameter param-name="currency" from-field="defaultOrganizationPartyCurrencyUomId"/> + </link> </menu-item> <menu-item name="statusToApproved" title="${uiLabelMap.AccountingInvoiceStatusToApproved}"> <condition> @@ -263,7 +266,10 @@ </or> </and> </condition> - <link target="copyInvoiceToTemplate?invoiceId=${invoice.invoiceId}&amp;invoiceTypeId=${invoice.invoiceTypeId}"/> + <link target="copyInvoiceToTemplate"> + <parameter param-name="invoiceId" from-field="invoice.invoiceId"/> + <parameter param-name="invoiceTypeId" from-field="invoice.invoiceTypeId"/> + </link> </menu-item> </menu> @@ -375,7 +381,10 @@ <menu name="FixedAssetMaintTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" selected-menuitem-context-field-name="tabButtonItemFixedAssetMaint" default-menu-item-name="EditFixedAssetMaint"> <menu-item name="EditFixedAssetMaint" title="${uiLabelMap.AccountingFixedAssetMaint}"> - <link target="EditFixedAssetMaint?fixedAssetId=${fixedAssetMaint.fixedAssetId}&amp;maintHistSeqId=${fixedAssetMaint.maintHistSeqId}"/> + <link target="EditFixedAssetMaint"> + <parameter param-name="fixedAssetId" from-field="fixedAssetMaint.fixedAssetId"/> + <parameter param-name="maintHistSeqId" from-field="fixedAssetMaint.maintHistSeqId"/> + </link> </menu-item> <menu-item name="EditFixedAssetMeters" title="${uiLabelMap.AccountingFixedAssetMeters}"> <link target="EditFixedAssetMeters"> @@ -385,7 +394,10 @@ </link> </menu-item> <menu-item name="EditFixedAssetMaintOrders" title="${uiLabelMap.AccountingFixedAssetMaintOrders}"> - <link target="EditFixedAssetMaintOrders?fixedAssetId=${fixedAssetMaint.fixedAssetId}&amp;maintHistSeqId=${fixedAssetMaint.maintHistSeqId}"/> + <link target="EditFixedAssetMaintOrders"> + <parameter param-name="fixedAssetId" from-field="fixedAssetMaint.fixedAssetId"/> + <parameter param-name="maintHistSeqId" from-field="fixedAssetMaint.maintHistSeqId"/> + </link> </menu-item> </menu> @@ -395,7 +407,10 @@ <link target="EditFixedAsset?fixedAssetId=${fixedAssetId}"/> </menu-item> <menu-item name="FixedAssetChildren" title="${uiLabelMap.CommonEntityChildren}"> - <link target="FixedAssetChildren?fixedAssetId=${fixedAssetId}&amp;trail=${fixedAssetId}"/> + <link target="FixedAssetChildren"> + <parameter param-name="fixedAssetId" from-field="fixedAssetId"/> + <parameter param-name="trail" from-field="fixedAssetId"/> + </link> </menu-item> <menu-item name="ListFixedAssetProducts" title="${uiLabelMap.AccountingFixedAssetProducts}"> <link target="ListFixedAssetProducts?fixedAssetId=${fixedAssetId}"/> @@ -632,34 +647,55 @@ <menu name="AgreementItemTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" selected-menuitem-context-field-name="buttonBarItem"> <menu-item name="EditAgreementItem" title="${uiLabelMap.AccountingAgreementItem}"> - <link target="EditAgreementItem?agreementId=${agreementItem.agreementId}&amp;agreementItemSeqId=${agreementItem.agreementItemSeqId}"/> + <link target="EditAgreementItem"> + <parameter param-name="agreementId" from-field="agreementItem.agreementId"/> + <parameter param-name="agreementItemSeqId" from-field="agreementItem.agreementItemSeqId"/> + </link> </menu-item> <menu-item name="ListAgreementPromoAppls" title="${uiLabelMap.AccountingAgreementPromoAppls}"> - <link target="ListAgreementPromoAppls?agreementId=${agreementItem.agreementId}&amp;agreementItemSeqId=${agreementItem.agreementItemSeqId}"/> + <link target="ListAgreementPromoAppls"> + <parameter param-name="agreementId" from-field="agreementItem.agreementId"/> + <parameter param-name="agreementItemSeqId" from-field="agreementItem.agreementItemSeqId"/> + </link> </menu-item> <menu-item name="ListAgreementItemTerms" title="${uiLabelMap.AccountingAgreementItemTerms}"> - <link target="ListAgreementItemTerms?agreementId=${agreementItem.agreementId}&amp;agreementItemSeqId=${agreementItem.agreementItemSeqId}"/> + <link target="ListAgreementItemTerms"> + <parameter param-name="agreementId" from-field="agreementItem.agreementId"/> + <parameter param-name="agreementItemSeqId" from-field="agreementItem.agreementItemSeqId"/> + </link> </menu-item> <menu-item name="ListAgreementItemSupplierProducts" title="${uiLabelMap.ProductProducts}"> <condition> <if-compare field="agreement.agreementTypeId" operator="equals" value="PURCHASE_AGREEMENT"/> </condition> - <link target="ListAgreementItemSupplierProducts?agreementId=${agreementItem.agreementId}&amp;agreementItemSeqId=${agreementItem.agreementItemSeqId}"/> + <link target="ListAgreementItemSupplierProducts"> + <parameter param-name="agreementId" from-field="agreementItem.agreementId"/> + <parameter param-name="agreementItemSeqId" from-field="agreementItem.agreementItemSeqId"/> + </link> </menu-item> <menu-item name="ListAgreementItemProducts" title="${uiLabelMap.ProductProducts}"> <condition> <if-compare field="agreement.agreementTypeId" operator="not-equals" value="PURCHASE_AGREEMENT"/> </condition> - <link target="ListAgreementItemProducts?agreementId=${agreementItem.agreementId}&amp;agreementItemSeqId=${agreementItem.agreementItemSeqId}"/> + <link target="ListAgreementItemProducts"> + <parameter param-name="agreementId" from-field="agreementItem.agreementId"/> + <parameter param-name="agreementItemSeqId" from-field="agreementItem.agreementItemSeqId"/> + </link> </menu-item> <menu-item name="ListAgreementItemParties" title="${uiLabelMap.Party}"> - <link target="ListAgreementItemParties?agreementId=${agreementItem.agreementId}&amp;agreementItemSeqId=${agreementItem.agreementItemSeqId}"/> + <link target="ListAgreementItemParties"> + <parameter param-name="agreementId" from-field="agreementItem.agreementId"/> + <parameter param-name="agreementItemSeqId" from-field="agreementItem.agreementItemSeqId"/> + </link> </menu-item> <menu-item name="ListAgreementGeographicalApplic" title="${uiLabelMap.CommonGeo}"> - <link target="ListAgreementGeographicalApplic?agreementId=${agreementItem.agreementId}&amp;agreementItemSeqId=${agreementItem.agreementItemSeqId}"/> + <link target="ListAgreementGeographicalApplic"> + <parameter param-name="agreementId" from-field="agreementItem.agreementId"/> + <parameter param-name="agreementItemSeqId" from-field="agreementItem.agreementItemSeqId"/> + </link> </menu-item> </menu> Modified: ofbiz/trunk/applications/accounting/widget/TaxAuthorityMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/TaxAuthorityMenus.xml?rev=760789&r1=760788&r2=760789&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/TaxAuthorityMenus.xml (original) +++ ofbiz/trunk/applications/accounting/widget/TaxAuthorityMenus.xml Wed Apr 1 06:16:07 2009 @@ -23,23 +23,41 @@ default-menu-item-name="EditTaxAuthority"> <menu-item name="EditTaxAuthority" title="${uiLabelMap.AccountingTaxAuthority}"> - <link target="EditTaxAuthority?taxAuthPartyId=${taxAuthPartyId}&amp;taxAuthGeoId=${taxAuthGeoId}"/> + <link target="EditTaxAuthority"> + <parameter param-name="taxAuthPartyId" from-field="taxAuthPartyId"/> + <parameter param-name="taxAuthGeoId" from-field="taxAuthGeoId"/> + </link> </menu-item> <menu-item name="EditTaxAuthorityCategories" title="${uiLabelMap.ProductCategories}"> - <link target="EditTaxAuthorityCategories?taxAuthPartyId=${taxAuthPartyId}&amp;taxAuthGeoId=${taxAuthGeoId}"/> + <link target="EditTaxAuthorityCategories"> + <parameter param-name="taxAuthPartyId" from-field="taxAuthPartyId"/> + <parameter param-name="taxAuthGeoId" from-field="taxAuthGeoId"/> + </link> </menu-item> <menu-item name="EditTaxAuthorityAssocs" title="${uiLabelMap.CommonAssocs}"> - <link target="EditTaxAuthorityAssocs?taxAuthPartyId=${taxAuthPartyId}&amp;taxAuthGeoId=${taxAuthGeoId}"/> + <link target="EditTaxAuthorityAssocs"> + <parameter param-name="taxAuthPartyId" from-field="taxAuthPartyId"/> + <parameter param-name="taxAuthGeoId" from-field="taxAuthGeoId"/> + </link> </menu-item> <menu-item name="EditTaxAuthorityGlAccounts" title="${uiLabelMap.AccountingGlAccs}"> - <link target="EditTaxAuthorityGlAccounts?taxAuthPartyId=${taxAuthPartyId}&amp;taxAuthGeoId=${taxAuthGeoId}"/> + <link target="EditTaxAuthorityGlAccounts"> + <parameter param-name="taxAuthPartyId" from-field="taxAuthPartyId"/> + <parameter param-name="taxAuthGeoId" from-field="taxAuthGeoId"/> + </link> </menu-item> <menu-item name="EditTaxAuthorityRateProducts" title="${uiLabelMap.AccountingProductRates}"> - <link target="EditTaxAuthorityRateProducts?taxAuthPartyId=${taxAuthPartyId}&amp;taxAuthGeoId=${taxAuthGeoId}"/> + <link target="EditTaxAuthorityRateProducts"> + <parameter param-name="taxAuthPartyId" from-field="taxAuthPartyId"/> + <parameter param-name="taxAuthGeoId" from-field="taxAuthGeoId"/> + </link> </menu-item> <menu-item name="ListTaxAuthorityParties" title="${uiLabelMap.PartyParties}"> - <link target="ListTaxAuthorityParties?taxAuthPartyId=${taxAuthPartyId}&amp;taxAuthGeoId=${taxAuthGeoId}"/> + <link target="ListTaxAuthorityParties"> + <parameter param-name="taxAuthPartyId" from-field="taxAuthPartyId"/> + <parameter param-name="taxAuthGeoId" from-field="taxAuthGeoId"/> + </link> </menu-item> </menu> </menus> Modified: ofbiz/trunk/applications/content/webapp/content/cms/CMSMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/cms/CMSMenus.xml?rev=760789&r1=760788&r2=760789&view=diff ============================================================================== --- ofbiz/trunk/applications/content/webapp/content/cms/CMSMenus.xml (original) +++ ofbiz/trunk/applications/content/webapp/content/cms/CMSMenus.xml Wed Apr 1 06:16:07 2009 @@ -55,7 +55,10 @@ </link> </menu-item> <menu-item name="contentedit" title="${uiLabelMap.CommonEdit}" > - <link id="CMSContentEdit" target="CMSContentEdit?contentId=${content.currentValue.contentId}&amp;dataResourceId=${content.currentValue.dataResourceId}"/> + <link id="CMSContentEdit" target="CMSContentEdit"> + <parameter param-name="contentId" from-field="content.currentValue.contentId"/> + <parameter param-name="dataResourceId" from-field="content.currentValue.dataResourceId"/> + </link> </menu-item> <menu-item name="contentadd" title="${uiLabelMap.CommonAdd}" > <link id="CMSContentAdd" target="CMSContentAdd"> Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml?rev=760789&r1=760788&r2=760789&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml (original) +++ ofbiz/trunk/applications/content/widget/compdoc/CompDocMenus.xml Wed Apr 1 06:16:07 2009 @@ -41,7 +41,10 @@ <if-compare value="TEMPLATE" field="contentTypeId" operator="equals"></if-compare> </or> </condition> - <link target="ViewCompDocTemplateTree?rootContentId=${rootContentId}&amp;rootContentRevisionSeqId=${rootContentRevisionSeqId}"/> + <link target="ViewCompDocTemplateTree"> + <parameter param-name="rootContentId" from-field="rootContentId"/> + <parameter param-name="rootContentRevisionSeqId" from-field="rootContentRevisionSeqId"/> + </link> </menu-item> <menu-item name="viewtree2" title="${uiLabelMap.ContentCompDocViewTree}"> <condition> @@ -50,16 +53,28 @@ <if-compare value="DOCUMENT" field="contentTypeId" operator="equals"></if-compare> </or> </condition> - <link target="ViewCompDocInstanceTree?rootContentId=${rootContentId}&amp;rootContentRevisionSeqId=${rootContentRevisionSeqId}"/> + <link target="ViewCompDocInstanceTree"> + <parameter param-name="rootContentId" from-field="rootContentId"/> + <parameter param-name="rootContentRevisionSeqId" from-field="rootContentRevisionSeqId"/> + </link> </menu-item> <menu-item name="edit" title="${uiLabelMap.CommonEdit}"> - <link target="EditRootCompDoc?rootContentId=${rootContentId}&amp;contentRevisionSeqId=${rootContentRevisionSeqId}"/> + <link target="EditRootCompDoc"> + <parameter param-name="rootContentId" from-field="rootContentId"/> + <parameter param-name="contentRevisionSeqId" from-field="rootContentRevisionSeqId"/> + </link> </menu-item> <menu-item name="approval" title="${uiLabelMap.ContentCompDocApprovals}"> - <link target="ListContentApproval?rootContentId=${rootContentId}&amp;rootContentRevisionSeqId=${rootContentRevisionSeqId}"/> + <link target="ListContentApproval"> + <parameter param-name="rootContentId" from-field="rootContentId"/> + <parameter param-name="rootContentRevisionSeqId" from-field="rootContentRevisionSeqId"/> + </link> </menu-item> <menu-item name="revision" title="${uiLabelMap.ContentCompDocRevisions}"> - <link target="ListContentRevisions?rootContentId=${rootContentId}&amp;rootContentRevisionSeqId=${rootContentRevisionSeqId}"/> + <link target="ListContentRevisions"> + <parameter param-name="rootContentId" from-field="rootContentId"/> + <parameter param-name="rootContentRevisionSeqId" from-field="rootContentRevisionSeqId"/> + </link> </menu-item> </menu> @@ -72,7 +87,10 @@ <if-compare value="TEMPLATE" field="contentTypeId" operator="equals"></if-compare> </or> </condition> - <link target="ViewCompDocTemplateTree?rootContentId=${rootContentId}&amp;rootContentRevisionSeqId=${rootContentRevisionSeqId}"/> + <link target="ViewCompDocTemplateTree"> + <parameter param-name="rootContentId" from-field="rootContentId"/> + <parameter param-name="rootContentRevisionSeqId" from-field="rootContentRevisionSeqId"/> + </link> </menu-item> <menu-item name="viewtree2" title="${uiLabelMap.PageTitleViewCompDocTree}"> <condition> @@ -81,7 +99,10 @@ <if-compare value="DOCUMENT" field="contentTypeId" operator="equals"></if-compare> </or> </condition> - <link target="ViewCompDocInstanceTree?rootContentId=${rootContentId}&amp;rootContentRevisionSeqId=${rootContentRevisionSeqId}"/> + <link target="ViewCompDocInstanceTree"> + <parameter param-name="rootContentId" from-field="rootContentId"/> + <parameter param-name="rootContentRevisionSeqId" from-field="rootContentRevisionSeqId"/> + </link> </menu-item> <menu-item name="edit" title="${uiLabelMap.CommonEdit}"> <link target="EditChildCompDoc" > @@ -97,10 +118,16 @@ <menu name="rootTemplateLine" menu-container-style="button-bar button-style-1" default-menu-item-name="content" selected-menuitem-context-field-name="currentMenuItemName" title="" type="simple"> <menu-item name="edit-inplace" title="${contentName}[${contentId}]" widget-style="h2"> - <link target="EditRootCompDoc?rootContentId=${rootContentId}&amp;contentRevisionSeqId=${rootContentRevisionSeqId}"/> + <link target="EditRootCompDoc"> + <parameter param-name="rootContentId" from-field="rootContentId"/> + <parameter param-name="contentRevisionSeqId" from-field="rootContentRevisionSeqId"/> + </link> </menu-item> <menu-item name="edit-link" title="${uiLabelMap.CommonEdit}"> - <link target="EditRootCompDoc?rootContentId=${rootContentId}&amp;contentRevisionSeqId=${rootContentRevisionSeqId}"/> + <link target="EditRootCompDoc"> + <parameter param-name="rootContentId" from-field="rootContentId"/> + <parameter param-name="contentRevisionSeqId" from-field="rootContentRevisionSeqId"/> + </link> </menu-item> <menu-item name="child" title="${uiLabelMap.ContentCompDocChild}"> <condition> @@ -116,10 +143,16 @@ </menu-item> <!-- on page <menu-item name="viewinst" title="View Instances"> - <link target="ViewInstances?rootContentId=${rootContentId}&amp;contentRevisionSeqId=${rootContentRevisionSeqId}"/> + <link target="ViewInstances"> + <parameter param-name="rootContentId" from-field="rootContentId"/> + <parameter param-name="contentRevisionSeqId" from-field="rootContentRevisionSeqId"/> + </link> </menu-item> <menu-item name="addinst" title="Add Instance"> - <link target="AddRootCompDocInstance?rootContentId=${rootContentId}&amp;contentRevisionSeqId=${rootContentRevisionSeqId}"/> + <link target="AddRootCompDocInstance"> + <parameter param-name="rootContentId" from-field="rootContentId"/> + <parameter param-name="contentRevisionSeqId" from-field="rootContentRevisionSeqId"/> + </link> </menu-item> --> </menu> @@ -206,13 +239,22 @@ <menu name="rootInstanceLine" menu-container-style="button-bar button-style-1" default-menu-item-name="content" selected-menuitem-context-field-name="currentMenuItemName" title="" type="simple"> <menu-item name="edit-inplace" title="${instanceContent.contentName}[${instanceContent.contentId}]" widget-style="h2"> - <link target="EditRootCompDoc?rootContentId=${rootContentId}&amp;contentRevisionSeqId=${rootContentRevisionSeqId}"/> + <link target="EditRootCompDoc"> + <parameter param-name="rootContentId" from-field="rootContentId"/> + <parameter param-name="contentRevisionSeqId" from-field="rootContentRevisionSeqId"/> + </link> </menu-item> <menu-item name="edit" title="${uiLabelMap.CommonEdit}"> - <link target="EditRootCompDoc?rootContentId=${rootContentId}&amp;contentRevisionSeqId=${rootContentRevisionSeqId}"/> + <link target="EditRootCompDoc"> + <parameter param-name="rootContentId" from-field="rootContentId"/> + <parameter param-name="contentRevisionSeqId" from-field="rootContentRevisionSeqId"/> + </link> </menu-item> <menu-item name="viewtree" title="${uiLabelMap.PageTitleViewCompDocTemplateTree}"> - <link target="ViewCompDocTemplateTree?rootContentRevisionSeqId=${templateContentRevisionSeqId}&amp;rootContentId=${templateContentId}"/> + <link target="ViewCompDocTemplateTree"> + <parameter param-name="rootContentRevisionSeqId" from-field="templateContentRevisionSeqId"/> + <parameter param-name="rootContentId" from-field="templateContentId"/> + </link> </menu-item> <menu-item name="latest" title="${uiLabelMap.ContentCompDocCurrentInstance}"> <condition> Modified: ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml?rev=760789&r1=760788&r2=760789&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/compdoc/CompDocScreens.xml Wed Apr 1 06:16:07 2009 @@ -543,7 +543,10 @@ <parameter param-name="contentId" from-field="rootContentId"/> <parameter param-name="contentRevisionSeqId" from-field="rootContentRevisionSeqId"/> </link> - <link target="ViewInstances?rootContentId=${rootContentId}&amp;contentRevisionSeqId=${rootContentRevisionSeqId}"/> + <link target="ViewInstances"> + <parameter param-name="rootContentId" from-field="rootContentId"/> + <parameter param-name="contentRevisionSeqId" from-field="rootContentRevisionSeqId"/> + </link> </container> <include-form name="EditRootCompDocTemplate" location="component://content/widget/compdoc/CompDocForms.xml"/> </widgets> @@ -1197,7 +1200,10 @@ </and> </condition> <widgets> - <link text="${uiLabelMap.ContentCompDocStartApprovalProcess}" target="prepForApproval?rootContentId=${rootContentId}&amp;rootContentRevisionSeqId=${rootContentRevisionSeqId}" style="buttontext"/> + <link text="${uiLabelMap.ContentCompDocStartApprovalProcess}" target="prepForApproval" style="buttontext"> + <parameter param-name="rootContentId" from-field="rootContentId"/> + <parameter param-name="rootContentRevisionSeqId" from-field="rootContentRevisionSeqId"/> + </link> </widgets> </section> </container> Modified: ofbiz/trunk/applications/content/widget/content/ContentMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/content/ContentMenus.xml?rev=760789&r1=760788&r2=760789&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/content/ContentMenus.xml (original) +++ ofbiz/trunk/applications/content/widget/content/ContentMenus.xml Wed Apr 1 06:16:07 2009 @@ -171,10 +171,16 @@ <link target="blogContent?blogContentId=${parameters.blogContentId}"/> </menu-item> <menu-item name="ViewBlogArt" title="${uiLabelMap.CommonView}"> - <link target="ViewBlogArticle?articleContentId=${parameters.articleContentId}&amp;blogContentId=${parameters.blogContentId}"/> + <link target="ViewBlogArticle"> + <parameter param-name="articleContentId" from-field="parameters.articleContentId"/> + <parameter param-name="blogContentId" from-field="parameters.blogContentId"/> + </link> </menu-item> <menu-item name="EditBlogArt" title="${uiLabelMap.CommonEdit}"> - <link target="EditBlogArticle?articleContentId=${parameters.articleContentId}&amp;blogContentId=${parameters.blogContentId}"/> + <link target="EditBlogArticle"> + <parameter param-name="articleContentId" from-field="parameters.articleContentId"/> + <parameter param-name="blogContentId" from-field="parameters.blogContentId"/> + </link> </menu-item> <menu-item name="Owners" title="${uiLabelMap.FormFieldTitle_roles}"> <link target="EditContentRole?contentId=${parameters.articleContentId}"/> Modified: ofbiz/trunk/applications/content/widget/forum/ForumMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/forum/ForumMenus.xml?rev=760789&r1=760788&r2=760789&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/forum/ForumMenus.xml (original) +++ ofbiz/trunk/applications/content/widget/forum/ForumMenus.xml Wed Apr 1 06:16:07 2009 @@ -31,7 +31,17 @@ <menu name="ForumMessagesTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="forumGroups" title="${uiLabelMap.FormFieldTitle_forumGroups}"><link target="findForumGroups"/></menu-item> <menu-item name="forums" title="${uiLabelMap.FormFieldTitle_forums}"><link target="findForums?forumGroupId=${parameters.forumGroupId}"/></menu-item> - <menu-item name="messageList" title="${uiLabelMap.FormFieldTitle_messageList}"><link target="findForumMessages?forumGroupId=${parameters.forumGroupId}&amp;forumId=${parameters.forumId}"/></menu-item> - <menu-item name="messageThread" title="${uiLabelMap.FormFieldTitle_messageThread}"><link target="findForumThreads?forumGroupId=${parameters.forumGroupId}&amp;forumId=${parameters.forumId}"/></menu-item> + <menu-item name="messageList" title="${uiLabelMap.FormFieldTitle_messageList}"> + <link target="findForumMessages"> + <parameter param-name="forumGroupId" from-field="parameters.forumGroupId"/> + <parameter param-name="forumId" from-field="parameters.forumId"/> + </link> + </menu-item> + <menu-item name="messageThread" title="${uiLabelMap.FormFieldTitle_messageThread}"> + <link target="findForumThreads"> + <parameter param-name="forumGroupId" from-field="parameters.forumGroupId"/> + <parameter param-name="forumId" from-field="parameters.forumId"/> + </link> + </menu-item> </menu> </menus> Modified: ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml?rev=760789&r1=760788&r2=760789&view=diff ============================================================================== --- ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml (original) +++ ofbiz/trunk/applications/marketing/widget/sfa/SfaMenus.xml Wed Apr 1 06:16:07 2009 @@ -52,16 +52,28 @@ <menu name="LeadTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="profile" title="${uiLabelMap.PartyProfile}"> - <link target="viewprofile?partyId=${parameters.partyId}&amp;partyGroupId=${parameters.partyGroupId}"/> + <link target="viewprofile"> + <parameter param-name="partyId" from-field="parameters.partyId"/> + <parameter param-name="partyGroupId" from-field="parameters.partyGroupId"/> + </link> </menu-item> <menu-item name="ConvertLead" title="${uiLabelMap.SfaConvertLead}"> - <link target="ConvertLead?partyId=${parameters.partyId}&amp;partyGroupId=${parameters.partyGroupId}"/> + <link target="ConvertLead"> + <parameter param-name="partyId" from-field="parameters.partyId"/> + <parameter param-name="partyGroupId" from-field="parameters.partyGroupId"/> + </link> </menu-item> <menu-item name="CloneLead" title="${uiLabelMap.SfaCloneLead}"> - <link target="CloneLead?partyId=${parameters.partyId}&amp;partyGroupId=${parameters.partyGroupId}"/> + <link target="CloneLead"> + <parameter param-name="partyId" from-field="parameters.partyId"/> + <parameter param-name="partyGroupId" from-field="parameters.partyGroupId"/> + </link> </menu-item> <menu-item name="MergeLeads" title="${uiLabelMap.SfaMergeLeads}"> - <link target="MergeLeads?partyId=${parameters.partyId}&amp;partyGroupId=${parameters.partyGroupId}"/> + <link target="MergeLeads"> + <parameter param-name="partyId" from-field="parameters.partyId"/> + <parameter param-name="partyGroupId" from-field="parameters.partyGroupId"/> + </link> </menu-item> </menu> Modified: ofbiz/trunk/applications/order/widget/ordermgr/RequestMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/widget/ordermgr/RequestMenus.xml?rev=760789&r1=760788&r2=760789&view=diff ============================================================================== --- ofbiz/trunk/applications/order/widget/ordermgr/RequestMenus.xml (original) +++ ofbiz/trunk/applications/order/widget/ordermgr/RequestMenus.xml Wed Apr 1 06:16:07 2009 @@ -58,16 +58,28 @@ <menu name="editrequestitemmenu" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> <menu-item name="requestitem" title="${uiLabelMap.OrderRequestItem}"> - <link id="requestitem" target="requestitem?custRequestId=${custRequest.custRequestId}&amp;custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}"/> + <link id="requestitem" target="requestitem"> + <parameter param-name="custRequestId" from-field="custRequest.custRequestId"/> + <parameter param-name="custRequestItemSeqId" from-field="custRequestItem.custRequestItemSeqId"/> + </link> </menu-item> <menu-item name="requestitemnotes" title="${uiLabelMap.OrderRequestItemNotes}"> - <link id="requestitemnotes" target="requestitemnotes?custRequestId=${custRequest.custRequestId}&amp;custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}"/> + <link id="requestitemnotes" target="requestitemnotes"> + <parameter param-name="custRequestId" from-field="custRequest.custRequestId"/> + <parameter param-name="custRequestItemSeqId" from-field="custRequestItem.custRequestItemSeqId"/> + </link> </menu-item> <menu-item name="requestitemquotes" title="${uiLabelMap.OrderRequestItemQuotes}"> - <link id="requestitemquotes" target="RequestItemQuotes?custRequestId=${custRequest.custRequestId}&amp;custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}"/> + <link id="requestitemquotes" target="RequestItemQuotes"> + <parameter param-name="custRequestId" from-field="custRequest.custRequestId"/> + <parameter param-name="custRequestItemSeqId" from-field="custRequestItem.custRequestItemSeqId"/> + </link> </menu-item> <menu-item name="workeffortrequirements" title="${uiLabelMap.OrderRequestItemWorkEffort}"> - <link id="workeffortrequirements" target="requestitemrequirements?custRequestId=${custRequest.custRequestId}&amp;custRequestItemSeqId=${custRequestItem.custRequestItemSeqId}"/> + <link id="workeffortrequirements" target="requestitemrequirements"> + <parameter param-name="custRequestId" from-field="custRequest.custRequestId"/> + <parameter param-name="custRequestItemSeqId" from-field="custRequestItem.custRequestItemSeqId"/> + </link> </menu-item> </menu> </menus> Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=760789&r1=760788&r2=760789&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Wed Apr 1 06:16:07 2009 @@ -103,7 +103,10 @@ <link target="EditPartyResumes?partyId=${partyId}"/> </menu-item> <menu-item name="EditEmploymentApps" title="${uiLabelMap.HumanResEmploymentApp}"> - <link target="EditEmploymentApps?partyId=${partyId}&amp;&amp;referredByPartyId=${partyId}"/> + <link target="EditEmploymentApps"> + <parameter param-name="partyId" from-field="partyId"/> + <parameter param-name="&amp;referredByPartyId" from-field="partyId"/> + </link> </menu-item> <menu-item name="FinancialHistory" title="${uiLabelMap.PartyFinancialHistory}"> <condition> @@ -136,13 +139,19 @@ <condition> <if-has-permission permission="ORDERMGR" action="_VIEW"/> </condition> - <link target="/ordermgr/control/FindRequest?lookupFlag=Y&amp;fromPartyId=${partyId}&amp;externaLoginKey=${externalLoginKey}" url-mode="inter-app"/> + <link target="/ordermgr/control/FindRequest" url-mode="inter-app"> + <parameter param-name="lookupFlag=Y&amp;fromPartyId" from-field="partyId"/> + <parameter param-name="externaLoginKey" from-field="externalLoginKey"/> + </link> </menu-item> <menu-item name="findQuote" title="${uiLabelMap.OrderOrderQuotes}" > <condition> <if-has-permission permission="ORDERMGR" action="_VIEW"/> </condition> - <link target="/ordermgr/control/FindQuote?partyId=${partyId}&amp;externalLoginKey=${externalLoginKey}" url-mode="inter-app"/> + <link target="/ordermgr/control/FindQuote" url-mode="inter-app"> + <parameter param-name="partyId" from-field="partyId"/> + <parameter param-name="externalLoginKey" from-field="externalLoginKey"/> + </link> </menu-item> <menu-item name="searchOrder" title="${uiLabelMap.OrderOrders}" > <condition> @@ -154,13 +163,19 @@ <condition> <if-has-permission permission="ORDERMGR" action="_CREATE"/> </condition> - <link target="/ordermgr/control/EditQuote?partyId=${partyId}&amp;externaLoginKey=${externalLoginKey}" url-mode="inter-app"/> + <link target="/ordermgr/control/EditQuote" url-mode="inter-app"> + <parameter param-name="partyId" from-field="partyId"/> + <parameter param-name="externaLoginKey" from-field="externalLoginKey"/> + </link> </menu-item> <menu-item name="newOrder" title="${uiLabelMap.OrderNewOrder}"> <condition> <if-has-permission permission="ORDERMGR" action="_CREATE"/> </condition> - <link target="/ordermgr/control/checkinits?partyId=${partyId}&amp;externaLoginKey=${externalLoginKey}" url-mode="inter-app"/> + <link target="/ordermgr/control/checkinits" url-mode="inter-app"> + <parameter param-name="partyId" from-field="partyId"/> + <parameter param-name="externaLoginKey" from-field="externalLoginKey"/> + </link> </menu-item> </menu> <menu name="create-new-party" type="simple" menu-container-style="basic-nav"> @@ -321,7 +336,10 @@ <if-has-permission permission="ORDERMGR_CRQ_CREATE"/> </and> </condition> - <link target="editRequestFromCommEvent?communicationEventId=${communicationEvent.communicationEventId}&amp;my=${parameters.my}"/> + <link target="editRequestFromCommEvent"> + <parameter param-name="communicationEventId" from-field="communicationEvent.communicationEventId"/> + <parameter param-name="my" from-field="parameters.my"/> + </link> </menu-item> <menu-item name="close" title="${uiLabelMap.CommonClose}"> <condition> @@ -379,7 +397,10 @@ </menu-item> <!-- TODO! <menu-item name="ListCommCustRequests" title="CustRequests"> - <link target="ListCommCustRequests?partyId=${partyId}&amp;communicationEventId=${communicationEventId}"/> + <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}"> @@ -389,13 +410,22 @@ <menu name="CommFindTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" default-menu-item-name="find"> <menu-item name="find" title="${uiLabelMap.CommonFind}"> - <link target="findCommunications?partyId=${partyId}&amp;communicationEventId=${communicationEventId}" url-mode="intra-app"/> + <link target="findCommunications" url-mode="intra-app"> + <parameter param-name="partyId" from-field="partyId"/> + <parameter param-name="communicationEventId" from-field="communicationEventId"/> + </link> </menu-item> <menu-item name="showall" title="${uiLabelMap.CommonShowAll}"> - <link target="listCommunications?partyId=${partyId}&amp;communicationEventId=${communicationEventId}" url-mode="intra-app"/> + <link target="listCommunications" url-mode="intra-app"> + <parameter param-name="partyId" from-field="partyId"/> + <parameter param-name="communicationEventId" from-field="communicationEventId"/> + </link> </menu-item> <menu-item name="pending" title="${uiLabelMap.PartyPending}"> - <link target="pendingCommunications?partyId=${partyId}&amp;communicationEventId=${communicationEventId}" url-mode="intra-app"/> + <link target="pendingCommunications" url-mode="intra-app"> + <parameter param-name="partyId" from-field="partyId"/> + <parameter param-name="communicationEventId" from-field="communicationEventId"/> + </link> </menu-item> </menu> Modified: ofbiz/trunk/applications/product/widget/facility/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/facility/Menus.xml?rev=760789&r1=760788&r2=760789&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/facility/Menus.xml (original) +++ ofbiz/trunk/applications/product/widget/facility/Menus.xml Wed Apr 1 06:16:07 2009 @@ -118,13 +118,22 @@ <menu name="InventoryItemTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml" default-menu-item-name="EditInventoryItem" selected-menuitem-context-field-name="subTabButtonItem"> <menu-item name="EditInventoryItem" title="${uiLabelMap.ProductInventoryItem}"> - <link target="EditInventoryItem?inventoryItemId=${inventoryItemId}&amp;facilityId=${facilityId}"/> + <link target="EditInventoryItem"> + <parameter param-name="inventoryItemId" from-field="inventoryItemId"/> + <parameter param-name="facilityId" from-field="facilityId"/> + </link> </menu-item> <menu-item name="ViewInventoryItemDetail" title="${uiLabelMap.ProductInventoryDetails}"> - <link target="ViewInventoryItemDetail?inventoryItemId=${inventoryItemId}&amp;facilityId=${facilityId}"/> + <link target="ViewInventoryItemDetail"> + <parameter param-name="inventoryItemId" from-field="inventoryItemId"/> + <parameter param-name="facilityId" from-field="facilityId"/> + </link> </menu-item> <menu-item name="EditInventoryItemLabels" title="${uiLabelMap.ProductInventoryItemLabelAppl}"> - <link target="EditInventoryItemLabels?inventoryItemId=${inventoryItemId}&amp;facilityId=${facilityId}"/> + <link target="EditInventoryItemLabels"> + <parameter param-name="inventoryItemId" from-field="inventoryItemId"/> + <parameter param-name="facilityId" from-field="facilityId"/> + </link> </menu-item> </menu> </menus> Modified: ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml?rev=760789&r1=760788&r2=760789&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml (original) +++ ofbiz/trunk/applications/workeffort/widget/WorkEffortMenus.xml Wed Apr 1 06:16:07 2009 @@ -39,7 +39,10 @@ <link target="EditWorkEffort?workEffortId=${workEffortId}"/> </menu-item> <menu-item name="WorkEffortAssocs" title="${uiLabelMap.CommonEntityChildren}"> - <link target="ChildWorkEfforts?workEffortId=${workEffortId}&amp;trail=${workEffortId}"/> + <link target="ChildWorkEfforts"> + <parameter param-name="workEffortId" from-field="workEffortId"/> + <parameter param-name="trail" from-field="workEffortId"/> + </link> </menu-item> <menu-item name="WorkEffortPartyAssigns" title="${uiLabelMap.WorkEffortParties}"> <link target="ListWorkEffortPartyAssigns?workEffortId=${workEffortId}"/> Modified: ofbiz/trunk/framework/example/widget/example/ExampleMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/ExampleMenus.xml?rev=760789&r1=760788&r2=760789&view=diff ============================================================================== --- ofbiz/trunk/framework/example/widget/example/ExampleMenus.xml (original) +++ ofbiz/trunk/framework/example/widget/example/ExampleMenus.xml Wed Apr 1 06:16:07 2009 @@ -26,7 +26,12 @@ <menu-item name="FormWidgetExamples" title="${uiLabelMap.ExampleFormWidgetExamples}"><link target="FormWidgetExamples"/></menu-item> <menu-item name="AjaxExample" title="${uiLabelMap.ExampleAjaxExamples}"><link target="authview/findExampleAjax"/></menu-item> <menu-item name="portalPage" parent-portal-page-value="${parameters.parentPortalPageId}"/> - <menu-item name="Dashboard" title="${uiLabelMap.ExampleDashboard}" align-style="opposed"><link target="ManagePortalPages?portalPageId=${currentPortalPage.portalPageId}&amp;parentPortalPageId=${parameters.parentPortalPageId}"/></menu-item> + <menu-item name="Dashboard" title="${uiLabelMap.ExampleDashboard}" align-style="opposed"> + <link target="ManagePortalPages"> + <parameter param-name="portalPageId" from-field="currentPortalPage.portalPageId"/> + <parameter param-name="parentPortalPageId" from-field="parameters.parentPortalPageId"/> + </link> + </menu-item> </menu> <menu name="EditExample" default-selected-style="selected" type="simple" Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml?rev=760789&r1=760788&r2=760789&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/Menus.xml Wed Apr 1 06:16:07 2009 @@ -31,7 +31,10 @@ <menu name="FixedAssetTabBar" extends="FixedAssetTabBar" extends-resource="component://accounting/widget/Menus.xml"> <menu-item name="EditProductMaints" title="${uiLabelMap.AssetMaintProductMaint}"> <condition><not><if-empty field="fixedAsset.instanceOfProductId"/></not></condition> - <link target="EditProductMaints?fixedAssetId=${fixedAsset.fixedAssetId}&amp;productId=${fixedAsset.instanceOfProductId}"/> + <link target="EditProductMaints"> + <parameter param-name="fixedAssetId" from-field="fixedAsset.fixedAssetId"/> + <parameter param-name="productId" from-field="fixedAsset.instanceOfProductId"/> + </link> </menu-item> </menu> @@ -58,7 +61,10 @@ </link> </menu-item> <menu-item name="EditItemIssuances" title="${uiLabelMap.AssetMaintItemIssuance}"> - <link target="EditItemIssuances?fixedAssetId=${fixedAssetMaint.fixedAssetId}&amp;maintHistSeqId=${fixedAssetMaint.maintHistSeqId}"/> + <link target="EditItemIssuances"> + <parameter param-name="fixedAssetId" from-field="fixedAssetMaint.fixedAssetId"/> + <parameter param-name="maintHistSeqId" from-field="fixedAssetMaint.maintHistSeqId"/> + </link> </menu-item> </menu> Modified: ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/Menus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/Menus.xml?rev=760789&r1=760788&r2=760789&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/Menus.xml (original) +++ ofbiz/trunk/specialpurpose/assetmaint/widget/ismgr/Menus.xml Wed Apr 1 06:16:07 2009 @@ -55,7 +55,10 @@ <link target="EditComputerHardware?fixedAssetId=${fixedAssetId}"/> </menu-item> <menu-item name="ListHardwareAccessories" title="${uiLabelMap.IsMgrHardwareAccessories}"> - <link target="ListHardwareAccessories?fixedAssetId=${fixedAssetId}&amp;trail=${fixedAssetId}"/> + <link target="ListHardwareAccessories"> + <parameter param-name="fixedAssetId" from-field="fixedAssetId"/> + <parameter param-name="trail" from-field="fixedAssetId"/> + </link> </menu-item> <menu-item name="ListInstalledSoftware" title="${uiLabelMap.IsMgrInstalledSoftware}"> <link target="ListInstalledSoftware?fixedAssetId=${fixedAssetId}"/> Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogMenus.xml?rev=760789&r1=760788&r2=760789&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogMenus.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogMenus.xml Wed Apr 1 06:16:07 2009 @@ -27,7 +27,10 @@ <if-entity-permission entity-id="${blog.contentId}" entity-name="Content" target-operation="CONTENT_UPDATE"/> </or> </condition> - <link text="${uiLabelMap.CommonEdit}" target="EditBlogArticle?contentId=${blog.contentId}&amp;blogContentId=${parameters.blogContentId}" style="buttontext"/> + <link text="${uiLabelMap.CommonEdit}" target="EditBlogArticle" style="buttontext"> + <parameter param-name="contentId" from-field="blog.contentId"/> + <parameter param-name="blogContentId" from-field="parameters.blogContentId"/> + </link> </menu-item> </menu> </menus> Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogScreens.xml?rev=760789&r1=760788&r2=760789&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/widget/blog/BlogScreens.xml Wed Apr 1 06:16:07 2009 @@ -111,7 +111,10 @@ <container style="blogwrapper"> <include-menu name="view_edit" location="component://ecommerce/widget/blog/BlogMenus.xml"/> <label text="&lt;p/&gt;"/> - <link text="${blog.contentName} [${blog.contentId}]" target="ViewBlogArticle?contentId=${blog.contentId}&amp;blogContentId=${blogContentId}" style="blogheader"/> + <link text="${blog.contentName} [${blog.contentId}]" target="ViewBlogArticle" style="blogheader"> + <parameter param-name="contentId" from-field="blog.contentId"/> + <parameter param-name="blogContentId" from-field="blogContentId"/> + </link> <!-- <link text="Latest" target="LatestResponses?ownerContentId=${blog.ownerContentId}" /> --> @@ -131,7 +134,10 @@ <include-menu name="view_edit" location="component://ecommerce/widget/blog/BlogMenus.xml"/> <label text="&lt;p/&gt;"/> <!--<label text="${blog.contentName} [${blog.contentId}]" style="blogheader"/>--> - <link text="${blog.contentName} [${blog.contentId}]" target="ViewBlogArticle?contentId=${blog.contentId}&amp;blogContentId=${blogContentId}" style="blogheader"/> + <link text="${blog.contentName} [${blog.contentId}]" target="ViewBlogArticle" style="blogheader"> + <parameter param-name="contentId" from-field="blog.contentId"/> + <parameter param-name="blogContentId" from-field="blogContentId"/> + </link> <!-- <link text="Latest" target="LatestResponses?ownerContentId=${blog.ownerContentId}" /> --> @@ -242,7 +248,10 @@ </condition> <widgets> <container style="rightjustify"> - <link text="${uiLabelMap.CommonEdit}" target="EditBlogArticle?contentId=${articleContentId}&amp;blogContentId=${blogContentId}" style="buttontext"/> + <link text="${uiLabelMap.CommonEdit}" target="EditBlogArticle" style="buttontext"> + <parameter param-name="contentId" from-field="articleContentId"/> + <parameter param-name="blogContentId" from-field="blogContentId"/> + </link> </container> </widgets> </section> @@ -295,7 +304,10 @@ <label text="&lt;p/&gt;"/> <container style="bloghr"> <container style="leftjustify"> - <link text="${article.contentName}: ${article.description}" target="ViewBlogArticle?articleContentId=${articleContentId}&amp;blogContentId=${blogContentId}" style="blogtitle"/> + <link text="${article.contentName}: ${article.description}" target="ViewBlogArticle" style="blogtitle"> + <parameter param-name="articleContentId" from-field="articleContentId"/> + <parameter param-name="blogContentId" from-field="blogContentId"/> + </link> <label text=" --&gt; ${content.contentName}: ${content.description}" style="blogtitle"/> </container> <section> Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml?rev=760789&r1=760788&r2=760789&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml (original) +++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml Wed Apr 1 06:16:07 2009 @@ -225,7 +225,11 @@ <if-has-permission permission="PARTYMGR_CME-NOTE_CREATE"/> </and> </condition> - <link target="NewCommunicationEvents?communicationEventTypeId=EMAIL_COMMUNICATION&amp;parentCommEventId=${parameters.communicationEventId}&amp;donePage=${parameters.donePage}"/> + <link target="NewCommunicationEvents"> + <parameter param-name="communicationEventTypeId" value="EMAIL_COMMUNICATION"/> + <parameter param-name="parentCommEventId" from-field="parameters.communicationEventId"/> + <parameter param-name="donePage" from-field="parameters.donePage"/> + </link> </menu-item> <menu-item name="forward" title="${uiLabelMap.PartyForward}"> <condition> @@ -237,7 +241,11 @@ <if-has-permission permission="PARTYMGR_CME-NOTE_CREATE"/> </and> </condition> - <link target="NewCommunicationEvents?communicationEventTypeId=EMAIL_COMMUNICATION&amp;originalCommEventId=${parameters.communicationEventId}&amp;donePage=${parameters.donePage}"/> + <link target="NewCommunicationEvents"> + <parameter param-name="communicationEventTypeId" value="EMAIL_COMMUNICATION"/> + <parameter param-name="parentCommEventId" from-field="parameters.communicationEventId"/> + <parameter param-name="donePage" from-field="parameters.donePage"/> + </link> </menu-item> <menu-item name="createRequestFromCommEvent" title="${uiLabelMap.PartyCreateRequestFromCommEvent}"> <condition> Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=760789&r1=760788&r2=760789&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Wed Apr 1 06:16:07 2009 @@ -796,8 +796,14 @@ <section> <widgets> <container> - <link style="smallSubmit" target="EditCommunicationEvent?partyId=${partyId}&amp;partyIdFrom=${partyId}" text="${uiLabelMap.PartyNewCommunication}"/> - <link style="smallSubmit" target="EditCommunicationEvent?partyId=${partyId}&amp;parentCommEventId=${communicationEventId}" text="${uiLabelMap.PartyReply}"/> + <link style="smallSubmit" target="EditCommunicationEvent" text="${uiLabelMap.PartyNewCommunication}"> + <parameter param-name="partyId" from-field="partyId"/> + <parameter param-name="partyIdFrom" from-field="partyId"/> + </link> + <link style="smallSubmit" target="EditCommunicationEvent" text="${uiLabelMap.PartyReply}"> + <parameter param-name="partyId" from-field="partyId"/> + <parameter param-name="parentCommEventId" from-field="communicationEventId"/> + </link> <!--<link style="smallSubmit" target="EditCommunicationEvent"> <parameter param-name="communicationEventTypeId" from-field="communicationEvent.communicationEventTypeId"/> <parameter param-name="contactMechIdTo" from-field="communicationEvent.contactMechIdFrom"/> From commitsjacobsonlaura@example.net Wed Apr 01 06:24:12 2009 Return-Path: <commitsjacobsonlaura@example.net> Delivered-To: jacobsonlaura@example.net Received: (qmail 73041 invoked from network); 1 Apr 2009 06:24:11 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Apr 2009 06:24:11 -0000 Received: (qmail 33977 invoked by uid 500); 1 Apr 2009 06:24:11 -0000 Delivered-To: jacobsonlaura@example.net Received: (qmail 33910 invoked by uid 500); 1 Apr 2009 06:24:11 -0000 Mailing-List: contact jacobsonlaura@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:jacobsonlaura@example.net> List-Unsubscribe: <mailto:jacobsonlaura@example.net> List-Post: <mailto:jacobsonlaura@example.net> List-Id: <commits.ofbiz.apache.org> Reply-To: jacobsonlaura@example.net Delivered-To: mailing list jacobsonlaura@example.net Received: (qmail 33900 invoked by uid 99); 1 Apr 2009 06:24:11 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Apr 2009 06:24:11 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Apr 2009 06:24:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7AC042388ABD; Wed, 1 Apr 2009 06:23:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r760791 - in /ofbiz/trunk/applications: accounting/widget/GlScreens.xml product/widget/catalog/ConfigScreens.xml Date: Wed, 01 Apr 2009 06:23:46 -0000 To: jacobsonlaura@example.net From: jacobsonlaura@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <jacobsonlaura@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: jleroux Date: Wed Apr 1 06:23:45 2009 New Revision: 760791 URL: http://svn.apache.org/viewvc?rev=760791&view=rev Log: Securing URLs, link element in screens and menus : 12th set + tabs to 4 spaces Modified: ofbiz/trunk/applications/accounting/widget/GlScreens.xml ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml Modified: ofbiz/trunk/applications/accounting/widget/GlScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlScreens.xml?rev=760791&r1=760790&r2=760791&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlScreens.xml Wed Apr 1 06:23:45 2009 @@ -253,8 +253,16 @@ </container> </container> <container style="screenlet-body"> - <link text="${uiLabelMap.AccountingDuplicateAccountingTransaction}" style="buttontext" target="copyAcctgTransAndEntries?revert=N&amp;fromAcctgTransId=${acctgTransId}&amp;organizationPartyId=${organizationPartyId}"/> - <link text="${uiLabelMap.AccountingRevertAccountingTransaction}" style="buttontext" target="copyAcctgTransAndEntries?revert=Y&amp;fromAcctgTransId=${acctgTransId}&amp;organizationPartyId=${organizationPartyId}"/> + <link text="${uiLabelMap.AccountingDuplicateAccountingTransaction}" style="buttontext" target="copyAcctgTransAndEntries"> + <parameter param-name="revert" value="N"/> + <parameter param-name="fromAcctgTransId" from-field="acctgTransId"/> + <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + </link> + <link text="${uiLabelMap.AccountingRevertAccountingTransaction}" style="buttontext" target="copyAcctgTransAndEntries"> + <parameter param-name="revert" value="Y"/> + <parameter param-name="fromAcctgTransId" from-field="acctgTransId"/> + <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + </link> <section> <condition> <if-compare field="acctgTrans.isPosted" operator="equals" value="Y"/> @@ -314,9 +322,15 @@ </container> <container style="screenlet-body"> <container> - <link text="${uiLabelMap.AccountingCompleteAcctgTransFields}" style="buttontext" target="completeAcctgTransEntries?acctgTransId=${acctgTransId}&amp;organizationPartyId=${organizationPartyId}"/> + <link text="${uiLabelMap.AccountingCompleteAcctgTransFields}" style="buttontext" target="completeAcctgTransEntries"> + <parameter param-name="acctgTransId" from-field="acctgTransId"/> + <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + </link> <link text="${uiLabelMap.AccountingVerifyTransaction}" style="buttontext" target="postAcctgTrans?acctgTransId=${acctgTransId}&amp;organizationPartyId=${organizationPartyId}&amp;verifyOnly=Y"/> - <link text="${uiLabelMap.AccountingPostTransaction}" style="buttontext" target="postAcctgTrans?acctgTransId=${acctgTransId}&amp;organizationPartyId=${organizationPartyId}"/> + <link text="${uiLabelMap.AccountingPostTransaction}" style="buttontext" target="postAcctgTrans"> + <parameter param-name="acctgTransId" from-field="acctgTransId"/> + <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> + </link> </container> <container> <include-form name="EditAcctgTransEntry" location="component://accounting/widget/GlForms.xml"/> Modified: ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml?rev=760791&r1=760790&r2=760791&view=diff ============================================================================== --- ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml (original) +++ ofbiz/trunk/applications/product/widget/catalog/ConfigScreens.xml Wed Apr 1 06:23:45 2009 @@ -194,13 +194,19 @@ </condition> <widgets> <screenlet title="${uiLabelMap.CommonEdit} ${uiLabelMap.ProductConfigs}"> - <link style="buttontext" text="${uiLabelMap.CommonNew} ${uiLabelMap.ProductConfigs}" target="EditProductConfigOptions?configItemId=${configItemId}&amp;configOptionId=${configOptionId}"/> + <link style="buttontext" text="${uiLabelMap.CommonNew} ${uiLabelMap.ProductConfigs}" target="EditProductConfigOptions"> + <parameter param-name="configItemId" from-field="configItemId"/> + <parameter param-name="configOptionId" from-field="configOptionId"/> + </link> <include-form name="CreateProductConfigProduct" location="component://product/webapp/catalog/config/ConfigForms.xml"/> </screenlet> </widgets> <fail-widgets> <screenlet title="${uiLabelMap.CommonAddA} ${uiLabelMap.ProductConfigs}"> - <link style="buttontext" text="${uiLabelMap.CommonNew} ${uiLabelMap.ProductConfigs}" target="EditProductConfigOptions?configItemId=${configItemId}&amp;configOptionId=${configOptionId}"/> + <link style="buttontext" text="${uiLabelMap.CommonNew} ${uiLabelMap.ProductConfigs}" target="EditProductConfigOptions"> + <parameter param-name="configItemId" from-field="configItemId"/> + <parameter param-name="configOptionId" from-field="configOptionId"/> + </link> <include-form name="CreateProductConfigProduct" location="component://product/webapp/catalog/config/ConfigForms.xml"/> </screenlet> </fail-widgets> From commitsjacobsonlaura@example.net Wed Apr 01 08:41:29 2009 Return-Path: <commitsjacobsonlaura@example.net> Delivered-To: jacobsonlaura@example.net Received: (qmail 55433 invoked from network); 1 Apr 2009 08:41:28 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Apr 2009 08:41:28 -0000 Received: (qmail 7105 invoked by uid 500); 1 Apr 2009 08:41:28 -0000 Delivered-To: jacobsonlaura@example.net Received: (qmail 7077 invoked by uid 500); 1 Apr 2009 08:41:28 -0000 Mailing-List: contact jacobsonlaura@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:jacobsonlaura@example.net> List-Unsubscribe: <mailto:jacobsonlaura@example.net> List-Post: <mailto:jacobsonlaura@example.net> List-Id: <commits.ofbiz.apache.org> Reply-To: jacobsonlaura@example.net Delivered-To: mailing list jacobsonlaura@example.net Received: (qmail 7068 invoked by uid 99); 1 Apr 2009 08:41:28 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Apr 2009 08:41:28 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Apr 2009 08:41:25 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 0E02723889FD; Wed, 1 Apr 2009 08:41:04 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r760815 - in /ofbiz/trunk: applications/accounting/widget/ applications/content/widget/ applications/party/widget/partymgr/ specialpurpose/ecommerce/widget/ specialpurpose/mypage/widget/ Date: Wed, 01 Apr 2009 08:41:02 -0000 To: jacobsonlaura@example.net From: jacobsonlaura@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <jacobsonlaura@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: jleroux Date: Wed Apr 1 08:41:00 2009 New Revision: 760815 URL: http://svn.apache.org/viewvc?rev=760815&view=rev Log: Securing URLs, link element in screens and menus : 13th set + tabs to 4 spaces Modified: ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml ofbiz/trunk/applications/accounting/widget/GlScreens.xml ofbiz/trunk/applications/content/widget/CommonScreens.xml ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml ofbiz/trunk/specialpurpose/ecommerce/widget/ForumScreens.xml ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml Modified: ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml?rev=760815&r1=760814&r2=760815&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/AgreementScreens.xml Wed Apr 1 08:41:00 2009 @@ -266,7 +266,10 @@ <decorator-screen name="CommonAgreementDecorator" location="${parameters.agreementDecoratorLocation}"> <decorator-section name="body"> <container> - <link target="EditAgreementPromoAppl?agreementId=${agreement.agreementId}&amp;agreementItemSeqId=${agreementItem.agreementItemSeqId}" text="${uiLabelMap.AccountingNewAgreementPromoAppl}" style="buttontext"/> + <link target="EditAgreementPromoAppl" text="${uiLabelMap.AccountingNewAgreementPromoAppl}" style="buttontext"> + <parameter param-name="agreementId" from-field="agreement.agreementId"/> + <parameter param-name="agreementItemSeqId" from-field="agreementItem.agreementItemSeqId"/> + </link> </container> <container style="screenlet"> <container style="screenlet-title-bar"> @@ -305,7 +308,10 @@ <decorator-screen name="CommonAgreementDecorator" location="${parameters.agreementDecoratorLocation}"> <decorator-section name="body"> <container> - <link target="EditAgreementPromoAppl?agreementId=${agreement.agreementId}&amp;agreementItemSeqId=${agreementItem.agreementItemSeqId}" text="${uiLabelMap.AccountingNewAgreementPromoAppl}" style="buttontext"/> + <link target="EditAgreementPromoAppl" text="${uiLabelMap.AccountingNewAgreementPromoAppl}" style="buttontext"> + <parameter param-name="agreementId" from-field="agreement.agreementId"/> + <parameter param-name="agreementItemSeqId" from-field="agreementItem.agreementItemSeqId"/> + </link> </container> <container style="screenlet"> <container style="screenlet-title-bar"> @@ -345,7 +351,10 @@ <decorator-screen name="CommonAgreementDecorator" location="${parameters.agreementDecoratorLocation}"> <decorator-section name="body"> <container> - <link target="EditAgreementItemTerm?agreementId=${agreement.agreementId}&amp;agreementItemSeqId=${agreementItem.agreementItemSeqId}" text="${uiLabelMap.AccountingNewAgreementItemTerm}" style="buttontext"/> + <link target="EditAgreementItemTerm" text="${uiLabelMap.AccountingNewAgreementItemTerm}" style="buttontext"> + <parameter param-name="agreementId" from-field="agreement.agreementId"/> + <parameter param-name="agreementItemSeqId" from-field="agreementItem.agreementItemSeqId"/> + </link> </container> <container style="screenlet"> <container style="screenlet-title-bar"> @@ -385,7 +394,10 @@ <decorator-screen name="CommonAgreementDecorator" location="${parameters.agreementDecoratorLocation}"> <decorator-section name="body"> <container> - <link target="EditAgreementItemTerm?agreementId=${agreement.agreementId}&amp;agreementItemSeqId=${agreementItem.agreementItemSeqId}" text="${uiLabelMap.AccountingNewAgreementItemTerm}" style="buttontext"/> + <link target="EditAgreementItemTerm" text="${uiLabelMap.AccountingNewAgreementItemTerm}" style="buttontext"> + <parameter param-name="agreementId" from-field="agreement.agreementId"/> + <parameter param-name="agreementItemSeqId" from-field="agreementItem.agreementItemSeqId"/> + </link> </container> <container style="screenlet"> <container style="screenlet-title-bar"> @@ -425,8 +437,14 @@ <decorator-screen name="CommonAgreementDecorator" location="${parameters.agreementDecoratorLocation}"> <decorator-section name="body"> <container> - <link target="EditAgreementItemProduct?agreementId=${agreement.agreementId}&amp;agreementItemSeqId=${agreementItem.agreementItemSeqId}" text="${uiLabelMap.ProductNewProduct}" style="buttontext"/> - <link target="ListAgreementItemProductsReport?agreementId=${agreement.agreementId}&amp;agreementItemSeqId=${agreementItem.agreementItemSeqId}" text="${uiLabelMap.CommonPrint}" style="buttontext"/> + <link target="EditAgreementItemProduct" text="${uiLabelMap.ProductNewProduct}" style="buttontext"> + <parameter param-name="agreementId" from-field="agreement.agreementId"/> + <parameter param-name="agreementItemSeqId" from-field="agreementItem.agreementItemSeqId"/> + </link> + <link target="ListAgreementItemProductsReport" text="${uiLabelMap.CommonPrint}" style="buttontext"> + <parameter param-name="agreementId" from-field="agreement.agreementId"/> + <parameter param-name="agreementItemSeqId" from-field="agreementItem.agreementItemSeqId"/> + </link> </container> <container style="screenlet"> <container style="screenlet-title-bar"> @@ -532,7 +550,10 @@ <decorator-screen name="CommonAgreementDecorator" location="${parameters.agreementDecoratorLocation}"> <decorator-section name="body"> <container> - <link target="EditAgreementItemProduct?agreementId=${agreement.agreementId}&amp;agreementItemSeqId=${agreementItem.agreementItemSeqId}" text="${uiLabelMap.ProductNewProduct}" style="buttontext"/> + <link target="EditAgreementItemProduct" text="${uiLabelMap.ProductNewProduct}" style="buttontext"> + <parameter param-name="agreementId" from-field="agreement.agreementId"/> + <parameter param-name="agreementItemSeqId" from-field="agreementItem.agreementItemSeqId"/> + </link> </container> <container style="screenlet"> <container style="screenlet-title-bar"> @@ -572,8 +593,14 @@ <decorator-screen name="CommonAgreementDecorator" location="${parameters.agreementDecoratorLocation}"> <decorator-section name="body"> <container> - <link target="EditAgreementItemSupplierProduct?agreementId=${agreement.agreementId}&amp;agreementItemSeqId=${agreementItem.agreementItemSeqId}" text="${uiLabelMap.ProductNewProduct}" style="buttontext"/> - <link target="ListAgreementItemSupplierProductsReport?agreementId=${agreement.agreementId}&amp;agreementItemSeqId=${agreementItem.agreementItemSeqId}" text="${uiLabelMap.CommonPrint}" style="buttontext"/> + <link target="EditAgreementItemSupplierProduct" text="${uiLabelMap.ProductNewProduct}" style="buttontext"> + <parameter param-name="agreementId" from-field="agreement.agreementId"/> + <parameter param-name="agreementItemSeqId" from-field="agreementItem.agreementItemSeqId"/> + </link> + <link target="ListAgreementItemSupplierProductsReport" text="${uiLabelMap.CommonPrint}" style="buttontext"> + <parameter param-name="agreementId" from-field="agreement.agreementId"/> + <parameter param-name="agreementItemSeqId" from-field="agreementItem.agreementItemSeqId"/> + </link> </container> <container style="screenlet"> <container style="screenlet-title-bar"> @@ -686,7 +713,10 @@ <decorator-screen name="CommonAgreementDecorator" location="${parameters.agreementDecoratorLocation}"> <decorator-section name="body"> <container> - <link target="EditAgreementItemSupplierProduct?agreementId=${agreement.agreementId}&amp;agreementItemSeqId=${agreementItem.agreementItemSeqId}" text="${uiLabelMap.ProductNewProduct}" style="buttontext"/> + <link target="EditAgreementItemSupplierProduct" text="${uiLabelMap.ProductNewProduct}" style="buttontext"> + <parameter param-name="agreementId" from-field="agreement.agreementId"/> + <parameter param-name="agreementItemSeqId" from-field="agreementItem.agreementItemSeqId"/> + </link> </container> <container style="screenlet"> <container style="screenlet-title-bar"> @@ -737,7 +767,10 @@ <decorator-screen name="CommonAgreementDecorator" location="${parameters.agreementDecoratorLocation}"> <decorator-section name="body"> <container> - <link target="EditAgreementItemParty?agreementId=${agreement.agreementId}&amp;agreementItemSeqId=${agreementItem.agreementItemSeqId}" text="${uiLabelMap.CommonNew}" style="buttontext"/> + <link target="EditAgreementItemParty" text="${uiLabelMap.CommonNew}" style="buttontext"> + <parameter param-name="agreementId" from-field="agreement.agreementId"/> + <parameter param-name="agreementItemSeqId" from-field="agreementItem.agreementItemSeqId"/> + </link> </container> <container style="screenlet"> <container style="screenlet-title-bar"> @@ -777,7 +810,10 @@ <decorator-screen name="CommonAgreementDecorator" location="${parameters.agreementDecoratorLocation}"> <decorator-section name="body"> <container> - <link target="EditAgreementItemParty?agreementId=${agreement.agreementId}&amp;agreementItemSeqId=${agreementItem.agreementItemSeqId}" text="${uiLabelMap.CommonNew}" style="buttontext"/> + <link target="EditAgreementItemParty" text="${uiLabelMap.CommonNew}" style="buttontext"> + <parameter param-name="agreementId" from-field="agreement.agreementId"/> + <parameter param-name="agreementItemSeqId" from-field="agreementItem.agreementItemSeqId"/> + </link> </container> <container style="screenlet"> <container style="screenlet-title-bar"> @@ -817,7 +853,10 @@ <decorator-screen name="CommonAgreementDecorator" location="${parameters.agreementDecoratorLocation}"> <decorator-section name="body"> <container> - <link target="EditAgreementGeographicalApplic?agreementId=${agreement.agreementId}&amp;agreementItemSeqId=${agreementItem.agreementItemSeqId}" text="${uiLabelMap.CommonNew}" style="buttontext"/> + <link target="EditAgreementGeographicalApplic" text="${uiLabelMap.CommonNew}" style="buttontext"> + <parameter param-name="agreementId" from-field="agreement.agreementId"/> + <parameter param-name="agreementItemSeqId" from-field="agreementItem.agreementItemSeqId"/> + </link> </container> <container style="screenlet"> <container style="screenlet-title-bar"> @@ -857,7 +896,10 @@ <decorator-screen name="CommonAgreementDecorator" location="${parameters.agreementDecoratorLocation}"> <decorator-section name="body"> <container> - <link target="EditAgreementGeographicalApplic?agreementId=${agreement.agreementId}&amp;agreementItemSeqId=${agreementItem.agreementItemSeqId}" text="${uiLabelMap.CommonNew}" style="buttontext"/> + <link target="EditAgreementGeographicalApplic" text="${uiLabelMap.CommonNew}" style="buttontext"> + <parameter param-name="agreementId" from-field="agreement.agreementId"/> + <parameter param-name="agreementItemSeqId" from-field="agreementItem.agreementItemSeqId"/> + </link> </container> <container style="screenlet"> <container style="screenlet-title-bar"> Modified: ofbiz/trunk/applications/accounting/widget/GlScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/widget/GlScreens.xml?rev=760815&r1=760814&r2=760815&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/widget/GlScreens.xml (original) +++ ofbiz/trunk/applications/accounting/widget/GlScreens.xml Wed Apr 1 08:41:00 2009 @@ -326,7 +326,11 @@ <parameter param-name="acctgTransId" from-field="acctgTransId"/> <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> </link> - <link text="${uiLabelMap.AccountingVerifyTransaction}" style="buttontext" target="postAcctgTrans?acctgTransId=${acctgTransId}&amp;organizationPartyId=${organizationPartyId}&amp;verifyOnly=Y"/> + <link text="${uiLabelMap.AccountingVerifyTransaction}" style="buttontext" target="postAcctgTrans"> + <parameter param-name="acctgTransId"/> + <parameter param-name="organizationPartyId"/> + <parameter param-name="verifyOnly" value="Y"/> + </link> <link text="${uiLabelMap.AccountingPostTransaction}" style="buttontext" target="postAcctgTrans"> <parameter param-name="acctgTransId" from-field="acctgTransId"/> <parameter param-name="organizationPartyId" from-field="organizationPartyId"/> Modified: ofbiz/trunk/applications/content/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/widget/CommonScreens.xml?rev=760815&r1=760814&r2=760815&view=diff ============================================================================== --- ofbiz/trunk/applications/content/widget/CommonScreens.xml (original) +++ ofbiz/trunk/applications/content/widget/CommonScreens.xml Wed Apr 1 08:41:00 2009 @@ -24,7 +24,7 @@ <screen name="main-decorator"> <section> <actions> - <!-- base/top/specific map first, then more common map added for shared labels --> + <!-- base/top/specific map first, then more common map added for shared labels --> <property-map resource="ContentUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <property-map resource="WorkEffortUiLabels" map-name="uiLabelMap" global="true"/> @@ -33,10 +33,10 @@ <set field="layoutSettings.companyName" from-field="uiLabelMap.ContentCompanyName" global="true"/> <set field="layoutSettings.companySubtitle" from-field="uiLabelMap.ContentCompanySubtitle" global="true"/> <set field="layoutSettings.styleSheets[]" value="/content/images/contentForum.css" global="true"/> - <set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/> + <set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/> <set field="activeApp" value="contentmgr" global="true"/> <set field="applicationMenuName" value="ContentAppBar" global="true"/> - <set field="applicationMenuLocation" value="component://content/widget/content/ContentMenus.xml" global="true"/> + <set field="applicationMenuLocation" value="component://content/widget/content/ContentMenus.xml" global="true"/> <set field="applicationTitle" value="${uiLabelMap.ContentContentManagerApplication}"/> </actions> <widgets> @@ -111,7 +111,7 @@ </widgets> </section> </screen> - + <screen name="contentDecorator"> <section> <actions> @@ -125,7 +125,7 @@ <if-has-permission permission="CONTENTMGR" action="UPDATE"/> </condition> <widgets> - <include-menu name="contentTopMenu" location="component://content/widget/content/ContentMenus.xml"/> + <include-menu name="contentTopMenu" location="component://content/widget/content/ContentMenus.xml"/> <decorator-section-include name="body"/> </widgets> <fail-widgets> @@ -137,8 +137,8 @@ </widgets> </section> </screen> - - + + <screen name="commonDataResourceDecorator"> <section> <actions> @@ -177,7 +177,7 @@ </widgets> </section> </screen> - + <screen name="commonCompDocDecorator"> <section> <actions> @@ -194,7 +194,7 @@ </widgets> </section> </screen> - + <screen name="commonContentSetupDecorator"> <section> <actions> @@ -283,7 +283,7 @@ </widgets> </section> </screen> - + <screen name="commonLayoutDecorator"> <section> <actions> @@ -344,20 +344,30 @@ <widgets> <container style="responseSelected"> <label text="${rsp.contentName} - ${rsp.description} [${rsp.contentId}]" style="responseheader" /> - <link text="${uiLabelMap.PartyReply}" target="addForumThreadMessage?forumGroupId=${parameters.forumGroupId}&amp;forumId=${parameters.forumId}&amp;forumMessageIdTo=${rsp.contentId}&amp;contentAssocTypeId=RESPONSE" style="buttontext"/> + <link text="${uiLabelMap.PartyReply}" target="addForumThreadMessage" style="buttontext"> + <parameter param-name="forumGroupId" from-field="parameters.forumGroupId"/> + <parameter param-name="forumId" from-field="parameters.forumId"/> + <parameter param-name="forumMessageIdTo" from-field="rsp.contentId"/> + <parameter param-name="contentAssocTypeId" value="RESPONSE" /> + </link> <container style="responsetext"> <include-form name="EditForumThreadMessage" location="component://content/widget/forum/ForumForms.xml"/> </container> - </container> + </container> </widgets> <fail-widgets> <container> <label text="${rsp.contentName} - ${rsp.description} [${rsp.contentId}]" style="responseheader" /> - <link text="${uiLabelMap.PartyReply}" target="addForumThreadMessage?forumGroupId=${parameters.forumGroupId}&amp;forumId=${parameters.forumId}&amp;forumMessageIdTo=${rsp.contentId}&amp;contentAssocTypeId=RESPONSE" style="buttontext"/> + <link text="${uiLabelMap.PartyReply}" target="addForumThreadMessage" style="buttontext"> + <parameter param-name="forumGroupId" from-field="parameters.forumGroupId"/> + <parameter param-name="forumId" from-field="parameters.forumId"/> + <parameter param-name="forumMessageIdTo" from-field="rsp.contentId"/> + <parameter param-name="contentAssocTypeId" value="RESPONSE" /> + </link> <container style="responsetext"> <include-form name="EditForumThreadMessage" location="component://content/widget/forum/ForumForms.xml"/> </container> - </container> + </container> </fail-widgets> </section> </widgets> Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=760815&r1=760814&r2=760815&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Wed Apr 1 08:41:00 2009 @@ -157,7 +157,14 @@ <condition> <if-has-permission permission="ORDERMGR" action="_VIEW"/> </condition> - <link target="/ordermgr/control/searchorders?lookupFlag=Y&amp;hideFields=Y&amp;partyId=${partyId}&amp;externalLoginKey=${externalLoginKey}&amp;viewIndex=1&amp;viewSize=20" url-mode="inter-app"/> + <link target="/ordermgr/control/searchorders" url-mode="inter-app"> + <parameter param-name="lookupFlag" value="Y"/> + <parameter param-name="hideFields" value="Y"/> + <parameter param-name="partyId" from-field="partyId"/> + <parameter param-name="externalLoginKey" from-field="externalLoginKey"/> + <parameter param-name="viewIndex" value="1"/> + <parameter param-name="viewSize" value="20"/> + </link> </menu-item> <menu-item name="newQuote" title="${uiLabelMap.OrderNewQuote}"> <condition> @@ -349,7 +356,12 @@ <if-has-permission permission="PARTYMGR_CME-EMAIL_UPDATE"/> </and> </condition> - <link target="setCommunicationEventRoleStatus?communicationEventId=${communicationEvent.communicationEventId}&amp;partyId=${myCommunicationEventRole.partyId&amp;roleType=${myCommunicationEventRole.roleTypeId}&amp;statusId=COM_ROLE_COMPLETED"/> + <link target="setCommunicationEventRoleStatus"> + <parameter param-name="communicationEventId" from-field="communicationEvent.communicationEventId"/> + <parameter param-name="partyId" from-field="myCommunicationEventRole.partyId"/> + <parameter param-name="roleType" from-field="myCommunicationEventRole.roleTypeId"/> + <parameter param-name="statusId" value="COM_ROLE_COMPLETED""/> + </link> </menu-item> <menu-item name="delete" title="${uiLabelMap.CommonDelete}"> <condition> Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/ForumScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/ForumScreens.xml?rev=760815&r1=760814&r2=760815&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/widget/ForumScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/widget/ForumScreens.xml Wed Apr 1 08:41:00 2009 @@ -549,14 +549,24 @@ <container style="responseSelected"> <label text="${rsp.contentName}" style="responseheader" /> <label text=" - ${rsp.description} [${rsp.contentId}]" style="responsetext" /> - <link text="${uiLabelMap.CommonView}" target="ViewForumMessage?forumId=${parameters.forumId}&amp;threadContentId=${parameters.threadContentId}&amp;responseContentId=${rsp.contentId}&amp;contentAssocTypeId=RESPONSE" style="buttontext"/> + <link text="${uiLabelMap.CommonView}" target="ViewForumMessage" style="buttontext"> + <parameter param-name="forumId" from-field="parameters.forumId"/> + <parameter param-name="threadContentId" from-field="parameters.threadContentId"/> + <parameter param-name="responseContentId" from-field="rsp.contentId"/> + <parameter param-name="contentAssocTypeId" value="RESPONSE"/> + </link> </container> </widgets> <fail-widgets> <container> <label text="${rsp.contentName}" style="responseheader" /> <label text=" - ${rsp.description} [${rsp.contentId}]" style="responsetext" /> - <link text="${uiLabelMap.CommonView}" target="ViewForumMessage?forumId=${parameters.forumId}&amp;threadContentId=${parameters.threadContentId}&amp;responseContentId=${rsp.contentId}&amp;contentAssocTypeId=RESPONSE" style="buttontext"/> + <link text="${uiLabelMap.CommonView}" target="ViewForumMessage" style="buttontext"> + <parameter param-name="forumId" from-field="parameters.forumId"/> + <parameter param-name="threadContentId" from-field="parameters.threadContentId"/> + <parameter param-name="responseContentId" from-field="rsp.contentId"/> + <parameter param-name="contentAssocTypeId" value="RESPONSE"/> + </link> </container> </fail-widgets> </section> Modified: ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml?rev=760815&r1=760814&r2=760815&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml (original) +++ ofbiz/trunk/specialpurpose/mypage/widget/MyPageMenus.xml Wed Apr 1 08:41:00 2009 @@ -207,7 +207,12 @@ <condition> <if-has-permission permission="PARTYMGR_CME-EMAIL_CREATE"/> </condition> - <link target="NewCommunicationEvent?communicationEventTypeId=EMAIL_COMMUNICATION&amp;donePage=${parameters.donePage}&amp;partyIdFrom=${userLogin.partyId}&amp;statusId=COM_PENDING"/> + <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="newInternalNote" title="${uiLabelMap.PartyNewInternalNote}"> <condition> @@ -263,7 +268,12 @@ <if-has-permission permission="PARTYMGR_CME-EMAIL_CREATE"/> </and> </condition> - <link target="setCommunicationEventRoleStatus?communicationEventId=${parameters.communicationEventId}&amp;partyId=${userLogin.partyId}&amp;roleTypeId=${communicationEventRole.roleTypeId}&amp;statusId=COM_ROLE_COMPLETED"/> + <link target="setCommunicationEventRoleStatus"> + <parameter param-name="communicationEventId" from-field="parameters.communicationEventId"/> + <parameter param-name="partyId" from-field="userLogin.partyId"/> + <parameter param-name="roleTypeId" from-field="communicationEventRole.roleTypeId"/> + <parameter param-name="statusId" value="COM_ROLE_COMPLETED"/> + </link> </menu-item> <menu-item name="send" title="${uiLabelMap.CommonSend}"> <condition> @@ -282,7 +292,13 @@ <if-has-permission permission="PARTYMGR_CME-EMAIL_DELETE"/> </and> </condition> - <link target="RemoveCommunicationEventRole?communicationEventId=${parameters.communicationEventId}&amp;roleTypeId=${communicationEventRole.roleTypeId}&amp;partyId=${userLogin.partyId}&amp;deleteCommEventIfLast=Y&amp;delContentDataResource=Y"/> + <link target="RemoveCommunicationEventRole"> + <parameter param-name="communicationEventId" from-field="parameters.communicationEventId"/> + <parameter param-name="roleTypeId" from-field="communicationEventRole.roleTypeId"/> + <parameter param-name="partyId" from-field="userLogin.partyId"/> + <parameter param-name="deleteCommEventIfLast" value="Y"/> + <parameter param-name="delContentDataResource" value="Y"/> + </link> </menu-item> </menu> <menu name="RequestTabBar" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml"> From commitsjacobsonlaura@example.net Wed Apr 01 15:19:46 2009 Return-Path: <commitsjacobsonlaura@example.net> Delivered-To: jacobsonlaura@example.net Received: (qmail 2642 invoked from network); 1 Apr 2009 15:19:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Apr 2009 15:19:46 -0000 Received: (qmail 70246 invoked by uid 500); 1 Apr 2009 15:19:45 -0000 Delivered-To: jacobsonlaura@example.net Received: (qmail 70215 invoked by uid 500); 1 Apr 2009 15:19:45 -0000 Mailing-List: contact jacobsonlaura@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:jacobsonlaura@example.net> List-Unsubscribe: <mailto:jacobsonlaura@example.net> List-Post: <mailto:jacobsonlaura@example.net> List-Id: <commits.ofbiz.apache.org> Reply-To: jacobsonlaura@example.net Delivered-To: mailing list jacobsonlaura@example.net Received: (qmail 70206 invoked by uid 99); 1 Apr 2009 15:19:45 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Apr 2009 15:19:45 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Apr 2009 15:19:43 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 74C9F23888E7; Wed, 1 Apr 2009 15:19:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r760916 - /ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Date: Wed, 01 Apr 2009 15:19:21 -0000 To: jacobsonlaura@example.net From: jacobsonlaura@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <jacobsonlaura@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: hansbak Date: Wed Apr 1 15:19:19 2009 New Revision: 760916 URL: http://svn.apache.org/viewvc?rev=760916&view=rev Log: small typo Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Modified: ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml?rev=760916&r1=760915&r2=760916&view=diff ============================================================================== --- ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml (original) +++ ofbiz/trunk/applications/party/widget/partymgr/PartyMenus.xml Wed Apr 1 15:19:19 2009 @@ -360,7 +360,7 @@ <parameter param-name="communicationEventId" from-field="communicationEvent.communicationEventId"/> <parameter param-name="partyId" from-field="myCommunicationEventRole.partyId"/> <parameter param-name="roleType" from-field="myCommunicationEventRole.roleTypeId"/> - <parameter param-name="statusId" value="COM_ROLE_COMPLETED""/> + <parameter param-name="statusId" value="COM_ROLE_COMPLETED"/> </link> </menu-item> <menu-item name="delete" title="${uiLabelMap.CommonDelete}"> From commitsjacobsonlaura@example.net Wed Apr 01 15:57:52 2009 Return-Path: <commitsjacobsonlaura@example.net> Delivered-To: jacobsonlaura@example.net Received: (qmail 20549 invoked from network); 1 Apr 2009 15:57:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Apr 2009 15:57:52 -0000 Received: (qmail 63223 invoked by uid 500); 1 Apr 2009 15:57:52 -0000 Delivered-To: jacobsonlaura@example.net Received: (qmail 63197 invoked by uid 500); 1 Apr 2009 15:57:52 -0000 Mailing-List: contact jacobsonlaura@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:jacobsonlaura@example.net> List-Unsubscribe: <mailto:jacobsonlaura@example.net> List-Post: <mailto:jacobsonlaura@example.net> List-Id: <commits.ofbiz.apache.org> Reply-To: jacobsonlaura@example.net Delivered-To: mailing list jacobsonlaura@example.net Received: (qmail 63188 invoked by uid 99); 1 Apr 2009 15:57:51 -0000 Received: from nike.apache.org (HELO nike.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Apr 2009 15:57:51 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Apr 2009 15:57:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 736662388A3D; Wed, 1 Apr 2009 15:57:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r760940 - in /ofbiz/trunk: applications/product/webapp/catalog/catalog/ProdCatalogForms.xml specialpurpose/projectmgr/widget/ProjectScreens.xml Date: Wed, 01 Apr 2009 15:57:27 -0000 To: jacobsonlaura@example.net From: jacobsonlaura@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <jacobsonlaura@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: jleroux Date: Wed Apr 1 15:57:25 2009 New Revision: 760940 URL: http://svn.apache.org/viewvc?rev=760940&view=rev Log: A patch from Henning Schmiedehausen " Category delete links in Catalog view don't work" https://issues.apache.org/jira/browse/OFBIZ-2266 + Securing URLs, link element in screens and menus : 14th set + tabs to 4 spaces Modified: ofbiz/trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Modified: ofbiz/trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml?rev=760940&r1=760939&r2=760940&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml (original) +++ ofbiz/trunk/applications/product/webapp/catalog/catalog/ProdCatalogForms.xml Wed Apr 1 15:57:25 2009 @@ -83,8 +83,12 @@ <field name="thruDate" title="${uiLabelMap.CommonThruDateTime}"></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="removeProdCatalogFromParty?prodCatalogId=${prodCatalogId}&amp;partyId=${partyId}&amp;roleTypeId=${roleTypeId}&amp;fromDate=${fromDate}" - description="${uiLabelMap.CommonDelete}" also-hidden="false"/> + <hyperlink target="removeProdCatalogFromParty" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <parameter param-name="prodCatalogId" from-field="prodCatalogId" /> + <parameter param-name="partyId" from-field="partyId" /> + <parameter param-name="roleTypeId" from-field="roleTypeId" /> + <parameter param-name="fromDate" from-field="fromDate" /> + </hyperlink> </field> </form> <form name="CreateProductStoreCatalog" type="single" target="createProdCatalogStore" title="" @@ -115,9 +119,12 @@ <field name="thruDate" title="${uiLabelMap.CommonThruDateTime}"></field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}" widget-style="smallSubmit"><submit button-type="button"/></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="deleteProdCatalogStore?prodCatalogId=${prodCatalogId}&amp;productStoreId=${productStoreId}&amp;fromDate=${fromDate}" - description="${uiLabelMap.CommonDelete}" also-hidden="false"/> - </field> + <hyperlink target="deleteProdCatalogStore" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <parameter param-name="prodCatalogId" from-field="prodCatalogId" /> + <parameter param-name="productStoreId" from-field="productStoreId" /> + <parameter param-name="fromDate" from-field="fromDate" /> + </hyperlink> + </field> </form> <form name="EditProdCatalogCategories" type="list" target="updateProductCategoryToProdCatalog" title="" list-name="prodCatalogCategories" odd-row-style="alternate-row" default-table-style="basic-table"> @@ -135,8 +142,13 @@ <field name="thruDate" title="${uiLabelMap.CommonThruDateTime}"></field> <field name="sequenceNum" title="${uiLabelMap.CommonSequenceNum}"></field> <field name="deleteLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> - <hyperlink target="removeProductCategoryFromProdCatalog?prodCatalogId=${prodCatalogId}&amp;productCategoryId=${productCategoryId}&amp;fromDate=${fromDate}&amp;prodCatalogCategoryTypeId=${prodCatalogCategoryTypeId}" - description="${uiLabelMap.CommonDelete}" also-hidden="false"/> + <hyperlink target="removeProductCategoryFromProdCatalog" description="${uiLabelMap.CommonDelete}" also-hidden="false"> + <parameter param-name="prodCatalogId" from-field="prodCatalogId" /> + <parameter param-name="productCategoryId" from-field="productCategoryId" /> + <parameter param-name="partyId" from-field="partyId" /> + <parameter param-name="fromDate" from-field="fromDate" /> + <parameter param-name="prodCatalogCategoryTypeId" from-field="prodCatalogCategoryTypeId" /> + </hyperlink> </field> <field name="makeTopLink" title="${uiLabelMap.CommonEmptyHeader}" widget-style="buttontext"> <hyperlink target="EditCategory?CATALOG_TOP_CATEGORY=${productCategoryId}&amp;productCategoryId=${productCategoryId}" Modified: ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=760940&r1=760939&r2=760940&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml (original) +++ ofbiz/trunk/specialpurpose/projectmgr/widget/ProjectScreens.xml Wed Apr 1 15:57:25 2009 @@ -287,7 +287,11 @@ </widgets> <!-- Edit an existing SubTask --> <fail-widgets> - <container><link text="${uiLabelMap.CommonGoBack}" target="FindTask?workEffortId=${task.workEffortParentId}&amp;workEffortTypeId=TASK" style="buttontext"/></container> + <container> + <link text="${uiLabelMap.CommonGoBack}" target="FindTask" style="buttontext"> + <parameter param-name="workEffortId" from-field="task.workEffortParentId"/> + </link> + </container> <label style="h1">${uiLabelMap.ProjectMgrSubTaskName}: ${task.workEffortName}</label> <container><label style="h1">${uiLabelMap.PageTitleEditSubTask}</label></container> <platform-specific> From commitsjacobsonlaura@example.net Wed Apr 01 16:04:36 2009 Return-Path: <commitsjacobsonlaura@example.net> Delivered-To: jacobsonlaura@example.net Received: (qmail 23611 invoked from network); 1 Apr 2009 16:04:35 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Apr 2009 16:04:35 -0000 Received: (qmail 76504 invoked by uid 500); 1 Apr 2009 16:04:35 -0000 Delivered-To: jacobsonlaura@example.net Received: (qmail 76476 invoked by uid 500); 1 Apr 2009 16:04:35 -0000 Mailing-List: contact jacobsonlaura@example.net; run by ezmlm Precedence: bulk List-Help: <mailto:jacobsonlaura@example.net> List-Unsubscribe: <mailto:jacobsonlaura@example.net> List-Post: <mailto:jacobsonlaura@example.net> List-Id: <commits.ofbiz.apache.org> Reply-To: jacobsonlaura@example.net Delivered-To: mailing list jacobsonlaura@example.net Received: (qmail 76467 invoked by uid 99); 1 Apr 2009 16:04:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Apr 2009 16:04:35 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Apr 2009 16:04:27 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id F182F238896D; Wed, 1 Apr 2009 16:04:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r760944 - /ofbiz/trunk/framework/common/config/CommonEntityLabels.xml Date: Wed, 01 Apr 2009 16:04:06 -0000 To: jacobsonlaura@example.net From: jacobsonlaura@example.net X-Mailer: svnmailer-1.0.8 Message-Id: <jacobsonlaura@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: jleroux Date: Wed Apr 1 16:04:05 2009 New Revision: 760944 URL: http://svn.apache.org/viewvc?rev=760944&view=rev Log: A patch from Sam Hamilton "Added Spanish GeoNames " https://issues.apache.org/jira/browse/OFBIZ-2265 Modified: ofbiz/trunk/framework/common/config/CommonEntityLabels.xml Modified: ofbiz/trunk/framework/common/config/CommonEntityLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonEntityLabels.xml?rev=760944&r1=760943&r2=760944&view=diff ============================================================================== --- ofbiz/trunk/framework/common/config/CommonEntityLabels.xml (original) +++ ofbiz/trunk/framework/common/config/CommonEntityLabels.xml Wed Apr 1 16:04:05 2009 @@ -2821,6 +2821,7 @@ <value xml:lang="th">AB</value> </property> <property key="Geo.geoName.ABW"> + <value xml:lang="es">Aruba</value> <value xml:lang="de">Aruba</value> <value xml:lang="en">Aruba</value> <value xml:lang="fr">Aruba</value> @@ -2832,6 +2833,7 @@ <value xml:lang="zh">阿鲁巴</value> </property> <property key="Geo.geoName.AFG"> + <value xml:lang="es">Afganistán</value> <value xml:lang="de">Afghanistan</value> <value xml:lang="en">Afghanistan</value> <value xml:lang="fr">Afghanistan</value> @@ -2843,6 +2845,7 @@ <value xml:lang="zh">阿富汗</value> </property> <property key="Geo.geoName.AGO"> + <value xml:lang="es">Angola</value> <value xml:lang="de">Angola</value> <value xml:lang="en">Angola</value> <value xml:lang="fr">Angola</value> @@ -2854,6 +2857,7 @@ <value xml:lang="zh">安哥拉</value> </property> <property key="Geo.geoName.AIA"> + <value xml:lang="es">Anguilla</value> <value xml:lang="de">Anguilla</value> <value xml:lang="en">Anguilla</value> <value xml:lang="fr">Anguilla</value> @@ -2865,6 +2869,7 @@ <value xml:lang="zh">安圭拉</value> </property> <property key="Geo.geoName.ALB"> + <value xml:lang="es">Albania</value> <value xml:lang="de">Albanien</value> <value xml:lang="en">Albania</value> <value xml:lang="fr">Albanie</value> @@ -2876,6 +2881,7 @@ <value xml:lang="zh">阿尔巴尼亚</value> </property> <property key="Geo.geoName.AND"> + <value xml:lang="es">Andorra</value> <value xml:lang="de">Andorra</value> <value xml:lang="en">Andorra</value> <value xml:lang="fr">Andorre</value> @@ -2887,6 +2893,7 @@ <value xml:lang="zh">安道尔</value> </property> <property key="Geo.geoName.ANT"> + <value xml:lang="es">Antillas Holandesas</value> <value xml:lang="de">Niederländische Antillen</value> <value xml:lang="en">Netherlands Antilles</value> <value xml:lang="fr">Antilles néerlandaises</value> @@ -2900,6 +2907,7 @@ <property key="Geo.geoName.ARE"> <value xml:lang="de">Vereinigte Arabische Emirate</value> <value xml:lang="en">United Arab Emirates</value> + <value xml:lang="es">Emiratos Árabes Unidos</value> <value xml:lang="fr">Emirats Arabes Unis</value> <value xml:lang="it">Emirati Arabi Uniti</value> <value xml:lang="pt">United Arab Emirates</value> @@ -2909,6 +2917,7 @@ <value xml:lang="zh">阿联酋</value> </property> <property key="Geo.geoName.ARG"> + <value xml:lang="es">Argentina</value> <value xml:lang="de">Argentinien</value> <value xml:lang="en">Argentina</value> <value xml:lang="fr">Argentine</value> @@ -2920,6 +2929,7 @@ <value xml:lang="zh">阿根廷</value> </property> <property key="Geo.geoName.ARM"> + <value xml:lang="es">Armenia</value> <value xml:lang="de">Armenien</value> <value xml:lang="en">Armenia</value> <value xml:lang="fr">Arménie</value> @@ -2932,6 +2942,7 @@ <property key="Geo.geoName.ASM"> <value xml:lang="de">Amerikanisch-Samoa</value> <value xml:lang="en">American Samoa</value> + <value xml:lang="es">Samoa Americana</value> <value xml:lang="fr">Samoa américaines</value> <value xml:lang="it">Samoa Americana</value> <value xml:lang="pt">American Samoa</value> @@ -2941,6 +2952,7 @@ <value xml:lang="zh">美属萨摩亚</value> </property> <property key="Geo.geoName.ATA"> + <value xml:lang="es">Antártida</value> <value xml:lang="de">Antarktis</value> <value xml:lang="en">Antarctica</value> <value xml:lang="fr">Antarctique</value> @@ -2954,6 +2966,7 @@ <property key="Geo.geoName.ATF"> <value xml:lang="de">Französische Süd- und Antarktisgebiete</value> <value xml:lang="en">French Southern Territories</value> + <value xml:lang="es">Territorios Australes Franceses</value> <value xml:lang="fr">Terres australes françaises,</value> <value xml:lang="it">Territori del Sud Francesi</value> <value xml:lang="pt">French Southern Territories</value> @@ -2963,6 +2976,7 @@ <value xml:lang="zh">法属南半球领地</value> </property> <property key="Geo.geoName.ATG"> + <value xml:lang="es">Antigua y Barbuda</value> <value xml:lang="de">Antigua und Barbuda</value> <value xml:lang="en">Antigua And Barbuda</value> <value xml:lang="fr">Antigua et Barbuda</value> @@ -2974,6 +2988,7 @@ <value xml:lang="zh">安提瓜和巴布达</value> </property> <property key="Geo.geoName.AUS"> + <value xml:lang="es">Australia</value> <value xml:lang="de">Australien</value> <value xml:lang="en">Australia</value> <value xml:lang="fr">Australie</value> @@ -2985,6 +3000,7 @@ <value xml:lang="zh">澳大利亚</value> </property> <property key="Geo.geoName.AUT"> + <value xml:lang="es">Austria</value> <value xml:lang="de">Österreich</value> <value xml:lang="en">Austria</value> <value xml:lang="fr">Autriche</value> @@ -2996,6 +3012,7 @@ <value xml:lang="zh">奥地利</value> </property> <property key="Geo.geoName.AZE"> + <value xml:lang="es">Azerbaiyán</value> <value xml:lang="de">Aserbaidschan</value> <value xml:lang="en">Azerbaijan</value> <value xml:lang="fr">Azerbadjian</value> @@ -3016,6 +3033,7 @@ <property key="Geo.geoName.BDI"> <value xml:lang="de">Burundi</value> <value xml:lang="en">Burundi</value> + <value xml:lang="es">Burundi</value> <value xml:lang="fr">Burundi</value> <value xml:lang="it">Burundi</value> <value xml:lang="pt">Burundi</value> @@ -3025,6 +3043,7 @@ <value xml:lang="zh">布隆迪</value> </property> <property key="Geo.geoName.BEL"> + <value xml:lang="es">Bélgica</value> <value xml:lang="de">Belgien</value> <value xml:lang="en">Belgium</value> <value xml:lang="fr">Belgique</value> @@ -3036,6 +3055,7 @@ <value xml:lang="zh">比利时</value> </property> <property key="Geo.geoName.BEN"> + <value xml:lang="es">Benin</value> <value xml:lang="de">Benin</value> <value xml:lang="en">Benin</value> <value xml:lang="fr">Bénin</value> @@ -3047,6 +3067,7 @@ <value xml:lang="zh">贝宁</value> </property> <property key="Geo.geoName.BFA"> + <value xml:lang="es">Burkina Faso</value> <value xml:lang="de">Burkina Faso</value> <value xml:lang="en">Burkina Faso</value> <value xml:lang="fr">Burkina Faso</value> @@ -3058,6 +3079,7 @@ <value xml:lang="zh">布基纳法索</value> </property> <property key="Geo.geoName.BGD"> + <value xml:lang="es">Bangladesh</value> <value xml:lang="de">Bangladesch</value> <value xml:lang="en">Bangladesh</value> <value xml:lang="fr">Bengladesh</value> @@ -3068,6 +3090,7 @@ <value xml:lang="zh">孟加拉</value> </property> <property key="Geo.geoName.BGR"> + <value xml:lang="es">Bulgaria</value> <value xml:lang="de">Bulgarien</value> <value xml:lang="en">Bulgaria</value> <value xml:lang="fr">Bulgarie</value> @@ -3079,6 +3102,7 @@ <value xml:lang="zh">保加利亚</value> </property> <property key="Geo.geoName.BHR"> + <value xml:lang="es">Bahréin</value> <value xml:lang="de">Bahrain</value> <value xml:lang="en">Bahrain</value> <value xml:lang="fr">Barhain</value> @@ -3090,6 +3114,7 @@ <value xml:lang="zh">巴林</value> </property> <property key="Geo.geoName.BHS"> + <value xml:lang="es">Bahamas</value> <value xml:lang="de">Bahamas</value> <value xml:lang="en">Bahamas</value> <value xml:lang="fr">Bahamas</value> @@ -3101,6 +3126,7 @@ <value xml:lang="zh">巴哈马</value> </property> <property key="Geo.geoName.BIH"> + <value xml:lang="es">Bosnia y Herzegovina</value> <value xml:lang="de">Bosnien und Herzegowina</value> <value xml:lang="en">Bosnia And Herzegowina</value> <value xml:lang="fr">Bosnie-Herzégovine</value> @@ -3112,6 +3138,7 @@ <value xml:lang="zh">玻利尼亚和黑塞各维</value> </property> <property key="Geo.geoName.BLR"> + <value xml:lang="es">Bielorrusia</value> <value xml:lang="de">Belarus</value> <value xml:lang="en">Belarus</value> <value xml:lang="fr">Biélorussie</value> @@ -3123,6 +3150,7 @@ <value xml:lang="zh">白俄罗斯</value> </property> <property key="Geo.geoName.BLZ"> + <value xml:lang="es">Belice</value> <value xml:lang="de">Belize</value> <value xml:lang="en">Belize</value> <value xml:lang="fr">Bélize</value> @@ -3134,6 +3162,7 @@ <value xml:lang="zh">贝里斯</value> </property> <property key="Geo.geoName.BMU"> + <value xml:lang="es">Bermudas</value> <value xml:lang="de">Bermuda</value> <value xml:lang="en">Bermuda</value> <value xml:lang="fr">Bermudes</value> @@ -3145,6 +3174,7 @@ <value xml:lang="zh">百慕大</value> </property> <property key="Geo.geoName.BOL"> + <value xml:lang="es">Bolivia</value> <value xml:lang="de">Bolivien</value> <value xml:lang="en">Bolivia</value> <value xml:lang="fr">Bolivie</value> @@ -3156,6 +3186,7 @@ <value xml:lang="zh">玻利维亚</value> </property> <property key="Geo.geoName.BRA"> + <value xml:lang="es">Brasil</value> <value xml:lang="de">Brasilien</value> <value xml:lang="en">Brazil</value> <value xml:lang="fr">Brésil</value> @@ -3167,6 +3198,7 @@ <value xml:lang="zh">巴西</value> </property> <property key="Geo.geoName.BRB"> + <value xml:lang="es">Barbados</value> <value xml:lang="de">Barbados</value> <value xml:lang="en">Barbados</value> <value xml:lang="fr">Barbade</value> @@ -3178,6 +3210,7 @@ <value xml:lang="zh">巴巴多斯</value> </property> <property key="Geo.geoName.BRN"> + <value xml:lang="es">Brunéi</value> <value xml:lang="de">Brunei Darussalam</value> <value xml:lang="en">Brunei Darussalam</value> <value xml:lang="fr">Brunéi Darusalam</value> @@ -3189,6 +3222,7 @@ <value xml:lang="zh">文莱</value> </property> <property key="Geo.geoName.BTN"> + <value xml:lang="es">Bhután</value> <value xml:lang="de">Bhutan</value> <value xml:lang="en">Bhutan</value> <value xml:lang="fr">Bhutan</value> @@ -3200,6 +3234,7 @@ <value xml:lang="zh">不丹</value> </property> <property key="Geo.geoName.BVT"> + <value xml:lang="es">Isla Bouvet</value> <value xml:lang="de">Bouvetinsel</value> <value xml:lang="en">Bouvet Island</value> <value xml:lang="fr">Île Bouvet</value> @@ -3211,6 +3246,7 @@ <value xml:lang="zh">波维特岛</value> </property> <property key="Geo.geoName.BWA"> + <value xml:lang="es">Botsuana</value> <value xml:lang="de">Botswana</value> <value xml:lang="en">Botswana </value> <value xml:lang="fr">Botswana </value> @@ -3222,6 +3258,7 @@ <property key="Geo.geoName.CAF"> <value xml:lang="de">Zentralafrikanische Republik</value> <value xml:lang="en">Central African Republic</value> + <value xml:lang="es">República Centroafricana</value> <value xml:lang="fr">République Centrafricaine</value> <value xml:lang="it">Repubblica Centrale Africana</value> <value xml:lang="pt">Central African Republic</value> @@ -3233,6 +3270,7 @@ <property key="Geo.geoName.CAN"> <value xml:lang="de">Kanada</value> <value xml:lang="en">Canada</value> + <value xml:lang="es">Canadá</value> <value xml:lang="fr">Canada</value> <value xml:lang="it">Canada</value> <value xml:lang="pt">Canada</value> @@ -3244,6 +3282,7 @@ <property key="Geo.geoName.CCK"> <value xml:lang="de">Kokosinseln</value> <value xml:lang="en">Cocos (keeling) Islands</value> + <value xml:lang="es">Islas Cocos</value> <value xml:lang="fr">Île de Cocos (keeling)</value> <value xml:lang="it">Isole Cocos (keeling)</value> <value xml:lang="pt">Cocos (keeling) Islands</value> @@ -3255,6 +3294,7 @@ <property key="Geo.geoName.CHE"> <value xml:lang="de">Schweiz</value> <value xml:lang="en">Switzerland</value> + <value xml:lang="es">Suiza</value> <value xml:lang="fr">Suisse</value> <value xml:lang="it">Svizzera</value> <value xml:lang="pt">Switzerland</value> @@ -3266,6 +3306,7 @@ <property key="Geo.geoName.CHL"> <value xml:lang="de">Chile</value> <value xml:lang="en">Chile</value> + <value xml:lang="es">Chile</value> <value xml:lang="fr">Chili</value> <value xml:lang="it">Cile</value> <value xml:lang="pt">Chile</value> @@ -3277,6 +3318,7 @@ <property key="Geo.geoName.CHN"> <value xml:lang="de">China</value> <value xml:lang="en">China</value> + <value xml:lang="es">China</value> <value xml:lang="fr">Chine</value> <value xml:lang="it">Cina</value> <value xml:lang="pt">China</value> @@ -3288,6 +3330,7 @@ <property key="Geo.geoName.CIV"> <value xml:lang="de">Elfenbeinküste</value> <value xml:lang="en">Cote D'ivoire</value> + <value xml:lang="es">Costa de Marfil</value> <value xml:lang="fr">Côte D'ivoire</value> <value xml:lang="it">Costa D'Avorio</value> <value xml:lang="pt">Cote D'ivoire</value> @@ -3299,6 +3342,7 @@ <property key="Geo.geoName.CMR"> <value xml:lang="de">Kamerun</value> <value xml:lang="en">Cameroon</value> + <value xml:lang="es">Camerún</value> <value xml:lang="fr">Cameroun</value> <value xml:lang="it">Cameroon</value> <value xml:lang="pt">Cameroon</value> @@ -3310,6 +3354,7 @@ <property key="Geo.geoName.COD"> <value xml:lang="de">Demokratische Republik Kongo</value> <value xml:lang="en">Congo, The Democratic Republic Of The</value> + <value xml:lang="es">República Democrática del Congo</value> <value xml:lang="fr">République Démocratique du Congo</value> <value xml:lang="it">Repubblica Democratica del Congo</value> <value xml:lang="pt">Congo, The Democratic Republic Of The</value> @@ -3321,6 +3366,7 @@ <property key="Geo.geoName.COG"> <value xml:lang="de">Kongo</value> <value xml:lang="en">Congo</value> + <value xml:lang="es">Congo</value> <value xml:lang="fr">Congo</value> <value xml:lang="it">Congo</value> <value xml:lang="pt">Congo</value> @@ -3332,6 +3378,7 @@ <property key="Geo.geoName.COK"> <value xml:lang="de">Cookinseln</value> <value xml:lang="en">Cook Islands</value> + <value xml:lang="es">Islas Cook</value> <value xml:lang="fr">Les îles Cook</value> <value xml:lang="it">Isole Cook</value> <value xml:lang="pt">Cook Islands</value> @@ -3343,6 +3390,7 @@ <property key="Geo.geoName.COL"> <value xml:lang="de">Kolumbien</value> <value xml:lang="en">Colombia</value> + <value xml:lang="es">Colombia</value> <value xml:lang="fr">Colombie</value> <value xml:lang="it">Colombia</value> <value xml:lang="pt">Colombia</value> @@ -3354,6 +3402,7 @@ <property key="Geo.geoName.COM"> <value xml:lang="de">Komoren</value> <value xml:lang="en">Comoros</value> + <value xml:lang="es">Comoras</value> <value xml:lang="fr">Les Comores</value> <value xml:lang="it">Comoros</value> <value xml:lang="pt">Comoros</value> @@ -3365,6 +3414,7 @@ <property key="Geo.geoName.CPV"> <value xml:lang="de">Kap Verde</value> <value xml:lang="en">Cape Verde</value> + <value xml:lang="es">Cabo Verde</value> <value xml:lang="fr">Cap Vert</value> <value xml:lang="it">Capo Verde</value> <value xml:lang="pt">Cape Verde</value> @@ -3376,6 +3426,7 @@ <property key="Geo.geoName.CRI"> <value xml:lang="de">Costa Rica</value> <value xml:lang="en">Costa Rica</value> + <value xml:lang="es">Costa Rica</value> <value xml:lang="fr">Costa Rica</value> <value xml:lang="it">Costa Rica</value> <value xml:lang="pt">Costa Rica</value> @@ -3387,6 +3438,7 @@ <property key="Geo.geoName.CUB"> <value xml:lang="de">Kuba</value> <value xml:lang="en">Cuba</value> + <value xml:lang="es">Cuba</value> <value xml:lang="fr">Cuba</value> <value xml:lang="it">Cuba</value> <value xml:lang="pt">Cuba</value> @@ -3398,6 +3450,7 @@ <property key="Geo.geoName.CXR"> <value xml:lang="de">Weihnachtsinseln</value> <value xml:lang="en">Christmas Island</value> + <value xml:lang="es">Isla de Navidad</value> <value xml:lang="fr">Île Christmas</value> <value xml:lang="it">Isola Di Natale</value> <value xml:lang="pt">Christmas Island</value> @@ -3409,6 +3462,7 @@ <property key="Geo.geoName.CYM"> <value xml:lang="de">Kaimaninseln</value> <value xml:lang="en">Cayman Islands</value> + <value xml:lang="es">Islas Caimán</value> <value xml:lang="fr">Îles Cayman</value> <value xml:lang="it">Isole Cayman</value> <value xml:lang="pt">Cayman Islands</value> @@ -3420,6 +3474,7 @@ <property key="Geo.geoName.CYP"> <value xml:lang="de">Zypern</value> <value xml:lang="en">Cyprus</value> + <value xml:lang="es">Chipre</value> <value xml:lang="fr">Chypre</value> <value xml:lang="it">Cipro</value> <value xml:lang="pt">Cyprus</value> @@ -3431,6 +3486,7 @@ <property key="Geo.geoName.CZE"> <value xml:lang="de">Tschechische Republik</value> <value xml:lang="en">Czech Republic</value> + <value xml:lang="es">República Checa</value> <value xml:lang="fr">République Tchèque</value> <value xml:lang="it">Repubblica Ceca</value> <value xml:lang="pt">Czech Republic</value> @@ -3440,6 +3496,7 @@ <value xml:lang="zh">捷克</value> </property> <property key="Geo.geoName.DEU"> + <value xml:lang="es">Alemania</value> <value xml:lang="de">Deutschland</value> <value xml:lang="en">Germany</value> <value xml:lang="fr">Allemagne</value> @@ -3453,6 +3510,7 @@ <property key="Geo.geoName.DJI"> <value xml:lang="de">Djibouti</value> <value xml:lang="en">Djibouti</value> + <value xml:lang="es">Yibuti</value> <value xml:lang="fr">Djibouti</value> <value xml:lang="it">Djibouti</value> <value xml:lang="pt">Djibouti</value> @@ -3464,6 +3522,7 @@ <property key="Geo.geoName.DMA"> <value xml:lang="de">Dominica</value> <value xml:lang="en">Dominica</value> + <value xml:lang="es">Dominica</value> <value xml:lang="fr">Dominique</value> <value xml:lang="it">Domenicana</value> <value xml:lang="pt">Dominica</value> @@ -3475,6 +3534,7 @@ <property key="Geo.geoName.DNK"> <value xml:lang="de">Dänemark</value> <value xml:lang="en">Denmark</value> + <value xml:lang="es">Dinamarca</value> <value xml:lang="fr">Danemark</value> <value xml:lang="it">Danimarca</value> <value xml:lang="pt">Denmark</value> @@ -3486,6 +3546,7 @@ <property key="Geo.geoName.DOM"> <value xml:lang="de">Dominikanische Republik</value> <value xml:lang="en">Dominican Republic</value> + <value xml:lang="es">República Dominicana</value> <value xml:lang="fr">République Dominicaine</value> <value xml:lang="it">Repubblica Domenicana</value> <value xml:lang="pt">Dominican Republic</value> @@ -3495,6 +3556,7 @@ <value xml:lang="zh">多米尼加共和国</value> </property> <property key="Geo.geoName.DZA"> + <value xml:lang="es">Argelia</value> <value xml:lang="de">Algerien</value> <value xml:lang="en">Algeria</value> <value xml:lang="fr">Algérie</value> @@ -3508,6 +3570,7 @@ <property key="Geo.geoName.ECU"> <value xml:lang="de">Equador</value> <value xml:lang="en">Ecuador</value> + <value xml:lang="es">Ecuador</value> <value xml:lang="fr">Equateur</value> <value xml:lang="it">Ecuador</value> <value xml:lang="pt">Ecuador</value> @@ -3519,6 +3582,7 @@ <property key="Geo.geoName.EGY"> <value xml:lang="de">Ägypten</value> <value xml:lang="en">Egypt</value> + <value xml:lang="es">Egipto</value> <value xml:lang="fr">Egypte</value> <value xml:lang="it">Egitto</value> <value xml:lang="pt">Egypt</value> @@ -3548,6 +3612,7 @@ <property key="Geo.geoName.ERI"> <value xml:lang="de">Eritrea</value> <value xml:lang="en">Eritrea</value> + <value xml:lang="es">Eritrea</value> <value xml:lang="fr">Erytrée</value> <value xml:lang="it">Eritrea</value> <value xml:lang="pt">Eritrea</value> @@ -3559,6 +3624,7 @@ <property key="Geo.geoName.ESH"> <value xml:lang="de">Westliche Sahara</value> <value xml:lang="en">Western Sahara</value> + <value xml:lang="es">Sahara Occidental</value> <value xml:lang="fr">Sahara occidental</value> <value xml:lang="it">Sahara Occidentale</value> <value xml:lang="pt">Western Sahara</value> @@ -3581,6 +3647,7 @@ <property key="Geo.geoName.EST"> <value xml:lang="de">Estland</value> <value xml:lang="en">Estonia</value> + <value xml:lang="es">Estonia</value> <value xml:lang="fr">Estonie</value> <value xml:lang="it">Estonia</value> <value xml:lang="pt">Estonia</value> @@ -3592,6 +3659,7 @@ <property key="Geo.geoName.ETH"> <value xml:lang="de">Äthiopien</value> <value xml:lang="en">Ethiopia</value> + <value xml:lang="es">Etiopía</value> <value xml:lang="fr">Ethiopie</value> <value xml:lang="it">Etiopia</value> <value xml:lang="pt">Ethiopia</value> @@ -3603,6 +3671,7 @@ <property key="Geo.geoName.FIN"> <value xml:lang="de">Finnland</value> <value xml:lang="en">Finland</value> + <value xml:lang="es">Finlandia</value> <value xml:lang="fr">Finlande</value> <value xml:lang="it">Finlandia</value> <value xml:lang="pt">Finland</value> @@ -3614,6 +3683,7 @@ <property key="Geo.geoName.FJI"> <value xml:lang="de">Fidschi</value> <value xml:lang="en">Fiji</value> + <value xml:lang="es">Fiyi</value> <value xml:lang="fr">Îles Fidgi</value> <value xml:lang="it">Fiji</value> <value xml:lang="pt">Fiji</value> @@ -3625,6 +3695,7 @@ <property key="Geo.geoName.FLK"> <value xml:lang="de">Falklandinseln (Malwinen)</value> <value xml:lang="en">Falkland Islands (malvinas)</value> + <value xml:lang="es">Islas Malvinas</value> <value xml:lang="fr">Îles Falkland (Malouines)</value> <value xml:lang="it">Isole Falkland (malvinas)</value> <value xml:lang="pt">Falkland Islands (malvinas)</value> @@ -3636,6 +3707,7 @@ <property key="Geo.geoName.FRA"> <value xml:lang="de">Frankreich</value> <value xml:lang="en">France</value> + <value xml:lang="es">Francia</value> <value xml:lang="fr">France</value> <value xml:lang="it">Francia</value> <value xml:lang="pt">France</value> @@ -3647,6 +3719,7 @@ <property key="Geo.geoName.FRO"> <value xml:lang="de">Färöer Inseln</value> <value xml:lang="en">Faroe Islands</value> + <value xml:lang="es">Islas Feroe</value> <value xml:lang="fr">Îles Féroé</value> <value xml:lang="it">Isole Faroe</value> <value xml:lang="pt">Faroe Islands</value> @@ -3658,6 +3731,7 @@ <property key="Geo.geoName.FSM"> <value xml:lang="de">Föderierte Staaten von Mikronesien</value> <value xml:lang="en">Micronesia, Federated States Of</value> + <value xml:lang="es">Micronesia</value> <value xml:lang="fr">États fédérés de Micronésie</value> <value xml:lang="it">Stato Federale Della Micronesia</value> <value xml:lang="pt">Micronesia, Federated States Of</value> @@ -3680,6 +3754,7 @@ <property key="Geo.geoName.GAB"> <value xml:lang="de">Gabun</value> <value xml:lang="en">Gabon</value> + <value xml:lang="es">Gabón</value> <value xml:lang="fr">Gabon</value> <value xml:lang="it">Gabon</value> <value xml:lang="pt">Gabon</value> @@ -3691,6 +3766,7 @@ <property key="Geo.geoName.GBR"> <value xml:lang="de">Vereinigtes Königreich</value> <value xml:lang="en">United Kingdom</value> + <value xml:lang="es">Reino Unido</value> <value xml:lang="fr">Royaume-Uni</value> <value xml:lang="it">Regno Unito</value> <value xml:lang="pt">United Kingdom</value> @@ -3702,6 +3778,7 @@ <property key="Geo.geoName.GEO"> <value xml:lang="de">Georgien</value> <value xml:lang="en">Georgia</value> + <value xml:lang="es">Georgia</value> <value xml:lang="fr">Georgie</value> <value xml:lang="it">Georgia</value> <value xml:lang="pt">Georgia</value> @@ -3713,6 +3790,7 @@ <property key="Geo.geoName.GHA"> <value xml:lang="de">Ghana</value> <value xml:lang="en">Ghana</value> + <value xml:lang="es">Ghana</value> <value xml:lang="fr">Ghana</value> <value xml:lang="it">Ghana</value> <value xml:lang="pt">Ghana</value> @@ -3724,6 +3802,7 @@ <property key="Geo.geoName.GIB"> <value xml:lang="de">Gibraltar</value> <value xml:lang="en">Gibraltar</value> + <value xml:lang="es">Gibraltar</value> <value xml:lang="fr">Gibraltar</value> <value xml:lang="it">Gibilterra</value> <value xml:lang="pt">Gibraltar</value> @@ -3735,6 +3814,7 @@ <property key="Geo.geoName.GIN"> <value xml:lang="de">Guinea</value> <value xml:lang="en">Guinea</value> + <value xml:lang="es">Guinea</value> <value xml:lang="fr">Guinée</value> <value xml:lang="it">Guinea</value> <value xml:lang="pt">Guinea</value> @@ -3746,6 +3826,7 @@ <property key="Geo.geoName.GLP"> <value xml:lang="de">Guadeloupe</value> <value xml:lang="en">Guadeloupe</value> + <value xml:lang="es">Guadalupe</value> <value xml:lang="fr">Guadeloupe</value> <value xml:lang="it">Guadalupe</value> <value xml:lang="pt">Guadeloupe</value> @@ -3757,6 +3838,7 @@ <property key="Geo.geoName.GMB"> <value xml:lang="de">Gambia</value> <value xml:lang="en">Gambia</value> + <value xml:lang="es">Gambia</value> <value xml:lang="fr">Gambie</value> <value xml:lang="it">Gambia</value> <value xml:lang="pt">Gambia</value> @@ -3768,6 +3850,7 @@ <property key="Geo.geoName.GNB"> <value xml:lang="de">Guinea-Bissau</value> <value xml:lang="en">Guinea-bissau</value> + <value xml:lang="es">Guinea-Bissau</value> <value xml:lang="fr">Guinée-Bissau</value> <value xml:lang="it">Guinea-bissau</value> <value xml:lang="pt">Guinea-bissau</value> @@ -3779,6 +3862,7 @@ <property key="Geo.geoName.GNQ"> <value xml:lang="de">Äquatorialguinea</value> <value xml:lang="en">Equatorial Guinea</value> + <value xml:lang="es">Guinea Ecuatorial</value> <value xml:lang="fr">Guinée équatoriale</value> <value xml:lang="it">Guinea Equatoriale</value> <value xml:lang="pt">Equatorial Guinea</value> @@ -3790,6 +3874,7 @@ <property key="Geo.geoName.GRC"> <value xml:lang="de">Griechenland</value> <value xml:lang="en">Greece</value> + <value xml:lang="es">Grecia</value> <value xml:lang="fr">Grèce</value> <value xml:lang="it">Grecia</value> <value xml:lang="pt">Greece</value> @@ -3801,6 +3886,7 @@ <property key="Geo.geoName.GRD"> <value xml:lang="de">Grenada</value> <value xml:lang="en">Grenada</value> + <value xml:lang="es">Granada</value> <value xml:lang="fr">Grenade</value> <value xml:lang="it">Grenada</value> <value xml:lang="pt">Grenada</value> @@ -3812,6 +3898,7 @@ <property key="Geo.geoName.GRL"> <value xml:lang="de">Grönland</value> <value xml:lang="en">Greenland</value> + <value xml:lang="es">Groenlandia</value> <value xml:lang="fr">Groënland</value>
{'source': 'Apache Software Foundation Public Mail Archives'}