You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by le...@apache.org on 2010/05/08 15:51:22 UTC
svn commit: r942386 [1/4] - in /ofbiz/trunk:
applications/accounting/webapp/accounting/common/
applications/accounting/webapp/accounting/finaccounttrans/
applications/accounting/webapp/accounting/invoice/
applications/accounting/webapp/accounting/ledge...
Author: lektran
Date: Sat May 8 13:51:19 2010
New Revision: 942386
URL: http://svn.apache.org/viewvc?rev=942386&view=rev
Log:
Set svn properties on all freemarker files that were missing them
Modified:
ofbiz/trunk/applications/accounting/webapp/accounting/common/creditcardfields.ftl (props changed)
ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl (props changed)
ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl (props changed)
ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/ShowGlTransactions.ftl (props changed)
ofbiz/trunk/applications/accounting/webapp/accounting/invoice/PrintInvoices.fo.ftl (props changed)
ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl (props changed)
ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl (props changed)
ofbiz/trunk/applications/accounting/webapp/accounting/ledger/CostCenters.ftl (props changed)
ofbiz/trunk/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl (props changed)
ofbiz/trunk/applications/accounting/webapp/accounting/reports/CostCentersReport.fo.ftl (props changed)
ofbiz/trunk/applications/accounting/webapp/accounting/reports/CostCentersReport.ftl (props changed)
ofbiz/trunk/applications/accounting/webapp/accounting/reports/DepositSlip.fo.ftl (props changed)
ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionReport.ftl (props changed)
ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionRun.ftl (props changed)
ofbiz/trunk/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl (props changed)
ofbiz/trunk/applications/accounting/webapp/ap/reports/CommissionReport.fo.ftl (props changed)
ofbiz/trunk/applications/accounting/webapp/ar/invoice/ListInvoices.ftl (props changed)
ofbiz/trunk/applications/accounting/webapp/ar/payment/batchPayments.ftl (props changed)
ofbiz/trunk/applications/humanres/webapp/humanres/humanres/findEmployee.ftl (props changed)
ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl (contents, props changed)
ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactCommunicationPreview.ftl (props changed)
ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl (props changed)
ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl (props changed)
ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/addItemsToShoppingList.ftl (contents, props changed)
ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/javascript.ftl (contents, props changed)
ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl (props changed)
ofbiz/trunk/applications/order/webapp/ordermgr/order/GiftCertificates.ftl (props changed)
ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderListByDate.ftl (props changed)
ofbiz/trunk/applications/order/webapp/ordermgr/order/shipGroups.fo.ftl (props changed)
ofbiz/trunk/applications/order/webapp/ordermgr/request/requestContactMech.ftl (contents, props changed)
ofbiz/trunk/applications/order/webapp/ordermgr/return/returnLinks.ftl (props changed)
ofbiz/trunk/applications/party/templates/email/ChangePersonalInfoNotification.ftl (props changed)
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl (props changed)
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/ProductStores.ftl (props changed)
ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/mytasks.ftl (props changed)
ofbiz/trunk/applications/product/templates/shipment/FedexShipRequestTemplate.xml.ftl (props changed)
ofbiz/trunk/applications/product/templates/shipment/FedexSubscriptionRequestTemplate.xml.ftl (props changed)
ofbiz/trunk/applications/product/webapp/catalog/find/exportproducts.ftl (props changed)
ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl (contents, props changed)
ofbiz/trunk/applications/product/webapp/catalog/product/ProductInventorySummary.ftl (props changed)
ofbiz/trunk/applications/product/webapp/facility/facility/batchPrintMarkAsAccepted.ftl (contents, props changed)
ofbiz/trunk/applications/product/webapp/facility/returns/UpdatedInventoryItemStatus.ftl (props changed)
ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromInventory.ftl (props changed)
ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl (props changed)
ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl (props changed)
ofbiz/trunk/applications/product/webapp/facility/shipment/WeightPackage.ftl (props changed)
ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/calendarEventContent.ftl (props changed)
ofbiz/trunk/applications/workeffort/webapp/workeffort/workeffort/EventReminderEmail.ftl (props changed)
ofbiz/trunk/framework/bi/webapp/bi/main.ftl (contents, props changed)
ofbiz/trunk/framework/common/webcommon/WEB-INF/geolocation.ftl (contents, props changed)
ofbiz/trunk/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl (props changed)
ofbiz/trunk/framework/common/webcommon/includes/commonMacros.ftl (props changed)
ofbiz/trunk/framework/common/webcommon/includes/geolocation.ftl (contents, props changed)
ofbiz/trunk/framework/common/webcommon/includes/helplink.ftl (contents, props changed)
ofbiz/trunk/framework/common/webcommon/includes/listVisualThemes.ftl (props changed)
ofbiz/trunk/framework/common/webcommon/includes/lookupFooter.ftl (props changed)
ofbiz/trunk/framework/common/webcommon/viewBlocked.ftl (contents, props changed)
ofbiz/trunk/framework/example/webapp/birt/birt/report.ftl (contents, props changed)
ofbiz/trunk/framework/example/webapp/example/reports/fonts.fo.ftl (contents, props changed)
ofbiz/trunk/framework/webtools/webapp/webtools/component/viewComponents.ftl (props changed)
ofbiz/trunk/framework/webtools/webapp/webtools/service/serviceResult.ftl (props changed)
ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprMacros.ftl (props changed)
ofbiz/trunk/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl (props changed)
ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl (props changed)
ofbiz/trunk/framework/widget/templates/csvScreenMacroLibrary.ftl (props changed)
ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl (props changed)
ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl (props changed)
ofbiz/trunk/framework/widget/templates/htmlTreeMacroLibrary.ftl (contents, props changed)
ofbiz/trunk/framework/widget/templates/textScreenMacroLibrary.ftl (props changed)
ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/EbayAdvancedSearch.ftl (props changed)
ofbiz/trunk/specialpurpose/ebay/webapp/ebay/find/EbayKeywordSearch.ftl (props changed)
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/feedback/LeaveFeedback.ftl (props changed)
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/StoreSetting.ftl (props changed)
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/ebayApiKeywordSearch.ftl (props changed)
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/orderImported.ftl (props changed)
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/productsearchExport.ftl (props changed)
ofbiz/trunk/specialpurpose/ebaystore/webapp/ebaystore/store/returnPolicy.ftl (props changed)
ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactListUnsubscribeEmail.ftl (props changed)
ofbiz/trunk/specialpurpose/ecommerce/templates/email/ContactUsEmail.ftl (props changed)
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/TextImage.ftl (props changed)
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/blogs.ftl (props changed)
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl (contents, props changed)
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/blog/menubar.ftl (props changed)
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/cart/UpdateCart.ftl (props changed)
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredCategoryDetail.ftl (props changed)
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/catalog/LayeredNavBar.ftl (props changed)
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/AnonContactus.ftl (props changed)
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl (props changed)
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl (props changed)
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl (props changed)
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl (props changed)
ofbiz/trunk/specialpurpose/googlebase/webapp/googlebase/find/GoogleBaseAdvancedSearch.ftl (props changed)
ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/includes/messages.ftl (contents, props changed)
ofbiz/trunk/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl (contents, props changed)
ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ConfirmBod.ftl (contents, props changed)
ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl (contents, props changed)
ofbiz/trunk/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl (contents, props changed)
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/survey/ListSurveys.ftl (props changed)
ofbiz/trunk/specialpurpose/projectmgr/webapp/projectmgr/survey/TestWorkEffortSurvey.ftl (props changed)
ofbiz/trunk/themes/bizznesstime/includes/appbar.ftl (props changed)
ofbiz/trunk/themes/bizznesstime/includes/footer.ftl (props changed)
ofbiz/trunk/themes/bizznesstime/includes/header.ftl (props changed)
ofbiz/trunk/themes/bizznesstime/includes/messages.ftl (props changed)
ofbiz/trunk/themes/bizznesstime/includes/secondary-appbar.ftl (props changed)
ofbiz/trunk/themes/bluelight/includes/appbarClose.ftl (contents, props changed)
ofbiz/trunk/themes/bluelight/includes/appbarOpen.ftl (contents, props changed)
ofbiz/trunk/themes/droppingcrumbs/includes/appbarClose.ftl (contents, props changed)
ofbiz/trunk/themes/droppingcrumbs/includes/appbarOpen.ftl (contents, props changed)
ofbiz/trunk/themes/droppingcrumbs/includes/footer.ftl (contents, props changed)
ofbiz/trunk/themes/droppingcrumbs/includes/header.ftl (contents, props changed)
ofbiz/trunk/themes/multiflex/includes/footer.ftl (contents, props changed)
ofbiz/trunk/themes/multiflex/includes/header.ftl (contents, props changed)
ofbiz/trunk/themes/tomahawk/includes/appbarClose.ftl (props changed)
ofbiz/trunk/themes/tomahawk/includes/appbarOpen.ftl (props changed)
ofbiz/trunk/themes/tomahawk/includes/footer.ftl (props changed)
ofbiz/trunk/themes/tomahawk/includes/header.ftl (props changed)
Propchange: ofbiz/trunk/applications/accounting/webapp/accounting/common/creditcardfields.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May 8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/FinAccountTrans.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May 8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/GlReconciledFinAccountTrans.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May 8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/accounting/webapp/accounting/finaccounttrans/ShowGlTransactions.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May 8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/accounting/webapp/accounting/invoice/PrintInvoices.fo.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May 8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ofbiz/trunk/applications/accounting/webapp/accounting/ledger/CostCenters.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May 8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/accounting/webapp/accounting/payment/depositWithdrawPayments.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May 8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/accounting/webapp/accounting/reports/CostCentersReport.fo.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May 8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/accounting/webapp/accounting/reports/CostCentersReport.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May 8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/accounting/webapp/accounting/reports/DepositSlip.fo.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May 8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionReport.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May 8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/accounting/webapp/ap/invoices/CommissionRun.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May 8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/accounting/webapp/ap/invoices/PurchaseInvoices.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May 8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/accounting/webapp/ap/reports/CommissionReport.fo.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May 8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/accounting/webapp/ar/invoice/ListInvoices.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May 8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/accounting/webapp/ar/payment/batchPayments.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May 8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/humanres/webapp/humanres/humanres/findEmployee.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May 8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"
Modified: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl?rev=942386&r1=942385&r2=942386&view=diff
==============================================================================
--- ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl (original)
+++ ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl Sat May 8 13:51:19 2010
@@ -1,31 +1,31 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<#list taskInfos as taskInfo>
-<div class="screenlet">
- <div class="screenlet-title-bar">
- <#assign task = taskInfo.task>
- <#assign taskForm = taskInfo.taskForm>
- <h3>${task.workEffortName?if_exists} [${task.workEffortId}]</h3>
- </div>
- <div class="screenlet-body">
- ${taskForm.renderFormString(context)}
- </div>
-</div>
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#list taskInfos as taskInfo>
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <#assign task = taskInfo.task>
+ <#assign taskForm = taskInfo.taskForm>
+ <h3>${task.workEffortName?if_exists} [${task.workEffortId}]</h3>
+ </div>
+ <div class="screenlet-body">
+ ${taskForm.renderFormString(context)}
+ </div>
+</div>
</#list>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactCommunicationPreview.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactCommunicationPreview.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/marketing/webapp/marketing/contact/ContactCommunicationPreview.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ofbiz/trunk/applications/marketing/webapp/sfa/contact/mergeContacts.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May 8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/marketing/webapp/sfa/lead/mergeLeads.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May 8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/addItemsToShoppingList.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/addItemsToShoppingList.ftl?rev=942386&r1=942385&r2=942386&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/addItemsToShoppingList.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/addItemsToShoppingList.ftl Sat May 8 13:51:19 2010
@@ -1,61 +1,61 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<!-- Screenlet to add cart to shopping list. The shopping lists are presented in a dropdown box. -->
-
-<#if (shoppingLists?exists) && (shoppingCartSize > 0)>
- <div class="screenlet">
- <div class="screenlet-title-bar">
- <div class="h3">${uiLabelMap.OrderAddOrderToShoppingList}</div>
- </div>
- <div class="screenlet-body">
- <table border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td>
- <form method="post" name="addBulkToShoppingList" action="<@o...@ofbizUrl>" style='margin: 0;'>
- <#assign index = 0/>
- <#list shoppingCart.items() as cartLine>
- <#if (cartLine.getProductId()?exists) && !cartLine.getIsPromo()>
- <input type="hidden" name="selectedItem" value="${index}"/>
- </#if>
- <#assign index = index + 1/>
- </#list>
- <table border="0">
- <tr>
- <td>
- <div>
- <select name='shoppingListId'>
- <#list shoppingLists as shoppingList>
- <option value='${shoppingList.shoppingListId}'>${shoppingList.getString("listName")}</option>
- </#list>
- <option value="">---</option>
- <option value="">${uiLabelMap.OrderNewShoppingList}</option>
- </select>
- <input type="submit" class="smallSubmit" value="${uiLabelMap.OrderAddToShoppingList}"/>
- </div>
- </td>
- </tr>
- </table>
- </form>
- </td>
- </tr>
- </table>
- </div>
- </div>
-</#if>
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<!-- Screenlet to add cart to shopping list. The shopping lists are presented in a dropdown box. -->
+
+<#if (shoppingLists?exists) && (shoppingCartSize > 0)>
+ <div class="screenlet">
+ <div class="screenlet-title-bar">
+ <div class="h3">${uiLabelMap.OrderAddOrderToShoppingList}</div>
+ </div>
+ <div class="screenlet-body">
+ <table border="0" cellspacing="0" cellpadding="0">
+ <tr>
+ <td>
+ <form method="post" name="addBulkToShoppingList" action="<@o...@ofbizUrl>" style='margin: 0;'>
+ <#assign index = 0/>
+ <#list shoppingCart.items() as cartLine>
+ <#if (cartLine.getProductId()?exists) && !cartLine.getIsPromo()>
+ <input type="hidden" name="selectedItem" value="${index}"/>
+ </#if>
+ <#assign index = index + 1/>
+ </#list>
+ <table border="0">
+ <tr>
+ <td>
+ <div>
+ <select name='shoppingListId'>
+ <#list shoppingLists as shoppingList>
+ <option value='${shoppingList.shoppingListId}'>${shoppingList.getString("listName")}</option>
+ </#list>
+ <option value="">---</option>
+ <option value="">${uiLabelMap.OrderNewShoppingList}</option>
+ </select>
+ <input type="submit" class="smallSubmit" value="${uiLabelMap.OrderAddToShoppingList}"/>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </form>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </div>
+</#if>
Propchange: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/addItemsToShoppingList.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/addItemsToShoppingList.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/addItemsToShoppingList.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/javascript.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/javascript.ftl?rev=942386&r1=942385&r2=942386&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/javascript.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/javascript.ftl Sat May 8 13:51:19 2010
@@ -1,105 +1,105 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<script language="JavaScript" type="text/javascript">
-function toggle(e) {
- e.checked = !e.checked;
-}
-function checkToggle(e) {
- var cform = document.cartform;
- if (e.checked) {
- var len = cform.elements.length;
- var allchecked = true;
- for (var i = 0; i < len; i++) {
- var element = cform.elements[i];
- if (element.name == "selectedItem" && !element.checked) {
- allchecked = false;
- }
- cform.selectAll.checked = allchecked;
- }
- } else {
- cform.selectAll.checked = false;
- }
-}
-function toggleAll() {
- var cform = document.cartform;
- var len = cform.elements.length;
- for (var i = 0; i < len; i++) {
- var e = cform.elements[i];
- if (e.name == "selectedItem") {
- toggle(e);
- }
- }
-}
-function removeSelected() {
- var cform = document.cartform;
- cform.removeSelected.value = true;
- cform.submit();
-}
-function addToList() {
- var cform = document.cartform;
- cform.action = "<@o...@ofbizUrl>";
- cform.submit();
-}
-function gwAll(e) {
- var cform = document.cartform;
- var len = cform.elements.length;
- var selectedValue = e.value;
- if (selectedValue == "") {
- return;
- }
-
- var cartSize = ${shoppingCartSize};
- var passed = 0;
- for (var i = 0; i < len; i++) {
- var element = cform.elements[i];
- var ename = element.name;
- var sname = ename.substring(0,16);
- if (sname == "option^GIFT_WRAP") {
- var options = element.options;
- var olen = options.length;
- var matching = -1;
- for (var x = 0; x < olen; x++) {
- var thisValue = element.options[x].value;
- if (thisValue == selectedValue) {
- element.selectedIndex = x;
- passed++;
- }
- }
- }
- }
- if (cartSize > passed && selectedValue != "NO^") {
- alert("${uiLabelMap.OrderSelectedGiftNotAvailableForAll}");
- }
- cform.submit();
-}
-function quicklookup_popup(element) {
- target = element; // note: global var target comes from fieldlookup.js
- var searchTerm = element.value;
- var obj_lookupwindow = window.open('LookupProduct?productId_op=like&productId_ic=Y&productId=' + searchTerm,'FieldLookup', 'width=700,height=550,scrollbars=yes,status=no,resizable=yes,top='+my+',left='+mx+',dependent=yes,alwaysRaised=yes');
- obj_lookupwindow.opener = window;
- obj_lookupwindow.focus();
-}
-function quicklookup(element) {
- <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
- window.location='<@o...@ofbizUrl>?productId='+element.value;
- <#else>
- window.location='<@o...@ofbizUrl>?productId='+element.value;
- </#if>
-}
-</script>
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<script language="JavaScript" type="text/javascript">
+function toggle(e) {
+ e.checked = !e.checked;
+}
+function checkToggle(e) {
+ var cform = document.cartform;
+ if (e.checked) {
+ var len = cform.elements.length;
+ var allchecked = true;
+ for (var i = 0; i < len; i++) {
+ var element = cform.elements[i];
+ if (element.name == "selectedItem" && !element.checked) {
+ allchecked = false;
+ }
+ cform.selectAll.checked = allchecked;
+ }
+ } else {
+ cform.selectAll.checked = false;
+ }
+}
+function toggleAll() {
+ var cform = document.cartform;
+ var len = cform.elements.length;
+ for (var i = 0; i < len; i++) {
+ var e = cform.elements[i];
+ if (e.name == "selectedItem") {
+ toggle(e);
+ }
+ }
+}
+function removeSelected() {
+ var cform = document.cartform;
+ cform.removeSelected.value = true;
+ cform.submit();
+}
+function addToList() {
+ var cform = document.cartform;
+ cform.action = "<@o...@ofbizUrl>";
+ cform.submit();
+}
+function gwAll(e) {
+ var cform = document.cartform;
+ var len = cform.elements.length;
+ var selectedValue = e.value;
+ if (selectedValue == "") {
+ return;
+ }
+
+ var cartSize = ${shoppingCartSize};
+ var passed = 0;
+ for (var i = 0; i < len; i++) {
+ var element = cform.elements[i];
+ var ename = element.name;
+ var sname = ename.substring(0,16);
+ if (sname == "option^GIFT_WRAP") {
+ var options = element.options;
+ var olen = options.length;
+ var matching = -1;
+ for (var x = 0; x < olen; x++) {
+ var thisValue = element.options[x].value;
+ if (thisValue == selectedValue) {
+ element.selectedIndex = x;
+ passed++;
+ }
+ }
+ }
+ }
+ if (cartSize > passed && selectedValue != "NO^") {
+ alert("${uiLabelMap.OrderSelectedGiftNotAvailableForAll}");
+ }
+ cform.submit();
+}
+function quicklookup_popup(element) {
+ target = element; // note: global var target comes from fieldlookup.js
+ var searchTerm = element.value;
+ var obj_lookupwindow = window.open('LookupProduct?productId_op=like&productId_ic=Y&productId=' + searchTerm,'FieldLookup', 'width=700,height=550,scrollbars=yes,status=no,resizable=yes,top='+my+',left='+mx+',dependent=yes,alwaysRaised=yes');
+ obj_lookupwindow.opener = window;
+ obj_lookupwindow.focus();
+}
+function quicklookup(element) {
+ <#if shoppingCart.getOrderType() == "PURCHASE_ORDER">
+ window.location='<@o...@ofbizUrl>?productId='+element.value;
+ <#else>
+ window.location='<@o...@ofbizUrl>?productId='+element.value;
+ </#if>
+}
+</script>
Propchange: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/javascript.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/javascript.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/order/webapp/ordermgr/entry/cart/javascript.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ofbiz/trunk/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May 8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/order/webapp/ordermgr/order/GiftCertificates.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May 8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/order/webapp/ordermgr/order/OrderListByDate.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May 8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/order/webapp/ordermgr/order/shipGroups.fo.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/webapp/ordermgr/order/shipGroups.fo.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/order/webapp/ordermgr/order/shipGroups.fo.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/requestContactMech.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/requestContactMech.ftl?rev=942386&r1=942385&r2=942386&view=diff
==============================================================================
--- ofbiz/trunk/applications/order/webapp/ordermgr/request/requestContactMech.ftl (original)
+++ ofbiz/trunk/applications/order/webapp/ordermgr/request/requestContactMech.ftl Sat May 8 13:51:19 2010
@@ -1,79 +1,79 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<#if fulfillContactMech?has_content>
-
-<#if "POSTAL_ADDRESS" == fulfillContactMech.contactMechTypeId>
- <#assign label = uiLabelMap.PartyAddressMailingShipping>
- <#assign postalAddress = fulfillContactMech.getRelatedOneCache("PostalAddress")?if_exists>
-<#elseif "EMAIL_ADDRESS" == fulfillContactMech.contactMechTypeId>
- <#assign label = uiLabelMap.PartyToEmailAddress>
- <#assign emailAddress = fulfillContactMech.infoString?if_exists>
-<#elseif "TELECOM_NUMBER" == fulfillContactMech.contactMechTypeId>
- <#assign label = uiLabelMap.PartyPhoneNumber>
- <#assign telecomNumber = fulfillContactMech.getRelatedOneCache("TelecomNumber")?if_exists>
-</#if>
-
-<div class="screenlet">
- <div class="screenlet-title-bar">
- <div class="h3">${uiLabelMap.PartyContactInformation}</div>
- </div>
- <div class="screenlet-body">
- <table cellspacing="0" class="basic-table">
- <tr>
- <td align="right" valign="top" width="25%" class="label">
- ${label?default(uiLabelMap.PartyUnknown)}
- </td>
- <td width="5%"> </td>
- <td valign="top" width="70%">
- <div>
- <#if emailAddress?has_content>${emailAddress}</#if>
-
- <#if postalAddress?has_content>
- <#if postalAddress.toName?has_content><span class="label">${uiLabelMap.PartyAddrToName}</span> ${postalAddress.toName}<br /></#if>
- <#if postalAddress.attnName?has_content><span class="label">${uiLabelMap.PartyAddrAttnName}</span> ${postalAddress.attnName}<br /></#if>
- ${postalAddress.address1?if_exists}<br />
- <#if postalAddress.address2?has_content>${postalAddress.address2}<br /></#if>
- ${postalAddress.city?if_exists},
- <#if postalAddress.stateProvinceGeoId?has_content>
- <#assign stateProvince = postalAddress.getRelatedOneCache("StateProvinceGeo")>
- ${stateProvince.abbreviation?default(stateProvince.geoId)}
- </#if>
- ${postalAddress.postalCode?if_exists}
- <#if postalAddress.countryGeoId?has_content><br />
- <#assign country = postalAddress.getRelatedOneCache("CountryGeo")>
- ${country.geoName?default(country.geoId)}
- </#if>
- </#if>
-
- <#if telecomNumber?has_content>
- ${telecomNumber.countryCode?if_exists}
- <#if telecomNumber.areaCode?has_content>${telecomNumber.areaCode?default("000")}-</#if>${telecomNumber.contactNumber?default("000-0000")}
- <#if (telecomNumber?has_content && !telecomNumber.countryCode?has_content) || telecomNumber.countryCode = "011">
- <a target="_blank" href="${uiLabelMap.CommonLookupAnywhoLink}" class="buttontext">${uiLabelMap.CommonLookupAnywho}</a>
- <a target="_blank" href="${uiLabelMap.CommonLookupWhitepagesTelNumberLink}" class="buttontext">${uiLabelMap.CommonLookupWhitepages}</a>
- </#if>
- </#if>
- </div>
- </td>
- </tr>
- </table>
- </div>
-</div>
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#if fulfillContactMech?has_content>
+
+<#if "POSTAL_ADDRESS" == fulfillContactMech.contactMechTypeId>
+ <#assign label = uiLabelMap.PartyAddressMailingShipping>
+ <#assign postalAddress = fulfillContactMech.getRelatedOneCache("PostalAddress")?if_exists>
+<#elseif "EMAIL_ADDRESS" == fulfillContactMech.contactMechTypeId>
+ <#assign label = uiLabelMap.PartyToEmailAddress>
+ <#assign emailAddress = fulfillContactMech.infoString?if_exists>
+<#elseif "TELECOM_NUMBER" == fulfillContactMech.contactMechTypeId>
+ <#assign label = uiLabelMap.PartyPhoneNumber>
+ <#assign telecomNumber = fulfillContactMech.getRelatedOneCache("TelecomNumber")?if_exists>
+</#if>
+
+<div class="screenlet">
+ <div class="screenlet-title-bar">
+ <div class="h3">${uiLabelMap.PartyContactInformation}</div>
+ </div>
+ <div class="screenlet-body">
+ <table cellspacing="0" class="basic-table">
+ <tr>
+ <td align="right" valign="top" width="25%" class="label">
+ ${label?default(uiLabelMap.PartyUnknown)}
+ </td>
+ <td width="5%"> </td>
+ <td valign="top" width="70%">
+ <div>
+ <#if emailAddress?has_content>${emailAddress}</#if>
+
+ <#if postalAddress?has_content>
+ <#if postalAddress.toName?has_content><span class="label">${uiLabelMap.PartyAddrToName}</span> ${postalAddress.toName}<br /></#if>
+ <#if postalAddress.attnName?has_content><span class="label">${uiLabelMap.PartyAddrAttnName}</span> ${postalAddress.attnName}<br /></#if>
+ ${postalAddress.address1?if_exists}<br />
+ <#if postalAddress.address2?has_content>${postalAddress.address2}<br /></#if>
+ ${postalAddress.city?if_exists},
+ <#if postalAddress.stateProvinceGeoId?has_content>
+ <#assign stateProvince = postalAddress.getRelatedOneCache("StateProvinceGeo")>
+ ${stateProvince.abbreviation?default(stateProvince.geoId)}
+ </#if>
+ ${postalAddress.postalCode?if_exists}
+ <#if postalAddress.countryGeoId?has_content><br />
+ <#assign country = postalAddress.getRelatedOneCache("CountryGeo")>
+ ${country.geoName?default(country.geoId)}
+ </#if>
+ </#if>
+
+ <#if telecomNumber?has_content>
+ ${telecomNumber.countryCode?if_exists}
+ <#if telecomNumber.areaCode?has_content>${telecomNumber.areaCode?default("000")}-</#if>${telecomNumber.contactNumber?default("000-0000")}
+ <#if (telecomNumber?has_content && !telecomNumber.countryCode?has_content) || telecomNumber.countryCode = "011">
+ <a target="_blank" href="${uiLabelMap.CommonLookupAnywhoLink}" class="buttontext">${uiLabelMap.CommonLookupAnywho}</a>
+ <a target="_blank" href="${uiLabelMap.CommonLookupWhitepagesTelNumberLink}" class="buttontext">${uiLabelMap.CommonLookupWhitepages}</a>
+ </#if>
+ </#if>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </div>
+</div>
</#if>
\ No newline at end of file
Propchange: ofbiz/trunk/applications/order/webapp/ordermgr/request/requestContactMech.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/order/webapp/ordermgr/request/requestContactMech.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/order/webapp/ordermgr/request/requestContactMech.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnLinks.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May 8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/party/templates/email/ChangePersonalInfoNotification.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/party/templates/email/ChangePersonalInfoNotification.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/party/templates/email/ChangePersonalInfoNotification.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/ProductStores.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May 8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/mytasks.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May 8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/product/templates/shipment/FedexShipRequestTemplate.xml.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May 8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/product/templates/shipment/FedexShipRequestTemplate.xml.ftl
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Sat May 8 13:51:19 2010
@@ -1 +1 @@
-text/xml
+text/plain
Propchange: ofbiz/trunk/applications/product/templates/shipment/FedexSubscriptionRequestTemplate.xml.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May 8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/product/templates/shipment/FedexSubscriptionRequestTemplate.xml.ftl
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Sat May 8 13:51:19 2010
@@ -1 +1 @@
-text/xml
+text/plain
Propchange: ofbiz/trunk/applications/product/webapp/catalog/find/exportproducts.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/product/webapp/catalog/find/exportproducts.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/product/webapp/catalog/find/exportproducts.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl?rev=942386&r1=942385&r2=942386&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl Sat May 8 13:51:19 2010
@@ -1,76 +1,76 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<#if productId?exists && product?exists>
- <table cellspacing="0" class="basic-table">
- <tr class="header-row">
- <td>${uiLabelMap.PartyPartyId}</td>
- <td>${uiLabelMap.PartyRole}</td>
- <td>${uiLabelMap.CommonSequenceNum}</td>
- <td>${uiLabelMap.CommonComments}</td>
- <td>${uiLabelMap.CommonFromDateTime}</td>
- <td>${uiLabelMap.CommonThruDateTime}</td>
- <td> </td>
- </tr>
- <#assign line = 0>
- <#assign rowClass = "2">
- <#list productRoles as productRole>
- <#assign line = line + 1>
- <#assign curRoleType = productRole.getRelatedOneCache("RoleType")>
- <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
- <td><a href="/partymgr/control/viewprofile?partyId=${(productRole.partyId)?if_exists}" target="_blank" class="buttontext">${(productRole.partyId)?if_exists}</a></td>
- <td>${(curRoleType.get("description",locale))?if_exists}</td>
- <td>${productRole.sequenceNum?if_exists}</td>
- <td>${productRole.comments?if_exists}</td>
- <#assign hasntStarted = false>
- <#if (productRole.getTimestamp("fromDate"))?exists && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().before(productRole.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if>
- <td<#if hasntStarted> class="alert"</#if>>${(productRole.fromDate)?if_exists}</td>
- <td align="center">
- <form method="post" action="<@o...@ofbizUrl>" name="lineForm${line}">
- <#assign hasExpired = false>
- <#if (productRole.getTimestamp("thruDate"))?exists && (Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().after(productRole.getTimestamp("thruDate")))> <#assign hasExpired = true></#if>
- <input type="hidden" name="productId" value="${(productRole.productId)?if_exists}" />
- <input type="hidden" name="partyId" value="${(productRole.partyId)?if_exists}" />
- <input type="hidden" name="roleTypeId" value="${(productRole.roleTypeId)?if_exists}" />
- <input type="hidden" name="fromDate" value="${(productRole.getTimestamp("fromDate"))?if_exists}" />
- <input type="text" size="25" name="thruDate" value="${(productRole. getTimestamp("thruDate"))?if_exists}"<#if hasExpired> class="alert"</#if> />
- <a href="javascript:call_cal(document.lineForm${line}.thruDate, '${(productRole.getTimestamp("thruDate"))?default(nowTimestamp?string)}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
- <input type="submit" value="${uiLabelMap.CommonUpdate}" />
- </form>
- </td>
-
- <td align="center">
- <form action="<@o...@ofbizUrl>" method="post">
- <input type="hidden" name="partyId" value="${(productRole.partyId)?if_exists}" />
- <input type="hidden" name="productId" value="${(productRole.productId)?if_exists}" />
- <input type="hidden" name="roleTypeId" value="${(productRole.roleTypeId)?if_exists}" />
- <input type="hidden" name="fromDate" value="${productRole.getString("fromDate")}" />
- <input type="submit" value="${uiLabelMap.CommonDelete}" />
- </form>
- </td>
- </tr>
- <#-- toggle the row color -->
- <#if rowClass == "2">
- <#assign rowClass = "1">
- <#else>
- <#assign rowClass = "2">
- </#if>
- </#list>
- </table>
-</#if>
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#if productId?exists && product?exists>
+ <table cellspacing="0" class="basic-table">
+ <tr class="header-row">
+ <td>${uiLabelMap.PartyPartyId}</td>
+ <td>${uiLabelMap.PartyRole}</td>
+ <td>${uiLabelMap.CommonSequenceNum}</td>
+ <td>${uiLabelMap.CommonComments}</td>
+ <td>${uiLabelMap.CommonFromDateTime}</td>
+ <td>${uiLabelMap.CommonThruDateTime}</td>
+ <td> </td>
+ </tr>
+ <#assign line = 0>
+ <#assign rowClass = "2">
+ <#list productRoles as productRole>
+ <#assign line = line + 1>
+ <#assign curRoleType = productRole.getRelatedOneCache("RoleType")>
+ <tr valign="middle"<#if rowClass == "1"> class="alternate-row"</#if>>
+ <td><a href="/partymgr/control/viewprofile?partyId=${(productRole.partyId)?if_exists}" target="_blank" class="buttontext">${(productRole.partyId)?if_exists}</a></td>
+ <td>${(curRoleType.get("description",locale))?if_exists}</td>
+ <td>${productRole.sequenceNum?if_exists}</td>
+ <td>${productRole.comments?if_exists}</td>
+ <#assign hasntStarted = false>
+ <#if (productRole.getTimestamp("fromDate"))?exists && Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().before(productRole.getTimestamp("fromDate"))> <#assign hasntStarted = true></#if>
+ <td<#if hasntStarted> class="alert"</#if>>${(productRole.fromDate)?if_exists}</td>
+ <td align="center">
+ <form method="post" action="<@o...@ofbizUrl>" name="lineForm${line}">
+ <#assign hasExpired = false>
+ <#if (productRole.getTimestamp("thruDate"))?exists && (Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp().after(productRole.getTimestamp("thruDate")))> <#assign hasExpired = true></#if>
+ <input type="hidden" name="productId" value="${(productRole.productId)?if_exists}" />
+ <input type="hidden" name="partyId" value="${(productRole.partyId)?if_exists}" />
+ <input type="hidden" name="roleTypeId" value="${(productRole.roleTypeId)?if_exists}" />
+ <input type="hidden" name="fromDate" value="${(productRole.getTimestamp("fromDate"))?if_exists}" />
+ <input type="text" size="25" name="thruDate" value="${(productRole. getTimestamp("thruDate"))?if_exists}"<#if hasExpired> class="alert"</#if> />
+ <a href="javascript:call_cal(document.lineForm${line}.thruDate, '${(productRole.getTimestamp("thruDate"))?default(nowTimestamp?string)}');"><img src="<@o...@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar" /></a>
+ <input type="submit" value="${uiLabelMap.CommonUpdate}" />
+ </form>
+ </td>
+
+ <td align="center">
+ <form action="<@o...@ofbizUrl>" method="post">
+ <input type="hidden" name="partyId" value="${(productRole.partyId)?if_exists}" />
+ <input type="hidden" name="productId" value="${(productRole.productId)?if_exists}" />
+ <input type="hidden" name="roleTypeId" value="${(productRole.roleTypeId)?if_exists}" />
+ <input type="hidden" name="fromDate" value="${productRole.getString("fromDate")}" />
+ <input type="submit" value="${uiLabelMap.CommonDelete}" />
+ </form>
+ </td>
+ </tr>
+ <#-- toggle the row color -->
+ <#if rowClass == "2">
+ <#assign rowClass = "1">
+ <#else>
+ <#assign rowClass = "2">
+ </#if>
+ </#list>
+ </table>
+</#if>
Propchange: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ofbiz/trunk/applications/product/webapp/catalog/product/ProductInventorySummary.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May 8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"
Modified: ofbiz/trunk/applications/product/webapp/facility/facility/batchPrintMarkAsAccepted.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/batchPrintMarkAsAccepted.ftl?rev=942386&r1=942385&r2=942386&view=diff
==============================================================================
--- ofbiz/trunk/applications/product/webapp/facility/facility/batchPrintMarkAsAccepted.ftl (original)
+++ ofbiz/trunk/applications/product/webapp/facility/facility/batchPrintMarkAsAccepted.ftl Sat May 8 13:51:19 2010
@@ -1,46 +1,46 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<#--
- The form widget of type multi can have only one submit button, and hence only one operation on the selected labels.
- To support more than one action, we can create another submit button outside the form and use a javascript
- function to change the target of the multi form and submit it.
-
- In this case, the multi form has two actions: Print as labels, which generates a PDF of selected labels, and
- mark as accepted, which updates the selected shipment route segments. The label printing button is handled
- normally in the form widget. The mark action is handled here using the technique described above. If more
- actions are required, we can create more submit buttons in this file with their own action-changing submit functions.
-
- Note that the facilityId in the form action is a trick to pass the facilityId on to the next request.
- Also note that for layout purposes, the submit button in the form widget can be converted and moved here so that all
- the buttons can be arranged as desired.
-
--->
-
-
-<script type="text/javascript">
-<!--
- function markAsAccepted() {
- document.Labels.action = "<@o...@ofbizUrl>";
- document.Labels.submit();
- }
-//-->
-</script>
-
-<input type="submit" class="smallSubmit" value="${uiLabelMap.ProductMarkAsAccepted}" onclick="javascript:markAsAccepted()"/>
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<#--
+ The form widget of type multi can have only one submit button, and hence only one operation on the selected labels.
+ To support more than one action, we can create another submit button outside the form and use a javascript
+ function to change the target of the multi form and submit it.
+
+ In this case, the multi form has two actions: Print as labels, which generates a PDF of selected labels, and
+ mark as accepted, which updates the selected shipment route segments. The label printing button is handled
+ normally in the form widget. The mark action is handled here using the technique described above. If more
+ actions are required, we can create more submit buttons in this file with their own action-changing submit functions.
+
+ Note that the facilityId in the form action is a trick to pass the facilityId on to the next request.
+ Also note that for layout purposes, the submit button in the form widget can be converted and moved here so that all
+ the buttons can be arranged as desired.
+
+-->
+
+
+<script type="text/javascript">
+<!--
+ function markAsAccepted() {
+ document.Labels.action = "<@o...@ofbizUrl>";
+ document.Labels.submit();
+ }
+//-->
+</script>
+
+<input type="submit" class="smallSubmit" value="${uiLabelMap.ProductMarkAsAccepted}" onclick="javascript:markAsAccepted()"/>
Propchange: ofbiz/trunk/applications/product/webapp/facility/facility/batchPrintMarkAsAccepted.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/applications/product/webapp/facility/facility/batchPrintMarkAsAccepted.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/product/webapp/facility/facility/batchPrintMarkAsAccepted.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ofbiz/trunk/applications/product/webapp/facility/returns/UpdatedInventoryItemStatus.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May 8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromInventory.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May 8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May 8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May 8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/product/webapp/facility/shipment/WeightPackage.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May 8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/calendarEventContent.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May 8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/workeffort/webapp/workeffort/workeffort/EventReminderEmail.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/applications/workeffort/webapp/workeffort/workeffort/EventReminderEmail.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ofbiz/trunk/framework/bi/webapp/bi/main.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/bi/webapp/bi/main.ftl?rev=942386&r1=942385&r2=942386&view=diff
==============================================================================
--- ofbiz/trunk/framework/bi/webapp/bi/main.ftl (original)
+++ ofbiz/trunk/framework/bi/webapp/bi/main.ftl Sat May 8 13:51:19 2010
@@ -1,56 +1,56 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<h1>${uiLabelMap.BusinessIntelligenceIntegratedFramework}</h1>
-<p>
- ${uiLabelMap.BusinessIntelligenceNote1}
- ${uiLabelMap.BusinessIntelligenceNote2}
- ${uiLabelMap.BusinessIntelligenceNote3}
- ${uiLabelMap.BusinessIntelligenceNote4}
- ${uiLabelMap.BusinessIntelligenceNote5}
- ${uiLabelMap.BusinessIntelligenceNote6}
- ${uiLabelMap.BusinessIntelligenceNote7}
- ${uiLabelMap.BusinessIntelligenceNote8}
- ${uiLabelMap.BusinessIntelligenceNote9}
- ${uiLabelMap.BusinessIntelligenceNote10}
- ${uiLabelMap.BusinessIntelligenceNote11}
- ${uiLabelMap.BusinessIntelligenceNote12}
-</p>
-<h2>${uiLabelMap.BusinessIntelligenceCurrentStatus}</h2>
-<p>
- ${uiLabelMap.BusinessIntelligenceNote13}
- ${uiLabelMap.BusinessIntelligenceNote14}
- ${uiLabelMap.BusinessIntelligenceNote15}
- ${uiLabelMap.BusinessIntelligenceNote16}
- ${uiLabelMap.BusinessIntelligenceNote17}
- ${uiLabelMap.BusinessIntelligenceNote18}
-</p>
-<h2>${uiLabelMap.BusinessIntelligenceQuickStartGuide}</h2>
-<p>
- ${uiLabelMap.BusinessIntelligenceNote19}
- ${uiLabelMap.BusinessIntelligenceNote20}
- ${uiLabelMap.BusinessIntelligenceNote21}
- ${uiLabelMap.BusinessIntelligenceNote22}
- ${uiLabelMap.BusinessIntelligenceNote23}
- ${uiLabelMap.BusinessIntelligenceNote24}
- ${uiLabelMap.BusinessIntelligenceNote25}
- ${uiLabelMap.BusinessIntelligenceNote26}
- ${uiLabelMap.BusinessIntelligenceNote27}
- ${uiLabelMap.BusinessIntelligenceNote28}
-</p>
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<h1>${uiLabelMap.BusinessIntelligenceIntegratedFramework}</h1>
+<p>
+ ${uiLabelMap.BusinessIntelligenceNote1}
+ ${uiLabelMap.BusinessIntelligenceNote2}
+ ${uiLabelMap.BusinessIntelligenceNote3}
+ ${uiLabelMap.BusinessIntelligenceNote4}
+ ${uiLabelMap.BusinessIntelligenceNote5}
+ ${uiLabelMap.BusinessIntelligenceNote6}
+ ${uiLabelMap.BusinessIntelligenceNote7}
+ ${uiLabelMap.BusinessIntelligenceNote8}
+ ${uiLabelMap.BusinessIntelligenceNote9}
+ ${uiLabelMap.BusinessIntelligenceNote10}
+ ${uiLabelMap.BusinessIntelligenceNote11}
+ ${uiLabelMap.BusinessIntelligenceNote12}
+</p>
+<h2>${uiLabelMap.BusinessIntelligenceCurrentStatus}</h2>
+<p>
+ ${uiLabelMap.BusinessIntelligenceNote13}
+ ${uiLabelMap.BusinessIntelligenceNote14}
+ ${uiLabelMap.BusinessIntelligenceNote15}
+ ${uiLabelMap.BusinessIntelligenceNote16}
+ ${uiLabelMap.BusinessIntelligenceNote17}
+ ${uiLabelMap.BusinessIntelligenceNote18}
+</p>
+<h2>${uiLabelMap.BusinessIntelligenceQuickStartGuide}</h2>
+<p>
+ ${uiLabelMap.BusinessIntelligenceNote19}
+ ${uiLabelMap.BusinessIntelligenceNote20}
+ ${uiLabelMap.BusinessIntelligenceNote21}
+ ${uiLabelMap.BusinessIntelligenceNote22}
+ ${uiLabelMap.BusinessIntelligenceNote23}
+ ${uiLabelMap.BusinessIntelligenceNote24}
+ ${uiLabelMap.BusinessIntelligenceNote25}
+ ${uiLabelMap.BusinessIntelligenceNote26}
+ ${uiLabelMap.BusinessIntelligenceNote27}
+ ${uiLabelMap.BusinessIntelligenceNote28}
+</p>
Propchange: ofbiz/trunk/framework/bi/webapp/bi/main.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/framework/bi/webapp/bi/main.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/framework/bi/webapp/bi/main.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: ofbiz/trunk/framework/common/webcommon/WEB-INF/geolocation.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/WEB-INF/geolocation.ftl?rev=942386&r1=942385&r2=942386&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/webcommon/WEB-INF/geolocation.ftl (original)
+++ ofbiz/trunk/framework/common/webcommon/WEB-INF/geolocation.ftl Sat May 8 13:51:19 2010
@@ -1,48 +1,48 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<#if geoPoint?has_content>
- <#if geoPoint.latitude?has_content && geoPoint.longitude?has_content>
- ${uiLabelMap.CommonLatitude}${geoPoint.latitude}<br/>
- ${uiLabelMap.CommonLongitude}${geoPoint.longitude}
- <#if geoPoint.elevation?has_content>
- <br/>${uiLabelMap.CommonElevation}${geoPoint.elevation} ${elevationUomAbbr?if_exists}
- </#if>
- <#if geoPoint.dataSourceId?has_content>
- <#if geoPoint.dataSourceId == "GEOPT_GOOGLE">
- <div id="map" style="border:1px solid #979797; background-color:#e5e3df; width:400px; height:300px; margin:2em auto;">
- <div style="padding:1em; color:gray;">${uiLabelMap.CommonLoading}</div>
- </div>
- <#assign defaultUrl = "https." + request.getServerName()>
- <#assign defaultGogleMapKey = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("general.properties", defaultUrl)>
- <script src="http://maps.google.com/maps?file=api&v=2&key=${defaultGogleMapKey}"
- type="text/javascript">
- </script>
- <script type="text/javascript">
- loadGoogleMap("${geoPoint.latitude}",
- "${geoPoint.longitude}")
- </script>
- <#elseif geoPoint.dataSourceId == "GEOPT_YAHOO">
- <#elseif geoPoint.dataSourceId == "GEOPT_MICROSOFT">
- <#elseif geoPoint.dataSourceId == "GEOPT_MAPTP">
- </#if>
- </#if>
- </#if>
-<#else>
- <h2>${uiLabelMap.CommonNoGeolocationAvailable}</h2>
-</#if>
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<#if geoPoint?has_content>
+ <#if geoPoint.latitude?has_content && geoPoint.longitude?has_content>
+ ${uiLabelMap.CommonLatitude}${geoPoint.latitude}<br/>
+ ${uiLabelMap.CommonLongitude}${geoPoint.longitude}
+ <#if geoPoint.elevation?has_content>
+ <br/>${uiLabelMap.CommonElevation}${geoPoint.elevation} ${elevationUomAbbr?if_exists}
+ </#if>
+ <#if geoPoint.dataSourceId?has_content>
+ <#if geoPoint.dataSourceId == "GEOPT_GOOGLE">
+ <div id="map" style="border:1px solid #979797; background-color:#e5e3df; width:400px; height:300px; margin:2em auto;">
+ <div style="padding:1em; color:gray;">${uiLabelMap.CommonLoading}</div>
+ </div>
+ <#assign defaultUrl = "https." + request.getServerName()>
+ <#assign defaultGogleMapKey = Static["org.ofbiz.base.util.UtilProperties"].getPropertyValue("general.properties", defaultUrl)>
+ <script src="http://maps.google.com/maps?file=api&v=2&key=${defaultGogleMapKey}"
+ type="text/javascript">
+ </script>
+ <script type="text/javascript">
+ loadGoogleMap("${geoPoint.latitude}",
+ "${geoPoint.longitude}")
+ </script>
+ <#elseif geoPoint.dataSourceId == "GEOPT_YAHOO">
+ <#elseif geoPoint.dataSourceId == "GEOPT_MICROSOFT">
+ <#elseif geoPoint.dataSourceId == "GEOPT_MAPTP">
+ </#if>
+ </#if>
+ </#if>
+<#else>
+ <h2>${uiLabelMap.CommonNoGeolocationAvailable}</h2>
+</#if>
Propchange: ofbiz/trunk/framework/common/webcommon/WEB-INF/geolocation.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/framework/common/webcommon/WEB-INF/geolocation.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/framework/common/webcommon/WEB-INF/geolocation.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: ofbiz/trunk/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Sat May 8 13:51:19 2010
@@ -1 +1 @@
-Date Rev Author URL Id
+"Date Rev Author URL Id"
Propchange: ofbiz/trunk/framework/common/webcommon/includes/commonMacros.ftl
------------------------------------------------------------------------------
svn:keywords = "Date Rev Author URL Id"
Propchange: ofbiz/trunk/framework/common/webcommon/includes/commonMacros.ftl
------------------------------------------------------------------------------
svn:mime-type = text/plain