mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Merge branch 'develop' into api2

Browse Source 
Conflicts:
	netbox/templates/users/_user.html
	netbox/users/urls.py
This commit is contained in:
Jeremy Stretch
2017-03-14 12:40:28 -04:00
parent 105d17748e d9f1bcbf15
commit 04aedcc056
14 changed files with 71 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
netbox/templates/users/_user.html
View File

@@ -10,19 +10,19 @@
<div class="col-sm-3 col-md-2 col-md-offset-2">
<ul class="nav nav-pills nav-stacked">
<li{% ifequal active_tab "profile" %} class="active"{% endifequal %}>
<a href="{% url 'users:profile' %}">Profile</a>
<a href="{% url 'user:profile' %}">Profile</a>
</li>
<li{% ifequal active_tab "change_password" %} class="active"{% endifequal %}>
<a href="{% url 'users:change_password' %}">Change Password</a>
<a href="{% url 'user:change_password' %}">Change Password</a>
</li>
<li{% ifequal active_tab "api_tokens" %} class="active"{% endifequal %}>
<a href="{% url 'users:token_list' %}">API Tokens</a>
<a href="{% url 'user:token_list' %}">API Tokens</a>
</li>
<li{% ifequal active_tab "userkey" %} class="active"{% endifequal %}>
<a href="{% url 'users:userkey' %}">User Key</a>
<a href="{% url 'user:userkey' %}">User Key</a>
</li>
<li{% ifequal active_tab "recent_activity" %} class="active"{% endifequal %}>
<a href="{% url 'users:recent_activity' %}">Recent Activity</a>
<a href="{% url 'user:recent_activity' %}">Recent Activity</a>
</li>
</ul>
</div>