svn commit: r792436 - in /ofbiz/trunk/specialpurpose/ec
Locked
 
|
Author: apatel
Date: Thu Jul 9 07:56:02 2009 New Revision: 792436 URL: http://svn.apache.org/viewvc?rev=792436&view=rev Log: cleaned mark. Moved list of anon checkout is in file by itself. This makes it easy to use login.ftl file in custom ecommerce components. Added: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/startanoncheckout.ftl (with props) Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/login.ftl ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/login.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/login.ftl?rev=792436&r1=792435&r2=792436&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/login.ftl (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/login.ftl Thu Jul 9 07:56:02 2009 @@ -17,92 +17,52 @@ under the License. --> -<#assign shoppingCart = sessionAttributes.shoppingCart?if_exists> -<#if shoppingCart?has_content> - <#assign shoppingCartSize = shoppingCart.size()> -<#else> - <#assign shoppingCartSize = 0> -</#if> - <h1>${uiLabelMap.CommonLogin}</h1> -<br/> - -<div> - <div style="float: left; width: 49%; margin-right: 5px; text-align: center;"> <div class="screenlet"> - <div class="screenlet-header"> - <div class="boxhead">${uiLabelMap.CommonRegistered}</div> - </div> - <div class="screenlet-body" style="text-align: center;"> - <form method="post" action="<@ofbizUrl>login</@ofbizUrl>" name="loginform"> - <div class="tabletext"> - ${uiLabelMap.CommonUsername}: - <input type="text" class="inputBox" name="USERNAME" value="<#if requestParameters.USERNAME?has_content>${requestParameters.USERNAME}<#elseif autoUserLogin?has_content>${autoUserLogin.userLoginId}</#if>" size="20"/> - </div> - <#if autoUserLogin?has_content> - <div class="tabletext"> - (${uiLabelMap.CommonNot} ${autoUserLogin.userLoginId}? <a href="<@ofbizUrl>${autoLogoutUrl}</@ofbizUrl>" class="buttontext">${uiLabelMap.CommonClickHere}</a>) - </div> - </#if> - <div class="tabletext"> - ${uiLabelMap.CommonPassword}: - <input type="password" class="inputBox" name="PASSWORD" value="" size="20"/> - </div> - <div class="tabletext"> - <input type="submit" class="smallSubmit" value="${uiLabelMap.CommonLogin}"/> - </div> - </form> - </div> + <h3>${uiLabelMap.CommonRegistered}</h3> + <form method="post" action="<@ofbizUrl>login</@ofbizUrl>" name="loginform"> + <fieldset> + <div> + <label for="userName">${uiLabelMap.CommonUsername}</label> + <input type="text" id="userName" name="USERNAME" value="<#if requestParameters.USERNAME?has_content>${requestParameters.USERNAME}<#elseif autoUserLogin?has_content>${autoUserLogin.userLoginId}</#if>"/> + </div> + <#if autoUserLogin?has_content> + <p>(${uiLabelMap.CommonNot} ${autoUserLogin.userLoginId}? <a href="<@ofbizUrl>${autoLogoutUrl}</@ofbizUrl>">${uiLabelMap.CommonClickHere}</a>)</p> + </#if> + <div> + <label for="password">${uiLabelMap.CommonPassword}:</label> + <input type="password" id="password" name="PASSWORD" value=""/> + </div> + <div> + <input type="submit" class="button" value="${uiLabelMap.CommonLogin}"/> + </div> + </fieldset> + </form> </div> <div class="screenlet"> - <div class="screenlet-header"> - <div class="boxhead">${uiLabelMap.CommonForgotYourPassword}?</div> - </div> - <div class="screenlet-body" style="text-align: center;"> - <form method="post" action="<@ofbizUrl>forgotpassword</@ofbizUrl>" name="forgotpassword" style="margin: 0;"> - <span class="tabletext">${uiLabelMap.CommonUsername}: </span><input type="text" size="20" class="inputBox" name="USERNAME" value="<#if requestParameters.USERNAME?has_content>${requestParameters.USERNAME}<#elseif autoUserLogin?has_content>${autoUserLogin.userLoginId}</#if>"/> - <div><input type="submit" name="GET_PASSWORD_HINT" class="smallSubmit" value="${uiLabelMap.CommonGetPasswordHint}"/> <input type="submit" name="EMAIL_PASSWORD" class="smallSubmit" value="${uiLabelMap.CommonEmailPassword}"/></div> - </form> + <h3>${uiLabelMap.CommonForgotYourPassword}?</h3> + <form method="post" action="<@ofbizUrl>forgotpassword</@ofbizUrl>"> + <div> + <label for="forgotpassword_userName">${uiLabelMap.CommonUsername}</label> + <input type="text" id="forgotpassword_userName" name="USERNAME" value="<#if requestParameters.USERNAME?has_content>${requestParameters.USERNAME}<#elseif autoUserLogin?has_content>${autoUserLogin.userLoginId}</#if>"/> + </div> + <div class="buttons"> + <input type="submit" class="button" name="GET_PASSWORD_HINT" value="${uiLabelMap.CommonGetPasswordHint}"/> + <input type="submit" class="button" name="EMAIL_PASSWORD" value="${uiLabelMap.CommonEmailPassword}"/> </div> + </form> </div> - - </div> - <div style="float: right; width: 49%; margin-left: 5px; text-align: center;"> <div class="screenlet"> - <div class="screenlet-header"> - <div class="boxhead">${uiLabelMap.CommonNewUser}</div> - </div> - <div class="screenlet-body" style="text-align: center;"> - <form method="post" action="<@ofbizUrl>newcustomer</@ofbizUrl>" style="margin: 0;"> - <div class="tabletext">${uiLabelMap.CommonMayCreateNewAccountHere}:</div> - <div><input type="submit" class="smallSubmit" value="${uiLabelMap.CommonMayCreate}"/></div> - </form> - </div> + <h3>${uiLabelMap.CommonNewUser}</h3> + <form method="post" action="<@ofbizUrl>newcustomer</@ofbizUrl>"> + <div> + <label for="newcustomer_submit">${uiLabelMap.CommonMayCreateNewAccountHere}:</p> + <input type="submit" class="button" id="newcustomer_submit" value="${uiLabelMap.CommonMayCreate}"/> + <div> + </form> </div> - <#if (shoppingCartSize > 0)> - <div class="screenlet"> - <div class="screenlet-header"> - <div class="boxhead">${uiLabelMap.CommonCheckoutAnonymous}</div> - </div> - <div class="screenlet-body"> - <div class="tabletext" align="center">${uiLabelMap.CommonCheckoutAnonymousMsg}:</div> - <form method="post" action="<@ofbizUrl>setCustomer</@ofbizUrl>" style="margin: 0;"> - <div align="center"><input type="submit" class="smallSubmit" value="${uiLabelMap.OrderCheckout}"/></div> - </form> - <form method="post" action="<@ofbizUrl>quickAnonCheckout</@ofbizUrl>" style="margin: 0;"> - <div align="center"><input type="submit" class="smallSubmit" value="${uiLabelMap.OrderCheckoutQuick}"/></div> - </form> - <form method="post" action="<@ofbizUrl>anonOnePageCheckout</@ofbizUrl>" style="margin: 0;"> - <div align="center"><input type="submit" class="smallSubmit" value="${uiLabelMap.EcommerceOnePageCheckout}"/></div> - </form> - <form method="post" action="<@ofbizUrl>googleCheckout</@ofbizUrl>" style="margin: 0;"> - <div align="center"><input type="submit" class="smallSubmit" value="${uiLabelMap.EcommerceCartToGoogleCheckout}"/></div> - </form> - </div> - </div> - </#if> </div> <div class="endcolumns"> </div> </div> Added: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/startanoncheckout.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/startanoncheckout.ftl?rev=792436&view=auto ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/startanoncheckout.ftl (added) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/startanoncheckout.ftl Thu Jul 9 07:56:02 2009 @@ -0,0 +1,53 @@ +<#-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<#assign shoppingCart = sessionAttributes.shoppingCart?if_exists> +<#if shoppingCart?has_content> + <#assign shoppingCartSize = shoppingCart.size()> +<#else> + <#assign shoppingCartSize = 0> +</#if> + +<#if (shoppingCartSize > 0)> + <div class="screenlet"> + <h3>${uiLabelMap.CommonCheckoutAnonymous}</h3> + <p>${uiLabelMap.CommonCheckoutAnonymousMsg}:<p> + <form method="post" action="<@ofbizUrl>setCustomer</@ofbizUrl>" style="margin: 0;"> + <div> + <input type="submit" class="button" value="${uiLabelMap.OrderCheckout}"/> + </div> + </form> + <form method="post" action="<@ofbizUrl>quickAnonCheckout</@ofbizUrl>"> + <div> + <input type="submit" class="button" value="${uiLabelMap.OrderCheckoutQuick}"/> + </div> + </form> + <form method="post" action="<@ofbizUrl>anonOnePageCheckout</@ofbizUrl>"> + <div> + <input type="submit" class="button" value="${uiLabelMap.EcommerceOnePageCheckout}"/> + </div> + </form> + <form method="post" action="<@ofbizUrl>googleCheckout</@ofbizUrl>"> + <div> + <input type="submit" class="button" value="${uiLabelMap.EcommerceCartToGoogleCheckout}"/> + </div> + </form> + </div> +</#if> + Propchange: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/startanoncheckout.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/startanoncheckout.ftl ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/startanoncheckout.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=792436&r1=792435&r2=792436&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/widget/CommonScreens.xml Thu Jul 9 07:56:02 2009 @@ -269,6 +269,9 @@ <platform-specific> <html><html-template location="component://ecommerce/webapp/ecommerce/login.ftl"/></html> </platform-specific> + <platform-specific> + <html><html-template location="component://ecommerce/webapp/ecommerce/order/startanoncheckout.ftl"/></html> + </platform-specific> </decorator-section> </decorator-screen> </widgets> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |