Fixed conditional user bit on the homepage

Improved text formatting on the base template
This commit is contained in:
Tom Price
2014-12-03 22:39:13 +00:00
parent 5cf73d441c
commit a87a1ba6bf
2 changed files with 4 additions and 4 deletions

View File

@@ -7,9 +7,9 @@
</div>
<div class="col-sm-6">
<div class="well">
{% if request.user %}
<h3>Welcome back {{ request.user.get_full_name }}.<br />
<small>Your rigboard initials are {{ request.user.initials }}</small></h3>
{% if user.is_authenticated %}
<h3>Welcome back {{ user.get_full_name }}.<br />
<small>Your rigboard initials are {{ user.initials }}</small></h3>
{% endif %}
<h3>There are currently {{ rig_count }} rigs coming up.</h3>
<a class="btn btn-default" href="{% url 'rigboard' %}">View Rigboard</a>

View File

@@ -81,7 +81,7 @@
</li>
</ul>
{% else %}
<a href="{% url "login" %}?next={{ request.build_absolute_uri }}">
<a href="{% url "login" %}?next={{ request.path }}">
<span class="icon-user"></span>
Hi guest
</a>