Page MenuHomeIn-Portal Phabricator

onlinestore
No OneTemporary

File Metadata

Created
Mon, Jan 6, 5:33 AM

onlinestore

Index: branches/1.1.x/platform/blocks/common/html_head.tpl
===================================================================
--- branches/1.1.x/platform/blocks/common/html_head.tpl (revision 13555)
+++ branches/1.1.x/platform/blocks/common/html_head.tpl (revision 13556)
@@ -1,22 +1,21 @@
<inp2:m_CheckSSL/>
<meta http-equiv="Content-Type" content="text/html; charset=<inp2:lang.current_Field name="Charset"/>" />
<inp2:m_if check="m_ModuleEnabled" module="In-Edit">
<!--## if In-edit purchase! ##-->
<inp2:m_Include t="in-edit/blocks/header"/>
<!--## /if In-edit purchase! ##-->
<inp2:m_else/>
<meta name="description" content="<inp2:c_Meta name="Description"/>" />
<meta name="keywords" content="<inp2:c_Meta name="Keywords"/>" />
</inp2:m_if>
<inp2:m_base_ref />
<script type="text/javascript" src="<inp2:m_Compress files='inc/prototype.js|inc/ajax.js'/>"></script>
<script type="text/javascript" src="inc/scriptaculous.js?load=effects"></script>
<script type="text/javascript" src="inc/lightbox.js"></script>
<script type="text/javascript">
var aRatingManager = new RatingManager('<inp2:m_Link template="index" events[#PREFIX#]="OnMakeVote" rating="#VOTE#" id="#ID#" no_amp="1" size="#SIZE#"/>');
</script>
<link href="<inp2:m_Compress files='inc/style.css'/>" rel="stylesheet" type="text/css" />
-<link rel="stylesheet" href="<inp2:m_Compress files='inc/lightbox.css'/>" type="text/css" media="screen" />
-<inp2:theme.current_StylesheetFile/>
\ No newline at end of file
+<link rel="stylesheet" href="<inp2:m_Compress files='inc/lightbox.css'/>" type="text/css" media="screen" />
\ No newline at end of file
Index: branches/1.1.x/platform/blocks/common/footer.tpl
===================================================================
--- branches/1.1.x/platform/blocks/common/footer.tpl (revision 13555)
+++ branches/1.1.x/platform/blocks/common/footer.tpl (revision 13556)
@@ -1,18 +1,22 @@
<table border="0" cellspacing="0" cellpadding="0">
<tr>
<td class="toolbar" style="text-align: center">
<a href="<inp2:c_CategoryLink template="index" module="In-Commerce" cat_id="Root"/>" class="toolbar"><inp2:m_Phrase label="lu_Home"/></a> |
<a href="<inp2:m_Link template="in-commerce/my_account/account"/>" class="toolbar"><inp2:m_Phrase label="lu_YourAccount"/></a> |
<a href="<inp2:m_Link template="in-commerce/my_account/wishlist"/>" class="toolbar"><inp2:m_Phrase label="lu_YourWishList"/></a> |
<a href="<inp2:m_Link template="in-commerce/checkout/shop_cart"/>" class="toolbar"><inp2:m_Phrase label="lu_ShoppingCart"/></a> |
<a href="<inp2:m_Link template="in-commerce/store/contact_info" />" class="toolbar"><inp2:m_Phrase label="lu_ContactUs"/></a>
<inp2:m_if check="m_LoggedIn">
| <a href="<inp2:u_LogoutLink />" class="toolbar"><inp2:m_Phrase label="lu_Logout"/></a>
</inp2:m_if>
</td>
</tr>
</table>
-<inp2:m_RegisterPageHit/>
\ No newline at end of file
+<inp2:m_RegisterPageHit/>
+
+<!-- Tracking Code Starts-->
+<inp2:st_PageInfo type="tracking"/>
+<!-- Tracking Code Ends -->
\ No newline at end of file
Index: branches/1.1.x
===================================================================
--- branches/1.1.x (revision 13555)
+++ branches/1.1.x (revision 13556)
Property changes on: branches/1.1.x
___________________________________________________________________
Added: bugtraq:logregex
## -0,0 +1,2 ##
+(?:[Bb]ugs?|[Ii]ssues?|[Rr]eports?|[Ff]ixe?s?|[Rr]esolves?)+\s+(?:#?(?:\d+)[,\.\s]*)+
+(\d+)
\ No newline at end of property
Added: bugtraq:url
## -0,0 +1 ##
+http://tracker.in-portal.org/view.php?id=%BUGID%
\ No newline at end of property
Added: bugtraq:warnifnoissue
## -0,0 +1 ##
+false
\ No newline at end of property
Modified: svn:mergeinfo
## -0,0 +0,2 ##
Merged /themes/onlinestore/releases/1.0.1:r13504-13555
Merged /themes/onlinestore/branches/1.0.x:r13048-13503

Event Timeline