summaryrefslogtreecommitdiffstats
path: root/pharos-dashboard/src/templates/account
diff options
context:
space:
mode:
authormaxbr <maxbr@mi.fu-berlin.de>2016-10-05 14:24:11 +0200
committerJose Lausuch <jose.lausuch@ericsson.com>2016-10-12 13:29:04 +0000
commitadafb09cb1f221259970d16886ea0e03169899a5 (patch)
treed282c9c67723a4f5247909256396bbfd1d957335 /pharos-dashboard/src/templates/account
parent46e1d9ab232df1c4deb672b72cd7b87081094955 (diff)
Sync dashboard user data with jira
JIRA: PHAROS-264 Change-Id: Ic4533af04946ee0493c762ca79aaf46ee0f80e00 Signed-off-by: maxbr <maxbr@mi.fu-berlin.de>
Diffstat (limited to 'pharos-dashboard/src/templates/account')
-rw-r--r--pharos-dashboard/src/templates/account/user_list.html20
-rw-r--r--pharos-dashboard/src/templates/account/userprofile_update_form.html10
2 files changed, 23 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>