Nicer index, callsign display in nav
This commit is contained in:
parent
ee05f845cb
commit
c27d8bc3bf
|
@ -27,8 +27,9 @@ def contestIndex(request):
|
||||||
#messages.error(request, "Error!!!")
|
#messages.error(request, "Error!!!")
|
||||||
#messages.success(request, "Great Success")
|
#messages.success(request, "Great Success")
|
||||||
qsoform = QSOForm(request.user)
|
qsoform = QSOForm(request.user)
|
||||||
|
contest = Contest.objects.get(id=1)
|
||||||
|
|
||||||
return render(request, 'contest/index.html', {"qsoform": qsoform})
|
return render(request, 'contest/index.html', {"qsoform": qsoform, "contest": contest})
|
||||||
|
|
||||||
@login_required
|
@login_required
|
||||||
def log(request):
|
def log(request):
|
||||||
|
|
|
@ -62,6 +62,9 @@
|
||||||
<li><a href="/login/">Login</a></li>
|
<li><a href="/login/">Login</a></li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</ul>
|
</ul>
|
||||||
|
{% if user.is_authenticated %}
|
||||||
|
<p class="navbar-text navbar-right"><kbd>{{ user.username }} @ {% if user.ref %}{{ user.ref }}{% else %}???{% endif %}</kbd></p>
|
||||||
|
{% endif %}
|
||||||
</div><!--/.nav-collapse -->
|
</div><!--/.nav-collapse -->
|
||||||
</div>
|
</div>
|
||||||
</nav>
|
</nav>
|
||||||
|
|
|
@ -23,7 +23,9 @@
|
||||||
<form method="post" action="{% url "login" %}" class="uniForm">
|
<form method="post" action="{% url "login" %}" class="uniForm">
|
||||||
{% csrf_token %}
|
{% csrf_token %}
|
||||||
{{ loginForm|crispy }}
|
{{ loginForm|crispy }}
|
||||||
|
<div class="form-actions">
|
||||||
<button type="submit" class="btn btn-primary">Login</button>
|
<button type="submit" class="btn btn-primary">Login</button>
|
||||||
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue