svn commit: r923545 [4/6] - in /ofbiz/trunk: applications/accounting/webapp
Locked
svn commit: r923545 [4/6] - in /ofbiz/trunk: applications/accounting/webapp
 
|
Modified: ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/PicklistManage.ftl Tue Mar 16 01:56:41 2010 @@ -47,7 +47,7 @@ under the License. </form> <span class="label">${uiLabelMap.ProductCreatedModifiedBy}</span> ${picklist.createdByUserLogin}/${picklist.lastModifiedByUserLogin} <a href="<@ofbizUrl>PicklistReport.pdf?picklistId=${picklist.picklistId}</@ofbizUrl>" target="_blank" class="buttontext">${uiLabelMap.ProductPick}/${uiLabelMap.ProductPacking} ${uiLabelMap.CommonReports}</a> - <hr/> + <hr /> </div> <#if picklistInfo.shipmentMethodType?has_content> <div style="margin-left: 15px;"> @@ -88,7 +88,7 @@ under the License. ${uiLabelMap.CommonBy} ${picklistStatusHistoryInfo.picklistStatusHistory.changeUserLoginId} </div> </#list> - <hr/> + <hr /> <#-- PicklistBin --> <#list picklistInfo.picklistBinInfoList?if_exists as picklistBinInfo> <#assign isBinComplete = Static["org.ofbiz.shipment.picklist.PickListServices"].isBinComplete(delegator, picklistBinInfo.picklistBin.picklistBinId)/> @@ -173,11 +173,11 @@ under the License. </#if> </#list> <#if picklistInfo_has_next> - <hr/> + <hr /> </#if> </#list> <#else/> <h3>${uiLabelMap.ProductNoPicksStarted}.</h3> </#if> </div> -</div> \ No newline at end of file +</div> Modified: ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/ViewContactMechs.ftl Tue Mar 16 01:56:41 2010 @@ -39,31 +39,31 @@ under the License. <#if facilityContactMechPurpose.thruDate?has_content> (${uiLabelMap.CommonExpire}: ${facilityContactMechPurpose.thruDate.toString()}) </#if> - <br/> + <br /> </#list> <#if "POSTAL_ADDRESS" = contactMech.contactMechTypeId> <#assign postalAddress = contactMechMap.postalAddress> - <#if postalAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${postalAddress.toName}<br/></#if> - <#if postalAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${postalAddress.attnName}<br/></#if> - ${postalAddress.address1?if_exists}<br/> - <#if postalAddress.address2?has_content>${postalAddress.address2?if_exists}<br/></#if> + <#if postalAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${postalAddress.toName}<br /></#if> + <#if postalAddress.attnName?has_content><b>${uiLabelMap.CommonAttn}:</b> ${postalAddress.attnName}<br /></#if> + ${postalAddress.address1?if_exists}<br /> + <#if postalAddress.address2?has_content>${postalAddress.address2?if_exists}<br /></#if> ${postalAddress.city?if_exists}, ${postalAddress.stateProvinceGeoId?if_exists} ${postalAddress.postalCode?if_exists} - <#if postalAddress.countryGeoId?has_content><br/>${postalAddress.countryGeoId}</#if> + <#if postalAddress.countryGeoId?has_content><br />${postalAddress.countryGeoId}</#if> <#if (postalAddress?has_content && !postalAddress.countryGeoId?has_content) || postalAddress.countryGeoId = "USA"> <#assign addr1 = postalAddress.address1?if_exists> <#if (addr1.indexOf(" ") > 0)> <#assign addressNum = addr1.substring(0, addr1.indexOf(" "))> <#assign addressOther = addr1.substring(addr1.indexOf(" ")+1)> - <br/><a target='_blank' href='${uiLabelMap.CommonLookupWhitepagesAddressLink}' class='buttontext'>${uiLabelMap.CommonLookupWhitepages}</a> + <br /><a target='_blank' href='${uiLabelMap.CommonLookupWhitepagesAddressLink}' class='buttontext'>${uiLabelMap.CommonLookupWhitepages}</a> </#if> </#if> <#if postalAddress.geoPointId?has_content> <#if contactMechPurposeType?has_content> <#assign popUptitle = contactMechPurposeType.get("description",locale) + uiLabelMap.CommonGeoLocation> </#if> - <br/><a href="javascript:popUp('<@ofbizUrl>geoLocation?geoPointId=${postalAddress.geoPointId}</@ofbizUrl>', '${popUptitle?if_exists}', '450', '550')" class="buttontext">${uiLabelMap.CommonGeoLocation}</a> + <br /><a href="javascript:popUp('<@ofbizUrl>geoLocation?geoPointId=${postalAddress.geoPointId}</@ofbizUrl>', '${popUptitle?if_exists}', '450', '550')" class="buttontext">${uiLabelMap.CommonGeoLocation}</a> </#if> <#elseif "TELECOM_NUMBER" = contactMech.contactMechTypeId> <#assign telecomNumber = contactMechMap.telecomNumber> @@ -71,7 +71,7 @@ under the License. <#if telecomNumber.areaCode?has_content>${telecomNumber.areaCode}-</#if>${telecomNumber.contactNumber?if_exists} <#if facilityContactMech.extension?has_content>${uiLabelMap.CommonExt} ${facilityContactMech.extension}</#if> <#if (telecomNumber?has_content && !telecomNumber.countryCode?has_content) || telecomNumber.countryCode = "011"> - <br/><a target='_blank' href='${uiLabelMap.CommonLookupAnywhoLink}' class='buttontext'>${uiLabelMap.CommonLookupAnywho}</a> + <br /><a target='_blank' href='${uiLabelMap.CommonLookupAnywhoLink}' class='buttontext'>${uiLabelMap.CommonLookupAnywho}</a> <a target='_blank' href='${uiLabelMap.CommonLookupWhitepagesTelNumberLink}' class='buttontext'>${uiLabelMap.CommonLookupWhitepages}</a> </#if> <#elseif "EMAIL_ADDRESS" = contactMech.contactMechTypeId> @@ -85,8 +85,8 @@ under the License. <#else> ${contactMech.infoString?if_exists} </#if> - <br/>(${uiLabelMap.CommonUpdated}: ${facilityContactMech.fromDate.toString()}) - <#if facilityContactMech.thruDate?has_content><br/><b>${uiLabelMap.CommonUpdatedEffectiveThru}: ${facilityContactMech.thruDate.toString()}</b></#if> + <br />(${uiLabelMap.CommonUpdated}: ${facilityContactMech.fromDate.toString()}) + <#if facilityContactMech.thruDate?has_content><br /><b>${uiLabelMap.CommonUpdatedEffectiveThru}: ${facilityContactMech.thruDate.toString()}</b></#if> </td> <td class="button-col"> Modified: ofbiz/trunk/applications/product/webapp/facility/group/FacilityGroupTabBar.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/group/FacilityGroupTabBar.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/group/FacilityGroupTabBar.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/group/FacilityGroupTabBar.ftl Tue Mar 16 01:56:41 2010 @@ -26,6 +26,6 @@ under the License. <li<#if selected="EditFacilityGroupMembers"> class="selected"</#if>><a href="<@ofbizUrl>EditFacilityGroupMembers?facilityGroupId=${facilityGroupId}</@ofbizUrl>">${uiLabelMap.ProductFacilities}</a></li> <li<#if selected="EditFacilityGroupRoles"> class="selected"</#if>><a href="<@ofbizUrl>EditFacilityGroupRoles?facilityGroupId=${facilityGroupId}</@ofbizUrl>">${uiLabelMap.PartyRoles}</a></li> </ul> - <br/> + <br /> </div> </#if> \ No newline at end of file Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/inventory/TransferInventoryItem.ftl Tue Mar 16 01:56:41 2010 @@ -110,7 +110,7 @@ under the License. </tr> <tr> <td width="14%"> </td> - <td colspan="3"><hr/></td> + <td colspan="3"><hr /></td> </tr> <tr> <td width="14%"> </td> @@ -150,7 +150,7 @@ under the License. </#list> </select> <span class="tooltip">${uiLabelMap.ProductSelectFacility}</span> - <br/> + <br /> <input type="text" name="containerIdTo" value="${(inventoryTransfer.containerIdTo)?if_exists}" size="20" maxlength="20"> <span class="tooltip">${uiLabelMap.ProductOrEnterContainerId}</span> </div> Modified: ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/inventory/receiveInventory.ftl Tue Mar 16 01:56:41 2010 @@ -29,7 +29,7 @@ under the License. <#-- Receiving Results --> <#if receivedItems?has_content> <h3>${uiLabelMap.ProductReceiptPurchaseOrder} ${purchaseOrder.orderId}</h3> - <hr/> + <hr /> <table class="basic-table" cellspacing="0"> <tr class="header-row"> <td>${uiLabelMap.ProductShipmentId}</td> @@ -66,9 +66,9 @@ under the License. </tr> </form> </#list> - <tr><td colspan="10"><hr/></td></tr> + <tr><td colspan="10"><hr /></td></tr> </table> - <br/> + <br /> </#if> <#-- Single Product Receiving --> @@ -259,7 +259,7 @@ under the License. <#assign shipmentType = shipment.getRelatedOneCache("ShipmentType")/> <#assign shipmentDate = shipment.estimatedArrivalDate?if_exists/> <tr> - <td><hr/></td> + <td><hr /></td> </tr> <tr> <td> @@ -278,7 +278,7 @@ under the License. </tr> </#list> <tr> - <td><hr/></td> + <td><hr /></td> </tr> <tr> <td> @@ -357,7 +357,7 @@ under the License. </#if> <tr> - <td colspan="2"><hr/></td> + <td colspan="2"><hr /></td> </tr> <tr> <td> @@ -472,7 +472,7 @@ under the License. </#list> <tr> <td colspan="2"> - <hr/> + <hr /> </td> </tr> <#if rowCount == 0> Modified: ofbiz/trunk/applications/product/webapp/facility/lookup/LookupInventoryItems.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/lookup/LookupInventoryItems.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/lookup/LookupInventoryItems.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/lookup/LookupInventoryItems.ftl Tue Mar 16 01:56:41 2010 @@ -26,7 +26,7 @@ under the License. <td>${uiLabelMap.ProductAtp}</td> <td>${uiLabelMap.FormFieldTitle_unitCost}</td> </tr> - <tr><td colspan="6"><hr/></td></tr> + <tr><td colspan="6"><hr /></td></tr> <#if (inventoryItemsForPo?exists && inventoryItemsForPo?has_content)> <tr class="header-row-2"><td colspan="6"><span class="label"> ${uiLabelMap.ProductInventoryItemsFor} ${uiLabelMap.ProductPurchaseOrder} - ${orderId}</span></td></tr> <#list inventoryItemsForPo as inventoryItem> @@ -70,4 +70,4 @@ under the License. <#if !(inventoryItemsForPo?exists && inventoryItemsForPo?has_content) && !(inventoryItemsForSupplier?exists && inventoryItemsForSupplier?has_content) && !(inventoryItemsForProduct?exists && inventoryItemsForProduct?has_content)> <tr><td><span class="label">${uiLabelMap.CommonNo} ${uiLabelMap.ProductInventoryItems} ${uiLabelMap.ProductAvailable}.</span></td></tr> </#if> -</table> \ No newline at end of file +</table> Modified: ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/returns/receiveReturn.ftl Tue Mar 16 01:56:41 2010 @@ -28,7 +28,7 @@ under the License. <#if "RETURN_RECEIVED" == returnHeader.getString("statusId")> <h3>${uiLabelMap.ProductReturnCompletelyReceived}</h3> </#if> - <br/> + <br /> <table cellspacing="0" class="basic-table"> <tr class="header-row"> <td>${uiLabelMap.ProductReceipt}</td> @@ -51,7 +51,7 @@ under the License. </tr> </#list> </table> - <br/> + <br /> </#if> <#-- Multi-Item Return Receiving --> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/AddItemsFromOrder.ftl Tue Mar 16 01:56:41 2010 @@ -75,7 +75,7 @@ under the License. <h3 style="color: red;">${uiLabelMap.ProductWarningOrderStatus} ${(orderHeaderStatus.get("description",locale))?default(orderHeader.statusId?if_exists)}; ${uiLabelMap.ProductApprovedBeforeShipping}.</h3> </#if> </#if> - <br/> + <br /> <#if orderItemDatas?exists> <#assign rowCount = 0> <#if isSalesOrder> @@ -87,7 +87,7 @@ under the License. <input type="hidden" name="_useRowSubmit" value="Y"> <table cellspacing="0" cellpadding="2" class="basic-table hover-bar"> <tr class="header-row"> - <td>${uiLabelMap.ProductOrderId}<br/>${uiLabelMap.ProductOrderShipGroupId}<br/>${uiLabelMap.ProductOrderItem}</td> + <td>${uiLabelMap.ProductOrderId}<br />${uiLabelMap.ProductOrderShipGroupId}<br />${uiLabelMap.ProductOrderItem}</td> <td>${uiLabelMap.ProductProduct}</td> <#if isSalesOrder> <td>${uiLabelMap.ProductItemsIssuedReserved}</td> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/EditShipmentRouteSegments.ftl Tue Mar 16 01:56:41 2010 @@ -85,11 +85,11 @@ under the License. <td valign="top"> <div> ${shipmentRouteSegment.shipmentRouteSegmentId} - <br/> + <br /> <a href="javascript:document.updateShipmentRouteSegmentForm${shipmentRouteSegmentData_index}.submit();" class="buttontext">${uiLabelMap.CommonUpdate}</a> - <br/> + <br /> <a href="javascript:document.duplicateShipmentRouteSegment_${shipmentRouteSegmentData_index}.submit();" class="buttontext">${uiLabelMap.CommonDuplicate}</a> - <br/> + <br /> <a href="javascript:document.deleteShipmentRouteSegment_${shipmentRouteSegmentData_index}.submit();" class="buttontext">${uiLabelMap.CommonDelete}</a> </div> </td> @@ -117,7 +117,7 @@ under the License. <option value="${shipmentMethodTypeOption.shipmentMethodTypeId}">${shipmentMethodTypeOption.get("description",locale)}</option> </#list> </select> - <br/> + <br /> <select name="originFacilityId"> <#if originFacility?has_content> <option value="${originFacility.facilityId}">${originFacility.facilityName} [${originFacility.facilityId}]</option> @@ -140,7 +140,7 @@ under the License. <option value="${facility.facilityId}">${facility.facilityName} [${facility.facilityId}]</option> </#list> </select> - <br/> + <br /> <div> <input type="text" size="15" name="originContactMechId" value="${shipmentRouteSegment.originContactMechId?if_exists}"/> <#if originPostalAddress?has_content><span class="tooltip">${uiLabelMap.CommonTo}: ${originPostalAddress.toName?if_exists}, ${uiLabelMap.CommonAttn}: ${originPostalAddress.attnName?if_exists}, ${originPostalAddress.address1?if_exists}, ${originPostalAddress.address2?if_exists}, ${originPostalAddress.city?if_exists}, ${originPostalAddress.stateProvinceGeoId?if_exists}, ${originPostalAddress.postalCode?if_exists}, ${originPostalAddress.countryGeoId?if_exists}</span></#if> @@ -173,16 +173,16 @@ under the License. <#if "UPS" == shipmentRouteSegment.carrierPartyId?if_exists> <#if !shipmentRouteSegment.carrierServiceStatusId?has_content || "SHRSCS_NOT_STARTED" == shipmentRouteSegment.carrierServiceStatusId?if_exists> <a href="javascript:document.upsShipmentConfirm_${shipmentRouteSegmentData_index}.submit()" class="buttontext">${uiLabelMap.ProductConfirmShipmentUps}</a> - <br/> + <br /> ${uiLabelMap.ProductShipmentUpsResidential}: <input type="checkbox" name="homeDeliveryType" value="Y" ${(shipmentRouteSegment.homeDeliveryType?has_content)?string("checked=\"checked\"","")}> <#elseif "SHRSCS_CONFIRMED" == shipmentRouteSegment.carrierServiceStatusId?if_exists> <a href="javascript:document.upsShipmentAccept_${shipmentRouteSegmentData_index}.submit()" class="buttontext">${uiLabelMap.ProductAcceptUpsShipmentConfirmation}</a> - <br/> + <br /> <a href="javascript:document.upsVoidShipment_${shipmentRouteSegmentData_index}.submit()" class="buttontext">${uiLabelMap.ProductVoidUpsShipmentConfirmation}</a> <#elseif "SHRSCS_ACCEPTED" == shipmentRouteSegment.carrierServiceStatusId?if_exists> <a href="javascript:document.upsTrackShipment_${shipmentRouteSegmentData_index}.submit()" class="buttontext">${uiLabelMap.ProductTrackUpsShipment}</a> - <br/> + <br /> <a href="javascript:document.upsVoidShipment_${shipmentRouteSegmentData_index}.submit()" class="buttontext">${uiLabelMap.ProductVoidUpsShipment}</a> </#if> </#if> @@ -194,7 +194,7 @@ under the License. <#if "FEDEX" == shipmentRouteSegment.carrierPartyId?if_exists> <#if !shipmentRouteSegment.carrierServiceStatusId?has_content || "SHRSCS_NOT_STARTED" == shipmentRouteSegment.carrierServiceStatusId?if_exists> <a href="javascript:document.fedexShipmentConfirm_${shipmentRouteSegmentData_index}.submit()" class="buttontext">${uiLabelMap.ProductConfirmShipmentFedex}</a> - <br/> + <br /> <#if shipmentMethodType?exists && shipmentMethodType.shipmentMethodTypeId=="GROUND_HOME"> <select name="homeDeliveryType"> <option value="">${uiLabelMap.ProductShipmentNone}</option> @@ -212,10 +212,10 @@ under the License. <#if shipmentRouteSegment.homeDeliveryDate?exists> (${shipmentRouteSegment.homeDeliveryDate?string("yyyy-MM-dd")}) </#if> - <br/> + <br /> </#if> </#if> - <br/> + <br /> <select name="carrierServiceStatusId"> <#if carrierServiceStatusItem?has_content> <option value="${carrierServiceStatusItem.statusId}">${carrierServiceStatusItem.description}</option> @@ -227,12 +227,12 @@ under the License. <option value="${carrierServiceStatusValidChangeToDetail.statusIdTo}">${carrierServiceStatusValidChangeToDetail.transitionName} [${carrierServiceStatusValidChangeToDetail.description}]</option> </#list> </select> - <br/> + <br /> <input type="text" size="24" name="trackingIdNumber" value="${shipmentRouteSegment.trackingIdNumber?if_exists}"/> - <br/> + <br /> <input type="text" size="25" name="estimatedStartDate" value="${(shipmentRouteSegment.estimatedStartDate.toString())?if_exists}"/><a href="javascript:call_cal(document.updateShipmentRouteSegmentForm${shipmentRouteSegmentData_index}.estimatedStartDate, '${(shipmentRouteSegment.estimatedStartDate.toString())?default(nowTimestampString)}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar'></a> <input type="text" size="25" name="estimatedArrivalDate" value="${(shipmentRouteSegment.estimatedArrivalDate.toString())?if_exists}"/><a href="javascript:call_cal(document.updateShipmentRouteSegmentForm${shipmentRouteSegmentData_index}.estimatedArrivalDate, '${(shipmentRouteSegment.estimatedArrivalDate.toString())?default(nowTimestampString)}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar'></a> - <br/> + <br /> <input type="text" size="25" name="actualStartDate" value="${(shipmentRouteSegment.actualStartDate.toString())?if_exists}"/><a href="javascript:call_cal(document.updateShipmentRouteSegmentForm${shipmentRouteSegmentData_index}.actualStartDate, '${(shipmentRouteSegment.actualStartDate.toString())?default(nowTimestampString)}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar'></a> <input type="text" size="25" name="actualArrivalDate" value="${(shipmentRouteSegment.actualArrivalDate.toString())?if_exists}"/><a href="javascript:call_cal(document.updateShipmentRouteSegmentForm${shipmentRouteSegmentData_index}.actualArrivalDate, '${(shipmentRouteSegment.actualArrivalDate.toString())?default(nowTimestampString)}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar'></a> </div> @@ -250,7 +250,7 @@ under the License. <option value="${weightUom.uomId}">${weightUom.get("description",locale)} [${weightUom.abbreviation}]</option> </#list> </select> - <br/> + <br /> <select name="currencyUomId"> <#if currencyUom?has_content> <option value="${currencyUom.uomId}">${currencyUom.get("description",locale)} [${currencyUom.uomId}]</option> @@ -262,13 +262,13 @@ under the License. <option value="${altCurrencyUom.uomId}">${altCurrencyUom.get("description",locale)} [${altCurrencyUom.uomId}]</option> </#list> </select> - <br/> + <br /> <input type="text" size="8" name="actualTransportCost" value="${shipmentRouteSegment.actualTransportCost?if_exists}"/> - <br/> + <br /> <input type="text" size="8" name="actualServiceCost" value="${shipmentRouteSegment.actualServiceCost?if_exists}"/> - <br/> + <br /> <input type="text" size="8" name="actualOtherCost" value="${shipmentRouteSegment.actualOtherCost?if_exists}"/> - <br/> + <br /> <input type="text" size="8" name="actualCost" value="${shipmentRouteSegment.actualCost?if_exists}"/> </td> </tr> @@ -383,7 +383,7 @@ under the License. <td valign="top"> <div> <span class="label">${uiLabelMap.ProductNewSegment}</span> - <br/> + <br /> <a href="javascript:document.createShipmentRouteSegmentForm.submit();" class="buttontext">${uiLabelMap.CommonCreate}</a> </div> </td> @@ -400,7 +400,7 @@ under the License. <option value="${shipmentMethodTypeOption.shipmentMethodTypeId}">${shipmentMethodTypeOption.get("description",locale)}</option> </#list> </select> - <br/> + <br /> <select name="originFacilityId"> <option value=""> </option> <#list facilities as facility> @@ -413,10 +413,10 @@ under the License. <option value="${facility.facilityId}">${facility.facilityName} [${facility.facilityId}]</option> </#list> </select> - <br/> + <br /> <input type="text" size="15" name="originContactMechId" value=""/> <input type="text" size="15" name="destContactMechId" value=""/> - <br/> + <br /> <input type="text" size="15" name="originTelecomNumberId" value=""/> <input type="text" size="15" name="destTelecomNumberId" value=""/> </div> @@ -428,12 +428,12 @@ under the License. <option value="${carrierServiceStatusValidChangeToDetail.statusIdTo}">${carrierServiceStatusValidChangeToDetail.transitionName} [${carrierServiceStatusValidChangeToDetail.description}]</option> </#list> </select> - <br/> + <br /> <input type="text" size="24" name="trackingIdNumber" value=""/> - <br/> + <br /> <input type="text" size="25" name="estimatedStartDate" value=""/><a href="javascript:call_cal(document.createShipmentRouteSegmentForm.estimatedStartDate, '${nowTimestampString}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar'></a> <input type="text" size="25" name="estimatedArrivalDate" value=""/><a href="javascript:call_cal(document.createShipmentRouteSegmentForm.estimatedArrivalDate, '${nowTimestampString}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar'></a> - <br/> + <br /> <input type="text" size="25" name="actualStartDate" value=""/><a href="javascript:call_cal(document.createShipmentRouteSegmentForm.actualStartDate, '${nowTimestampString}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar'></a> <input type="text" size="25" name="actualArrivalDate" value=""/><a href="javascript:call_cal(document.createShipmentRouteSegmentForm.actualArrivalDate, '${nowTimestampString}');"><img src='<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>' width='16' height='16' border='0' alt='Calendar'></a> </td> @@ -445,20 +445,20 @@ under the License. <option value="${weightUom.uomId}">${weightUom.get("description",locale)} [${weightUom.abbreviation}]</option> </#list> </select> - <br/> + <br /> <select name="currencyUomId"> <option value=""> </option> <#list currencyUoms as altCurrencyUom> <option value="${altCurrencyUom.uomId}">${altCurrencyUom.get("description",locale)} [${altCurrencyUom.uomId}]</option> </#list> </select> - <br/> + <br /> <input type="text" size="8" name="actualTransportCost"/> - <br/> + <br /> <input type="text" size="8" name="actualServiceCost"/> - <br/> + <br /> <input type="text" size="8" name="actualOtherCost"/> - <br/> + <br /> <input type="text" size="8" name="actualCost"/> </td> </tr> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/PackOrder.ftl Tue Mar 16 01:56:41 2010 @@ -66,7 +66,7 @@ under the License. </div> </#if> </#if> - <br/> + <br /> <!-- select order form --> <form name="selectOrderForm" method="post" action="<@ofbizUrl>PackOrder</@ofbizUrl>"> @@ -93,7 +93,7 @@ under the License. </tr> </table> </form> - <br/> + <br /> <!-- select picklist bin form --> <form name="selectPicklistBinForm" method="post" action="<@ofbizUrl>PackOrder</@ofbizUrl>" style="margin: 0;"> @@ -156,28 +156,28 @@ under the License. <tr> <td valign="top"> <span class="label">${uiLabelMap.ProductShipToAddress}</span> - <br/> + <br /> ${uiLabelMap.CommonTo}: ${postalAddress.toName?default("")} - <br/> + <br /> <#if postalAddress.attnName?has_content> ${uiLabelMap.CommonAttn}: ${postalAddress.attnName} - <br/> + <br /> </#if> ${postalAddress.address1} - <br/> + <br /> <#if postalAddress.address2?has_content> ${postalAddress.address2} - <br/> + <br /> </#if> ${postalAddress.city?if_exists}, ${postalAddress.stateProvinceGeoId?if_exists} ${postalAddress.postalCode?if_exists} - <br/> + <br /> ${postalAddress.countryGeoId} - <br/> + <br /> </td> <td> </td> <td valign="top"> <span class="label">${uiLabelMap.ProductCarrierShipmentMethod}</span> - <br/> + <br /> <#if carrier == "USPS"> <#assign color = "red"> <#elseif carrier == "UPS"> @@ -190,18 +190,18 @@ under the License. </#if> ${orderItemShipGroup.shipmentMethodTypeId?default("??")} - <br/> + <br /> <span class="label">${uiLabelMap.ProductEstimatedShipCostForShipGroup}</span> - <br/> + <br /> <#if shipmentCostEstimateForShipGroup?exists> <@ofbizCurrency amount=shipmentCostEstimateForShipGroup isoCode=orderReadHelper.getCurrency()?if_exists/> - <br/> + <br /> </#if> </td> <td> </td> <td valign="top"> <span class="label">${uiLabelMap.OrderInstructions}</span> - <br/> + <br /> ${orderItemShipGroup.shippingInstructions?default("(${uiLabelMap.CommonNone})")} </td> </tr> @@ -210,7 +210,7 @@ under the License. <!-- manual per item form --> <#if showInput != "N"> - <hr/> + <hr /> <form name="singlePackForm" method="post" action="<@ofbizUrl>ProcessPackOrder</@ofbizUrl>"> <input type="hidden" name="packageSeq" value="${packingSession.getCurrentPackageSeq()}"/> <input type="hidden" name="orderId" value="${orderId}"/> @@ -241,7 +241,7 @@ under the License. <!-- auto grid form --> <#assign itemInfos = packingSession.getItemInfos()?if_exists> <#if showInput != "N" && hideGrid != "Y" && itemInfos?has_content> - <br/> + <br /> <form name="multiPackForm" method="post" action="<@ofbizUrl>ProcessBulkPackOrder</@ofbizUrl>"> <input type="hidden" name="facilityId" value="${facilityId?if_exists}"> <input type="hidden" name="orderId" value="${orderId?if_exists}"> @@ -343,7 +343,7 @@ under the License. </tr> </table> </form> - <br/> + <br /> </#if> <!-- complete form --> @@ -362,11 +362,11 @@ under the License. <#if packageSeqIds?has_content> <td> <span class="label">${uiLabelMap.ProductPackedWeight} (${("uiLabelMap.ProductShipmentUomAbbreviation_" + defaultWeightUomId)?eval}):</span> - <br/> + <br /> <#list packageSeqIds as packageSeqId> ${uiLabelMap.ProductPackage} ${packageSeqId} <input type="text" size="7" name="packageWeight_${packageSeqId}" value="${packingSession.getPackageWeight(packageSeqId?int)?if_exists}"> - <br/> + <br /> </#list> <#if orderItemShipGroup?has_content> <input type="hidden" name="shippingContactMechId" value="${orderItemShipGroup.contactMechId?if_exists}"/> @@ -379,16 +379,16 @@ under the License. </#if> <td nowrap="nowrap"> <span class="label">${uiLabelMap.ProductAdditionalShippingCharge}:</span> - <br/> + <br /> <input type="text" name="additionalShippingCharge" value="${packingSession.getAdditionalShippingCharge()?if_exists}" size="20"/> <#if packageSeqIds?has_content> <a href="javascript:document.completePackForm.action='<@ofbizUrl>calcPackSessionAdditionalShippingCharge</@ofbizUrl>';document.completePackForm.submit();" class="buttontext">${uiLabelMap.ProductEstimateShipCost}</a> - <br/> + <br /> </#if> </td> <td> <span class="label">${uiLabelMap.ProductHandlingInstructions}:</span> - <br/> + <br /> <textarea name="handlingInstructions" rows="2" cols="30">${packingSession.getHandlingInstructions()?if_exists}</textarea> </td> <td align="right"> @@ -402,7 +402,7 @@ under the License. </td> </tr> </table> - <br/> + <br /> </form> </#if> </div> @@ -424,10 +424,10 @@ under the License. <#list sortedKeys as key> <#assign packedLines = packageMap.get(key)> <#if packedLines?has_content> - <br/> + <br /> <#assign packedLine = packedLines.get(0)?if_exists> <span class="label" style="font-size:1.2em">${uiLabelMap.ProductPackage} ${packedLine.getPackageSeq()?if_exists}</span> - <br/> + <br /> <table class="basic-table" cellspacing='0'> <tr class="header-row"> <td>${uiLabelMap.ProductItem} #</td> @@ -517,4 +517,4 @@ under the License. </div> <#else> <h3>${uiLabelMap.ProductFacilityViewPermissionError}</h3> -</#if> \ No newline at end of file +</#if> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/QuickShipOrder.ftl Tue Mar 16 01:56:41 2010 @@ -117,7 +117,7 @@ function setWeight(weight) { <#-- display the links for label/packing slip --> <#assign allDone = "yes"> <center> - <a href="<@ofbizUrl>viewShipmentPackageRouteSegLabelImage?shipmentId=${requestParameters.shipmentId}&shipmentRouteSegmentId=${requestParameters.shipmentRouteSegmentId}&shipmentPackageSeqId=00001</@ofbizUrl>" target="_blank" class="buttontext">${uiLabelMap.ProductShippingLabel}</a><br/> + <a href="<@ofbizUrl>viewShipmentPackageRouteSegLabelImage?shipmentId=${requestParameters.shipmentId}&shipmentRouteSegmentId=${requestParameters.shipmentRouteSegmentId}&shipmentPackageSeqId=00001</@ofbizUrl>" target="_blank" class="buttontext">${uiLabelMap.ProductShippingLabel}</a><br /> <a href="<@ofbizUrl>ShipmentManifest.pdf?shipmentId=${requestParameters.shipmentId}&shipmentRouteSegmentId=${requestParameters.shipmentRouteSegmentId}</@ofbizUrl>" target="_blank" class="buttontext">${uiLabelMap.ProductPackingSlip}</a> </center> </#if> @@ -166,12 +166,12 @@ function setWeight(weight) { <#else> <div class="alert">${uiLabelMap.ProductErrorNoPackagesFoundForShipment} !</div> </#if> - <hr/> + <hr /> ${pages.get("/shipment/ViewShipmentInfo.ftl")} - <br/>${pages.get("/shipment/ViewShipmentItemInfo.ftl")} - <br/>${pages.get("/shipment/ViewShipmentPackageInfo.ftl")} + <br />${pages.get("/shipment/ViewShipmentItemInfo.ftl")} + <br />${pages.get("/shipment/ViewShipmentPackageInfo.ftl")} <#if allDone?default("no") == "yes"> - <br/>${pages.get("/shipment/ViewShipmentRouteInfo.ftl")} + <br />${pages.get("/shipment/ViewShipmentRouteInfo.ftl")} </#if> </#if> <#else> @@ -201,4 +201,4 @@ function setWeight(weight) { document.selectOrderForm.orderId.focus(); </script> </#if> -</#if> \ No newline at end of file +</#if> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/ReceiveInventoryAgainstPurchaseOrder.ftl Tue Mar 16 01:56:41 2010 @@ -92,7 +92,7 @@ under the License. <#assign itemsAvailableToReceive = totalAvailableToReceive?default(0) > 0/> <#if orderItemDatas?exists> - <br/> + <br /> <#assign rowCount = 0> <#assign totalReadyToReceive = 0/> <form action="<@ofbizUrl>issueOrderItemToShipmentAndReceiveAgainstPO?clearAll=Y</@ofbizUrl>" method="post" name="selectAllForm"> @@ -153,7 +153,7 @@ under the License. <div> <#if fulfilledReservations?has_content> <#list fulfilledReservations?sort_by("orderId") as fulfilledReservation> - ${fulfilledReservation.orderId}<br/> + ${fulfilledReservation.orderId}<br /> </#list> </#if> </div> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/ShipmentTabBar.ftl Tue Mar 16 01:56:41 2010 @@ -40,6 +40,6 @@ under the License. <li<#if selected="ViewShipmentReceipts"> class="selected"</#if>><a href="<@ofbizUrl>ViewShipmentReceipts?shipmentId=${shipmentId}</@ofbizUrl>">${uiLabelMap.ProductShipmentReceipts}</a></li> </#if> </ul> - <br/> + <br /> </div> </#if> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/VerifyPick.ftl Tue Mar 16 01:56:41 2010 @@ -47,7 +47,7 @@ under the License. </div> </#if> </#if> - <br/> + <br /> <div class="screenlet-body"> <form name="selectOrderForm" method="post" action="<@ofbizUrl>VerifyPick</@ofbizUrl>"> <input type="hidden" name="facilityId" value="${facility.facilityId?if_exists}"/> @@ -74,7 +74,7 @@ under the License. </tr> </table> </form> - <br/> + <br /> <!-- select picklist bin form --> <form name="selectPicklistBinForm" method="post" action="<@ofbizUrl>VerifyPick</@ofbizUrl>" style="margin: 0;"> <input type="hidden" name="facilityId" value="${facility.facilityId?if_exists}"/> @@ -118,28 +118,28 @@ under the License. <tr> <td valign="top"> <span class="label">${uiLabelMap.ProductShipToAddress}</span> - <br/> + <br /> ${uiLabelMap.CommonTo}: ${postalAddress.toName?default("")} - <br/> + <br /> <#if postalAddress.attnName?has_content> ${uiLabelMap.CommonAttn}: ${postalAddress.attnName} - <br/> + <br /> </#if> ${postalAddress.address1} - <br/> + <br /> <#if postalAddress.address2?has_content> ${postalAddress.address2} - <br/> + <br /> </#if> ${postalAddress.city?if_exists}, ${postalAddress.stateProvinceGeoId?if_exists} ${postalAddress.postalCode?if_exists} - <br/> + <br /> ${postalAddress.countryGeoId} - <br/> + <br /> </td> <td> </td> <td valign="top"> <span class="label">${uiLabelMap.ProductCarrierShipmentMethod}</span> - <br/> + <br /> <#if carrier == "USPS"> <#assign color = "red"> <#elseif carrier == "UPS"> @@ -156,13 +156,13 @@ under the License. <td> </td> <td valign="top"> <span class="label">${uiLabelMap.OrderInstructions}</span> - <br/> + <br /> ${orderItemShipGroup.shippingInstructions?default("(${uiLabelMap.CommonNone})")} </td> </tr> </table> </#if> - <hr/> + <hr /> <form name="singlePickForm" method="post" action="<@ofbizUrl>processVerifyPick</@ofbizUrl>"> <input type="hidden" name="orderId" value="${orderId?if_exists}"/> <input type="hidden" name="shipGroupSeqId" value="${shipGroupSeqId?if_exists}"/> @@ -181,7 +181,7 @@ under the License. </tr> </table> </form> - <br/> + <br /> <#assign orderItems = orderItems?if_exists> <form name="multiPickForm" method="post" action="<@ofbizUrl>processBulkVerifyPick</@ofbizUrl>"> <input type="hidden" name="facilityId" value="${facility.facilityId?if_exists}"/> @@ -313,7 +313,7 @@ under the License. </tr> </table> </form> - <br/> + <br /> </div> </div> <#assign orderId = orderId?if_exists > Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/ViewShipmentRouteInfo.ftl Tue Mar 16 01:56:41 2010 @@ -65,25 +65,25 @@ under the License. <td> <span>${(carrierPerson.firstName)?if_exists} ${(carrierPerson.middleName)?if_exists} ${(carrierPerson.lastName)?if_exists} ${(carrierPartyGroup.groupName)?if_exists} [${shipmentRouteSegment.carrierPartyId?if_exists}]</span> <span>${shipmentMethodType.description?default(shipmentRouteSegment.shipmentMethodTypeId?if_exists)}</span> - <br/> + <br /> <span class="label">${uiLabelMap.ProductOrigin}</span> <span>${(originFacility.facilityName)?if_exists} [${originFacility.facilityId?if_exists}]</span> - <br/> + <br /> <span class="label">${uiLabelMap.ProductDest}</span> <span>${(destFacility.facilityName)?if_exists} [${destFacility.facilityId?if_exists}]</span> - <br/> + <br /> <span class="label">${uiLabelMap.ProductOrigin}</span> <span><#if originPostalAddress?has_content>${uiLabelMap.CommonTo} : ${originPostalAddress.toName?if_exists}, ${uiLabelMap.CommonAttn} : ${originPostalAddress.attnName?if_exists}, ${originPostalAddress.address1?if_exists}, ${originPostalAddress.address2?if_exists}, ${originPostalAddress.city?if_exists}, ${originPostalAddress.stateProvinceGeoId?if_exists}, ${originPostalAddress.postalCode?if_exists}, ${originPostalAddress.countryGeoId?if_exists}</#if> [${shipmentRouteSegment.originContactMechId?if_exists}]</span> - <br/> + <br /> <span class="label">${uiLabelMap.ProductDest}</span> <span><#if destPostalAddress?has_content>${uiLabelMap.CommonTo} : ${destPostalAddress.toName?if_exists}, ${uiLabelMap.CommonAttn} : ${destPostalAddress.attnName?if_exists}, ${destPostalAddress.address1?if_exists}, ${destPostalAddress.address2?if_exists}, ${destPostalAddress.city?if_exists}, ${destPostalAddress.stateProvinceGeoId?if_exists}, ${destPostalAddress.postalCode?if_exists}, ${destPostalAddress.countryGeoId?if_exists}</#if> [${shipmentRouteSegment.destContactMechId?if_exists}]</span> - <br/> + <br /> <span class="label">${uiLabelMap.ProductOrigin}</span> <span><#if originTelecomNumber?has_content>${originTelecomNumber.countryCode?if_exists} ${originTelecomNumber.areaCode?if_exists} ${originTelecomNumber.contactNumber?if_exists}</#if> [${shipmentRouteSegment.originTelecomNumberId?if_exists}]</span> - <br/> + <br /> <span class="label">${uiLabelMap.ProductDest}</span> <span><#if destTelecomNumber?has_content>${destTelecomNumber.countryCode?if_exists} ${destTelecomNumber.areaCode?if_exists} ${destTelecomNumber.contactNumber?if_exists}</#if> [${shipmentRouteSegment.destTelecomNumberId?if_exists}]</span> - <br/> + <br /> </td> <td> <div>${(carrierServiceStatus.description)?default(" ")}</div> Modified: ofbiz/trunk/applications/product/webapp/facility/shipment/WeightPackage.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/shipment/WeightPackage.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/shipment/WeightPackage.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/shipment/WeightPackage.ftl Tue Mar 16 01:56:41 2010 @@ -61,7 +61,7 @@ under the License. </form> </#list> </#if> - <br/> + <br /> <#if !(orderId?has_content)> <form name="selectOrderForm" method="post" action="<@ofbizUrl>WeightPackageOnly</@ofbizUrl>"> <input type="hidden" name="facilityId" value="${(facility.facilityId)?if_exists}"> @@ -85,7 +85,7 @@ under the License. </tr> </table> </form> - <br/> + <br /> <!-- select picklist bin form --> <form name="selectPicklistBinForm" method="post" action="<@ofbizUrl>WeightPackageOnly</@ofbizUrl>" style="margin: 0;"> <input type="hidden" name="facilityId" value="${(facility.facilityId)?if_exists}"> @@ -190,21 +190,21 @@ under the License. <tr> <td> <span class="label">${uiLabelMap.ProductPackedWeight} (${("uiLabelMap.ProductShipmentUomAbbreviation_" + defaultWeightUomId)?eval}): - <br/> + <br /> ${uiLabelMap.ProductPackage} <input type="text" size="7" name="packageWeight" value=""/> </span> </td> <td> <span class="label">${uiLabelMap.CommonDimension} (${("uiLabelMap.ProductShipmentUomAbbreviation_" + defaultDimensionUomId)?eval}):</span> - <br/> + <br /> <span class="label">${uiLabelMap.CommonLength}<input type="text" name="packageLength" value="" size="5"/></span> <span class="label">${uiLabelMap.ProductWidth}<input type="text" name="packageWidth" value="" size="5"/></span> <span class="label">${uiLabelMap.PartyHeight}<input type="text" name="packageHeight" value="" size="5"/></span> </td> <td> <span class="label">${uiLabelMap.ProductPackageInputBox}:</span> - <br/> + <br /> <select name="shipmentBoxTypeId"> <#if shipmentBoxTypes?has_content> <option value=""></option> Modified: ofbiz/trunk/applications/securityext/email/default/passwordemail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/securityext/email/default/passwordemail.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/securityext/email/default/passwordemail.ftl (original) +++ ofbiz/trunk/applications/securityext/email/default/passwordemail.ftl Tue Mar 16 01:56:41 2010 @@ -22,7 +22,7 @@ under the License. </head> <body> <div>${uiLabelMap.EcommerceThisEmailIsInResponseToYourRequestToHave} <#if useEncryption>${uiLabelMap.EcommerceANew}<#else>${uiLabelMap.EcommerceYour}</#if> ${uiLabelMap.EcommercePasswordSentToYou}.</div> - <br/> + <br /> <div> <#if useEncryption> ${uiLabelMap.EcommerceNewPasswordMssgEncryptionOn} Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl (original) +++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/day.ftl Tue Mar 16 01:56:41 2010 @@ -32,7 +32,7 @@ under the License. <#if (nowTimestamp >= period.start) && (nowTimestamp <= period.end)><#assign currentPeriod = true/></#if> <tr<#if currentPeriod> class="current-period"<#else><#if (period.calendarEntries?size > 0)> class="active-period"</#if></#if>> <td class="label"> - ${period.start?time?string.short}<br/> + ${period.start?time?string.short}<br /> <a href="<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=day&form=edit&parentTypeId=${parentTypeId?if_exists}&start=${parameters.start?if_exists}¤tStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}${urlParam?if_exists}${addlParam?if_exists}</@ofbizUrl>">${uiLabelMap.CommonAddNew}</a> </td> <#list period.calendarEntries as calEntry> @@ -68,7 +68,7 @@ under the License. <#else> ${startDate?time?string.short}-${completionDate?time?string.short} </#if> - <br/> + <br /> ${setRequestAttribute("periodType", "day")} ${setRequestAttribute("workEffortId", calEntry.workEffort.workEffortId)} ${screens.render("component://workeffort/widget/CalendarScreens.xml#calendarEventContent")} Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/eventsByForms.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/eventsByForms.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/eventsByForms.ftl (original) +++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/eventsByForms.ftl Tue Mar 16 01:56:41 2010 @@ -41,7 +41,7 @@ under the License. </select> <input type="submit" value="${uiLabelMap.CommonView}"/> </form> - <br/> + <br /> <form style="display: inline;" action="<@ofbizUrl>${parameters.targetRequestUri}</@ofbizUrl>" method="post"> <input type="hidden" name="start" value="${start.time?string("#")}"/> Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl (original) +++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/month.ftl Tue Mar 16 01:56:41 2010 @@ -71,7 +71,7 @@ height: auto; <#if !completionDate?has_content && calEntry.workEffort.estimatedMilliSeconds?has_content> <#assign completionDate = calEntry.workEffort.estimatedStartDate + calEntry.workEffort.estimatedMilliSeconds> </#if> - <hr/> + <hr /> <#if (startDate.compareTo(period.start) <= 0 && completionDate?has_content && completionDate.compareTo(period.end) >= 0)> ${uiLabelMap.CommonAllDay} <#elseif startDate.before(period.start) && completionDate?has_content> @@ -83,11 +83,11 @@ height: auto; <#else> ${startDate?time?string.short}-${completionDate?time?string.short} </#if> - <br/> + <br /> ${setRequestAttribute("periodType", "month")} ${setRequestAttribute("workEffortId", calEntry.workEffort.workEffortId)} ${screens.render("component://workeffort/widget/CalendarScreens.xml#calendarEventContent")} - <br/> + <br /> </#list> </td> @@ -112,7 +112,7 @@ height: auto; <#else> ${calEntry.workEffort.estimatedStartDate?time?string.short}-${calEntry.workEffort.estimatedCompletionDate?time?string.short} </#if> - <br/> + <br /> <a href="<@ofbizUrl>WorkEffortSummary?workEffortId=${calEntry.workEffort.workEffortId}${addlParam?if_exists}</@ofbizUrl>" class="event">${calEntry.workEffort.workEffortName?default("Undefined")}</a> </td> </tr> Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl (original) +++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/upcoming.ftl Tue Mar 16 01:56:41 2010 @@ -28,7 +28,7 @@ under the License. <#list days as day> <#assign workEfforts = day.calendarEntries> <#if workEfforts?has_content> - <tr class="header-row"><th colspan="4"><hr/></th></tr> + <tr class="header-row"><th colspan="4"><hr /></th></tr> <#assign alt_row = false> <#list workEfforts as calendarEntry> <#assign workEffort = calendarEntry.workEffort> Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl (original) +++ ofbiz/trunk/applications/workeffort/webapp/workeffort/calendar/week.ftl Tue Mar 16 01:56:41 2010 @@ -32,7 +32,7 @@ under the License. <#if (nowTimestamp >= period.start) && (nowTimestamp <= period.end)><#assign currentPeriod = true/></#if> <tr<#if currentPeriod> class="current-period"<#else><#if (period.calendarEntries?size > 0)> class="active-period"</#if></#if>> <td class="centered" width="1%"> - <a href="<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=day&start=${period.start.time?string("#")}${urlParam?if_exists}${addlParam?if_exists}</@ofbizUrl>">${period.start?date?string("EEEE")?cap_first} ${period.start?date?string.short}</a><br/> + <a href="<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=day&start=${period.start.time?string("#")}${urlParam?if_exists}${addlParam?if_exists}</@ofbizUrl>">${period.start?date?string("EEEE")?cap_first} ${period.start?date?string.short}</a><br /> <a href="<@ofbizUrl>${parameters._LAST_VIEW_NAME_}?period=week&form=edit&start=${parameters.start?if_exists}&parentTypeId=${parentTypeId?if_exists}¤tStatusId=CAL_TENTATIVE&estimatedStartDate=${period.start?string("yyyy-MM-dd HH:mm:ss")}&estimatedCompletionDate=${period.end?string("yyyy-MM-dd HH:mm:ss")}${addlParam?if_exists}${urlParam?if_exists}</@ofbizUrl>">${uiLabelMap.CommonAddNew}</a> </td> <#list period.calendarEntries as calEntry> @@ -70,7 +70,7 @@ under the License. <#else> ${startDate?time?string.short}-${completionDate?time?string.short} </#if> - <br/> + <br /> ${setRequestAttribute("periodType", "week")} ${setRequestAttribute("workEffortId", calEntry.workEffort.workEffortId)} ${screens.render("component://workeffort/widget/CalendarScreens.xml#calendarEventContent")} Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchResults.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchResults.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchResults.ftl (original) +++ ofbiz/trunk/applications/workeffort/webapp/workeffort/find/WorkEffortSearchResults.ftl Tue Mar 16 01:56:41 2010 @@ -28,7 +28,7 @@ under the License. <div><a href="<@ofbizUrl>WorkEffortSearchOptions</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRefineSearch}</a></div> <#if !workEffortIds?has_content> - <br/><h2> ${uiLabelMap.ProductNoResultsFound}.</h2> + <br /><h2> ${uiLabelMap.ProductNoResultsFound}.</h2> </#if> <#if workEffortIds?has_content> Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/main.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/main.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/webapp/workeffort/main.ftl (original) +++ ofbiz/trunk/applications/workeffort/webapp/workeffort/main.ftl Tue Mar 16 01:56:41 2010 @@ -27,7 +27,7 @@ under the License. <div class="screenlet-body"> <#if !userLogin?has_content> <div>${uiLabelMap.WorkEffortInterestingSure}.</div> - <br/> + <br /> </#if> <div class="label">${uiLabelMap.WorkEffortApplicationEventsTasksWorkflowActivities}.</div> </div> Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/task/mytasks.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/task/mytasks.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/webapp/workeffort/task/mytasks.ftl (original) +++ ofbiz/trunk/applications/workeffort/webapp/workeffort/task/mytasks.ftl Tue Mar 16 01:56:41 2010 @@ -21,7 +21,7 @@ under the License. <a href="<@ofbizUrl>EditWorkEffort?workEffortTypeId=TASK&currentStatusId=CAL_NEEDS_ACTION</@ofbizUrl>" class="buttontext create">${uiLabelMap.WorkEffortNewTask}</a> </div> <h2>${uiLabelMap.WorkEffortAssignedTasks}</h2> - <br/> + <br /> <table class="basic-table hover-bar" cellspacing="0"> <tr class="header-row-2"> <td>${uiLabelMap.CommonStartDateTime}</td> @@ -42,7 +42,7 @@ under the License. </table> <#if (activities.size() > 0)> <h2>${uiLabelMap.WorkEffortWorkflowActivitiesUser}</h2> - <br/> + <br /> <table class="basic-table hover-bar" cellspacing="0"> <tr class="header-row-2"> <td>${uiLabelMap.CommonStartDateTime}</td> @@ -72,7 +72,7 @@ under the License. </#if> <#if (roleActivities.size() > 0)> <h2>${uiLabelMap.WorkEffortWorkflowActivitiesUserRole}</h2> - <br/> + <br /> <table class="basic-table hover-bar" cellspacing="0"> <tr class="header-row-2"> <td>${uiLabelMap.CommonStartDateTime}</td> @@ -102,7 +102,7 @@ under the License. </#if> <#if (groupActivities.size() > 0)> <h2>${uiLabelMap.WorkEffortWorkflowActivitiesUserGroup}</h2> - <br/> + <br /> <table class="basic-table hover-bar" cellspacing="0"> <tr class="header-row-2"> <td>${uiLabelMap.CommonStartDateTime}</td> Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/workeffort/EventReminderEmail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/workeffort/EventReminderEmail.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/workeffort/webapp/workeffort/workeffort/EventReminderEmail.ftl (original) +++ ofbiz/trunk/applications/workeffort/webapp/workeffort/workeffort/EventReminderEmail.ftl Tue Mar 16 01:56:41 2010 @@ -47,7 +47,7 @@ under the License. <tr><td class="label">${uiLabelMap.CommonType}</td><td>${(workEffortType.description)?default(" ")}</td></tr> <tr><td class="label">${uiLabelMap.CommonPurpose}</td><td>${(workEffortPurposeType.description)?default(" ")}</td></tr> <tr><td class="label">${uiLabelMap.CommonStatus}</td><td>${(currentStatusItem.description)?default(" ")}</td></tr> - <tr><td colspan="2"><hr/></td> + <tr><td colspan="2"><hr /></td> </table> <#if partyAssignments?has_content> <div><b>${uiLabelMap.PageTitleListWorkEffortPartyAssigns}</b></div> Modified: ofbiz/trunk/framework/common/webcommon/includes/simple.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/includes/simple.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/includes/simple.ftl (original) +++ ofbiz/trunk/framework/common/webcommon/includes/simple.ftl Tue Mar 16 01:56:41 2010 @@ -56,7 +56,7 @@ under the License. <form name="printPage"> <input type="button" value="${uiLabelMap.CommonPrint}" onClick="window.print()" class="smallSubmit"/> </form> -<br/> +<br /> ${sections.render("body")} </body> </html> Modified: ofbiz/trunk/framework/common/webcommon/login.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/login.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/login.ftl (original) +++ ofbiz/trunk/framework/common/webcommon/login.ftl Tue Mar 16 01:56:41 2010 @@ -48,7 +48,7 @@ under the License. </tr> </table> <input type="hidden" name="JavaScriptEnabled" value="N"/> - <br/> + <br /> <a href="<@ofbizUrl>forgotPassword</@ofbizUrl>">${uiLabelMap.CommonForgotYourPassword}?</a> </form> </div> Modified: ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl (original) +++ ofbiz/trunk/framework/common/webcommon/portal/editPortalPage.ftl Tue Mar 16 01:56:41 2010 @@ -21,7 +21,7 @@ under the License. <tr> <#list portalPageColumnList?if_exists as portalPageColumn> <td class="manage-portal-column-toolbar" style="vertical-align: top; <#if portalPageColumn.columnWidthPercentage?has_content> width:${portalPageColumn.columnWidthPercentage}%;</#if>"> - <hr/> + <hr /> <ul> <li id="delete-column"><form method="post" action="<@ofbizUrl>deletePortalPageColumn</@ofbizUrl>" onSubmit="javascript:submitFormDisableSubmits(this)" name="delPortalPageId_${portalPageColumn_index}"><input name="portalPageId" value="${portalPage.portalPageId}" type="hidden"/><input name="columnSeqId" value="${portalPageColumn.columnSeqId}" type="hidden"/><input name="parentPortalPageId" value="${parameters.parentPortalPageId}" type="hidden"/></form><a class="buttontext" href="javascript:document.delPortalPageId_${portalPageColumn_index}.submit()">${uiLabelMap.CommonRemove}</a></li> <li id="add-portlet"><form method="post" action="<@ofbizUrl>AddPortlet</@ofbizUrl>" onSubmit="javascript:submitFormDisableSubmits(this)" name="addPortlet_${portalPageColumn_index}"><input name="portalPageId" value="${portalPage.portalPageId}" type="hidden"/><input name="columnSeqId" value="${portalPageColumn.columnSeqId}" type="hidden"/><input name="parentPortalPageId" value="${parameters.parentPortalPageId}" type="hidden"/></form><a class="buttontext" href="javascript:document.addPortlet_${portalPageColumn_index}.submit()">${uiLabelMap.CommonAddAPortlet}</a></li> Modified: ofbiz/trunk/framework/common/webcommon/viewBlocked.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/webcommon/viewBlocked.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/framework/common/webcommon/viewBlocked.ftl (original) +++ ofbiz/trunk/framework/common/webcommon/viewBlocked.ftl Tue Mar 16 01:56:41 2010 @@ -24,7 +24,7 @@ under the License. </div> <div class="screenlet-body"> ${errorMessage?if_exists} - <br/> + <br /> </div> </div> </center> Modified: ofbiz/trunk/framework/images/webapp/images/dojo/src/widget/templates/Editor2/Dialog/createlink.html URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/dojo/src/widget/templates/Editor2/Dialog/createlink.html?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/framework/images/webapp/images/dojo/src/widget/templates/Editor2/Dialog/createlink.html (original) +++ ofbiz/trunk/framework/images/webapp/images/dojo/src/widget/templates/Editor2/Dialog/createlink.html Tue Mar 16 01:56:41 2010 @@ -1,5 +1,5 @@ <table> -<tr><td>URL</td><td> <input type="text" dojoAttachPoint="link_href" name="dojo_createLink_href"/></td></tr> +<tr><td>URL</td><td> <input type="text" dojoAttachPoint="link_href" name="dojo_createLink_href" /></td></tr> <tr><td>Target </td><td><select dojoAttachPoint="link_target"> <option value="">Self</option> <option value="_blank">New Window</option> @@ -12,4 +12,4 @@ <td><button dojoType='Button' dojoAttachEvent='onClick:cancel'>Cancel</button></td> </tr></table> </td></tr> -</table> \ No newline at end of file +</table> Modified: ofbiz/trunk/framework/images/webapp/images/dojo/src/widget/templates/Editor2/Dialog/insertimage.html URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/dojo/src/widget/templates/Editor2/Dialog/insertimage.html?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/framework/images/webapp/images/dojo/src/widget/templates/Editor2/Dialog/insertimage.html (original) +++ ofbiz/trunk/framework/images/webapp/images/dojo/src/widget/templates/Editor2/Dialog/insertimage.html Tue Mar 16 01:56:41 2010 @@ -62,7 +62,7 @@ <td nowrap="nowrap"> <span >HSpace</span> </td> <td> - <input type="text" size="2" dojoAttachPoint="image_hspace"/></td> + <input type="text" size="2" dojoAttachPoint="image_hspace" /></td> </tr> <tr> <td nowrap="nowrap"> @@ -111,4 +111,4 @@ <td><button dojoType='Button' dojoAttachEvent='onClick:cancel'>Cancel</button></td> </tr></table> </td></tr> -</table> \ No newline at end of file +</table> Modified: ofbiz/trunk/framework/images/webapp/images/dojo/src/widget/templates/Wizard.html URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/images/webapp/images/dojo/src/widget/templates/Wizard.html?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/framework/images/webapp/images/dojo/src/widget/templates/Wizard.html (original) +++ ofbiz/trunk/framework/images/webapp/images/dojo/src/widget/templates/Wizard.html Tue Mar 16 01:56:41 2010 @@ -2,9 +2,9 @@ <div class="WizardText" dojoAttachPoint="wizardPanelContainerNode"> </div> <div class="WizardButtonHolder" dojoAttachPoint="wizardControlContainerNode"> - <input class="WizardButton" type="button" dojoAttachPoint="previousButton"/> - <input class="WizardButton" type="button" dojoAttachPoint="nextButton"/> - <input class="WizardButton" type="button" dojoAttachPoint="doneButton" style="display:none"/> - <input class="WizardButton" type="button" dojoAttachPoint="cancelButton"/> + <input class="WizardButton" type="button" dojoAttachPoint="previousButton" /> + <input class="WizardButton" type="button" dojoAttachPoint="nextButton" /> + <input class="WizardButton" type="button" dojoAttachPoint="doneButton" style="display:none" /> + <input class="WizardButton" type="button" dojoAttachPoint="cancelButton" /> </div> </div> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/cache/editUtilCache.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/cache/editUtilCache.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/cache/editUtilCache.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/cache/editUtilCache.ftl Tue Mar 16 01:56:41 2010 @@ -31,7 +31,7 @@ under the License. <br class="clear"/> </div> <div class="screenlet-body"> - <br/> + <br /> <@displayButtonBar/> <#if cache?has_content> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCache.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCache.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCache.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCache.ftl Tue Mar 16 01:56:41 2010 @@ -33,7 +33,7 @@ under the License. <br class="clear"/> </div> <div class="screenlet-body"> - <br/> + <br /> <p> <u><b>${uiLabelMap.WebtoolsMemory}</b></u> <b>${uiLabelMap.WebtoolsTotalMemory}</b> ${memory} @@ -41,7 +41,7 @@ under the License. <b>${uiLabelMap.WebtoolsUsedMemory}</b> ${usedMemory} <b>${uiLabelMap.WebtoolsMaxMemory}</b> ${maxMemory} </p> - <br/> + <br /> <@displayButtonBar/> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/cache/findUtilCacheElements.ftl Tue Mar 16 01:56:41 2010 @@ -31,12 +31,12 @@ under the License. <br class="clear"/> </div> <div class="screenlet-body"> - <br/> + <br /> <p> <b>${uiLabelMap.WebtoolsCacheName}</b> ${cacheName?if_exists} (${now}) <b>${uiLabelMap.WebtoolsSizeTotal}</b> ${totalSize} ${uiLabelMap.WebtoolsBytes} </p> - <br/> + <br /> <@displayButtonBar/> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/datafile/viewdatafile.ftl Tue Mar 16 01:56:41 2010 @@ -24,9 +24,9 @@ under the License. <br class="clear"/> </div> <div class="screenlet-body"> - <br/> + <br /> <p>${uiLabelMap.WebtoolsDataFileMessage1}.</p> - <br/> + <br /> <#if security.hasPermission("DATAFILE_MAINT", session)> <form method="post" action="<@ofbizUrl>viewdatafile</@ofbizUrl>"> <table class="basic-table" cellspacing="0"> @@ -76,7 +76,7 @@ under the License. </form> <#if messages?has_content> - <hr/> + <hr /> <h1>${uiLabelMap.CommonFollowingOccurred}:</h1> <div> <#list messages as message> @@ -92,7 +92,7 @@ under the License. <#-- if record is different than the last displayed, make a new table and header row --> <#if !modelRecord.name.equals(lastRecordName)> <#if lastRecordName != null> - </table><br/> + </table><br /> </#if> <table class="basic-table hover-bar" cellspacing="0"> <tr> @@ -130,7 +130,7 @@ under the License. </#macro> <#if dataFile?has_content && modelDataFile?has_content && (!parameters.ENTITYXML_FILE_SAVE?has_content || parameters.ENTITYXML_FILE_SAVE.length() == 0) && (parameters.DATAFILE_SAVE == null || parameters.DATAFILE_SAVE.length() == 0)> - <hr/> + <hr /> <table class="basic-table" cellspacing="0"> <tr class="header-row"> <td>Name</td> @@ -153,7 +153,7 @@ under the License. <td colspan="">${modelDataFile.description}</td> </tr> </table> - <br/> + <br /> <@displayrecords records = dataFile.getRecords()/> </#if> <#else> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/CheckDb.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/CheckDb.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/entity/CheckDb.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/CheckDb.ftl Tue Mar 16 01:56:41 2010 @@ -111,7 +111,7 @@ under the License. ${uiLabelMap.WebtoolsGroupName}: <input type="text" name="groupName" value="${groupName}" size="40"/> <input type="submit" value="${uiLabelMap.CommonUpdate}"/> </form> - <hr/> + <hr /> </div> <#if miters?has_content> <ul> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityExportAll.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityExportAll.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityExportAll.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityExportAll.ftl Tue Mar 16 01:56:41 2010 @@ -23,14 +23,14 @@ under the License. ${uiLabelMap.WebtoolsXMLExportInfo} </p> <#if results?has_content> - <hr/> + <hr /> <h2>${uiLabelMap.WebtoolsResults}:</h2> <#list results as result> <p>${result}</p> </#list> </#if> -<hr/> +<hr /> <h2>${uiLabelMap.WebtoolsExport}:</h2> <form method="post" action="<@ofbizUrl>entityExportAll</@ofbizUrl>"> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImport.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImport.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImport.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImport.ftl Tue Mar 16 01:56:41 2010 @@ -20,7 +20,7 @@ under the License. <h1>${uiLabelMap.WebtoolsImportToDataSource}</h1> <br /> <p>${uiLabelMap.WebtoolsXMLImportInfo}</p> -<hr/> +<hr /> <h2>${uiLabelMap.WebtoolsImport}:</h2> <br /> @@ -43,7 +43,7 @@ under the License. <div class="button-bar"><input type="submit" value="${uiLabelMap.WebtoolsImportText}"/></div> </form> <#if messages?exists> - <hr/> + <hr /> <h3>${uiLabelMap.WebtoolsResults}:</h3> <#list messages as message> <p>${message}</p> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportDir.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportDir.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportDir.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportDir.ftl Tue Mar 16 01:56:41 2010 @@ -20,7 +20,7 @@ under the License. <h1>${uiLabelMap.WebtoolsImportToDataSource}</h1> <br /> <p>${uiLabelMap.WebtoolsXMLImportInfo}</p> -<hr/> +<hr /> <h2>${uiLabelMap.WebtoolsImport}:</h2> <form method="post" action="<@ofbizUrl>entityImportDir</@ofbizUrl>"> @@ -36,7 +36,7 @@ under the License. <div class="button-bar"><input type="submit" value="${uiLabelMap.WebtoolsImportFile}"/></div> </form> <#if messages?exists> - <hr/> + <hr /> <h1>${uiLabelMap.WebtoolsResults}:</h1> <#list messages as message> <p>${message}</p> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportReaders.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportReaders.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportReaders.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityImportReaders.ftl Tue Mar 16 01:56:41 2010 @@ -20,7 +20,7 @@ under the License. <h1>${uiLabelMap.WebtoolsImportToDataSource}</h1> <br /> <p>${uiLabelMap.WebtoolsXMLImportInfo}</p> -<hr/> +<hr /> <h2>${uiLabelMap.WebtoolsImport}:</h2> <form method="post" action="<@ofbizUrl>entityImportReaders</@ofbizUrl>"> @@ -34,7 +34,7 @@ under the License. <div class="button-bar"><input type="submit" value="${uiLabelMap.WebtoolsImport}"/></div> </form> <#if messages?exists> - <hr/> + <hr /> <h3>${uiLabelMap.WebtoolsResults}:</h3> <#list messages as message> <p>${message}</p> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityMaint.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityMaint.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityMaint.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityMaint.ftl Tue Mar 16 01:56:41 2010 @@ -57,7 +57,7 @@ under the License. <a href="#Entity_${firstChar}">${firstChar}</a> </#if> </#list> - <br/><br/> + <br /><br /> <div class="screenlet"> <div class="screenlet-title-bar"> <ul> Modified: ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRef.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRef.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRef.ftl (original) +++ ofbiz/trunk/framework/webtools/webapp/webtools/entity/EntityRef.ftl Tue Mar 16 01:56:41 2010 @@ -27,6 +27,6 @@ under the License. <noframes> <h2>${uiLabelMap.CommonFrameAlert1}</h2> <p>${uiLabelMap.CommonFrameAlert2}</p> - <br/> + <br /> </noframes> </html> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |