diff options
Diffstat (limited to 'templates/task')
| -rw-r--r-- | templates/task/assign.html | 1 | ||||
| -rw-r--r-- | templates/task/claim.html | 32 | ||||
| -rw-r--r-- | templates/task/view.html | 110 |
3 files changed, 79 insertions, 64 deletions
diff --git a/templates/task/assign.html b/templates/task/assign.html index 232b56d..8c4e3d2 100644 --- a/templates/task/assign.html +++ b/templates/task/assign.html @@ -1,5 +1,6 @@ {% extends 'base.html' %} {% block content %} + <a href="/task/claim/tid={{task.id}}">click here</a> to return to the claims page.<br /><br /> Select a user to assign this task.<br /> <form action="" method="POST"> {{form.as_table}} diff --git a/templates/task/claim.html b/templates/task/claim.html index 47e24b7..9368da1 100644 --- a/templates/task/claim.html +++ b/templates/task/claim.html @@ -4,31 +4,35 @@ List of all the claims for the task <a href="/task/view/tid={{task.id}}">{{task.title}}</a><br /> {% for claim in claims %} <hr /> - <a href="/user/view/uid={{claim.user.id}}">{{claim.user.username}}</a> at {{claim.creation_datetime.ctime}} wrote:<br /> + <a href="/user/view/uid={{claim.user.id}}">{{claim.user.username}}</a> + on {{claim.creation_datetime|date:"D d M Y"}} at {{claim.creation_datetime|time:"H:i"}} wrote:<br /> {{claim.message}}<br /> {% endfor %} {% else %} - {% if task_claimable%} + {% if task_claimable %} There are no claims for this task yet.<br /> + Be the first to claim the task.<br /> {% else %} This task cannot be claimed right now. {% endif %} - <a href="/task/view/tid={{task.id}}">Click here</a> to return to the task. + <a href="/task/view/tid={{task.id}}">Click here</a> to return to the task.<br /> {% endif %} {% if task_claimed and is_mentor %} <a href="/task/assign/tid={{task.id}}">Select a user to assign the work.</a> {% endif %} {% if user_can_claim %} - <hr /> - {% if errors %} - {% for error in errors %} - {{error}}<br /> - {% endfor %} - {% endif %} - Claim the task:<br /> - <form action="" method="post"> - <textarea name="message"></textarea><br /> - <input type="submit" value="Submit Claim"> - </form> + {% if errors %} + {% for error in errors %} + {{error}}<br /> + {% endfor %} + {% endif %} + + <hr /> + Please note that you can claim only once and so write your proposal carefully.<br /> + Claim proposal:<br /> + <form action="" method="post"> + <textarea name="message"></textarea><br /> + <input type="submit" value="Submit Claim"> + </form> {% endif %} {% endblock %} diff --git a/templates/task/view.html b/templates/task/view.html index 1b25927..d30290e 100644 --- a/templates/task/view.html +++ b/templates/task/view.html @@ -5,40 +5,46 @@ {% block content %} {% if task_viewable %} <h3>{{ task.title }}</h3><br /> - <!-- we have to write our own datetime.strftime filter and use in the next line --> - created by <a href="/user/view/uid={{ task.created_by.id }}">{{ task.created_by.username }}</a> - on {{task.creation_datetime|date:"D d M Y"}} at {{task.creation_datetime|time:"H:i"}}<br /> - {% if is_mentor %} + {% if can_edit %} + <a href="/task/edit/tid={{task.id}}">Edit task</a> + {% endif %} - {% ifequal task.status "UP" %} - <a href="/task/edit/tid={{task.id}}">Edit task</a> - {% else %} - <a href="/task/close/tid={{task.id}}">Close this task</a> - {% endifequal %} - - {% if can_publish %} - <a href="/task/publish/tid={{task.id}}">Publish task</a> - {% endif %} - <br /> + {% if can_close %} + <a href="/task/close/tid={{task.id}}">Close this task</a> {% endif %} + + {% if can_publish %} + <a href="/task/publish/tid={{task.id}}">Publish task</a> + {% endif %} + + <hr />created by <a href="/user/view/uid={{ task.created_by.id }}">{{ task.created_by.username }}</a> + on {{task.creation_datetime|date:"D d M Y"}} at {{task.creation_datetime|time:"H:i"}}<br /> {% ifequal task.status "UP" %} Task can be viewed by: {% else %} Mentors: {% endifequal %} + {% for mentor in mentors %} - <a href="/user/view/uid={{mentor.id}}">{{mentor.username}}|</a> + <a href="/user/view/uid={{mentor.id}}">{{mentor.username}}</a> {% endfor %} + {% if can_mod_mentors %} <a href="/task/addmentor/tid={{task.id}}"> {% ifequal task.status "UP" %} Request others to view/edit the task {% else %} Add another Mentor to this task - {% endifequal %}</a><br /> + {% endifequal %}</a> {% endif %} + <br /> + + <hr /> + <b>Description:</b><br /> + {{ task.desc }} + <hr /> {% if deps %} @@ -75,51 +81,55 @@ {% endif %} {% endif %} + {% ifequal task.status "CD" %} + Task has been closed by <a href="/user/view={{closing_notification.sent_from.id}}">{{closing_notification.sent_from.username}}</a> + on {{closing_notification.sent_date|date:"D d M Y"}} at {{closing_notification.sent_date|time:"H:i"}}<br /> + <b>Reason: </b>{{closing_notification.remarks}}<br /> + {% endifequal %} - <hr> - <br />Description:<br /> - <br />{{ task.desc }}<br /> - <hr> - - {% ifnotequal task.status "CM" %} - {% if assigned_users %} - Users working on this task: - {% for user in assigned_users %} - <a href="/user/view/uid={{user.id}}">{{user.username}}</a>| - {% endfor %} - {% if is_mentor %} - <a href="/task/remuser/tid={{task.id}}">Remove an existing user</a> - <br /> - {% endif %} - {% else %} - There are no users currently working on this task.<br /> - {% endif %} - {% if can_assign_credits %} - <a href="/task/assigncredits/tid={{task.id}}">View/Assign credits</a> - {% endif %} - {% if not is_guest and task_claimable %} - <a href="/task/claim/tid={{task.id}}">View claims</a><br /> + {% ifequal task.status "CM" %} + Task has been marked complete by <a href="/user/view={{completed_notification.sent_from.id}}"> + {{completed_notification.sent_from.username}}</a> + on {{completed_notification.sent_date|date:"D d M Y"}} at {{completed_notification.sent_date|time:"H:i"}}<br /> + {% endifequal %} + + {% ifequal task.status "OP" %} + <br />There are no users working on this task.<br /> + {% endifequal %} + + {% if assigned_users %} + Users working on this task: + {% for user in assigned_users %} + <a href="/user/view/uid={{user.id}}">{{user.username}}</a> + {% endfor %} + {% if is_mentor %} + <a href="/task/remuser/tid={{task.id}}">Remove an existing user</a> {% endif %} - {% else %} - {% ifequal task.status "CD" %} - The task has been closed by .. due to .. - {% else %} - The task is complete. - {% endifequal %} - {% endifnotequal %} + <br /> + {% endif %} + + {% if can_assign_credits %} + <a href="/task/assigncredits/tid={{task.id}}">View/Assign credits</a> + {% endif %} + + {% if task_claimable %} + <a href="/task/claim/tid={{task.id}}">View claims</a> + {% endif %} {% if comments %} <hr /> - <br/>comments:<br /> + comments:<br /><br /> {% for comment in comments %} - <br /><a href="/user/view/uid={{comment.created_by.id}}">{{ comment.created_by.username }}</a> at {{ comment.creation_datetime.ctime }} wrote:<br /> - {{ comment.data }}<br /> + <a href="/user/view/uid={{comment.created_by.id}}">{{ comment.created_by.username }}</a> + on {{ comment.creation_datetime|date:"D d M Y"}} at {{comment.creation_datetime|time:"H:i"}} wrote:<br /> + {{ comment.data }}<br /><br /> {% endfor %} {% endif %} {% if not is_guest %} + <hr /> {% ifnotequal task.status "CM" %} - <br />Add comment:<br /> + Add comment:<br /> <form action="" method="post"> <!-- we might even want to use forms here --> <textarea name="data"></textarea><br /> |