Return-Path: Delivered-To: apmail-ofbiz-commits-archive@www.apache.org Received: (qmail 80099 invoked from network); 10 Jan 2010 16:08:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 10 Jan 2010 16:08:31 -0000 Received: (qmail 17687 invoked by uid 500); 10 Jan 2010 16:08:30 -0000 Delivered-To: apmail-ofbiz-commits-archive@ofbiz.apache.org Received: (qmail 17616 invoked by uid 500); 10 Jan 2010 16:08:30 -0000 Mailing-List: contact commits-help@ofbiz.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ofbiz.apache.org Delivered-To: mailing list commits@ofbiz.apache.org Received: (qmail 17607 invoked by uid 99); 10 Jan 2010 16:08:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 10 Jan 2010 16:08:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 10 Jan 2010 16:08:27 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4933423888D1; Sun, 10 Jan 2010 16:08:06 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r897650 - in /ofbiz/trunk/applications: accounting/webapp/accounting/finaccounttrans/ accounting/webapp/accounting/period/ manufacturing/webapp/manufacturing/mrp/ manufacturing/webapp/manufacturing/routing/ party/webapp/partymgr/party/ part... Date: Sun, 10 Jan 2010 16:08:06 -0000 To: commits@ofbiz.apache.org From: buscob@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100110160806.4933423888D1@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: buscob Date: Sun Jan 10 16:08:05 2010 New Revision: 897650 URL: http://svn.apache.org/viewvc?rev=897650&view=rev Log: Changed some FTL screenlet-title-bar titles to match with what is rendered by the screenlet widget Modified: ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/AvsSettings.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Content.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/LoyaltyPoints.ftl ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/SerializedInventory.ftl ofbiz/trunk/applications/product/webapp/catalog/catalog/FindProdCatalog.ftl ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl Modified: ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl?rev=897650&r1=897649&r2=897650&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl Sun Jan 10 16:08:05 2010 @@ -23,7 +23,10 @@
- ${uiLabelMap.AccountingCurrentBankReconciliation} +
    +
  • ${uiLabelMap.AccountingCurrentBankReconciliation}
    • +
+
${uiLabelMap.CommonEdit} @@ -70,7 +73,10 @@
- ${uiLabelMap.AccountingPreviousBankReconciliation} +
    +
  • ${uiLabelMap.AccountingPreviousBankReconciliation}
    • +
+
<#if previousGlReconciliation?has_content> @@ -112,7 +118,10 @@
- ${uiLabelMap.AccountingFinAcctTransAssociatedToGlReconciliation} +
    +
  • ${uiLabelMap.AccountingFinAcctTransAssociatedToGlReconciliation}
    • +
+
<#if finAccountTransList?has_content> Modified: ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl?rev=897650&r1=897649&r2=897650&view=diff ============================================================================== --- ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl (original) +++ ofbiz/trunk/applications/accounting/webapp/accounting/period/EditCustomTimePeriod.ftl Sun Jan 10 16:08:05 2010 @@ -136,7 +136,10 @@
-

${uiLabelMap.AccountingChildPeriods}

+
    +
  • ${uiLabelMap.AccountingChildPeriods}
    • +
+
<#if customTimePeriods?has_content> @@ -230,7 +233,10 @@
-

${uiLabelMap.AccountingAddCustomTimePeriod}

+
    +
  • ${uiLabelMap.AccountingAddCustomTimePeriod}
    • +
+
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl?rev=897650&r1=897649&r2=897650&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/mrp/findInventoryEventPlan.ftl Sun Jan 10 16:08:05 2010 @@ -26,7 +26,10 @@
-

${uiLabelMap.PageTitleFindInventoryEventPlan}

+
    +
  • ${uiLabelMap.PageTitleFindInventoryEventPlan}
    • +
+
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl?rev=897650&r1=897649&r2=897650&view=diff ============================================================================== --- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl (original) +++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/routing/EditCalendar.ftl Sun Jan 10 16:08:05 2010 @@ -20,7 +20,10 @@ <#if techDataCalendar?has_content>
-

${uiLabelMap.ManufacturingUpdateCalendar}

+
    +
  • ${uiLabelMap.ManufacturingUpdateCalendar}
    • +
+
${uiLabelMap.ManufacturingNewCalendar} @@ -29,7 +32,10 @@ <#else>
-

${uiLabelMap.ManufacturingCreateCalendar}

+
    +
  • ${uiLabelMap.ManufacturingCreateCalendar}
    • +
+
${uiLabelMap.ManufacturingNewCalendar} Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl?rev=897650&r1=897649&r2=897650&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl Sun Jan 10 16:08:05 2010 @@ -219,7 +219,10 @@
-

${uiLabelMap.PartyQuickAddList}

+
    +
  • ${uiLabelMap.PartyQuickAddList}
    • +
+
Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl?rev=897650&r1=897649&r2=897650&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl Sun Jan 10 16:08:05 2010 @@ -35,7 +35,7 @@ <#else> <#assign createUrl = "createnew"/> -
${uiLabelMap.CommonCreateNew}
+
${uiLabelMap.CommonCreateNew}
<#if partyList?has_content> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl?rev=897650&r1=897649&r2=897650&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl Sun Jan 10 16:08:05 2010 @@ -25,7 +25,10 @@ <#if hasUpdatePermission>
-

${uiLabelMap.PartyLink}

+
    +
  • ${uiLabelMap.PartyLink}
    • +
+
<#if partyTo?has_content && partyFrom?has_content> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/AvsSettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/AvsSettings.ftl?rev=897650&r1=897649&r2=897650&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/AvsSettings.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/AvsSettings.ftl Sun Jan 10 16:08:05 2010 @@ -19,7 +19,10 @@
-

${uiLabelMap.PartyAvsOver}

+
    +
  • ${uiLabelMap.PartyAvsOver}
    • +
+
${uiLabelMap.PartyAvsString}${(avsOverride.avsDeclineString)?default("${uiLabelMap.CommonGlobal}")} Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Content.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Content.ftl?rev=897650&r1=897649&r2=897650&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Content.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Content.ftl Sun Jan 10 16:08:05 2010 @@ -18,7 +18,10 @@ -->
-

${uiLabelMap.PartyContent}

+
    +
  • ${uiLabelMap.PartyContent}
    • +
+
${screens.render("component://party/widget/partymgr/ProfileScreens.xml#ContentList")} Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/LoyaltyPoints.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/LoyaltyPoints.ftl?rev=897650&r1=897649&r2=897650&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/LoyaltyPoints.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/LoyaltyPoints.ftl Sun Jan 10 16:08:05 2010 @@ -20,7 +20,10 @@ <#if monthsToInclude?exists && totalSubRemainingAmount?exists && totalOrders?exists>
-

${uiLabelMap.PartyLoyaltyPoints}

+
    +
  • ${uiLabelMap.PartyLoyaltyPoints}
    • +
+
${uiLabelMap.PartyYouHave} ${totalSubRemainingAmount} ${uiLabelMap.PartyPointsFrom} ${totalOrders} ${uiLabelMap.PartyOrderInLast} ${monthsToInclude} ${uiLabelMap.CommonMonths}. Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/SerializedInventory.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/SerializedInventory.ftl?rev=897650&r1=897649&r2=897650&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/SerializedInventory.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/SerializedInventory.ftl Sun Jan 10 16:08:05 2010 @@ -19,7 +19,10 @@
-

${uiLabelMap.ProductSerializedInventorySummary}

+
    +
  • ${uiLabelMap.ProductSerializedInventorySummary}
    • +
+
Modified: ofbiz/trunk/applications/product/webapp/catalog/catalog/FindProdCatalog.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/catalog/FindProdCatalog.ftl?rev=897650&r1=897649&r2=897650&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/catalog/FindProdCatalog.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/catalog/FindProdCatalog.ftl Sun Jan 10 16:08:05 2010 @@ -18,7 +18,10 @@ -->
-

${uiLabelMap.ProductProductCatalogsList}

+
    +
  • ${uiLabelMap.ProductProductCatalogsList}
    • +
+
Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl?rev=897650&r1=897649&r2=897650&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl Sun Jan 10 16:08:05 2010 @@ -40,7 +40,10 @@ <#if ! productCategory?has_content> <#if productCategoryId?has_content>
-

${uiLabelMap.ProductCouldNotFindProductCategoryWithId} "${productCategoryId}".

+
    +
  • ${uiLabelMap.ProductCouldNotFindProductCategoryWithId} "${productCategoryId}".
    • +
+
@@ -54,7 +57,10 @@ <#else>
-

${uiLabelMap.PageTitleCreateProductCategory}

+
    +
  • ${uiLabelMap.PageTitleCreateProductCategory}
    • +
+