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

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}