summaryrefslogtreecommitdiffstats
path: root/tools/pharos-dashboard/src/templates
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
commit7022542bc70c448f71fa56c06d90595e276d7dcc (patch)
tree44b37f2772860eb211ccede03fa0c0dfbce5accd /tools/pharos-dashboard/src/templates
parent0655a3226b31ac0486e053a6161f99f08223ba59 (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 'tools/pharos-dashboard/src/templates')
-rw-r--r--tools/pharos-dashboard/src/templates/account/user_list.html20
-rw-r--r--tools/pharos-dashboard/src/templates/account/userprofile_update_form.html10
-rw-r--r--tools/pharos-dashboard/src/templates/dashboard/resource_detail.html1
3 files changed, 24 insertions, 7 deletions
diff --git a/tools/pharos-dashboard/src/templates/account/user_list.html b/tools/pharos-dashboard/src/templates/account/user_list.html
index c2b81938..f18e1618 100644
--- a/tools/pharos-dashboard/src/templates/account/user_list.html
+++ b/tools/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/tools/pharos-dashboard/src/templates/account/userprofile_update_form.html b/tools/pharos-dashboard/src/templates/account/userprofile_update_form.html
index 542ea81e..f4bb7b55 100644
--- a/tools/pharos-dashboard/src/templates/account/userprofile_update_form.html
+++ b/tools/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/tools/pharos-dashboard/src/templates/dashboard/resource_detail.html b/tools/pharos-dashboard/src/templates/dashboard/resource_detail.html
index 657d5656..e0b29bd9 100644
--- a/tools/pharos-dashboard/src/templates/dashboard/resource_detail.html
+++ b/tools/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