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

Update design of user profile section

Browse Source
This commit is contained in:
jeremystretch
2021-08-24 15:24:03 -04:00
parent 52603c087b
commit d11ea67bdd
6 changed files with 68 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
netbox/templates/users/api_tokens.html
View File

@ -3,7 +3,7 @@
{% block title %}API Tokens{% endblock %} {% block title %}API Tokens{% endblock %}
{% block usercontent %} {% block content %}
<div class="row"> <div class="row">
<div class="col col-md-12"> <div class="col col-md-12">
{% for token in tokens %} {% for token in tokens %}
@ -51,10 +51,12 @@
{% empty %} {% empty %}
<p>You do not have any API tokens.</p> <p>You do not have any API tokens.</p>
{% endfor %} {% endfor %}
<a href="{% url 'user:token_add' %}" class="btn btn-sm btn-primary my-3"> <div class="text-end">
<a href="{% url 'user:token_add' %}" class="btn btn-sm btn-primary my-3">
<span class="mdi mdi-plus-thick" aria-hidden="true"></span> <span class="mdi mdi-plus-thick" aria-hidden="true"></span>
Add a Token Add a Token
</a> </a>
</div>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}

41
netbox/templates/users/base.html
View File

@ -1,21 +1,26 @@
{% extends 'base/layout.html' %} {% extends 'base/layout.html' %}
{% block title %}{% endblock %} {% block tabs %}
<ul class="nav nav-tabs px-3">
{% block content %} <li role="presentation" class="nav-item">
<div class="row"> <a class="nav-link{% if active_tab == 'profile' %} active{% endif %}" href="{% url 'user:profile' %}">Profile</a>
<div class="col-sm-3 col-md-2 border-end"> </li>
<nav class="nav nav-pills nav-justified flex-column"> <li role="presentation" class="nav-item">
<a class="nav-item nav-link text-start{% if active_tab == 'profile' %} active{% endif %}" href="{% url 'user:profile' %}">Profile</a> <a class="nav-link{% if active_tab == 'preferences' %} active{% endif %}" href="{% url 'user:preferences' %}">Preferences</a>
<a class="nav-link nav-item text-start{% if active_tab == 'preferences' %} active{% endif %}" href="{% url 'user:preferences' %}">Preferences</a> </li>
{% if not request.user.ldap_username %} {% if not request.user.ldap_username %}
<a class="nav-link nav-item text-start{% if active_tab == 'change-password' %} active{% endif %}" href="{% url 'user:change_password' %}">Change Password</a> <li role="presentation" class="nav-item">
{% endif %} <a class="nav-link{% if active_tab == 'password' %} active{% endif %}" href="{% url 'user:change_password' %}">Password</a>
<a class="nav-link nav-item text-start{% if active_tab == 'api-tokens' %} active{% endif %}" href="{% url 'user:token_list' %}">API Tokens</a> </li>
</nav> {% endif %}
</div> <li role="presentation" class="nav-item">
<div class="col-sm-9 col-md-10 px-4"> <a class="nav-link{% if active_tab == 'api-tokens' %} active{% endif %}" href="{% url 'user:token_list' %}">API Tokens</a>
{% block usercontent %}{% endblock %} </li>
</div> </ul>
</div> {% endblock %}
{% block content-wrapper %}
<div class="tab-content">
{% block content %}{% endblock %}
</div>
{% endblock %} {% endblock %}

6
netbox/templates/users/change_password.html → netbox/templates/users/password.html
View File

@ -3,10 +3,8 @@
{% block title %}Change Password{% endblock %} {% block title %}Change Password{% endblock %}
{% render_errors form %} {% block content %}
<form action="." method="post" class="form form-horizontal col-md-8 offset-md-2">
{% block usercontent %}
<form action="." method="post" class="form form-horizontal col-md-10 col-md-offset-1">
{% csrf_token %} {% csrf_token %}
<div class="field-group"> <div class="field-group">
<h5 class="text-center">Password</h5> <h5 class="text-center">Password</h5>

2
netbox/templates/users/preferences.html
View File

@ -3,7 +3,7 @@
{% block title %}User Preferences{% endblock %} {% block title %}User Preferences{% endblock %}
{% block usercontent %} {% block content %}
<form method="post" action="" id="preferences-update"> <form method="post" action="" id="preferences-update">
{% csrf_token %} {% csrf_token %}
<div class="field-group mb-3"> <div class="field-group mb-3">

63
netbox/templates/users/profile.html
View File

@ -3,35 +3,40 @@
{% block title %}User Profile{% endblock %} {% block title %}User Profile{% endblock %}
{% block usercontent %} {% block content %}
<small class="text-muted">User Login</small> <div class="row">
<h5>{{ request.user.username }}</h5> <div class="col-md-8 offset-md-2">
<small class="text-muted">Full Name</small> <span class="text-muted">User Login</span>
<h5> <h5 class="mb-3">{{ request.user.username }}</h5>
{% if request.user.first_name and request.user.last_name %}
{{ request.user.first_name }} {{ request.user.last_name }} <span class="text-muted">Full Name</span>
{% elif request.user.first_name and not request.user.last_name %} <h5 class="mb-3">
{{ request.user.first_name }} {% if request.user.first_name and request.user.last_name %}
{% elif request.user.last_name and not request.user.first_name %} {{ request.user.first_name }} {{ request.user.last_name }}
{{ request.user.last_name }} {% elif request.user.first_name and not request.user.last_name %}
{% else %} {{ request.user.first_name }}
<span class="text-muted">None</span>
{% endif %}
</h5>
<small class="text-muted">Email</small>
<h5>{{ request.user.email }}</h5>
<small class="text-muted">Registered</small>
<h5>{{ request.user.date_joined|annotated_date }}</h5>
<small class="text-muted">Groups</small>
<h5>
{% if request.user.groups.all %}
{% for group in request.user.groups.all %}
<span class="badge bg-secondary">{{ group }}</span>
{% endfor %}
{% else %} {% else %}
<span class="text-muted">None</span> {{ request.user.last_name|placeholder }}
{% endif %} {% endif %}
</h5> </h5>
<small class="text-muted">Admin Access</small>
<h5>{{ request.user.is_staff|yesno|capfirst }}</h5> <span class="text-muted">Email</span>
<h5 class="mb-3">{{ request.user.email|placeholder }}</h5>
<span class="text-muted">Registered</span>
<h5 class="mb-3">{{ request.user.date_joined|annotated_date }}</h5>
<span class="text-muted">Groups</span>
<h5 class="mb-3">
{% for group in request.user.groups.all %}
<span class="badge bg-secondary">{{ group }}</span>
{% empty %}
<span class="text-muted">None</span>
{% endfor %}
</h5>
<span class="text-muted">Admin Access</span>
<h5 class="mb-3">{{ request.user.is_staff|yesno|capfirst }}</h5>
</div>
</div>
{% endblock %} {% endblock %}

6
netbox/users/views.py
View File

@ -153,7 +153,7 @@ class UserConfigView(LoginRequiredMixin, View):
class ChangePasswordView(LoginRequiredMixin, View): class ChangePasswordView(LoginRequiredMixin, View):
template_name = 'users/change_password.html' template_name = 'users/password.html'
def get(self, request): def get(self, request):
# LDAP users cannot change their password here # LDAP users cannot change their password here
@ -165,7 +165,7 @@ class ChangePasswordView(LoginRequiredMixin, View):
return render(request, self.template_name, { return render(request, self.template_name, {
'form': form, 'form': form,
'active_tab': 'change_password', 'active_tab': 'password',
}) })
def post(self, request): def post(self, request):
@ -194,7 +194,7 @@ class TokenListView(LoginRequiredMixin, View):
return render(request, 'users/api_tokens.html', { return render(request, 'users/api_tokens.html', {
'tokens': tokens, 'tokens': tokens,
'active_tab': 'api_tokens', 'active_tab': 'api-tokens',
}) })