diff options
Diffstat (limited to 'pharos-dashboard/src/templates')
3 files changed, 24 insertions, 7 deletions
diff --git a/pharos-dashboard/src/templates/account/user_list.html b/pharos-dashboard/src/templates/account/user_list.html index c2b8193..f18e161 100644 --- a/pharos-dashboard/src/templates/account/user_list.html +++ b/pharos-dashboard/src/templates/account/user_list.html @@ -5,6 +5,8 @@ <thead> <tr> <th>Username</th> + <th>Full Name</th> + <th>Email</th> <th>Company</th> <th>SSH Key</th> <th>GPG Key</th> @@ -17,17 +19,23 @@ {{ user.username }} </td> <td> + {{ user.userprofile.full_name }} + </td> + <td> + {{ user.email }} + </td> + <td> {{ user.userprofile.company }} </td> <td> - {% if user.userprofile.ssh_public_key %} - <a href={{ user.userprofile.ssh_public_key.url }}>SSH</a> - {% endif %} + {% if user.userprofile.ssh_public_key %} + <a href={{ user.userprofile.ssh_public_key.url }}>SSH</a> + {% endif %} </td> <td> - {% if user.userprofile.pgp_public_key %} - <a href={{ user.userprofile.pgp_public_key.url }}>GPG</a> - {% endif %} + {% if user.userprofile.pgp_public_key %} + <a href={{ user.userprofile.pgp_public_key.url }}>GPG</a> + {% endif %} </td> </tr> {% endfor %} diff --git a/pharos-dashboard/src/templates/account/userprofile_update_form.html b/pharos-dashboard/src/templates/account/userprofile_update_form.html index 542ea81..f4bb7b5 100644 --- a/pharos-dashboard/src/templates/account/userprofile_update_form.html +++ b/pharos-dashboard/src/templates/account/userprofile_update_form.html @@ -16,9 +16,17 @@ <form enctype="multipart/form-data" method="post"> {% csrf_token %} {% bootstrap_form form %} + <p><b>API Token</b> + <a href="{% url 'generate_token' %}" class="btn btn-default"> + Generate + </a> + </p> + <p style="word-wrap: break-word;">{{ token.key }}</p> + + <p></p> {% buttons %} <button type="submit" class="btn btn btn-success"> - Save + Save Profile </button> {% endbuttons %} </form> diff --git a/pharos-dashboard/src/templates/dashboard/resource_detail.html b/pharos-dashboard/src/templates/dashboard/resource_detail.html index 657d565..e0b29bd 100644 --- a/pharos-dashboard/src/templates/dashboard/resource_detail.html +++ b/pharos-dashboard/src/templates/dashboard/resource_detail.html @@ -106,6 +106,7 @@ </p> <p> <b>Email: </b> + {{ resource.owner.email }} </p> <p> <a href="{% url 'booking:create' resource_id=resource.id %}" class="btn |