diff --git a/netbox/templates/users/api_tokens.html b/netbox/templates/users/api_tokens.html index b14b08928..48fe01c1c 100644 --- a/netbox/templates/users/api_tokens.html +++ b/netbox/templates/users/api_tokens.html @@ -3,7 +3,7 @@ {% block title %}API Tokens{% endblock %} -{% block usercontent %} +{% block content %}
{% for token in tokens %} @@ -51,10 +51,12 @@ {% empty %}

You do not have any API tokens.

{% endfor %} - +
+ Add a Token - + +
{% endblock %} diff --git a/netbox/templates/users/base.html b/netbox/templates/users/base.html index 038787862..cf4cd585d 100644 --- a/netbox/templates/users/base.html +++ b/netbox/templates/users/base.html @@ -1,21 +1,26 @@ {% extends 'base/layout.html' %} -{% block title %}{% endblock %} - -{% block content %} -
-
- -
-
- {% block usercontent %}{% endblock %} -
-
+{% block tabs %} + +{% endblock %} + +{% block content-wrapper %} +
+ {% block content %}{% endblock %} +
{% endblock %} diff --git a/netbox/templates/users/change_password.html b/netbox/templates/users/password.html similarity index 89% rename from netbox/templates/users/change_password.html rename to netbox/templates/users/password.html index a0c08035c..81082792d 100644 --- a/netbox/templates/users/change_password.html +++ b/netbox/templates/users/password.html @@ -3,10 +3,8 @@ {% block title %}Change Password{% endblock %} -{% render_errors form %} - -{% block usercontent %} -
+{% block content %} + {% csrf_token %}
Password
diff --git a/netbox/templates/users/preferences.html b/netbox/templates/users/preferences.html index 9d63dc390..156767e8d 100644 --- a/netbox/templates/users/preferences.html +++ b/netbox/templates/users/preferences.html @@ -3,7 +3,7 @@ {% block title %}User Preferences{% endblock %} -{% block usercontent %} +{% block content %} {% csrf_token %}
diff --git a/netbox/templates/users/profile.html b/netbox/templates/users/profile.html index 683612870..aacee591d 100644 --- a/netbox/templates/users/profile.html +++ b/netbox/templates/users/profile.html @@ -3,35 +3,40 @@ {% block title %}User Profile{% endblock %} -{% block usercontent %} - User Login -
{{ request.user.username }}
- Full Name -
- {% if request.user.first_name and request.user.last_name %} - {{ request.user.first_name }} {{ request.user.last_name }} - {% elif request.user.first_name and not request.user.last_name %} - {{ request.user.first_name }} - {% elif request.user.last_name and not request.user.first_name %} - {{ request.user.last_name }} - {% else %} - None - {% endif %} -
- Email -
{{ request.user.email }}
- Registered -
{{ request.user.date_joined|annotated_date }}
- Groups -
- {% if request.user.groups.all %} - {% for group in request.user.groups.all %} - {{ group }} - {% endfor %} +{% block content %} +
+
+ User Login +
{{ request.user.username }}
+ + Full Name +
+ {% if request.user.first_name and request.user.last_name %} + {{ request.user.first_name }} {{ request.user.last_name }} + {% elif request.user.first_name and not request.user.last_name %} + {{ request.user.first_name }} {% else %} - None + {{ request.user.last_name|placeholder }} {% endif %} -
- Admin Access -
{{ request.user.is_staff|yesno|capfirst }}
+
+ + Email +
{{ request.user.email|placeholder }}
+ + Registered +
{{ request.user.date_joined|annotated_date }}
+ + Groups +
+ {% for group in request.user.groups.all %} + {{ group }} + {% empty %} + None + {% endfor %} +
+ + Admin Access +
{{ request.user.is_staff|yesno|capfirst }}
+
+
{% endblock %} diff --git a/netbox/users/views.py b/netbox/users/views.py index eac6d7490..afee10eeb 100644 --- a/netbox/users/views.py +++ b/netbox/users/views.py @@ -153,7 +153,7 @@ class UserConfigView(LoginRequiredMixin, View): class ChangePasswordView(LoginRequiredMixin, View): - template_name = 'users/change_password.html' + template_name = 'users/password.html' def get(self, request): # LDAP users cannot change their password here @@ -165,7 +165,7 @@ class ChangePasswordView(LoginRequiredMixin, View): return render(request, self.template_name, { 'form': form, - 'active_tab': 'change_password', + 'active_tab': 'password', }) def post(self, request): @@ -194,7 +194,7 @@ class TokenListView(LoginRequiredMixin, View): return render(request, 'users/api_tokens.html', { 'tokens': tokens, - 'active_tab': 'api_tokens', + 'active_tab': 'api-tokens', })