Page Menu
Home
In-Portal Phabricator
Search
Configure Global Search
Log In
Files
F823853
in-commerce
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Subscribers
None
File Metadata
Details
File Info
Storage
Attached
Created
Tue, Mar 11, 10:35 AM
Size
8 KB
Mime Type
text/x-diff
Expires
Thu, Mar 13, 10:35 AM (19 h, 4 m)
Engine
blob
Format
Raw Data
Handle
585908
Attached To
rMINC Modules.In-Commerce
in-commerce
View Options
Index: branches/RC/themes/onlinestore/platform/blocks/common/contact_info.tpl
===================================================================
--- branches/RC/themes/onlinestore/platform/blocks/common/contact_info.tpl (revision 11630)
+++ branches/RC/themes/onlinestore/platform/blocks/common/contact_info.tpl (revision 11631)
@@ -1,52 +1,52 @@
<table class="block-no-border">
<tr>
<td class="block-header"><inp2:m_Phrase label="lu_ContactInformation"/></td>
</tr>
<tr>
<td class="block-data-single">
- <h1><inp2:conf_ConfigValue name="Comm_StoreName"/></h1>
+ <h1><inp2:conf_ConfigValue name="Comm_CompanyName"/></h1>
<table class="block-no-border">
<tr class="form-data">
<td><strong><inp2:m_Phrase label="lu_Email"/>:</strong></td>
<td><a href="mailto:<inp2:conf_ConfigValue name="Comm_Contacts_Email"/>"><inp2:conf_ConfigValue name="Comm_Contacts_Email"/></a> </td>
</tr>
<tr class="form-data">
<td width="200"><strong><inp2:m_Phrase label="lu_Phone"/>:</strong></td>
<td><inp2:conf_ConfigValue name="Comm_Contacts_Phone"/> </td>
</tr>
<tr class="form-data">
<td><strong><inp2:m_Phrase label="lu_Fax"/>:</strong></td>
<td><inp2:conf_ConfigValue name="Comm_Contacts_Fax"/> </td>
</tr>
<tr class="form-data">
<td width="200"><strong><inp2:m_Phrase label="lu_Address"/>:</strong></td>
<td><inp2:conf_ConfigValue name="Comm_AddressLine1"/> </td>
</tr>
<tr class="form-data">
<td> </td>
<td><inp2:conf_ConfigValue name="Comm_AddressLine2"/> </td>
</tr>
<tr class="form-data">
<td><strong><inp2:m_Phrase label="lu_City"/>:</strong></td>
<td><inp2:conf_ConfigValue name="Comm_City"/> </td>
</tr>
<tr class="form-data">
<td><strong><inp2:m_Phrase label="lu_State"/>:</strong></td>
<td><inp2:conf_ConfigValue name="Comm_State"/> </td>
</tr>
<tr class="form-data">
<td><strong><inp2:m_Phrase label="lu_ZipCode"/>:</strong></td>
<td><inp2:conf_ConfigValue name="Comm_ZIP"/> </td>
</tr>
<tr class="form-data">
<td><strong><inp2:m_Phrase label="lu_Country"/>:</strong></td>
<td><inp2:conf_ConfigValue name="Comm_Country"/> </td>
</tr>
<tr class="form-data">
<td><strong><inp2:m_Phrase label="lu_AdditionalInfo"/>:</strong></td>
<td><inp2:conf_ConfigValue name="Comm_Contacts_Additional"/> </td>
</tr>
</table>
</td>
</tr>
</table>
Property changes on: branches/RC/themes/onlinestore/platform/blocks/common/contact_info.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.4.2.1
\ No newline at end of property
Index: branches/RC/themes/onlinestore/in-commerce/checkout/shipping.tpl
===================================================================
--- branches/RC/themes/onlinestore/in-commerce/checkout/shipping.tpl (revision 11630)
+++ branches/RC/themes/onlinestore/in-commerce/checkout/shipping.tpl (revision 11631)
@@ -1,56 +1,57 @@
<inp2:m_RequireLogin condition="Comm_RequireLoginBeforeCheckout" login_template="platform/login/login_register"/>
<inp2:m_CheckSSL mode="required" condition="Require_SSL" />
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title><inp2:conf_ConfigValue name="Site_Name"/> :: <inp2:m_Phrase label="lu_cart_Checkout"/> :: <inp2:m_Phrase label="lu_comm_ShippingInfo"/></title>
<inp2:m_include template="platform/blocks/common/html_head" />
</head>
<body>
<inp2:m_include template="platform/blocks/common/header" />
<inp2:m_include template="platform/blocks/common/toolbar" />
<table class="main-table">
<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 method="post" onkeypress="catchFormEnter(event, 'events[ord][OnUpdate]')" action="<inp2:m_FormAction />">
<inp2:m_include template="in-commerce/blocks/checkout/shipping_address"/>
<inp2:m_include template="in-commerce/blocks/checkout/shipping_options"/>
</form>
+ <div align="center" class="error"><inp2:m_Get name="usps_errors" /></div>
</td>
<td class="main-column-right">
<inp2:m_include template="in-commerce/blocks/checkout/checkout_steps"/>
<inp2:m_include template="in-commerce/blocks/products/products_recent" data_exists="1"/>
</td>
</tr>
</table>
<inp2:m_include template="platform/blocks/common/footer" />
<inp2:m_include template="platform/blocks/common/copyright" />
</body>
</html>
\ No newline at end of file
Property changes on: branches/RC/themes/onlinestore/in-commerce/checkout/shipping.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.6.2.1
\ No newline at end of property
Index: branches/RC/themes/default/in-commerce/shop_cart/shipping.tpl
===================================================================
--- branches/RC/themes/default/in-commerce/shop_cart/shipping.tpl (revision 11630)
+++ branches/RC/themes/default/in-commerce/shop_cart/shipping.tpl (revision 11631)
@@ -1,62 +1,63 @@
<inp2:m_RequireLogin condition="Comm_RequireLoginBeforeCheckout" login_template="in-commerce/login_register"/>
<inp2:m_CheckSSL mode="required" condition="Require_SSL" />
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>In-commerce Online Store</title>
<inp2:m_include template="in-commerce/blocks/common/html_head" />
</head>
<body>
<inp2:m_include template="common/pagetop.tpl" />
<img src="img/s.gif"/><br/>
<table class="main-table">
<tr>
<td class="main-column-center">
<form method="post" action="<inp2:m_FormAction />">
<table class="main-path">
<tr valign="middle">
<td>
<div class="nav-bar">
<img src="img/ic_homepath.gif" align="absmiddle" />
<a href="<inp:m_template_link _Template="index" _Category=0 />"><inp:m_language _Phrase="lu_home" /></a> >
<inp:m_language _Phrase="lu_comm_ShippingInfo" />
</div>
</td>
<td class="main-path-language">
<img src="<inp:m_lang_field _Field="icon" _default="img/ic_flag.gif"/>" width="18" height="12" alt="" align="absmiddle" />
<span onclick="showSeg('langmenu',true); "><inp:m_lang_field _Field="LocalName" />
</td>
</tr>
</table>
<inp:include _Template="lang_select/lang_menu.tpl" />
<inp2:m_include template="in-commerce/blocks/shop_cart/shipping_address"/>
<inp2:m_include template="in-commerce/blocks/shop_cart/shipping_options"/>
</form>
+ <div align="center" class="error"><inp2:m_Get name="usps_errors" /></div>
</td>
<td class="main-column-right">
<inp2:m_include template="in-commerce/blocks/shop_cart/checkout_steps"/>
<inp:m_loginbox _LoginTemplate="misc/right_login" _LoggedInTemplate="misc/right_loggedin.tpl" />
<!--inp2:m_include template="in-commerce/blocks/common/login" /-->
<inp:include _Template="misc/right_searchbox.tpl" />
<inp2:m_include template="in-commerce/blocks/products/products_recent" data_exists="1"/>
</td>
</tr>
</table>
<table>
<inp2:m_include template="common/footer.tpl" />
</table>
</body>
</html>
\ No newline at end of file
Property changes on: branches/RC/themes/default/in-commerce/shop_cart/shipping.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.7
\ No newline at end of property
+1.7.2.1
\ No newline at end of property
Event Timeline
Log In to Comment