svn commit: r942474 [1/3] - in /ofbiz/branches/release09.04: applications/accounting/webapp
Locked
svn commit: r942474 [1/3] - in /ofbiz/branches/release09.04: applications/accounting/webapp
 
|
Author: lektran
Date: Sat May 8 22:08:40 2010 New Revision: 942474 URL: http://svn.apache.org/viewvc?rev=942474&view=rev Log: Set svn properties on all freemarker files that were missing them Modified: ofbiz/branches/release09.04/applications/accounting/webapp/accounting/common/creditcardfields.ftl (contents, props changed) ofbiz/branches/release09.04/applications/accounting/webapp/accounting/fixedasset/DepreciationReport.ftl (props changed) ofbiz/branches/release09.04/applications/accounting/webapp/accounting/fixedasset/FixedAssetGeoLocation.ftl (contents, props changed) ofbiz/branches/release09.04/applications/accounting/webapp/accounting/invoice/InvoiceSubTabBar.ftl (props changed) ofbiz/branches/release09.04/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl (contents, props changed) ofbiz/branches/release09.04/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl (contents, props changed) ofbiz/branches/release09.04/applications/accounting/webapp/accounting/payment/PaymentSubTabBar.ftl (props changed) ofbiz/branches/release09.04/applications/accounting/webapp/ar/main.ftl (props changed) ofbiz/branches/release09.04/applications/humanres/webapp/humanres/humanres/findEmployee.ftl (props changed) ofbiz/branches/release09.04/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl (contents, props changed) ofbiz/branches/release09.04/applications/marketing/webapp/marketing/contact/ContactCommunicationPreview.ftl (props changed) ofbiz/branches/release09.04/applications/marketing/webapp/sfa/contact/mergeContacts.ftl (props changed) ofbiz/branches/release09.04/applications/marketing/webapp/sfa/lead/mergeLeads.ftl (props changed) ofbiz/branches/release09.04/applications/marketing/webapp/sfa/party/findSfaParty.ftl (props changed) ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/cart/addItemsToShoppingList.ftl (contents, props changed) ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/cart/javascript.ftl (contents, props changed) ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl (props changed) ofbiz/branches/release09.04/applications/order/webapp/ordermgr/order/shipGroups.fo.ftl (props changed) ofbiz/branches/release09.04/applications/order/webapp/ordermgr/request/requestContactMech.ftl (contents, props changed) ofbiz/branches/release09.04/applications/order/webapp/ordermgr/return/returnLinks.ftl (props changed) ofbiz/branches/release09.04/applications/party/templates/email/ChangePersonalInfoNotification.ftl (props changed) ofbiz/branches/release09.04/applications/party/webapp/partymgr/party/partygeolocation.ftl (contents, props changed) ofbiz/branches/release09.04/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl (props changed) ofbiz/branches/release09.04/applications/party/webapp/partymgr/party/profileblocks/mytasks.ftl (props changed) ofbiz/branches/release09.04/applications/product/templates/shipment/FedexShipRequestTemplate.xml.ftl (props changed) ofbiz/branches/release09.04/applications/product/templates/shipment/FedexSubscriptionRequestTemplate.xml.ftl (props changed) ofbiz/branches/release09.04/applications/product/webapp/catalog/find/exportproducts.ftl (props changed) ofbiz/branches/release09.04/applications/product/webapp/catalog/product/EditProductParties.ftl (contents, props changed) ofbiz/branches/release09.04/applications/product/webapp/catalog/product/ProductInventorySummary.ftl (props changed) ofbiz/branches/release09.04/applications/product/webapp/facility/facility/FacilityLocationGeoLocation.ftl (contents, props changed) ofbiz/branches/release09.04/applications/product/webapp/facility/facility/batchPrintMarkAsAccepted.ftl (contents, props changed) ofbiz/branches/release09.04/applications/product/webapp/facility/shipment/AddItemsFromInventory.ftl (props changed) ofbiz/branches/release09.04/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl (props changed) ofbiz/branches/release09.04/applications/product/webapp/facility/shipment/VerifyPick.ftl (props changed) ofbiz/branches/release09.04/applications/workeffort/webapp/workeffort/workeffort/EventReminderEmail.ftl (props changed) ofbiz/branches/release09.04/framework/bi/webapp/bi/main.ftl (contents, props changed) ofbiz/branches/release09.04/framework/common/webcommon/WEB-INF/geolocation.ftl (contents, props changed) ofbiz/branches/release09.04/framework/common/webcommon/includes/ajaxAutocompleteOptions.ftl (props changed) ofbiz/branches/release09.04/framework/common/webcommon/includes/commonMacros.ftl (props changed) ofbiz/branches/release09.04/framework/common/webcommon/includes/helplink.ftl (contents, props changed) ofbiz/branches/release09.04/framework/common/webcommon/includes/listVisualThemes.ftl (props changed) ofbiz/branches/release09.04/framework/common/webcommon/includes/lookupFooter.ftl (props changed) ofbiz/branches/release09.04/framework/common/webcommon/viewBlocked.ftl (contents, props changed) ofbiz/branches/release09.04/framework/example/webapp/example/reports/fonts.fo.ftl (contents, props changed) ofbiz/branches/release09.04/framework/webtools/webapp/webtools/component/viewComponents.ftl (props changed) ofbiz/branches/release09.04/framework/webtools/webapp/webtools/service/serviceResult.ftl (props changed) ofbiz/branches/release09.04/framework/webtools/webapp/webtools/tempexpr/tempExprMacros.ftl (props changed) ofbiz/branches/release09.04/framework/webtools/webapp/webtools/tempexpr/tempExprMaint.ftl (props changed) ofbiz/branches/release09.04/framework/widget/templates/foFormMacroLibrary.ftl (props changed) ofbiz/branches/release09.04/framework/widget/templates/htmlFormMacroLibrary.ftl (props changed) ofbiz/branches/release09.04/framework/widget/templates/textScreenMacroLibrary.ftl (props changed) ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/blog/TextImage.ftl (props changed) ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/blog/blogs.ftl (contents, props changed) ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/blog/main.ftl (contents, props changed) ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/blog/menubar.ftl (contents, props changed) ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/customer/miniSignUpForContactList.ftl (contents, props changed) ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/customer/profile/EditPostalAddress.ftl (props changed) ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/includes/headerHead.ftl (contents, props changed) ofbiz/branches/release09.04/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl (props changed) ofbiz/branches/release09.04/specialpurpose/hhfacility/webapp/hhfacility/includes/messages.ftl (contents, props changed) ofbiz/branches/release09.04/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl (contents, props changed) ofbiz/branches/release09.04/specialpurpose/oagis/webapp/oagis/message/ConfirmBod.ftl (contents, props changed) ofbiz/branches/release09.04/specialpurpose/oagis/webapp/oagis/message/ProcessShipment.ftl (contents, props changed) ofbiz/branches/release09.04/specialpurpose/oagis/webapp/oagis/message/ReceiveDelivery.ftl (contents, props changed) ofbiz/branches/release09.04/themes/bizznesstime/includes/appbar.ftl (props changed) ofbiz/branches/release09.04/themes/bizznesstime/includes/footer.ftl (props changed) ofbiz/branches/release09.04/themes/bizznesstime/includes/header.ftl (props changed) ofbiz/branches/release09.04/themes/bizznesstime/includes/messages.ftl (props changed) ofbiz/branches/release09.04/themes/bizznesstime/includes/secondary-appbar.ftl (props changed) ofbiz/branches/release09.04/themes/multiflex/includes/footer.ftl (contents, props changed) ofbiz/branches/release09.04/themes/multiflex/includes/header.ftl (contents, props changed) Modified: ofbiz/branches/release09.04/applications/accounting/webapp/accounting/common/creditcardfields.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/accounting/webapp/accounting/common/creditcardfields.ftl?rev=942474&r1=942473&r2=942474&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/accounting/webapp/accounting/common/creditcardfields.ftl (original) +++ ofbiz/branches/release09.04/applications/accounting/webapp/accounting/common/creditcardfields.ftl Sat May 8 22:08:40 2010 @@ -1,181 +1,181 @@ -<#-- -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 !creditCard?has_content> - <#assign creditCard = requestParameters> -</#if> - -<#if !paymentMethod?has_content> - <#assign paymentMethod = requestParameters> -</#if> - - <tr> - <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingCompanyNameCard}</td> - <td width="5"> </td> - <td width="74%"> - <input type="text" size="30" maxlength="60" name="companyNameOnCard" value="${creditCard.companyNameOnCard?if_exists}"/> - </td> - </tr> - <tr> - <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingPrefixCard}</td> - <td width="5"> </td> - <td width="74%"> - <select name="titleOnCard"> - <option value="">${uiLabelMap.CommonSelectOne}</option> - <option<#if ((creditCard.titleOnCard)?default("") == "${uiLabelMap.CommonTitleMr}")> selected</#if>>${uiLabelMap.CommonTitleMr}</option> - <option<#if ((creditCard.titleOnCard)?default("") == "Mrs.")> selected</#if>>${uiLabelMap.CommonTitleMrs}</option> - <option<#if ((creditCard.titleOnCard)?default("") == "Ms.")> selected</#if>>${uiLabelMap.CommonTitleMs}</option> - <option<#if ((creditCard.titleOnCard)?default("") == "Dr.")> selected</#if>>${uiLabelMap.CommonTitleDr}</option> - </select> - </td> - </tr> - <tr> - <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingFirstNameCard}</td> - <td width="5"> </td> - <td width="74%"> - <input type="text" size="20" maxlength="60" name="firstNameOnCard" value="${(creditCard.firstNameOnCard)?if_exists}"/> - <#if showToolTip?has_content><span class="tooltip">${uiLabelMap.CommonRequired}</span><#else>*</#if></td> - </tr> - <tr> - <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingMiddleNameCard}</td> - <td width="5"> </td> - <td width="74%"> - <input type="text" size="15" maxlength="60" name="middleNameOnCard" value="${(creditCard.middleNameOnCard)?if_exists}"/> - </td> - </tr> - <tr> - <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingLastNameCard}</td> - <td width="5"> </td> - <td width="74%"> - <input type="text" size="20" maxlength="60" name="lastNameOnCard" value="${(creditCard.lastNameOnCard)?if_exists}"/> - <#if showToolTip?has_content><span class="tooltip">${uiLabelMap.CommonRequired}</span><#else>*</#if></td> - </tr> - <tr> - <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingSuffixCard}</td> - <td width="5"> </td> - <td width="74%"> - <select name="suffixOnCard"> - <option value="">${uiLabelMap.CommonSelectOne}</option> - <option<#if ((creditCard.suffixOnCard)?default("") == "Jr.")> selected</#if>>Jr.</option> - <option<#if ((creditCard.suffixOnCard)?default("") == "Sr.")> selected</#if>>Sr.</option> - <option<#if ((creditCard.suffixOnCard)?default("") == "I")> selected</#if>>I</option> - <option<#if ((creditCard.suffixOnCard)?default("") == "II")> selected</#if>>II</option> - <option<#if ((creditCard.suffixOnCard)?default("") == "III")> selected</#if>>III</option> - <option<#if ((creditCard.suffixOnCard)?default("") == "IV")> selected</#if>>IV</option> - <option<#if ((creditCard.suffixOnCard)?default("") == "V")> selected</#if>>V</option> - </select> - </td> - </tr> - - <tr> - <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingCardType}</td> - <td width="5"> </td> - <td width="74%"> - <select name="cardType"> - <#if creditCard.cardType?exists> - <option>${creditCard.cardType}</option> - <option value="${creditCard.cardType}">---</option> - </#if> - ${screens.render("component://common/widget/CommonScreens.xml#cctypes")} - </select> - <#if showToolTip?has_content><span class="tooltip">${uiLabelMap.CommonRequired}</span><#else>*</#if></td> - </tr> - <tr> - <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingCardNumber}</td> - <td width="5"> </td> - <td width="74%"> - <#if creditCard?has_content> - <#if cardNumberMinDisplay?has_content> - <#-- create a display version of the card where all but the last four digits are * --> - <#assign cardNumberDisplay = ""> - <#assign cardNumber = creditCard.cardNumber?if_exists> - <#if cardNumber?has_content> - <#assign size = cardNumber?length - 4> - <#if (size > 0)> - <#list 0 .. size-1 as foo> - <#assign cardNumberDisplay = cardNumberDisplay + "*"> - </#list> - <#assign cardNumberDisplay = cardNumberDisplay + cardNumber[size .. size + 3]> - <#else> - <#-- but if the card number has less than four digits (ie, it was entered incorrectly), display it in full --> - <#assign cardNumberDisplay = cardNumber> - </#if> - </#if> - <input type="text" class="required" size="20" maxlength="30" name="cardNumber" onfocus="javascript:this.value = '';" value="${cardNumberDisplay?if_exists}"> - <#else> - <input type="text" size="20" maxlength="30" name="cardNumber" value="${creditCard.cardNumber?if_exists}"/> - </#if> - <#else> - <input type="text" size="20" maxlength="30" name="cardNumber" value="${creditCard.cardNumber?if_exists}"/> - </#if> - <#if showToolTip?has_content><span class="tooltip">${uiLabelMap.CommonRequired}</span><#else>*</#if></td> - </tr> - <#--<tr> - <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingCardSecurityCode}</td> - <td width="5"> </td> - <td width="74%"> - <input type="text" size="5" maxlength="10" name="cardSecurityCode" value="${creditCard.cardSecurityCode?if_exists}"> - </td> - </tr>--> - <tr> - <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingExpirationDate}</td> - <td width="5"> </td> - <td width="74%"> - <#assign expMonth = ""> - <#assign expYear = ""> - <#if creditCard?exists && creditCard.expireDate?exists> - <#assign expDate = creditCard.expireDate> - <#if (expDate?exists && expDate.indexOf("/") > 0)> - <#assign expMonth = expDate.substring(0,expDate.indexOf("/"))> - <#assign expYear = expDate.substring(expDate.indexOf("/")+1)> - </#if> - </#if> - <select name="expMonth"> - <#if creditCard?has_content && expMonth?has_content> - <#assign ccExprMonth = expMonth> - <#else> - <#assign ccExprMonth = requestParameters.expMonth?if_exists> - </#if> - <#if ccExprMonth?has_content> - <option value="${ccExprMonth?if_exists}">${ccExprMonth?if_exists}</option> - </#if> - ${screens.render("component://common/widget/CommonScreens.xml#ccmonths")} - </select> - <select name="expYear"> - <#if creditCard?has_content && expYear?has_content> - <#assign ccExprYear = expYear> - <#else> - <#assign ccExprYear = requestParameters.expYear?if_exists> - </#if> - <#if ccExprYear?has_content> - <option value="${ccExprYear?if_exists}">${ccExprYear?if_exists}</option> - </#if> - ${screens.render("component://common/widget/CommonScreens.xml#ccyears")} - </select> - <#if showToolTip?has_content><span class="tooltip">${uiLabelMap.CommonRequired}</span><#else>*</#if></td> - </tr> - <tr> - <td width="26%" align="right" valign="middle">${uiLabelMap.CommonDescription}</td> - <td width="5"> </td> - <td width="74%"> - <input type="text" size="20" maxlength="30" name="description" value="${paymentMethod.description?if_exists}"/> - </td> - </tr> - - +<#-- +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 !creditCard?has_content> + <#assign creditCard = requestParameters> +</#if> + +<#if !paymentMethod?has_content> + <#assign paymentMethod = requestParameters> +</#if> + + <tr> + <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingCompanyNameCard}</td> + <td width="5"> </td> + <td width="74%"> + <input type="text" size="30" maxlength="60" name="companyNameOnCard" value="${creditCard.companyNameOnCard?if_exists}"/> + </td> + </tr> + <tr> + <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingPrefixCard}</td> + <td width="5"> </td> + <td width="74%"> + <select name="titleOnCard"> + <option value="">${uiLabelMap.CommonSelectOne}</option> + <option<#if ((creditCard.titleOnCard)?default("") == "${uiLabelMap.CommonTitleMr}")> selected</#if>>${uiLabelMap.CommonTitleMr}</option> + <option<#if ((creditCard.titleOnCard)?default("") == "Mrs.")> selected</#if>>${uiLabelMap.CommonTitleMrs}</option> + <option<#if ((creditCard.titleOnCard)?default("") == "Ms.")> selected</#if>>${uiLabelMap.CommonTitleMs}</option> + <option<#if ((creditCard.titleOnCard)?default("") == "Dr.")> selected</#if>>${uiLabelMap.CommonTitleDr}</option> + </select> + </td> + </tr> + <tr> + <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingFirstNameCard}</td> + <td width="5"> </td> + <td width="74%"> + <input type="text" size="20" maxlength="60" name="firstNameOnCard" value="${(creditCard.firstNameOnCard)?if_exists}"/> + <#if showToolTip?has_content><span class="tooltip">${uiLabelMap.CommonRequired}</span><#else>*</#if></td> + </tr> + <tr> + <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingMiddleNameCard}</td> + <td width="5"> </td> + <td width="74%"> + <input type="text" size="15" maxlength="60" name="middleNameOnCard" value="${(creditCard.middleNameOnCard)?if_exists}"/> + </td> + </tr> + <tr> + <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingLastNameCard}</td> + <td width="5"> </td> + <td width="74%"> + <input type="text" size="20" maxlength="60" name="lastNameOnCard" value="${(creditCard.lastNameOnCard)?if_exists}"/> + <#if showToolTip?has_content><span class="tooltip">${uiLabelMap.CommonRequired}</span><#else>*</#if></td> + </tr> + <tr> + <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingSuffixCard}</td> + <td width="5"> </td> + <td width="74%"> + <select name="suffixOnCard"> + <option value="">${uiLabelMap.CommonSelectOne}</option> + <option<#if ((creditCard.suffixOnCard)?default("") == "Jr.")> selected</#if>>Jr.</option> + <option<#if ((creditCard.suffixOnCard)?default("") == "Sr.")> selected</#if>>Sr.</option> + <option<#if ((creditCard.suffixOnCard)?default("") == "I")> selected</#if>>I</option> + <option<#if ((creditCard.suffixOnCard)?default("") == "II")> selected</#if>>II</option> + <option<#if ((creditCard.suffixOnCard)?default("") == "III")> selected</#if>>III</option> + <option<#if ((creditCard.suffixOnCard)?default("") == "IV")> selected</#if>>IV</option> + <option<#if ((creditCard.suffixOnCard)?default("") == "V")> selected</#if>>V</option> + </select> + </td> + </tr> + + <tr> + <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingCardType}</td> + <td width="5"> </td> + <td width="74%"> + <select name="cardType"> + <#if creditCard.cardType?exists> + <option>${creditCard.cardType}</option> + <option value="${creditCard.cardType}">---</option> + </#if> + ${screens.render("component://common/widget/CommonScreens.xml#cctypes")} + </select> + <#if showToolTip?has_content><span class="tooltip">${uiLabelMap.CommonRequired}</span><#else>*</#if></td> + </tr> + <tr> + <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingCardNumber}</td> + <td width="5"> </td> + <td width="74%"> + <#if creditCard?has_content> + <#if cardNumberMinDisplay?has_content> + <#-- create a display version of the card where all but the last four digits are * --> + <#assign cardNumberDisplay = ""> + <#assign cardNumber = creditCard.cardNumber?if_exists> + <#if cardNumber?has_content> + <#assign size = cardNumber?length - 4> + <#if (size > 0)> + <#list 0 .. size-1 as foo> + <#assign cardNumberDisplay = cardNumberDisplay + "*"> + </#list> + <#assign cardNumberDisplay = cardNumberDisplay + cardNumber[size .. size + 3]> + <#else> + <#-- but if the card number has less than four digits (ie, it was entered incorrectly), display it in full --> + <#assign cardNumberDisplay = cardNumber> + </#if> + </#if> + <input type="text" class="required" size="20" maxlength="30" name="cardNumber" onfocus="javascript:this.value = '';" value="${cardNumberDisplay?if_exists}"> + <#else> + <input type="text" size="20" maxlength="30" name="cardNumber" value="${creditCard.cardNumber?if_exists}"/> + </#if> + <#else> + <input type="text" size="20" maxlength="30" name="cardNumber" value="${creditCard.cardNumber?if_exists}"/> + </#if> + <#if showToolTip?has_content><span class="tooltip">${uiLabelMap.CommonRequired}</span><#else>*</#if></td> + </tr> + <#--<tr> + <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingCardSecurityCode}</td> + <td width="5"> </td> + <td width="74%"> + <input type="text" size="5" maxlength="10" name="cardSecurityCode" value="${creditCard.cardSecurityCode?if_exists}"> + </td> + </tr>--> + <tr> + <td width="26%" align="right" valign="middle">${uiLabelMap.AccountingExpirationDate}</td> + <td width="5"> </td> + <td width="74%"> + <#assign expMonth = ""> + <#assign expYear = ""> + <#if creditCard?exists && creditCard.expireDate?exists> + <#assign expDate = creditCard.expireDate> + <#if (expDate?exists && expDate.indexOf("/") > 0)> + <#assign expMonth = expDate.substring(0,expDate.indexOf("/"))> + <#assign expYear = expDate.substring(expDate.indexOf("/")+1)> + </#if> + </#if> + <select name="expMonth"> + <#if creditCard?has_content && expMonth?has_content> + <#assign ccExprMonth = expMonth> + <#else> + <#assign ccExprMonth = requestParameters.expMonth?if_exists> + </#if> + <#if ccExprMonth?has_content> + <option value="${ccExprMonth?if_exists}">${ccExprMonth?if_exists}</option> + </#if> + ${screens.render("component://common/widget/CommonScreens.xml#ccmonths")} + </select> + <select name="expYear"> + <#if creditCard?has_content && expYear?has_content> + <#assign ccExprYear = expYear> + <#else> + <#assign ccExprYear = requestParameters.expYear?if_exists> + </#if> + <#if ccExprYear?has_content> + <option value="${ccExprYear?if_exists}">${ccExprYear?if_exists}</option> + </#if> + ${screens.render("component://common/widget/CommonScreens.xml#ccyears")} + </select> + <#if showToolTip?has_content><span class="tooltip">${uiLabelMap.CommonRequired}</span><#else>*</#if></td> + </tr> + <tr> + <td width="26%" align="right" valign="middle">${uiLabelMap.CommonDescription}</td> + <td width="5"> </td> + <td width="74%"> + <input type="text" size="20" maxlength="30" name="description" value="${paymentMethod.description?if_exists}"/> + </td> + </tr> + + Propchange: ofbiz/branches/release09.04/applications/accounting/webapp/accounting/common/creditcardfields.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/release09.04/applications/accounting/webapp/accounting/common/creditcardfields.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/branches/release09.04/applications/accounting/webapp/accounting/common/creditcardfields.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Propchange: ofbiz/branches/release09.04/applications/accounting/webapp/accounting/fixedasset/DepreciationReport.ftl ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat May 8 22:08:40 2010 @@ -1 +1 @@ -Date Rev Author URL Id +"Date Rev Author URL Id" Modified: ofbiz/branches/release09.04/applications/accounting/webapp/accounting/fixedasset/FixedAssetGeoLocation.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/accounting/webapp/accounting/fixedasset/FixedAssetGeoLocation.ftl?rev=942474&r1=942473&r2=942474&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/accounting/webapp/accounting/fixedasset/FixedAssetGeoLocation.ftl (original) +++ ofbiz/branches/release09.04/applications/accounting/webapp/accounting/fixedasset/FixedAssetGeoLocation.ftl Sat May 8 22:08:40 2010 @@ -1,50 +1,50 @@ -<#-- -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 latestGeoPoint?has_content> - <#if latestGeoPoint.latitude?has_content && latestGeoPoint.longitude?has_content> - ${uiLabelMap.CommonLatitude}${latestGeoPoint.latitude}<br> - ${uiLabelMap.CommonLongitude}${latestGeoPoint.longitude} - <#if latestGeoPoint.elevation?has_content> - <br>${uiLabelMap.CommonElevation}${latestGeoPoint.elevation} ${elevationUomAbbr} - </#if> - <#if latestGeoPoint.dataSourceId?has_content> - <#if latestGeoPoint.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("${latestGeoPoint.latitude}", - "${latestGeoPoint.longitude}", - "<@ofbizUrl>EditFixedAsset?fixedAssetId=${fixedAssetId}</@ofbizUrl>", - "${uiLabelMap.AccountingFixedAsset} ${uiLabelMap.CommonOf} ${fixedAssetId}") - </script> - <#elseif latestGeoPoint.dataSourceId == "GEOPT_YAHOO"> - <#elseif latestGeoPoint.dataSourceId == "GEOPT_MICROSOFT"> - <#elseif latestGeoPoint.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 latestGeoPoint?has_content> + <#if latestGeoPoint.latitude?has_content && latestGeoPoint.longitude?has_content> + ${uiLabelMap.CommonLatitude}${latestGeoPoint.latitude}<br> + ${uiLabelMap.CommonLongitude}${latestGeoPoint.longitude} + <#if latestGeoPoint.elevation?has_content> + <br>${uiLabelMap.CommonElevation}${latestGeoPoint.elevation} ${elevationUomAbbr} + </#if> + <#if latestGeoPoint.dataSourceId?has_content> + <#if latestGeoPoint.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("${latestGeoPoint.latitude}", + "${latestGeoPoint.longitude}", + "<@ofbizUrl>EditFixedAsset?fixedAssetId=${fixedAssetId}</@ofbizUrl>", + "${uiLabelMap.AccountingFixedAsset} ${uiLabelMap.CommonOf} ${fixedAssetId}") + </script> + <#elseif latestGeoPoint.dataSourceId == "GEOPT_YAHOO"> + <#elseif latestGeoPoint.dataSourceId == "GEOPT_MICROSOFT"> + <#elseif latestGeoPoint.dataSourceId == "GEOPT_MAPTP"> + </#if> + </#if> + </#if> +<#else> + <h2>${uiLabelMap.CommonNoGeolocationAvailable}</h2> +</#if> Propchange: ofbiz/branches/release09.04/applications/accounting/webapp/accounting/fixedasset/FixedAssetGeoLocation.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/release09.04/applications/accounting/webapp/accounting/fixedasset/FixedAssetGeoLocation.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/branches/release09.04/applications/accounting/webapp/accounting/fixedasset/FixedAssetGeoLocation.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Propchange: ofbiz/branches/release09.04/applications/accounting/webapp/accounting/invoice/InvoiceSubTabBar.ftl ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat May 8 22:08:40 2010 @@ -1 +1 @@ -Date Rev Author URL Id +"Date Rev Author URL Id" Modified: ofbiz/branches/release09.04/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl?rev=942474&r1=942473&r2=942474&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl (original) +++ ofbiz/branches/release09.04/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl Sat May 8 22:08:40 2010 @@ -1,47 +1,47 @@ -<#-- -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. ---> -<#escape x as x?xml> -<fo:table space-after="0.3in"> - <fo:table-column column-width="3.5in"/> - <fo:table-body> - <fo:table-row > - <fo:table-cell> - <fo:block>${uiLabelMap.CommonTo}: </fo:block> - <#if billingAddress?has_content> - <#assign billingPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", billingParty.partyId, "compareDate", invoice.invoiceDate, "userLogin", userLogin))/> - <fo:block>${billingPartyNameResult.fullName?default(billingAddress.toName)?default("Billing Name Not Found")}</fo:block> - <#if billingAddress.attnName?exists> - <fo:block>${billingAddress.attnName}</fo:block> - </#if> - <fo:block>${billingAddress.address1?if_exists}</fo:block> - <#if billingAddress.address2?exists> - <fo:block>${billingAddress.address2}</fo:block> - </#if> - <fo:block>${billingAddress.city?if_exists} ${billingAddress.stateProvinceGeoId?if_exists} ${billingAddress.postalCode?if_exists}</fo:block> - <#else> - <fo:block>${uiLabelMap.AccountingNoGenBilAddressFound}${billingParty.partyId}</fo:block> - </#if> - <#if billingPartyTaxId?has_content> - <fo:block>Tax ID: ${billingPartyTaxId}</fo:block> - </#if> - </fo:table-cell> - </fo:table-row> - </fo:table-body> -</fo:table> -</#escape> +<#-- +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. +--> +<#escape x as x?xml> +<fo:table space-after="0.3in"> + <fo:table-column column-width="3.5in"/> + <fo:table-body> + <fo:table-row > + <fo:table-cell> + <fo:block>${uiLabelMap.CommonTo}: </fo:block> + <#if billingAddress?has_content> + <#assign billingPartyNameResult = dispatcher.runSync("getPartyNameForDate", Static["org.ofbiz.base.util.UtilMisc"].toMap("partyId", billingParty.partyId, "compareDate", invoice.invoiceDate, "userLogin", userLogin))/> + <fo:block>${billingPartyNameResult.fullName?default(billingAddress.toName)?default("Billing Name Not Found")}</fo:block> + <#if billingAddress.attnName?exists> + <fo:block>${billingAddress.attnName}</fo:block> + </#if> + <fo:block>${billingAddress.address1?if_exists}</fo:block> + <#if billingAddress.address2?exists> + <fo:block>${billingAddress.address2}</fo:block> + </#if> + <fo:block>${billingAddress.city?if_exists} ${billingAddress.stateProvinceGeoId?if_exists} ${billingAddress.postalCode?if_exists}</fo:block> + <#else> + <fo:block>${uiLabelMap.AccountingNoGenBilAddressFound}${billingParty.partyId}</fo:block> + </#if> + <#if billingPartyTaxId?has_content> + <fo:block>Tax ID: ${billingPartyTaxId}</fo:block> + </#if> + </fo:table-cell> + </fo:table-row> + </fo:table-body> +</fo:table> +</#escape> Propchange: ofbiz/branches/release09.04/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/release09.04/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/branches/release09.04/applications/accounting/webapp/accounting/invoice/invoiceReportContactMechs.fo.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/branches/release09.04/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl?rev=942474&r1=942473&r2=942474&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl (original) +++ ofbiz/branches/release09.04/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl Sat May 8 22:08:40 2010 @@ -1,62 +1,62 @@ -<#-- -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. ---> -<#escape x as x?xml> -<fo:table> -<fo:table-column column-width="1in"/> -<fo:table-column column-width="1.5in"/> -<fo:table-body> -<fo:table-row> - <fo:table-cell> - <fo:block number-columns-spanned="2" font-weight="bold" wrap-option="no-wrap">${invoice.getRelatedOne("InvoiceType").get("description",locale)}</fo:block> - </fo:table-cell> -</fo:table-row> - -<fo:table-row> - <fo:table-cell><fo:block>${uiLabelMap.AccountingInvoiceDateAbbr}:</fo:block></fo:table-cell> - <fo:table-cell><fo:block>${invoiceDate?if_exists}</fo:block></fo:table-cell> -</fo:table-row> - -<fo:table-row> - <fo:table-cell><fo:block>${uiLabelMap.AccountingCustNr}:</fo:block></fo:table-cell> - <fo:table-cell><fo:block><#if invoice?has_content>${billingParty.partyId}</#if></fo:block></fo:table-cell> -</fo:table-row> - -<#if billingPartyTaxId?has_content> - <fo:table-row> - <fo:table-cell><fo:block>${uiLabelMap.PartyTaxId}:</fo:block></fo:table-cell> - <fo:table-cell><fo:block> ${billingPartyTaxId}</fo:block></fo:table-cell> - </fo:table-row> -</#if> - -<fo:table-row> - <fo:table-cell><fo:block>${uiLabelMap.AccountingInvNr}:</fo:block></fo:table-cell> - <fo:table-cell><fo:block><#if invoice?has_content>${invoice.invoiceId}</#if></fo:block></fo:table-cell> -</fo:table-row> -<fo:table-row> - <fo:table-cell><fo:block>${uiLabelMap.AccountingDescr}:</fo:block></fo:table-cell> - <fo:table-cell><fo:block><#if invoice?has_content>${invoice.description?if_exists}</#if></fo:block></fo:table-cell> -</fo:table-row> - -<!--fo:table-row> - <fo:table-cell><fo:block>${uiLabelMap.CommonStatus}</fo:block></fo:table-cell> - <fo:table-cell><fo:block font-weight="bold">${invoiceStatus.get("description",locale)}</fo:block></fo:table-cell> -</fo:table-row--> -</fo:table-body> -</fo:table> -</#escape> +<#-- +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. +--> +<#escape x as x?xml> +<fo:table> +<fo:table-column column-width="1in"/> +<fo:table-column column-width="1.5in"/> +<fo:table-body> +<fo:table-row> + <fo:table-cell> + <fo:block number-columns-spanned="2" font-weight="bold" wrap-option="no-wrap">${invoice.getRelatedOne("InvoiceType").get("description",locale)}</fo:block> + </fo:table-cell> +</fo:table-row> + +<fo:table-row> + <fo:table-cell><fo:block>${uiLabelMap.AccountingInvoiceDateAbbr}:</fo:block></fo:table-cell> + <fo:table-cell><fo:block>${invoiceDate?if_exists}</fo:block></fo:table-cell> +</fo:table-row> + +<fo:table-row> + <fo:table-cell><fo:block>${uiLabelMap.AccountingCustNr}:</fo:block></fo:table-cell> + <fo:table-cell><fo:block><#if invoice?has_content>${billingParty.partyId}</#if></fo:block></fo:table-cell> +</fo:table-row> + +<#if billingPartyTaxId?has_content> + <fo:table-row> + <fo:table-cell><fo:block>${uiLabelMap.PartyTaxId}:</fo:block></fo:table-cell> + <fo:table-cell><fo:block> ${billingPartyTaxId}</fo:block></fo:table-cell> + </fo:table-row> +</#if> + +<fo:table-row> + <fo:table-cell><fo:block>${uiLabelMap.AccountingInvNr}:</fo:block></fo:table-cell> + <fo:table-cell><fo:block><#if invoice?has_content>${invoice.invoiceId}</#if></fo:block></fo:table-cell> +</fo:table-row> +<fo:table-row> + <fo:table-cell><fo:block>${uiLabelMap.AccountingDescr}:</fo:block></fo:table-cell> + <fo:table-cell><fo:block><#if invoice?has_content>${invoice.description?if_exists}</#if></fo:block></fo:table-cell> +</fo:table-row> + +<!--fo:table-row> + <fo:table-cell><fo:block>${uiLabelMap.CommonStatus}</fo:block></fo:table-cell> + <fo:table-cell><fo:block font-weight="bold">${invoiceStatus.get("description",locale)}</fo:block></fo:table-cell> +</fo:table-row--> +</fo:table-body> +</fo:table> +</#escape> Propchange: ofbiz/branches/release09.04/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/release09.04/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/branches/release09.04/applications/accounting/webapp/accounting/invoice/invoiceReportHeaderInfo.fo.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Propchange: ofbiz/branches/release09.04/applications/accounting/webapp/accounting/payment/PaymentSubTabBar.ftl ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat May 8 22:08:40 2010 @@ -1 +1 @@ -Date Rev Author URL Id +"Date Rev Author URL Id" Propchange: ofbiz/branches/release09.04/applications/accounting/webapp/ar/main.ftl ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat May 8 22:08:40 2010 @@ -1 +1 @@ -Date Rev Author URL Id +"Date Rev Author URL Id" Propchange: ofbiz/branches/release09.04/applications/humanres/webapp/humanres/humanres/findEmployee.ftl ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat May 8 22:08:40 2010 @@ -1 +1 @@ -Date Rev Author URL Id +"Date Rev Author URL Id" Modified: ofbiz/branches/release09.04/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl?rev=942474&r1=942473&r2=942474&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl (original) +++ ofbiz/branches/release09.04/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl Sat May 8 22:08:40 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/branches/release09.04/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/release09.04/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/branches/release09.04/applications/manufacturing/webapp/manufacturing/jobshopmgt/ProductionRunTasksInfo.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Propchange: ofbiz/branches/release09.04/applications/marketing/webapp/marketing/contact/ContactCommunicationPreview.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/release09.04/applications/marketing/webapp/marketing/contact/ContactCommunicationPreview.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/branches/release09.04/applications/marketing/webapp/marketing/contact/ContactCommunicationPreview.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Propchange: ofbiz/branches/release09.04/applications/marketing/webapp/sfa/contact/mergeContacts.ftl ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat May 8 22:08:40 2010 @@ -1 +1 @@ -Date Rev Author URL Id +"Date Rev Author URL Id" Propchange: ofbiz/branches/release09.04/applications/marketing/webapp/sfa/lead/mergeLeads.ftl ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat May 8 22:08:40 2010 @@ -1 +1 @@ -Date Rev Author URL Id +"Date Rev Author URL Id" Propchange: ofbiz/branches/release09.04/applications/marketing/webapp/sfa/party/findSfaParty.ftl ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat May 8 22:08:40 2010 @@ -1 +1 @@ -Date Rev Author URL Id +"Date Rev Author URL Id" Modified: ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/cart/addItemsToShoppingList.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/cart/addItemsToShoppingList.ftl?rev=942474&r1=942473&r2=942474&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/cart/addItemsToShoppingList.ftl (original) +++ ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/cart/addItemsToShoppingList.ftl Sat May 8 22:08:40 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-header"> - <div class="boxhead"> ${uiLabelMap.OrderAddOrderToShoppingList}</div> - </div> - <div class="screenlet-body"> - <table border="0" cellspacing="0" cellpadding="0"> - <tr> - <td> - <form method="post" name="addBulkToShoppingList" action="<@ofbizUrl>addBulkToShoppingList</@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-header"> + <div class="boxhead"> ${uiLabelMap.OrderAddOrderToShoppingList}</div> + </div> + <div class="screenlet-body"> + <table border="0" cellspacing="0" cellpadding="0"> + <tr> + <td> + <form method="post" name="addBulkToShoppingList" action="<@ofbizUrl>addBulkToShoppingList</@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/branches/release09.04/applications/order/webapp/ordermgr/entry/cart/addItemsToShoppingList.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/cart/addItemsToShoppingList.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/cart/addItemsToShoppingList.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/cart/javascript.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/cart/javascript.ftl?rev=942474&r1=942473&r2=942474&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/cart/javascript.ftl (original) +++ ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/cart/javascript.ftl Sat May 8 22:08:40 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 = "<@ofbizUrl>addBulkToShoppingList</@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='<@ofbizUrl>LookupBulkAddSupplierProducts</@ofbizUrl>?productId='+element.value; - <#else> - window.location='<@ofbizUrl>LookupBulkAddProducts</@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 = "<@ofbizUrl>addBulkToShoppingList</@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='<@ofbizUrl>LookupBulkAddSupplierProducts</@ofbizUrl>?productId='+element.value; + <#else> + window.location='<@ofbizUrl>LookupBulkAddProducts</@ofbizUrl>?productId='+element.value; + </#if> +} +</script> Propchange: ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/cart/javascript.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/cart/javascript.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/cart/javascript.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Propchange: ofbiz/branches/release09.04/applications/order/webapp/ordermgr/entry/catalog/inlineProductDetail.ftl ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat May 8 22:08:40 2010 @@ -1 +1 @@ -Date Rev Author URL Id +"Date Rev Author URL Id" Propchange: ofbiz/branches/release09.04/applications/order/webapp/ordermgr/order/shipGroups.fo.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/release09.04/applications/order/webapp/ordermgr/order/shipGroups.fo.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/branches/release09.04/applications/order/webapp/ordermgr/order/shipGroups.fo.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/branches/release09.04/applications/order/webapp/ordermgr/request/requestContactMech.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/order/webapp/ordermgr/request/requestContactMech.ftl?rev=942474&r1=942473&r2=942474&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/order/webapp/ordermgr/request/requestContactMech.ftl (original) +++ ofbiz/branches/release09.04/applications/order/webapp/ordermgr/request/requestContactMech.ftl Sat May 8 22:08:40 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-header"> - <div class="boxhead"> ${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-header"> + <div class="boxhead"> ${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/branches/release09.04/applications/order/webapp/ordermgr/request/requestContactMech.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/release09.04/applications/order/webapp/ordermgr/request/requestContactMech.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/branches/release09.04/applications/order/webapp/ordermgr/request/requestContactMech.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Propchange: ofbiz/branches/release09.04/applications/order/webapp/ordermgr/return/returnLinks.ftl ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat May 8 22:08:40 2010 @@ -1 +1 @@ -Date Rev Author URL Id +"Date Rev Author URL Id" Propchange: ofbiz/branches/release09.04/applications/party/templates/email/ChangePersonalInfoNotification.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/release09.04/applications/party/templates/email/ChangePersonalInfoNotification.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/branches/release09.04/applications/party/templates/email/ChangePersonalInfoNotification.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/branches/release09.04/applications/party/webapp/partymgr/party/partygeolocation.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/release09.04/applications/party/webapp/partymgr/party/partygeolocation.ftl?rev=942474&r1=942473&r2=942474&view=diff ============================================================================== --- ofbiz/branches/release09.04/applications/party/webapp/partymgr/party/partygeolocation.ftl (original) +++ ofbiz/branches/release09.04/applications/party/webapp/partymgr/party/partygeolocation.ftl Sat May 8 22:08:40 2010 @@ -1,50 +1,50 @@ -<#-- -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 latestGeoPoint?has_content> - <#if latestGeoPoint.latitude?has_content && latestGeoPoint.longitude?has_content> - ${uiLabelMap.CommonLatitude}${latestGeoPoint.latitude}<br> - ${uiLabelMap.CommonLongitude}${latestGeoPoint.longitude} - <#if latestGeoPoint.elevation?has_content> - <br>${uiLabelMap.CommonElevation}${latestGeoPoint.elevation} ${elevationUomAbbr} - </#if> - <#if latestGeoPoint.dataSourceId?has_content> - <#if latestGeoPoint.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("${latestGeoPoint.latitude}", - "${latestGeoPoint.longitude}", - "<@ofbizUrl>viewprofile?partyId=${partyId}</@ofbizUrl>", - "${uiLabelMap.PartyProfile} ${uiLabelMap.CommonOf} ${partyId}") - </script> - <#elseif latestGeoPoint.dataSourceId == "GEOPT_YAHOO"> - <#elseif latestGeoPoint.dataSourceId == "GEOPT_MICROSOFT"> - <#elseif latestGeoPoint.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 latestGeoPoint?has_content> + <#if latestGeoPoint.latitude?has_content && latestGeoPoint.longitude?has_content> + ${uiLabelMap.CommonLatitude}${latestGeoPoint.latitude}<br> + ${uiLabelMap.CommonLongitude}${latestGeoPoint.longitude} + <#if latestGeoPoint.elevation?has_content> + <br>${uiLabelMap.CommonElevation}${latestGeoPoint.elevation} ${elevationUomAbbr} + </#if> + <#if latestGeoPoint.dataSourceId?has_content> + <#if latestGeoPoint.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("${latestGeoPoint.latitude}", + "${latestGeoPoint.longitude}", + "<@ofbizUrl>viewprofile?partyId=${partyId}</@ofbizUrl>", + "${uiLabelMap.PartyProfile} ${uiLabelMap.CommonOf} ${partyId}") + </script> + <#elseif latestGeoPoint.dataSourceId == "GEOPT_YAHOO"> + <#elseif latestGeoPoint.dataSourceId == "GEOPT_MICROSOFT"> + <#elseif latestGeoPoint.dataSourceId == "GEOPT_MAPTP"> + </#if> + </#if> + </#if> +<#else> + <h2>${uiLabelMap.CommonNoGeolocationAvailable}</h2> +</#if> Propchange: ofbiz/branches/release09.04/applications/party/webapp/partymgr/party/partygeolocation.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/release09.04/applications/party/webapp/partymgr/party/partygeolocation.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/branches/release09.04/applications/party/webapp/partymgr/party/partygeolocation.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Propchange: ofbiz/branches/release09.04/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/release09.04/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/branches/release09.04/applications/party/webapp/partymgr/party/profileblocks/ContentList.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Propchange: ofbiz/branches/release09.04/applications/party/webapp/partymgr/party/profileblocks/mytasks.ftl ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat May 8 22:08:40 2010 @@ -1 +1 @@ -Date Rev Author URL Id +"Date Rev Author URL Id" Propchange: ofbiz/branches/release09.04/applications/product/templates/shipment/FedexShipRequestTemplate.xml.ftl ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat May 8 22:08:40 2010 @@ -1 +1 @@ -Date Rev Author URL Id +"Date Rev Author URL Id" Propchange: ofbiz/branches/release09.04/applications/product/templates/shipment/FedexShipRequestTemplate.xml.ftl ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type Sat May 8 22:08:40 2010 @@ -1 +1 @@ -text/xml +text/plain Propchange: ofbiz/branches/release09.04/applications/product/templates/shipment/FedexSubscriptionRequestTemplate.xml.ftl ------------------------------------------------------------------------------ --- svn:keywords (original) +++ svn:keywords Sat May 8 22:08:40 2010 @@ -1 +1 @@ -Date Rev Author URL Id +"Date Rev Author URL Id" Propchange: ofbiz/branches/release09.04/applications/product/templates/shipment/FedexSubscriptionRequestTemplate.xml.ftl ------------------------------------------------------------------------------ --- svn:mime-type (original) +++ svn:mime-type Sat May 8 22:08:40 2010 @@ -1 +1 @@ -text/xml +text/plain Propchange: ofbiz/branches/release09.04/applications/product/webapp/catalog/find/exportproducts.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/branches/release09.04/applications/product/webapp/catalog/find/exportproducts.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/branches/release09.04/applications/product/webapp/catalog/find/exportproducts.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |