Index: branches/1.0.x/img/bullet-level5.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/zoom/slider.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/inc/profile.css
===================================================================
diff -u -N -r14600 -r14708
--- branches/1.0.x/inc/profile.css	(.../profile.css)	(revision 14600)
+++ branches/1.0.x/inc/profile.css	(.../profile.css)	(revision 14708)
@@ -64,11 +64,11 @@
 .profile-form .field { width: 270px; }
 .profile-form .alt2 .field { width: 150px; }
 .field.statusSuccess {
-	background: url(/i/bg-field-success.jpg) repeat-x 0 0;
+	background: url(@templates_base@/img/bg-field-success.jpg) repeat-x 0 0;
 	border: 1px solid #80d04d;
 }
 .field.statusError {
-	background: url(/i/bg-field-error.jpg) repeat-x 0 0;
+	background: url(@templates_base@/img/bg-field-error.jpg) repeat-x 0 0;
 	border: 1px solid #d80000;
 }
 
Index: branches/1.0.x/img/icon-print.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/lang/deutch.gif
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/inc/modal.css
===================================================================
diff -u -N -r14600 -r14708
--- branches/1.0.x/inc/modal.css	(.../modal.css)	(revision 14600)
+++ branches/1.0.x/inc/modal.css	(.../modal.css)	(revision 14708)
@@ -1,7 +1,7 @@
 @charset "UTF-8";
 
 .tbox {position:absolute; display:none; padding:14px 17px; z-index:900}
-.tinner {padding:15px; -moz-border-radius:3px; border-radius:3px; background:#fff url(/i/modal/preload.gif) no-repeat 50% 50%; border:1px solid #404040;}
+.tinner {padding:15px; -moz-border-radius:3px; border-radius:3px; background:#fff url(@templates_base@/img/modal/preload.gif) no-repeat 50% 50%; border:1px solid #404040;}
 .tmask {position:absolute; display:none; top:0px; left:0px; height:100%; width:100%; background:#000; z-index:800}
-.tclose {position:absolute; top:45px; right:50px; width:100px; height:15px; cursor:pointer; background:url(/i/modal/close.png) no-repeat 100% 0; color: #5a5a5a; font: bold 11px Arial; text-align: right; padding-right: 20px;}
+.tclose {position:absolute; top:45px; right:50px; width:100px; height:15px; cursor:pointer; background:url(@templates_base@/img/modal/close.png) no-repeat 100% 0; color: #5a5a5a; font: bold 11px Arial; text-align: right; padding-right: 20px;}
 .tcontent {border: 9px solid #e6e6e6; padding: 40px 50px;}
\ No newline at end of file
Index: branches/1.0.x/img/zoom/zoom-plus.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/button-addtocart-left.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/icon-addreview.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/safe-shop.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/bg-vertslider-full.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/zoom/zoom-minus.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/bg-field-error.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/icon-cart.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/bg-button-cart-add.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/button-addtocart-right.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/inc/details.css
===================================================================
diff -u -N -r14600 -r14708
--- branches/1.0.x/inc/details.css	(.../details.css)	(revision 14600)
+++ branches/1.0.x/inc/details.css	(.../details.css)	(revision 14708)
@@ -8,15 +8,15 @@
 }
 
 .block h2 a.product-prev {
-	background: url(/i/product-nav.png) no-repeat 0 0;
+	background: url(@templates_base@/img/product-nav.png) no-repeat 0 0;
 	height: 21px;
 	position: absolute;
 	right: 40px;
 	top: 9px;
 	width: 21px;
 }
 .block h2 a.product-next {
-	background: url(/i/product-nav.png) no-repeat 100% 0;
+	background: url(@templates_base@/img/product-nav.png) no-repeat 100% 0;
 	height: 21px;
 	position: absolute;
 	right: 15px;
@@ -28,7 +28,7 @@
 
 .product-detail { position: relative; }
 .product-detail .ribbon {
-	background: url(/i/ribbon-big.png) no-repeat 0 0;
+	background: url(@templates_base@/img/ribbon-big.png) no-repeat 0 0;
 	height: 53px;
 	position: absolute;
 	top: -3px; right: -7px;
@@ -69,7 +69,7 @@
 	width: 260px;
 }
 .product .viewlarger a {
-	background: url(/i/icon-zoom-small.png) no-repeat 0 2px;
+	background: url(@templates_base@/img/icon-zoom-small.png) no-repeat 0 2px;
 	padding: 0 0 0 20px;
 }
 .product .info .img .signsmall {
@@ -87,29 +87,29 @@
 }
 
 .product .info .doplinks {
-	background: url(/i/bg-doplinks.jpg) no-repeat 0 0;
+	background: url(@templates_base@/img/bg-doplinks.jpg) no-repeat 0 0;
 	float: left;
 	height: 152px;
 	margin-top: 220px;
 	padding: 40px 0 0 25px;
 	width: 225px;
 }
 .product .doplinks a.link-print {
-	background: url(/i/icon-print.jpg) no-repeat 0 0;
+	background: url(@templates_base@/img/icon-print.jpg) no-repeat 0 0;
 	display: inline-block;
 	height: 32px;
 	line-height: 32px;
 	padding: 0 20px 13px 40px;
 }
 .product .doplinks a.link-compare {
-	background: url(/i/icon-compare.png) no-repeat 3px 5px;
+	background: url(@templates_base@/img/icon-compare.png) no-repeat 3px 5px;
 	display: inline-block;
 	height: 32px;
 	line-height: 32px;
 	padding: 0 20px 10px 40px;
 }
 .product .doplinks a.link-wishlist {
-	background: url(/i/icon-wishlist.jpg) no-repeat 0 0;
+	background: url(@templates_base@/img/icon-wishlist.jpg) no-repeat 0 0;
 	display: inline-block;
 	height: 32px;
 	line-height: 32px;
@@ -185,7 +185,7 @@
 	float: right;
 }
 .product .description .order-block .addtocart {
-	background: url(/i/addtocart-left.jpg) no-repeat 0 0;
+	background: url(@templates_base@/img/addtocart-left.jpg) no-repeat 0 0;
 	color: #faffed;
 	display: inline-block;
 	font-size: 1.077em;
@@ -194,12 +194,12 @@
 	text-decoration: none;
 }
 .product .description .order-block .addtocart span {
-	background: url(/i/addtocart-right.jpg) no-repeat 100% 0;
+	background: url(@templates_base@/img/addtocart-right.jpg) no-repeat 100% 0;
 	display: inline-block;
 	padding: 0 20px 0 10px;
 }
 .product .description .order-block .addtocart span i {
-	background: url(/i/bg-button-cart-add.png) no-repeat 0 3px;
+	background: url(@templates_base@/img/bg-button-cart-add.png) no-repeat 0 3px;
 	line-height: 33px;
 	padding: 7px 0 7px 30px;
 }
@@ -217,7 +217,7 @@
 	border: 1px solid #949494;
 }
 .ui-tabs .ui-tabs-nav li.ui-tabs-selected {
-	background: #fff url(/i/bg-tab.png) repeat-x 0 0;
+	background: #fff url(@templates_base@/img/bg-tab.png) repeat-x 0 0;
 	border-bottom: none;
 	position: relative;
 	z-index: 100;
@@ -253,7 +253,7 @@
 	padding: 20px 0 0;
 }
 .reviews .info-review .addreview {
-	background: url(/i/icon-addreview.jpg) no-repeat 0 0;
+	background: url(@templates_base@/img/icon-addreview.jpg) no-repeat 0 0;
 	display: block;
 	height: 22px;
 	line-height: 22px;
@@ -311,7 +311,7 @@
 .pagination { padding: 20px 0 10px; text-align: center; }
 .pagination span,
 .pagination a {
-	background: url(/i/paginate.png) no-repeat -28px 0;
+	background: url(@templates_base@/img/paginate.png) no-repeat -28px 0;
 	color: #fff;
 	display: inline-block;
 	font-size: 1.308em;
Index: branches/1.0.x/elements/promo.elm.tpl
===================================================================
diff -u -N
--- branches/1.0.x/elements/promo.elm.tpl	(revision 0)
+++ branches/1.0.x/elements/promo.elm.tpl	(revision 14708)
@@ -0,0 +1,15 @@
+<div id="slider">
+	<ul class="slides">
+		<li>
+			<img src="<inp2:m_TemplatesBase />img/samples/slider.jpg" />
+		</li>
+		<li>
+			<img src="<inp2:m_TemplatesBase />img/samples/slider.jpg" />
+		</li>
+		
+		<!--##							
+		<inp2:promo-block.home_PrintList render_as="promo_item"/>
+		##-->
+	</ul>					
+</div>
+<div class="clear"></div>
\ No newline at end of file
Index: branches/1.0.x/img/paypal.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/buttons-slider.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/payment.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/point-subcategory.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/li-blinks.gif
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/elements/side_boxes/categories.elm.tpl
===================================================================
diff -u -N
--- branches/1.0.x/elements/side_boxes/categories.elm.tpl	(revision 0)
+++ branches/1.0.x/elements/side_boxes/categories.elm.tpl	(revision 14708)
@@ -0,0 +1,30 @@
+<inp2:m_Capture to_var="header">
+	<em><inp2:m_Phrase label="lu_title_Categories"/></em><span></span>
+</inp2:m_Capture>
+
+<inp2:m_DefineElement name="more_link_elem">
+	<li>
+		<a href="<inp2:c_CategoryLink template='__default__' m_cat_page='1'/>"><inp2:m_Phrase label="lu_more_Products"/>...</a>
+	</li>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="subcategory_elem">
+	<li>
+		<a href="<inp2:CategoryLink template="__default__" m_cat_page="1"/>" class="<inp2:m_if check='IsCurrent'>active</inp2:m_if>"><inp2:Field name="Name" html_escape="1"/></a>
+	</li>	
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="category_elem">
+	<h3><a href="<inp2:CategoryLink template="__default__" m_cat_page="1"/>"><inp2:Field name="Name" html_escape="1"/></a></h3>
+	<div>
+		<ul>
+			<inp2:ListCategories requery="1" render_as="subcategory_elem" more_link_render_as="more_link_elem" max_items="20" no_table="1"/>
+		</ul>
+	</div>
+</inp2:m_DefineElement>
+
+<inp2:m_Cache key="prefix:c;skip_var:t,page,per_page,sort_by">
+	<div id="accordion-menu">
+		<inp2:c_ListCategories render_as="category_elem" sort_by="Priority,Desc" per_page="-1" no_table="1" parent_cat_id="Root" module="In-Commerce"/>
+	</div>
+</inp2:m_Cache>
\ No newline at end of file
Index: branches/1.0.x/inc/review.css
===================================================================
diff -u -N -r14600 -r14708
--- branches/1.0.x/inc/review.css	(.../review.css)	(revision 14600)
+++ branches/1.0.x/inc/review.css	(.../review.css)	(revision 14708)
@@ -36,11 +36,11 @@
 .profile-form p.buttons { padding: 0 0 0 90px; width: 380px; }
 .profile-form p.buttons em { float: right; text-align: right; width: 170px; }
 .field.statusSuccess {
-	background: url(/i/bg-field-success.jpg) repeat-x 0 0;
+	background: url(@templates_base@/img/bg-field-success.jpg) repeat-x 0 0;
 	border: 1px solid #80d04d;
 }
 .field.statusError {
-	background: url(/i/bg-field-error.jpg) repeat-x 0 0;
+	background: url(@templates_base@/img/bg-field-error.jpg) repeat-x 0 0;
 	border: 1px solid #d80000;
 }
 
Index: branches/1.0.x/img/paginate.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/inc/validationEngine.jquery.css
===================================================================
diff -u -N -r14600 -r14708
--- branches/1.0.x/inc/validationEngine.jquery.css	(.../validationEngine.jquery.css)	(revision 14600)
+++ branches/1.0.x/inc/validationEngine.jquery.css	(.../validationEngine.jquery.css)	(revision 14708)
@@ -21,7 +21,7 @@
 
 .formError .formErrorContent {
 	width: 100%;
-	background: #990000 url(/i/validate/con-error.png) repeat-x 0 0;
+	background: #990000 url(@templates_base@/img/validate/con-error.png) repeat-x 0 0;
 	position:relative;
 	z-index:5001;
 	color: #fff;
@@ -47,7 +47,7 @@
 }
 
 .formError .formErrorArrow {
-	background: url(/i/validate/con-arrow.png) no-repeat 0 0;
+	background: url(@templates_base@/img/validate/con-arrow.png) no-repeat 0 0;
 	height: 17px;
 	margin: -21px 0 0 -8px;
 	position: relative;
Index: branches/1.0.x/elements/new_products.elm.tpl
===================================================================
diff -u -N
--- branches/1.0.x/elements/new_products.elm.tpl	(revision 0)
+++ branches/1.0.x/elements/new_products.elm.tpl	(revision 14708)
@@ -0,0 +1,44 @@
+<div class="block no-border-bottom">
+				<h2><em>New Arrivals</em><span class="new"></span></h2>
+				<div class="good-item good-item-narrow good-item-float border-radius">
+					<dl>
+						<dt><a href="#">Nikon D5000 Digital Camera</a></dt>
+						<dd>
+							<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good1.jpg" width="136" height="136" alt="" /></a></p>
+							<p class="price">$2,549.<span>95</span></p>
+							<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
+						</dd>
+					</dl>
+				</div>
+				<div class="good-item good-item-narrow good-item-float border-radius">
+					<dl>
+						<dt><a href="#">Motorola Backflip Silver Smartphone</a></dt>
+						<dd>
+							<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good2.jpg" width="133" height="133" alt="" /></a></p>
+							<p class="price">$549.<span>95</span></p>
+							<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
+						</dd>
+					</dl>
+				</div>
+				<div class="good-item good-item-narrow good-item-float border-radius">
+					<dl>
+						<dt><a href="#">Apple iMac Desktop Customizable</a></dt>
+						<dd>
+							<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good3.jpg" width="135" height="124" alt="" /></a></p>
+							<p class="price">$999.<span>95</span></p>
+							<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
+						</dd>
+					</dl>
+				</div>
+				<div class="good-item good-item-narrow good-item-narrow-last good-item-float border-radius">
+					<dl>
+						<dt><a href="#">Apple IPod Classic 160GB White</a></dt>
+						<dd>
+							<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good4.jpg" width="77" height="134" alt="" /></a></p>
+							<p class="price">$1,749.<span>95</span></p>
+							<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
+						</dd>
+					</dl>
+				</div>
+				<div class="clear"></div>
+			</div>
\ No newline at end of file
Index: branches/1.0.x/img/bg-button-left.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/bg-button-right.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/icon-linkedin.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/bullet-menu.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/delimiter-special.gif
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/validate/con-arrow.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/h1-right-bullet.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/inc/jquery.gzoom.css
===================================================================
diff -u -N -r14600 -r14708
--- branches/1.0.x/inc/jquery.gzoom.css	(.../jquery.gzoom.css)	(revision 14600)
+++ branches/1.0.x/inc/jquery.gzoom.css	(.../jquery.gzoom.css)	(revision 14708)
@@ -37,12 +37,12 @@
   margin-top: 25px;
 }
 .gzoomSlider {
-  background: url(/i/zoom/bg-line.png) repeat-x 0 6px;
+  background: url(@templates_base@/img/zoom/bg-line.png) repeat-x 0 6px;
   float:left;
   margin: 25px 9px 0 5px;
 }
 .gzoomSlider a {
-  background: url(/i/zoom/slider.png) no-repeat 0 0;
+  background: url(@templates_base@/img/zoom/slider.png) no-repeat 0 0;
   height: 15px;
   width: 9px;
 }
@@ -52,12 +52,12 @@
 }
 
 .ui-icon-circle-minus {
-	background: url(/i/zoom/zoom-minus.png) no-repeat 0 0;
+	background: url(@templates_base@/img/zoom/zoom-minus.png) no-repeat 0 0;
 	height: 14px;
 	width: 14px;
 }
 .ui-icon-circle-plus {
-	background: url(/i/zoom/zoom-plus.png) no-repeat 0 0;
+	background: url(@templates_base@/img/zoom/zoom-plus.png) no-repeat 0 0;
 	height: 14px;
 	width: 14px;
 }
Index: branches/1.0.x/elements/side_boxes/picks.elm.tpl
===================================================================
diff -u -N
--- branches/1.0.x/elements/side_boxes/picks.elm.tpl	(revision 0)
+++ branches/1.0.x/elements/side_boxes/picks.elm.tpl	(revision 14708)
@@ -0,0 +1,18 @@
+<inp2:p_InitList list_name="pick_products" types="pick" parent_cat_id="0" recursive="1" per_page="short_list"/>
+
+<inp2:m_Capture to_var="header"><em>Our Favorites</em><span class="pick"></span></inp2:m_Capture>
+
+<inp2:m_DefineElement name="pick_product_element">
+	<dt><a href="<inp2:ProductLink template='__default__'/>"><inp2:Field field="Name" /></a></dt>
+	<dd>
+		<p class="img"><a href="<inp2:ProductLink template='__default__'/>"><inp2:Image render_as="image_element" Primary="1" Thumbnail="1" DefaultImage="img/no_picture.gif" MaxWidth="136" MaxHeight="136"/></a></p>
+		<p class="price"><inp2:Field name="Price" currency="selected"/>$759.<span>95</span></p>
+		<p><a href="<inp2:AddToCartLink template="checkout/shop_cart" product_template="__default__"/>" class="addtocart"><span>Add to Cart</span></a></p>
+	</dd>
+</inp2:m_DefineElement>
+
+<div class="good-item border-radius-bottom">
+	<dl>
+		<inp2:p_ListProducts list_name="pick_products" render_as="pick_product_element" no_table="1"/>
+	</dl>
+</div>
\ No newline at end of file
Index: branches/1.0.x/img/lang/rus.gif
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/arrow-right.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/bc-step.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/badge-optional.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/arrow-left.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/inc/compare.css
===================================================================
diff -u -N -r14600 -r14708
--- branches/1.0.x/inc/compare.css	(.../compare.css)	(revision 14600)
+++ branches/1.0.x/inc/compare.css	(.../compare.css)	(revision 14708)
@@ -25,15 +25,15 @@
 
 .buttons-block { padding-top: 120px; text-align: center; }
 .compare-button {
-	background: url(/i/bg-button-compare-left.jpg) no-repeat 0 0;
+	background: url(@templates_base@/img/bg-button-compare-left.jpg) no-repeat 0 0;
 	color: #323232;
 	display: inline-block;
 	font-size: 1.385em;
 	font-weight: bold;
 	text-decoration: none;
 }
 .compare-button span {
-	background: url(/i/bg-button-compare-right.jpg) no-repeat 100% 0;
+	background: url(@templates_base@/img/bg-button-compare-right.jpg) no-repeat 100% 0;
 	display: inline-block;
 	height: 60px;
 	padding: 10px 20px;
@@ -42,7 +42,7 @@
 
 /*** Compare accordion ***/
 #compare-menu h3 {
-	background: #fff url(/i/bg-form-fieldset.jpg) repeat-x 0 0;
+	background: #fff url(@templates_base@/img/bg-form-fieldset.jpg) repeat-x 0 0;
 	color: #5b5b5b;
 	cursor: pointer;
 	font-weight: bold;
@@ -54,12 +54,12 @@
 #compare-menu a { color: #5b5b5b; padding-left: 20px; text-decoration: none; }
 #compare-menu h3.active a { color: #fff; }
 #compare-menu .ui-icon-circle-arrow-e {
-	background: url(/i/bullet-menu.png) no-repeat 0 -22px;
+	background: url(@templates_base@/img/bullet-menu.png) no-repeat 0 -22px;
 	height: 6px;
 	width: 10px;
 }
 #compare-menu .ui-icon-circle-arrow-s {
-	background: url(/i/bullet-menu.png) no-repeat 0 -6px;
+	background: url(@templates_base@/img/bullet-menu.png) no-repeat 0 -6px;
 	height: 6px;
 	width: 10px;
 }
Index: branches/1.0.x/img/icon-zoom-small.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/h1-right.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/icon-select.gif
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/elements/footer_menu.elm.tpl
===================================================================
diff -u -N
--- branches/1.0.x/elements/footer_menu.elm.tpl	(revision 0)
+++ branches/1.0.x/elements/footer_menu.elm.tpl	(revision 14708)
@@ -0,0 +1,13 @@
+<inp2:m_DefineElement name="menu_element" no_editing="1">
+<li class="<inp2:m_if check="m_Param" name="active">active</inp2:m_if>">
+	<a href="<inp2:m_Link template='$template' m_cat_id='$cat_id' use_section='$use_section' m_cat_page='1'/>" title="<inp2:m_Param name="title"/>"><span><span><inp2:m_Param name="title"/></span></span></a>
+</li>
+</inp2:m_DefineElement>
+
+<div class="menu">
+	<div class="padding">
+		<ul>
+			<inp2:st_CachedMenu render_as="menu_element" category_id="1"/>
+		</ul>	
+	</div>
+</div><!-- .menu -->
\ No newline at end of file
Index: branches/1.0.x/img/order-left.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/bg-button-continue-right.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/elements/header.elm.tpl
===================================================================
diff -u -N -r14600 -r14708
--- branches/1.0.x/elements/header.elm.tpl	(.../header.elm.tpl)	(revision 14600)
+++ branches/1.0.x/elements/header.elm.tpl	(.../header.elm.tpl)	(revision 14708)
@@ -1,32 +1,66 @@
-<!--##
-<inp2:m_DefineElement name="lang_elem" no_editing="1">
-	<inp2:m_if check="SelectedLanguage">
-		<span><inp2:Field name="LocalName"/></span>
-	<inp2:m_else/>
-		<a href="<inp2:LanguageLink/>"><inp2:Field name="LocalName"/></a>
-	</inp2:m_if>
-	<inp2:m_ifnot check="m_Param" name="is_last"> | </inp2:m_ifnot>
-</inp2:m_DefineElement>
+<div id="header">
+	<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>
+		<inp2:st_ContentBlock num="100" page="index"/>
+	</div>
+	<div class="infoblock">
+		<div class="welcome">
+			<div class="lang">
+				<div class="<inp2:lang.current_Field name='Locale' db='1'/>">
+					<a href="#" id="lang"><inp2:lang.current_Field name='LocalName'/></a>
+				</div>
+				<div id="lang-sel" class="plashka">
+					<ul>
+					<inp2:m_DefineElement name="lang_elem" no_editing="1">
+						<li><a href="<inp2:LanguageLink/>" class="<inp2:Field name='Locale' db='1'/><inp2:m_if check='SelectedLanguage'> active</inp2:m_if>"><inp2:Field name="LocalName"/></a></li>
+					</inp2:m_DefineElement>
+					<inp2:lang_ListLanguages render_as="lang_elem" no_table="1"/>
+					</ul>
+				</div>
+			</div>
+			<div class="currency">
+				<form method="post" name="cur_form"  id="cur_form" action="<inp2:m_FormAction />">
+				<div class="cur">
+					<a href="" id="currency">USD</a>
+				</div>
+				<div id="currency-sel" class="plashka">
+					<ul>
+						<li><a href="#" class="active">USD</a></li>
+						<li><a href="#" class="">DCH</a></li>
+						<li><a href="#" class="">RUS</a></li>
+					</ul>
+				</div>
+				</form>
+			</div>
 
-<inp2:lang_ListLanguages render_as="lang_elem" no_table="1"/>
-##-->
-
-<div class="wrapper">
-	<h1><a href="<inp2:m_Link template="index" m_cat_id="0" />" id="logo" title="<inp2:m_GetConfig name="Site_Name"/>"><inp2:m_GetConfig name="Site_Name"/></a></h1>
-	<form id="search" action="<inp2:m_Link template='search' use_section='1'/>" method="get">
-		<div class="bg">
-			<input type="submit" class="submit" value="">
-			<input type="text" class="input" name="keywords" value="">
-			<inp2:m_GetFormHiddens template="search" />
+			<div class="txt">Welcome! Please <a href="" onclick="TINY.box.show({iframe:'registration.html',width:850,height:570}); return false;">Register</a> for an account or
+				<div class="login">
+					<a href="" id="login">Log In</a>
+				</div>
+				<div id="login-sel" class="plashka">
+					<a href="" class="icon-close"><img src="<inp2:m_TemplatesBase />img/icon-close.gif" width="6" height="6" alt="Close" /></a>
+					<form method="post" action="#" id="login-form" class="form login-form">
+						<fieldset>
+							<p><label for="email">E-mail:</label><input type="text" id="email" name="email" value="" class="field" /></p>
+							<p><label for="password">Password:</label><input type="text" id="password" name="password" value="" class="field" /></p>
+							<p><label><input type="checkbox" id="remember" name="remember" value="1" /> <u>Remember me on this computer</u></label></p>
+							<p class="buttons">
+								<input type="submit" value="Sign in" id="signin" class="green-button" />&nbsp;&nbsp;&nbsp;
+								<a href="#" style="font-weight: normal;">Forgot password?</a>
+							</p>
+						</fieldset>
+					</form>
+				</div>
+			</div>
 		</div>
-	</form>
-</div>
-
-<inp2:m_Include template="elements/navigation_menu.elm" />
-
-<div class="wrapper">
-	<div class="text">		
-		<span class="text1"><inp2:m_Phrase label="lu_text_PromoHeader1"/></span>
-		<inp2:st_ContentBlock num="100" page="index"/>
+		<div class="cart">
+			<span class="phone" style="<inp2:m_ifnot check="ord_ItemsInCart">padding-right:338px;</inp2:m_ifnot>">1-855-WWW-PROS</span>
+			<inp2:m_if check="ord_ItemsInCart">
+				<span class="items"><inp2:ord_ItemsInCart/> Items: $1,759<i>.99</i></span>
+				<span class="delim">|</span>
+				<a href="<inp2:m_Link template='checkout/shop_cart' m_cat_id='0' m_cat_page='1'/>">Checkout</a>			
+			</inp2:m_if>
+		</div>
 	</div>
-</div>
\ No newline at end of file
+	<div class="clear"></div>
+</div>
Index: branches/1.0.x/img/bg-textarera.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/icon-checkout.gif
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/h1-right-pick.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/bg-field.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/con-basket-arrow.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/bg-point-menu.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/point-vertslider.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/elements/footer.elm.tpl
===================================================================
diff -u -N -r14600 -r14708
--- branches/1.0.x/elements/footer.elm.tpl	(.../footer.elm.tpl)	(revision 14600)
+++ branches/1.0.x/elements/footer.elm.tpl	(.../footer.elm.tpl)	(revision 14708)
@@ -1,5 +1,22 @@
-&copy; <inp2:lang.current_CurrentDate format="Y"/> <inp2:m_GetConfig name="Site_Name"/><br/>
-<a href="http://www.templatemonster.com/" target="_blank">Website template</a> designed by TemplateMonster.com<br/>
-Powered by <a href="http://www.in-portal.com" target="_blank">In-Portal &mdash; Open Source CMS</a>
+<div id="footer">
+	<div class="copy">
+		<p>&copy; 1997-<inp2:lang.current_CurrentDate format="Y"/>, <a href="http://in-portal.com">In-Portal Open Source Content Management & Shopping Cart</a></p>
+		<p class="doplinks"><a href="#">Privacy Policy</a>|<a href="#">Terms of Use</a>|<a href="#">Terms of Sale</a></p>
+	</div>
+	<div class="links">
+		<ul>
+			<li><a href="#">Track Order</a></li>
+			<li><a href="#">Order History</a></li>
+			<li><a href="#">Return Policy</a></li>
+			<li><a href="#">Affiliates</a></li>
+			<li><a href="#">Contact Us</a></li>
+		</ul>
+	</div>
+	<div class="payment">
+		<p class="logos"><img src="<inp2:m_TemplatesBase/>img/payment.jpg" width="217" height="25" alt="" /></p>
+		<p>Follow Us: <a href="#"><img src="<inp2:m_TemplatesBase/>img/icon-fb.jpg" width="25" height="25" alt="" /></a><a href="#"><img src="<inp2:m_TemplatesBase/>img/icon-tw.jpg" width="26" height="25" alt="" /></a><a href="#"><img src="<inp2:m_TemplatesBase/>img/icon-linkedin.jpg" width="25" height="25" alt="" /></a></p>
+	</div>
+	<div class="clear"></div>
+</div><!-- #footer -->
 
 <inp2:m_RegisterPageHit/>
\ No newline at end of file
Index: branches/1.0.x/img/bg-searchbox-l.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/subs.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/elements/menu.elm.tpl
===================================================================
diff -u -N
--- branches/1.0.x/elements/menu.elm.tpl	(revision 0)
+++ branches/1.0.x/elements/menu.elm.tpl	(revision 14708)
@@ -0,0 +1,18 @@
+<div class="menu">
+	<div class="padding">
+		<inp2:m_DefineElement name="menu_element" no_editing="1">
+			<li>
+				<a class="<inp2:m_if check="m_Param" name="active">active</inp2:m_if>" href="<inp2:m_Link template='$template' m_cat_id='$cat_id' use_section='$use_section' m_cat_page='1'/>" title="<inp2:m_Param name="title"/>"><span><span><inp2:m_Param name="title"/></span></span></a>
+			</li>
+		</inp2:m_DefineElement>
+		<ul id="mainmenu">
+			<inp2:st_CachedMenu render_as="menu_element" category_id="1"/>
+		</ul>
+					
+		<inp2:m_Include template="elements/search.elm" />
+		
+	<!--##
+		<inp2:m_Include template="elements/products_menu.elm" />
+	##-->		
+	</div>
+</div><!-- .menu -->
\ No newline at end of file
Index: branches/1.0.x/img/modal/preload.gif
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/elements/products_menu.elm.tpl
===================================================================
diff -u -N
--- branches/1.0.x/elements/products_menu.elm.tpl	(revision 0)
+++ branches/1.0.x/elements/products_menu.elm.tpl	(revision 14708)
@@ -0,0 +1,95 @@
+<div class="level2">
+	<div class="level2-bg">
+		<div id="level2-menu">
+			<h3><a href="#">Musical Instruments</a></h3>
+			<div>
+				<ul>
+					<li class="level3-menu">
+						<h4><a href="#">35mm & SLR Cameras</a></h4>
+						<div>
+							<ul>
+								<li><a href="#" class="active">35mm & SLR Cameras</a></li>
+								<li><a href="#">Binoculars</a></li>
+							</ul>
+						</div>
+					</li>
+					<li class="level3-menu">
+						<h4><a href="#">Binoculars</a></h4>
+						<div>
+							<ul>
+								<li><a href="#" class="active">35mm & SLR Cameras</a></li>
+								<li><a href="#">Binoculars</a></li>
+							</ul>
+						</div>
+					</li>
+					<li><i><a href="#">Blu-Ray Players</a></i></li>
+					<li><i><a href="#">CD Players</a></i></li>
+					<li><i><a href="#">Camcorders</a></i></li>
+					<li><i><a href="#">Cell Phones</a></i></li>
+					<li><i><a href="#">Clock Radios</a></i></li>
+					<li><i><a href="#">Cordless Phones</a></i></li>
+				</ul>
+			</div>
+			<h3><a href="#">Accessories & Shoes</a></h3>
+			<div>
+				<ul>
+					<li><a href="#">35mm & SLR Cameras</a></li>
+					<li><a href="#" class="active">Binoculars</a></li>
+					<li><a href="#">Blu-Ray Players</a></li>
+					<li><a href="#">CD Players</a></li>
+					<li><a href="#">Camcorders</a></li>
+					<li><a href="#">Cell Phones</a></li>
+					<li><a href="#">Clock Radios</a></li>
+					<li><a href="#">Cordless Phones</a></li>
+				</ul>
+			</div>
+			<h3><a href="#">Home & Garden</a></h3>
+			<div>
+				<ul>
+					<li><a href="#">35mm & SLR Cameras</a></li>
+					<li><a href="#" class="active">Binoculars</a></li>
+					<li><a href="#">Blu-Ray Players</a></li>
+					<li><a href="#">CD Players</a></li>
+					<li><a href="#">Camcorders</a></li>
+					<li><a href="#">Cell Phones</a></li>
+					<li><a href="#">Clock Radios</a></li>
+					<li><a href="#">Cordless Phones</a></li>
+				</ul>
+			</div>
+		</div>
+		<div id="level-content">
+			<ul>
+				<li><a href="#">Nuvi 755T Car GPS Receiver</a></li>
+				<li><a href="#">eTrex Venture HC</a></li>
+				<li><a href="#">Garmin Approach G5</a></li>
+				<li><a href="#">Garmin nuvi 265W Receiver</a></li>
+				<li><a href="#">Nuvi 755T Car GPS Receiver</a></li>
+				<li><a href="#">eTrex Venture HC</a></li>
+				<li><a href="#">Garmin Approach G5</a></li>
+				<li><a href="#">Garmin nuvi 265W Receiver</a></li>
+				<li><a href="#">Nuvi 755T Car GPS Receiver</a></li>
+				<li><a href="#">eTrex Venture HC</a></li>
+				<li><a href="#">Garmin Approach G5</a></li>
+				<li><a href="#">Garmin nuvi 265W Receiver</a></li>
+				<li><a href="#">Nuvi 755T Car GPS Receiver</a></li>
+				<li><a href="#">eTrex Venture HC</a></li>
+				<li><a href="#">Garmin Approach G5</a></li>
+				<li><a href="#">Garmin nuvi 265W Receiver</a></li>
+				<li><a href="#">Nuvi 755T Car GPS Receiver</a></li>
+				<li><a href="#">eTrex Venture HC</a></li>
+				<li><a href="#">Garmin Approach G5</a></li>
+				<li><a href="#">Garmin nuvi 265W Receiver</a></li>
+				<li><a href="#">Nuvi 755T Car GPS Receiver</a></li>
+				<li><a href="#">eTrex Venture HC</a></li>
+				<li><a href="#">Garmin Approach G5</a></li>
+				<li><a href="#">Garmin nuvi 265W Receiver</a></li>
+			</ul>
+		</div>
+		<div id="level-good" class="good-item">
+			<p><img src="/i/samples/good4.jpg" width="77" height="134" alt="" /></p>
+			<p class="price">$759.<span>95</span></p>
+			<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
+		</div>
+	</div>
+	<div class="clear"></div>
+</div>
\ No newline at end of file
Index: branches/1.0.x/img/bg-searchbox-r.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/samples/good2.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/samples/good4.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/subs-top.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/samples/good6.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/elements/search.elm.tpl
===================================================================
diff -u -N
--- branches/1.0.x/elements/search.elm.tpl	(revision 0)
+++ branches/1.0.x/elements/search.elm.tpl	(revision 14708)
@@ -0,0 +1,16 @@
+<div class="searchbox">
+	<form id="search_form" action="<inp2:m_Link template='inc/search_results_ajax.elm'/>">
+		<inp2:m_if check='m_Get' name='keywords'>
+			<input type="text" id="search" name="search" value="<inp2:m_Get name='keywords'/>" autocomplete="off" />
+		<inp2:m_else/>	
+			<input type="text" id="search" name="search" value="Search" autocomplete="off" onblur="if (this.value == '') this.value='Search'" onclick="if (this.value == 'Search') this.value=''" />
+		</inp2:m_if>
+	</form>
+</div>
+
+<div class="" style="display: none;">
+	<div class="search-box-small-header"></div>
+	<div class="search-box-small-footer"></div>
+</div>
+
+<div class="clear"></div>
\ No newline at end of file
Index: branches/1.0.x/img/h1-left.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/bg-header.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/validate/con-success.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/validate/con-error-arrow.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/bullet-l2menu.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/bg-searchfield.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/icon-wishlist.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/bullet-l3menu.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/bg-block-top.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/bg-blinks.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/ribbon-big.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/bg-vertslider.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/bg-tab.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/h1-right-sale.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/elements/content_boxes.elm.tpl
===================================================================
diff -u -N -r14600 -r14708
--- branches/1.0.x/elements/content_boxes.elm.tpl	(.../content_boxes.elm.tpl)	(revision 14600)
+++ branches/1.0.x/elements/content_boxes.elm.tpl	(.../content_boxes.elm.tpl)	(revision 14708)
@@ -1,28 +1,42 @@
-<!--## DESIGN FOR COLUMN CONTENT ELEMENT ##-->
 <inp2:m_DefineElement name="content_box" type="text">
 	<h2 class="movable-header"><inp2:m_param name="header"/></h2>
 	<div class="<inp2:m_Param name="type"/>">
 		<inp2:m_param name="content"/>
 	</div>
 </inp2:m_DefineElement>
-<!--## DESIGN FOR COLUMN CONTENT ELEMENT ##-->
 
-<!--## DESIGN FOR COLUMN CONTENT ELEMENT ##-->
-<inp2:m_DefineElement name="side_box" type="">
-	<div class="<inp2:m_Param name="type"/>">
-		<h3 class="movable-header"><inp2:m_param name="header"/></h3>
-		<dl>
-			<inp2:m_param name="content"/>
-		</dl>
+<inp2:m_DefineElement name="side_box" add_class="">
+	<div class="block <inp2:m_Param name='add_class'/>">
+		<h2><inp2:m_param name="header"/></h2>	
+		<inp2:m_param name="content"/>
 	</div>
 </inp2:m_DefineElement>
-<!--## DESIGN FOR COLUMN CONTENT ELEMENT ##-->
 
+<inp2:m_DefineElement name="custom_box" add_class="">
+	<div class="<inp2:m_Param name='add_class'/>">
+		<h4><inp2:m_param name="header"/></h4>	
+		<inp2:m_param name="content"/>
+	</div>
+</inp2:m_DefineElement>
+
 <!--## DEFAULT CONTENT-TOP ELEMENT ##-->
 <inp2:m_DefineElement name="default_content_banner" no_editing="1">
 		
 	<!-- default banners -->
 	<inp2:st_ContentBlock num="101" page="index"/>
 	<!-- //default banners -->
 		
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="default_add_to_footer" no_editing="1">		
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="default_add_to_head" no_editing="1">		
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="default_sidebar" no_editing="1">		
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="image_element">
+	<img src="<inp2:m_param name="img_path" />" title="<inp2:m_param name="alt" />" alt="<inp2:m_param name="alt" />" <inp2:m_param name="img_size" /> align="<inp2:m_param name="align"/>" />
 </inp2:m_DefineElement>
\ No newline at end of file
Index: branches/1.0.x/elements/html_head.elm.tpl
===================================================================
diff -u -N -r14600 -r14708
--- branches/1.0.x/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 14600)
+++ branches/1.0.x/elements/html_head.elm.tpl	(.../html_head.elm.tpl)	(revision 14708)
@@ -14,37 +14,37 @@
 <link rel="icon" href="<inp2:m_BaseURL/>favicon.ico" type="image/x-icon" />
 <link rel="shortcut icon" href="<inp2:m_BaseURL/>favicon.ico" type="image/x-icon" />
 
-<!--## CSS ##-->
-<link rel="stylesheet" type="text/css" href="<inp2:m_Compress files='inc/reset.css|inc/layout.css|inc/styles.css'/>" media="all" charset="<inp2:lang.current_Field name='Charset'/>"/>
+<link rel="stylesheet" type="text/css" href="<inp2:m_Compress files='inc/reset.css|inc/styles.css|inc/category.css|inc/flexslider.css|inc/modal.css'/>" media="all" charset="<inp2:lang.current_Field name='Charset'/>"/>
 
+<link type="text/css" rel="stylesheet" href="<inp2:m_TemplatesBase />inc/ui/jquery.ui.all.css" charset="utf-8" />
+
+<!--##
+<link type="text/css" rel="stylesheet" href="<inp2:m_TemplatesBase />inc/reset.css" charset="utf-8" />
+<link type="text/css" rel="stylesheet" href="<inp2:m_TemplatesBase />inc/styles.css" charset="utf-8" />
+<link type="text/css" rel="stylesheet" href="<inp2:m_TemplatesBase />inc/category.css" charset="utf-8" />
+<link type="text/css" rel="stylesheet" href="<inp2:m_TemplatesBase />inc/flexslider.css" charset="utf-8" />
+<link type="text/css" rel="stylesheet" href="<inp2:m_TemplatesBase />inc/modal.css" charset="utf-8" />
+##-->
+
 <!--## JS FOR ADMIN ##-->
 <inp2:st_EditingScripts/>
 
 <!--## JS FOR FRONT ##-->
 <inp2:m_ifnot check="m_GetConst" name="EDITING_MODE">
 	<!--## EXCLUDE THIS JS WHEN IN ADMIN ##-->
-	<script type="text/javascript" src="<inp2:m_TemplatesBase />inc/js/jquery-1.4.4.min.js"></script>	
+	<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.6.2/jquery.min.js" type="text/javascript"></script>		
 </inp2:m_ifnot> 
 
-<script type="text/javascript" src="<inp2:m_TemplatesBase />inc/js/jcookie.js"></script>
-<script type="text/javascript" src="<inp2:m_TemplatesBase />inc/js/cufon-yui.js"></script>
-<script type="text/javascript" src="<inp2:m_TemplatesBase />inc/js/cufon-replace.js"></script>
-<script type="text/javascript" src="<inp2:m_TemplatesBase />inc/js/Myriad_Pro_400.font.js"></script>
-<script type="text/javascript" src="<inp2:m_TemplatesBase />inc/js/Myriad_Pro_700.font.js"></script>
-<script type="text/javascript" src="<inp2:m_TemplatesBase />inc/js/Myriad_Pro_600.font.js"></script>
+<script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.15/jquery-ui.min.js" type="text/javascript"></script>
+<script src="<inp2:m_TemplatesBase />inc/js/ui/jquery.ui.core.min.js" type="text/javascript"></script>
+<script src="<inp2:m_TemplatesBase />inc/js/ui/jquery.ui.widget.min.js" type="text/javascript"></script>
+<script src="<inp2:m_TemplatesBase />inc/js/ui/jquery.ui.accordion.min.js" type="text/javascript"></script>
+<script src="<inp2:m_TemplatesBase />inc/js/jquery.flexslider-min.js" type="text/javascript"></script>
+<script src="<inp2:m_TemplatesBase />inc/js/jquery.scripts.js" type="text/javascript"></script>
+<script src="<inp2:m_TemplatesBase />inc/js/tinybox.js" type="text/javascript"></script>
 
 <inp2:m_Comment>
 <!--[if lt IE 9]>
-	<script type="text/javascript" src="<inp2:m_TemplatesBase/>inc/js/ie6_script_other.js"></script>
-	<script type="text/javascript" src="<inp2:m_TemplatesBase/>inc/js/html5.js"></script>
+	
 <![endif]-->
-</inp2:m_Comment>
-
-<!--##
-<script type="text/javascript">
-
-$(document).ready(function() {
-	$('li.active').prev('li').addClass('beforeactive');
-});
-</script>
-##-->
+</inp2:m_Comment>
\ No newline at end of file
Index: branches/1.0.x/img/display-view.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/bg-menu.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/index.tpl
===================================================================
diff -u -N
--- branches/1.0.x/index.tpl	(revision 0)
+++ branches/1.0.x/index.tpl	(revision 14708)
@@ -0,0 +1,99 @@
+<!--##
+<NAME>Home</NAME>
+<DESC>Welcome page</DESC>
+<SECTION></SECTION>
+##-->
+
+<!--## PAGE TITLE ELEMENT ##-->
+<inp2:m_DefineElement name="page_title"><inp2:m_phrase name="lu_title_WelcomeTitle" no_editing="1"/></inp2:m_DefineElement>
+<!--## //PAGE TITLE ELEMENT ##-->
+
+<!--## SIDE-BAR ELEMENT ##-->
+<inp2:m_DefineElement name="sidebar">
+	<inp2:m_RenderElement name="elements/side_boxes/categories.elm" design="side_box"/>	
+	<inp2:m_RenderElement name="elements/side_boxes/picks.elm" design="side_box" add_class="no-border-bottom"/>	
+	<inp2:m_RenderElement name="elements/side_boxes/subscribe.elm" design="custom_box" add_class="subscribe-block"/>	
+</inp2:m_DefineElement>
+<!--## /SIDE-BAR ELEMENT ##-->
+
+<!--## MAIN CONTENT ##-->
+<inp2:m_DefineElement name="content">
+	
+	<inp2:m_Include template="elements/promo.elm" strip_nl="2"/>
+	
+	<inp2:m_Include template="elements/special_deals.elm" strip_nl="2"/>
+	
+	<inp2:m_Include template="elements/new_products.elm" strip_nl="2"/>
+	
+	<inp2:m_RenderElement design="content_box">
+		<inp2:m_Capture to_var="header">
+			<inp2:m_phrase name="lu_title_WelcomeTitle"/>
+		</inp2:m_Capture>
+
+		<inp2:st_ContentBlock num="1"/>
+	</inp2:m_RenderElement>
+	
+</inp2:m_DefineElement>
+<!--## /MAIN CONTENT ##-->
+
+<inp2:m_DefineElement name="add_to_head">
+	<script>
+	$(function() {
+		var icons = {
+			header: "ui-icon-circle-arrow-e",
+			headerSelected: "ui-icon-circle-arrow-s"
+		};
+		var level2icons = {
+			header: "ui-icon-circle-arrow-l2e",
+			headerSelected: "ui-icon-circle-arrow-l2s"
+		};
+		var level3icons = {
+			header: "ui-icon-circle-arrow-l3e",
+			headerSelected: "ui-icon-circle-arrow-l3s"
+		};
+		$( "#accordion-menu" ).accordion({
+			icons: icons
+		});
+		$( "#level2-menu" ).accordion({
+			icons: level2icons
+		});
+		$( ".level3-menu" ).accordion({
+			icons: level3icons,
+			header: 'h4',
+			autoHeight: false,
+			event: "mouseover"
+		});
+		$('#slider').flexslider({
+			directionNav: false,
+			prevText: "",
+			nextText: ""
+		});
+	});
+	</script>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="add_to_footer">
+	<script src="<inp2:m_TemplatesBase />inc/js/jquery.easing.1.3.js" type="text/javascript"></script>
+	<script src="<inp2:m_TemplatesBase />inc/js/jquery.mousewheel.js" type="text/javascript"></script>
+	<script src="<inp2:m_TemplatesBase />inc/js/jquery.contentcarousel.js" type="text/javascript"></script>
+	<script>
+	$(function() {
+		$('#scrollable').contentcarousel({
+			// speed for the sliding animation
+			sliderSpeed		: 500,
+			// easing for the sliding animation
+			sliderEasing	: 'easeOutExpo',
+			// speed for the item animation (open / close)
+			itemSpeed		: 500,
+			// easing for the item animation (open / close)
+			itemEasing		: 'easeOutExpo',
+			// number of items to scroll at a time
+			scroll			: 1
+		});
+	});
+	</script>
+</inp2:m_DefineElement>
+
+<!--## 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/img/lang/eng.gif
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/button-addtocart.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/elements/special_deals.elm.tpl
===================================================================
diff -u -N
--- branches/1.0.x/elements/special_deals.elm.tpl	(revision 0)
+++ branches/1.0.x/elements/special_deals.elm.tpl	(revision 14708)
@@ -0,0 +1,98 @@
+<div class="block block-margin no-border-bottom">
+	<h2><em>Special Deals</em><span class="sale"></span></h2>
+	<div id="scrollable">
+		<div class="items">
+			<div class="good-item good-item-float">
+				<dl>
+					<dt><a href="#">Nikon D5000 Digital Camera</a></dt>
+					<dd>
+						<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good1.jpg" width="136" height="136" alt="" /></a></p>
+						<p class="price-deal"><s class="under">$2,549.<span>95</span></s><em class="price">$2,549.<span>95</span></em></p>
+						<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
+					</dd>
+				</dl>
+			</div>
+			<div class="good-item good-item-float">
+				<dl>
+					<dt><a href="#">Motorola Backflip Silver Smartphone</a></dt>
+					<dd>
+						<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good2.jpg" width="133" height="133" alt="" /></a></p>
+						<p class="price-deal"><s class="under">$2,549.<span>95</span></s><em class="price">$2,549.<span>95</span></em></p>
+						<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
+					</dd>
+				</dl>
+			</div>
+			<div class="good-item good-item-float">
+				<dl>
+					<dt><a href="#">Apple iMac Desktop Customizable</a></dt>
+					<dd>
+						<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good3.jpg" width="135" height="124" alt="" /></a></p>
+						<p class="price-deal"><s class="under">$2,549.<span>95</span></s><em class="price">$2,549.<span>95</span></em></p>
+						<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
+					</dd>
+				</dl>
+			</div>
+			<div class="good-item good-item-float">
+				<dl>
+					<dt><a href="#">Nikon D5000 Digital Camera</a></dt>
+					<dd>
+						<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good1.jpg" width="136" height="136" alt="" /></a></p>
+						<p class="price-deal"><s class="under">$2,549.<span>95</span></s><em class="price">$2,549.<span>95</span></em></p>
+						<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
+					</dd>
+				</dl>
+			</div>
+			<div class="good-item good-item-float">
+				<dl>
+					<dt><a href="#">Motorola Backflip Silver Smartphone</a></dt>
+					<dd>
+						<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good2.jpg" width="133" height="133" alt="" /></a></p>
+						<p class="price-deal"><s class="under">$2,549.<span>95</span></s><em class="price">$2,549.<span>95</span></em></p>
+						<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
+					</dd>
+				</dl>
+			</div>
+			<div class="good-item good-item-float">
+				<dl>
+					<dt><a href="#">Apple iMac Desktop Customizable</a></dt>
+					<dd>
+						<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good3.jpg" width="135" height="124" alt="" /></a></p>
+						<p class="price-deal"><s class="under">$2,549.<span>95</span></s><em class="price">$2,549.<span>95</span></em></p>
+						<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
+					</dd>
+				</dl>
+			</div>
+			<div class="good-item good-item-float">
+				<dl>
+					<dt><a href="#">Nikon D5000 Digital Camera</a></dt>
+					<dd>
+						<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good1.jpg" width="136" height="136" alt="" /></a></p>
+						<p class="price">$2,549.<span>95</span></p>
+						<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
+					</dd>
+				</dl>
+			</div>
+			<div class="good-item good-item-float">
+				<dl>
+					<dt><a href="#">Motorola Backflip Silver Smartphone</a></dt>
+					<dd>
+						<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good2.jpg" width="133" height="133" alt="" /></a></p>
+						<p class="price">$549.<span>95</span></p>
+						<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
+					</dd>
+				</dl>
+			</div>
+			<div class="good-item good-item-float">
+				<dl>
+					<dt><a href="#">Apple iMac Desktop Customizable</a></dt>
+					<dd>
+						<p class="img"><a href="#"><img src="<inp2:m_TemplatesBase />img/samples/good3.jpg" width="135" height="124" alt="" /></a></p>
+						<p class="price">$999.<span>95</span></p>
+						<p><a href="#" class="addtocart"><span>Add to Cart</span></a></p>
+					</dd>
+				</dl>
+			</div>
+			<div class="clear"></div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
Index: branches/1.0.x/img/bg-block-bottom.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/bg-field-success.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/bg-vertslider-a.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/elements/side_boxes/subscribe.elm.tpl
===================================================================
diff -u -N
--- branches/1.0.x/elements/side_boxes/subscribe.elm.tpl	(revision 0)
+++ branches/1.0.x/elements/side_boxes/subscribe.elm.tpl	(revision 14708)
@@ -0,0 +1,22 @@
+<inp2:m_Capture to_var="header">Get Promotions & Discounts:</inp2:m_Capture>
+
+<inp2:u.subscribe-sidebox_FormName name="subscription"/>
+<form method="post" action="<inp2:m_FormAction />" class="form" name="mailing_list_form">	
+	<fieldset>
+		<inp2:if check="u.subscribe-sidebox_Field" name="SubscriberEmail">
+			<input type="text" class="field subsfield" name="<inp2:u.subscribe-sidebox_InputName name='SubscriberEmail'/>" value="<inp2:u.subscribe-sidebox_Field name='SubscriberEmail'/>" onblur="if (this.value == '') this.value='Your Email'" onclick="if (this.value == 'Your Email') this.value=''"/>
+		<inp2:m_else/>
+			<input type="text" class="field subsfield" name="<inp2:u.subscribe-sidebox_InputName name='SubscriberEmail'/>" value="Your Email" onblur="if (this.value == '') this.value='Your Email'" onclick="if (this.value == 'Your Email') this.value=''"  />
+		</inp2:if>
+		
+		<inp2:m_if check="u.subscribe-sidebox_HasError" field="any">
+			<span class="field-error"><inp2:u.subscribe-sidebox_Error field="SubscriberEmail"/></span><br />
+		</inp2:m_if>
+		
+		<a href="#" class="grey-but"><span><inp2:m_Phrase label='lu_btn_Subscribe' no_editing='1'/></span></a>
+		
+		<input type="hidden" name="events[u.subscribe-sidebox][OnSubscribeQuery]" value="1"/>
+		<input type="hidden" name="subscribe_template" value="mailing/subscribe"/>
+		<input type="hidden" name="unsubscribe_template" value="mailing/unsubscribe"/>
+	</fieldset>
+</form>
\ No newline at end of file
Index: branches/1.0.x/img/samples/good-details-big.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/logo.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/star-smallest.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/checkout-grey-left.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/h1-right-new.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/bg-buttons.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/creditcards.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/addtocart-right.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/bg-subcategory.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/product-nav.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/icon-fb.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/cart-steps.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/checkout-grey-right.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/icon-close.gif
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/bg-button-login.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/inc/styles.css
===================================================================
diff -u -N -r14600 -r14708
--- branches/1.0.x/inc/styles.css	(.../styles.css)	(revision 14600)
+++ branches/1.0.x/inc/styles.css	(.../styles.css)	(revision 14708)
@@ -6,7 +6,7 @@
 	min-width: 1000px;
 }
 body {
-	background: #fff url(/i/bg-header.jpg) repeat-y 0 0;
+	background: #fff url(@templates_base@/img/bg-header.jpg) repeat-y 0 0;
 	color: #3c3c3c;
 	font: 0.813em/1.231em Arial,Verdana,Tahoma,Sans-Serif;
 }
@@ -48,8 +48,8 @@
 #header .infoblock .welcome .txt { padding: 0 0 0 20px; }
 #header .infoblock .welcome .logged { padding-top: 5px; }
 #header .infoblock .welcome .txt a { font-weight: bold; }
-#header .infoblock .welcome .lang .eng {
-	background: url(/i/lang/eng.gif) no-repeat 10px 7px;
+#header .infoblock .welcome .lang .en-US {
+	background: url(@templates_base@/img/lang/eng.gif) no-repeat 10px 7px;
 	padding: 5px 10px 10px 35px;
 }
 #header .infoblock .welcome .txt,
@@ -70,13 +70,13 @@
 a#lang,
 a#currency,
 a#profile {
-	background: url(/i/icon-select.gif) no-repeat 100% 6px;
+	background: url(@templates_base@/img/icon-select.gif) no-repeat 100% 6px;
 	display: block;
 	padding: 0 12px 0 0;
 	text-decoration: none;
 }
 #header .infoblock .cart {
-	background: url(/i/bg-cart.jpg) no-repeat 100% 0;
+	background: url(@templates_base@/img/bg-cart.jpg) no-repeat 100% 0;
 	float: right;
 	font-size: 1.154em;
 	font-weight: bold;
@@ -85,7 +85,7 @@
 #header .infoblock .cart span,
 #header .infoblock .cart a { float: left; }
 #header .infoblock .cart a {
-	background: url(/i/icon-checkout.gif) no-repeat 100% 12px;
+	background: url(@templates_base@/img/icon-checkout.gif) no-repeat 100% 12px;
 	color: #75b833;
 	line-height: 33px;
 	padding: 0 12px 0 0;
@@ -95,7 +95,7 @@
 	font-size: 0.733em;
 }
 #header .infoblock .cart .items {
-	background: url(/i/icon-cart.png) no-repeat 0 0;
+	background: url(@templates_base@/img/icon-cart.png) no-repeat 0 0;
 	line-height: 33px;
 	padding: 0 0 0 50px;
 }
@@ -116,15 +116,15 @@
 	text-decoration: underline;
 }
 #header .infoblock .welcome .lang #lang-sel .eng {
-	background: url(/i/lang/eng.gif) no-repeat 0 0;
+	background: url(@templates_base@/img/lang/eng.gif) no-repeat 0 0;
 	padding: 0 0 0 25px;
 }
 #header .infoblock .welcome .lang #lang-sel .deutch {
-	background: url(/i/lang/deutch.gif) no-repeat 0 0;
+	background: url(@templates_base@/img/lang/deutch.gif) no-repeat 0 0;
 	padding: 0 0 0 25px;
 }
 #header .infoblock .welcome .lang #lang-sel .rus {
-	background: url(/i/lang/rus.gif) no-repeat 0 0;
+	background: url(@templates_base@/img/lang/rus.gif) no-repeat 0 0;
 	padding: 0 0 0 25px;
 }
 
@@ -177,7 +177,7 @@
 .plashka-sel a#lang,
 .plashka-sel a#currency,
 .plashka-sel a#profile {
-	background: url(/i/icon-close.gif) no-repeat 100% 6px;
+	background: url(@templates_base@/img/icon-close.gif) no-repeat 100% 6px;
 }
 
 #header .infoblock .welcome .login,
@@ -188,7 +188,7 @@
 .login-alt .login { font-size: 0.867em; padding-left: 5px; }
 #header .infoblock .welcome .login a,
 .login-alt .login a {
-	background: url(/i/bg-button-login.jpg) no-repeat 0 0;
+	background: url(@templates_base@/img/bg-button-login.jpg) no-repeat 0 0;
 	display: block;
 	height: 18px;
 	text-align: center;
@@ -213,7 +213,7 @@
 
 /*** Menu ***/
 .menu {
-	background: #3e3e3e url(/i/bg-menu.jpg) repeat-x 0 0;
+	background: #3e3e3e url(@templates_base@/img/bg-menu.jpg) repeat-x 0 0;
 	height: 46px;
 	position: relative;
 	width: 100%;
@@ -241,21 +241,21 @@
 }
 .menu ul li a:hover,
 .menu ul li a:focus {
-	background: #4b4b4b url(/i/bg-menu.jpg) repeat-x 0 -46px;
+	background: #4b4b4b url(@templates_base@/img/bg-menu.jpg) repeat-x 0 -46px;
 }
 .menu ul li a.active {
-	background: #2d85d6 url(/i/bg-menu.jpg) repeat-x 0 -92px;
+	background: #2d85d6 url(@templates_base@/img/bg-menu.jpg) repeat-x 0 -92px;
 }
 .menu .searchbox {
-	background: url(/i/bg-searchbox-l.jpg) no-repeat 0 0;
+	background: url(@templates_base@/img/bg-searchbox-l.jpg) no-repeat 0 0;
 	float: right;
 	margin-top: 10px;
 	text-align: right;
 	width: 210px;
 }
 .menu .searchbox input[type="text"] {
 	border: none;
-	background: #fff url(/i/bg-searchbox-r.jpg) no-repeat 100% 0;
+	background: #fff url(@templates_base@/img/bg-searchbox-r.jpg) no-repeat 100% 0;
 	height: 23px;
 	line-height: 23px;
 	padding-top: 2px;
@@ -325,7 +325,7 @@
 	background: none;
 }
 #level2-menu ul li i {
-	background: url(/i/bullet-l3menu.png) no-repeat 22px 9px;
+	background: url(@templates_base@/img/bullet-l3menu.png) no-repeat 22px 9px;
 	display: block;
 	padding: 0 0 0 20px;
 	white-space: nowrap;
@@ -342,7 +342,7 @@
 	font-size: 0.917em;
 }
 #level2-menu ul li.level3-menu ul li a {
-	background: url(/i/bullet-l3menu.png) no-repeat 35px 4px;
+	background: url(@templates_base@/img/bullet-l3menu.png) no-repeat 35px 4px;
 	line-height: 18px;
 	padding: 0 0 0 45px;
 }
@@ -352,22 +352,22 @@
 #level2-menu.ui-accordion .ui-accordion-content-active { background-color: #eaeaea; }
 
 #level2-menu .ui-icon-circle-arrow-l2e {
-	background: url(/i/bullet-l2menu.png) no-repeat 0 0;
+	background: url(@templates_base@/img/bullet-l2menu.png) no-repeat 0 0;
 	height: 7px;
 	width: 4px;
 }
 #level2-menu .ui-icon-circle-arrow-l2s {
-	background: url(/i/bullet-l2menu.png) no-repeat 0 -7px;
+	background: url(@templates_base@/img/bullet-l2menu.png) no-repeat 0 -7px;
 	height: 4px;
 	width: 7px;
 }
 #level2-menu .ui-icon-circle-arrow-l3e {
-	background: url(/i/bullet-l2menu.png) no-repeat 0 -11px;
+	background: url(@templates_base@/img/bullet-l2menu.png) no-repeat 0 -11px;
 	height: 7px;
 	width: 4px;
 }
 #level2-menu .ui-icon-circle-arrow-l3s {
-	background: url(/i/bullet-l2menu.png) no-repeat 0 -18px;
+	background: url(@templates_base@/img/bullet-l2menu.png) no-repeat 0 -18px;
 	height: 4px;
 	width: 7px;
 }
@@ -382,7 +382,7 @@
 	width: auto;
 }
 #level-content ul li {
-	background: url(/i/bullet-level5.png) no-repeat 0 7px;
+	background: url(@templates_base@/img/bullet-level5.png) no-repeat 0 7px;
 	float: left;
 	font-size: 1em;
 	font-weight: normal;
@@ -432,15 +432,15 @@
 #content .block-fixed div { padding-bottom: 13px; }
 
 .button-addtocart {
-	background: url(/i/button-addtocart-left.jpg) no-repeat 0 0;
+	background: url(@templates_base@/img/button-addtocart-left.jpg) no-repeat 0 0;
 	color: #faffed;
 	display: inline-block;
 	font-size: 0.846em;
 	text-shadow: #000 0px 1px 1px;
 	text-decoration: none;
 }
 .button-addtocart span {
-	background: url(/i/button-addtocart-right.jpg) no-repeat 100% 0;
+	background: url(@templates_base@/img/button-addtocart-right.jpg) no-repeat 100% 0;
 	display: inline-block;
 	height: 40px;
 	padding: 5px 6px 0;
@@ -465,12 +465,12 @@
 }
 
 .subscribe-block {
-	background: url(/i/subs.png) no-repeat 0 100%;
+	background: url(@templates_base@/img/subs.png) no-repeat 0 100%;
 	padding: 0 16px 11px 0;
 	width: 214px;
 }
 .subscribe-block h4 {
-	background: url(/i/subs-top.png) no-repeat 0 0;
+	background: url(@templates_base@/img/subs-top.png) no-repeat 0 0;
 	font-size: 1.077em;
 	font-weight: bold;
 	padding: 14px 0 0 16px;
@@ -485,7 +485,7 @@
 textarea.field,
 select.field,
 select.field-alt {
-	background: url(/i/bg-field.jpg) repeat-x 0 0;
+	background: url(@templates_base@/img/bg-field.jpg) repeat-x 0 0;
 	border: 1px solid #828282;
 	height: 24px;
 	line-height: 24px;
@@ -505,12 +505,12 @@
 
 /*** Block ***/
 .block {
-	background: url(/i/bg-block-bottom.jpg) no-repeat 0 100%;
+	background: url(@templates_base@/img/bg-block-bottom.jpg) no-repeat 0 100%;
 	margin: 0 0 10px;
 	padding: 0 0 8px;
 }
 .block .block-top {
-	background: url(/i/bg-block-top.jpg) no-repeat 0 100%;
+	background: url(@templates_base@/img/bg-block-top.jpg) no-repeat 0 100%;
 	height: 8px;
 	width: 100%;
 }
@@ -520,7 +520,7 @@
 }
 .block.block-margin { margin: 0 0 20px; }
 .block h2 {
-	background: url(/i/h1-left.png) no-repeat 0 0;
+	background: url(@templates_base@/img/h1-left.png) no-repeat 0 0;
 	height: 36px;
 	line-height: 36px;
 	padding-left: 14px;
@@ -538,27 +538,27 @@
 }
 .block h2 a { text-decoration: underline; }
 .block h2 i {
-	background: url(/i/bc-step.png) no-repeat 50% 50%;
+	background: url(@templates_base@/img/bc-step.png) no-repeat 50% 50%;
 	padding: 0 15px;
 }
 .block h2 span {
-	background: url(/i/h1-right.png) no-repeat 100% 0;
+	background: url(@templates_base@/img/h1-right.png) no-repeat 100% 0;
 	height: 53px;
 	position: absolute;
 	top: -3px; right: -6px;
 	width: 136px;
 	z-index: 50;
 }
-.block h2 span.new { background: url(/i/h1-right-new.png) no-repeat 100% 0; }
-.block h2 span.pick { background: url(/i/h1-right-pick.png) no-repeat 100% 0; }
-.block h2 span.sale { background: url(/i/h1-right-sale.png) no-repeat 100% 0; }
-.block h2 span.bullet { background: url(/i/h1-right-bullet.png) no-repeat 100% 0; }
+.block h2 span.new { background: url(@templates_base@/img/h1-right-new.png) no-repeat 100% 0; }
+.block h2 span.pick { background: url(@templates_base@/img/h1-right-pick.png) no-repeat 100% 0; }
+.block h2 span.sale { background: url(@templates_base@/img/h1-right-sale.png) no-repeat 100% 0; }
+.block h2 span.bullet { background: url(@templates_base@/img/h1-right-bullet.png) no-repeat 100% 0; }
 
 .block.alt-block {
 	background: none;
 }
 .block.alt-block h2 {
-	background: url(/i/bg-block.png) no-repeat 0 0;
+	background: url(@templates_base@/img/bg-block.png) no-repeat 0 0;
 	padding-left: 0;
 }
 .block.alt-block h2.active {
@@ -602,17 +602,17 @@
 .manufacturer label { text-decoration: underline; }
 
 #slider-vertical {
-	background: url(/i/bg-vertslider-full.png) no-repeat 0 0;
+	background: url(@templates_base@/img/bg-vertslider-full.png) no-repeat 0 0;
 	float: left;
 	padding: 5px 0 0;
 }
 #slider-vertical .ui-slider-range {
-	background: url(/i/bg-vertslider-a.png) repeat-y 0 0;
+	background: url(@templates_base@/img/bg-vertslider-a.png) repeat-y 0 0;
 	margin: 0 0 0 7px;
 }
 
 #slider-vertical .ui-slider-handle {
-	background: url(/i/point-vertslider.png) no-repeat 0 0;
+	background: url(@templates_base@/img/point-vertslider.png) no-repeat 0 0;
 	height: 9px;
 	margin: 0;
 	width: 16px;
@@ -659,7 +659,7 @@
 	border-right: 1px solid #d0d0d0;
 }
 #accordion-menu h3 {
-	background: #fff url(/i/bg-point-menu.jpg) repeat-x 0 100%;
+	background: #fff url(@templates_base@/img/bg-point-menu.jpg) repeat-x 0 100%;
 	border-bottom: 1px solid #d0d0d0;
 	color: #666;
 	cursor: pointer;
@@ -669,14 +669,14 @@
 	position: relative;
 }
 #accordion-menu h3.active {
-	background: #1b6bc7 url(/i/bg-point-menu-active.jpg) repeat-x 0 0;
+	background: #1b6bc7 url(@templates_base@/img/bg-point-menu-active.jpg) repeat-x 0 0;
 	color: #fff;
 }
 #accordion-menu a { padding-left: 20px; text-decoration: none; }
 #accordion-menu a:hover, #accordion-menu a:focus { text-decoration: underline; }
 #accordion-menu h3.active a { color: #fff; }
 #accordion-menu .ui-icon-circle-arrow-e {
-	background: url(/i/bullet-menu.png) no-repeat 0 0;
+	background: url(@templates_base@/img/bullet-menu.png) no-repeat 0 0;
 	height: 6px;
 	width: 10px;
 }
@@ -686,12 +686,12 @@
 	top: 50%;
 }
 #accordion-menu .ui-icon-circle-arrow-s {
-	background: url(/i/bullet-menu.png) no-repeat 0 -6px;
+	background: url(@templates_base@/img/bullet-menu.png) no-repeat 0 -6px;
 	height: 6px;
 	width: 10px;
 }
 #accordion-menu .ui-icon-circle-arrow-a {
-	background: url(/i/bullet-menu.png) no-repeat 0 -12px;
+	background: url(@templates_base@/img/bullet-menu.png) no-repeat 0 -12px;
 	height: 10px;
 	margin-top: -5px;
 	position: absolute;
@@ -705,14 +705,14 @@
 #accordion-menu div ul { padding: 10px 0 10px 7px; }
 #accordion-menu div ul li { padding: 3px 0 5px 7px; }
 #accordion-menu div ul li.active {
-	background: url(/i/bg-subcategory.png) repeat-x 0 0;
+	background: url(@templates_base@/img/bg-subcategory.png) repeat-x 0 0;
 }
 #accordion-menu div ul a { color: #333; padding-left: 0; }
 #accordion-menu div ul li.active a { color: #fff; }
 
 #accordion-menu div ul li ul { padding: 10px 0 0 25px; }
 #accordion-menu div ul li ul li {
-	background: url(/i/point-subcategory.png) no-repeat 0 7px;
+	background: url(@templates_base@/img/point-subcategory.png) no-repeat 0 7px;
 	font-size: 0.923em;
 	padding: 2px 0 2px 10px;
 }
@@ -783,7 +783,7 @@
 	font-size: 0.708em;
 }
 .good-item .addtocart {
-	background: url(/i/addtocart-left.jpg) no-repeat 0 0;
+	background: url(@templates_base@/img/addtocart-left.jpg) no-repeat 0 0;
 	color: #faffed;
 	display: inline-block;
 	font-size: 1.077em;
@@ -792,7 +792,7 @@
 	text-decoration: none;
 }
 .good-item .addtocart span {
-	background: url(/i/addtocart-right.jpg) no-repeat 100% 0;
+	background: url(@templates_base@/img/addtocart-right.jpg) no-repeat 100% 0;
 	display: inline-block;
 	height: 33px;
 	line-height: 33px;
@@ -822,7 +822,7 @@
 	width: 650px;
 }
 #scrollable .good-item {
-	background: url(/i/delimiter-special.gif) repeat-y 100% 0;
+	background: url(@templates_base@/img/delimiter-special.gif) repeat-y 100% 0;
 	position:relative;
 	width:222px;
 	height: 280px;
@@ -846,7 +846,7 @@
 #scrollable .ca-nav span {
 	width:30px;
 	height:309px;
-	background:transparent url(/i/special-navi.png) no-repeat 0 0;
+	background:transparent url(@templates_base@/img/special-navi.png) no-repeat 0 0;
 	position:absolute;
 	top:0;
 	left:0;
@@ -888,7 +888,7 @@
 }
 
 #feedback {
-	background: url(/i/con-contact.jpg) no-repeat 100% 0;
+	background: url(@templates_base@/img/con-contact.jpg) no-repeat 100% 0;
 	font-size: 0.929em;
 	padding: 20px 330px 0 0;
 }
@@ -925,7 +925,7 @@
 	float: left;
 }
 #feedback textarea {
-	background: url(/i/bg-textarera.jpg) repeat-x 0 0;
+	background: url(@templates_base@/img/bg-textarera.jpg) repeat-x 0 0;
 	border: 1px solid #b4b4b4;
 	height: 120px;
 	width: 450px;
@@ -938,7 +938,7 @@
 }
 
 .form .green-button {
-	background: url(/i/bg-buttons.jpg) no-repeat 0 0;
+	background: url(@templates_base@/img/bg-buttons.jpg) no-repeat 0 0;
 	border: none;
 	color: #fff;
 	font-weight: bold;
@@ -947,7 +947,7 @@
 	width: 90px;
 }
 .form .grey-button {
-	background: url(/i/bg-buttons.jpg) no-repeat 0 100%;
+	background: url(@templates_base@/img/bg-buttons.jpg) no-repeat 0 100%;
 	border: none;
 	color: #000;
 	font-weight: bold;
@@ -957,7 +957,7 @@
 }
 
 .green-but {
-	background: url(/i/bg-button-left.png) no-repeat 0 0;
+	background: url(@templates_base@/img/bg-button-left.png) no-repeat 0 0;
 	color: #fff;
 	display: inline-block;
 	font-weight: bold;
@@ -969,14 +969,14 @@
 }
 .green-but:hover { color: #fff; text-decoration: none; }
 .green-but span {
-	background: url(/i/bg-button-right.png) no-repeat 100% 0;
+	background: url(@templates_base@/img/bg-button-right.png) no-repeat 100% 0;
 	display: inline-block;
 	height: 26px;
 	margin: 0 -19px 0 0;
 	padding: 0 20px 0 0;
 }
 .grey-but {
-	background: url(/i/bg-button-left.png) no-repeat 0 100%;
+	background: url(@templates_base@/img/bg-button-left.png) no-repeat 0 100%;
 	color: #3c3c3c;
 	display: inline-block;
 	font-weight: bold;
@@ -987,7 +987,7 @@
 }
 .grey-but:hover { color: #3c3c3c; text-decoration: none; }
 .grey-but span {
-	background: url(/i/bg-button-right.png) no-repeat 100% 100%;
+	background: url(@templates_base@/img/bg-button-right.png) no-repeat 100% 100%;
 	display: inline-block;
 	height: 26px;
 	margin: 0 -19px 0 0;
@@ -1029,13 +1029,13 @@
 #footer .copy .doplinks a { padding: 0 15px; }
 #footer .copy .doplinks a:first-child { padding-left: 0; }
 #footer .links {
-	background: url(/i/bg-blinks.jpg) no-repeat 0 0;
+	background: url(@templates_base@/img/bg-blinks.jpg) no-repeat 0 0;
 	float: left;
 	padding: 18px 0 36px 16px;
 	width: 124px;
 }
 #footer .links ul li {
-	background: url(/i/li-blinks.gif) no-repeat 0 6px;
+	background: url(@templates_base@/img/li-blinks.gif) no-repeat 0 6px;
 	padding: 0 0 0 11px;
 }
 #footer .payment {
@@ -1076,7 +1076,7 @@
 	-webkit-border-radius: 3px;
 }
 .basketStatus .basketArrow {
-	background: url(/i/con-basket-arrow.png) no-repeat 0 0; 
+	background: url(@templates_base@/img/con-basket-arrow.png) no-repeat 0 0;
 	height: 15px;
 	margin: -55px 0 0 22px;
 	position: relative;
Index: branches/1.0.x/img/bg-button-continue-left.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/validate/con-error.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/bg-block.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/icon-download.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/bg-doplinks.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/icon-help.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/icon-compare.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/icon-step.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/bg-cart.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/icon-galka.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/ribbon.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/bg-button-compare-add.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/bg-button-compare-left.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/inc/category.css
===================================================================
diff -u -N -r14600 -r14708
--- branches/1.0.x/inc/category.css	(.../category.css)	(revision 14600)
+++ branches/1.0.x/inc/category.css	(.../category.css)	(revision 14708)
@@ -36,7 +36,7 @@
 	width: 48px;
 	height: 21px;
 	display: block;
-	background: url(/i/display-view.png) no-repeat 0 0;
+	background: url(@templates_base@/img/display-view.png) no-repeat 0 0;
 	outline: none;
 	text-indent: -9999px;
 }
@@ -52,7 +52,7 @@
 	width: auto;
 }
 .items .ribbon {
-	background: url(/i/ribbon.png) no-repeat 0 0;
+	background: url(@templates_base@/img/ribbon.png) no-repeat 0 0;
 	height: 40px;
 	position: absolute;
 	top: -3px; right: -26px;
@@ -108,7 +108,7 @@
 }
 .items .item .price-block em.price span { font-size: 0.708em; }
 .items .item .price-block .addtocart {
-	background: url(/i/addtocart-left.jpg) no-repeat 0 0;
+	background: url(@templates_base@/img/addtocart-left.jpg) no-repeat 0 0;
 	color: #faffed;
 	display: inline-block;
 	font-size: 1.077em;
@@ -117,7 +117,7 @@
 	text-decoration: none;
 }
 .items .item .price-block .addtocart span {
-	background: url(/i/addtocart-right.jpg) no-repeat 100% 0;
+	background: url(@templates_base@/img/addtocart-right.jpg) no-repeat 100% 0;
 	display: inline-block;
 	height: 33px;
 	line-height: 33px;
@@ -175,7 +175,7 @@
 .pagination { padding-top: 20px; text-align: center; }
 .pagination span,
 .pagination a {
-	background: url(/i/paginate.png) no-repeat -28px 0;
+	background: url(@templates_base@/img/paginate.png) no-repeat -28px 0;
 	color: #fff;
 	display: inline-block;
 	font-size: 1.308em;
@@ -207,11 +207,13 @@
 }
 
 /*** Searchbox ***/
+/*
 .form { padding: 10px 0; }
 .form input[type="text"] {
 	border: none;
-	background: #fff url(/i/bg-searchfield.jpg) no-repeat 0 0;
+	background: #fff url(@templates_base@/img/bg-searchfield.jpg) no-repeat 0 0;
 	height: 23px;
 	padding: 2px 5px 2px 35px;
 	width: 162px;
 }
+*/
Index: branches/1.0.x/img/samples/slider.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/bg-point-menu-active.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/addtocart-left.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/samples/good-details.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/icon-delete.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/safe-shop2.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/designs/default_design.des.tpl
===================================================================
diff -u -N -r14600 -r14708
--- branches/1.0.x/designs/default_design.des.tpl	(.../default_design.des.tpl)	(revision 14600)
+++ branches/1.0.x/designs/default_design.des.tpl	(.../default_design.des.tpl)	(revision 14708)
@@ -1,35 +1,55 @@
 <inp2:m_CheckSSL/>
 
-<html lang="<inp2:lang.current_Field name='Locale' db='1'/>">
-	<head>
-		<title><inp2:m_GetConfig name="Site_Name"/> &mdash; <inp2:st_PageInfo type="title"/></title>		
-		<inp2:m_Include template="elements/html_head.elm" strip_nl="2"/>
-		<inp2:m_Include template="elements/content_boxes.elm" strip_nl="2"/>  <!--## includes system elements ##-->
-	</head>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 
-	<body>
+<html xmlns="http://www.w3.org/1999/xhtml" lang="<inp2:lang.current_Field name='Locale' db='1'/>">
+
+<head>
+	<title><inp2:m_GetConfig name="Site_Name"/> &mdash; <inp2:st_PageInfo type="title"/></title>
+	<inp2:m_Include template="elements/html_head.elm" strip_nl="2"/>
+	<inp2:m_Include template="elements/content_boxes.elm" strip_nl="2"/>  <!--## includes system elements ##-->
+
+	<link rel="stylesheet" rev="stylesheet" href="<inp2:m_Compress from='all_css'/>" type="text/css" />
 	
-		<!--## System tag please do not remove ##-->
-		<inp2:st_EditPage mode="start"/>
-		
-		<div class="main">
-				
+<!--##	
+	<script type="text/javascript" src="<inp2:m_Compress from='all_js'/>"></script>
+##-->
+	
+	<inp2:m_RenderElement name="add_to_head"  default_element="default_add_to_head"/>
+</head>
 
-				<inp2:m_Include template="elements/header.elm" />
+<body>
 
-				
-				<inp2:m_RenderElement name="content"/>
+	<!--## System tag please do not remove ##-->
+	<inp2:st_EditPage mode="start"/>
 
+	<inp2:m_Include template="elements/header.elm" />	
+	<inp2:m_Include template="elements/menu.elm" />
 
-				<inp2:m_Include template="elements/footer.elm" />
+	<div id="content">
+		<div class="padding">
+		
+			<div class="leftcol">
+				<inp2:m_RenderElement name="sidebar" default_element="default_sidebar"/>
+			</div>
+		
+			<div class="contentcol">
+				<inp2:m_RenderElement name="content"/>
+			</div>
+			<div class="clear"></div>
+			
+		</div>
+	</div>
 
-		</div>	
-		<!--footer end-->
+	<inp2:m_Include template="elements/footer_menu.elm" />
 	
-		<inp2:st_EditPage mode="end"/> <!--## /System tag please do not remove ##-->
+	<inp2:m_Include template="elements/footer.elm" />
 
-		<inp2:m_Include template="elements/tracking.elm" />
-		
-		<script type="text/javascript"> Cufon.now(); </script>
-	</body>
+	<inp2:st_EditPage mode="end"/> <!--## /System tag please do not remove ##-->
+
+	<inp2:m_Include template="elements/tracking.elm" />
+	
+	<inp2:m_RenderElement name="add_to_footer" default_element="default_add_to_footer"/>
+</body>
 </html>
\ No newline at end of file
Index: branches/1.0.x/img/success.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/samples/good1.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/inc/flexslider.css
===================================================================
diff -u -N -r14600 -r14708
--- branches/1.0.x/inc/flexslider.css	(.../flexslider.css)	(revision 14600)
+++ branches/1.0.x/inc/flexslider.css	(.../flexslider.css)	(revision 14708)
@@ -17,7 +17,7 @@
 	width: 19px;
 	height: 20px;
 	display: block;
-	background: url(/i/buttons-slider.png) no-repeat 0 0;
+	background: url(@templates_base@/img/buttons-slider.png) no-repeat 0 0;
 	cursor: pointer;
 	color: #222;
 	text-shadow: 0px 2px 1px #ccc;
Index: branches/1.0.x/img/special-navi.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/samples/good3.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/validate/con-success-arrow.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/elements/side_boxes/compare.elm.tpl
===================================================================
diff -u -N
--- branches/1.0.x/elements/side_boxes/compare.elm.tpl	(revision 0)
+++ branches/1.0.x/elements/side_boxes/compare.elm.tpl	(revision 14708)
@@ -0,0 +1 @@

\ No newline at end of file
Index: branches/1.0.x/img/samples/good5.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/inc/cart.css
===================================================================
diff -u -N -r14600 -r14708
--- branches/1.0.x/inc/cart.css	(.../cart.css)	(revision 14600)
+++ branches/1.0.x/inc/cart.css	(.../cart.css)	(revision 14708)
@@ -7,7 +7,7 @@
 	width: 535px;
 }
 .steps li {
-	background: url(/i/icon-step.png) no-repeat 100% 40%;
+	background: url(@templates_base@/img/icon-step.png) no-repeat 100% 40%;
 	color: #bdbdbd;
 	float: left;
 	font-size: 9pt;
@@ -28,16 +28,16 @@
 	margin: 0 auto 5px;
 	width: 40px;
 }
-.steps li.step1 i { background: url(/i/cart-steps.png) no-repeat 0 0; }
-.steps li.step2 i { background: url(/i/cart-steps.png) no-repeat 0 -36px; }
-.steps li.step3 i { background: url(/i/cart-steps.png) no-repeat 0 -72px; }
+.steps li.step1 i { background: url(@templates_base@/img/cart-steps.png) no-repeat 0 0; }
+.steps li.step2 i { background: url(@templates_base@/img/cart-steps.png) no-repeat 0 -36px; }
+.steps li.step3 i { background: url(@templates_base@/img/cart-steps.png) no-repeat 0 -72px; }
 .steps li a {
 	color: #bdbdbd;
 	text-decoration: none;
 }
-.steps li.step1.active i { background: url(/i/cart-steps.png) no-repeat -40px 0; }
-.steps li.step2.active i { background: url(/i/cart-steps.png) no-repeat -40px -36px; }
-.steps li.step3.active i { background: url(/i/cart-steps.png) no-repeat -40px -72px; }
+.steps li.step1.active i { background: url(@templates_base@/img/cart-steps.png) no-repeat -40px 0; }
+.steps li.step2.active i { background: url(@templates_base@/img/cart-steps.png) no-repeat -40px -36px; }
+.steps li.step3.active i { background: url(@templates_base@/img/cart-steps.png) no-repeat -40px -72px; }
 .steps li.active a { color: #878787; }
 
 
@@ -70,14 +70,14 @@
 	position: relative;
 }
 .cart-detail .halfcol-last .badge-optional {
-	background: url(/i/badge-optional.png) no-repeat 0 0;
+	background: url(@templates_base@/img/badge-optional.png) no-repeat 0 0;
 	height: 40px;
 	position: absolute;
 	top: -44px; left: -20px;
 	width: 102px;
 }
 .cart-detail .fieldset {
-	background: url(/i/bg-form-fieldset.jpg) repeat-x 0 0;
+	background: url(@templates_base@/img/bg-form-fieldset.jpg) repeat-x 0 0;
 	color: #000;
 	font-weight: bold;
 	height: 26px;
@@ -131,11 +131,11 @@
 .checkout-form .field { width: 300px; }
 .checkout-form select.field { width: 311px; }
 .field.statusSuccess {
-	background: url(/i/bg-field-success.jpg) repeat-x 0 0;
+	background: url(@templates_base@/img/bg-field-success.jpg) repeat-x 0 0;
 	border: 1px solid #80d04d;
 }
 .field.statusError {
-	background: url(/i/bg-field-error.jpg) repeat-x 0 0;
+	background: url(@templates_base@/img/bg-field-error.jpg) repeat-x 0 0;
 	border: 1px solid #d80000;
 }
 
@@ -194,7 +194,7 @@
 #result-password .colorbar.meterExcel { background-color: #66c133; }
 
 .checkout-form .safe-shop {
-	background: url(/i/safe-shop.jpg) no-repeat 0 40px;
+	background: url(@templates_base@/img/safe-shop.jpg) no-repeat 0 40px;
 	min-height: 160px;
 	margin: 115px 0 115px 50px;
 }
@@ -208,7 +208,7 @@
 	padding: 10px 0 0 130px;
 }
 .checkout-form .safe-shop ul.list li {
-	background: url(/i/icon-galka.png) no-repeat 0 50%;
+	background: url(@templates_base@/img/icon-galka.png) no-repeat 0 50%;
 	color: #313030;
 	font-weight: bold;
 	padding: 6px 0 6px 25px;
@@ -240,7 +240,7 @@
 .place-grey-button,
 .checkout-button,
 .checkout-grey-button {
-	background: url(/i/order-left.jpg) no-repeat 0 0;
+	background: url(@templates_base@/img/order-left.jpg) no-repeat 0 0;
 	color: #faffed;
 	display: inline-block;
 	font-size: 1.385em;
@@ -252,7 +252,7 @@
 .place-grey-button span,
 .checkout-button span,
 .checkout-grey-button span {
-	background: url(/i/order-right.jpg) no-repeat 100% 0;
+	background: url(@templates_base@/img/order-right.jpg) no-repeat 100% 0;
 	display: inline-block;
 	height: 37px;
 	line-height: 37px;
@@ -264,34 +264,34 @@
 .checkout-grey-button:hover { color: #faffed; }
 
 .checkout-button span {
-	background: url(/i/checkout-right.jpg) no-repeat 100% 0;
+	background: url(@templates_base@/img/checkout-right.jpg) no-repeat 100% 0;
 	padding: 0 30px 0 20px;
 }
 .place-grey-button {
-	background: url(/i/checkout-grey-left.jpg) no-repeat 0 0;
+	background: url(@templates_base@/img/checkout-grey-left.jpg) no-repeat 0 0;
 }
 .place-grey-button span {
-	background: url(/i/order-grey-right.jpg) no-repeat 100% 0;
+	background: url(@templates_base@/img/order-grey-right.jpg) no-repeat 100% 0;
 }
 .checkout-grey-button {
-	background: url(/i/checkout-grey-left.jpg) no-repeat 0 0;
+	background: url(@templates_base@/img/checkout-grey-left.jpg) no-repeat 0 0;
 	margin-top: 20px;
 }
 .checkout-grey-button span {
-	background: url(/i/checkout-grey-right.jpg) no-repeat 100% 0;
+	background: url(@templates_base@/img/checkout-grey-right.jpg) no-repeat 100% 0;
 	padding: 0 30px 0 20px;
 }
 
 .continue-button {
-	background: url(/i/bg-button-continue-right.jpg) no-repeat 100% 0;
+	background: url(@templates_base@/img/bg-button-continue-right.jpg) no-repeat 100% 0;
 	color: #3c3c3c;
 	display: inline-block;
 	font-weight: bold;
 	margin-right: 20px;
 	text-decoration: none;
 }
 .continue-button span {
-	background: url(/i/bg-button-continue-left.jpg) no-repeat 0 0;
+	background: url(@templates_base@/img/bg-button-continue-left.jpg) no-repeat 0 0;
 	display: inline-block;
 	height: 26px;
 	line-height: 26px;
@@ -302,7 +302,7 @@
 }
 
 .cart-detail.receipt .success-order {
-	background: url(/i/success.png) no-repeat 30px 30px;
+	background: url(@templates_base@/img/success.png) no-repeat 30px 30px;
 	border-bottom: 1px solid #d0d0d0;
 	margin-bottom: 25px;
 	padding: 0 0 25px 130px;
@@ -312,15 +312,15 @@
 	padding: 0;
 }
 .cart-detail.receipt .success-order .links a.link-print {
-	background: url(/i/icon-print.jpg) no-repeat 0 0;
+	background: url(@templates_base@/img/icon-print.jpg) no-repeat 0 0;
 	display: inline-block;
 	font-weight: bold;
 	height: 32px;
 	line-height: 32px;
 	padding: 0 20px 0 40px;
 }
 .cart-detail.receipt .success-order .links a.link-download {
-	background: url(/i/icon-download.jpg) no-repeat 0 0;
+	background: url(@templates_base@/img/icon-download.jpg) no-repeat 0 0;
 	display: inline-block;
 	font-weight: bold;
 	height: 32px;
@@ -360,7 +360,7 @@
 	margin-top: 0;
 }
 .cart-detail.receipt .items thead {
-	background: url(/i/bg-form-fieldset.jpg) repeat-x 0 0;
+	background: url(@templates_base@/img/bg-form-fieldset.jpg) repeat-x 0 0;
 	border: 1px solid #adadad;
 }
 .cart-detail.receipt .items th {
@@ -425,10 +425,10 @@
 	width: 21px;
 	z-index: 5006;
 }
-.formStatus.formSuccess .formContent { background: #398d1d url(/i/validate/con-success.png) repeat-x 0 0; }
-.formStatus.formSuccess .formArrow { background: url(/i/validate/con-success-arrow.png) no-repeat 0 0; }
-.formStatus.formError .formContent { background: #990000 url(/i/validate/con-error.png) repeat-x 0 0; }
-.formStatus.formError .formArrow { background: url(/i/validate/con-error-arrow.png) no-repeat 0 0; }
+.formStatus.formSuccess .formContent { background: #398d1d url(@templates_base@/img/validate/con-success.png) repeat-x 0 0; }
+.formStatus.formSuccess .formArrow { background: url(@templates_base@/img/validate/con-success-arrow.png) no-repeat 0 0; }
+.formStatus.formError .formContent { background: #990000 url(@templates_base@/img/validate/con-error.png) repeat-x 0 0; }
+.formStatus.formError .formArrow { background: url(@templates_base@/img/validate/con-error-arrow.png) no-repeat 0 0; }
 
 .cart-detail.receipt dl.total { float: right; padding-right: 30px; }
 
Index: branches/1.0.x/img/con-contact.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/zoom/bg-line.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/icon-tw.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/bg-form-fieldset.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/star-small.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/order-grey-right.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/order-right.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/modal/close.png
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/inc/layout.css
===================================================================
diff -u -N
--- branches/1.0.x/inc/layout.css	(revision 14600)
+++ branches/1.0.x/inc/layout.css	(revision 0)
@@ -1,33 +0,0 @@
-.col1,.col2,.col3,.cols {
-	float:left;
-}
-.col1 {
-	width:500px;
-}
-.col2 {
-	width:290px;
-}
-.cols {
-	width:225px;
-}
-
-/* index.html */
-#page1 {
-	background:url('@templates_base@/img/bg_top.gif');
-}
-#page1 .text {
-	background:url('@templates_base@/img/bg_img1.jpg') 0 0 no-repeat;
-	padding:71px 0 0 535px;
-	margin-top:17px;
-	height:339px;
-}
-#page1 .text1 span {
-	padding-bottom:40px;
-}
-
-/* index-1.html */
-/* index-2.html */
-/* index-3.html */
-#page4 .cols {
-	width:85px;
-}
\ No newline at end of file
Index: branches/1.0.x/img/bg-button-compare-right.jpg
===================================================================
diff -u -N
Binary files differ
Index: branches/1.0.x/img/checkout-right.jpg
===================================================================
diff -u -N
Binary files differ