Loading... |
Reply to author |
Edit post |
Move post |
Delete this post |
Delete this post and replies |
Change post date |
Print post |
Permalink |
Raw mail |
1582 posts
|
Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/gcinfo.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/gcinfo.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/gcinfo.ftl (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/gcinfo.ftl Wed Mar 24 09:23:07 2010 @@ -22,7 +22,7 @@ under the License. <#assign giftCard = giftCard?if_exists> <#if paymentMethodTypeId?if_exists != "GIFT_CARD"> <tr> - <td colspan="3"><hr/></td> + <td colspan="3"><hr /></td> </tr> </#if> <tr> Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/orderstatus.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/orderstatus.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/orderstatus.ftl (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/orderstatus.ftl Wed Mar 24 09:23:07 2010 @@ -21,7 +21,7 @@ under the License. <input type="hidden" name="add_all" value="false"> <input type="hidden" name="orderId" value="${orderHeader.orderId}"> ${screens.render("component://ecommerce/widget/OrderScreens.xml#orderheader")} - <br/> + <br /> ${screens.render("component://ecommerce/widget/OrderScreens.xml#orderitems")} </form> Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/paymentinformation.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/paymentinformation.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/paymentinformation.ftl (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/paymentinformation.ftl Wed Mar 24 09:23:07 2010 @@ -91,7 +91,7 @@ function shipBillAddr() { </td> </tr> <tr> - <td colspan="3"><hr/></td> + <td colspan="3"><hr /></td> </tr> </#if> @@ -110,7 +110,7 @@ function shipBillAddr() { <#assign creditCard = requestParameters> </#if> <tr> - <td colspan="3"><hr/></td> + <td colspan="3"><hr /></td> </tr> <tr> <td width="26%" align="right" valign="top"><div class="tableheadtext">${uiLabelMap.AccountingCreditCardInformation}</div></td> @@ -127,7 +127,7 @@ function shipBillAddr() { <#assign eftAccount = requestParameters> </#if> <tr> - <td colspan="3"><hr/></td> + <td colspan="3"><hr /></td> </tr> <tr> <td width="26%" align="right" valign="top"><div class="tableheadtext">${uiLabelMap.AccountingEFTAccountInformation}</div></td> @@ -196,7 +196,7 @@ function shipBillAddr() { <#assign giftCard = giftCard?if_exists> <#if paymentMethodTypeId?if_exists != "GIFT_CARD"> <tr> - <td colspan="3"><hr/></td> + <td colspan="3"><hr /></td> </tr> </#if> <tr> Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCheckoutReview.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCheckoutReview.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCheckoutReview.ftl (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCheckoutReview.ftl Wed Mar 24 09:23:07 2010 @@ -50,7 +50,7 @@ under the License. <#if cart?exists && 0 < cart.size()> ${screens.render("component://ecommerce/widget/OrderScreens.xml#quickAnonOrderHeader")} - <br/> + <br /> <div id="orderItemsSection">${screens.render("component://ecommerce/widget/OrderScreens.xml#orderitems")}</div> <form type="POST" action="<@ofbizUrl>processorder</@ofbizUrl>" name="${parameters.formNameValue}"> <table border="0" cellpadding="1" width="100%"> Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonCustSettings.ftl Wed Mar 24 09:23:07 2010 @@ -131,7 +131,7 @@ under the License. </td> </tr> <tr> - <td colspan="3" align="center"><hr/></td> + <td colspan="3" align="center"><hr /></td> </tr> <tr> <td width="50%"> Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOptionSettings.ftl Wed Mar 24 09:23:07 2010 @@ -112,7 +112,7 @@ function onClickShippingMethod(e) { <textarea class='textAreaBox' cols="30" rows="3" name="shipping_instructions">${shoppingCart.getShippingInstructions()?if_exists}</textarea> </td> </tr> - <tr><td colspan="2"><hr/></td></tr> + <tr><td colspan="2"><hr /></td></tr> <tr> <td colspan="2"> <h2>${uiLabelMap.OrderPoNumber}</h2> @@ -120,7 +120,7 @@ function onClickShippingMethod(e) { </td> </tr> <#if productStore.showCheckoutGiftOptions?if_exists != "N"> - <tr><td colspan="2"><hr/></td></tr> + <tr><td colspan="2"><hr /></td></tr> <tr> <td colspan="2"> <div> @@ -130,7 +130,7 @@ function onClickShippingMethod(e) { </div> </td> </tr> - <tr><td colspan="2"><hr/></td></tr> + <tr><td colspan="2"><hr /></td></tr> <tr> <td colspan="2"> <h2>${uiLabelMap.OrderGiftMessage}</h2> @@ -145,7 +145,7 @@ function onClickShippingMethod(e) { </table></div> </td> </tr> - <tr><td colspan="2"><hr/></td></tr> + <tr><td colspan="2"><hr /></td></tr> <tr><td colspan="2"><h2>${uiLabelMap.OrderShipAllAtOnce}?</h2></td></tr> <tr> <td valign="top" colspan="2"> Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonOrderHeader.ftl Wed Mar 24 09:23:07 2010 @@ -54,7 +54,7 @@ under the License. </div> </td> </tr> - <tr><td colspan="7"><hr/></td></tr> + <tr><td colspan="7"><hr /></td></tr> </#if> <#-- order status information --> <tr> @@ -72,7 +72,7 @@ under the License. </tr> <#-- ordered date --> <#if orderHeader?has_content> - <tr><td colspan="7"><hr/></td></tr> + <tr><td colspan="7"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.CommonDate}</b></div> @@ -84,7 +84,7 @@ under the License. </tr> </#if> <#if distributorId?exists> - <tr><td colspan="7"><hr/></td></tr> + <tr><td colspan="7"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%"> <div class="tabletext"> <b>${uiLabelMap.OrderDistributor}</b></div> @@ -132,17 +132,17 @@ under the License. <td width="5"> </td> <td valign="top" width="80%"> <div class="tabletext"> - <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br/></#if> - <#if shippingAddress.attnName?has_content><b>${uiLabelMap.PartyAddrAttnName}:</b> ${shippingAddress.attnName}<br/></#if> - ${shippingAddress.address1}<br/> - <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br/></#if> + <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br /></#if> + <#if shippingAddress.attnName?has_content><b>${uiLabelMap.PartyAddrAttnName}:</b> ${shippingAddress.attnName}<br /></#if> + ${shippingAddress.address1}<br /> + <#if shippingAddress.address2?has_content>${shippingAddress.address2}<br /></#if> ${shippingAddress.city}<#if shippingAddress.stateProvinceGeoId?has_content>, ${shippingAddress.stateProvinceGeoId} </#if> - ${shippingAddress.postalCode?if_exists}<br/> + ${shippingAddress.postalCode?if_exists}<br /> ${shippingAddress.countryGeoId?if_exists} </div> </td> </tr> - <tr><td colspan="7"><hr/></td></tr> + <tr><td colspan="7"><hr /></td></tr> </#if> <tr><td colspan="7"> ${screens.render("component://ecommerce/widget/OrderScreens.xml#quickAnonOptionSettings")} Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/quickAnonPaymentInformation.ftl Wed Mar 24 09:23:07 2010 @@ -141,7 +141,7 @@ function getPaymentInformation() { </td> </tr> <tr><td nowrap colspan="3"><div id="paymentInfoSection"></div></td></tr> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> <#-- gift card fields --> <#if productStorePaymentMethodTypeIdMap.GIFT_CARD?exists> <tr> Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/requestreturn.ftl Wed Mar 24 09:23:07 2010 @@ -53,7 +53,7 @@ under the License. <td><div class="tableheadtext">${uiLabelMap.OrderRequestedResponse}</div></td> <td> </td> </tr> - <tr><td colspan="6"><hr/></td></tr> + <tr><td colspan="6"><hr /></td></tr> <#if returnableItems?has_content> <#assign rowCount = 0> <#list returnableItems.keySet() as orderItem> @@ -106,7 +106,7 @@ under the License. <input type="checkbox" name="_rowSubmit_o_${rowCount}" value="Y" onclick="javascript:checkToggle(this, 'selectAllForm');"/> </td> </tr> - <tr><td colspan="6"><hr/></td></tr> + <tr><td colspan="6"><hr /></td></tr> <#assign rowCount = rowCount + 1> </#if> </#list> @@ -114,7 +114,7 @@ under the License. <tr> <td colspan="6"><div class="tableheadtext">${uiLabelMap.OrderSelectShipFromAddress}:</td> </tr> - <tr><td colspan="6"><hr/></td></tr> + <tr><td colspan="6"><hr /></td></tr> <tr> <td colspan="6"> <table cellspacing="1" cellpadding="2" width="100%"> @@ -126,14 +126,14 @@ under the License. </td> <td width="99%" valign="top" nowrap> <div class="tabletext"> - <#if shippingAddress.toName?has_content><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br/></#if> - <#if shippingAddress.attnName?has_content><b>${uiLabelMap.PartyAddrAttnName}:</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><b>${uiLabelMap.CommonTo}:</b> ${shippingAddress.toName}<br /></#if> + <#if shippingAddress.attnName?has_content><b>${uiLabelMap.PartyAddrAttnName}:</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> @@ -142,7 +142,7 @@ under the License. </table> </td> </tr> - <tr><td colspan="6"><hr/></td></tr> + <tr><td colspan="6"><hr /></td></tr> <tr> <td colspan="6" align="right"> <a href="javascript:document.selectAllForm.submit();" class="buttontext">${uiLabelMap.OrderReturnSelectedItems}</a> Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/splitship.ftl Wed Mar 24 09:23:07 2010 @@ -137,7 +137,7 @@ function submitForm(form, mode, value) { <#assign groupIdx = groupIdx + 1> <#if group_has_next> <tr> - <td colspan="6"><hr/></td> + <td colspan="6"><hr /></td> </tr> </#if> </form> Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/startanoncheckout.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/startanoncheckout.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/startanoncheckout.ftl (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/order/startanoncheckout.ftl Wed Mar 24 09:23:07 2010 @@ -25,15 +25,15 @@ under the License. </#if> <#if (shoppingCartSize > 0)> - <div class="screenlet"> - <h3>${uiLabelMap.CommonCheckoutAnonymous}</h3> - <p>${uiLabelMap.CommonCheckoutAnonymousMsg}:<p> - <ul> - <li><a href="<@ofbizUrl>setCustomer</@ofbizUrl>">${uiLabelMap.OrderCheckout}</a></li> - <li><a href="<@ofbizUrl>quickAnonCheckout</@ofbizUrl>">${uiLabelMap.OrderCheckoutQuick}</a></li> - <li><a href="<@ofbizUrl>anonOnePageCheckout</@ofbizUrl>">${uiLabelMap.EcommerceOnePageCheckout}</a></li> - <li><a href="<@ofbizUrl>googleCheckout</@ofbizUrl>">${uiLabelMap.EcommerceCartToGoogleCheckout}</a></li> - </ul> - </div> +<div class="screenlet"> + <h3>${uiLabelMap.CommonCheckoutAnonymous}</h3> + <p>${uiLabelMap.CommonCheckoutAnonymousMsg}:</p> + <ul> + <li><a href="<@ofbizUrl>setCustomer</@ofbizUrl>">${uiLabelMap.OrderCheckout}</a></li> + <li><a href="<@ofbizUrl>quickAnonCheckout</@ofbizUrl>">${uiLabelMap.OrderCheckoutQuick}</a></li> + <li><a href="<@ofbizUrl>anonOnePageCheckout</@ofbizUrl>">${uiLabelMap.EcommerceOnePageCheckout}</a></li> + <li><a href="<@ofbizUrl>googleCheckout</@ofbizUrl>">${uiLabelMap.EcommerceCartToGoogleCheckout}</a></li> + </ul> +</div> </#if> Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/quote/CreateOrderQuote.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/quote/CreateOrderQuote.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/quote/CreateOrderQuote.ftl (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/quote/CreateOrderQuote.ftl Wed Mar 24 09:23:07 2010 @@ -26,4 +26,4 @@ under the License. </#if> </#if> </div> -<br/> +<br /> Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/request/requestInfo.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/request/requestInfo.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/request/requestInfo.ftl (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/request/requestInfo.ftl Wed Mar 24 09:23:07 2010 @@ -32,7 +32,7 @@ under the License. ${(custRequestType.get("description",locale))?default(custRequest.custRequestTypeId?if_exists)} </td> </tr> - <tr><td colspan="7"><hr/></td></tr> + <tr><td colspan="7"><hr /></td></tr> <#-- request status information --> <tr> <td align="right" valign="top" width="15%" class="label"> @@ -44,7 +44,7 @@ under the License. </td> </tr> <#-- party --> - <tr><td colspan="7"><hr/></td></tr> + <tr><td colspan="7"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.PartyPartyId} @@ -55,7 +55,7 @@ under the License. </td> </tr> <#-- request name --> - <tr><td colspan="7"><hr/></td></tr> + <tr><td colspan="7"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.CommonName} @@ -66,7 +66,7 @@ under the License. </td> </tr> <#-- request description --> - <tr><td colspan="7"><hr/></td></tr> + <tr><td colspan="7"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.CommonDescription} @@ -77,7 +77,7 @@ under the License. </td> </tr> <#-- request currency --> - <tr><td colspan="7"><hr/></td></tr> + <tr><td colspan="7"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.CommonCurrency} @@ -88,7 +88,7 @@ under the License. </td> </tr> <#-- request currency --> - <tr><td colspan="7"><hr/></td></tr> + <tr><td colspan="7"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.ProductProductStore} @@ -99,7 +99,7 @@ under the License. </td> </tr> <#-- request comment --> - <tr><td colspan="7"><hr/></td></tr> + <tr><td colspan="7"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.CommonInternalComment} @@ -110,7 +110,7 @@ under the License. </td> </tr> <#-- request reason --> - <tr><td colspan="7"><hr/></td></tr> + <tr><td colspan="7"><hr /></td></tr> <tr> <td align="right" valign="top" width="15%" class="label"> ${uiLabelMap.CommonReason} Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/request/requestRoles.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/request/requestRoles.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/request/requestRoles.ftl (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/request/requestRoles.ftl Wed Mar 24 09:23:07 2010 @@ -36,7 +36,7 @@ under the License. </td> </tr> <#if requestParties.size() != row> - <tr><td colspan="3"><hr/></td></tr> + <tr><td colspan="3"><hr /></td></tr> </#if> <#assign row = row + 1> </#list> Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/requirePasswordChange.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/requirePasswordChange.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/requirePasswordChange.ftl (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/requirePasswordChange.ftl Wed Mar 24 09:23:07 2010 @@ -25,7 +25,7 @@ under the License. </#if> <h1>${uiLabelMap.CommonLogin}</h1> -<br/> +<br /> <div style="float: center; width: 49%; margin-right: 5px; text-align: center;" class="screenlet"> <div class="screenlet-title-bar"> Modified: ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/ecommerce/webapp/ecommerce/shoppinglist/editShoppingList.ftl Wed Mar 24 09:23:07 2010 @@ -28,7 +28,7 @@ under the License. obj.submit(); } </script> -<br/> +<br /> <div class="screenlet"> <div class="boxlink"> <a href="<@ofbizUrl>createEmptyShoppingList?productStoreId=${productStoreId}</@ofbizUrl>" class="submenutextright">${uiLabelMap.CommonCreateNew}</a> @@ -208,7 +208,7 @@ under the License. </td> <td> </td> </tr> - <tr><td colspan="9"><hr/></td></tr> + <tr><td colspan="9"><hr /></td></tr> <tr> <td><div class="tableheadtext">${uiLabelMap.OrderShipTo}</div></td> <td> @@ -271,7 +271,7 @@ under the License. </td> <td> </td> </tr> - <tr><td colspan="9"><hr/></td></tr> + <tr><td colspan="9"><hr /></td></tr> <tr> <td align="right" colspan="9"> <div class="tabletext"> @@ -283,7 +283,7 @@ under the License. </td> </tr> <#if shoppingList.isActive?default("N") == "Y"> - <tr><td colspan="9"><hr/></td></tr> + <tr><td colspan="9"><hr /></td></tr> <tr> <td colspan="9"> <#assign nextTime = recInfo.next(lastSlOrderTime)?if_exists> @@ -352,7 +352,7 @@ under the License. </tr> </form> </#list> - <tr><td colspan="6"><hr/></td></tr> + <tr><td colspan="6"><hr /></td></tr> <tr> <td><div class="tabletext"> </div></td> <td nowrap align="right"> @@ -430,7 +430,7 @@ under the License. <#if isVirtual && productVariantAssocs?has_content> <#assign replaceItemAction = "/replaceShoppingListItem/" + requestAttributes._CURRENT_VIEW_?if_exists> <#assign addToCartAction = "/additem/" + requestAttributes._CURRENT_VIEW_?if_exists> - <br/> + <br /> <form method="post" action="<@ofbizUrl>${addToCartAction}</@ofbizUrl>" name="listreplform_${shoppingListItem.shoppingListItemSeqId}" style="margin: 0;"> <input type="hidden" name="shoppingListId" value="${shoppingListItem.shoppingListId}"/> <input type="hidden" name="shoppingListItemSeqId" value="${shoppingListItem.shoppingListItemSeqId}"/> @@ -444,9 +444,9 @@ under the License. </#if> </#list> </select> - <br/> + <br /> <a href="javascript:document.listreplform_${shoppingListItem.shoppingListItemSeqId}.action='<@ofbizUrl>${replaceItemAction}</@ofbizUrl>';document.listreplform_${shoppingListItem.shoppingListItemSeqId}.submit();" class="buttontext">${uiLabelMap.EcommerceReplaceWithVariation}</a> - <br/> + <br /> <a href="javascript:document.listreplform_${shoppingListItem.shoppingListItemSeqId}.action='<@ofbizUrl>${addToCartAction}</@ofbizUrl>';document.listreplform_${shoppingListItem.shoppingListItemSeqId}.submit();" class="buttontext">${uiLabelMap.CommonAdd} ${shoppingListItem.quantity?string} ${uiLabelMap.EcommerceVariationToCart}</a> </form> <#else> @@ -455,7 +455,7 @@ under the License. </td> </tr> </#list> - <tr><td colspan="6"><hr/></td></tr> + <tr><td colspan="6"><hr /></td></tr> <tr> <td><div class="tabletext"> </div></td> <td><div class="tabletext"> </div></td> Modified: ofbiz/branches/multitenant20100310/specialpurpose/googlebase/webapp/googlebase/find/GoogleBaseAdvancedSearch.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/googlebase/webapp/googlebase/find/GoogleBaseAdvancedSearch.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/googlebase/webapp/googlebase/find/GoogleBaseAdvancedSearch.ftl (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/googlebase/webapp/googlebase/find/GoogleBaseAdvancedSearch.ftl Wed Mar 24 09:23:07 2010 @@ -378,7 +378,7 @@ under the License. </#if> <tr> <td align="center" colspan="2"> - <hr/> + <hr /> <a href="javascript:submit($('advToKeywordSearchform'));" class="buttontext">${uiLabelMap.CommonFind}</a> </td> </tr> Modified: ofbiz/branches/multitenant20100310/specialpurpose/googlebase/webapp/googlebase/find/googleExportLink.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/googlebase/webapp/googlebase/find/googleExportLink.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/googlebase/webapp/googlebase/find/googleExportLink.ftl (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/googlebase/webapp/googlebase/find/googleExportLink.ftl Wed Mar 24 09:23:07 2010 @@ -28,7 +28,7 @@ under the License. <table cellspacing="0" class="basic-table"> <tr> <td align="center" colspan="2"> - <hr/> + <hr /> <a href="javascript:exportToGoogle();" class="buttontext">${uiLabelMap.GoogleBaseExportToGoogle}</a> </td> </tr> Propchange: ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Mar 24 09:23:07 2010 @@ -0,0 +1,2 @@ +/incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:418499-490456 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/Facilities.groovy:921280-926954 Propchange: ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Mar 24 09:23:07 2010 @@ -0,0 +1,2 @@ +/incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:418499-490456 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductList.groovy:921280-926954 Propchange: ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Mar 24 09:23:07 2010 @@ -0,0 +1,2 @@ +/incubator/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:418499-490456 +/ofbiz/trunk/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/actions/ProductStockTake.groovy:921280-926954 Modified: ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/includes/messages.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/includes/messages.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/includes/messages.ftl (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/hhfacility/webapp/hhfacility/includes/messages.ftl Wed Mar 24 09:23:07 2010 @@ -37,7 +37,7 @@ under the License. <#-- display the error messages --> <#if (errorMessage?has_content || errorMessageList?has_content)> - <div class="errorMessage">Errors Occurred:</div><br/> + <div class="errorMessage">Errors Occurred:</div><br /> <ul> <#if errorMessage?has_content> <li class="errorMessage">${errorMessage}</li> @@ -48,12 +48,12 @@ under the License. </#list> </#if> </ul> - <br/> + <br /> </#if> <#-- display the event messages --> <#if (eventMessage?has_content || eventMessageList?has_content)> - <div class="eventMessage">Events:</div><br/> + <div class="eventMessage">Events:</div><br /> <ul> <#if eventMessage?has_content> <li class="eventMessage">${eventMessage}</li> @@ -64,5 +64,5 @@ under the License. </#list> </#if> </ul> - <br/> + <br /> </#if> Modified: ofbiz/branches/multitenant20100310/specialpurpose/myportal/widget/login.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/myportal/widget/login.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/myportal/widget/login.ftl (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/myportal/widget/login.ftl Wed Mar 24 09:23:07 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> <a href="<@ofbizUrl>newRegisterLogin</@ofbizUrl>">${uiLabelMap.MyPortalNewRegistration}</a> </form> Modified: ofbiz/branches/multitenant20100310/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/oagis/templates/email/InventoryNoticeEmail.ftl Wed Mar 24 09:23:07 2010 @@ -29,7 +29,7 @@ <body> <h1>${title}</h1> <#-- custom logo or text can be inserted here --> - <br/> + <br /> <div class="screenlet-title-bar"> <div class="h3">${uiLabelMap.OagisInventoryDescription}<b></b></div> </div> @@ -43,7 +43,7 @@ <td width="10%" align="right"><b>${uiLabelMap.OrderQuantity} (Message)</b></td> <td width="10%" align="right"><b>${uiLabelMap.OagisQuantityDiff}.</b></td> </tr> - <tr><td colspan="10"><hr/></td></tr> + <tr><td colspan="10"><hr /></td></tr> <#assign alt_row = false> <#list inventoryMapList as inventoryMap> <tr valign="middle"<#if alt_row> class="alternate-row"</#if>> @@ -57,7 +57,7 @@ <#-- toggle the row color --> <#assign alt_row = !alt_row> </#list> - <tr><td colspan="10"><hr/></td></tr> + <tr><td colspan="10"><hr /></td></tr> </table> </div> </body> Modified: ofbiz/branches/multitenant20100310/specialpurpose/ofbizwebsite/webapp/ofbiz/images/global.css URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ofbizwebsite/webapp/ofbiz/images/global.css?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/ofbizwebsite/webapp/ofbiz/images/global.css (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/ofbizwebsite/webapp/ofbiz/images/global.css Wed Mar 24 09:23:07 2010 @@ -79,11 +79,11 @@ body > #wrap {height: auto; min-height: body { font: 11px/ 165% "Lucida Grande", Geneva, Verdana, Arial, Helvetica, sans-serif; - color: #666666; - margin: 0; - padding: 0; - background: url(/ofbiz/images/bg.png) top left repeat-x #b5b5b5; - text-align: center; + color: #666666; + margin: 0; + padding: 0; + background: url(/ofbiz/images/bg.png) top left repeat-x #b5b5b5; + text-align: center; } .clearfix:after { @@ -118,60 +118,60 @@ html[xmlns] .clearfix { Typography ********************************/ a,a:active,a:link { - text-decoration: none; - color: #0066CC; + text-decoration: none; + color: #0066CC; } a:visited { - text-decoration: none; + text-decoration: none; } a:hover { - color: #030d1c; + color: #030d1c; } h1,h2,h3 { - font-family: "Trebuchet MS", Tahoma, Arial, Sans-serif; - color: #555; + font-family: "Trebuchet MS", Tahoma, Arial, Sans-serif; + color: #555; } h1 { - font-family: "Lucida Grande", Geneva, Verdana, Arial, Helvetica, sans-serif; - font-size: 350%; - font-weight: normal; - letter-spacing: -2px; - padding: 15px 10px 5px 10px; - margin: 0; + font-family: "Lucida Grande", Geneva, Verdana, Arial, Helvetica, sans-serif; + font-size: 350%; + font-weight: normal; + letter-spacing: -2px; + padding: 15px 10px 5px 10px; + margin: 0; } h2 { - font-size: 200%; - color: #895F30; - padding: 20px 10px 5px 10px; - margin: 0; + font-size: 200%; + color: #895F30; + padding: 20px 10px 5px 10px; + margin: 0; } h3 { - font-size: 170%; - font-weight: normal; - padding: 20px 10px 5px 10px; - margin: 0; + font-size: 170%; + font-weight: normal; + padding: 20px 10px 5px 10px; + margin: 0; } h4 { - font-size: 100%; - font-weight: bolder; - color: #000000; - padding: 20px 10px 5px 10px; - margin: 0; + font-size: 100%; + font-weight: bolder; + color: #000000; + padding: 20px 10px 5px 10px; + margin: 0; } strong { font-size: 100%; - font-weight: bolder; - color: #000000; - padding: 20px 10px 5px 10px; - margin: 0; + font-weight: bolder; + color: #000000; + padding: 20px 10px 5px 10px; + margin: 0; } p{ @@ -179,31 +179,31 @@ p{ } p,dl { - padding: 10px; - margin: 0; + padding: 10px; + margin: 0; } ul{ - margin: 10px 10px; - padding: 0 0 0 10px; + margin: 10px 10px; + padding: 0 0 0 10px; } ul { - list-style: none; + list-style: none; } ol { - margin: 10px 30px; - padding: 0; + margin: 10px 30px; + padding: 0; } dt { - font-weight: bold; - color: #b13f1a; + font-weight: bold; + color: #b13f1a; } dd { - padding-left: 25px; + padding-left: 25px; } /******************************** @@ -265,28 +265,28 @@ blockquote { Tables ********************************/ table { - border-collapse: collapse; - margin: 15px 10px; + border-collapse: collapse; + margin: 15px 10px; } th { - background: #d14b1f url(/ofbiz/images/header-bg.jpg) repeat-x 0 -100px; - height: 38px; - padding-left: 12px; - padding-right: 12px; - color: #fff; - text-align: left; - border-left: 1px solid #d14b1f; - border-bottom: solid 2px #fff; + background: #d14b1f url(/ofbiz/images/header-bg.jpg) repeat-x 0 -100px; + height: 38px; + padding-left: 12px; + padding-right: 12px; + color: #fff; + text-align: left; + border-left: 1px solid #d14b1f; + border-bottom: solid 2px #fff; } tr { - height: 34px; + height: 34px; } td { - padding-left: 11px; - padding-right: 11px; + padding-left: 11px; + padding-right: 11px; } /******************************** @@ -356,20 +356,20 @@ input.button { #wrap{ background: #fff url(/ofbiz/images/wrapper.jpg) top center no-repeat; width: 945px; - margin: 0 auto; + margin: 0 auto; text-align:left; } #content-wrap { width:945px; - margin:0 auto; + margin:0 auto; padding-bottom: 42px; } #content { width:500px; - float:left; - padding:30px 0 25px 0; + float:left; + padding:30px 0 25px 0; } /******************************** @@ -378,11 +378,11 @@ input.button { #footer { background: url(/ofbiz/images/footer.jpg) bottom center no-repeat; position: relative; - margin: -42px auto 0px auto; - height: 42px; - clear:both; - font-size:11px; - font-family:Verdana, Arial, sans-serif; + margin: -42px auto 0px auto; + height: 42px; + clear:both; + font-size:11px; + font-family:Verdana, Arial, sans-serif; width:945px; } @@ -543,20 +543,20 @@ input.button { } #main h2 { - padding-bottom: 3px; - margin-top: 15px; - font: normal 2.5em "Lucida Grande", Geneva, Verdana, Arial, Helvetica, sans-serif; - color: #333; - letter-spacing: -2px; - text-transform: none; - border-bottom: 1px solid #ebebeb; + padding-bottom: 3px; + margin-top: 15px; + font: normal 2.5em "Lucida Grande", Geneva, Verdana, Arial, Helvetica, sans-serif; + color: #333; + letter-spacing: -2px; + text-transform: none; + border-bottom: 1px solid #ebebeb; } #main h2 a { - color: #333; - text-decoration: none; - background: none; - border: none; + color: #333; + text-decoration: none; + background: none; + border: none; } #main ul li { @@ -590,51 +590,51 @@ input.button { } #main #col1 h2, #main #col2 h2 { - border-bottom: 1px solid #ebebeb; - color:#304C70; - padding-bottom: 3px; - letter-spacing: -3px; - text-transform: none; - font-size:30px; + border-bottom: 1px solid #ebebeb; + color:#304C70; + padding-bottom: 3px; + letter-spacing: -3px; + text-transform: none; + font-size:30px; } .feature { - margin:0px; - padding:0px; - height:435px; + margin:0px; + padding:0px; + height:435px; } .screen { - margin:10px 0 5px 0; - padding:0px; - background:#fff; - border:1px solid #eee; - width:255px; - height:200px; - overflow:hidden; + margin:10px 0 5px 0; + padding:0px; + background:#fff; + border:1px solid #eee; + width:255px; + height:200px; + overflow:hidden; } #main .hero { - margin:10px 0 5px 0; - padding:0px; - background:#fff; - border:1px solid #eee; - width:555px; + margin:10px 0 5px 0; + padding:0px; + background:#fff; + border:1px solid #eee; + width:555px; } #main .highlights { - float:right; - width:240px; - background:#dfe9ef; - border:1px solid #eee; - margin:0px 10px 0px 5px; - display:inline; + float:right; + width:240px; + background:#dfe9ef; + border:1px solid #eee; + margin:0px 10px 0px 5px; + display:inline; } #main .form { - width:240px; - margin:0px 10px 0px 5px; - display:inline; + width:240px; + margin:0px 10px 0px 5px; + display:inline; } #main .highlights ul li { @@ -642,7 +642,7 @@ input.button { } #main .highlights h4 { - padding:5px 5px 0 5px; + padding:5px 5px 0 5px; } #sidebar { @@ -792,160 +792,160 @@ p.thumbs { ********************************/ /*HOME*/ body#home #wrap { - position: relative; - background: #fff url(/ofbiz/images/home-wrapper.jpg) top center no-repeat; - width: 945px; - margin: 0 auto; - text-align: left; + position: relative; + background: #fff url(/ofbiz/images/home-wrapper.jpg) top center no-repeat; + width: 945px; + margin: 0 auto; + text-align: left; } body#home #header { - position: relative; - width: 945px; - height: 403px; - padding: 0; - margin: 0 auto; - background: transparent; + position: relative; + width: 945px; + height: 403px; + padding: 0; + margin: 0 auto; + background: transparent; } body#home #header #slides { - position: absolute; - top: 128px; - left: 10px; - background: url(/ofbiz/images/slideshow-bg.jpg) top center no-repeat; - width: 923px; - height: 260px; + position: absolute; + top: 128px; + left: 10px; + background: url(/ofbiz/images/slideshow-bg.jpg) top center no-repeat; + width: 923px; + height: 260px; } body#home #header #slides .slideshow { - width:923px; - height:260px; - margin:0px; - padding:0px; + width:923px; + height:260px; + margin:0px; + padding:0px; } body#home #header #slides .callout { - position: absolute; - top: 35px; - left: 30px; - font-size: 30px; - line-height: 30px; - color: #2b1f48; + position: absolute; + top: 35px; + left: 30px; + font-size: 30px; + line-height: 30px; + color: #2b1f48; } body#home #header #slides .description { - position: absolute; - top: 175px; - left: 30px; - font-size: 14px; - line-height: 15px; - color: #e0e0e0; - width: 350px; + position: absolute; + top: 175px; + left: 30px; + font-size: 14px; + line-height: 15px; + color: #e0e0e0; + width: 350px; } body#home #header #slides .controls { - width: 100px; - position: absolute; - top: 15px; - left: 750px; - height:30px; + width: 100px; + position: absolute; + top: 15px; + left: 750px; + height:30px; } body#home #header #slides .controls a { - border: none; - position:absolute; - height:30px; - line-height:24px; - padding:5px; - text-indent:-9999px; - outline:none; + border: none; + position:absolute; + height:30px; + line-height:24px; + padding:5px; + text-indent:-9999px; + outline:none; } body#home #header #slides .controls a.previous { - background: url(/ofbiz/images/backward.gif) top center no-repeat; - left:0px; - height:30px; - width:16px; + background: url(/ofbiz/images/backward.gif) top center no-repeat; + left:0px; + height:30px; + width:16px; } body#home #header #slides .controls a.next { - background: url(/ofbiz/images/forward.gif) top center no-repeat; - left:60px; - height:30px; - width:16px; + background: url(/ofbiz/images/forward.gif) top center no-repeat; + left:60px; + height:30px; + width:16px; } body#home #header #slides .controls a.stop { - background: url(/ofbiz/images/pause.gif) top center no-repeat; - left:30px; - height:30px; - width:16px; + background: url(/ofbiz/images/pause.gif) top center no-repeat; + left:30px; + height:30px; + width:16px; } body#home #header #slides .controls a.start { - background: url(/ofbiz/images/start.gif) top center no-repeat; - left:30px; - height:30px; - width:16px; + background: url(/ofbiz/images/start.gif) top center no-repeat; + left:30px; + height:30px; + width:16px; } body#home #header #slides .controls a img { - background: none; - border: none; - cursor: pointer; + background: none; + border: none; + cursor: pointer; } body#home #header #slides .mantle{ - position:absolute; - top:58px; - left:385px; + position:absolute; + top:58px; + left:385px; } body#home #col1 { - float: left; - width: 260px; - padding: 0; - margin: 5px 0 0 0px; - display: inline; + float: left; + width: 260px; + padding: 0; + margin: 5px 0 0 0px; + display: inline; } body#home #col2 { - float: left; - width: 260px; - padding: 0; - margin: 5px 0 0 20px; - display: inline; + float: left; + width: 260px; + padding: 0; + margin: 5px 0 0 20px; + display: inline; } .downloadNow { - margin:30px 0 10px 0; + margin:30px 0 10px 0; } .downloadLinks span.docs { - float:left; - margin:0px 0px 0 0; - display:inline; + float:left; + margin:0px 0px 0 0; + display:inline; } .downloadLinks span.previousVersions { - float:right; - margin:0px 20px 0 0; - display:inline; + float:right; + margin:0px 20px 0 0; + display:inline; } /*SUBPAGE - NO SIDEBAR*/ body#full #wrap { - position: relative; - background: #ffffff url(/ofbiz/images/full-wrapper.jpg) top center no-repeat; - width: 945px; - margin: 0 auto; - text-align: left; + position: relative; + background: #ffffff url(/ofbiz/images/full-wrapper.jpg) top center no-repeat; + width: 945px; + margin: 0 auto; + text-align: left; } body#semi #wrap { - position: relative; - background: #ffffff url(/ofbiz/images/wrapper.jpg) top center no-repeat; - width: 945px; - margin: 0 auto; - text-align: left; + position: relative; + background: #ffffff url(/ofbiz/images/wrapper.jpg) top center no-repeat; + width: 945px; + margin: 0 auto; + text-align: left; } Modified: ofbiz/branches/multitenant20100310/specialpurpose/ofbizwebsite/webapp/ofbiz/images/rsscss.css URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ofbizwebsite/webapp/ofbiz/images/rsscss.css?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/ofbizwebsite/webapp/ofbiz/images/rsscss.css (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/ofbizwebsite/webapp/ofbiz/images/rsscss.css Wed Mar 24 09:23:07 2010 @@ -19,10 +19,10 @@ /* border table for feed news */ .fd_bordertable { - background: #FFFFFF; - border-style: solid; border-width: 1px; border-color: #CCCCCC; - padding: 0; - width: 100%; + background: #FFFFFF; + border-style: solid; border-width: 1px; border-color: #CCCCCC; + padding: 0; + width: 100%; } /* maintable table for feed news */ @@ -30,25 +30,25 @@ /* header cell with header text and xml button */ .fd_header { - padding: 5px; - padding-left: 4px; - background: #000099; - color: white; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 8pt; - font-weight: bold; - text-align: left; - vertical-align: top; - width: 100%; + padding: 5px; + padding-left: 4px; + background: #000099; + color: white; + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 8pt; + font-weight: bold; + text-align: left; + vertical-align: top; + width: 100%; } /* item description area */ .fd_itemcell { - padding: 10px; - line-height: 16px; - background: #FAFAFA; color: black; - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 12px + padding: 10px; + line-height: 16px; + background: #FAFAFA; color: black; + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 12px } /* item link properties, such as text-decoration and etc */ Modified: ofbiz/branches/multitenant20100310/specialpurpose/ofbizwebsite/webapp/ofbiz/script/slides.js URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/ofbizwebsite/webapp/ofbiz/script/slides.js?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/ofbizwebsite/webapp/ofbiz/script/slides.js (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/ofbizwebsite/webapp/ofbiz/script/slides.js Wed Mar 24 09:23:07 2010 @@ -19,110 +19,110 @@ var Slides = Class.create({ - initialize: function(element, options) { - this.options = { - Duration: 1, - Delay: 10.0, - Random: true, - Slideshow:true, - Controls:true - } - Object.extend(this.options, options || {}); - - this.element = $(element); - this.slides = this.element.childElements(); - this.num_slides = this.slides.length; - this.current_slide = (this.options.Random) ? (Math.floor(Math.random()*this.num_slides)) : 0; - this.end_slide = this.num_slides - 1; - - this.slides.invoke('hide'); - this.slides[this.current_slide].show(); - - if (this.options.Slideshow) { - this.startSlideshow(); - } - if (this.options.Controls) { - this.addControls(); - } - }, - - addControls: function() { - this.btn_previous = $('previous'); - this.btn_next = $('next'); - this.btn_start = $('start'); - this.btn_stop = $('stop'); - - this.btn_previous.observe('click', this.moveToPrevious.bindAsEventListener(this)); - this.btn_next.observe('click', this.moveToNext.bindAsEventListener(this)); - this.btn_start.observe('click', this.startSlideshow.bindAsEventListener(this)); - this.btn_stop.observe('click', this.stopSlideshow.bindAsEventListener(this)); - }, - - startSlideshow: function(event) { - if (event) { Event.stop(event); } - if (!this.running) { - this.fadeStartBtn(); - this.executer = new PeriodicalExecuter(function(){ - this.updateSlide(this.current_slide+1); - }.bind(this),this.options.Delay); - this.running=true; - } - - }, - - fadeStartBtn: function() { - var startBtn = $('start'); - var stopBtn = $('stop'); - Effect.Fade(startBtn, { duration: 0.3 }), - Effect.Appear(stopBtn, { duration: 0.3 }) - }, - - stopSlideshow: function(event) { - if (event) { Event.stop(event); } - if (this.executer) { - this.fadeStopBtn(); - this.executer.stop(); - this.running=false; - } - }, - - fadeStopBtn: function() { - var startBtn = $('start'); - var stopBtn = $('stop'); - Effect.Fade(stopBtn, { duration: 0.3 }), - Effect.Appear(startBtn, { duration: 0.3 }) - }, - - moveToPrevious: function (event) { - if (event) { Event.stop(event); } - //this.stopSlideshow(); - this.updateSlide(this.current_slide-1); - }, - - moveToNext: function (event) { - if (event) { Event.stop(event); } - //this.stopSlideshow(); - this.updateSlide(this.current_slide+1); - }, - - updateSlide: function(next_slide) { - if (next_slide > this.end_slide) { - next_slide = 0; - } - else if ( next_slide == -1 ) { - next_slide = this.end_slide; - } - - this.fadeInOut(next_slide, this.current_slide); - }, - - fadeInOut: function (next, current) { - new Effect.Parallel([ - new Effect.Fade(this.slides[current], { sync: true }), - new Effect.Appear(this.slides[next], { sync: true }) - ], { duration: this.options.Duration }); - - this.current_slide = next; - } + initialize: function(element, options) { + this.options = { + Duration: 1, + Delay: 10.0, + Random: true, + Slideshow:true, + Controls:true + } + Object.extend(this.options, options || {}); + + this.element = $(element); + this.slides = this.element.childElements(); + this.num_slides = this.slides.length; + this.current_slide = (this.options.Random) ? (Math.floor(Math.random()*this.num_slides)) : 0; + this.end_slide = this.num_slides - 1; + + this.slides.invoke('hide'); + this.slides[this.current_slide].show(); + + if (this.options.Slideshow) { + this.startSlideshow(); + } + if (this.options.Controls) { + this.addControls(); + } + }, + + addControls: function() { + this.btn_previous = $('previous'); + this.btn_next = $('next'); + this.btn_start = $('start'); + this.btn_stop = $('stop'); + + this.btn_previous.observe('click', this.moveToPrevious.bindAsEventListener(this)); + this.btn_next.observe('click', this.moveToNext.bindAsEventListener(this)); + this.btn_start.observe('click', this.startSlideshow.bindAsEventListener(this)); + this.btn_stop.observe('click', this.stopSlideshow.bindAsEventListener(this)); + }, + + startSlideshow: function(event) { + if (event) { Event.stop(event); } + if (!this.running) { + this.fadeStartBtn(); + this.executer = new PeriodicalExecuter(function(){ + this.updateSlide(this.current_slide+1); + }.bind(this),this.options.Delay); + this.running=true; + } + + }, + + fadeStartBtn: function() { + var startBtn = $('start'); + var stopBtn = $('stop'); + Effect.Fade(startBtn, { duration: 0.3 }), + Effect.Appear(stopBtn, { duration: 0.3 }) + }, + + stopSlideshow: function(event) { + if (event) { Event.stop(event); } + if (this.executer) { + this.fadeStopBtn(); + this.executer.stop(); + this.running=false; + } + }, + + fadeStopBtn: function() { + var startBtn = $('start'); + var stopBtn = $('stop'); + Effect.Fade(stopBtn, { duration: 0.3 }), + Effect.Appear(startBtn, { duration: 0.3 }) + }, + + moveToPrevious: function (event) { + if (event) { Event.stop(event); } + //this.stopSlideshow(); + this.updateSlide(this.current_slide-1); + }, + + moveToNext: function (event) { + if (event) { Event.stop(event); } + //this.stopSlideshow(); + this.updateSlide(this.current_slide+1); + }, + + updateSlide: function(next_slide) { + if (next_slide > this.end_slide) { + next_slide = 0; + } + else if ( next_slide == -1 ) { + next_slide = this.end_slide; + } + + this.fadeInOut(next_slide, this.current_slide); + }, + + fadeInOut: function (next, current) { + new Effect.Parallel([ + new Effect.Fade(this.slides[current], { sync: true }), + new Effect.Appear(this.slides[next], { sync: true }) + ], { duration: this.options.Duration }); + + this.current_slide = next; + } }); \ No newline at end of file Modified: ofbiz/branches/multitenant20100310/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java Wed Mar 24 09:23:07 2010 @@ -1477,7 +1477,7 @@ public class PosTransaction implements S } try { - ShoppingListEvents.addBulkFromCart(delegator, dispatcher, cart, userLogin, shoppingListId, selectedCartItems, true, true); + ShoppingListEvents.addBulkFromCart(delegator, dispatcher, cart, userLogin, shoppingListId, null, selectedCartItems, true, true); } catch (IllegalArgumentException e) { Debug.logError(e, "Problem while creating new ShoppingList", module); pos.showDialog("dialog/error/exception", UtilProperties.getMessage("OrderErrorUiLabels", "OrderUnableToCreateNewShoppingList", locale)); Modified: ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/config/ProjectMgrUiLabels.xml Wed Mar 24 09:23:07 2010 @@ -173,6 +173,10 @@ <value xml:lang="nl">Template ID</value> <value xml:lang="zh">模æ¿Id</value> </property> + <property key="FormFieldTitle_timesheetPartyId"> + <value xml:lang="en">Associated to</value> + <value xml:lang="fr">Associée à </value> + </property> <property key="PageTitleAddATimesheet"> <value xml:lang="de">Neue wöchentliche Zeiterfassung hinzufügen</value> <value xml:lang="en">Add a new weekly Timesheet</value> @@ -1858,6 +1862,10 @@ <value xml:lang="th">à¸à¸¸à¸à¸à¹à¸à¸à¸à¸²à¸£à¸à¸²à¸£à¸à¸à¸¸à¸à¸²à¸à¸à¸¢à¹à¸²à¸à¸à¹à¸à¸¢à¸à¸µà¹à¸ªà¸¸à¸ PROJECTMGR_READ à¹à¸à¸à¸²à¸£à¹à¸ªà¸à¸à¸«à¸à¹à¸²à¸à¸à¸à¸µà¹</value> <value xml:lang="zh">ä½ è³å°éè¦æPROJECTMGR_READæéæè½æ¥çæ¬é¡µ</value> </property> + <property key="ProjectMgrAdminViewPermissionError"> + <value xml:lang="en">You need at least a PROJECT_ADMIN permission to view this screen</value> + <value xml:lang="fr">Il vous faut au moins l'autorisation PROJECTMGR_ADMIN pour voir cet écran</value> + </property> <property key="ProjectMgrWeek"> <value xml:lang="de">Woche</value> <value xml:lang="en">Week</value> Modified: ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/entitydef/entitymodel.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/entitydef/entitymodel.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/entitydef/entitymodel.xml (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/entitydef/entitymodel.xml Wed Mar 24 09:23:07 2010 @@ -31,7 +31,7 @@ under the License. <extend-entity entity-name="WorkEffort"> <field name="sequenceNum" type="numeric"> - <description>To order the workefforts under a workeffort parent</description> + <description>To order the workefforts under a workeffort parent</description> </field> </extend-entity> Modified: ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/main.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/main.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/main.ftl (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/main.ftl Wed Mar 24 09:23:07 2010 @@ -17,12 +17,12 @@ specific language governing permissions under the License. --> -<br/> +<br /> <h2>${text1}</h2> -<br/> +<br /> <#if text2?exists> <h2>${text2}</h2> -</#if><br/> +</#if><br /> <#if link1?exists> <h2>1. <a href="${link1}" target="new1">${link1Text}</a></h2> </#if> Modified: ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/webapp/projectmgr/project/edittaskandassoc.ftl Wed Mar 24 09:23:07 2010 @@ -33,7 +33,7 @@ under the License. <#if task?has_content> <form name="addTaskAndAssocForm" method="get" action="<@ofbizUrl>updateTaskAndAssoc</@ofbizUrl>"> <#else> - <br/> + <br /> <form name="addTaskAndAssocForm" method="get" action="<@ofbizUrl>createTaskAndAssoc</@ofbizUrl>"> </#if> <table width="100%" cellpadding="2" cellspacing="0"> Modified: ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/widget/CustRequestScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/widget/CustRequestScreens.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/widget/CustRequestScreens.xml (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/widget/CustRequestScreens.xml Wed Mar 24 09:23:07 2010 @@ -42,7 +42,7 @@ under the License. </screenlet> </widgets> <fail-widgets> - <label style="h2" text="You need at least a PROJECT_ADMIN permission"></label> + <label style="h2" text="${uiLabelMap.ProjectMgrAdminViewPermissionError}"/> </fail-widgets> </section> </screen> Modified: ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/widget/ProjectScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/widget/ProjectScreens.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/widget/ProjectScreens.xml (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/widget/ProjectScreens.xml Wed Mar 24 09:23:07 2010 @@ -421,7 +421,7 @@ under the License. <script location="component://projectmgr/webapp/projectmgr/WEB-INF/actions/GanttChart.groovy"/> </actions> <widgets> - <label text="${project}"></label> + <label text="${project}"/> <decorator-screen name="CommonProjectDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> <screenlet title="${uiLabelMap.PageTitleProjectGanttChart}"> @@ -540,7 +540,7 @@ under the License. <not><if-empty field="clientAssigns"/></not> </condition> <widgets> - <label style="h3" text="${uiLabelMap.ProjectMgrClientContacts}"></label> + <label style="h3" text="${uiLabelMap.ProjectMgrClientContacts}"/> <include-form name="ListProjectClientParties" location="component://projectmgr/widget/forms/ProjectForms.xml"/> </widgets> </section> @@ -549,7 +549,7 @@ under the License. <not><if-empty field="companyAssigns"/></not> </condition> <widgets> - <label style="h3" text="${uiLabelMap.ProjectMgrCompanies}"></label> + <label style="h3" text="${uiLabelMap.ProjectMgrCompanies}"/> <include-form name="ListProjectCompanyParties" location="component://projectmgr/widget/forms/ProjectForms.xml"/> </widgets> </section> @@ -1105,7 +1105,7 @@ under the License. <if-empty field="projects"/> </condition> <widgets> - <label style="h2" text="${uiLabelMap.ProjectMgrNoProjectsFound}"></label> + <label style="h2" text="${uiLabelMap.ProjectMgrNoProjectsFound}"/> </widgets> </section> </widgets> Modified: ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/widget/TaskScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/widget/TaskScreens.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/widget/TaskScreens.xml (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/widget/TaskScreens.xml Wed Mar 24 09:23:07 2010 @@ -111,7 +111,7 @@ under the License. </widgets> <fail-widgets> <screenlet title="${uiLabelMap.ProjectMgrAssignATaskToMe}"> - <label style="h3" text="${uiLabelMap.ProjectMgrTaskMember}"></label> + <label style="h3" text="${uiLabelMap.ProjectMgrTaskMember}"/> </screenlet> </fail-widgets> </section> @@ -144,10 +144,10 @@ under the License. <fail-widgets> <screenlet title="${uiLabelMap.PageTitleTaskAssignedToMe}"> <container> - <label style="h3" text="${uiLabelMap.ProjectMgrTaskNoOpen1}"></label> + <label style="h3" text="${uiLabelMap.ProjectMgrTaskNoOpen1}"/> </container> <container> - <label style="h3" text="${uiLabelMap.ProjectMgrTaskNoOpen2}"></label> + <label style="h3" text="${uiLabelMap.ProjectMgrTaskNoOpen2}"/> </container> </screenlet> </fail-widgets> @@ -479,7 +479,7 @@ under the License. <widgets> <decorator-screen name="CommonTaskDecorator" location="${parameters.mainDecoratorLocation}"> <decorator-section name="body"> - <label style="h1" text="${uiLabelMap.OrderRequest} : ${custRequest.custRequestName} [${parameters.custRequestId}] ${uiLabelMap.CommonFrom} ${partyName.firstName} ${partyName.middleName} ${partyName.lastName} ${partyName.groupName} "></label> + <label style="h1" text="${uiLabelMap.OrderRequest} : ${custRequest.custRequestName} [${parameters.custRequestId}] ${uiLabelMap.CommonFrom} ${partyName.firstName} ${partyName.middleName} ${partyName.lastName} ${partyName.groupName} "/> <container style="lefthalf"> <screenlet title="${uiLabelMap.PageTitleCreateTaskbyRequest}"> <include-form name="EditTaskFromRequest" location="component://projectmgr/widget/forms/TaskForms.xml"/> Modified: ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/widget/forms/CustRequestForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/widget/forms/CustRequestForms.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/widget/forms/CustRequestForms.xml (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/widget/forms/CustRequestForms.xml Wed Mar 24 09:23:07 2010 @@ -35,7 +35,6 @@ under the License. <field name="shortDescription" parameter-name="description" use-when="custRequest==null" encode-output="false"><text/></field> <!--field name="description" parameter-name="story" use-when="custRequest==null" encode-output="false"><textarea cols="60" rows="12" default-value="${communicationEvent.content}"/></field--> <field name="workEffortName"><hidden value="${custRequestName}"/></field> - <field name="workEffortId"><hidden value="${custRequestId}"/></field> <field name="workEffortTypeId"><hidden value="TASK"/></field> <field name="currentStatusId"><hidden value="PTS_CREATED"/></field> <!--field name="communicationEventId"><hidden value="${communicationEvent.communicationEventId}"/></field--> Modified: ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/widget/forms/ProjectForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/widget/forms/ProjectForms.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/widget/forms/ProjectForms.xml (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/widget/forms/ProjectForms.xml Wed Mar 24 09:23:07 2010 @@ -103,8 +103,8 @@ </form> <form name="FindProject" type="single" target="FindProject" title="Find and List Project" header-row-style="header-row" default-table-style="basic-table"> - <field name="projectId" title="${uiLabelMap.ProjectMgrProjectId}" parameter-name="workEffortId"><text-find size="25"></text-find></field> - <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}" parameter-name="workEffortName"><text-find size="25"></text-find></field> + <field name="projectId" title="${uiLabelMap.ProjectMgrProjectId}" parameter-name="workEffortId"><text-find size="25"/></field> + <field name="projectName" title="${uiLabelMap.ProjectMgrProjectName}" parameter-name="workEffortName"><text-find size="25"/></field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}" parameter-name="createdStamp"><date-find/></field> <field name="find" title="${uiLabelMap.CommonFind}"><submit/></field> </form> @@ -314,13 +314,13 @@ </field> <field entry-name="sequenceNum" name="taskSeqNum" parameter-name="sequenceNum"><text size="3"/></field> <field entry-name="workEffortName" name="taskName" parameter-name="workEffortName" title="${uiLabelMap.CommonName}"> - <text/> + <text/> </field> <field name="workEffortTypeId" title="${uiLabelMap.CommonType}"> <display-entity entity-name="WorkEffortType" key-field-name="workEffortTypeId" description="${description}" also-hidden="false"/> </field> <field name="currentStatusId" title="${uiLabelMap.CommonStatus}"> - <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}" also-hidden="false"/> + <display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}" also-hidden="false"/> </field> <field name="plannedHours" parameter-name="estimatedDuration" title="${uiLabelMap.ProjectMgrPlannedHours}"><text size="3"/></field> <field name="actualHours" title="${uiLabelMap.ProjectMgrActualHours}"><display/></field> @@ -340,7 +340,7 @@ <field name="estimatedStartDate" title="${uiLabelMap.WorkEffortEstimatedStartDate}"><date-time type="date"/></field> <field name="estimatedCompletionDate" title="${uiLabelMap.WorkEffortEstimatedCompletionDate}"><date-time type="date"/></field> <field name="edit" title=" "> - <hyperlink target="EditTask?workEffortId=${workEffortId}" description="${uiLabelMap.CommonEdit}"></hyperlink> + <hyperlink target="EditTask?workEffortId=${workEffortId}" description="${uiLabelMap.CommonEdit}"/> </field> <field name="submitButton" title="${uiLabelMap.CommonUpdate}"><submit button-type="button"/></field> </form> @@ -535,7 +535,7 @@ </hyperlink> </field> <field name="roleTypeId"><display-entity entity-name="RoleType" description="${description}"/></field> - <field name="currencyUomId"><display-entity entity-name="Uom" key-field-name="uomId" description="${description}"></display-entity></field> + <field name="currencyUomId"><display-entity entity-name="Uom" key-field-name="uomId" description="${description}"/></field> </form> <form name="EditWorkEffortPartyAssigns" target="deleteWorkEffortPartyAssign" title="" type="list" paginate-target="ListWorkEffortPartyAssigns" odd-row-style="alternate-row" header-row-style="header-row-2" default-table-style="basic-table hover-bar"> Modified: ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/widget/forms/TaskForms.xml URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/widget/forms/TaskForms.xml?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/widget/forms/TaskForms.xml (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/projectmgr/widget/forms/TaskForms.xml Wed Mar 24 09:23:07 2010 @@ -547,7 +547,7 @@ </hyperlink> </field> <field name="taskDescription" title="${uiLabelMap.CommonDescription}"><display/></field> - <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"></display-entity></field> + <field name="currentStatusId"><display-entity entity-name="StatusItem" key-field-name="statusId" description="${description}"/></field> <field name="priority" title="${uiLabelMap.CommonPriority}"><display type="date"/></field> <field name="estimatedStartDate"><display type="date"/></field> <field name="estimatedCompletionDate"><display type="date"/></field> @@ -578,7 +578,7 @@ <field name="roleTypeId" title="${uiLabelMap.PartyRoleType}"> <display-entity entity-name="RoleType"/> </field> - <field name="statusId"><display-entity entity-name="StatusItem"></display-entity></field> + <field name="statusId"><display-entity entity-name="StatusItem"/></field> <field name="fromDate" title="${uiLabelMap.CommonFromDate}"><display type="date"/></field> <field name="thruDate" title="${uiLabelMap.CommonThruDate}"><display type="date"/></field> <field name="deleteButton" widget-style="smallSubmit"><submit button-type="button"/></field> Modified: ofbiz/branches/multitenant20100310/specialpurpose/shark/webapp/shark/repository/showRepository.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/shark/webapp/shark/repository/showRepository.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/shark/webapp/shark/repository/showRepository.ftl (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/shark/webapp/shark/repository/showRepository.ftl Wed Mar 24 09:23:07 2010 @@ -53,7 +53,7 @@ under the License. <div>Repository is empty.</div> </#if> -<br/> +<br /> <h2>Upload XPDL</h2> <div> </div> <form method="post" enctype="multipart/form-data" action="<@ofbizUrl>repository?upload=xpdl</@ofbizUrl>" name="xpdlUploadForm"> Modified: ofbiz/branches/multitenant20100310/specialpurpose/webpos/webapp/webpos/RequirePasswordChange.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/webpos/webapp/webpos/RequirePasswordChange.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/webpos/webapp/webpos/RequirePasswordChange.ftl (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/webpos/webapp/webpos/RequirePasswordChange.ftl Wed Mar 24 09:23:07 2010 @@ -25,7 +25,7 @@ under the License. </#if> <h1>${uiLabelMap.CommonLogin}</h1> -<br/> +<br /> <div style="float: center; width: 49%; margin-right: 5px; text-align: center;" class="screenlet"> <div class="screenlet-title-bar">${uiLabelMap.CommonPasswordChange}</div> Modified: ofbiz/branches/multitenant20100310/specialpurpose/webpos/webapp/webpos/includes/Footer.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/webpos/webapp/webpos/includes/Footer.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/webpos/webapp/webpos/includes/Footer.ftl (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/webpos/webapp/webpos/includes/Footer.ftl Wed Mar 24 09:23:07 2010 @@ -19,16 +19,16 @@ under the License. <#assign nowTimestamp = Static["org.ofbiz.base.util.UtilDateTime"].nowTimestamp()> -<br/> +<br /> <div align="center"> <a href="http://jigsaw.w3.org/css-validator/"><img style="border:0;width:88px;height:31px" src="<@ofbizContentUrl>/images/vcss.gif</@ofbizContentUrl>" alt="Valid CSS!"/></a> <a href="http://validator.w3.org/check?uri=referer"><img style="border:0;width:88px;height:31px" src="<@ofbizContentUrl>/images/valid-xhtml10.png</@ofbizContentUrl>" alt="Valid XHTML 1.0!"/></a> </div> -<br/> +<br /> <div align="center"> <div>Copyright (c) 2001-${nowTimestamp?string("yyyy")} The Apache Software Foundation - <a href="http://www.apache.org" class="tabletext" target="_blank">www.apache.org</a></div> <div>Powered by <a href="http://ofbiz.apache.org" target="_blank">Apache OFBiz</a></div> </div> -<br/> +<br /> </body> </html> Modified: ofbiz/branches/multitenant20100310/specialpurpose/webpos/webapp/webpos/search/SearchProducts.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/webpos/webapp/webpos/search/SearchProducts.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/webpos/webapp/webpos/search/SearchProducts.ftl (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/webpos/webapp/webpos/search/SearchProducts.ftl Wed Mar 24 09:23:07 2010 @@ -25,7 +25,7 @@ under the License. <input type="text" id="productGoodIdentification" name="productGoodIdentification" size="40" maxlength="100"> <div id="productsIdent" class="autocomplete" style="display:none"></div> <input type="submit" id="submitButton" name="submitButton" value="${uiLabelMap.OrderAddToCart}" onclick="ajaxSubmitFormUpdateAreas('SearchProducts', 'CartScreen, webpos/control/ShowCart,')"> - <br/> + <br /> <label for="searchBy"><b> ${uiLabelMap.WebPosSearchBy}</b></label> <select id="searchBy" name="searchBy"> <option value="productName" selected>${uiLabelMap.ProductProductName}</option> @@ -35,7 +35,7 @@ under the License. <div id="products" class="autocomplete" style="display:none"></div> </div> </form> -<br/> +<br /> <script language="javascript" type="text/javascript"> document.SearchProducts.productGoodIdentification.focus(); </script> \ No newline at end of file Modified: ofbiz/branches/multitenant20100310/specialpurpose/workflow/webapp/workflow/workflow/readxpdl.ftl URL: http://svn.apache.org/viewvc/ofbiz/branches/multitenant20100310/specialpurpose/workflow/webapp/workflow/workflow/readxpdl.ftl?rev=926987&r1=926986&r2=926987&view=diff ============================================================================== --- ofbiz/branches/multitenant20100310/specialpurpose/workflow/webapp/workflow/workflow/readxpdl.ftl (original) +++ ofbiz/branches/multitenant20100310/specialpurpose/workflow/webapp/workflow/workflow/readxpdl.ftl Wed Mar 24 09:23:07 2010 @@ -20,7 +20,7 @@ under the License. <h1>${uiLabelMap.WorkflowReadXPDLFile}</h1> <br /> <p>${uiLabelMap.WorkflowImportXPDLPageDescription}</p> -<hr/> +<hr /> <#if security.hasPermission("WORKFLOW_MAINT", session)> <form method="post" action="<@ofbizUrl>readxpdl</@ofbizUrl>"> <table class="basic-table form-widget-table"> @@ -44,7 +44,7 @@ under the License. <#if parameters.XPDL_LOCATION?has_content> <#if messages?has_content> - <hr/> + <hr /> <h1>${uiLabelMap.CommonErrorMessage3}:</h1> <div> <#list messages as message> @@ -57,7 +57,7 @@ under the License. <#list toBeStored as entity> <pre>${entity}</pre> </#list> - <hr/> + <hr /> <div>${uiLabelMap.WorkflowReadAndPrintedNEntities}</div> <#else> <div>${uiLabelMap.WorkflowNoEntitiesRead}.</div> |
Free forum by Nabble | Edit this page |