Index: branches/1.0.x/inc/cart.css
===================================================================
diff -u -N -r14798 -r14805
--- branches/1.0.x/inc/cart.css	(.../cart.css)	(revision 14798)
+++ branches/1.0.x/inc/cart.css	(.../cart.css)	(revision 14805)
@@ -155,10 +155,10 @@
 	display: inline-block;
 	height: 45px;
 }
-.creditcards span:first-child {
-	border-right: 1px solid #d3d3d3;
-	margin-right: 10px;
-	padding-right: 15px;
+.creditcards span.paypal {
+	border-left: 1px solid #d3d3d3;
+	margin-left: 10px;
+	padding-left: 15px;
 }
 
 .password-block {
Index: branches/1.0.x/inc/profile.css
===================================================================
diff -u -N -r14798 -r14805
--- branches/1.0.x/inc/profile.css	(.../profile.css)	(revision 14798)
+++ branches/1.0.x/inc/profile.css	(.../profile.css)	(revision 14805)
@@ -98,7 +98,7 @@
 }
 
 .password-block {
-	display: none;
+	/*display: none;*/
 	float: left;
 	padding: 5px 0;
 	position: relative;
Index: branches/1.0.x/checkout.tpl
===================================================================
diff -u -N
--- branches/1.0.x/checkout.tpl	(revision 0)
+++ branches/1.0.x/checkout.tpl	(revision 14805)
@@ -0,0 +1,246 @@
+<!--##
+<NAME>One Step Checkout</NAME>
+<DESC></DESC>
+<SECTION>Pages||Checkout</SECTION>
+##-->
+
+<inp2:m_DefineElement name="page_title">One Step Checkout</inp2:m_DefineElement>
+
+<!--## MAIN CONTENT ##-->
+<inp2:m_DefineElement name="content">
+
+	<ul class="steps">
+		<li class="step1"><a href="<inp2:m_Link template='cart'/>"><i></i>Shopping Cart</a></li>
+		<li class="step2 active"><a href="#"><i></i>One-step Checkout</a></li>
+		<li class="step3"><span><i></i>Receipt</span></li>
+	</ul>
+	<div class="clear"></div>
+
+	<div class="cart-detail">
+		<h1>One-Step Checkout</h1>
+		<form method="post" action="<inp2:m_FormAction/>" id="checkout-form" class="form checkout-form">
+
+			<script type="text/javascript">
+				FormManager.resetFields('ord');
+			</script>
+
+			<inp2:ord_ShowDefaultAddress type="billing"/>
+			<inp2:ord_ShowDefaultAddress type="shipping"/>
+
+			<div class="halfcol">
+				<fieldset class="firstline">
+
+					<inp2:m_ifnot check="m_LoggedIn">
+						<div class="login-alt">
+							Continue as Guest or
+							<div class="login">
+								<a href="" id="login-alt">Log In</a>
+							</div>
+						</div>
+					</inp2:m_ifnot>
+
+					<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingEmail" title="lu_fld_YourEmail"/>
+				</fieldset>
+				<fieldset>
+					<div class="fieldset">
+						Billing Address
+					</div>
+
+					<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingTo" title="lu_fld_FullName"/>
+					<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingCompany" title="lu_fld_Company"/>
+					<inp2:m_RenderElement name="inp_edit_address" prefix="ord" field="BillingAddress1" field2="BillingAddress2" title="lu_fld_Address"/>
+					<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingCity" title="lu_fld_City"/>
+					<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="BillingCountry" title="lu_fld_Country" has_empty="1" empty_label="lu_opt_SelectCountry"/>
+
+					<!-- TODO: preload states by country -->
+					<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="BillingState" title="lu_fld_State" has_empty="1" row_class="alt1"/>
+					<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingZip" title="lu_fld_Zip" row_class="alt2"/>
+					<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="BillingPhone" title="lu_fld_Phone"/>
+				</fieldset>
+
+				<fieldset class="creditcard">
+					<div class="fieldset">
+						Payment Information
+					</div>
+					<div class="creditcards">
+						<span><img src="<inp2:m_TemplatesBase/>img/creditcards.jpg" width="245" height="39" alt="" /></span>
+						<span class="paypal"><img src="<inp2:m_TemplatesBase/>img/paypal.jpg" width="98" height="45" alt="" /></span>
+					</div>
+
+					<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentAccount" title="lu_fld_CreditCardNumber"/>
+
+					<inp2:m_RenderElement design="form_row" prefix="ord" field="PaymentCCExpDate" title="lu_fld_ExpirationDate" row_class="alt1 expdate">
+						<select class="field" name="<inp2:ord_InputName field='PaymentCCExpMonth'/>">
+							<inp2:ord_PredefinedOptions field="PaymentCCExpMonth" render_as="inp_option_item" selected="selected"/>
+						</select> /
+						<select class="field" name="<inp2:ord_InputName field='PaymentCCExpYear'/>">
+							<option value=''></option>
+							<inp2:ord_PrintYearOptions field="PaymentCCExpYear" render_as="inp_option_item" selected="selected"/>
+						</select>
+					</inp2:m_RenderElement>
+
+					<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="PaymentCVV2" title="lu_fld_SecurityCode" row_class="alt2"/>
+				</fieldset>
+			</div>
+
+			<div class="halfcol halfcol-last">
+				<inp2:m_ifnot check="m_LoggedIn">
+					<div class="badge-optional"></div>
+
+					<fieldset class="firstline" id="create-account-password">
+						<p>
+							<label><input type="checkbox" id="create_account" name="create_account" value="1"<inp2:m_if check="m_Get" name="create_account"> checked</inp2:m_if>/> Create account for easy purchases and order tracking</label>
+						</p>
+
+						<inp2:m_RenderElement name="inp_edit_password" prefix="ord" field="UserPassword" title="lu_fld_Password" verify_title="lu_fld_VerifyPassword"/>
+					</fieldset>
+				</inp2:m_ifnot>
+
+				<fieldset>
+					<div class="fieldset">
+						<label>
+							<input type="checkbox" id="same_as_billing" name="same_as_billing" value="1"<inp2:m_if check="m_Get" name="same_as_billing"> checked</inp2:m_if>/> Ship To Address is the same as Billing
+						</label>
+					</div>
+
+					<div id="shipping-address"<inp2:m_if check="m_Get" name="same_as_billing"> style="display: none;"</inp2:m_if>>
+						<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingTo" title="lu_fld_FullName"/>
+						<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCompany" title="lu_fld_Company"/>
+						<inp2:m_RenderElement name="inp_edit_address" prefix="ord" field="ShippingAddress1" field2="ShippingAddress2" title="lu_fld_Address"/>
+						<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingCity" title="lu_fld_City"/>
+						<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="ShippingCountry" title="lu_fld_Country" has_empty="1" empty_label="lu_opt_SelectCountry"/>
+
+						<!-- TODO: preload states by country -->
+						<inp2:m_RenderElement name="inp_edit_options" prefix="ord" field="ShippingState" title="lu_fld_State" has_empty="1" row_class="alt1"/>
+						<inp2:m_RenderElement name="inp_edit_box" prefix="ord" field="ShippingZip" title="lu_fld_Zip" row_class="alt2"/>
+					</div>
+
+					<p>
+						<label for="ship">How would you like the items shipped? <span class="star">*</span></label>
+						<select id="ship" class="field">
+							<option value="" selected="selected">FedEx Ground (Next Day) $14.00</option>
+							<option value="">USA</option>
+							<option value="">Russia</option>
+						</select>
+					</p>
+
+					<div class="safe-shop" id="shipping-address-placeholder"<inp2:m_ifnot check="m_Get" name="same_as_billing"> style="display: none;"</inp2:m_ifnot>>
+						<p class="title">100% Safe & Secure Shopping</p>
+						<ul class="list">
+							<li>All Transactions are Encrypted</li>
+							<li>Your Information is Protected</li>
+							<li>No Hidden Charges</li>
+							<li>Satisfaction Guaranteed</li>
+						</ul>
+					</div>
+				</fieldset>
+				<fieldset>
+					<div class="fieldset">
+						Your Order Summary (18 Items)
+						<a href="#" class="link">View Order Details</a>
+					</div>
+					<dl class="total">
+						<dt>Subtotal</dt>
+						<dd>$1,759.99</dd>
+						<dt class="discount">Discount:</dt>
+						<dd class="price2">- $10.00</dd>
+						<dt>Shipping</dt>
+						<dd class="price3">$100.00</dd>
+						<dt>Tax</dt>
+						<dd class="price3">$100.00</dd>
+						<dt>Order Total</dt>
+						<dd class="price4">$1,959.99</dd>
+					</dl>
+					<div class="clear"></div>
+					<div class="terms">
+						<label><input type="checkbox" id="terms" name="terms" value="yes" checked="true" />&nbsp;I Agree to Terms and Conditions</label>
+					</div>
+					<p class="buttons">
+						<a href="#" class="place-button"><span>Place Order</span></a>
+					</p>
+				</fieldset>
+			</div>
+			<div class="clear"></div>
+
+			<input type="hidden" name="check_billing_address" id="check_billing_address" value="true"/>
+			<input type="hidden" name="check_shipping_address" id="check_shipping_address" value="true"/>
+			<input type="hidden" name="check_credit_card" id="check_credit_card" value="true"/>
+		</form>
+	</div>
+
+	<script type="text/javascript">
+		$(document).ready(
+			function () {
+				$('#same_as_billing').click(
+					function ($e) {
+						var $checked = $(this).is(':checked');
+
+						$('#shipping-address').toggle(!$checked);
+						$('#shipping-address-placeholder').toggle($checked);
+					}
+				);
+
+				$('#create_account').click(
+					function ($e) {
+						$('.password-block').toggle( $(this).is(':checked') );
+					}
+				);
+
+				FormManager.registerForm(
+					{
+						prefix: 'ord',
+						save_event: 'OnCombinedPlaceOrder',
+						id: '<inp2:ord_Field name="OrderId"/>',
+						form_id: 'checkout-form'
+					}
+				);
+
+				$('.place-button').click(
+					function ($e) {
+						FormManager.submitForm('ord');
+
+						return false;
+					}
+				);
+
+				$('#checkout-form').submit(
+					function ($e) {
+						FormManager.submitForm('ord');
+
+						return false;
+					}
+				);
+
+				$('#login-alt').click(
+					function ($e) {
+						var $login_link = $('#login');
+
+						if ( !$login_link.parents('.login:first').hasClass('plashka-sel') ) {
+							$login_link.click();
+						}
+
+						return false;
+					}
+				);
+
+				$('body').bind(
+					'OnAfterLogin',
+					function ($e, $params) {
+						$('.login-alt').remove();
+						$('#create-account-password, .badge-optional').remove();
+
+						FormManager.setFieldStatus('ord', 'BillingEmail');
+						FormManager.getField('ord', 'BillingEmail').value = $params['user_email'];
+					}
+				)
+			}
+		);
+
+		$('.password-block').toggle( $('#create_account').is(':checked') );
+	</script>
+</inp2:m_DefineElement>
+<!--## /MAIN CONTENT ##-->
+
+<!--## DESIGN TEMPLATE ##-->
+<inp2:m_include template="designs/default_design.des" pass_params="1"/>
+<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Index: branches/1.0.x/elements/header.elm.tpl
===================================================================
diff -u -N -r14801 -r14805
--- branches/1.0.x/elements/header.elm.tpl	(.../header.elm.tpl)	(revision 14801)
+++ branches/1.0.x/elements/header.elm.tpl	(.../header.elm.tpl)	(revision 14805)
@@ -1,14 +1,20 @@
-<div id="header">
+<inp2:m_if check="m_Get" name="ajax" equals_to="yes">
+	<inp2:m_NoDebug/>
+	<inp2:m_Set skip_last_template="1"/>
+<inp2:m_else/>
+	<div id="header">
+</inp2:m_if>
+
 	<div class="logo">
-		<a href="<inp2:m_Link template="index" m_cat_id="0" />"><img src="<inp2:m_TemplatesBase/>img/logo.jpg" width="238" height="79" alt="<inp2:m_GetConfig name="Site_Name"/>" /></a>
+		<a href="<inp2:m_Link template='index' m_cat_id='0' />"><img src="<inp2:m_TemplatesBase/>img/logo.jpg" width="238" height="79" alt="<inp2:m_GetConfig name='Site_Name'/>" /></a>
 		<inp2:st_ContentBlock num="100" page="index"/>
 	</div>
 	<div class="infoblock">
 		<div class="welcome">
 
 			<div class="lang">
 				<div <inp2:m_if check="lang.current_Field" name="IconURL">class="with-icon" style="background-image: url(<inp2:m_TemplatesBase/>img/lang/<inp2:lang.current_Field name='IconURL'/>);"<inp2:m_else/>class="without-icon"</inp2:m_if>>
-					<a href="#" id="lang"><inp2:lang.current_Field name='LocalName'/></a>
+					<a href="<inp2:lang.current_LanguageLink/>"" id="lang"><inp2:lang.current_Field name='LocalName'/></a>
 				</div>
 
 				<div id="lang-sel" class="plashka">
@@ -70,4 +76,11 @@
 
 	</div>
 	<div class="clear"></div>
-</div>
+
+<inp2:m_ifnot check="m_Get" name="ajax" equals_to="yes">
+	</div>
+</inp2:m_ifnot>
+
+<script type="text/javascript">
+	new DBlocks();
+</script>
\ No newline at end of file
Index: branches/1.0.x/inc/js/jquery.scripts.js
===================================================================
diff -u -N -r14798 -r14805
--- branches/1.0.x/inc/js/jquery.scripts.js	(.../jquery.scripts.js)	(revision 14798)
+++ branches/1.0.x/inc/js/jquery.scripts.js	(.../jquery.scripts.js)	(revision 14805)
@@ -48,7 +48,7 @@
 /* === DBlocks class === */
 function DBlocks() {
 	var $me = this;
-	this.selectors = ['#lang', '#currency', '#login', '#login-alt', '#profile'];
+	this.selectors = ['#lang', '#currency', '#login', /*'#login-alt',*/ '#profile'];
 
 	$(document).ready(
 		function () {
@@ -60,7 +60,7 @@
 DBlocks.prototype.init = function () {
 	var $manager = this;
 
-	$( this.selectors.join(', ') ).click(
+	$( this.selectors.join(', ') ).unbind('click').click(
 		function($e, $now) {
 			var $me = $(this),
 				$parent = $me.parent();
@@ -88,8 +88,8 @@
 
 	$('.icon-close').click(
 		function() {
-			$('#login,#login-alt').parent().removeClass('plashka-sel');
-			$('#login-sel, #login-alt-sel').fadeOut();
+			$('#login').parent().removeClass('plashka-sel'); // ,#login-alt
+			$('#login-sel').fadeOut(); // , #login-alt-sel
 
 			return false;
 		}
@@ -185,6 +185,4 @@
 			return false;
 		}
 	);
-});
-
-new DBlocks();
\ No newline at end of file
+});
\ No newline at end of file
Index: branches/1.0.x/elements/login.elm.tpl
===================================================================
diff -u -N -r14794 -r14805
--- branches/1.0.x/elements/login.elm.tpl	(.../login.elm.tpl)	(revision 14794)
+++ branches/1.0.x/elements/login.elm.tpl	(.../login.elm.tpl)	(revision 14805)
@@ -66,7 +66,11 @@
 								save_event: 'OnLoginAjax',
 								id: '<inp2:u.login-sidebox_Field name="PortalUserId"/>',
 								form_id: 'login-form',
-								immediate_validation: false
+								immediate_validation: false,
+								before_close: function ($data, $add_params) {
+									$('#header').load('<inp2:m_Link render_template="elements/header.elm" pass="all" no_amp="1" js_escape="1"/>');
+									$('body').trigger('OnAfterLogin', [$data]);
+								}
 							}
 						);
 
Index: branches/1.0.x/elements/ajax/register.tpl
===================================================================
diff -u -N -r14794 -r14805
--- branches/1.0.x/elements/ajax/register.tpl	(.../register.tpl)	(revision 14794)
+++ branches/1.0.x/elements/ajax/register.tpl	(.../register.tpl)	(revision 14805)
@@ -26,12 +26,13 @@
 
 		<div class="halfcol halfcol-last">
 			<inp2:m_RenderElement name="inp_edit_address" prefix="u.register" field="Street" field2="Street2" title="lu_fld_Address"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="City"/>
 			<inp2:m_RenderElement name="inp_edit_options" prefix="u.register" field="Country" has_empty="1" empty_label="lu_opt_SelectCountry"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="u.register" field="State" has_empty="1"/>
 
 			<!-- TODO: preload states by country -->
-
+			<inp2:m_RenderElement name="inp_edit_options" prefix="u.register" field="State" has_empty="1"/>
 			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Zip" row_class="alt2"/>
+
 			<inp2:m_RenderElement name="inp_edit_box" prefix="u.register" field="Phone"/>
 		</div>
 		<div class="clear"></div>
Index: branches/1.0.x/inc/js/form_manager.js
===================================================================
diff -u -N -r14763 -r14805
--- branches/1.0.x/inc/js/form_manager.js	(.../form_manager.js)	(revision 14763)
+++ branches/1.0.x/inc/js/form_manager.js	(.../form_manager.js)	(revision 14805)
@@ -262,9 +262,15 @@
 	return false;
 }
 
+FormManager.getCell = function ($prefix, $field_name, $cell_type) {
+	$field_name = $field_name.replace(/_(date|time)$/, '');
+
+	return this.getField($prefix, $field_name, undefined, '_' + $cell_type + '_cell');
+}
+
 FormManager.setFieldStatus = function ($prefix, $field_name, $error_msg) {
-	var field_cell = this.getField($prefix, $field_name, undefined, '_field_cell');
-	var status_cell = this.getField($prefix, $field_name, undefined, '_status_cell');
+	var field_cell = this.getCell($prefix, $field_name, 'field');
+	var status_cell = this.getCell($prefix, $field_name, 'status');
 
 	if (!field_cell) {
 		alert('Error field "' + $field_name + '" missing.');
@@ -331,7 +337,7 @@
 			$data = eval('(' + $data + ')');
 			$me.setFieldStatus($prefix, $field, $data.status == 'OK' ? undefined : $data.status);
 
-			$("input[type='submit']").attr('disabled', !$.isArray($data.other_errors) );
+			$("input[type='submit']", form).attr('disabled', !$.isArray($data.other_errors) );
 		}
 	);
 
Index: branches/1.0.x/elements/forms.elm.tpl
===================================================================
diff -u -N -r14770 -r14805
--- branches/1.0.x/elements/forms.elm.tpl	(.../forms.elm.tpl)	(revision 14770)
+++ branches/1.0.x/elements/forms.elm.tpl	(.../forms.elm.tpl)	(revision 14805)
@@ -150,7 +150,7 @@
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_password" title="lu_fld_{$field}" style="" field_type="text" no_editing="1">
+<inp2:m_DefineElement name="inp_edit_password" title="lu_fld_{$field}" verify_title="lu_fld_Verify{$field}" style="" field_type="text" no_editing="1">
 	<inp2:m_ifnot check="m_Get" name="password_js_included">
 		<script src="<inp2:m_Compress files='inc/js/passwordStrengthMeter.js'/>" type="text/javascript"></script>
 		<inp2:m_Set password_js_included="1"/>
@@ -172,7 +172,7 @@
 			/>
 		</inp2:m_RenderElement>
 
-		<inp2:m_RenderElement design="form_row" row_class="pasfield2" field="Verify{$field}" title="lu_fld_Verify{$field}" error_position="none" pass_params="1">
+		<inp2:m_RenderElement design="form_row" row_class="pasfield2" field="Verify{$field}" title="$verify_title" error_position="none" pass_params="1">
 			<input
 				type="password"
 				class="field"