summaryrefslogtreecommitdiff
path: root/templates/user
diff options
context:
space:
mode:
Diffstat (limited to 'templates/user')
-rw-r--r--templates/user/browse_requests.html35
-rw-r--r--templates/user/view_request.html26
2 files changed, 42 insertions, 19 deletions
diff --git a/templates/user/browse_requests.html b/templates/user/browse_requests.html
index fca0763..cee1665 100644
--- a/templates/user/browse_requests.html
+++ b/templates/user/browse_requests.html
@@ -1,15 +1,36 @@
{% extends 'base.html' %}
{% block content %}
{% if not reqs %}
- You have no unreplied requests.
+ You have no unreplied requests <sup><a href="/about/request/" target="_blank">learn more</a></sup><br />
{% else %}
+ You have not yet replied to these requests.<sup><a href="/about/request/" target="_blank">learn more</a></sup><br /><br />
{% for req in reqs %}
- <form><a href="/user/requests/rid={{req.id}}">
- {% if not req.is_read %}<b>{% endif %}{{req.sent_by.username}}|{{req.role}}|
- {% ifequal req.role "PY" %}
- {{req.task.title}}
- {% endifequal %}</a>
- {% if not req.is_read %}</b>{% endif %}<br /></form>
+ <a href="/user/requests/rid={{req.id}}">
+ {% if not req.is_read %}<b>{% endif %}
+
+ {% ifequal req.role "PY" %}
+ Assign of pynts to {{req.receiving_user}} for the task "{{req.task.title|slice:":20"}}"
+ {% endifequal %}
+
+ {% ifequal req.role "MT" %}
+ Request to mentor the task "{{req.task.title|slice:":20"}}"
+ {% endifequal %}
+
+ {% ifequal req.role "DV" %}
+ Request to act as a developer in the website
+ {% endifequal %}
+
+ {% ifequal req.role "MG" %}
+ Request to act as a manager in the website
+ {% endifequal %}
+
+ {% ifequal req.role "AD" %}
+ Request to act as an admin in the website
+ {% endifequal %}
+
+
+ {% if not req.is_read %}</b>{% endif %}<br />
+ </a>
{% endfor %}
{% endif %}
{% endblock %}
diff --git a/templates/user/view_request.html b/templates/user/view_request.html
index 2d3fc41..cb803fb 100644
--- a/templates/user/view_request.html
+++ b/templates/user/view_request.html
@@ -25,24 +25,26 @@
<a href="/user/view/uid={{req.sent_by.id}}">{{req.sent_by.username}}</a> assigned {{req.pynts}} pynts to
<a href="/user/view/uid={{req.receiving_user.id}}">{{req.receiving_user.username}}</a> for the task
<a href="/task/view/tid={{req.task.id}}">{{req.task.title}}</a><br />
- {% endifequal %}
+ {% else %}
- {% ifequal "MT" req.role %}
- <a href="/user/view/uid={{req.sent_by.id}}">{{req.sent_by.username}}</a> requested you to act as a mentor for the task
- <a href="/task/view/tid={{req.task.id}}">{{req.task.title}}</a><br />
- {% else %}
- You have been requested to act as
- {% ifequal "AD" req.role %}
- an Admin
+ {% ifequal "MT" req.role %}
+ <a href="/user/view/uid={{req.sent_by.id}}">{{req.sent_by.username}}</a> requested you to act as a mentor for the task
+ <a href="/task/view/tid={{req.task.id}}">{{req.task.title}}</a><br />
{% else %}
- {% ifequal "MG" req.role %}
- a Manager
+ You have been requested to act as
+ {% ifequal "AD" req.role %}
+ an Admin
{% else %}
- a Developer
+ {% ifequal "MG" req.role %}
+ a Manager
+ {% else %}
+ a Developer
+ {% endifequal %}
{% endifequal %}
+ for the website by <a href="/user/view/uid={{req.sent_by.id}}">{{req.sent_by.username}}</a>.<br />
{% endifequal %}
- for the website by <a href="/user/view/uid={{req.sent_by.id}}">{{req.sent_by.username}}</a>.<br />
{% endifequal %}
+ <br />
Please accept or reject the request.<br />
<form action="yes/" method="post">