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

Merge with master (Conflict)

Browse Source
This commit is contained in:
touffies
2013-10-02 11:26:11 +02:00
parent fd881b23f0
commit c56a7851e1
3 changed files with 1 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
templates/default/layout.tpl
View File

@@ -66,31 +66,8 @@ URL: http://www.thelia.net
<!-- Place everything within .nav-collapse to hide it until above 768px -->
<nav class="navbar-collapse collapse nav-main" role="navigation" aria-label="Main Navigation">
<ul class="nav navbar-nav navbar-categories">
<<<<<<< HEAD
<li><a href="{url path="/"}" class="home">{intl l="Home"}</a></li>
{loop type="category" name="category.navigation" parent="0" limit="3"}
=======
<li class="active"><a href="{url path="/"}" class="home" tabindex="-1">Home</a></li>
{* <li class="dropdown">
<a href="" data-toggle="dropdown" class="dropdown-toggle">Pages</a>
<ul class="dropdown-menu list-subnav" role="menu">
<li class="active"><a href="index.html" tabindex="-1">Index</a></li>
<li><a href="category.html">Category Grid</a></li>
<li><a href="category-list.html">Category List</a></li>
<li><a href="account.html">Account</a></li>
<li><a href="login.html">Login</a></li>
<li><a href="password.html">Forgot Password</a></li>
<li><a href="register.html">Register</a></li>
<li><a href="cart.html">Cart</a></li>
<li><a href="cart-step2.html">Cart (Step 2)</a></li>
<li><a href="cart-step3.html">Cart (Step 3)</a></li>
<li><a href="cart-step4.html">Cart (Step 4)</a></li>
<li><a href="product-details.html">Product details</a></li>
<li><a href="address.html">New address</a></li>
</ul>
</li>*}
{loop type="category" name="category.navigation" parent="0"}
>>>>>>> master
<li><a href="{$URL}">{$TITLE}</a></li>
{/loop}
</ul>
@@ -99,24 +76,12 @@ URL: http://www.thelia.net
<li><a href="{url path="/logout"}" class="logout">{intl l="Log out!"}</a></li>
<li><a href="{url path="/customer/account"}" class="account">{intl l="My Account"}</a></li>
{/loop}
<<<<<<< HEAD
{elseloop rel="customer_info_block" 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 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>
>>>>>>> master
{/elseloop}
<li class="dropdown">
<<<<<<< HEAD
<a href="{url path="/cart"}" class="cart" data-toggle="dropdown">
=======
<a href="{url path="/cart"}" class="dropdown-toggle cart" {*data-toggle="dropdown"*}>
>>>>>>> master
Cart <span class="badge">{cart attr="count_item"}</span>
</a>
</li>

14
templates/default/login.html
View File

@@ -1,19 +1,7 @@
{extends file="layout.tpl"}
<<<<<<< HEAD
* Body Class *}
{* Body Class *}
{block name="body-class"}page-login{/block}
=======
{block name="breadcrumb"}
<nav class="nav-breadcrumb" role="navigation" aria-labelledby="breadcrumb-label">
<strong id="breadcrumb-label">{intl l="You are here"}: </strong>
<ul class="breadcrumb" itemprop="breadcrumb">
<li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{navigate to="index"}" itemprop="url"><span itemprop="title">{intl l="Home"}</span></a></li>
<li itemscope itemtype="http://data-vocabulary.org/Breadcrumb" class="active"><span itemprop="title">{intl l="Login"}</span></li>
</ul>
</nav><!-- /.nav-breadcrumb -->
{/block}
>>>>>>> master
{* Breadcrumb *}
{block name='no-return-functions' append}

11
templates/default/password.html
View File

@@ -1,6 +1,5 @@
{extends file="layout.tpl"}
<<<<<<< HEAD
{* Body Class *}
{block name="body-class"}page-password{/block}
@@ -9,16 +8,6 @@
{$breadcrumbs = [
['name' => {intl l="Password"}, 'link'=>{url path="/password"}]
]}
=======
{block name="breadcrumb"}
<nav class="nav-breadcrumb" role="navigation" aria-labelledby="breadcrumb-label">
<strong id="breadcrumb-label">{intl l="You are here"} </strong>
<ul class="breadcrumb" itemprop="breadcrumb">
<li itemscope itemtype="http://data-vocabulary.org/Breadcrumb"><a href="{navigate to="index"}" itemprop="url"><span itemprop="title">{intl l="Home"}</span></a></li>
<li itemscope itemtype="http://data-vocabulary.org/Breadcrumb" class="active"><span itemprop="title">{intl l="Password"}</span></li>
</ul>
</nav><!-- /.nav-breadcrumb -->
>>>>>>> master
{/block}