svn commit: r923545 [3/6] - in /ofbiz/trunk: applications/accounting/webapp
Locked
svn commit: r923545 [3/6] - in /ofbiz/trunk: applications/accounting/webapp
 
|
Modified: ofbiz/trunk/applications/order/webapp/ordermgr/order/transitions.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/order/transitions.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/order/transitions.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/order/transitions.ftl Tue Mar 16 01:56:41 2010 @@ -63,7 +63,7 @@ under the License. </div> </div> </#if> -<br/> +<br /> <#if wfTransitions?exists && wfTransitions?has_content> <div class="screenlet"> <div class="screenlet-title-bar"> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/ManageQuotePrices.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ManageQuotePrices.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/quote/ManageQuotePrices.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/ManageQuotePrices.ftl Tue Mar 16 01:56:41 2010 @@ -17,10 +17,10 @@ specific language governing permissions under the License. --> <span class="label">${uiLabelMap.OrderOrderQuoteCoefficients}</span> -<br/> +<br /> <#list quoteCoefficients as quoteCoefficient> <div>${quoteCoefficient.coeffName} ${quoteCoefficient.coeffValue}</div> </#list> -<br/> +<br /> <div><span class="label">${uiLabelMap.CommonTotalCostMult}</span> ${costMult}</div> <div><span class="label">${uiLabelMap.CommonTotalCostToPriceMult}</span> ${costToPriceMult}</div> \ No newline at end of file Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/ManageQuotePricesTotals.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ManageQuotePricesTotals.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/quote/ManageQuotePricesTotals.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/ManageQuotePricesTotals.ftl Tue Mar 16 01:56:41 2010 @@ -16,7 +16,7 @@ KIND, either express or implied. See th specific language governing permissions and limitations under the License. --> -<br/> +<br /> <div><span class="label">${uiLabelMap.CommonTotalCost}</span> ${totalCost}</div> <div><span class="label">${uiLabelMap.CommonTotalPrice}</span> ${totalPrice}</div> <div><span class="label">${uiLabelMap.CommonTotalCostMult}</span> ${totalCostMult}</div> \ No newline at end of file Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteItemInfo.ftl Tue Mar 16 01:56:41 2010 @@ -101,12 +101,12 @@ under the License. <#-- toggle the row color --> <#assign alt_row = !alt_row> </#list> - <tr><td colspan="10"><hr/></td></tr> + <tr><td colspan="10"><hr /></td></tr> <tr> <td align="right" colspan="6" class="label">${uiLabelMap.CommonSubtotal}</td> <td align="right"><@ofbizCurrency amount=totalQuoteAmount isoCode=quote.currencyUomId/></td> </tr> - <tr><td colspan="5"></td><td colspan="6"><hr/></td></tr> + <tr><td colspan="5"></td><td colspan="6"><hr /></td></tr> <#assign totalQuoteHeaderAdjustmentAmount = 0.0> <#assign findAdjustment = false> <#list quoteAdjustments as quoteAdjustment> @@ -122,7 +122,7 @@ under the License. </#list> <#assign grandTotalQuoteAmount = totalQuoteAmount + totalQuoteHeaderAdjustmentAmount> <#if findAdjustment> - <tr><td colspan="5"></td><td colspan="6"><hr/></td></tr> + <tr><td colspan="5"></td><td colspan="6"><hr /></td></tr> </#if> <tr> <td align="right" colspan="6" class="label">${uiLabelMap.OrderGrandTotal}</td> @@ -132,4 +132,4 @@ under the License. </tr> </table> </div> -</div> \ No newline at end of file +</div> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteProfit.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteProfit.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteProfit.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/ViewQuoteProfit.ftl Tue Mar 16 01:56:41 2010 @@ -20,13 +20,13 @@ under the License. <#list quoteCoefficients as quoteCoefficient> <div>${quoteCoefficient.coeffName}: ${quoteCoefficient.coeffValue}</div> </#list> -<br/> +<br /> <div><span class="label">${uiLabelMap.CommonTotalCostMult}</span> ${costMult}</div> <div><span class="label">${uiLabelMap.CommonTotalCostToPriceMult}</span> ${costToPriceMult}</div> -<br/> +<br /> <div><span class="label">${uiLabelMap.CommonTotalCost}</span> <@ofbizCurrency amount=totalCost isoCode=quote.currencyUomId/></div> <div><span class="label">${uiLabelMap.CommonTotalAmount}</span> <@ofbizCurrency amount=totalPrice isoCode=quote.currencyUomId/></div> -<br/> +<br /> <div><span class="label">${uiLabelMap.CommonTotalProfit}</span> <@ofbizCurrency amount=totalProfit isoCode=quote.currencyUomId/></div> <div><span class="label">${uiLabelMap.CommonTotalPercProfit}</span> ${totalPercProfit}%</div> -<br/> \ No newline at end of file +<br /> \ No newline at end of file Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteDate.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteDate.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteDate.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteDate.ftl Tue Mar 16 01:56:41 2010 @@ -31,7 +31,7 @@ under the License. ${(quote.issueDate.toString())?if_exists} </td> </tr> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.CommonValidFromDate} @@ -41,7 +41,7 @@ under the License. ${(quote.validFromDate.toString())?if_exists} </td> </tr> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.CommonValidThruDate} @@ -53,4 +53,4 @@ under the License. </tr> </table> </div> -</div> \ No newline at end of file +</div> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteInfo.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteInfo.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteInfo.ftl Tue Mar 16 01:56:41 2010 @@ -32,7 +32,7 @@ under the License. ${(quoteType.get("description",locale))?default(quote.quoteTypeId?if_exists)} </td> </tr> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <#-- quote Channel information --> <tr> @@ -44,7 +44,7 @@ under the License. ${(salesChannel.get("description",locale))?default(quote.salesChannelEnumId?if_exists)} </td> </tr> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <#-- quote status information --> <tr> @@ -57,7 +57,7 @@ under the License. </td> </tr> <#-- party --> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.PartyPartyId} @@ -68,7 +68,7 @@ under the License. </td> </tr> <#-- quote name --> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.OrderOrderQuoteName} @@ -79,7 +79,7 @@ under the License. </td> </tr> <#-- quote description --> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.CommonDescription} @@ -90,7 +90,7 @@ under the License. </td> </tr> <#-- quote currency --> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.CommonCurrency} @@ -101,7 +101,7 @@ under the License. </td> </tr> <#-- quote currency --> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.ProductProductStore} @@ -113,4 +113,4 @@ under the License. </tr> </table> </div> -</div> \ No newline at end of file +</div> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteRoles.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteRoles.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteRoles.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/quote/quoteRoles.ftl Tue Mar 16 01:56:41 2010 @@ -37,10 +37,10 @@ under the License. </td> </tr> <#if quoteRoles.size() != row> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> </#if> <#assign row = row + 1> </#list> </table> </div> -</div> \ No newline at end of file +</div> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/reports/reportlist.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/reports/reportlist.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/reports/reportlist.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/reports/reportlist.ftl Tue Mar 16 01:56:41 2010 @@ -22,7 +22,7 @@ They use the JasperReports reporting too they are good examples of creating detailed reports that you have a lot of control over. special thanks for Britton LaRoche for creating the first pass of these reports and helping to improve them.</div> -<br/> +<br /> <FORM METHOD="post" NAME="orderreportform" ACTION="<@ofbizUrl>orderreportjasper.pdf</@ofbizUrl>" TARGET="OrderReport"> <Table> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/AddedNoteCustRequestNotification.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/AddedNoteCustRequestNotification.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/request/AddedNoteCustRequestNotification.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/request/AddedNoteCustRequestNotification.ftl Tue Mar 16 01:56:41 2010 @@ -25,14 +25,14 @@ under the License. <body> <h2>${title}</h2> <p>Hello ${person.firstName?if_exists} ${person.lastName?if_exists},</p> - <p>Your Customer Request ${custRequest.custRequestName?if_exists} [${custRequest.custRequestId}] has a note added to it:<br/> + <p>Your Customer Request ${custRequest.custRequestName?if_exists} [${custRequest.custRequestId}] has a note added to it:<br /> ${StringUtil.wrapString(noteData.noteInfo?if_exists)} - <br/><br/> - Please login to the url below and add another note as a reply if required.<br/><br/> - The status and used hours can always be checked <br/> + <br /><br /> + Please login to the url below and add another note as a reply if required.<br /><br /> + The status and used hours can always be checked <br /> <a href="${StringUtil.wrapString(baseSecureUrl?if_exists)}/myportal/control/showPortletDecorator?portalPortletId=ViewCustRequest&id=${custRequest.custRequestId}">here.....</a> - <br/><br/> - Regards.<br/><br/> + <br /><br /> + Regards.<br /><br /> Thank you for your business. </body> </html> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/request/CompletedCustRequestNotification.ftl Tue Mar 16 01:56:41 2010 @@ -26,11 +26,11 @@ under the License. <h1>${title}</h1> <p>Hello ${person.firstName?if_exists} ${person.lastName?if_exists},</p> <p>Your Customer Request ${custRequest.custRequestName?if_exists} [${custRequest.custRequestId}] has been completed. - <br/><br/> - The status and used hours can always be checked at the url: <br/> + <br /><br /> + The status and used hours can always be checked at the url: <br /> <a href="${StringUtil.wrapString(baseUrl?if_exists)}/myportal/control/showPortletDecorator?portalPortletId=ViewCustRequest&id=${custRequest.custRequestId}">${baseUrl?if_exists}/myportal/control/ViewRequest?custRequestId=${custRequest.custRequestId}</a> - <br/><br/> - Regards.<br/><br/> + <br /><br /> + Regards.<br /><br /> Thank you for your business. </body> </html> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/request/CreateCustRequestNotification.ftl Tue Mar 16 01:56:41 2010 @@ -26,14 +26,14 @@ under the License. <h1>${title}</h1> <p>Hello ${person.firstName?if_exists} ${person.middleName?if_exists} ${person.lastName?if_exists},</p> <p>Your Customer Request ${custRequest.custRequestName?if_exists} [${custRequest.custRequestId}] has been created successfully. - <br/><br/> + <br /><br /> We will solve/implement the request as soon as possible - <br/><br/> - The status and used hours can always be checked <br/> + <br /><br /> + The status and used hours can always be checked <br /> <a href="${StringUtil.wrapString(baseUrl?if_exists)}/myportal/control/showPortletDecorator?portalPortletId=ViewCustRequest&id=${custRequest.custRequestId}">here....</a> - <br/><br/> + <br /><br /> Regards. - <br/><br/> + <br /><br /> PS. we will notify you when the customer request is completed. </p> </body> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/requestContactMech.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/requestContactMech.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/request/requestContactMech.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/request/requestContactMech.ftl Tue Mar 16 01:56:41 2010 @@ -46,17 +46,17 @@ under the License. <#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> + <#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/> + <#if postalAddress.countryGeoId?has_content><br /> <#assign country = postalAddress.getRelatedOneCache("CountryGeo")> ${country.geoName?default(country.geoId)} </#if> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/request/requestDate.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/request/requestDate.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/request/requestDate.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/request/requestDate.ftl Tue Mar 16 01:56:41 2010 @@ -31,7 +31,7 @@ under the License. ${(custRequest.custRequestDate.toString())?if_exists} </td> </tr> - <tr><td colspan="7"><hr/></td></tr> + <tr><td colspan="7"><hr /></td></tr> <tr> <td align="right" valign="top" width="25%" class="label"> ${uiLabelMap.OrderRequestCreatedDate} @@ -41,7 +41,7 @@ under the License. ${(custRequest.createdDate.toString())?if_exists} </td> </tr> - <tr><td colspan="7"><hr/></td></tr> + <tr><td colspan="7"><hr /></td></tr> <tr> <td align="right" valign="top" width="25%" class="label"> ${uiLabelMap.OrderRequestLastModifiedDate} @@ -53,4 +53,4 @@ under the License. </tr> </table> </div> -</div> \ No newline at end of file +</div> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/return/quickReturn.ftl Tue Mar 16 01:56:41 2010 @@ -37,7 +37,7 @@ under the License. <input type="hidden" name="currencyUomId" value="${orderHeader.currencyUom}"/> </#if> <#include "returnItemInc.ftl"/> - <hr/> + <hr /> <#if "CUSTOMER_RETURN" == returnHeaderTypeId> <h3>${uiLabelMap.FormFieldTitle_paymentMethodId}:</h3> <table cellspacing="0" class="basic-table"> @@ -82,14 +82,14 @@ under the License. </td> <td width="99%" valign="top" nowrap> <div> - <#if shippingAddress.toName?has_content><span class="label">${uiLabelMap.CommonTo}</span> ${shippingAddress.toName}<br/></#if> - <#if shippingAddress.attnName?has_content><span class="label">${uiLabelMap.CommonAttn}</span></b> ${shippingAddress.attnName}<br/></#if> - <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br/></#if> - <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br/></#if> + <#if shippingAddress.toName?has_content><span class="label">${uiLabelMap.CommonTo}</span> ${shippingAddress.toName}<br /></#if> + <#if shippingAddress.attnName?has_content><span class="label">${uiLabelMap.CommonAttn}</span></b> ${shippingAddress.attnName}<br /></#if> + <#if shippingAddress.address1?has_content>${shippingAddress.address1}<br /></#if> + <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br /></#if> <#if shippingAddress.city?has_content>${shippingAddress.city}</#if> - <#if shippingAddress.stateProvinceGeoId?has_content><br/>${shippingAddress.stateProvinceGeoId}</#if> - <#if shippingAddress.postalCode?has_content><br/>${shippingAddress.postalCode}</#if> - <#if shippingAddress.countryGeoId?has_content><br/>${shippingAddress.countryGeoId}</#if> + <#if shippingAddress.stateProvinceGeoId?has_content><br />${shippingAddress.stateProvinceGeoId}</#if> + <#if shippingAddress.postalCode?has_content><br />${shippingAddress.postalCode}</#if> + <#if shippingAddress.countryGeoId?has_content><br />${shippingAddress.countryGeoId}</#if> <#--<a href="<@ofbizUrl>editcontactmech?DONE_PAGE=checkoutoptions&contactMechId=${shippingAddress.contactMechId}</@ofbizUrl>" class="buttontext">[${uiLabelMap.CommonUpdate}]</a>--> </div> </td> @@ -101,4 +101,4 @@ under the License. </table> </form> </div> -</div> \ No newline at end of file +</div> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnHeader.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnHeader.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnHeader.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnHeader.ftl Tue Mar 16 01:56:41 2010 @@ -263,14 +263,14 @@ under the License. <input type='radio' name="originContactMechId" value="${postalAddress.contactMechId?if_exists}" <#if ( postalAddressFrom?has_content && postalAddressFrom.contactMechId?default("") == postalAddress.contactMechId)>checked="checked"</#if>> </#if> - <#if postalAddress.toName?has_content><span class="label">${uiLabelMap.CommonTo}</span> ${postalAddress.toName}<br/></#if> - <#if postalAddress.attnName?has_content><span class="label">${uiLabelMap.CommonAttn}</span> ${postalAddress.attnName}<br/></#if> - <#if postalAddress.address1?has_content> ${postalAddress.address1}<br/></#if> - <#if postalAddress.address2?has_content> ${postalAddress.address2}<br/></#if> + <#if postalAddress.toName?has_content><span class="label">${uiLabelMap.CommonTo}</span> ${postalAddress.toName}<br /></#if> + <#if postalAddress.attnName?has_content><span class="label">${uiLabelMap.CommonAttn}</span> ${postalAddress.attnName}<br /></#if> + <#if postalAddress.address1?has_content> ${postalAddress.address1}<br /></#if> + <#if postalAddress.address2?has_content> ${postalAddress.address2}<br /></#if> <#if postalAddress.city?has_content> ${postalAddress.city}</#if> <#if postalAddress.stateProvinceGeoId?has_content> ${postalAddress.stateProvinceGeoId}</#if> <#if postalAddress.postalCode?has_content> ${postalAddress.postalCode}</#if> - <#if postalAddress.countryGeoId?has_content><br/> ${postalAddress.countryGeoId}</#if> + <#if postalAddress.countryGeoId?has_content><br /> ${postalAddress.countryGeoId}</#if> </div> </#if> </#macro> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItemInc.ftl Tue Mar 16 01:56:41 2010 @@ -160,7 +160,7 @@ under the License. <tr> <td colspan="9"><h3>${uiLabelMap.OrderReturnAdjustments} #<a href="<@ofbizUrl>orderview?orderId=${orderId}</@ofbizUrl>" class="buttontext">${orderId}</h3></td> </tr> - <tr><td colspan="9"><br/></td></tr> + <tr><td colspan="9"><br /></td></tr> <#if orderHeaderAdjustments?has_content> <tr class="header-row"> <td>${uiLabelMap.CommonDescription}</td> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnItems.ftl Tue Mar 16 01:56:41 2010 @@ -122,7 +122,7 @@ under the License. </table> </td></tr> </#if> - <tr><td colspan="10"><br/></td></tr> + <tr><td colspan="10"><br /></td></tr> <tr class="header-row"> <td>${uiLabelMap.OrderOrderItems}</td> <td>${uiLabelMap.ProductProduct}</td> @@ -185,9 +185,9 @@ under the License. <input name="returnQuantity_o_${rowCount}" value="${item.returnQuantity}" type="text" size="8" align="right"> </#if> <#if item.receivedQuantity?exists> - <br/>${uiLabelMap.OrderTotalQuantityReceive}: ${item.receivedQuantity} + <br />${uiLabelMap.OrderTotalQuantityReceive}: ${item.receivedQuantity} <#list shipmentReceipts?if_exists as shipmentReceipt> - <br/>${uiLabelMap.OrderQty}: ${shipmentReceipt.quantityAccepted}, ${shipmentReceipt.datetimeReceived}, <a href="/facility/control/EditInventoryItem?inventoryItemId=${shipmentReceipt.inventoryItemId}" class="buttontext">${shipmentReceipt.inventoryItemId}</a> + <br />${uiLabelMap.OrderQty}: ${shipmentReceipt.quantityAccepted}, ${shipmentReceipt.datetimeReceived}, <a href="/facility/control/EditInventoryItem?inventoryItemId=${shipmentReceipt.inventoryItemId}" class="buttontext">${shipmentReceipt.inventoryItemId}</a> </#list> </#if> </div></td> @@ -299,7 +299,7 @@ under the License. </#list> </#if> <#-- show the return total --> - <tr><td colspan="5"></td><td><hr/></td></tr> + <tr><td colspan="5"></td><td><hr /></td></tr> <tr> <td colspan="2"> </td> <td colspan="3" class="label">${uiLabelMap.OrderReturnTotal}</td> @@ -333,7 +333,7 @@ under the License. </#list> </#if> <#if (returnHeader.statusId == "RETURN_REQUESTED" || returnHeader.statusId == "SUP_RETURN_REQUESTED") && (rowCount > 0)> - <br/> + <br /> <form name="acceptReturn" method="post" action="<@ofbizUrl>/updateReturn</@ofbizUrl>"> <#if "CUSTOMER_RETURN" == returnHeader.returnHeaderTypeId> <#assign statusId = "RETURN_ACCEPTED"> @@ -349,7 +349,7 @@ under the License. </#if> <#if returnHeader.statusId == "RETURN_REQUESTED" || returnHeader.statusId == "SUP_RETURN_REQUESTED"> - <br/> + <br /> <form name="returnItems" method="post" action="<@ofbizUrl>returnItems</@ofbizUrl>"> <input type="hidden" name="returnId" value="${returnId}"> <table border='0' cellpadding='2' cellspacing='0'> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnLinks.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnLinks.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnLinks.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnLinks.ftl Tue Mar 16 01:56:41 2010 @@ -24,7 +24,7 @@ under the License. <li<#if selected="OrderReturnItems"> class="selected"</#if>><a href="<@ofbizUrl>returnItems?returnId=${returnId?if_exists}</@ofbizUrl>">${uiLabelMap.OrderReturnItems}</a></li> <li<#if selected="OrderReturnHistory"> class="selected"</#if>><a href="<@ofbizUrl>ReturnHistory?returnId=${returnId?if_exists}</@ofbizUrl>">${uiLabelMap.OrderReturnHistory}</a></li> </ul> - <br/> + <br /> </div> <div> <#if selected != "OrderReturnHistory"> @@ -68,5 +68,5 @@ under the License. <#if requestParameters.returnId?has_content> <h2>${uiLabelMap.OrderNoReturnFoundWithId} : ${requestParameters.returnId}</h2> </#if> - <br/> + <br /> </#if> \ No newline at end of file Modified: ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/return/returnList.ftl Tue Mar 16 01:56:41 2010 @@ -20,7 +20,7 @@ under the License. <h1>${uiLabelMap.OrderReturnsCurrent}</h1> <div><a href="<@ofbizUrl>returnMain</@ofbizUrl>" class="buttontext">${uiLabelMap.OrderCreateReturn}</a></div> -<br/> +<br /> <table cellspacing="0" class="basic-table"> <tr class="header-row"> <td>${uiLabelMap.OrderReturnId} #</td> Modified: ofbiz/trunk/applications/order/webapp/ordermgr/setup/paymentsetup.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/order/webapp/ordermgr/setup/paymentsetup.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/order/webapp/ordermgr/setup/paymentsetup.ftl (original) +++ ofbiz/trunk/applications/order/webapp/ordermgr/setup/paymentsetup.ftl Tue Mar 16 01:56:41 2010 @@ -95,7 +95,7 @@ under the License. </table> <#if security.hasEntityPermission("PAYPROC", "_CREATE", session)> -<br/> +<br /> <table border="0" width='100%' cellpadding='0' cellspacing=0 class='boxoutside'> <tr> <td width='100%'> @@ -205,6 +205,6 @@ under the License. </#if> <#else> - <br/> + <br /> <h3>You do not have permission to view this page. ("PAYSETUP_VIEW" or "PAYSETUP_ADMIN" needed)</h3> </#if> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/ClassificationTabBar.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/ClassificationTabBar.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/ClassificationTabBar.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/ClassificationTabBar.ftl Tue Mar 16 01:56:41 2010 @@ -28,7 +28,7 @@ under the License. </ul> <br class="clear"/> </div> - <br/> + <br /> </#if> <#else> <h2>${uiLabelMap.PartyMgrViewPermissionError}</h2> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/editShoppingList.ftl Tue Mar 16 01:56:41 2010 @@ -50,7 +50,7 @@ under the License. </#if> </div> </div> -<br/> +<br /> <#if shoppingList?has_content> <div class="screenlet"> <div class="screenlet-title-bar"> @@ -129,7 +129,7 @@ under the License. </div> </div> <#if childShoppingListDatas?has_content> -<br/> +<br /> <div class="screenlet"> <div class="screenlet-title-bar"> <ul> @@ -158,7 +158,7 @@ under the License. </div> </div> </#if> -<br/> +<br /> <div class="screenlet"> <div class="screenlet-title-bar"> <ul> @@ -221,7 +221,7 @@ under the License. </#if> </div> </div> -<br/> +<br /> <div class="screenlet"> <div class="screenlet-title-bar"> <ul> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/findparty.ftl Tue Mar 16 01:56:41 2010 @@ -146,7 +146,7 @@ under the License. <td><input type="text" name="softIdentifier" value="${parameters.softIdentifier?if_exists}"/></td> </tr> <#if extInfo == "P"> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td class="label">${uiLabelMap.CommonAddress1}</td> <td><input type="text" name="address1" value="${parameters.address1?if_exists}"/></td> @@ -178,7 +178,7 @@ under the License. </tr> </#if> <#if extInfo == "T"> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td class="label">${uiLabelMap.PartyCountryCode}</td> <td><input type="text" name="countryCode" value="${parameters.countryCode?if_exists}"/></td> @@ -193,7 +193,7 @@ under the License. </tr> </#if> <#if extInfo == "O"> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <tr> <td class="label">${uiLabelMap.PartyContactInformation}</td> <td><input type="text" name="infoString" value="${parameters.infoString?if_exists}"/></td> @@ -214,7 +214,7 @@ under the License. <#if partyList?exists> <#if hideFields != "Y"> - <hr/> + <hr /> </#if> <div id="findPartyResults"> <h2>${uiLabelMap.CommonSearchResults}</h2> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/linkparty.ftl Tue Mar 16 01:56:41 2010 @@ -21,7 +21,7 @@ under the License. <#assign partyId = requestParameters.partyId?if_exists> <#assign partyIdTo = requestParameters.partyIdTo?if_exists> -<br/> +<br /> <#if hasUpdatePermission> <div id="linkParty" class="screenlet"> <div class="screenlet-title-bar"> @@ -36,7 +36,7 @@ under the License. <div class="h1 alert"> ${uiLabelMap.PartyLinkMessage1} </div> - <br/> + <br /> <div> <span class="label">${uiLabelMap.PartyLink}</span> <input type="hidden" name="partyId" value="${partyFrom.partyId}"/> @@ -61,7 +61,7 @@ under the License. </#if> ${partyTo.partyId} </div> - <br/> + <br /> <div> <a href="javascript:document.linkparty.submit()" class="smallSubmit">${uiLabelMap.CommonConfirm}</a> </div> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Contact.ftl Tue Mar 16 01:56:41 2010 @@ -39,7 +39,7 @@ under the License. <#list contactMeches as contactMechMap> <#assign contactMech = contactMechMap.contactMech> <#assign partyContactMech = contactMechMap.partyContactMech> - <tr><td colspan="4"><hr/></td></tr> + <tr><td colspan="4"><hr /></td></tr> <tr> <td class="label align-top">${contactMechMap.contactMechType.get("description",locale)}</td> <td> Modified: ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Content.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Content.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Content.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/party/profileblocks/Content.ftl Tue Mar 16 01:56:41 2010 @@ -25,7 +25,7 @@ under the License. </div> <div class="screenlet-body"> ${screens.render("component://party/widget/partymgr/ProfileScreens.xml#ContentList")} - <hr/> + <hr /> <div class="label">${uiLabelMap.PartyAttachContent}</div> <form id="uploadPartyContent" method="post" enctype="multipart/form-data" action="<@ofbizUrl>uploadPartyContent</@ofbizUrl>"> <input type="hidden" name="dataCategoryId" value="PERSONAL"/> Modified: ofbiz/trunk/applications/party/webapp/partymgr/visit/showvisits.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/visit/showvisits.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/visit/showvisits.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/visit/showvisits.ftl Tue Mar 16 01:56:41 2010 @@ -34,7 +34,7 @@ under the License. <br class="clear"/> </div> <div class="screenlet-body"> - <br/> + <br /> <div class="align-float"> <span class="label"> <#if (visitSize > 0)> @@ -49,7 +49,7 @@ under the License. </span> </div> <br class="clear"/> - <br/> + <br /> <table class="basic-table hover-bar" cellspacing="0"> <tr class="header-row"> <td><a href="<@ofbizUrl>showvisits?sort=visitId&showAll=${showAll}<#if partyId?has_content>&partyId=${partyId}</#if></@ofbizUrl>">${uiLabelMap.PartyVisitId}</a></td> @@ -78,7 +78,7 @@ under the License. <#assign alt_row = !alt_row> </#list> </table> - <br/> + <br /> <div class="align-float"> <span class="label"> <#if (visitSize > 0)> Modified: ofbiz/trunk/applications/party/webapp/partymgr/visit/visitdetail.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/party/webapp/partymgr/visit/visitdetail.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/party/webapp/partymgr/visit/visitdetail.ftl (original) +++ ofbiz/trunk/applications/party/webapp/partymgr/visit/visitdetail.ftl Tue Mar 16 01:56:41 2010 @@ -189,7 +189,7 @@ under the License. <td><input type="submit" value="${uiLabelMap.CommonSubmit}"></td> </tr> <tr> - <td colspan="3"><hr/></td> + <td colspan="3"><hr /></td> </tr> </form> <form name="setFollower" method="get" action="<@ofbizUrl>setAppletFollower</@ofbizUrl>"> @@ -206,4 +206,4 @@ under the License. </table> </#if> </div> -</div> \ No newline at end of file +</div> Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategory.ftl Tue Mar 16 01:56:41 2010 @@ -175,7 +175,7 @@ function insertImageName(type,nameValue) <td> </td> <td width="74%"> <input type="text" <#if productCategory?has_content>value="${productCategory.detailScreen?if_exists}"</#if> name="detailScreen" size="60" maxlength="250"/> - <br/><span class="tooltip">${uiLabelMap.ProductDefaultsTo} "categorydetail", ${uiLabelMap.ProductDetailScreenMessage}: "component://ecommerce/widget/CatalogScreens.xml#categorydetail"</span> + <br /><span class="tooltip">${uiLabelMap.ProductDefaultsTo} "categorydetail", ${uiLabelMap.ProductDetailScreenMessage}: "component://ecommerce/widget/CatalogScreens.xml#categorydetail"</span> </td> </tr> <tr> @@ -210,7 +210,7 @@ function insertImageName(type,nameValue) <table cellspacing="0" class="basic-table"> <tr><td> <input type="file" size="50" name="fname"/> - <br/> + <br /> <span> <input type="radio" name="upload_file_type_bogus" value="category" checked="checked" onclick='setUploadUrl("<@ofbizUrl>UploadCategoryImage?productCategoryId=${productCategoryId}&upload_file_type=category</@ofbizUrl>");'/>${uiLabelMap.ProductCategoryImageUrl} <input type="radio" name="upload_file_type_bogus" value="linkOne" onclick='setUploadUrl("<@ofbizUrl>UploadCategoryImage?productCategoryId=${productCategoryId}&upload_file_type=linkOne</@ofbizUrl>");'/>${uiLabelMap.ProductLinkOneImageUrl} Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryContent.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryContent.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryContent.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryContent.ftl Tue Mar 16 01:56:41 2010 @@ -59,7 +59,7 @@ under the License. <td> </td> <td width="74%"> <input type="text" <#if productCategory?has_content>value="${productCategory.detailScreen?if_exists}"</#if> name="detailScreen" size="60" maxlength="250"> - <br/> + <br /> <span class="tooltip">${uiLabelMap.ProductDefaultsTo} "categorydetail", ${uiLabelMap.ProductDetailScreenMessage}: "component://ecommerce/widget/CatalogScreens.xml#categorydetail"</span> </td> </tr> Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProdCatalogs.ftl Tue Mar 16 01:56:41 2010 @@ -89,7 +89,7 @@ under the License. </#if> </#list> </table> - <br/> + <br /> </div> </div> <div class="screenlet"> Modified: ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/EditCategoryProducts.ftl Tue Mar 16 01:56:41 2010 @@ -80,7 +80,7 @@ under the License. <a href="javascript:call_cal(document.updateCategoryProductForm.thruDate${suffix}, '${(productCategoryMember.thruDate)?default(nowTimestamp?string)}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> <input type="text" size="5" name="sequenceNum${suffix}" value="${(productCategoryMember.sequenceNum)?if_exists}"> <input type="text" size="5" name="quantity${suffix}" value="${(productCategoryMember.quantity)?if_exists}"> - <br/> + <br /> <textarea name="comments${suffix}" rows="2" cols="40">${(productCategoryMember.comments)?if_exists}</textarea> </td> <td align="center"> @@ -151,7 +151,7 @@ under the License. <a href="javascript:call_fieldlookup2(document.addProductCategoryMemberForm.productId, 'LookupProduct');"><img src="<@ofbizContentUrl>/images/fieldlookup.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="${uiLabelMap.CommonClickHereForFieldLookup}"></a> <span class="label">${uiLabelMap.CommonFromDate}</span> <input type="text" size="22" name="fromDate"> <a href="javascript:call_cal(document.addProductCategoryMemberForm.fromDate, '${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> - <br/> + <br /> <span class="label">${uiLabelMap.CommonComments}</span> <textarea name="comments" rows="2" cols="40"></textarea> <input type="submit" value="${uiLabelMap.CommonAdd}"> </div> @@ -174,10 +174,10 @@ under the License. <span class="label">${uiLabelMap.ProductTargetProductCategory}</span> <input type="text" name="productCategoryIdTo" size="20" maxlength="20"/> <a href="javascript:call_fieldlookup2(document.copyCategoryProductMembersForm.productCategoryIdTo,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a> - <br/> + <br /> <span class="label">${uiLabelMap.ProductOptionalFilterWithDate}</span> <input type="text" size="20" name="validDate"> <a href="javascript:call_cal(document.copyCategoryProductMembersForm.validDate, '${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> - <br/> + <br /> <span class="label">${uiLabelMap.ProductIncludeSubCategories}?</span> <select name="recurse"> <option value="N">${uiLabelMap.CommonN}</option> Modified: ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryCheckExisting.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryCheckExisting.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryCheckExisting.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/category/createProductInCategoryCheckExisting.ftl Tue Mar 16 01:56:41 2010 @@ -55,7 +55,7 @@ under the License. <h3> ${uiLabelMap.ProductNoExistingProductsFound}.</h3> </#if> </div> - <br/> + <br /> <div class="screenlet-body"> <form name="createProductInCategoryForm" method="post" action="<@ofbizUrl>createProductInCategory</@ofbizUrl>" style="margin: 0;"> <input type="hidden" name="productCategoryId" value="${productCategoryId}"> Modified: ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContent.ftl Tue Mar 16 01:56:41 2010 @@ -35,7 +35,7 @@ function insertImageName(size,nameValue) <div>${uiLabelMap.ProductServerDirectory}: <b>${imageServerPath?if_exists}</b></div> <div>${uiLabelMap.ProductTheUrlOfYourUploadedFile}: <b><a href="<@ofbizContentUrl>${imageUrl?if_exists}</@ofbizContentUrl>">${imageUrl?if_exists}</a></b></div> </#if> -<br/> +<br /> </#if> <#if !(configItem?exists)> @@ -70,7 +70,7 @@ function insertImageName(size,nameValue) </#if> </#list> </table> - <br/> + <br /> <#if configItemId?has_content && configItem?has_content> <div class="screenlet"> <div class="screenlet-title-bar"> Modified: ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContentContent.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContentContent.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContentContent.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/config/EditProductConfigItemContentContent.ftl Tue Mar 16 01:56:41 2010 @@ -20,7 +20,7 @@ under the License. <#if contentId?has_content> <a href="/content/control/gotoContent?contentId=${contentId}" class='buttontext' target='_blank'>${uiLabelMap.ProductContent} ${uiLabelMap.CommonPage}</a> </#if> -<br/> +<br /> <#if configItemId?has_content && productContent?has_content> ${updateProductContentWrapper.renderFormString()} </#if> \ No newline at end of file Modified: ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureCategoryFeatures.ftl Tue Mar 16 01:56:41 2010 @@ -34,7 +34,7 @@ under the License. </div> <input type="hidden" name="productFeatureCategoryId" value="${productFeatureCategoryId}"> </form> - <br/> + <br /> </div> </div> <div class="screenlet"> @@ -64,7 +64,7 @@ under the License. </tr> </table> </#if> - <br/> + <br /> <table cellspacing="0" class="basic-table"> <form method='POST' action='<@ofbizUrl>UpdateProductFeatureInCategory</@ofbizUrl>' name="selectAllForm"> <input type="hidden" name="_useRowSubmit" value="Y"> Modified: ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureGroups.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureGroups.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureGroups.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/feature/EditFeatureGroups.ftl Tue Mar 16 01:56:41 2010 @@ -21,7 +21,7 @@ under the License. <h3>${uiLabelMap.PageTitleEditProductFeatureGroups}</h3> </div> <div class="screenlet-body"> - <br/> + <br /> <table cellspacing="0" class="basic-table"> <tr class="header-row"> <td><b>${uiLabelMap.CommonId}</b></td> @@ -48,7 +48,7 @@ under the License. </#if> </#list> </table> - <br/> + <br /> </div> </div> <div class="screenlet"> @@ -57,7 +57,7 @@ under the License. </div> <div class="screenlet-body"> <form method="post" action="<@ofbizUrl>CreateProductFeatureGroup</@ofbizUrl>"> - <br/> + <br /> <table cellspacing="0" class="basic-table"> <tr> <td class="label">${uiLabelMap.CommonDescription}:</td> @@ -68,6 +68,6 @@ under the License. </tr> </table> </form> - <br/> + <br /> </div> </div> \ No newline at end of file Modified: ofbiz/trunk/applications/product/webapp/catalog/find/FindProductById.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/FindProductById.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/find/FindProductById.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/find/FindProductById.ftl Tue Mar 16 01:56:41 2010 @@ -26,10 +26,10 @@ under the License. <form name="idsearchform" method="post" action="<@ofbizUrl>FindProductById</@ofbizUrl>" style="margin: 0;"> <span class="label">${uiLabelMap.CommonId} ${uiLabelMap.CommonValue}:</span> <input type="text" name="idValue" size="20" maxlength="50" value="${idValue?if_exists}"> <a href="javascript:document.idsearchform.submit()" class="buttontext">${uiLabelMap.CommonFind}</a> </form> - <br/> + <br /> <h1>${uiLabelMap.ProductSearchResultsWithIdValue}: ${idValue?if_exists}</h1> <#if !goodIdentifications?has_content && !idProduct?has_content> - <br/> + <br /> <h2> ${uiLabelMap.ProductNoResultsFound}.</h2> <#else/> <table cellspacing="0" class="basic-table"> Modified: ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/find/advancedsearch.ftl Tue Mar 16 01:56:41 2010 @@ -307,7 +307,7 @@ under the License. </#if> <tr> <td align="center" colspan="2"> - <hr/> + <hr /> <a href="javascript:document.advtokeywordsearchform.submit()" class="buttontext">${uiLabelMap.CommonFind}</a> </td> </tr> Modified: ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearch.ftl Tue Mar 16 01:56:41 2010 @@ -28,7 +28,7 @@ under the License. <div><a href="<@ofbizUrl>advancedsearch?SEARCH_CATEGORY_ID=${(requestParameters.SEARCH_CATEGORY_ID)?if_exists}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonRefineSearch}</a></div> <#if !productIds?has_content> - <br/><h2> ${uiLabelMap.ProductNoResultsFound}.</h2> + <br /><h2> ${uiLabelMap.ProductNoResultsFound}.</h2> </#if> <#if productIds?has_content> @@ -89,7 +89,7 @@ under the License. </b> </td> </tr> - <tr><td colspan="2"><hr/></td></tr> + <tr><td colspan="2"><hr /></td></tr> </table> <form method="post" name="products"> @@ -116,7 +116,7 @@ under the License. </form> <table cellspacing="0" class="basic-table"> - <tr><td colspan="2"><hr/></td></tr> + <tr><td colspan="2"><hr /></td></tr> <tr> <td align="right"> <b> @@ -140,4 +140,4 @@ under the License. </table> </#if> </div> -</div> \ No newline at end of file +</div> Modified: ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchactions.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchactions.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchactions.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/find/keywordsearchactions.ftl Tue Mar 16 01:56:41 2010 @@ -18,13 +18,13 @@ under the License. --> <#if productIds?has_content> - <hr/> + <hr /> <span class="label"><b>${uiLabelMap.ProductNote}:</b></span> ${uiLabelMap.ProductNoteKeywordSearch} - <hr/> + <hr /> ${screens.render("component://product/widget/catalog/ProductScreens.xml#CreateVirtualWithVariantsFormInclude")} - <hr/> + <hr /> <div> <form method="post" action="<@ofbizUrl>searchRemoveFromCategory</@ofbizUrl>" name="searchRemoveFromCategory"> @@ -33,11 +33,11 @@ under the License. <a href="javascript:call_fieldlookup2(document.searchRemoveFromCategory.SE_SEARCH_CATEGORY_ID,'LookupProductCategory');"><img src='/images/fieldlookup.gif' width='15' height='14' border='0' alt="${uiLabelMap.CommonClickHereForFieldLookup}"/></a> <input type="hidden" name="clearSearch" value="N"> <input type="submit" value="${uiLabelMap.CommonRemove}" class="smallSubmit"> - <br/> + <br /> </form> </div> - <hr/> + <hr /> <div> <form method="post" action="<@ofbizUrl>searchExpireFromCategory</@ofbizUrl>" name="searchExpireFromCategory"> @@ -47,11 +47,11 @@ under the License. <span class="label">${uiLabelMap.CommonThru}</span><input type="text" size="25" name="thruDate"><a href="javascript:call_cal(document.searchExpireFromCategory.thruDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> <input type="hidden" name="clearSearch" value="N"> <input type="submit" value="${uiLabelMap.CommonExpire}" class="smallSubmit"> - <br/> + <br /> </form> </div> - <hr/> + <hr /> <div> <form method="post" action="<@ofbizUrl>searchAddToCategory</@ofbizUrl>" name="searchAddToCategory"> @@ -61,19 +61,19 @@ under the License. <span class="label">${uiLabelMap.CommonFrom}</span><input type="text" size="25" name="fromDate"><a href="javascript:call_cal(document.searchAddToCategory.fromDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> <input type="hidden" name="clearSearch" value="N"> <input type="submit" value="${uiLabelMap.ProductAddToCategory}" class="smallSubmit"> - <br/> + <br /> </form> </div> - <hr/> + <hr /> <div> <form method="post" action="<@ofbizUrl>searchAddFeature</@ofbizUrl>" name="searchAddFeature"> - <span class="label">${uiLabelMap.ProductAddFeatureToResults}:</span><br/> + <span class="label">${uiLabelMap.ProductAddFeatureToResults}:</span><br /> <span class="label">${uiLabelMap.ProductFeatureId}</span><input type="text" size="10" name="productFeatureId" value=""> <span class="label">${uiLabelMap.CommonFrom}</span><input type="tex"t size="25" name="fromDate"><a href="javascript:call_cal(document.searchAddFeature.fromDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> <span class="label">${uiLabelMap.CommonThru}</span><input type="text" size="25" name="thruDate"><a href="javascript:call_cal(document.searchAddFeature.thruDate, null);"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"></a> - <br/> + <br /> <span class="label">${uiLabelMap.CommonAmount}</span><input type="text" size="5" name="amount" value=""> <span class="label">${uiLabelMap.CommonSequence}</span><input type="text" size="5" name="sequenceNum" value=""> <span class="label">${uiLabelMap.ProductFeatureApplicationType}</span> @@ -89,35 +89,35 @@ under the License. </select> <input type="hidden" name="clearSearch" value="N"> <input type="submit" value="${uiLabelMap.ProductAddFeature}" class="smallSubmit"> - <br/> + <br /> </form> </div> - <hr/> + <hr /> <div> <form method="post" action="<@ofbizUrl>searchRemoveFeature</@ofbizUrl>" name="searchRemoveFeature"> - <span class="label">${uiLabelMap.ProductRemoveFeatureFromResults}:</span><br/> + <span class="label">${uiLabelMap.ProductRemoveFeatureFromResults}:</span><br /> <span class="label">${uiLabelMap.ProductFeatureId}</span><input type="text" size="10" name="productFeatureId" value=""> <input type="hidden" name="clearSearch" value="N"> <input type="submit" value="${uiLabelMap.ProductRemoveFeature}" class="smallSubmit"> - <br/> + <br /> </form> </div> - <hr/> + <hr /> <div> <form method="post" action="" name="searchShowParams"> <#assign searchParams = Static["org.ofbiz.product.product.ProductSearchSession"].makeSearchParametersString(session)> <span class="label">${uiLabelMap.ProductPlainSearchParameters}:</span><input type="text" size="60" name="searchParameters" value="${StringUtil.wrapString(searchParams)}"> - <br/> + <br /> <span class="label">${uiLabelMap.ProductHtmlSearchParameters}:</span><input type="text" size="60" name="searchParameters" value="${StringUtil.wrapString(searchParams)?html}"> <input type="hidden" name="clearSearch" value="N"> </form> </div> - <hr/> + <hr /> <div> <span class="label">${uiLabelMap.ProductSearchExportProductList}:</span><a href="<@ofbizUrl>searchExportProductList?clearSearch=N</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductSearchExport}</a> Modified: ofbiz/trunk/applications/product/webapp/catalog/lookup/LookupVariantProduct.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/lookup/LookupVariantProduct.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/lookup/LookupVariantProduct.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/lookup/LookupVariantProduct.ftl Tue Mar 16 01:56:41 2010 @@ -17,9 +17,9 @@ specific language governing permissions under the License. --> <#if (requestAttributes.uiLabelMap)?exists><#assign uiLabelMap = requestAttributes.uiLabelMap></#if> -<br/> +<br /> <div class="label">[${product.productId}] ${product.internalName}</div> -<br/> +<br /> <#if searchFeatures?has_content> <table cellspacing="0" class="basic-table"> <form method="post" action="<@ofbizUrl>LookupVariantProduct</@ofbizUrl>" name="selectAllForm"> @@ -50,7 +50,7 @@ under the License. </tr> </table> </#if> -<br/> +<br /> <#if variantProducts?exists> <table cellspacing="0" class="basic-table"> <tr class="header-row"> Modified: ofbiz/trunk/applications/product/webapp/catalog/main.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/main.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/main.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/main.ftl Tue Mar 16 01:56:41 2010 @@ -20,7 +20,7 @@ under the License. <#if !sessionAttributes.userLogin?exists> <div class='label'> ${uiLabelMap.ProductGeneralMessage}.</div> </#if> -<br/> +<br /> <#if security.hasEntityPermission("CATALOG", "_VIEW", session)> <div class="label">${uiLabelMap.ProductEditCatalogWithCatalogId}:</div> <form method="post" action="<@ofbizUrl>EditProdCatalog</@ofbizUrl>" style="margin: 0;" name="EditProdCatalogForm"> @@ -28,32 +28,32 @@ under the License. <input type="submit" value=" ${uiLabelMap.ProductEditCatalog}" class="smallSubmit"/> </form> <div class="label">${uiLabelMap.CommonOr}: <a href="<@ofbizUrl>EditProdCatalog</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductCreateNewCatalog}</a></div> - <br/> + <br /> <div class="label">${uiLabelMap.ProductEditCategoryWithCategoryId}:</div> <form method="post" action="<@ofbizUrl>EditCategory</@ofbizUrl>" style="margin: 0;" name="EditCategoryForm"> <@formrenderer.renderLookupField name="productCategoryId" id="productCategoryId" formName="EditCategoryForm" lookupFieldFormName="LookupProductCategory"/> <input type="submit" value="${uiLabelMap.ProductEditCategory}" class="smallSubmit"/> </form> - <br/> + <br /> <div class="label">${uiLabelMap.CommonOr}: <a href="<@ofbizUrl>EditCategory</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductCreateNewCategory}</a></div> - <br/> + <br /> <div class="label">${uiLabelMap.ProductEditProductWithProductId}:</div> <form method="post" action="<@ofbizUrl>EditProduct</@ofbizUrl>" style="margin: 0;" name="EditProductForm"> <@formrenderer.renderLookupField name="productId" id="productId" formName="EditProductForm" lookupFieldFormName="LookupProduct"/> <input type="submit" value=" ${uiLabelMap.ProductEditProduct}" class="smallSubmit"/> </form> - <br/> + <br /> <div class="label">${uiLabelMap.CommonOr}: <a href="<@ofbizUrl>EditProduct</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductCreateNewProduct}</a></div> - <br/> + <br /> <div class="label">${uiLabelMap.CommonOr}: <a href="<@ofbizUrl>CreateVirtualWithVariantsForm</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductQuickCreateVirtualFromVariants}</a></div> - <br/> + <br /> <div class="label">${uiLabelMap.ProductFindProductWithIdValue}:</div> <form method="post" action="<@ofbizUrl>FindProductById</@ofbizUrl>" style="margin: 0;"> <input type="text" size="20" maxlength="20" name="idValue" value=""/> <input type="submit" value=" ${uiLabelMap.ProductFindProduct}" class="smallSubmit"/> </form> - <br/> + <br /> <div><a href="<@ofbizUrl>UpdateAllKeywords</@ofbizUrl>" class="buttontext"> ${uiLabelMap.ProductAutoCreateKeywordsForAllProducts}</a></div> <div><a href="<@ofbizUrl>FastLoadCache</@ofbizUrl>" class="buttontext"> ${uiLabelMap.ProductFastLoadCatalogIntoCache}</a></div> - <br/> + <br /> </#if> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/CreateVirtualWithVariantsForm.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/CreateVirtualWithVariantsForm.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/CreateVirtualWithVariantsForm.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/CreateVirtualWithVariantsForm.ftl Tue Mar 16 01:56:41 2010 @@ -23,7 +23,7 @@ under the License. </tr> <tr> <td> - <br/> + <br /> <span class="label">${uiLabelMap.ProductVariantProductIds}:</span> <textarea name="variantProductIdsBag" rows="6" cols="20"></textarea> <span class="label">Hazmat:</span> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductAssoc.ftl Tue Mar 16 01:56:41 2010 @@ -265,5 +265,5 @@ under the License. </div> </div> </#if> -<br/> -<span class="tooltip">${uiLabelMap.CommonNote} : ${uiLabelMap.ProductHighlightedExplanation}</span> \ No newline at end of file +<br /> +<span class="tooltip">${uiLabelMap.CommonNote} : ${uiLabelMap.ProductHighlightedExplanation}</span> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductContent.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductContent.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductContent.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductContent.ftl Tue Mar 16 01:56:41 2010 @@ -36,7 +36,7 @@ under the License. <div>${uiLabelMap.ProductServerDirectory}: <b>${imageServerPath?if_exists}</b></div> <div>${uiLabelMap.ProductTheUrlOfYourUploadedFile}: <b><a href="<@ofbizContentUrl>${imageUrl?if_exists}</@ofbizContentUrl>">${imageUrl?if_exists}</a></b></div> </#if> - <br/> + <br /> </#if> <form action="<@ofbizUrl>updateProductContent</@ofbizUrl>" method="post" style="margin: 0;" name="productForm"> <input type="hidden" name="productId" value="${productId?if_exists}"/> @@ -67,7 +67,7 @@ under the License. <td> </td> <td width="80%" colspan="4" valign="top"> <input type="text" name="detailScreen" value="${(product.detailScreen)?if_exists}" size="60" maxlength="250"/> - <br/><span class="tooltip">${uiLabelMap.ProductIfNotSpecifiedDefaultsIsProductdetail} "productdetail", ${uiLabelMap.ProductDetailScreenMessage}: "component://ecommerce/widget/CatalogScreens.xml#productdetail"</span> + <br /><span class="tooltip">${uiLabelMap.ProductIfNotSpecifiedDefaultsIsProductdetail} "productdetail", ${uiLabelMap.ProductDetailScreenMessage}: "component://ecommerce/widget/CatalogScreens.xml#productdetail"</span> </td> </tr> <tr> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductFeatures.ftl Tue Mar 16 01:56:41 2010 @@ -150,7 +150,7 @@ under the License. </#list> </select> <span class='label'>${uiLabelMap.CommonIdCode}: </span><input type="text" size='10' name='idCode' value=''/> - <br/> + <br /> <span class='label'>${uiLabelMap.ProductFeatureApplicationType}: </span> <select name='productFeatureApplTypeId' size="1"> <#list productFeatureApplTypes as productFeatureApplType> @@ -160,7 +160,7 @@ under the License. >${(productFeatureApplType.get("description",locale))?if_exists} </option> </#list> </select> - <br/> + <br /> <span class='label'>${uiLabelMap.CommonFrom} : </span><input type="text" size='25' name='fromDate'/> <a href="javascript:call_cal(document.addFeatureByTypeIdCode.fromDate, '${nowTimestamp?string}');"><img src='/images/cal.gif' width='16' height='16' border='0' alt='Calendar'/></a> <span class='label'>${uiLabelMap.CommonThru} : </span><input type="text" size='25' name='thruDate'/> @@ -193,7 +193,7 @@ under the License. >${(productFeatureApplType.get("description",locale))?if_exists} </option> </#list> </select> - <br/> + <br /> <span class="label">${uiLabelMap.CommonFrom} : </span><input type="text" size="25" name="fromDate"/> <a href="javascript:call_cal(document.addFeatureById.fromDate, '${nowTimestamp?string}');"><img src="<@ofbizContentUrl>/images/cal.gif</@ofbizContentUrl>" width="16" height="16" border="0" alt="Calendar"/></a> <span class="label">${uiLabelMap.CommonThru} : </span><input type="text" size="25" name="thruDate"/> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductInventoryItems.ftl Tue Mar 16 01:56:41 2010 @@ -31,7 +31,7 @@ under the License. <a href="<@ofbizUrl>EditProductInventoryItems?productId=${productId}&showEmpty=true</@ofbizUrl>" class="buttontext">${uiLabelMap.ProductShowEmptyItems}</a> </#if> </#if> - <br/> + <br /> <#if productId?exists> <table cellspacing="0" class="basic-table"> <tr class="header-row"> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductParties.ftl Tue Mar 16 01:56:41 2010 @@ -68,9 +68,9 @@ under the License. </#if> </#list> </table> - <br/> + <br /> <h2>${uiLabelMap.ProductAssociatePartyToProduct}:</h2> - <br/> + <br /> <form method="post" action="<@ofbizUrl>addPartyToProduct</@ofbizUrl>" name="addNewForm"> <input type="hidden" name="productId" value="${productId}"> <input type="text" size="20" maxlength="20" name="partyId" value=""> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/EditProductQuickAdmin.ftl Tue Mar 16 01:56:41 2010 @@ -104,7 +104,7 @@ function doPublish() { </tr> </table> </form> - <br/> + <br /> <form action="<@ofbizUrl>updateProductQuickAdminSelFeat</@ofbizUrl>" method="post" style="margin: 0;" name="selectableFeature"> <input type="hidden" name="productId" value="${product.productId?if_exists}"/> <input type="hidden" name="productFeatureTypeId" value="${(productFeatureTypeId)?if_exists}"/> @@ -341,7 +341,7 @@ function doPublish() { </td> </tr> </table> - <br/> + <br /> <form action="<@ofbizUrl>EditProductQuickAdmin</@ofbizUrl>"> <input type="hidden" name="productFeatureTypeId" value="${(productFeatureTypeId)?if_exists}"/> <input type="hidden" name="productId" value="${product.productId?if_exists}"/> Modified: ofbiz/trunk/applications/product/webapp/catalog/product/QuickAddVariants.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/product/QuickAddVariants.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/product/QuickAddVariants.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/product/QuickAddVariants.ftl Tue Mar 16 01:56:41 2010 @@ -125,7 +125,7 @@ function clickAll(e) { </tr> <tr> <td> - <br/> + <br /> <input type="hidden" name="productId" value="${productId}"/> <span class="label">${uiLabelMap.ProductVariantProductIds}:</span> <textarea name="variantProductIdsBag" rows="6" cols="20"></textarea> Modified: ofbiz/trunk/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/promo/FindProductPromoCode.ftl Tue Mar 16 01:56:41 2010 @@ -36,7 +36,7 @@ under the License. </form> </div> </div> - <br/> + <br /> <div class="screenlet"> <div class="screenlet-title-bar"> <h3>${uiLabelMap.ProductPromotionAddSetOfPromotionCodes}</h3> Modified: ofbiz/trunk/applications/product/webapp/catalog/reviews/pendingReviews.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/reviews/pendingReviews.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/reviews/pendingReviews.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/reviews/pendingReviews.ftl Tue Mar 16 01:56:41 2010 @@ -86,7 +86,7 @@ under the License. <option value="Y">${uiLabelMap.CommonY}</option> </select> </td> - <td>${review.getRelatedOne("Product").internalName?if_exists}<br/><a class="buttontext" href="<@ofbizUrl>EditProduct?productId=${review.productId}</@ofbizUrl>">${review.productId}</a></td> + <td>${review.getRelatedOne("Product").internalName?if_exists}<br /><a class="buttontext" href="<@ofbizUrl>EditProduct?productId=${review.productId}</@ofbizUrl>">${review.productId}</a></td> <td> <input type="text" size='3' name="productRating_o_${rowCount}" value="${review.productRating?if_exists?string}"> </td> Modified: ofbiz/trunk/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl (original) +++ ofbiz/trunk/applications/product/webapp/catalog/thesaurus/EditKeywordThesaurus.ftl Tue Mar 16 01:56:41 2010 @@ -39,7 +39,7 @@ under the License. <a href="<@ofbizUrl>editKeywordThesaurus?firstLetter=${letter}</@ofbizUrl>" class="buttontext"><#if highlight>[</#if>${letter}<#if highlight>]</#if></a> </#list> </div> - <br/> + <br /> <#assign lastkeyword = ""> <table cellspacing="0" class="basic-table"> <#assign rowClass = "2"> Modified: ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/EditFacilityLocation.ftl Tue Mar 16 01:56:41 2010 @@ -97,7 +97,7 @@ under the License. </table> </form> <#if locationSeqId?exists> - <br/> + <br /> <div class="screenlet"> <div class="screenlet-title-bar"> <h3>${uiLabelMap.ProductLocationProduct}</h3> Modified: ofbiz/trunk/applications/product/webapp/facility/facility/FacilityScheduleTabBar.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/FacilityScheduleTabBar.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/FacilityScheduleTabBar.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/FacilityScheduleTabBar.ftl Tue Mar 16 01:56:41 2010 @@ -19,12 +19,12 @@ under the License. <#assign selected = scheduleTabButtonItem?default("void")> <#if facilityId?has_content> - <br/> + <br /> <div class="button-bar tab-bar"> <ul> <li<#if selected="ScheduleTabButton"> class="selected"</#if>><a href="<@ofbizUrl>ScheduleShipmentRouteSegment?facilityId=${facilityId}</@ofbizUrl>">${uiLabelMap.ProductSchedule}</a></li> <li<#if selected="LabelsTabButton"> class="selected"</#if>><a href="<@ofbizUrl>Labels?facilityId=${facilityId}</@ofbizUrl>">${uiLabelMap.ProductLabels}</a></li> </ul> - <br/> + <br /> </div> </#if> \ No newline at end of file Modified: ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl?rev=923545&r1=923544&r2=923545&view=diff ============================================================================== --- ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl (original) +++ ofbiz/trunk/applications/product/webapp/facility/facility/FindFacilityLocation.ftl Tue Mar 16 01:56:41 2010 @@ -71,9 +71,9 @@ under the License. <#if foundLocations?exists> <#-- TODO: Put this in a screenlet - make it look more like the party find screen --> - <br/> + <br /> <h1>${uiLabelMap.CommonFound}: ${foundLocations.size()} ${uiLabelMap.ProductLocationsFor} <#if facility?exists>${(facility.facilityName)?if_exists}</#if> [ID:${facilityId?if_exists}]</h1> - <br/> + <br /> <table class="basic-table hover-bar" cellspacing="0"> <tr class="header-row-2"> <td>${uiLabelMap.ProductFacility}</td> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |