Skip to content

Commit

Permalink
changed staff index to home
Browse files Browse the repository at this point in the history
  • Loading branch information
jsayles committed Jan 24, 2017
1 parent 783ea08 commit f5f352a
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion members/templates/members/u_base.html
Expand Up @@ -103,7 +103,7 @@
<li><a href="{% url 'member:faq' %}">FAQ</a></li>
<li><a class='dropdown-button' data-hover="true" data-beloworigin="true" data-activates='dropdown3' href="{% url 'logout' %}">Logout</a>
<ul id='dropdown3' class='dropdown-content'>
{% if request.user.is_staff %} <li><a href="{% url 'staff:index' %}">Staff</a></li>
{% if request.user.is_staff %} <li><a href="{% url 'staff:home' %}">Staff</a></li>
<li><a href="{% url 'admin:index' %}">Admin</a></li>
{% endif %}
</ul>
Expand Down
8 changes: 4 additions & 4 deletions staff/templates/staff/base.html
Expand Up @@ -21,7 +21,7 @@
<script src="{% static 'materialize.min.js' %}"></script>

{%block sub-head %}{% endblock %}

{% block pagestyle %}{% endblock %}

<style>
Expand All @@ -34,16 +34,16 @@
<nav id="branding">
<div class='right nav-wrapper'>
{% if request.user.is_authenticated %}
<a href="/member">Member</a> |
<span style="color:#e1e1e1">Staff</span> |
<a href="{% url 'member:home' %}">Member</a> |
<a href="{% url 'staff:home' %}" style="color:#e1e1e1">Staff</a> |
<a href="/admin">Admin</a> |
<a href="/tablet">Tablet</a>
{% else %}
<a href="http://nadineproject.org" target="_new">The Nadine Project</a>
{% endif %}
</div>
<div id='site-id'>
<a href="/">{{ site.name}}</a>: <span style="color:#e1e1e1">Nadine Membership Console</span>
<a href="/">{{ site.name }}</a>: <span style="color:#e1e1e1">Nadine Membership Console</span>
</div>
</nav>

Expand Down
2 changes: 1 addition & 1 deletion staff/urls/__init__.py
Expand Up @@ -4,7 +4,7 @@
from staff.views import core

urlpatterns = [
url(r'^$', lambda r: redirect('staff:tasks:todo'), name="index"),
url(r'^$', lambda r: redirect('staff:tasks:todo'), name="home"),

url(r'^tasks/', include('staff.urls.tasks', namespace="tasks")),
url(r'^user/', include('staff.urls.user', namespace="user")),
Expand Down
2 changes: 1 addition & 1 deletion views.py
Expand Up @@ -34,7 +34,7 @@
@login_required
def index(request):
if request.user.is_staff:
return HttpResponseRedirect(reverse('staff:index'))
return HttpResponseRedirect(reverse('staff:home'))
return HttpResponseRedirect(reverse('member:home'))


Expand Down

0 comments on commit f5f352a

Please sign in to comment.