TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'refactor_action'

Browse Source 
Conflicts:
	core/lib/Thelia/Action/Product.php
	core/lib/Thelia/Controller/Admin/CategoryController.php
	core/lib/Thelia/Controller/Admin/ProductController.php
	core/lib/Thelia/Controller/Admin/TemplateController.php
This commit is contained in:
Manuel Raynaud
2013-09-30 10:26:59 +02:00
parent 2928d0d3c0 6c5e348b46
commit 7bf5ee31c9
116 changed files with 334 additions and 254 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/default/layout.tpl
View File

@@ -90,12 +90,12 @@ URL: http://www.thelia.net
<li><a href="{url path="/customer/account"}" class="login">{intl l="My Account"}</a></li>
{/loop}
{elseloop rel="customer_info_block" rel="customer_info_block"}
{elseloop rel="customer_info_block"}
<li><a href="{url path="/register"}" class="register">{intl l="Register"}!</a></li>
<li><a href="{url path="/login"}" class="login">{intl l="Log In!"}</a></li>
{/elseloop}
<li class="dropdown">
<a href="{url path="/cart"}" class="dropdown-toggle cart" data-toggle="dropdown">
<a href="{url path="/cart"}" class="dropdown-toggle cart" {*data-toggle="dropdown"*}>
Cart <span class="badge">{cart attr="count_item"}</span>
</a>
</li>