Author: lektran
Date: Wed Mar 17 19:41:57 2010
New Revision: 924441
URL: http://svn.apache.org/viewvc?rev=924441&view=rev
Log:
Formatting fixes, no markups changes
Modified:
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/login.ftl
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/startanoncheckout.ftl
Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/login.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/login.ftl?rev=924441&r1=924440&r2=924441&view=diff
==============================================================================
--- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/login.ftl (original)
+++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/login.ftl Wed Mar 17
19:41:57 2010
@@ -18,58 +18,58 @@ under the License.
-->
<h1>${uiLabelMap.CommonLogin}</h1>
- <div class="screenlet">
- <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>
- <div>
- <label
for="newcustomer_submit">${uiLabelMap.CommonMayCreateNewAccountHere}:</label>
- <a
href="<@ofbizUrl>newcustomer</@ofbizUrl>">${uiLabelMap.CommonMayCreate}</a>
- </div>
- </fieldset>
- </form>
- </div>
+<div class="screenlet">
+ <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>
+ <div>
+ <label
for="newcustomer_submit">${uiLabelMap.CommonMayCreateNewAccountHere}:</label>
+ <a
href="<@ofbizUrl>newcustomer</@ofbizUrl>">${uiLabelMap.CommonMayCreate}</a>
+ </div>
+ </fieldset>
+ </form>
+</div>
- <div class="screenlet">
- <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 class="screenlet">
+ <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="screenlet">
- <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 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 class="screenlet">
+ <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>
-->
- </div>
- <div class="endcolumns"> </div>
+</div>
+<div class="endcolumns"> </div>
</div>
<script language="JavaScript" type="text/javascript">
Modified:
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=924441&r1=924440&r2=924441&view=diff
==============================================================================
---
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/startanoncheckout.ftl
(original)
+++
ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/order/startanoncheckout.ftl
Wed Mar 17 19:41:57 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>
