Page MenuHomeIn-Portal Phabricator
Files F860240

in-commerce
No OneTemporary
Actions

File Metadata

Created
Wed, Apr 30, 6:07 PM

in-commerce
View Options

Index: branches/RC/themes/default2009/in-commerce/detail.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/detail.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/detail.tpl (revision 11485)
@@ -1,283 +1,296 @@
-<!--## ADD CURRENT PRODUCT TO RECENTLY VIEWED PRODUCTS ##-->
-<inp2:p_AddToRecent />
-<!--## /ADD CURRENT PRODUCT TO RECENTLY VIEWED PRODUCTS ##-->
+<inp2:p_AddToRecent /> <!--## ADD CURRENT PRODUCT TO RECENTLY VIEWED PRODUCTS ##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:p_Field name="Name"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories.elm" data_exists="1" design="blue_box"/>
-
- <inp2:m_RenderElements
- elements="
- platform/elements/side_boxes/login.elm,
- platform/elements/side_boxes/search.elm,
- "
- design="blue_box"/>
-
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/action_box.elm" item_actions="1" design="blue_box"/>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories.elm" data_exists="1" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/action_box.elm" item_actions="1" design="blue_box"/>
+ </div>
</inp2:m_DefineElement>
<!--## /SIDE-BAR ELEMENT ##-->
-<!--## ADDITIONAL IMAGE ELEMENT ##-->
-<inp2:m_DefineElement name="additional_image_element">
- <td>
- <a href="<inp2:ImageSrc format="resize:450x450;wm:platform/img/logo_watermark.png|-1|-1"/>" class="thickbox" rel="product-images" title="<inp2:m_param name="alt"/>">
- <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"/> border="0" /><br />
- </a>
- </td>
- <inp2:m_if check="m_Param" name="not_last">
- <td>
- <img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="8" height="1" alt="" />
- </td>
- </inp2:m_if>
-</inp2:m_DefineElement>
-<!--## /ADDITIONAL IMAGE ELEMENT ##-->
-
<!--## MAIN CONTENT ##-->
<inp2:m_DefineElement name="content">
+
+<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="__item__" templates="__default__" show_category="1"/>
+</div>
+<div class="movable-element">
<!-- Product Details -->
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_ProductDetails"/>
</inp2:m_Capture>
<table class="fullwidth table-border">
<tr>
<td class="item-padding">
<img src="<inp2:m_TemplatesBase module="In-Commerce"/>img/shopping_cart_item.gif" alt=""/> <span class="text-title"><inp2:p_Field name="Name"/></span>
<inp2:m_if check="p_Field" name="IsHot"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_hot.gif" alt="<inp2:m_phrase name="lu_Hot"/>"/></inp2:m_if>
<inp2:m_if check="p_Field" name="IsNew"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_new.gif" alt="<inp2:m_phrase name="lu_New"/>"/></inp2:m_if>
<inp2:m_if check="p_Field" name="IsPop"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_popular.gif" alt="<inp2:m_phrase name="lu_Pop"/>"/></inp2:m_if>
<inp2:m_if check="p_IsEditorsPick"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_pick.gif" alt="<inp2:m_phrase name="lu_Pick"/>"/></inp2:m_if>
<inp2:m_if check="p_IsFavorite"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_favorite.gif" alt="<inp2:m_phrase name="lu_Favorite"/>"/></inp2:m_if>
<inp2:p_VotesIndicator render_as="rating_element"/>
<br />
<br />
<table>
<tr>
<td style="text-align: center; padding-right: 10px;" valign="top">
<!--## Check if image exists ##-->
<inp2:m_if check="p_ImageSrc" MaxWidth="fullsize">
<a href="<inp2:p_ImageSrc DefaultImage="platform/img/no_picture.gif" format="resize:450x450;wm:platform/img/logo_watermark.png|-1|-1"/>" class="thickbox" rel="product-images" title="<inp2:p_Field name='Name' html_escape='1'/>">
<inp2:p_Image render_as="image_element" Primary="1" MaxWidth="thumbnail" DefaultWidth="150" DefaultImage="platform/img/no_picture.gif" align="center"/><br />
</a>
<!--## Check if image exists ##-->
<inp2:m_else/>
<inp2:p_Image render_as="image_element" Primary="1" MaxWidth="thumbnail" DefaultWidth="150" DefaultImage="platform/img/no_picture.gif" align="center"/><br />
</inp2:m_if>
<br />
<inp2:m_if check="p_HasAdditionalImages">
<a href="<inp2:p_ProductLink template="__default__" />#images"><inp2:m_Phrase label="lu_btn_MoreImages"/></a>
<br /><br />
</inp2:m_if>
<span class="product-price-large"><inp2:p_Field name="Price" currency="selected"/></span><br /><br />
<inp2:m_if check="p_Available">
<inp2:m_if check="p_ShouldListOptions" required_only="1"><inp2:m_else/>
<input class="button" onclick=" window.location.href='<inp2:p_AddToCartLink template="in-commerce/checkout/shop_cart" product_template="__default__"/>' " type="button" value="<inp2:m_Phrase label="lu_comm_BuyNow"/>" />
</inp2:m_if>
<inp2:m_else />
<strong><inp2:m_phrase label="lu_comm_outofstock"/></strong>
</inp2:m_if>
</td>
<td valign="top">
<strong><inp2:m_phrase label="lu_Added"/>:</strong> <inp2:p_field field="CreatedOn_date" format="_regional_DateFormat"/><br />
<strong><inp2:m_phrase label="lu_Hits"/>:</strong> <inp2:p_field field="Hits"/><br />
<strong><inp2:m_phrase label="lu_Reviews"/>:</strong> <inp2:p_field field="CachedReviewsQty"/>
<a href="<inp2:p_ProductLink template="in-commerce/products/add_review"/>"><inp2:m_phrase name="lu_btn_AddReview"/></a><br />
<strong><inp2:m_phrase label="lu_Rating"/>:</strong> <inp2:p_field field="CachedRating"/> (<inp2:m_phrase label="lu_Votes"/>: <inp2:p_field field="CachedVotesQty"/>)
<a href="<inp2:p_ProductLink template="in-commerce/products/add_review"/>"><inp2:m_phrase name="lu_btn_RateThisProduct"/></a><br />
<br />
<inp2:m_if check="p_Field" name="SKU">
<strong><inp2:m_Phrase label="lu_fld_SKU"/>:</strong> <inp2:p_field name="SKU"/><br />
</inp2:m_if>
<inp2:m_if check="p_Field" name="ManufacturerId">
<strong><inp2:m_Phrase label="lu_fld_Manufacturer"/>:</strong> <inp2:p_field name="ManufacturerId"/> (<inp2:m_Phrase label="lu_comm_OtherProductsBy"/> <a href="<inp2:p_ManufacturerLink template="in-commerce/products/manufacturer_products" />"><inp2:p_Field name="ManufacturerId"/></a> <inp2:m_Phrase label="lu_comm_OtherProducts"/>) <br />
</inp2:m_if>
<inp2:m_if check="p_Field" name="MSRP">
<strong><inp2:m_Phrase label="lu_fld_MSRP"/>:</strong> <span class="product-price-msrp"><inp2:p_Field name="MSRP" currency="selected"/></span> <br />
</inp2:m_if>
<strong><inp2:m_Phrase label="lu_fld_OurPrice"/>: <span class="product-price"><inp2:p_Field name="Price" currency="selected"/></span></strong> <br />
<inp2:m_if check="p_Savings">
<strong><inp2:m_Phrase label="lu_fld_YouSave"/>: <span class="product-price"><inp2:p_Savings currency="selected" /> (<inp2:p_Savings type="percent"/>%)</span></strong><br/>
</inp2:m_if>
<br />
<inp2:m_if check="p_CustomField" name="Availability">
<strong><inp2:p_CustomFieldLabel field="Availability"/>:</strong>
<inp2:p_CustomField name="Availability"/>
<br />
<br />
</inp2:m_if>
<inp2:m_if check="p_HasQuantityPricing">
<inp2:m_if check="p_IsTangible">
<table>
<tr>
<td colspan="2" class="block-header">
<inp2:m_Phrase label="lu_comm_QuantityPricing"/>
</td>
</tr>
<tr class="cart-header">
<td>
<inp2:m_Phrase label="lu_comm_Quantity"/>
</td>
<td>
<inp2:m_Phrase label="lu_comm_Price"/>
</td>
</tr>
<inp2:m_DefineElement name="price_bracket">
<tr class="cart-item-small">
<td>
<inp2:Field name="MinQty"/> - <inp2:Field name="MaxQty"/>
</td>
<td>
<inp2:m_if check="Field" name="Negotiated">
<a href="mailto:<inp2:conf_ConfigValue name="Comm_Contacts_Email"/>"><inp2:conf_ConfigValue name="Comm_Contacts_Email"/></a>
<inp2:m_else/>
<inp2:Field name="Price" currency="selected"/>
</inp2:m_if>
</td>
</tr>
</inp2:m_DefineElement>
<inp2:p_ListPriceBrackets render_as="price_bracket"/>
</table>
<br />
</inp2:m_if>
<inp2:m_if check="p_IsSubscription">
<table>
<tr>
<td colspan="3" class="block-header">
<inp2:m_Phrase label="lu_comm_Pricing"/>
</td>
</tr>
<tr class="cart-header">
<td>
<inp2:m_Phrase label="lu_comm_AccessDuration"/>
</td>
<td>
<inp2:m_Phrase label="lu_comm_Price"/>
</td>
<td>&nbsp;
</td>
</tr>
<inp2:m_DefineElement name="access_price_bracket">
<tr class="cart-item-small">
<td>
<inp2:Field name="AccessDuration"/> <inp2:Field name="AccessUnit"/>
<br />
<small><inp2:Field name="Description"/></small>
</td>
<td>
<inp2:Field name="Price" currency="selected"/>
</td>
<td>
<a href="<inp2:AddToCartLink template="in-commerce/checkout/shop_cart" product_template="__default__"/>"><img src="<inp2:m_TemplatesBase module="In-Commerce"/>img/buy2.gif" alt="<inp2:m_Phrase label="lu_comm_BuyNow"/>" width="15" height="17" border="0" /></a>
</td>
</tr>
</inp2:m_DefineElement>
<inp2:p_ListPriceBrackets render_as="access_price_bracket"/>
</table>
<br />
</inp2:m_if>
</inp2:m_if>
- <inp2:m_include template="in-commerce/products/form_options"/>
+ <inp2:m_include template="in-commerce/products/form_options.elm"/>
<inp2:m_if check="p_Field" name="Description">
<strong><inp2:m_Phrase label="lu_fld_Description"/>:</strong> <inp2:p_Field name="Description"/> <br />
</inp2:m_if>
<br />
<inp2:m_if check="p_CustomField" name="Features">
<strong><inp2:p_CustomFieldLabel field="Features"/>:</strong>
<inp2:p_CustomField name="Features"/>
<br />
<br />
</inp2:m_if>
<inp2:m_if check="p_IsFavorite">
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/ic_removefromfav.gif" width="11" height="10" alt="" /> <a class="item-action" href="<inp2:p_FavoriteToggleLink/>"><inp2:m_phrase name="lu_btn_RemoveFromWishList"/></a>
<inp2:m_else/>
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/ic_addtofav.gif" width="11" height="10" alt="" /> <a class="item-action" href="<inp2:p_FavoriteToggleLink template="platform/my_account/my_favorites"/>"><inp2:m_phrase name="lu_btn_AddToWishList"/></a>
</inp2:m_if>
</td>
</tr>
</table>
<br />
<inp2:m_if check="p_HasAdditionalImages">
+ <!--## ADDITIONAL IMAGE ELEMENT ##-->
+ <inp2:m_DefineElement name="additional_image_element">
+ <td>
+ <a href="<inp2:ImageSrc format="resize:450x450;wm:platform/img/logo_watermark.png|-1|-1"/>" class="thickbox" rel="product-images" title="<inp2:m_param name="alt"/>">
+ <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"/> border="0" /><br />
+ </a>
+ </td>
+ <inp2:m_if check="m_Param" name="not_last">
+ <td>
+ <img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="8" height="1" alt="" />
+ </td>
+ </inp2:m_if>
+ </inp2:m_DefineElement>
+ <!--## /ADDITIONAL IMAGE ELEMENT ##-->
+
<a name="images"></a>
<inp2:m_RenderElement name="subsection" title="lu_section_AdditionalImages"/>
<table>
<tr>
<inp2:p_ListImages render_as="additional_image_element" types="additional" per_page="-1" no_table="1" MaxWidth="thumbnail" DefaultWidth="150" DefaultImage="platform/img/no_picture.gif"/>
</tr>
</table>
</inp2:m_if>
</td>
</tr>
</table>
</inp2:m_RenderElement>
<!-- // Product Details -->
+</div>
+<div class="movable-element">
<!-- Product Reviews -->
<inp2:m_DefineElement name="no_reviews">
<inp2:m_phrase name="lu_NoReviews"/>
</inp2:m_DefineElement>
<inp2:m_RenderElement design="content_box" data_exists="1" block_no_data="no_reviews">
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_section_Reviews"/> (<inp2:p-rev_TotalRecords/>)
</inp2:m_Capture>
<table>
<inp2:p-rev_PrintList render_as="review_element"/>
</table>
<inp2:m_include template="platform/elements/pagination.elm" prefix="p-rev"/>
</inp2:m_RenderElement>
<!-- // Product Reviews -->
+</div>
+<div class="movable-element">
<a name="related"></a>
<inp2:m_include template="in-commerce/elements/content_boxes/related_products.elm"/>
+
<!--## RELATED TO PRODUCT ITEMS ##-->
<inp2:m_RenderElement design="content_box" related_to="Product" data_exists="1">
<inp2:m_Capture to_var="header">
<inp2:m_Phrase label="lu_title_RelatedItems"/>
</inp2:m_Capture>
<inp2:m_ModuleInclude template="elements/content_boxes/related_items.elm" related_to="$related_to" skip_prefixes="p" />
</inp2:m_RenderElement>
<!--## // RELATED TO PRODUCT ITEMS ##-->
+</div>
</inp2:m_DefineElement>
<!--## /MAIN CONTENT ##-->
<!--## DESIGN TEMPLATE ##-->
-<inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Property changes on: branches/RC/themes/default2009/in-commerce/detail.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.5
\ No newline at end of property
+1.1.2.6
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/my_account/my_downloads_more.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/my_account/my_downloads_more.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/my_account/my_downloads_more.tpl (revision 11485)
@@ -1,81 +1,90 @@
-<!--## LOGIN REQUIRED ##-->
-<inp2:m_RequireLogin login_template="platform/login/register"/>
-<!--## /LOGIN REQUIRED ##-->
-
-<!--## CHECK IF SSL REQUIRED ##-->
-<inp2:m_CheckSSL mode="required" condition="Require_SSL" />
-<!--## /CHECK IF SSL REQUIRED ##-->
+<inp2:m_RequireLogin login_template="platform/login/register"/> <!--## LOGIN REQUIRED ##-->
+<inp2:m_CheckSSL mode="required" condition="Require_SSL" /> <!--## CHECK IF SSL REQUIRED ##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:p_Field name="Name" /> - <inp2:m_phrase name="lu_title_ProductFiles"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
- <inp2:m_RenderElements
- elements="
- platform/elements/side_boxes/login.elm,
- platform/elements/side_boxes/search.elm,
- in-commerce/elements/side_boxes/credit_cards.elm,
- "
- design="blue_box"/>
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ </div>
</inp2:m_DefineElement>
<!--## SIDE-BAR ELEMENT ##-->
<!--## MAIN CONTENT ##-->
<inp2:m_DefineElement name="content">
+
+<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_MyDownloads,__item__,lu_title_ProductFiles" templates="platform/my_account/my_account,in-commerce/my_account/my_downloads,__default__,in-commerce/my_account/my_downloads_more"/>
+</div>
+<div class="movable-element">
<!--## MORE DOWNLOADS ##-->
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:p_Field name="Name" /> - <inp2:m_phrase name="lu_title_ProductFiles"/>
</inp2:m_Capture>
<table>
<tr>
<td style="text-align: center; padding-right: 10px;" valign="top">
<a href="<inp2:p_ImageSrc MaxWidth="fullsize" DefaultImage="platform/img/no_picture.gif"/>" target="_blank">
<inp2:p_Image render_as="image_element" Primary="1" MaxWidth="thumbnail" DefaultImage="platform/img/no_picture.gif"/><br />
</a>
</td>
<td>
<a href="<inp2:p_ProductLink template="__default__"/>" class="text-title"><inp2:p_field name="Name"/></a><br />
<inp2:m_if check="p_Field" name="ManufacturerId">
<inp2:m_Phrase label="lu_fld_Manufacturer"/>: <inp2:p_field name="ManufacturerId"/> (<inp2:m_Phrase label="lu_OtherProductsBy"/> <a href="<inp2:p_ManufacturerLink template="in-commerce/products/manufacturer_products" />"><inp2:p_Field name="ManufacturerId"/></a>) <br />
</inp2:m_if>
<br />
<inp2:m_Phrase label="lu_fld_Description"/>: <inp2:p_Field name="Description"/> <br /><br />
<inp2:m_if check="p_CustomField" name="Features">
<inp2:p_CustomFieldLabel field="Features"/>:
<inp2:p_CustomField name="Features"/>
<br />
<br />
</inp2:m_if>
<inp2:m_include template="in-commerce/designs/product_files.elm"/>
<inp2:m_RenderElement name="subsection" title="lu_section_Files"/>
<table>
<inp2:p_ListFiles render_as="product_file_element" per_page="-1"/>
</table>
</td>
</tr>
</table>
</inp2:m_RenderElement>
<!--## /MORE DOWNLOADS ##-->
+</div>
</inp2:m_DefineElement>
<!--## MAIN CONTENT ##-->
<!--## DESIGN TEMPLATE ##-->
-<inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Property changes on: branches/RC/themes/default2009/in-commerce/my_account/my_downloads_more.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.5
\ No newline at end of property
+1.1.2.6
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/my_account/my_addresses.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/my_account/my_addresses.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/my_account/my_addresses.tpl (revision 11485)
@@ -1,67 +1,80 @@
-<!--## LOGIN REQUIRED ##-->
-<inp2:m_RequireLogin login_template="platform/login/register"/>
-<!--## /LOGIN REQUIRED ##-->
+<inp2:m_RequireLogin login_template="platform/login/register"/> <!--## LOGIN REQUIRED ##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_Phrase label="lu_comm_MyAddresses"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
- <inp2:m_RenderElements
- elements="
- platform/elements/side_boxes/login.elm,
- platform/elements/side_boxes/search.elm,
- "
- design="blue_box"/>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ </div>
</inp2:m_DefineElement>
<!--## /SIDE-BAR ELEMENT ##-->
<!--## MAIN CONTENT ##-->
<inp2:m_DefineElement name="content">
+<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_MyAddresses" templates="platform/my_account/my_account,in-commerce/my_account/my_addresses"/>
<inp2:m_RenderElement design="content_box">
<inp2:addr_InitList list_name="my_addresses" types="myaddresses"/>
<inp2:m_Capture to_var="header">
<inp2:m_Phrase label="lu_comm_MyAddresses"/>
</inp2:m_Capture>
<inp2:m_include template="in-commerce/designs/addresses.elm"/>
<inp2:m_if check="ord_AllowAddAddress">
<a href="<inp2:m_Link template="in-commerce/my_account/new_address"/>"><inp2:m_Phrase label="lu_btn_NewAddress"/></a>
<br /><br />
</inp2:m_if>
<inp2:m_if check="addr_TotalRecords" list_name="my_addresses">
<table class="fullwidth">
<tr>
<td colspan="4">
<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
</td>
</tr>
<tr class="sub-section-header">
<td><inp2:m_Phrase label="lu_Address"/></td>
<td><inp2:m_Phrase label="lu_ContactInfo"/></td>
<td><inp2:m_Phrase label="lu_AddressUsedAs"/></td>
<td>&nbsp;</td>
</tr>
<inp2:addr_PrintList list_name="my_addresses" render_as="my_address_element" direction="H"/>
</table>
<inp2:m_include template="platform/elements/pagination.elm" prefix="addr" list_name="my_addresses"/>
<inp2:m_else/>
<strong><inp2:m_Phrase label="lu_comm_DontHaveAddresses"/></strong>
</inp2:m_if>
</inp2:m_RenderElement>
+</div>
+
</inp2:m_DefineElement>
<!--## /MAIN CONTENT ##-->
<!--## DESIGN TEMPLATE ##-->
-<inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Property changes on: branches/RC/themes/default2009/in-commerce/my_account/my_addresses.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.5
\ No newline at end of property
+1.1.2.6
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/my_account/my_orders.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/my_account/my_orders.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/my_account/my_orders.tpl (revision 11485)
@@ -1,63 +1,73 @@
-<!--## LOGIN REQUIRED ##-->
-<inp2:m_RequireLogin login_template="platform/login/register"/>
-<!--## /LOGIN REQUIRED ##-->
-
-<!--## CHECK IF SSL REQUIRED ##-->
-<inp2:m_CheckSSL mode="required" condition="Require_SSL" />
-<!--## /CHECK IF SSL REQUIRED ##-->
+<inp2:m_RequireLogin login_template="platform/login/register"/> <!--## LOGIN REQUIRED ##-->
+<inp2:m_CheckSSL mode="required" condition="Require_SSL" /> <!--## CHECK IF SSL REQUIRED ##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_phrase name="lu_title_MyOrders"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
- <inp2:m_RenderElements
- elements="
- platform/elements/side_boxes/login.elm,
- platform/elements/side_boxes/search.elm,
- "
- design="blue_box"/>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ </div>
</inp2:m_DefineElement>
<!--## /SIDE-BAR ELEMENT ##-->
<!--## MAIN CONTENT ##-->
<inp2:m_DefineElement name="content">
+
+<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_MyOrders" templates="platform/my_account/my_account,in-commerce/my_account/my_orders"/>
- <!--## my orders ##-->
- <inp2:ord_InitList list_name="my_orders" types="myorders"/>
+</div>
+<div class="movable-element">
+ <!--## my orders ##-->
<inp2:m_RenderElement design="content_box" block_no_data="no_orders">
+ <inp2:ord_InitList list_name="my_orders" types="myorders"/>
+
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_MyOrders"/> (<inp2:ord_TotalRecords list_name="my_orders"/>)
</inp2:m_Capture>
<inp2:m_include template="in-commerce/designs/orders.elm"/>
<table class="fullwidth">
<tr>
<td colspan="4">
<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
</td>
</tr>
<tr class="sub-section-header">
<td><inp2:m_Phrase label="lu_comm_OrderNumberText"/></td>
<td><inp2:m_Phrase label="lu_comm_Date"/></td>
<td><inp2:m_Phrase label="lu_comm_Amount"/></td>
<td><inp2:m_Phrase label="lu_comm_Status"/></td>
</tr>
<inp2:ord_PrintList list_name="my_orders" render_as="my_order_element"/>
</table>
<inp2:m_include template="platform/elements/pagination.elm" prefix="ord" list_name="my_orders"/>
</inp2:m_RenderElement>
<!--## // my orders ##-->
+</div>
+
</inp2:m_DefineElement>
<!--## /MAIN CONTENT ##-->
<!--## DESIGN TEMPLATE ##-->
-<inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Property changes on: branches/RC/themes/default2009/in-commerce/my_account/my_orders.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.5
\ No newline at end of property
+1.1.2.6
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/my_account/cancel_recurring.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/my_account/cancel_recurring.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/my_account/cancel_recurring.tpl (revision 11485)
@@ -1,59 +1,71 @@
+<inp2:m_RequireLogin login_template="platform/login/register"/> <!--## LOGIN REQUIRED ##-->
+<inp2:m_CheckSSL mode="required" condition="Require_SSL" /> <!--## CHECK IF SSL REQUIRED ##-->
+
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_phrase name="lu_title_CancelRecurring"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
-<!--## LOGIN REQUIRED ##-->
-<inp2:m_RequireLogin login_template="platform/login/register"/>
-<!--## /LOGIN REQUIRED ##-->
-
-<!--## CHECK IF SSL REQUIRED ##-->
-<inp2:m_CheckSSL mode="required" condition="Require_SSL" />
-<!--## /CHECK IF SSL REQUIRED ##-->
-
<!--## SIDE-BAR ELEMENTS ##-->
<inp2:m_DefineElement name="sidebar">
- <inp2:m_RenderElements
- elements="
- platform/elements/side_boxes/login.elm,
- platform/elements/side_boxes/search.elm,
- "
- design="blue_box"/>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ </div>
</inp2:m_DefineElement>
<!--## /SIDE-BAR ELEMENTS ##-->
<!--## MAIN CONTENT ##-->
<inp2:m_DefineElement name="content">
- <inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_MyOrders" templates="platform/my_account/my_account,in-commerce/my_account/my_orders"/>
+<div class="movable-element">
+ <inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_MyOrders,lu_title_CancelRecurring" templates="platform/my_account/my_account,in-commerce/my_account/my_orders,in-commerce/my_account/cancel_recurring"/>
+</div>
+<div class="movable-element">
<inp2:m_RenderElement design="content_box" block_no_data="no_orders">
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_CancelRecurring"/>
</inp2:m_Capture>
<table border="0" cellspacing="0" cellpadding="0">
<tr>
<td>
<strong><inp2:m_Phrase label="lu_CancelRecurring_confirm" /></strong>
<inp2:m_Phrase label="lu_CancelRecurring_confirm_prompt" />
<br />
<br />
<form method="POST" action="<inp2:m_FormAction />">
<input class="button" name="events[ord][OnCancelRecurring]" type="submit" value="<inp2:m_Phrase label="lu_Yes"/>" />&nbsp;
<input class="button" type="button" value="<inp2:m_Phrase label="lu_No"/>" onClick="window.location.href='<inp2:m_Link template="in-commerce/my_account/account"/>'" />&nbsp;
<input type="hidden" name="cancelrecurring_ok_template" value="in-commerce/my_account/cancel_recurring_ok"/>
</form>
</td>
</tr>
</table>
</inp2:m_RenderElement>
+</div>
+
</inp2:m_DefineElement>
<!--## /MAIN CONTENT ##-->
<!--## DESIGN TEMPLATE ##-->
-<inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Property changes on: branches/RC/themes/default2009/in-commerce/my_account/cancel_recurring.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.4
\ No newline at end of property
+1.1.2.5
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/my_account/my_order_details.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/my_account/my_order_details.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/my_account/my_order_details.tpl (revision 11485)
@@ -1,55 +1,66 @@
-<!--## LOGIN REQUIRED ##-->
-<inp2:m_RequireLogin login_template="platform/login/register"/>
-<!--## /LOGIN REQUIRED ##-->
-
-<!--## CHECK IF SSL REQUIRED ##-->
-<inp2:m_CheckSSL mode="required" condition="Require_SSL" />
-<!--## /CHECK IF SSL REQUIRED ##-->
+<inp2:m_RequireLogin login_template="platform/login/register"/> <!--## LOGIN REQUIRED ##-->
+<inp2:m_CheckSSL mode="required" condition="Require_SSL" /> <!--## CHECK IF SSL REQUIRED ##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_phrase name="lu_title_OrderPreview"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
- <inp2:m_RenderElements
- elements="
- platform/elements/side_boxes/login.elm,
- platform/elements/side_boxes/search.elm,
- in-commerce/elements/side_boxes/credit_cards.elm,
- "
- design="blue_box"/>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/credit_cards.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ </div>
</inp2:m_DefineElement>
<!--## /SIDE-BAR ELEMENT ##-->
<!--## MAIN CONTENT ##-->
<inp2:m_DefineElement name="content">
+
+<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_MyOrders,lu_title_OrderPreview" templates="platform/my_account/my_account,in-commerce/my_account/my_orders,in-commerce/my_account/my_order_details"/>
+</div>
+<div class="movable-element">
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_OrderPreview"/>
</inp2:m_Capture>
<form method="post" action="<inp2:m_FormAction/>">
<inp2:m_include template="in-commerce/elements/order_details.elm"/>
</form>
</inp2:m_RenderElement>
+</div>
+
</inp2:m_DefineElement>
<!--## /MAIN CONTENT ##-->
<!--## DESIGN TEMPLATE ##-->
-<inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
<!--## /DESIGN TEMPLATE ##-->
Property changes on: branches/RC/themes/default2009/in-commerce/my_account/my_order_details.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.5
\ No newline at end of property
+1.1.2.6
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_payment_type.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_payment_type.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_payment_type.tpl (revision 11485)
@@ -1,59 +1,78 @@
-<inp2:m_RequireLogin login_template="platform/login/register" />
-<inp2:m_RequireAffiliate registration_template="in-commerce/my_account/affiliate/affiliate" />
-<inp2:m_CheckSSL mode="required" condition="Require_SSL" />
+<inp2:m_RequireLogin login_template="platform/login/register"/> <!--## LOGIN REQUIRED ##-->
+<inp2:m_CheckSSL mode="required" condition="Require_SSL" /> <!--## CHECK IF SSL REQUIRED ##-->
+<inp2:m_RequireAffiliate registration_template="in-commerce/my_account/affiliate/affiliate" /> <!--## MUST BE AN AFFILIATE ##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_Phrase label="lu_title_AffiliatePaymentType"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
+<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
- <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-
- <inp2:m_if check="u_IsAffiliate">
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/affiliate_navigation.elm" design="blue_box"/>
- </inp2:m_if>
-
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_if check="u_IsAffiliate">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/affiliate_navigation.elm" design="blue_box"/>
+ </inp2:m_if>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ </div>
</inp2:m_DefineElement>
+<!--## /SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="content">
- <inp2:m_include template="platform/elements/navigation_bar.elm"
- titles="lu_title_MyAccount,lu_title_Affiliate,lu_title_AffiliateStatistics,lu_title_AffiliatePaymentType"
- templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate,in-commerce/my_account/affiliate/affiliate_statistics,in-commerce/my_account/affiliate/affiliate_payment_type"/>
+
+<div class="movable-element">
+ <inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_Affiliate,lu_title_AffiliateStatistics,lu_title_AffiliatePaymentType" templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate,in-commerce/my_account/affiliate/affiliate_statistics,in-commerce/my_account/affiliate/affiliate_payment_type"/>
+</div>
+
+<div class="movable-element">
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_Phrase label="lu_title_AffiliatePaymentType"/>
</inp2:m_Capture>
<table class="form-data fullwidth">
<tr>
<td class="field-name" style="width:155px">
<strong><inp2:m_Phrase label="lu_CurrentAffiliatePaymentType" />:</strong>
</td>
<td class="field-name"><inp2:u_AffiliateField name="PaymentTypeId" /></td>
</tr>
<tr><td colspan="2" style="padding-left:15px"><inp2:m_Phrase label="lu_ChangeAffiliatePaymentTypeDescription"/><br /><br /></td></tr>
</table>
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br />
<br />
<inp2:m_include template="in-commerce/elements/forms.elm"/>
<form method="post" action="<inp2:m_FormAction/>">
<table border="0" class="form-data fullwidth">
<inp2:m_RenderElement name="inp_affiliate_payment_types" field="PaymentTypeId" title="lu_fld_AffiliatePaymentType" style="width:155px"/>
<inp2:m_RenderElement name="inp_affiliate_textarea" field="Comments" title="lu_fld_AffiliateComments" cols="35" rows="5" style="width:155px" is_last="1"/>
<inp2:m_RenderElement design="inp_edit_buttons">
<input type="hidden" name="next_template" value="in-commerce/my_account/affiliate/affiliate_payment_type_changed" />
<input type="submit" class="button" name="events[affil][OnChangePaymentType]" id="events[affil][OnChangePaymentType]" value="<inp2:m_Phrase label="lu_ChangePaymentType"/>" />
</inp2:m_RenderElement>
</table>
</form>
</inp2:m_RenderElement>
+</div>
+
</inp2:m_DefineElement>
-<inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
\ No newline at end of file
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Property changes on: branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_payment_type.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.5
\ No newline at end of property
+1.1.2.6
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate.tpl (revision 11485)
@@ -1,94 +1,114 @@
-<inp2:m_RequireLogin login_template="platform/login/register"/>
-<inp2:m_CheckSSL mode="required" condition="Require_SSL" />
-
-<inp2:m_DefineElement name="affiliate_element">
- <a href="<inp2:m_Link template="$template"/>">
- <strong><inp2:m_Phrase label="$label"/></strong></a><br />
- <inp2:m_Phrase label="$text"/><br /><br />
-</inp2:m_DefineElement>
+<inp2:m_RequireLogin login_template="platform/login/register"/> <!--## LOGIN REQUIRED ##-->
+<inp2:m_CheckSSL mode="required" condition="Require_SSL" /> <!--## CHECK IF SSL REQUIRED ##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_Phrase label="lu_title_Affiliate"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
+<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
- <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-
- <inp2:m_if check="u_IsAffiliate">
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/affiliate_navigation.elm" design="blue_box"/>
- </inp2:m_if>
-
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_if check="u_IsAffiliate">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/affiliate_navigation.elm" design="blue_box"/>
+ </inp2:m_if>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ </div>
</inp2:m_DefineElement>
+<!--## /SIDE-BAR ELEMENT ##-->
+<!--## MAIN CONTENT ##-->
<inp2:m_DefineElement name="content">
- <inp2:m_include template="platform/elements/navigation_bar.elm"
- titles="lu_title_MyAccount,lu_title_Affiliate"
- templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate"/>
+<div class="movable-element">
+ <inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_Affiliate" templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate"/>
+</div>
+
+<div class="movable-element">
<inp2:m_RenderElement design="content_box">
+ <inp2:m_DefineElement name="affiliate_element">
+ <a href="<inp2:m_Link template="$template"/>">
+ <strong><inp2:m_Phrase label="$label"/></strong></a><br />
+ <inp2:m_Phrase label="$text"/><br /><br />
+ </inp2:m_DefineElement>
+
<inp2:m_if check="u_IsAffiliate">
<!-- Affiliate Section List -->
<inp2:m_Capture to_var="header">
<inp2:m_Phrase label="lu_title_Affiliate"/>
</inp2:m_Capture>
<inp2:m_if check="u_AffiliateIsNotActive">
<table class="warning-message fullwidth">
<tr>
<td width="30">
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/warning_icon.gif" width="21" height="18" alt=""/>
</td>
<td><inp2:m_phrase name="lu_Warning"/></td>
</tr>
</table>
<br />
<inp2:m_Phrase label="lu_AffiliateIsPendingOrDisabled"/><br /><br />
</inp2:m_if>
<inp2:m_RenderElement name="affiliate_element" template="in-commerce/my_account/affiliate/affiliate_statistics" label="lu_comm_AffiliateStatistics" text="lu_AffiliateStatisticsText"/>
<inp2:m_RenderElement name="affiliate_element" template="in-commerce/my_account/affiliate/affiliate_payments" label="lu_AffiliatePayments" text="lu_AffiliatePaymentsText"/>
<inp2:m_RenderElement name="affiliate_element" template="in-commerce/my_account/affiliate/affiliate_materials" label="lu_AffiliateMaterials" text="lu_AffiliateMaterialsText"/>
<inp2:m_RenderElement name="affiliate_element" template="in-commerce/my_account/affiliate/affiliate_payment_type" label="lu_ChangePaymentType" text="lu_ChangePaymentTypeText"/>
<a href="<inp2:m_Link t='in-commerce/my_account/affiliate'/>" onclick="showAffiliateAgreement();return false;">
<strong><inp2:m_Phrase label="lu_TermsAndConditionsLink"/></strong></a><br />
<inp2:m_Phrase label="lu_TermsAndConditionsText"/><br /><br />
<!-- End Of Affiliate Section List -->
<inp2:m_else />
<!-- Affiliate Registration -->
<inp2:m_Capture to_var="header">
<inp2:m_Phrase label="lu_title_AffiliateRegistration"/>
</inp2:m_Capture>
<inp2:m_Phrase label="lu_BecomeAnAffiliateDescription"/><br /><br />
<inp2:m_if check="u_HasError" field="any">
<inp2:m_RenderElement name="error_message" />
</inp2:m_if>
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br />
<br />
<inp2:m_include template="in-commerce/elements/forms.elm"/>
<form method="post" action="<inp2:m_FormAction/>">
<table border="0" class="form-data fullwidth">
<inp2:m_RenderElement name="inp_affiliate_box" field="SSN" title="lu_fld_SSNField" style="width:155px" required="1"/>
<inp2:m_RenderElement name="inp_affiliate_payment_types" field="PaymentTypeId" title="lu_fld_AffiliatePaymentType" style="width:155px"/>
<inp2:m_RenderElement name="inp_affiliate_textarea" field="Comments" title="lu_fld_AffiliateComments" cols="35" rows="5" style="width:155px"/>
<inp2:m_RenderElement name="inp_affiliate_terms_checkbox"/>
<inp2:m_RenderElement design="inp_edit_buttons">
<input type="hidden" name="next_template" value="in-commerce/my_account/affiliate/affiliate_thankyou" />
<input type="submit" class="button" name="events[affil][OnBecomeAffiliate]" id="events[affil][OnBecomeAffiliate]" value="<inp2:m_Phrase label="lu_comm_BecomeAnAffiliate"/>" />
</inp2:m_RenderElement>
</table>
</form>
</inp2:m_if>
</inp2:m_RenderElement>
+</div>
+
</inp2:m_DefineElement>
+<!--## //MAIN CONTENT ##-->
-<inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
\ No newline at end of file
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Property changes on: branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.5
\ No newline at end of property
+1.1.2.6
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_payments.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_payments.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_payments.tpl (revision 11485)
@@ -1,60 +1,77 @@
-<inp2:m_RequireLogin login_template="platform/login/register" />
-<inp2:m_RequireAffiliate registration_template="in-commerce/my_account/affiliate/affiliate" />
-<inp2:m_CheckSSL mode="required" condition="Require_SSL" />
+<inp2:m_RequireLogin login_template="platform/login/register"/> <!--## LOGIN REQUIRED ##-->
+<inp2:m_CheckSSL mode="required" condition="Require_SSL" /> <!--## CHECK IF SSL REQUIRED ##-->
+<inp2:m_RequireAffiliate registration_template="in-commerce/my_account/affiliate/affiliate" /> <!--## MUST BE AN AFFILIATE ##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_Phrase label="lu_title_ComissionPayments"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
- <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-
- <inp2:m_if check="u_IsAffiliate">
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/affiliate_navigation.elm" design="blue_box"/>
- </inp2:m_if>
-
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_if check="u_IsAffiliate">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/affiliate_navigation.elm" design="blue_box"/>
+ </inp2:m_if>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ </div>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="content">
- <inp2:m_include template="platform/elements/navigation_bar.elm"
- titles="lu_title_MyAccount,lu_title_Affiliate,lu_title_AffiliateStatistics,lu_title_ComissionPayments"
- templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate,in-commerce/my_account/affiliate/affiliate_statistics,in-commerce/my_account/affiliate/affiliate_payments"/>
+
+<div class="movable-element">
+ <inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_Affiliate,lu_title_AffiliateStatistics,lu_title_ComissionPayments" templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate,in-commerce/my_account/affiliate/affiliate_statistics,in-commerce/my_account/affiliate/affiliate_payments"/>
+</div>
+
+<div class="movable-element">
<inp2:m_RenderElement design="content_box" block_no_data="no_payments">
<inp2:apayments_InitList list_name="my_payments_list" types="my_payments"/>
<inp2:m_Capture to_var="header">
<inp2:m_Phrase label="lu_title_ComissionPayments"/> (<inp2:apayments_TotalRecords list_name="my_payments_list" />)
</inp2:m_Capture>
<inp2:m_include template="in-commerce/designs/affiliates.elm"/>
<table class="fullwidth">
<inp2:m_RenderElement name="separator" colspan="4"/>
<tr class="sub-section-header">
<td><inp2:m_Phrase label="lu_Date"/></td>
<td><inp2:m_Phrase label="lu_PaymentReference"/></td>
<td><inp2:m_Phrase label="lu_PaymentAmount"/></td>
</tr>
<inp2:m_RenderElement name="separator" colspan="4"/>
<inp2:m_include template="in-commerce/designs/affiliates.elm"/>
<inp2:apayments_PrintList list_name="my_payments_list" render_as="payment_element"/>
</table>
<inp2:m_include template="platform/elements/pagination.elm" prefix="apayments" list_name="my_payments_list"/>
</inp2:m_RenderElement>
+</div>
+
</inp2:m_DefineElement>
-<inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
Property changes on: branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_payments.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.5
\ No newline at end of property
+1.1.2.6
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_materials.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_materials.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_materials.tpl (revision 11485)
@@ -1,62 +1,79 @@
-<inp2:m_RequireLogin login_template="platform/login/register" />
-<inp2:m_RequireAffiliate registration_template="in-commerce/my_account/affiliate/affiliate" />
-<inp2:m_CheckSSL mode="required" condition="Require_SSL" />
+<inp2:m_RequireLogin login_template="platform/login/register"/> <!--## LOGIN REQUIRED ##-->
+<inp2:m_CheckSSL mode="required" condition="Require_SSL" /> <!--## CHECK IF SSL REQUIRED ##-->
+<inp2:m_RequireAffiliate registration_template="in-commerce/my_account/affiliate/affiliate" /> <!--## MUST BE AN AFFILIATE ##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_Phrase label="lu_AffiliateMaterials"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
- <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-
- <inp2:m_if check="u_IsAffiliate">
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/affiliate_navigation.elm" design="blue_box"/>
- </inp2:m_if>
-
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_if check="u_IsAffiliate">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/affiliate_navigation.elm" design="blue_box"/>
+ </inp2:m_if>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ </div>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="content">
- <inp2:m_include template="platform/elements/navigation_bar.elm"
- titles="lu_title_MyAccount,lu_title_Affiliate,lu_title_AffiliateStatistics,lu_AffiliateMaterials"
- templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate,in-commerce/my_account/affiliate/affiliate_statistics,in-commerce/my_account/affiliate/affiliate_materials"/>
+
+<div class="movable-element">
+ <inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_Affiliate,lu_title_AffiliateStatistics,lu_AffiliateMaterials" templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate,in-commerce/my_account/affiliate/affiliate_statistics,in-commerce/my_account/affiliate/affiliate_materials"/>
+</div>
+
+<div class="movable-element">
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_Phrase label="lu_AffiliateMaterials"/>
</inp2:m_Capture>
<inp2:m_if check="u_IsAffiliate">
<table>
<tr>
<td colspan="2"><inp2:m_Phrase label="lu_AffiliateMaterials"/></td>
</tr>
<tr>
<td>
<inp2:m_Phrase label="lu_comm_AffilliateMaterialsToRefer"/>:
<br /><br />
<a href="<inp2:affil_GetUserAffiliateLink template="index"/>"><inp2:affil_GetUserAffiliateLink template="index"/></a>
</td>
</tr>
<tr>
<td>
<inp2:m_Phrase label="lu_comm_AffilliateMaterialsCode"/>:
<blockquote style="border: 1px dashed #cccccc; background-color: #f3f3f3; padding: 8px">
<small>
&lt;a href="<inp2:affil_GetUserAffiliateLink template="index"/>"&gt;
<inp2:conf_ConfigValue name="Site_Name"/>
&lt;/a&gt;
</small>
</blockquote>
<inp2:m_Phrase label="lu_comm_AffilliateMaterialsCopy"/>
</td>
</tr>
</table>
</inp2:m_if>
</inp2:m_RenderElement>
+</div>
+
</inp2:m_DefineElement>
-<inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
\ No newline at end of file
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Property changes on: branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_materials.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.5
\ No newline at end of property
+1.1.2.6
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_thankyou.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_thankyou.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_thankyou.tpl (revision 11485)
@@ -1,29 +1,48 @@
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_phrase name="lu_title_AffiliateRegistration"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
- <inp2:m_RenderElements
- elements="
- platform/elements/side_boxes/login.elm,
- "
- design="blue_box"/>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_if check="u_IsAffiliate">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/affiliate_navigation.elm" design="blue_box"/>
+ </inp2:m_if>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ </div>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="content">
- <inp2:m_include template="platform/elements/navigation_bar.elm"
- titles="lu_title_MyAccount,lu_title_Affiliate,lu_title_AffiliateRegistration"
- templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate,in-commerce/my_account/affiliate/affiliate_thankyou"/>
+<div class="movable-element">
+ <inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_Affiliate,lu_title_AffiliateRegistration" templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate,in-commerce/my_account/affiliate/affiliate_thankyou"/>
+</div>
+
+<div class="movable-element">
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_AffiliateRegistration"/>
</inp2:m_Capture>
<inp2:m_Phrase label="lu_ThankYouForBecomingAffiliate"/>
</inp2:m_RenderElement>
+</div>
+
</inp2:m_DefineElement>
-<inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
\ No newline at end of file
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Property changes on: branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_thankyou.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.4
\ No newline at end of property
+1.1.2.5
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_statistics_orders_list.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_statistics_orders_list.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_statistics_orders_list.tpl (revision 11485)
@@ -1,57 +1,72 @@
-<inp2:m_RequireLogin login_template="platform/login/register" />
-<inp2:m_RequireAffiliate registration_template="in-commerce/my_account/affiliate/affiliate" />
-<inp2:m_CheckSSL mode="required" condition="Require_SSL" />
+<inp2:m_RequireLogin login_template="platform/login/register"/> <!--## LOGIN REQUIRED ##-->
+<inp2:m_CheckSSL mode="required" condition="Require_SSL" /> <!--## CHECK IF SSL REQUIRED ##-->
+<inp2:m_RequireAffiliate registration_template="in-commerce/my_account/affiliate/affiliate" /> <!--## MUST BE AN AFFILIATE ##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_Phrase label="lu_title_AffiliateStatisticsOrders"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
- <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-
- <inp2:m_if check="u_IsAffiliate">
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/affiliate_navigation.elm" design="blue_box"/>
- </inp2:m_if>
-
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_if check="u_IsAffiliate">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/affiliate_navigation.elm" design="blue_box"/>
+ </inp2:m_if>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ </div>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="content">
- <inp2:m_include template="platform/elements/navigation_bar.elm"
- titles="lu_title_MyAccount,lu_title_Affiliate,lu_title_AffiliateStatistics,lu_title_AffiliateStatisticsOrders"
- templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate,in-commerce/my_account/affiliate/affiliate_statistics,in-commerce/my_account/affiliate/affiliate_statistics_orders_list"/>
+<div class="movable-element">
+ <inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_Affiliate,lu_title_AffiliateStatistics,lu_title_AffiliateStatisticsOrders" templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate,in-commerce/my_account/affiliate/affiliate_statistics,in-commerce/my_account/affiliate/affiliate_statistics_orders_list"/>
+</div>
+
+<div class="movable-element">
<inp2:m_RenderElement design="content_box" block_no_data="no_orders">
<inp2:visits_InitList list_name="visitors_orders_list" types="myvisitororders" grid="visitsincommerce"/>
<inp2:m_Capture to_var="header">
<inp2:m_Phrase label="lu_title_AffiliateStatisticsOrders"/>
</inp2:m_Capture>
<inp2:m_include template="in-commerce/elements/affiliate_date_filter.elm" prefix="visits.incommerce" field="VisitDate" grid_name="visitsincommerce"/>
<inp2:m_include template="in-commerce/designs/affiliates.elm"/>
<table class="fullwidth">
<inp2:m_RenderElement name="separator" colspan="4"/>
<tr class="sub-section-header">
<td><inp2:m_Phrase label="lu_col_Date"/></td>
<td><inp2:m_Phrase label="lu_col_OrderNumber"/></td>
<td><inp2:m_Phrase label="lu_col_OrderTotalAmount"/></td>
<td><inp2:m_Phrase label="lu_col_OrderCommissionEarned"/></td>
</tr>
<inp2:m_RenderElement name="separator" colspan="5"/>
<inp2:visits_PrintList list_name="visitors_orders_list" render_as="my_order_element"/>
<inp2:visits_AffiliateOrderInfo list_name="visitors_orders_list" types="myvisitors" render_as="affiliate_orders_info" currency="selected" />
</table>
<inp2:m_include template="platform/elements/pagination.elm" prefix="visits" list_name="visitors_orders_list"/>
-
</inp2:m_RenderElement>
+</div>
+
</inp2:m_DefineElement>
-<inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
\ No newline at end of file
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Property changes on: branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_statistics_orders_list.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.5
\ No newline at end of property
+1.1.2.6
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_statistics_visits_list.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_statistics_visits_list.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_statistics_visits_list.tpl (revision 11485)
@@ -1,58 +1,74 @@
-<inp2:m_RequireLogin login_template="platform/login/register" />
-<inp2:m_RequireAffiliate registration_template="in-commerce/my_account/affiliate/affiliate" />
-<inp2:m_CheckSSL mode="required" condition="Require_SSL" />
+<inp2:m_RequireLogin login_template="platform/login/register"/> <!--## LOGIN REQUIRED ##-->
+<inp2:m_CheckSSL mode="required" condition="Require_SSL" /> <!--## CHECK IF SSL REQUIRED ##-->
+<inp2:m_RequireAffiliate registration_template="in-commerce/my_account/affiliate/affiliate" /> <!--## MUST BE AN AFFILIATE ##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_Phrase label="lu_title_AffiliateStatisticsVisits"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
- <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-
- <inp2:m_if check="u_IsAffiliate">
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/affiliate_navigation.elm" design="blue_box"/>
- </inp2:m_if>
-
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_if check="u_IsAffiliate">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/affiliate_navigation.elm" design="blue_box"/>
+ </inp2:m_if>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ </div>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="content">
- <inp2:m_include template="platform/elements/navigation_bar.elm"
- titles="lu_title_MyAccount,lu_title_Affiliate,lu_title_AffiliateStatistics,lu_title_AffiliateStatisticsVisits"
- templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate,in-commerce/my_account/affiliate/affiliate_statistics,in-commerce/my_account/affiliate/affiliate_statistics_visits_list"/>
+<div class="movable-element">
+ <inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_Affiliate,lu_title_AffiliateStatistics,lu_title_AffiliateStatisticsVisits" templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate,in-commerce/my_account/affiliate/affiliate_statistics,in-commerce/my_account/affiliate/affiliate_statistics_visits_list"/>
+</div>
+
+<div class="movable-element">
<inp2:m_RenderElement design="content_box" block_no_data="no_visitors">
<inp2:visits_InitList list_name="visitors_list" types="myvisitors" grid="visitsincommerce"/>
<inp2:m_Capture to_var="header">
<inp2:m_Phrase label="lu_title_AffiliateStatisticsVisits"/> (<inp2:visits_TotalRecords list_name="visitors_list" />)
</inp2:m_Capture>
<inp2:m_include template="in-commerce/elements/affiliate_date_filter.elm" prefix="visits.incommerce" field="VisitDate" grid_name="visitsincommerce"/>
<inp2:m_include template="in-commerce/designs/affiliates.elm"/>
<table class="fullwidth">
<inp2:m_RenderElement name="separator" colspan="5"/>
<tr class="sub-section-header">
<td><inp2:m_Phrase label="lu_col_Date"/></td>
<td><inp2:m_Phrase label="lu_col_Referer"/></td>
<td><inp2:m_Phrase label="lu_col_OrderCount"/></td>
<td><inp2:m_Phrase label="lu_col_OrderTotalAmount"/></td>
<td><inp2:m_Phrase label="lu_col_OrderCommissionEarned"/></td>
</tr>
<inp2:m_RenderElement name="separator" colspan="5"/>
<inp2:visits_PrintList list_name="visitors_list" render_as="my_visitor_element"/>
<inp2:visits_AffiliateOrderInfo list_name="visitors_list" types="myvisitors" render_as="affiliate_visits_info" currency="selected" />
</table>
<inp2:m_include template="platform/elements/pagination.elm" prefix="visits" list_name="visitors_list"/>
</inp2:m_RenderElement>
+</div>
+
</inp2:m_DefineElement>
-<inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
Property changes on: branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_statistics_visits_list.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.5
\ No newline at end of property
+1.1.2.6
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_payment_type_changed.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_payment_type_changed.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_payment_type_changed.tpl (revision 11485)
@@ -1,33 +1,50 @@
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_Phrase label="lu_title_AffiliatePaymentTypeChanged"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
- <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-
- <inp2:m_if check="u_IsAffiliate">
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/affiliate_navigation.elm" design="blue_box"/>
- </inp2:m_if>
-
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_if check="u_IsAffiliate">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/affiliate_navigation.elm" design="blue_box"/>
+ </inp2:m_if>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ </div>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="content">
- <inp2:m_include template="platform/elements/navigation_bar.elm"
- titles="lu_title_MyAccount,lu_title_Affiliate,lu_title_AffiliateStatistics,lu_title_AffiliatePaymentType,lu_title_AffiliatePaymentTypeChanged"
- templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate,in-commerce/my_account/affiliate/affiliate_payment_type,in-commerce/my_account/affiliate/affiliate_payment_type_changed"/>
+
+<div class="movable-element">
+ <inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_Affiliate,lu_title_AffiliateStatistics,lu_title_AffiliatePaymentType,lu_title_AffiliatePaymentTypeChanged" templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate,in-commerce/my_account/affiliate/affiliate_payment_type,in-commerce/my_account/affiliate/affiliate_payment_type_changed"/>
+</div>
+
+<div class="movable-element">
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_Phrase label="lu_title_AffiliatePaymentTypeChanged"/>
</inp2:m_Capture>
<inp2:m_Phrase label="lu_AffiliatePaymentTypeChangedMessage"/>
</inp2:m_RenderElement>
+</div>
+
</inp2:m_DefineElement>
-<inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
\ No newline at end of file
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Property changes on: branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_payment_type_changed.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.5
\ No newline at end of property
+1.1.2.6
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_statistics.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_statistics.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_statistics.tpl (revision 11485)
@@ -1,48 +1,58 @@
-<inp2:m_RequireLogin login_template="platform/login/register" />
-<inp2:m_RequireAffiliate registration_template="in-commerce/my_account/affiliate/affiliate" />
-<inp2:m_CheckSSL mode="required" condition="Require_SSL" />
-
-<!--## PAGE TITLE ELEMENT ##-->
-<inp2:m_DefineElement name="page_title">
- <inp2:m_Phrase label="lu_title_AffiliateStatistics"/>
-</inp2:m_DefineElement>
-<!--## //PAGE TITLE ELEMENT ##-->
+<inp2:m_RequireLogin login_template="platform/login/register"/> <!--## LOGIN REQUIRED ##-->
+<inp2:m_CheckSSL mode="required" condition="Require_SSL" /> <!--## CHECK IF SSL REQUIRED ##-->
+<inp2:m_RequireAffiliate registration_template="in-commerce/my_account/affiliate/affiliate" /> <!--## MUST BE AN AFFILIATE ##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_Phrase label="lu_title_AffiliateStatistics"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
- <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
-
- <inp2:m_if check="u_IsAffiliate">
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/affiliate_navigation.elm" design="blue_box"/>
- </inp2:m_if>
-
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_if check="u_IsAffiliate">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/affiliate_navigation.elm" design="blue_box"/>
+ </inp2:m_if>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ </div>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="content">
- <inp2:m_include template="platform/elements/navigation_bar.elm"
- titles="lu_title_MyAccount,lu_title_Affiliate,lu_title_AffiliateStatistics"
- templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate,in-commerce/my_account/affiliate/affiliate_statistics"/>
+<div class="movable-element">
+ <inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_Affiliate,lu_title_AffiliateStatistics" templates="platform/my_account/my_account,in-commerce/my_account/affiliate/affiliate,in-commerce/my_account/affiliate/affiliate_statistics"/>
+</div>
+
+<div class="movable-element">
<inp2:m_RenderElement design="content_box">
<inp2:visits_InitList list_name="visitors_list" types="myvisitors" grid="visitsincommerce" per_page="5"/>
<inp2:m_Capture to_var="header">
<inp2:m_Phrase label="lu_title_AffiliateStatistics"/>
</inp2:m_Capture>
<inp2:m_include template="in-commerce/elements/affiliate_date_filter.elm" prefix="visits.incommerce" field="VisitDate" grid_name="visitsincommerce"/>
<inp2:m_include template="in-commerce/designs/affiliates.elm"/>
<inp2:visits_AffiliateOrderInfo list_name="visitors_list" types="myvisitors" render_as="affiliate_info" currency="selected"/>
</inp2:m_RenderElement>
+</div>
+
</inp2:m_DefineElement>
-<inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
\ No newline at end of file
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Property changes on: branches/RC/themes/default2009/in-commerce/my_account/affiliate/affiliate_statistics.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.5
\ No newline at end of property
+1.1.2.6
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/my_account/edit_address.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/my_account/edit_address.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/my_account/edit_address.tpl (revision 11485)
@@ -1,73 +1,87 @@
-<!--## LOGIN REQUIRED ##-->
-<!--## Require Login is not strictly required here - checkItemStatus will do the job ##-->
-<!--## but it is placed for standart redirect to Register template ##-->
-<inp2:m_RequireLogin login_template="platform/login/register"/>
-<!--## /LOGIN REQUIRED ##-->
+<inp2:m_RequireLogin login_template="platform/login/register"/> <!--## LOGIN REQUIRED ##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_Phrase label="lu_title_EditAddress"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
- <inp2:m_RenderElements
- elements="
- platform/elements/side_boxes/login.elm,
- platform/elements/side_boxes/search.elm,
- "
- design="blue_box"/>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ </div>
</inp2:m_DefineElement>
<!--## /SIDE-BAR ELEMENT ##-->
<!--## MAIN CONTENT ##-->
<inp2:m_DefineElement name="content">
+
+<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_MyAddresses,lu_title_EditAddress" templates="platform/my_account/my_account,in-commerce/my_account/my_addresses,in-commerce/my_account/edit_address"/>
+</div>
+<div class="movable-element">
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_Phrase label="lu_title_EditAddress"/>
</inp2:m_Capture>
<form method="post" action="<inp2:m_FormAction />">
<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
<inp2:m_if check="addr_HasError" field="any">
<inp2:m_RenderElement name="error_message" />
</inp2:m_if>
<inp2:m_if check="u.current_Field" name="cust_shipping_addr_block">
<strong><inp2:m_Phrase label="lu_AddressModificationBlocked"/></strong>
<inp2:m_else/>
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
<table class="form-data fullwidth">
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="To" title="lu_fld_FullName"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Company" title="lu_fld_Company"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Address1" title="lu_fld_AddressLine1"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Address2" title="lu_fld_AddressLine2"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="City" title="lu_fld_City"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="State" title="lu_fld_State"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Zip" title="lu_fld_ZipCode"/>
<inp2:m_RenderElement name="inp_edit_options" prefix="addr" field="Country" title="lu_fld_Country"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Phone" title="lu_fld_Phone"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Fax" title="lu_fld_Fax"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Email" title="lu_fld_Email"/>
<inp2:m_RenderElement name="inp_edit_checkbox" prefix="addr" field="LastUsedAsShipping" title="lu_fld_LastUsedAsShipping"/>
<inp2:m_RenderElement name="inp_edit_checkbox" prefix="addr" field="LastUsedAsBilling" title="lu_fld_LastUsedAsBilling" is_last="1"/>
<inp2:m_RenderElement design="inp_edit_buttons">
<input class="button" type="submit" name="events[addr][OnUpdate]" value="<inp2:m_Phrase label="lu_btn_Update"/>"/>
<input type="hidden" name="next_template" value="in-commerce/my_account/my_addresses"/>
</inp2:m_RenderElement>
</table>
</inp2:m_if>
</form>
</inp2:m_RenderElement>
+</div>
+
</inp2:m_DefineElement>
<!--## /MAIN CONTENT ##-->
<!--## DESIGN TEMPLATE ##-->
-<inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Property changes on: branches/RC/themes/default2009/in-commerce/my_account/edit_address.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.4
\ No newline at end of property
+1.1.2.5
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/my_account/cancel_recurring_ok.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/my_account/cancel_recurring_ok.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/my_account/cancel_recurring_ok.tpl (revision 11485)
@@ -1,53 +1,65 @@
+<inp2:m_RequireLogin login_template="platform/login/register"/> <!--## LOGIN REQUIRED ##-->
+<inp2:m_CheckSSL mode="required" condition="Require_SSL" /> <!--## CHECK IF SSL REQUIRED ##-->
+
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_phrase name="lu_title_CancelRecurring"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
-<!--## LOGIN REQUIRED ##-->
-<inp2:m_RequireLogin login_template="platform/login/register"/>
-<!--## /LOGIN REQUIRED ##-->
-
-<!--## CHECK IF SSL REQUIRED ##-->
-<inp2:m_CheckSSL mode="required" condition="Require_SSL" />
-<!--## /CHECK IF SSL REQUIRED ##-->
-
<!--## SIDE-BAR ELEMENTS ##-->
<inp2:m_DefineElement name="sidebar">
- <inp2:m_RenderElements
- elements="
- platform/elements/side_boxes/login.elm,
- platform/elements/side_boxes/search.elm,
- "
- design="blue_box"/>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ </div>
</inp2:m_DefineElement>
<!--## /SIDE-BAR ELEMENTS ##-->
<!--## MAIN CONTENT ##-->
<inp2:m_DefineElement name="content">
- <inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_MyOrders" templates="platform/my_account/my_account,in-commerce/my_account/my_orders"/>
+<div class="movable-element">
+ <inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_MyOrders,lu_title_CancelRecurring" templates="platform/my_account/my_account,in-commerce/my_account/my_orders,in-commerce/my_account/cancel_recurring_ok"/>
+</div>
+<div class="movable-element">
<inp2:m_RenderElement design="content_box" block_no_data="no_orders">
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_CancelRecurring"/>
</inp2:m_Capture>
<table border="0" cellspacing="0" cellpadding="0">
<tr>
<td>
<br />
<strong><inp2:m_Phrase label="lu_CancelRecurring_confirmed" /></strong>
<br />
<br />
<inp2:m_Phrase label="lu_CancelRecurring_ok" />
</td>
</tr>
</table>
</inp2:m_RenderElement>
+</div>
+
</inp2:m_DefineElement>
<!--## /MAIN CONTENT ##-->
<!--## DESIGN TEMPLATE ##-->
-<inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Property changes on: branches/RC/themes/default2009/in-commerce/my_account/cancel_recurring_ok.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.4
\ No newline at end of property
+1.1.2.5
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/my_account/new_address.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/my_account/new_address.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/my_account/new_address.tpl (revision 11485)
@@ -1,73 +1,86 @@
-<!--## LOGIN REQUIRED ##-->
-<inp2:m_RequireLogin login_template="platform/login/register"/>
-<!--## /LOGIN REQUIRED ##-->
+<inp2:m_RequireLogin login_template="platform/login/register"/> <!--## LOGIN REQUIRED ##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_Phrase label="lu_title_AddAddress"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
- <inp2:m_RenderElements
- elements="
- platform/elements/side_boxes/login.elm,
- platform/elements/side_boxes/search.elm,
- "
- design="blue_box"/>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ </div>
</inp2:m_DefineElement>
<!--## /SIDE-BAR ELEMENT ##-->
<!--## MAIN CONTENT ##-->
<inp2:m_DefineElement name="content">
+
+<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_MyAddresses,lu_title_AddAddress" templates="platform/my_account/my_account,in-commerce/my_account/my_addresses,in-commerce/my_account/new_address"/>
+</div>
- <inp2:addr_PresetFormFields/>
+<div class="movable-element">
<inp2:m_RenderElement design="content_box">
+ <inp2:addr_PresetFormFields/>
+
<inp2:m_Capture to_var="header">
<inp2:m_Phrase label="lu_title_AddAddress"/>
</inp2:m_Capture>
<form method="post" action="<inp2:m_FormAction />">
<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
<inp2:m_if check="addr_HasError" field="any">
<inp2:m_RenderElement name="error_message" />
</inp2:m_if>
<inp2:m_if check="u.current_Field" name="cust_shipping_addr_block">
<strong><inp2:m_Phrase label="lu_AddressModificationBlocked"/></strong>
<inp2:m_else/>
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
<table class="form-data fullwidth">
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="To" title="lu_fld_FullName"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Company" title="lu_fld_Company"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Address1" title="lu_fld_AddressLine1"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Address2" title="lu_fld_AddressLine2"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="City" title="lu_fld_City"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="State" title="lu_fld_State"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Zip" title="lu_fld_ZipCode"/>
<inp2:m_RenderElement name="inp_edit_options" prefix="addr" field="Country" title="lu_fld_Country"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Phone" title="lu_fld_Phone"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Fax" title="lu_fld_Fax"/>
<inp2:m_RenderElement name="inp_edit_box" prefix="addr" field="Email" title="lu_fld_Email"/>
<inp2:m_RenderElement name="inp_edit_checkbox" prefix="addr" field="LastUsedAsShipping" title="lu_fld_LastUsedAsShipping"/>
<inp2:m_RenderElement name="inp_edit_checkbox" prefix="addr" field="LastUsedAsBilling" title="lu_fld_LastUsedAsBilling" is_last="1"/>
<inp2:m_RenderElement design="inp_edit_buttons">
<input class="button" type="submit" name="events[addr][OnCreate]" value="<inp2:m_Phrase label="lu_btn_Create"/>"/>
<input type="hidden" name="next_template" value="in-commerce/my_account/my_addresses"/>
</inp2:m_RenderElement>
</table>
</inp2:m_if>
</form>
</inp2:m_RenderElement>
+</div>
</inp2:m_DefineElement>
<!--## /MAIN CONTENT ##-->
<!--## DESIGN TEMPLATE ##-->
-<inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Property changes on: branches/RC/themes/default2009/in-commerce/my_account/new_address.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.4
\ No newline at end of property
+1.1.2.5
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/my_account/my_downloads.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/my_account/my_downloads.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/my_account/my_downloads.tpl (revision 11485)
@@ -1,57 +1,66 @@
-<!--## LOGIN REQUIRED ##-->
-<inp2:m_RequireLogin login_template="platform/login/register"/>
-<!--## /LOGIN REQUIRED ##-->
+<inp2:m_RequireLogin login_template="platform/login/register"/> <!--## LOGIN REQUIRED ##-->
+<inp2:m_CheckSSL mode="required" condition="Require_SSL" /> <!--## CHECK IF SSL REQUIRED ##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_phrase name="lu_title_MyDownloads"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
-<!--## CHECK IF SSL REQUIRED ##-->
-<inp2:m_CheckSSL mode="required" condition="Require_SSL" />
-<!--## /CHECK IF SSL REQUIRED ##-->
-
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
- <inp2:m_RenderElements
- elements="
- platform/elements/side_boxes/login.elm,
- platform/elements/side_boxes/search.elm,
- "
- design="blue_box"/>
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ </div>
</inp2:m_DefineElement>
<!--## /SIDE-BAR ELEMENT ##-->
<!--## MAIN CONTENT ##-->
<inp2:m_DefineElement name="content">
+<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_MyAccount,lu_title_MyDownloads" templates="platform/my_account/my_account,in-commerce/my_account/my_downloads"/>
- <inp2:m_include template="in-commerce/designs/products.elm"/>
+</div>
+<div class="movable-element">
<!--## MY DOWNLOADS LIST ##-->
- <inp2:p_InitList list_name="my_downloads" types="my_downloads" parent_cat_id="any" recursive="1"/>
-
<inp2:m_RenderElement design="content_box" block_no_data="no_products">
+ <inp2:p_InitList list_name="my_downloads" types="my_downloads" parent_cat_id="any" recursive="1"/>
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_MyDownloads"/> (<inp2:p_TotalRecords list_name="my_downloads"/>)
</inp2:m_Capture>
<inp2:m_include template="in-commerce/elements/sorting.elm" list_name="my_downloads"/>
+ <inp2:m_include template="in-commerce/designs/products.elm"/>
+
<table class="fullwidth item-listing">
<inp2:p_ListProducts list_name="my_downloads" render_as="downloadable_product_element"/>
</table>
<inp2:m_include template="platform/elements/pagination.elm" prefix="p" list_name="my_downloads"/>
</inp2:m_RenderElement>
<!--## /MY DOWNLOADS LIST ##-->
+</div>
</inp2:m_DefineElement>
<!--## /MAIN CONTENT ##-->
<!--## DESIGN TEMPLATE ##-->
-<inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Property changes on: branches/RC/themes/default2009/in-commerce/my_account/my_downloads.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.5
\ No newline at end of property
+1.1.2.6
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/products/form_options.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/products/form_options.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/products/form_options.tpl (nonexistent)
@@ -1,156 +0,0 @@
-<!--## PRODUCT OPTIONS FORM ##-->
-
-<inp2:m_if check="p_ShouldListOptions">
- <form name="add_to_cart" method="post" id="add_to_cart" action="<inp2:m_link pass="all,p"/>">
- <input type="hidden" name="events[ord]" id="events[ord]" value="OnAddToCart">
- <input type="hidden" name="m_t" value="in-commerce/checkout/shop_cart">
- <input type="hidden" name="p_id" value="<inp2:p_Field name="ProductId"/>">
- <input type="hidden" name="product_details_template" value="<inp2:m_Get var="t"/>">
- <input type="hidden" name="shop_cart_template" value="in-commerce/checkout/shop_cart">
-
- <inp2:m_if check="p_OptionsHaveError">
- <table class="warning-message fullwidth">
- <tr>
- <td width="30">
- <img src="<inp2:m_TemplatesBase module="In-Portal"/>img/warning_icon.gif" width="21" height="18" alt=""/>
- </td>
- <td><span class="warning"><inp2:m_Phrase label="lu_Warning"/></span></td>
- </tr>
- <tr>
- <td colspan="2">
- <inp2:p_OptionsError required="lu_comm_OptionsRequired" not_available="lu_comm_OptionsNotAvailable"/>
- </td>
- </tr>
- </table>
- </inp2:m_if>
-
- <inp2:m_if check="p_FieldEquals" field="OptionsSelectionMode" value="1"> <!-- Listable options (combinations) -->
- <script type="text/javascript">
- function BuyCombination(comb_id)
- {
- document.getElementById('qty[<inp2:p_Field name="ProductId"/>]['+comb_id+']').value = 1;
- document.getElementById('add_to_cart').submit();
- }
- </script>
-
- <inp2:m_DefineElement name="combination_option_element">
- <strong><inp2:m_Param name="option_name" />: </strong>
- <inp2:m_Param name="option_value" /><inp2:m_if check="m_ParamEquals" param="is_last" value="1"><inp2:m_else/>, </inp2:m_if>
- </inp2:m_DefineElement>
-
- <inp2:m_DefineElement name="combination_element">
- <tr class="cart-item-small">
- <td>
- <input type="hidden" id="qty[<inp2:p_Field name="ProductId"/>][<inp2:Field name="CombinationId"/>]" name="qty[<inp2:p_Field name="ProductId"/>][<inp2:Field name="CombinationId"/>]" value="0">
- <inp2:ShowCombination render_as="combination_option_element"/>
- </td>
- <td><inp2:Field name="FinalPrice" currency="selected"/>&nbsp;&nbsp;</td>
- <td>
- <a href="javascript:BuyCombination(<inp2:Field name="CombinationId"/>)"><inp2:m_Phrase label="lu_comm_BuyNow"/></a>
- </td>
- </tr>
- </inp2:m_DefineElement>
- <table style="wdith: 100%; margin: 0px;">
- <tr class="cart-header">
- <td><strong><inp2:m_Phrase label="lu_comm_OptionsCombination"/></strong></td>
- <td><strong><inp2:m_Phrase label="lu_comm_Price"/></strong></td>
- <td>&nbsp;</td>
- </tr>
-
- <inp2:poc_PrintList2 per_page="-1" render_as="combination_element" row_start_render_as="html:" row_end_render_as="html:"/>
- </table>
- <br/>
- <inp2:m_else/> <!-- Selectable options -->
- <script type="text/javascript">
- function AddToCart()
- {
- document.getElementById('add_to_cart').submit();
- }
-
- function UpdateOptions()
- {
- document.getElementById('events[ord]').value = 'OnUpdateItemOptions';
- document.getElementById('add_to_cart').submit();
- }
-
- </script>
-
- <strong><inp2:m_Phrase label="lu_comm_SelectOptions"/>:</strong><br/>
- <img src="<inp2:m_TemplatesBase module="In-Commerce"/>img/s.gif" width="1" height="8" alt="" /><br />
-
-
-
-
- <inp2:m_DefineElement name="option_select_element">
- <option value="<inp2:m_param name="id"/>" <inp2:m_param name="selected"/>><inp2:m_param name="value"/><inp2:m_if check="m_ParamEquals" name="price" value=""><inp2:m_else/>: (<inp2:m_param name="sign"/><inp2:m_param name="price"/> <inp2:m_param name="price_type"/>)</inp2:m_if></option>
- </inp2:m_DefineElement>
-
- <inp2:m_DefineElement name="option_cb_element">
- <input type="checkbox" <inp2:m_param name="selected"/>
- name="options[<inp2:p_Field name="ProductId"/>][<inp2:Field name="ProductOptionId"/>][]"
- id="options[<inp2:p_Field name="ProductId"/>][<inp2:Field name="ProductOptionId"/>]_<inp2:m_param name="id"/>"
- value="<inp2:m_param name="id"/>" />
- <label for="options[<inp2:p_Field name="ProductId"/>][<inp2:Field name="ProductOptionId"/>]_<inp2:m_param name="id"/>">
- <inp2:m_param name="value"/><inp2:m_if check="m_ParamEquals" name="price" value=""><inp2:m_else/>: (<inp2:m_param name="sign"/><inp2:m_param name="price"/> <inp2:m_param name="price_type"/>)</inp2:m_if>&nbsp;&nbsp;
- </label>
- </inp2:m_DefineElement>
-
- <inp2:m_DefineElement name="option_radio_element">
- <input type="radio" <inp2:m_param name="selected"/>
- name="options[<inp2:p_Field name="ProductId"/>][<inp2:Field name="ProductOptionId"/>]"
- id="options[<inp2:p_Field name="ProductId"/>][<inp2:Field name="ProductOptionId"/>]_<inp2:m_param name="id"/>"
- value="<inp2:m_param name="id"/>" />
- <label for="options[<inp2:p_Field name="ProductId"/>][<inp2:Field name="ProductOptionId"/>]_<inp2:m_param name="id"/>">
- <inp2:m_param name="value"/><inp2:m_if check="m_ParamEquals" name="price" value=""><inp2:m_else/>: (<inp2:m_param name="sign"/><inp2:m_param name="price"/> <inp2:m_param name="price_type"/>)</inp2:m_if>&nbsp;&nbsp;
- </label>
- </inp2:m_DefineElement>
-
- <inp2:m_DefineElement name="option_element">
- <tr>
- <td style="padding-right: 10px">
- <inp2:Field name="Name"/><inp2:m_if check="FieldEquals" field="Required" value="1"><span class="field-required">*</span></inp2:m_if> :
- </td>
- <td>
- <inp2:m_if check="FieldEquals" field="OptionType" value="1"> <!-- drop-down -->
- <select class="input-select" name="options[<inp2:p_Field name="ProductId"/>][<inp2:Field name="ProductOptionId"/>]">
- <option value=""></option>
- <inp2:ShowOptions render_as="option_select_element" currency="selected"/>
- </select>
- </inp2:m_if>
-
- <inp2:m_if check="FieldEquals" field="OptionType" value="5"> <!-- editbox -->
- <input type="text" class="input-text" name="options[<inp2:p_Field name="ProductId"/>][<inp2:Field name="ProductOptionId"/>]" value="<inp2:OptionData/>"/>
- </inp2:m_if>
-
- <inp2:m_if check="FieldEquals" field="OptionType" value="4"> <!-- textarea -->
- <textarea cols="50" rows="5" class="input-textarea" name="options[<inp2:p_Field name="ProductId"/>][<inp2:Field name="ProductOptionId"/>]"><inp2:OptionData/></textarea>
- </inp2:m_if>
-
- <inp2:m_if check="FieldEquals" field="OptionType" value="6"> <!-- checkboxeS -->
- <inp2:ShowOptions render_as="option_cb_element" currency="selected"/>
- </inp2:m_if>
-
- <inp2:m_if check="FieldEquals" field="OptionType" value="3"> <!-- radio buttons -->
- <inp2:ShowOptions render_as="option_radio_element" currency="selected"/>
- </inp2:m_if>
- </td>
- </tr>
- </inp2:m_DefineElement>
-
- <table class="form-data" style="margin: 0px;" >
- <inp2:p_ListOptions per_page="-1" render_as="option_element" row_start_render_as="html:" row_end_render_as="html:"/>
- </table>
- <br />
- <inp2:m_if check="p_OptionsUpdateMode">
- <input type="button" class="button" onclick="javascript:UpdateOptions()" value="<inp2:m_Phrase label="lu_comm_UpdateCartItem"/>" />
- <!--<a href="javascript:UpdateOptions()" class="price2"><inp2:m_Phrase label="lu_comm_UpdateCartItem"/></a><br/>-->
- <inp2:m_else/>
- <input type="button" class="button" onclick="javascript:AddToCart()" value="<inp2:m_Phrase label="lu_comm_BuyNow"/>" />
- <!--<a href="javascript:AddToCart()" class="price2"><inp2:m_Phrase label="lu_comm_BuyNow"/></a><br/>-->
- </inp2:m_if>
- <br/><br />
- </inp2:m_if>
- </form>
-</inp2:m_if>
-
-<!--## /PRODUCT OPTIONS FORM ##-->
\ No newline at end of file
Property changes on: branches/RC/themes/default2009/in-commerce/products/form_options.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/products/rate_product.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/products/rate_product.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/products/rate_product.tpl (nonexistent)
@@ -1,3 +0,0 @@
-<inp2:m_RequireLogin login_template="platform/login/register" permissions="PRODUCT.RATE"/>
-
-Rate Product TPL
\ No newline at end of file
Property changes on: branches/RC/themes/default2009/in-commerce/products/rate_product.tpl
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1.2.1
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/products/featured_products.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/products/featured_products.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/products/featured_products.tpl (revision 11485)
@@ -1,50 +1,62 @@
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_phrase name="lu_title_FeaturedProducts"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories.elm" design="blue_box" data_exists="1"/>
-
- <inp2:m_RenderElements
- elements="
- platform/elements/side_boxes/login.elm,
- platform/elements/side_boxes/search.elm,
- "
- design="blue_box"/>
-
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ </div>
</inp2:m_DefineElement>
<!--## /SIDE-BAR ELEMENT ##-->
<!--## MAIN CONTENT ##-->
<inp2:m_DefineElement name="content">
+
+<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_Products,lu_title_FeaturedProducts" templates="in-commerce/store/category,in-commerce/products/featured_products"/>
+</div>
+<div class="movable-element">
<inp2:m_RenderElement design="content_box" data_exists="1">
<inp2:p_InitList list_name="featured_products" types="featured" recursive="1"/>
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_FeaturedProducts"/> (<inp2:p_TotalRecords list_name="featured_products"/>)
</inp2:m_Capture>
<inp2:m_include template="in-commerce/elements/sorting.elm" list_name="featured_products"/>
<inp2:m_include template="in-commerce/designs/products.elm"/>
<table class="fullwidth item-listing-featured table-border">
<inp2:p_ListProducts list_name="featured_products" render_as="product_element"/>
</table>
<inp2:m_include template="platform/elements/pagination.elm" prefix="p" list_name="featured_products"/>
</inp2:m_RenderElement>
+</div>
+
</inp2:m_DefineElement>
<!--## /MAIN CONTENT ##-->
<!--## DESIGN TEMPLATE ##-->
-<inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Property changes on: branches/RC/themes/default2009/in-commerce/products/featured_products.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.5
\ No newline at end of property
+1.1.2.6
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/products/recent_products.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/products/recent_products.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/products/recent_products.tpl (revision 11485)
@@ -1,43 +1,50 @@
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_Phrase label="lu_title_RecentlyViewedProducts"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
-
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories.elm" design="blue_box" data_exists="1"/>
-
- <inp2:m_RenderElements
- elements="
- platform/elements/side_boxes/login.elm,
- platform/elements/side_boxes/search.elm,
- "
- design="blue_box"/>
-
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
-</inp2:m_DefineElement>
-
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
+ </div>
<inp2:m_DefineElement name="content">
+
+<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_RecentlyViewedProducts" templates="in-commerce/products/recent_products"/>
+</div>
+<div class="movable-element">
<inp2:m_RenderElement design="content_box">
<inp2:p_InitList list_name="recent_products" types="recent" parent_cat_id="any" recursive="1" except="in_cart"/>
<inp2:m_Capture to_var="header">
<inp2:m_Phrase label="lu_title_RecentlyViewedProducts"/> (<inp2:p_TotalRecords list_name="recent_products"/>)
</inp2:m_Capture>
<inp2:m_include template="in-commerce/elements/sorting.elm" list_name="recent_products"/>
<inp2:m_include template="in-commerce/designs/products.elm"/>
<table class="fullwidth item-listing">
<inp2:p_ListProducts list_name="recent_products" render_as="product_element"/>
</table>
<inp2:m_include template="platform/elements/pagination.elm" prefix="p" list_name="recent_products"/>
</inp2:m_RenderElement>
+</div>
+
</inp2:m_DefineElement>
-<inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
Property changes on: branches/RC/themes/default2009/in-commerce/products/recent_products.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.5
\ No newline at end of property
+1.1.2.6
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/products/add_review_confirm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/products/add_review_confirm.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/products/add_review_confirm.tpl (revision 11485)
@@ -1,30 +1,43 @@
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_phrase name="lu_title_AddProductReviewConfirm"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
+<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
- <inp2:m_RenderElements
- elements="
- platform/elements/side_boxes/login.elm,
- platform/elements/side_boxes/search.elm,
- in-commerce/elements/side_boxes/action_box.elm,
- "
- design="blue_box"/>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/action_box.elm" item_actions="1" design="blue_box"/>
+ </div>
</inp2:m_DefineElement>
+<!--## //SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="content">
+
+<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="__item__,lu_title_ReviewProduct,lu_title_AddProductReviewConfirm" templates="__default__,in-commerce/products/add_review,in-commerce/products/add_review_confirm" show_category="1"/>
+</div>
+<div class="movable-element">
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_AddProductReviewConfirm"/>
</inp2:m_Capture>
<inp2:m_phrase name="lu_text_AddProductReviewConfirm"/><br /><br />
<a href="<inp2:p_ProductLink template="__default__"/>"><inp2:p_Field name="Name"/></a>
</inp2:m_RenderElement>
+</div>
+
</inp2:m_DefineElement>
-<inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
\ No newline at end of file
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Property changes on: branches/RC/themes/default2009/in-commerce/products/add_review_confirm.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.5
\ No newline at end of property
+1.1.2.6
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/products/search_results.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/products/search_results.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/products/search_results.tpl (revision 11485)
@@ -1,50 +1,63 @@
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_Phrase label="lu_title_ProductSearchResults"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories.elm" design="blue_box" data_exists="1"/>
-
- <inp2:m_RenderElements
- elements="
- platform/elements/side_boxes/login.elm,
- platform/elements/side_boxes/search.elm,
- "
- design="blue_box"/>
-
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ </div>
</inp2:m_DefineElement>
<!--## SIDE-BAR ELEMENT ##-->
<!--## MAIN CONTENT ##-->
<inp2:m_DefineElement name="content">
+
+<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_ProductSearchResults" templates="in-commerce/search/search_results"/>
+</div>
+<div class="movable-element">
<inp2:m_RenderElement design="content_box">
<inp2:p_InitList list_name="product_search_results" types="search" parent_cat_id="any" recursive="1" except="in_cart"/>
<inp2:m_Capture to_var="header">
<inp2:m_Phrase label="lu_title_ProductSearchResults"/> (<inp2:p_TotalRecords list_name="product_search_results"/>)
</inp2:m_Capture>
<inp2:m_include template="in-commerce/elements/sorting.elm" list_name="product_search_results"/>
<inp2:m_include template="in-commerce/designs/products.elm"/>
<inp2:m_include template="platform/designs/search_results.elm"/>
<table class="fullwidth item-listing">
<inp2:p_ListProducts list_name="product_search_results" render_as="product_element" show_relevance="1"/>
</table>
<inp2:m_include template="platform/elements/pagination.elm" prefix="p" list_name="product_search_results"/>
</inp2:m_RenderElement>
+</div>
+
</inp2:m_DefineElement>
<!--## /MAIN CONTENT ##-->
<!--## DESIGN TEMPLATE ##-->
-<inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Property changes on: branches/RC/themes/default2009/in-commerce/products/search_results.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.6
\ No newline at end of property
+1.1.2.7
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/products/add_review.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/products/add_review.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/products/add_review.tpl (revision 11485)
@@ -1,135 +1,149 @@
<inp2:m_RequireLogin login_template="platform/login/register" permissions="PRODUCT.REVIEW|PRODUCT.REVIEW.PENDING"/>
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:p_Field name="Name"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
+<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
- <inp2:m_RenderElements
- elements="
- platform/elements/side_boxes/login.elm,
- platform/elements/side_boxes/search.elm,
- "
- design="blue_box"/>
-
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/action_box.elm" item_actions="1" design="blue_box"/>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/action_box.elm" item_actions="1" design="blue_box"/>
+ </div>
</inp2:m_DefineElement>
+<!--## //SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="content">
+
+<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="__item__,lu_title_ReviewProduct" templates="__default__,in-commerce/products/add_review" show_category="1"/>
+</div>
+<div class="movable-element">
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_ProductDetails"/>
</inp2:m_Capture>
<table class="fullwidth table-border">
<tr><td class="item-padding">
<img src="<inp2:m_TemplatesBase module="In-Commerce"/>img/shopping_cart_item.gif" alt=""/> <span class="text-title">
<a href="<inp2:p_ProductLink template="__default__"/>"><inp2:p_Field name="Name"/></a></span>
<inp2:m_if check="p_Field" name="IsHot"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_hot.gif" alt="<inp2:m_phrase name="lu_Hot"/>"/></inp2:m_if>
<inp2:m_if check="p_Field" name="IsNew"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_new.gif" alt="<inp2:m_phrase name="lu_New"/>"/></inp2:m_if>
<inp2:m_if check="p_Field" name="IsPop"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_popular.gif" alt="<inp2:m_phrase name="lu_Pop"/>"/></inp2:m_if>
<inp2:m_if check="p_IsEditorsPick"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_pick.gif" alt="<inp2:m_phrase name="lu_Pick"/>"/></inp2:m_if>
<inp2:m_if check="p_IsFavorite"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/icon_favorite.gif" alt="<inp2:m_phrase name="lu_Favorite"/>"/></inp2:m_if>
<inp2:p_VotesIndicator render_as="rating_element"/>
<br />
<br />
<table>
<tr>
<td style="text-align: center; padding-right: 10px;" valign="top">
<!--## Check if image exists ##-->
<inp2:m_if check="p_ImageSrc" MaxWidth="fullsize">
<a href="<inp2:p_ImageSrc MaxWidth="fullsize" DefaultImage="platform/img/no_picture.gif"/>" class="thickbox" rel="product-images" target="_blank" title="<inp2:p_Field name='Name' html_escape='1'/>">
<inp2:p_Image render_as="image_element" Primary="1" MaxWidth="thumbnail" DefaultImage="platform/img/no_picture.gif"/><br />
</a>
<!--## Check if image exists ##-->
<inp2:m_else/>
<inp2:p_Image render_as="image_element" Primary="1" MaxWidth="thumbnail" DefaultImage="platform/img/no_picture.gif"/><br />
</inp2:m_if>
<br />
</td>
<td valign="top">
<strong><inp2:m_phrase label="lu_Added"/>:</strong> <inp2:p_field field="CreatedOn_date" format="_regional_DateFormat"/><br />
<strong><inp2:m_phrase label="lu_Hits"/>:</strong> <inp2:p_field field="Hits"/><br />
<strong><inp2:m_phrase label="lu_Reviews"/>:</strong> <inp2:p_field field="CachedReviewsQty"/>
<strong><inp2:m_phrase label="lu_Rating"/>:</strong> <inp2:p_field field="CachedRating"/> (<inp2:m_phrase label="lu_Votes"/>: <inp2:p_field field="CachedVotesQty"/>)
<br />
<inp2:m_if check="p_Field" name="ManufacturerId">
<strong><inp2:m_Phrase label="lu_fld_Manufacturer"/>:</strong> <inp2:p_field name="ManufacturerId"/> (<inp2:m_Phrase label="lu_comm_OtherProductsBy"/> <a href="<inp2:p_ManufacturerLink template="in-commerce/products/manufacturer_products" />"><inp2:p_Field name="ManufacturerId"/></a> <inp2:m_Phrase label="lu_comm_OtherProducts"/>) <br />
</inp2:m_if>
<inp2:m_if check="p_Field" name="MSRP">
<strong><inp2:m_Phrase label="lu_fld_MSRP"/>:</strong> <span class="product-price-msrp"><inp2:p_Field name="MSRP" currency="selected"/></span> <br />
</inp2:m_if>
<strong><inp2:m_Phrase label="lu_fld_OurPrice"/>: <span class="product-price"><inp2:p_Field name="Price" currency="selected"/></span></strong> <br />
<inp2:m_if check="p_Savings">
<strong><inp2:m_Phrase label="lu_fld_YouSave"/>: <span class="product-price"><inp2:p_Savings currency="selected" /> (<inp2:p_Savings type="percent"/>%)</span></strong><br/>
</inp2:m_if>
<br />
<inp2:m_if check="p_Field" name="DescriptionExcerpt">
<span class="listing-field-name"><inp2:m_Phrase label="lu_fld_Description"/>:</span> <inp2:p_Field name="DescriptionExcerpt" nl2br="1"/><br/>
</inp2:m_if>
</td>
</tr>
</table>
</td></tr></table>
</inp2:m_RenderElement>
+</div>
+<div class="movable-element">
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_ReviewThisProduct"/>
</inp2:m_Capture>
<inp2:m_if check="p_HasPermission" permissions="PRODUCT.REVIEW|PRODUCT.REVIEW.PENDING">
<inp2:m_if check="p-rev_AlreadyReviewed">
<inp2:m_Phrase label="lu_ErrorAlreadyReviewed"/><br/><br/>
<table>
<inp2:p-rev_PrintList render_as="review_element" type="current_user"/>
</table>
<inp2:m_include template="platform/elements/pagination.elm" prefix="p-rev"/>
<inp2:m_else/>
<inp2:p-rev_PresetFormFields/>
<span class="field-required">*</span> <inp2:m_phrase name="lu_IndicatesRequired"/><br /><br />
<inp2:m_if check="p-rev_HasError" field="any">
<inp2:m_RenderElement name="error_message" />
</inp2:m_if>
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/grey_pix.gif" width="100%" height="1" align="absmiddle" alt="" /><br /><br />
<form method="post" action="<inp2:m_FormAction/>">
<table class="form-data fullwidth">
<inp2:m_RenderElement name="inp_edit_radio" prefix="p-rev" field="Rating" title="lu_fld_Rating"/>
<inp2:m_RenderElement name="inp_edit_textarea" prefix="p-rev" field="ReviewText" rows="8" cols="40" title="lu_fld_ReviewText" is_last="1"/>
<inp2:m_RenderElement design="inp_edit_buttons">
<input type="hidden" name="success_template" value="in-commerce/products/add_review_confirm" />
<input type="hidden" name="success_pending_template" value="in-commerce/products/add_review_pending_confirm" />
<input class="button" type="submit" name="events[p-rev][OnCreate]" value="<inp2:m_phrase label="lu_btn_Create"/>" />
</inp2:m_RenderElement>
</table>
</form>
</inp2:m_if>
<inp2:m_else/>
<inp2:m_phrase name="lu_text_NoProductReviewPermission"/>
</inp2:m_if>
</inp2:m_RenderElement>
+</div>
+
</inp2:m_DefineElement>
-<inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
\ No newline at end of file
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Property changes on: branches/RC/themes/default2009/in-commerce/products/add_review.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.5
\ No newline at end of property
+1.1.2.6
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/products/pick_products.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/products/pick_products.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/products/pick_products.tpl (revision 11485)
@@ -1,51 +1,64 @@
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_phrase name="lu_title_PickProducts"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories.elm" design="blue_box" data_exists="1"/>
-
- <inp2:m_RenderElements
- elements="
- platform/elements/side_boxes/login.elm,
- platform/elements/side_boxes/search.elm,
- "
- design="blue_box"/>
-
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ </div>
</inp2:m_DefineElement>
<!--## /SIDE-BAR ELEMENT ##-->
<!--## MAIN CONTENT ##-->
<inp2:m_DefineElement name="content">
+
+<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_PickProducts" templates="in-commerce/products/pick_products"/>
+</div>
+
+<div class="movable-element">
<!-- Editors Pick Products List -->
<inp2:m_RenderElement design="content_box" data_exists="1">
<inp2:p_InitList list_name="pick_products" types="pick" recursive="true"/>
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_PickProducts"/> (<inp2:p_TotalRecords list_name="pick_products"/>)
</inp2:m_Capture>
<inp2:m_include template="in-commerce/elements/sorting.elm" list_name="pick_products"/>
<inp2:m_include template="in-commerce/designs/products.elm"/>
<table class="fullwidth item-listing">
<inp2:p_ListProducts list_name="pick_products" render_as="product_element"/>
</table>
<inp2:m_include template="platform/elements/pagination.elm" prefix="p" list_name="pick_products"/>
</inp2:m_RenderElement>
<!-- //Editors Pick Products List -->
+</div>
+
</inp2:m_DefineElement>
<!--## /MAIN CONTENT ##-->
<!--## DESIGN TEMPLATE ##-->
-<inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Property changes on: branches/RC/themes/default2009/in-commerce/products/pick_products.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.5
\ No newline at end of property
+1.1.2.6
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/products/add_review_pending_confirm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/products/add_review_pending_confirm.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/products/add_review_pending_confirm.tpl (revision 11485)
@@ -1,30 +1,43 @@
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_phrase name="lu_title_AddProductReviewConfirm"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
+<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
- <inp2:m_RenderElements
- elements="
- platform/elements/side_boxes/login.elm,
- platform/elements/side_boxes/search.elm,
- in-commerce/elements/side_boxes/action_box.elm,
- "
- design="blue_box"/>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/action_box.elm" item_actions="1" design="blue_box"/>
+ </div>
</inp2:m_DefineElement>
+<!--## //SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="content">
+
+<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="__item__,lu_title_ReviewPendingProduct,lu_title_AddProductReviewPendingConfirm" templates="__default__,in-commerce/products/add_review,in-commerce/products/add_review_pending_confirm" show_category="1"/>
+</div>
+<div class="movable-element">
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_AddProductReviewConfirm"/>
</inp2:m_Capture>
<inp2:m_phrase name="lu_text_AddProductReviewPendingConfirm"/><br /><br />
<a href="<inp2:p_ProductLink template="__default__"/>"><inp2:p_Field name="Name"/></a>
</inp2:m_RenderElement>
+</div>
+
</inp2:m_DefineElement>
-<inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
\ No newline at end of file
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
\ No newline at end of file
Property changes on: branches/RC/themes/default2009/in-commerce/products/add_review_pending_confirm.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.5
\ No newline at end of property
+1.1.2.6
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/products/form_options.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/products/form_options.elm.tpl (nonexistent)
+++ branches/RC/themes/default2009/in-commerce/products/form_options.elm.tpl (revision 11485)
@@ -0,0 +1,156 @@
+<!--## PRODUCT OPTIONS FORM ##-->
+
+<inp2:m_if check="p_ShouldListOptions">
+ <form name="add_to_cart" method="post" id="add_to_cart" action="<inp2:m_link pass="all,p"/>">
+ <input type="hidden" name="events[ord]" id="events[ord]" value="OnAddToCart">
+ <input type="hidden" name="m_t" value="in-commerce/checkout/shop_cart">
+ <input type="hidden" name="p_id" value="<inp2:p_Field name="ProductId"/>">
+ <input type="hidden" name="product_details_template" value="<inp2:m_Get var="t"/>">
+ <input type="hidden" name="shop_cart_template" value="in-commerce/checkout/shop_cart">
+
+ <inp2:m_if check="p_OptionsHaveError">
+ <table class="warning-message fullwidth">
+ <tr>
+ <td width="30">
+ <img src="<inp2:m_TemplatesBase module="In-Portal"/>img/warning_icon.gif" width="21" height="18" alt=""/>
+ </td>
+ <td><span class="warning"><inp2:m_Phrase label="lu_Warning"/></span></td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <inp2:p_OptionsError required="lu_comm_OptionsRequired" not_available="lu_comm_OptionsNotAvailable"/>
+ </td>
+ </tr>
+ </table>
+ </inp2:m_if>
+
+ <inp2:m_if check="p_FieldEquals" field="OptionsSelectionMode" value="1"> <!-- Listable options (combinations) -->
+ <script type="text/javascript">
+ function BuyCombination(comb_id)
+ {
+ document.getElementById('qty[<inp2:p_Field name="ProductId"/>]['+comb_id+']').value = 1;
+ document.getElementById('add_to_cart').submit();
+ }
+ </script>
+
+ <inp2:m_DefineElement name="combination_option_element">
+ <strong><inp2:m_Param name="option_name" />: </strong>
+ <inp2:m_Param name="option_value" /><inp2:m_if check="m_ParamEquals" param="is_last" value="1"><inp2:m_else/>, </inp2:m_if>
+ </inp2:m_DefineElement>
+
+ <inp2:m_DefineElement name="combination_element">
+ <tr class="cart-item-small">
+ <td>
+ <input type="hidden" id="qty[<inp2:p_Field name="ProductId"/>][<inp2:Field name="CombinationId"/>]" name="qty[<inp2:p_Field name="ProductId"/>][<inp2:Field name="CombinationId"/>]" value="0">
+ <inp2:ShowCombination render_as="combination_option_element"/>
+ </td>
+ <td><inp2:Field name="FinalPrice" currency="selected"/>&nbsp;&nbsp;</td>
+ <td>
+ <a href="javascript:BuyCombination(<inp2:Field name="CombinationId"/>)"><inp2:m_Phrase label="lu_comm_BuyNow"/></a>
+ </td>
+ </tr>
+ </inp2:m_DefineElement>
+ <table style="wdith: 100%; margin: 0px;">
+ <tr class="cart-header">
+ <td><strong><inp2:m_Phrase label="lu_comm_OptionsCombination"/></strong></td>
+ <td><strong><inp2:m_Phrase label="lu_comm_Price"/></strong></td>
+ <td>&nbsp;</td>
+ </tr>
+
+ <inp2:poc_PrintList2 per_page="-1" render_as="combination_element" row_start_render_as="html:" row_end_render_as="html:"/>
+ </table>
+ <br/>
+ <inp2:m_else/> <!-- Selectable options -->
+ <script type="text/javascript">
+ function AddToCart()
+ {
+ document.getElementById('add_to_cart').submit();
+ }
+
+ function UpdateOptions()
+ {
+ document.getElementById('events[ord]').value = 'OnUpdateItemOptions';
+ document.getElementById('add_to_cart').submit();
+ }
+
+ </script>
+
+ <strong><inp2:m_Phrase label="lu_comm_SelectOptions"/>:</strong><br/>
+ <img src="<inp2:m_TemplatesBase module="In-Commerce"/>img/s.gif" width="1" height="8" alt="" /><br />
+
+
+
+
+ <inp2:m_DefineElement name="option_select_element">
+ <option value="<inp2:m_param name="id"/>" <inp2:m_param name="selected"/>><inp2:m_param name="value"/><inp2:m_if check="m_ParamEquals" name="price" value=""><inp2:m_else/>: (<inp2:m_param name="sign"/><inp2:m_param name="price"/> <inp2:m_param name="price_type"/>)</inp2:m_if></option>
+ </inp2:m_DefineElement>
+
+ <inp2:m_DefineElement name="option_cb_element">
+ <input type="checkbox" <inp2:m_param name="selected"/>
+ name="options[<inp2:p_Field name="ProductId"/>][<inp2:Field name="ProductOptionId"/>][]"
+ id="options[<inp2:p_Field name="ProductId"/>][<inp2:Field name="ProductOptionId"/>]_<inp2:m_param name="id"/>"
+ value="<inp2:m_param name="id"/>" />
+ <label for="options[<inp2:p_Field name="ProductId"/>][<inp2:Field name="ProductOptionId"/>]_<inp2:m_param name="id"/>">
+ <inp2:m_param name="value"/><inp2:m_if check="m_ParamEquals" name="price" value=""><inp2:m_else/>: (<inp2:m_param name="sign"/><inp2:m_param name="price"/> <inp2:m_param name="price_type"/>)</inp2:m_if>&nbsp;&nbsp;
+ </label>
+ </inp2:m_DefineElement>
+
+ <inp2:m_DefineElement name="option_radio_element">
+ <input type="radio" <inp2:m_param name="selected"/>
+ name="options[<inp2:p_Field name="ProductId"/>][<inp2:Field name="ProductOptionId"/>]"
+ id="options[<inp2:p_Field name="ProductId"/>][<inp2:Field name="ProductOptionId"/>]_<inp2:m_param name="id"/>"
+ value="<inp2:m_param name="id"/>" />
+ <label for="options[<inp2:p_Field name="ProductId"/>][<inp2:Field name="ProductOptionId"/>]_<inp2:m_param name="id"/>">
+ <inp2:m_param name="value"/><inp2:m_if check="m_ParamEquals" name="price" value=""><inp2:m_else/>: (<inp2:m_param name="sign"/><inp2:m_param name="price"/> <inp2:m_param name="price_type"/>)</inp2:m_if>&nbsp;&nbsp;
+ </label>
+ </inp2:m_DefineElement>
+
+ <inp2:m_DefineElement name="option_element">
+ <tr>
+ <td style="padding-right: 10px">
+ <inp2:Field name="Name"/><inp2:m_if check="FieldEquals" field="Required" value="1"><span class="field-required">*</span></inp2:m_if> :
+ </td>
+ <td>
+ <inp2:m_if check="FieldEquals" field="OptionType" value="1"> <!-- drop-down -->
+ <select class="input-select" name="options[<inp2:p_Field name="ProductId"/>][<inp2:Field name="ProductOptionId"/>]">
+ <option value=""></option>
+ <inp2:ShowOptions render_as="option_select_element" currency="selected"/>
+ </select>
+ </inp2:m_if>
+
+ <inp2:m_if check="FieldEquals" field="OptionType" value="5"> <!-- editbox -->
+ <input type="text" class="input-text" name="options[<inp2:p_Field name="ProductId"/>][<inp2:Field name="ProductOptionId"/>]" value="<inp2:OptionData/>"/>
+ </inp2:m_if>
+
+ <inp2:m_if check="FieldEquals" field="OptionType" value="4"> <!-- textarea -->
+ <textarea cols="50" rows="5" class="input-textarea" name="options[<inp2:p_Field name="ProductId"/>][<inp2:Field name="ProductOptionId"/>]"><inp2:OptionData/></textarea>
+ </inp2:m_if>
+
+ <inp2:m_if check="FieldEquals" field="OptionType" value="6"> <!-- checkboxeS -->
+ <inp2:ShowOptions render_as="option_cb_element" currency="selected"/>
+ </inp2:m_if>
+
+ <inp2:m_if check="FieldEquals" field="OptionType" value="3"> <!-- radio buttons -->
+ <inp2:ShowOptions render_as="option_radio_element" currency="selected"/>
+ </inp2:m_if>
+ </td>
+ </tr>
+ </inp2:m_DefineElement>
+
+ <table class="form-data" style="margin: 0px;" >
+ <inp2:p_ListOptions per_page="-1" render_as="option_element" row_start_render_as="html:" row_end_render_as="html:"/>
+ </table>
+ <br />
+ <inp2:m_if check="p_OptionsUpdateMode">
+ <input type="button" class="button" onclick="javascript:UpdateOptions()" value="<inp2:m_Phrase label="lu_comm_UpdateCartItem"/>" />
+ <!--<a href="javascript:UpdateOptions()" class="price2"><inp2:m_Phrase label="lu_comm_UpdateCartItem"/></a><br/>-->
+ <inp2:m_else/>
+ <input type="button" class="button" onclick="javascript:AddToCart()" value="<inp2:m_Phrase label="lu_comm_BuyNow"/>" />
+ <!--<a href="javascript:AddToCart()" class="price2"><inp2:m_Phrase label="lu_comm_BuyNow"/></a><br/>-->
+ </inp2:m_if>
+ <br/><br />
+ </inp2:m_if>
+ </form>
+</inp2:m_if>
+
+<!--## /PRODUCT OPTIONS FORM ##-->
\ No newline at end of file
Property changes on: branches/RC/themes/default2009/in-commerce/products/form_options.elm.tpl
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1.2.1
\ No newline at end of property
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/products/top_seller_products.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/products/top_seller_products.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/products/top_seller_products.tpl (revision 11485)
@@ -1,48 +1,59 @@
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_phrase name="lu_title_TopSellerProducts"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
- <inp2:m_RenderElements
- elements="
- in-commerce/elements/side_boxes/checkout_steps.elm,
- platform/elements/side_boxes/login.elm,
- platform/elements/side_boxes/search.elm,
- "
- design="blue_box"/>
-
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ </div>
</inp2:m_DefineElement>
<!--## /SIDE-BAR ELEMENT ##-->
<!--## MAIN CONTENT ##-->
<inp2:m_DefineElement name="content">
+
+<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_TopSellerProducts" templates="in-commerce/products/top_seller_products"/>
+</div>
+<div class="movable-element">
<inp2:m_RenderElement design="content_box">
<inp2:p_InitList list_name="top_seller_products" types="hot" recursive="1"/>
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_TopSellerProducts"/> (<inp2:p_TotalRecords list_name="top_seller_products"/>)
</inp2:m_Capture>
<inp2:m_include template="in-commerce/elements/sorting.elm" list_name="top_seller_products"/>
<inp2:m_include template="in-commerce/designs/products.elm"/>
<table class="fullwidth item-listing">
<inp2:p_ListProducts list_name="top_seller_products" render_as="product_element"/>
</table>
<inp2:m_include template="platform/elements/pagination.elm" prefix="p" list_name="top_seller_products"/>
</inp2:m_RenderElement>
+</div>
+
</inp2:m_DefineElement>
<!--## /MAIN CONTENT ##-->
<!--## DESIGN TEMPLATE ##-->
-<inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Property changes on: branches/RC/themes/default2009/in-commerce/products/top_seller_products.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.5
\ No newline at end of property
+1.1.2.6
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/products/new_products.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/products/new_products.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/products/new_products.tpl (revision 11485)
@@ -1,54 +1,64 @@
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_phrase name="lu_title_NewProducts"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
-
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories.elm" design="blue_box" data_exists="1"/>
-
- <inp2:m_RenderElements
- elements="
- platform/elements/side_boxes/login.elm,
- platform/elements/side_boxes/search.elm,
- "
- design="blue_box"/>
-
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ </div>
</inp2:m_DefineElement>
<!--## /SIDE-BAR ELEMENT ##-->
<!--## MAIN CONTENT ##-->
<inp2:m_DefineElement name="content">
+
+<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_NewProducts" templates="in-commerce/products/new_products"/>
+</div>
+<div class="movable-element">
<!-- New Products List -->
<inp2:m_RenderElement design="content_box" data_exists="1">
<inp2:p_InitList list_name="new_products" types="new" recursive="true"/>
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_NewProducts"/> (<inp2:p_TotalRecords list_name="new_products"/>)
</inp2:m_Capture>
<inp2:m_include template="in-commerce/elements/sorting.elm" list_name="new_products"/>
<inp2:m_include template="in-commerce/designs/products.elm"/>
<table class="fullwidth item-listing">
<inp2:p_ListProducts list_name="new_products" render_as="product_element"/>
</table>
<inp2:m_include template="platform/elements/pagination.elm" prefix="p" list_name="new_products"/>
</inp2:m_RenderElement>
<!-- //New Products List -->
+</div>
</inp2:m_DefineElement>
<!--## MAIN CONTENT ##-->
<!--## DESIGN TEMPLATE ##-->
-<inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Property changes on: branches/RC/themes/default2009/in-commerce/products/new_products.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.5
\ No newline at end of property
+1.1.2.6
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/products/manufacturer_products.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/products/manufacturer_products.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/products/manufacturer_products.tpl (revision 11485)
@@ -1,51 +1,62 @@
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_Phrase label="lu_title_ProductsByManufacturer"/> <inp2:manuf_Field name="Name" />
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
-
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories.elm" design="blue_box" data_exists="1"/>
-
- <inp2:m_RenderElements
- elements="
- platform/elements/side_boxes/login.elm,
- platform/elements/side_boxes/search.elm,
- "
- design="blue_box"/>
-
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/top_seller_products.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ </div>
</inp2:m_DefineElement>
<!--## /SIDE-BAR ELEMENT ##-->
<!--## MAIN CONTENT ##-->
<inp2:m_DefineElement name="content">
+
+<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_ProductsByManufacturer" templates="in-commerce/products/manufacturer_products"/>
+</div>
+<div class="movable-element">
<inp2:m_RenderElement design="content_box" data_exists="1">
<inp2:p_InitList list_name="manufacturer_products" types="manufacturer" recursive="1" parent_cat_id="any" />
<inp2:m_Capture to_var="header">
<inp2:m_Phrase label="lu_title_ProductsByManufacturer"/> <inp2:manuf_Field name="Name" /> (<inp2:p_TotalRecords list_name="manufacturer_products"/>)
</inp2:m_Capture>
<inp2:m_include template="in-commerce/elements/sorting.elm" list_name="manufacturer_products"/>
<inp2:m_include template="in-commerce/designs/products.elm"/>
<table class="fullwidth item-listing">
<inp2:p_ListProducts list_name="manufacturer_products" render_as="product_element"/>
</table>
<inp2:m_include template="platform/elements/pagination.elm" prefix="p" list_name="manufacturer_products"/>
</inp2:m_RenderElement>
+</div>
+
</inp2:m_DefineElement>
<!--## /MAIN CONTENT ##-->
<!--## DESIGN TEMPLATE ##-->
-<inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Property changes on: branches/RC/themes/default2009/in-commerce/products/manufacturer_products.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.5
\ No newline at end of property
+1.1.2.6
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/checkout/preview.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/checkout/preview.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/checkout/preview.tpl (revision 11485)
@@ -1,53 +1,55 @@
-<!--## CHECK IF LOGIN REQUIRED ##-->
-<inp2:m_RequireLogin condition="Comm_RequireLoginBeforeCheckout" login_template="platform/login/register"/>
-<!--## /CHECK IF LOGIN REQUIRED ##-->
-
-<!--## CHECK IF SSL REQUIRED ##-->
-<inp2:m_CheckSSL mode="required" condition="Require_SSL" />
-<!--## /CHECK IF SSL REQUIRED ##-->
+<inp2:m_RequireLogin condition="Comm_RequireLoginBeforeCheckout" login_template="platform/login/register"/> <!--## CHECK IF LOGIN REQUIRED ##-->
+<inp2:m_CheckSSL mode="required" condition="Require_SSL" /> <!--## CHECK IF SSL REQUIRED ##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_Phrase label="lu_comm_OrderPreview"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
- <inp2:m_RenderElements
- elements="
- in-commerce/elements/side_boxes/checkout_steps.elm,
- platform/elements/side_boxes/login.elm,
- platform/elements/side_boxes/search.elm,
- "
- design="blue_box"/>
-
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/checkout_steps.elm" design="blue_box/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ </div>
</inp2:m_DefineElement>
<!--## /SIDE-BAR ELEMENT ##-->
<!--## MAIN CONTENT ##-->
<inp2:m_DefineElement name="content">
+
+<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_ShoppingCart" templates="in-commerce/checkout/shop_cart"/>
+</div>
- <inp2:m_DefineElement name="preview_content">
+<div class="movable-element">
+ <inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_Phrase label="lu_comm_OrderPreview"/>
</inp2:m_Capture>
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td class="main-column-center">
<inp2:m_include template="in-commerce/elements/order_preview.elm"/>
</td>
</tr>
</table>
- </inp2:m_DefineElement>
- <inp2:m_RenderElement name="preview_content" design="content_box"/>
+ </inp2:m_RenderElement>
+</div>
</inp2:m_DefineElement>
<!--## /MAIN CONTENT ##-->
<!--## DESIGN TEMPLATE ##-->
-<inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
<!--## /DESIGN TEMPLATE ##-->
Property changes on: branches/RC/themes/default2009/in-commerce/checkout/preview.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.5
\ No newline at end of property
+1.1.2.6
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/checkout/shipping.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/checkout/shipping.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/checkout/shipping.tpl (revision 11485)
@@ -1,62 +1,62 @@
-<!--## CHECK IF LOGIN REQUIRED ##-->
-<inp2:m_RequireLogin condition="Comm_RequireLoginBeforeCheckout" login_template="platform/login/register"/>
-<!--## /CHECK IF LOGIN REQUIRED ##-->
-
-<!--## CHECK IF SSL REQUIRED ##-->
-<inp2:m_CheckSSL mode="required" condition="Require_SSL" />
-<!--## /CHECK IF SSL REQUIRED ##-->
+<inp2:m_RequireLogin condition="Comm_RequireLoginBeforeCheckout" login_template="platform/login/register"/> <!--## CHECK IF LOGIN REQUIRED ##-->
+<inp2:m_CheckSSL mode="required" condition="Require_SSL" /> <!--## CHECK IF SSL REQUIRED ##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_Phrase label="lu_comm_ShippingInfo"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
-
- <inp2:m_RenderElements
- elements="
- in-commerce/elements/side_boxes/checkout_steps.elm,
- platform/elements/side_boxes/login.elm,
- platform/elements/side_boxes/search.elm,
- "
- design="blue_box"/>
-
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/checkout_steps.elm" design="blue_box/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ </div>
</inp2:m_DefineElement>
<!--## /SIDE-BAR ELEMENT ##-->
<!--## MAIN CONTENT ##-->
<inp2:m_DefineElement name="content">
+
+<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_ShoppingCart" templates="in-commerce/checkout/shop_cart"/>
+</div>
<script type="text/javascript">
function catchFormEnter(e, id)
{
if (typeof(e) == 'undefined') e = window.event;
if (!e) return;
if (e.keyCode == 13) { //enter
if (typeof(document.all) == 'undefined') e.preventDefault();
e.cancelBubble = true;
e.returnValue = false;
document.getElementById(id).focus();
document.getElementById(id).click();
return false;
}
}
</script>
<form method="post" onkeypress="catchFormEnter(event, 'events[ord][OnUpdate]')" action="<inp2:m_FormAction />">
<inp2:m_include template="in-commerce/elements/content_boxes/checkout/shipping_address.elm"/>
<inp2:m_include template="in-commerce/elements/content_boxes/checkout/shipping_options.elm"/>
<!-- <inp2:m_include template="in-commerce/elements/content_boxes/checkout/shipping_calendar.elm"/>-->
</form>
</inp2:m_DefineElement>
<!--## /MAIN CONTENT ##-->
<!--## DESIGN TEMPLATE ##-->
-<inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Property changes on: branches/RC/themes/default2009/in-commerce/checkout/shipping.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.5
\ No newline at end of property
+1.1.2.6
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/checkout/shop_cart.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/checkout/shop_cart.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/checkout/shop_cart.tpl (revision 11485)
@@ -1,308 +1,318 @@
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_Phrase label="lu_title_ShoppingCart"/><inp2:m_if check="orditems_TotalRecords"> (<inp2:orditems_TotalRecords/>)</inp2:m_if>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
- <inp2:m_RenderElements
- elements="
- in-commerce/elements/side_boxes/checkout_steps.elm,
- platform/elements/side_boxes/login.elm,
- platform/elements/side_boxes/search.elm,
- "
- design="blue_box"/>
-
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/checkout_steps.elm" design="blue_box/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ </div>
</inp2:m_DefineElement>
<!--## /SIDE-BAR ELEMENT ##-->
<!--## MAIN CONTENT ##-->
<inp2:m_DefineElement name="content">
+
+<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_ShoppingCart" templates="in-commerce/checkout/shop_cart"/>
+</div>
+<div class="movable-element">
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_Phrase label="lu_title_ShoppingCart"/><inp2:m_if check="orditems_TotalRecords"> (<inp2:orditems_TotalRecords/>)</inp2:m_if>
</inp2:m_Capture>
<form method="post" action="<inp2:m_FormAction />">
<inp2:m_if check="ord_CartHasError">
<table class="warning-message fullwidth">
<tr>
<td width="30">
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/warning_icon.gif" width="21" height="18" alt=""/>
</td>
<td>
<inp2:m_phrase name="lu_Warning"/>
</td>
</tr>
</table>
<br />
<inp2:ord_CheckoutError state_changed="lu_comm_msg_state_changed" qty_unavailable="lu_comm_msg_qty_unavailable" outofstock="lu_comm_msg_outofstock"
coupon_applied="lu_comm_CouponApplied"
gift_certificate_applied="lu_comm_GiftCertificateApplied"
invalid_code="lu_comm_invalid_code" code_expired="lu_comm_code_expired"
min_qty="lu_min_qty_error" code_removed="lu_comm_CouponRemoved"
gc_code_removed="lu_comm_GiftCertificateRemoved"
code_removed_automatically="lu_comm_CouponIsNotEffective"
gc_code_removed_automatically="lu_comm_GiftCertificateIsNotEffective"
changed_after_login="lu_comm_CartChangedAfterLogin" /><br /><br />
</inp2:m_if>
<table class="fullwidth">
<inp2:m_DefineElement name="shop_cart_header">
<tr>
<td colspan="5">
<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
</td>
</tr>
<tr class="sub-section-header">
<td><inp2:m_Phrase label="lu_comm_ProductDescription"/></td>
<td width="60"><inp2:m_Phrase label="lu_comm_YourPrice"/></td>
<td width="50"><inp2:m_Phrase label="lu_comm_Qty"/>.</td>
<td width="50"><inp2:m_Phrase label="lu_comm_Total"/></td>
<td width="25">&nbsp;</td>
</tr>
<tr>
<td colspan="5">
<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
</td>
</tr>
</inp2:m_DefineElement>
<inp2:m_include template="in-commerce/elements/options_blocks.elm"/>
<inp2:m_DefineElement name="shop_cart_item">
<tr>
<td class="shopping-cart-cell-item-padding">
<table>
<tr>
<td class="shopping-cart-icpn-padding-right">
<img src="<inp2:m_TemplatesBase module="In-Commerce"/>img/shopping_cart_item.gif" width="16" height="14" alt="" />
</td>
<td>
<inp2:m_if check="FieldEquals" field="Virtual" value="0">
<a href="<inp2:ProductLink template="__default__"/>"><inp2:Field name="Name" /></a>
<inp2:m_if check="ord_FreePromoShippingAvailable">&nbsp;<sup><inp2:m_phrase label="lu_cart_FreeShippingAvailable" /></sup>
</inp2:m_if>
<inp2:m_else/>
<inp2:Field name="Name" />
</inp2:m_if>
<inp2:m_if check="ord_BackorderFlag"> <span class="error"><inp2:m_phrase label="lu_cart_BackorderFlag" /></span></inp2:m_if>
<inp2:m_if check="HasOptions">
<br/>
<span style="font-size: 8pt">
<inp2:m_if check="DisplayOptionsPricing">
<inp2:PrintOptions render_as="option_element" currency="selected"/>
<inp2:m_else/>
<inp2:PrintOptions render_as="option_element_no_price" currency="selected"/>
</inp2:m_if>
<inp2:m_if check="FieldEquals" field="OptionsSelectionMode" value="0">
<a href="<inp2:m_link template="__default__" pass="m,p,orditems"/>"><inp2:m_Phrase label="lu_comm_edit_options"/></a>
</inp2:m_if>
</span>
</inp2:m_if>
<inp2:m_if check="p_CustomField" name="Availability">
<br />
<inp2:p_CustomField name="Availability"/>
</inp2:m_if>
<inp2:m_if check="HasDiscount">
<br />
<inp2:m_Phrase label="lu_comm_RegularPrice" />: <inp2:Field name="FlatPrice" currency="selected"/><br />
<inp2:m_Phrase label="lu_comm_Discount" />: <span class="price1"><inp2:Field name="ItemDiscount" currency="selected" negative="1" /></span>
<!--<a href="javascript:showDiscountInfo('<inp2:ord_DiscountHelpLink template="in-commerce/checkout/discount_info" />')">[?]</a>-->
</inp2:m_if>
</td>
</tr>
</table>
</td>
<td class="shopping-cart-cell-item-padding"><strong><inp2:Field name="Price" currency="selected"/></strong></td>
<td class="shopping-cart-cell-item-padding">
<inp2:m_if check="IsTangible">
<inp2:m_if check="m_ModuleEnabled" module="In-Auction">
<inp2:m_if check="ebay-sections_IseBayItem">
<inp2:Field field="Quantity"/>
<inp2:m_else />
<input value="<inp2:Field field="Quantity"/>" style="width:20px" class="input-text" name="<inp2:InputName field="Quantity"/>" />
</inp2:m_if>
<inp2:m_else />
<input value="<inp2:Field field="Quantity"/>" style="width:20px" class="input-text" name="<inp2:InputName field="Quantity"/>" />
</inp2:m_if>
<!--<inp2:m_if check="ProductsInStock">
<inp2:m_Phrase name="lu_of"/> <inp2:ProductsInStock/>
</inp2:m_if>-->
<inp2:m_else />
1
</inp2:m_if>
</td>
<td class="shopping-cart-cell-item-padding"><strong><inp2:Field name="ExtendedPrice" currency="selected"/></strong></td>
<td class="shopping-cart-cell-item-padding" align="center">
<inp2:m_if check="m_ModuleEnabled" module="In-Auction">
<inp2:m_if check="ebay-sections_IseBayItem">
&nbsp;
<inp2:m_else />
<a href="<inp2:LinkRemoveFromCart/>"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/delete.gif" title="Delete" alt="Delete" width="8" height="10" border="0" /></a>
</inp2:m_if>
<inp2:m_else />
<a href="<inp2:LinkRemoveFromCart/>"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/delete.gif" title="Delete" alt="Delete" width="8" height="10" border="0" /></a>
</inp2:m_if>
</td>
</tr>
<tr>
<td colspan="5">
<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
</td>
</tr>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="shop_cart_footer">
</table>
<table width="100%">
<tr >
<td class="cart-subtotal">
<table width="100%">
<inp2:m_if check="ord_HasDiscount">
<tr>
<td>
<strong><inp2:m_Phrase label="lu_comm_TotalSavings" />:</strong>&nbsp;
</td>
<td>
<span class="price1"><strong><inp2:ord_Field name="DiscountTotal" currency="selected" /></strong></span>
</td>
</tr>
<tr>
<td colspan="2">
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="5" alt="" />
</td>
</tr>
</inp2:m_if>
<inp2:m_if check="ord_Field" name="CouponId">
<tr>
<td>
<inp2:m_Phrase label="lu_comm_CouponHasBeenApplied" />:&nbsp;
</td>
<td>
<inp2:ord_Field field="CouponName" />&nbsp;&nbsp;
<a href="<inp2:ord_RemoveCouponLink type="coupon"/>"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/delete.gif" title="<inp2:m_Phrase label="lu_comm_RemoveCoupon"/>" alt="<inp2:m_Phrase label="lu_comm_RemoveCoupon"/>" width="8" height="10" border="0" /></a>
</td>
</tr>
<inp2:m_else />
<tr>
<td><inp2:m_Phrase label="lu_comm_EnterCouponCode" />:&nbsp;</td>
<td><input size="15" class="input-text" name="coupon_code" /></td>
</tr>
</inp2:m_if>
<tr>
<td colspan="2">
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="3" alt="" />
</td>
</tr>
<inp2:m_if check="ord_Field" name="GiftCertificateId">
<tr>
<td><inp2:m_Phrase label="lu_comm_GiftCertificateHasBeenApplied" />:&nbsp;</td>
<td>
<inp2:ord_Field field="GiftCertificateDiscount" currency="selected" />&nbsp;&nbsp;
<a href="<inp2:ord_RemoveCouponLink type="gift_certificate"/>"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/delete.gif" title="<inp2:m_Phrase label="lu_comm_RemoveGiftCertificate"/>" alt="<inp2:m_Phrase label="lu_comm_RemoveGiftCertificate"/>" width="8" height="10" border="0" /></a>
</td>
</tr>
<inp2:m_else />
<tr>
<td><inp2:m_Phrase label="lu_comm_EnterGiftCertificateCode" />:&nbsp;</td>
<td><input size="15" class="input-text" name="giftcert_code" /></td>
</tr>
</inp2:m_if>
</table>
</td>
<td class="cart-subtotal" align="right">
<span class="cart-subtotal-text"><inp2:m_Phrase label="lu_comm_Subtotal"/>: <inp2:ord_Field field="SubtotalWithDiscount" currency="selected"/></span>
</td>
</tr>
<tr>
<td colspan="2">
<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="2" alt="" /><br />
<div class="horizontal-separator"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="1" height="1" alt="" /></div>
</td>
</tr>
<input type="hidden" name="next_step_template" value="<inp2:m_if check="ord_OrderHasTangibleItems">in-commerce/checkout/shipping<inp2:m_else/>in-commerce/checkout/billing</inp2:m_if>" />
<tr>
<td class="shopping-cart-button-padding">
<input class="button" type="submit" name="events[ord][OnUpdateCart]" value="<inp2:m_Phrase label="lu_comm_UpdateCart"/>" />
&nbsp;
<input class="button" type="submit" name="events[ord][OnCleanupCart]" onclick="return confirm('<inp2:m_Phrase label="lu_comm_ClearCartConfirmation" />')" value="<inp2:m_Phrase label="lu_comm_CleanupCart"/>" />
</td>
<td class="shopping-cart-button-padding" align="right">
<input type="hidden" name="continue_shopping_template" value="__default__"/>
<input class="button" type="submit" name="events[ord][OnContinueShopping]" value="<inp2:m_Phrase label="lu_comm_Continue_Shopping"/>">
&nbsp;
<input class="button" type="submit" name="events[ord][OnCheckout]" value="<inp2:m_Phrase label="lu_comm_ProceedCheckout"/>" />
</td>
</tr>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="shop_cart_empty">
<tr>
<td>
<strong><inp2:m_Phrase label="lu_comm_YourCartIsEmpty"/></strong>
</td>
</tr>
</inp2:m_DefineElement>
<script language="JavaScript">
function showDiscountInfo(url)
{
window.open(url, null, 'scrollbars=no,menubar=no,toolbars=no,width=300,height=150');
}
</script>
<inp2:ord_PrintCart item_render_as="shop_cart_item" header_render_as="shop_cart_header" footer_render_as="shop_cart_footer" empty_cart_render_as="shop_cart_empty" per_page="-1"/>
</table>
</form>
<inp2:m_if check="ord_CartNotEmpty">
<inp2:m_if check="ord_HasPaymentGateway" name="Google Checkout">
<inp2:m_DefineElement name="google_checkout_button">
<form method="POST" target="_blank" action="<inp2:ord_GetFormAction payment_type_id="$payment_type_id"/>">
<inp2:ord_GetFormHiddenFields return_template="in-commerce/checkout/checkout_success"
cancel_template="in-commerce/checkout/billing"
payment_type_id="$payment_type_id"/>
<inp2:m_if check="m_Param" name="submit_url" equals_to="https://checkout.google.com/api/checkout/v2">
<input type="image" name="Google Checkout" alt="Fast checkout through Google"
src="https://checkout.google.com/buttons/checkout.gif?merchant_id=<inp2:m_Param name="merchant_id"/>
&w=180&h=46&style=white&variant=text&loc=en_US" height="46" width="180">
<inp2:m_else/>
<input type="image" name="Google Checkout" alt="Fast checkout through Google"
src="http://sandbox.google.com/checkout/buttons/checkout.gif?merchant_id=<inp2:m_Param name="merchant_id"/>
&w=180&h=46&style=white&variant=text&loc=en_US" height="46" width="180">
</inp2:m_if>
</form>
</inp2:m_DefineElement>
<inp2:ord_DisplayPaymentGateway name="Google Checkout" render_as="google_checkout_button"/>
</inp2:m_if>
</inp2:m_if>
</inp2:m_RenderElement>
+</div>
+<div class="movable-element">
<inp2:m_if check="ord_CartIsEmpty">
<inp2:m_include template="in-commerce/elements/content_boxes/pick_products.elm"/>
</inp2:m_if>
+</div>
</inp2:m_DefineElement>
<!--## /MAIN CONTENT ##-->
<!--## DESIGN TEMPLATE ##-->
-<inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
<!--## /DESIGN TEMPLATE ##-->
Property changes on: branches/RC/themes/default2009/in-commerce/checkout/shop_cart.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.5
\ No newline at end of property
+1.1.2.6
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/checkout/cvv2help.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/checkout/cvv2help.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/checkout/cvv2help.tpl (revision 11485)
@@ -1,32 +1,38 @@
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_Phrase label="lu_comm_CVV2HELP"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
- <inp2:m_RenderElements
- elements="
- platform/elements/side_boxes/login.elm,
- platform/elements/side_boxes/search.elm,
- "
- design="blue_box"/>
-
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ </div>
</inp2:m_DefineElement>
<!--## SIDE-BAR ELEMENT ##-->
<!--## MAIN CONTENT ##-->
<inp2:m_DefineElement name="content">
+
+<div class="movable-element">
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_Phrase label="lu_comm_CVV2HELP"/>
</inp2:m_Capture>
CVV2HELP TPL
</inp2:m_RenderElement>
+</div>
+
</inp2:m_DefineElement>
<!--## /MAIN CONTENT ##-->
<!--## DESIGN TEMPLATE ##-->
-<inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Property changes on: branches/RC/themes/default2009/in-commerce/checkout/cvv2help.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.3
\ No newline at end of property
+1.1.2.4
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/checkout/checkout_success.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/checkout/checkout_success.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/checkout/checkout_success.tpl (revision 11485)
@@ -1,43 +1,50 @@
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_Phrase label="lu_comm_OrderCompleted"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
- <inp2:m_RenderElements
- elements="
- platform/elements/side_boxes/login.elm,
- platform/elements/side_boxes/search.elm,
- "
- design="blue_box"/>
-
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="0"/>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ </div>
</inp2:m_DefineElement>
<!--## /SIDE-BAR ELEMENT ##-->
<!--## MAIN CONTENT ##-->
<inp2:m_DefineElement name="content">
+
+<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_ShoppingCart" templates="in-commerce/checkout/shop_cart"/>
+</div>
+<div class="movable-element">
<inp2:m_RenderElement design="content_box">
<inp2:m_Capture to_var="header">
<inp2:m_Phrase label="lu_comm_OrderCompleted"/>
</inp2:m_Capture>
<inp2:m_Phrase label="lu_comm_ThankYou"/>!
<br/>
<inp2:m_Phrase label="lu_comm_OrderSuccessfullyPlaced"/>
</inp2:m_RenderElement>
<inp2:m_if check="u_SuggestRegister">
<inp2:m_include template="in-commerce/elements/content_boxes/checkout/form_register.elm"/>
</inp2:m_if>
+</div>
+
</inp2:m_DefineElement>
<!--## /MAIN CONTENT ##-->
<!--## DESIGN TEMPLATE ##-->
-<inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
<!--## /DESIGN TEMPLATE ##-->
Property changes on: branches/RC/themes/default2009/in-commerce/checkout/checkout_success.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.5
\ No newline at end of property
+1.1.2.6
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/checkout/billing.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/checkout/billing.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/checkout/billing.tpl (revision 11485)
@@ -1,65 +1,67 @@
-<!--## CHECK IF LOGIN REQUIRED ##-->
-<inp2:m_RequireLogin condition="Comm_RequireLoginBeforeCheckout" login_template="platform/login/register"/>
-<!-- /CHECK IF LOGIN REQUIRED -->
-
-<!--## CHECK IF SSL REQUIRED ##-->
-<inp2:m_CheckSSL mode="required" condition="Require_SSL" />
-<!-- /CHECK IF SSL REQUIRED -->
+<inp2:m_RequireLogin condition="Comm_RequireLoginBeforeCheckout" login_template="platform/login/register"/> <!--## CHECK IF LOGIN REQUIRED ##-->
+<inp2:m_CheckSSL mode="required" condition="Require_SSL" /> <!--## CHECK IF SSL REQUIRED ##-->
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_Phrase label="lu_comm_BillingInfo"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
- <inp2:m_RenderElements
- elements="
- in-commerce/elements/side_boxes/checkout_steps.elm,
- platform/elements/side_boxes/login.elm,
- platform/elements/side_boxes/search.elm,
- "
- design="blue_box"/>
-
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/checkout_steps.elm" design="blue_box/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/recent_products.elm" design="blue_box" data_exists="1"/>
+ </div>
</inp2:m_DefineElement>
<!--## /SIDE-BAR ELEMENT ##-->
<!--## MAIN CONTENT ##-->
<inp2:m_DefineElement name="content">
+
+<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm" titles="lu_title_ShoppingCart" templates="in-commerce/checkout/shop_cart"/>
+</div>
+
<table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td class="main-column-center">
<script type="text/javascript">
function catchFormEnter(e, id)
{
if (typeof(e) == 'undefined') e = window.event;
if (!e) return;
if (e.keyCode == 13) { //enter
if (typeof(document.all) == 'undefined') e.preventDefault();
e.cancelBubble = true;
e.returnValue = false;
document.getElementById(id).focus();
document.getElementById(id).click();
return false;
}
}
</script>
<form id="billing_info" method="post" onkeypress="catchFormEnter(event, 'events[ord][OnUpdate]')" action="<inp2:m_FormAction />">
<inp2:m_include template="in-commerce/elements/content_boxes/checkout/billing_address.elm"/>
<inp2:m_include template="in-commerce/elements/content_boxes/checkout/billing_options.elm"/>
</form>
</td>
</tr>
</table>
</inp2:m_DefineElement>
<!--## /MAIN CONTENT ##-->
<!--## DESIGN TEMPLATE ##-->
-<inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Property changes on: branches/RC/themes/default2009/in-commerce/checkout/billing.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.5
\ No newline at end of property
+1.1.2.6
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/index.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/index.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/index.tpl (revision 11485)
@@ -1,79 +1,97 @@
<!--## PAGE TITLE ELEMENT ##-->
<inp2:m_DefineElement name="page_title">
<inp2:m_include template="platform/elements/title_bar.elm"/>
</inp2:m_DefineElement>
<!--## //PAGE TITLE ELEMENT ##-->
<!--## SIDE-BAR ELEMENT ##-->
<inp2:m_DefineElement name="sidebar">
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
-
- <!--## PRODUCTS CATEGORIES LEFT MENU ##-->
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/cart_indicator.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
<inp2:m_RenderElement name="in-commerce/elements/side_boxes/categories.elm" design="blue_box" data_exists="1"/>
- <!--## /PRODUCTS CATEGORIES LEFT MENU ##-->
-
- <inp2:m_RenderElements
- elements="
- platform/elements/side_boxes/login.elm,
- platform/elements/side_boxes/search.elm,
- in-commerce/elements/side_boxes/credit_cards.elm,
- "
- design="blue_box"/>
-
- <inp2:m_RenderElement name="in-commerce/elements/side_boxes/pick_products.elm" design="blue_box" data_exists="1"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/login.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="platform/elements/side_boxes/search.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/credit_cards.elm" design="blue_box"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_RenderElement name="in-commerce/elements/side_boxes/pick_products.elm" design="blue_box" data_exists="1"/>
+ </div>
</inp2:m_DefineElement>
<!--## /SIDE-BAR ELEMENT ##-->
<!--## MAIN CONTENT ##-->
<inp2:m_DefineElement name="content">
+
+<div class="movable-element">
<inp2:m_include template="platform/elements/navigation_bar.elm"/>
+</div>
<!--## IF IN-COMMERCE HOME PAGE ##-->
<inp2:m_if check="p_IsModuleHome">
- <inp2:m_include template="in-commerce/elements/content_boxes/featured_products.elm"/>
- <inp2:m_include template="in-commerce/elements/content_boxes/new_products.elm"/>
- <inp2:m_include template="in-commerce/elements/content_boxes/pick_products.elm"/>
+ <div class="movable-element">
+ <inp2:m_include template="in-commerce/elements/content_boxes/featured_products.elm"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_include template="in-commerce/elements/content_boxes/new_products.elm"/>
+ </div>
+ <div class="movable-element">
+ <inp2:m_include template="in-commerce/elements/content_boxes/pick_products.elm"/>
+ </div>
<inp2:m_else/>
<!--## /IF IN-COMMERCE HOME PAGE ##-->
+ <div class="movable-element">
<inp2:m_include template="platform/elements/content_boxes/sub_categories.elm"/>
+ </div>
+ <div class="movable-element">
<!-- Category Products List -->
<inp2:m_RenderElement design="content_box" block_no_data="no_products">
<inp2:p_InitList list_name="products_in_category" />
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_Products"/> (<inp2:p_TotalRecords list_name="products_in_category"/>)
</inp2:m_Capture>
<inp2:m_include template="in-commerce/elements/sorting.elm" list_name="products_in_category"/>
<inp2:m_include template="in-commerce/designs/products.elm"/>
<table class="fullwidth table-border">
<inp2:p_ListProducts list_name="products_in_category" render_as="product_element"/>
</table>
<inp2:m_include template="platform/elements/pagination.elm" prefix="p" list_name="products_in_category"/>
</inp2:m_RenderElement>
<!-- // Category Products List -->
+ </div>
<!--## RELATED CATEGORIES ##-->
<!--##
+ <div class="movable-element">
<inp2:m_RenderElement design="content_box" related_to="Category" data_exists="1">
<inp2:m_Capture to_var="header">
<inp2:m_Phrase label="lu_title_RelatedCategories"/>
</inp2:m_Capture>
<inp2:m_include template="platform/elements/content_boxes/related_items.elm" related_to="$related_to" />
</inp2:m_RenderElement>
+ </div>
##-->
<!--## // RELATED CATEGORIES ##-->
</inp2:m_if>
</inp2:m_DefineElement>
<!--## /MAIN CONTENT ##-->
<!--## DESIGN TEMPLATE ##-->
-<inp2:m_include template="platform/designs/default_design.dsg" pass_params="1"/>
+<inp2:m_include template="platform/designs/default_design.des" pass_params="1"/>
<!--## /DESIGN TEMPLATE ##-->
\ No newline at end of file
Property changes on: branches/RC/themes/default2009/in-commerce/index.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.5
\ No newline at end of property
+1.1.2.6
\ No newline at end of property
Index: branches/RC/themes/default2009/in-commerce/elements/side_boxes/action_box.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-commerce/elements/side_boxes/action_box.elm.tpl (revision 11484)
+++ branches/RC/themes/default2009/in-commerce/elements/side_boxes/action_box.elm.tpl (revision 11485)
@@ -1,39 +1,29 @@
<inp2:m_Capture to_var="header">
<inp2:m_phrase name="lu_title_ActionBox"/>
</inp2:m_Capture>
<table width="100%" style="border-width: 0px;">
<inp2:m_if check="m_Param" name="item_actions">
<tr>
<td>-</td>
<td>
<inp2:m_if check="p_IsFavorite">
<a href="<inp2:p_FavoriteToggleLink/>">
<inp2:m_phrase name="lu_btn_RemoveFromWishList"/>
</a>
<inp2:m_else/>
<a href="<inp2:p_FavoriteToggleLink template="platform/my_account/my_favorites"/>">
<inp2:m_phrase name="lu_btn_AddToWishList"/>
</a>
</inp2:m_if>
</td>
</tr>
<tr>
<td>-</td>
<td>
<a href="<inp2:p_ProductLink template="in-commerce/products/add_review"/>"><inp2:m_phrase name="lu_btn_ReviewThisProduct"/></a>
</td>
</tr>
-
- <!--##
- <tr>
- <td>-</td>
- <td>
- <a href="<inp2:p_ProductLink template="in-commerce/products/rate_product"/>"><inp2:m_phrase name="lu_btn_RateThisProduct"/></a>
- </td>
- </tr>
- ##-->
-
</inp2:m_if>
</table>
\ No newline at end of file
Property changes on: branches/RC/themes/default2009/in-commerce/elements/side_boxes/action_box.elm.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.2.1
\ No newline at end of property
+1.1.2.2
\ No newline at end of property

Event Timeline

In-Portal CMS · In-Portal Community Pages · In-Portal Issue Tracker · In-Portal Repository Browser · Quality Assurance · In-Portal CI Server