Skip to content

Commit 972471e

Browse files
committed
Fixed navigation
1 parent ec73e7e commit 972471e

2 files changed

Lines changed: 12 additions & 11 deletions

File tree

resources/views/auth/signin.twig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
{% endif %}
4444
</div>
4545

46-
<button class="btn btn-primary btn-lg btn-block" type="submit">Sign up</button>
46+
<button class="btn btn-primary btn-lg btn-block" type="submit">Sign i</button>
4747

4848
{{ csrf.field | raw }}
4949
</form>

resources/views/templates/partials/navigation.twig

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<nav class="navbar navbar-inverse navbar-embossed col-md-12" role="navigation">
1+
2+
<nav class="navbar navbar-inverse col-md-12" role="navigation">
23
<div class="navbar-header">
34
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-01">
45
<span class="sr-only">Toggle navigation</span>
@@ -11,16 +12,16 @@
1112
<!-- If User is logged in -->
1213
{% if auth.check %}
1314
<li class="dropdown">
14-
<a href="#" class="dropdown-toggle" data-toggle="dropdown">{{ auth.user.first_name }} {{ auth.user.last_name }} <b class="caret"></b></a>
15+
<a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-user-o" aria-hidden="true"></i> {{ auth.user.first_name }} {{ auth.user.last_name }} <b class="caret"></b></a>
1516
<span class="dropdown-arrow"></span>
1617
<ul class="dropdown-menu">
17-
<li><a href="{{ path_for('users.view', { 'id': auth.user.id }) }}">My Profile</a></li>
18+
<li><a href="{{ path_for('users.view', { 'id': auth.user.id }) }}"><i class="fa fa-user" aria-hidden="true"></i> My Profile</a></li>
1819

19-
<li><a href="{{ path_for('posts.index', {'user_id': auth.user.id }) }}">My Posts</a></li>
20-
<li><a href="{{ path_for('auth.password.change') }}">Change Password</a></li>
20+
<li><a href="{{ path_for('posts.index', {'user_id': auth.user.id }) }}"><i class="fa fa-pencil-square-o" aria-hidden="true"></i> My Posts</a></li>
21+
<li><a href="{{ path_for('auth.password.change') }}"><i class="fa fa-key" aria-hidden="true"></i> Change Password</a></li>
2122

2223
<li class="divider"></li>
23-
<li><a href="{{ path_for('auth.signout')}}">Logout</a></li>
24+
<li><a href="{{ path_for('auth.signout')}}"><i class="fa fa-power-off" aria-hidden="true"></i> Logout</a></li>
2425
</ul>
2526
</li>
2627

@@ -38,18 +39,18 @@
3839
{% endif %}
3940

4041
{% else %}
41-
<li><a href="{{ path_for('auth.signup')}}">Signup</a></li>
42-
<li><a href="{{ path_for('auth.signin')}}">Signin</a></li>
42+
<li><a href="{{ path_for('auth.signup')}}"><i class="fa fa-sign-in" aria-hidden="true"></i> Signup</a></li>
43+
<li><a href="{{ path_for('auth.signin')}}"><i class="fa fa-unlock" aria-hidden="true"></i> Signin</a></li>
4344

4445
{% endif %}
45-
<li><a href="{{ path_for('about')}}">About Us</a></li>
46+
<li><a href="{{ path_for('about')}}"><i class="fa fa-address-book-o" aria-hidden="true"></i> About Us</a></li>
4647
</ul>
4748
<form class="navbar-form navbar-right" action="#" role="search">
4849
<div class="form-group">
4950
<div class="input-group">
5051
<input class="form-control" id="navbarInput-01" type="search" placeholder="Search">
5152
<span class="input-group-btn">
52-
<button type="submit" class="btn"><span class="fui-search"></span> Search</button>
53+
<button type="submit" class="btn btn-primary"><span class="fui-search"></span> Search</button>
5354
</span>
5455
</div>
5556
</div>

0 commit comments

Comments
 (0)