finished the phase-2 successfully. added all the learnmore templates. hav to look for bugs if any.

8 files changed, 63 insertions, 5 deletions

diff --git a/taskapp/utilities/notification.py b/taskapp/utilities/notification.py
index 4c14976..696f5b5 100644
--- a/taskapp/utilities/notification.py
+++ b/taskapp/utilities/notification.py
@@ -96,7 +96,7 @@ def create_notification(role, sent_to, sent_from=None, reply=None, task=None, re
 
         notification.task = task
         new_mentor = sent_to
-        mentor_learn_url = '<sup><a href="/about/mentor">learn more</a></sup>'
+        mentor_learn_url = '<sup><a href="/about/mentor/">learn more</a></sup>'
         task_url= '<a href="/task/view/tid=%s">%s</a>'%(task.id, task.title)
 
         notification.sub = "You are mentoring the task %s"%task.title[:20]
diff --git a/taskapp/views/user.py b/taskapp/views/user.py
index ea29576..3277039 100644
--- a/taskapp/views/user.py
+++ b/taskapp/views/user.py
@@ -22,10 +22,11 @@ about = {
     "starthere": "about/starthere.html",
     "task": "about/task.html",
     "tasklife": "about/tasklife.html",
-    "developer": "about/developer.html", 
-    ## "manager":
-    ## "admin":
-    ## "request": - also contains about automatic rejection of requests
+    "developer": "about/developer.html",
+    "notification": "about/notification.html",
+    "request": "about/request.html",
+    "manager": "about/manager.html",
+    "admin": "about/admin.html",
 }
 
 def show_msg(user, message, redirect_url=None, url_desc=None):
diff --git a/templates/about/admin.html b/templates/about/admin.html
new file mode 100644
index 0000000..e623b8f
--- /dev/null
+++ b/templates/about/admin.html
@@ -0,0 +1,8 @@
+{% extends 'base.html' %}
+{% block title %}
+    PyTasks - About - Admin
+{% endblock %}
+{% block content %}
+    Admin is the user who has to approve assign of credits to any user for his/her work on the task.<br />
+    An Admin also has the right to request normal users to become admins or managers or developers.
+{% endblock %}
diff --git a/templates/about/developer.html b/templates/about/developer.html
new file mode 100644
index 0000000..b0a7713
--- /dev/null
+++ b/templates/about/developer.html
@@ -0,0 +1,8 @@
+{% extends 'base.html' %}
+{% block title %}
+    PyTasks - About - Developer
+{% endblock %}
+{% block content %}
+    A Developer has the right to post a task. The link is available on your homepage.<br />
+    <a href="/about/tasklife/" target="_blank">click here</a> to know the complete life cycle of a task.
+{% endblock %}
diff --git a/templates/about/manager.html b/templates/about/manager.html
new file mode 100644
index 0000000..804cda5
--- /dev/null
+++ b/templates/about/manager.html
@@ -0,0 +1,7 @@
+{% extends 'base.html' %}
+{% block title %}
+    PyTasks - About - Manager
+{% endblock %}
+{% block content %}
+    A Manager has the right to request normal users to become managers or developers.
+{% endblock %}
diff --git a/templates/about/notification.html b/templates/about/notification.html
new file mode 100644
index 0000000..3fce3ce
--- /dev/null
+++ b/templates/about/notification.html
@@ -0,0 +1,7 @@
+{% extends 'base.html' %}
+{% block title %}
+    PyTasks - About - Notification
+{% endblock %}
+{% block content %}
+    Notification is a message generated by the system to inform you about any events.
+{% endblock %}
diff --git a/templates/about/request.html b/templates/about/request.html
new file mode 100644
index 0000000..4c20b34
--- /dev/null
+++ b/templates/about/request.html
@@ -0,0 +1,25 @@
+{% extends 'base.html' %}
+{% block title %}
+    PyTasks - About - Request
+{% endblock %}
+{% block content %}
+    Request is a request made by a user, requesting you to become someone else. It can also be request of assigning pynts to a user
+    for a task ( goes to all the admins only ).
+    You can accept or reject a request. You can also provide optional remarks when rejecting. When you respond to a request, it is 
+    automatically removed from your requests and you will be redirected to browse requests page.
+    Redundant requests are automatically removed.<br /><br />
+    The following can be redundant requests.
+    <ul>
+    <li>You are requested to act as a mentor and the task is published or deleted or closed or completed</li>
+    <li>There are requests for assigning pynts to a user for a task and the task is closed or completed</li>
+    <li>There are requests for assigning pynts to a user and the user is removed from the working users of the task</li>
+    </ul>
+    These redundant requests when removed, a notification is sent to the requested user.
+    <ul>
+    <li>You accept a request to act as mentor for a task and there are similar requests </li>
+    <li>You accept a request to act as an admin and there are similar or less privileged requests ("Manager", "Developer")</li>
+    <li>You accept a request to act as a manager and there are similar or less privileged requests ("Developer")</li>
+    <li>You accept a request to act as a developer and there are similar requests</li>
+    </ul>
+    
+{% endblock %}
diff --git a/templates/about/tasklife.html b/templates/about/tasklife.html
index 0eb9cd5..d3e3c24 100644
--- a/templates/about/tasklife.html
+++ b/templates/about/tasklife.html
@@ -27,6 +27,8 @@
      request for assign of credits to the task implies that someone has worked on the task and hence dependencies cannot be 
      added after that.<br /><br />
      
+     The users can be selected to work or removed from working users at any point in time. If a user is removed, he can claim again
+     to request to continue working on the task. If a user is removed, all the pending requests for assigning pynts to user will be made invalid.
      After a considerable amount of work has been done and all the users and mentors have been assigned pynts properly, any mentor in the
      task can mark the task as complete. The link is available on assign pynts page just in case
      the mentor wants to assign more pynts before marking the task as complete.<br/>