8 files changed, 119 insertions, 15 deletions
diff --git a/taskapp/views/user.py b/taskapp/views/user.py
index e12d9ec..ea29576 100644
--- a/taskapp/views/user.py
+++ b/taskapp/views/user.py
@@ -18,13 +18,11 @@ from pytask.taskapp.utilities.user import get_user
 
 about = {
     "addmentors": "about/addmentors.html",
-    "mentor": "about/mentor.html", ## - include role in different stages and merge with mentorrights
+    "mentor": "about/mentor.html", 
     "starthere": "about/starthere.html",
-    ## "claimtask":
-    ## "edittask": - contains both about up and pub states
-    ## "mentorrights":
-    ## "assigntask":
-    ## "developer":
+    "task": "about/task.html",
+    "tasklife": "about/tasklife.html",
+    "developer": "about/developer.html", 
     ## "manager":
     ## "admin":
     ## "request": - also contains about automatic rejection of requests
diff --git a/templates/404.html b/templates/404.html
new file mode 100644
index 0000000..d65d1a7
--- /dev/null
+++ b/templates/404.html
@@ -0,0 +1,5 @@
+{% extends 'base.html' %}
+{% block content %}
+    The page you requested does not exist.<br />
+    <a href="javascript:history.go(-1)">Click here</a> to get back to the previous page.
+{% endblock %}
diff --git a/templates/about/addmentors.html b/templates/about/addmentors.html
index 538f0bf..e7bd4e9 100644
--- a/templates/about/addmentors.html
+++ b/templates/about/addmentors.html
@@ -1,12 +1,24 @@
 {% extends 'base.html' %}
 {% block title %}
-    {{task.title}}
+    PyTasks - About - Add Mentors
 {% endblock %}
 {% block content %}
      
-    A Mentor<sup><a href="/about/mentor/" target="_blank">learn more</a></sup>
+    A Mentor <sup><a href="/about/mentor/" target="_blank">learn more</a></sup>
     of the task can request other users to mentor the task by clicking the link "Add more mentors" available on the task page.
-    A request will be sent to the user and he will also become the mentor of the task if he accepts it.<br />
+    A request will be sent to the user. If a user has claimed the task or is working on the task, he cannot be requested to be a mentor.
+    If the requested user accepts the request, he will also become the mentor of the task.<br /><br />
     
+    Since mentors can view unpublished tasks, mentors can be requested to view, edit and comment upon unpublished tasks.
+    They can also add or remove subtasks/dependencies in unpublished state. Thereby, the creator of task can fix on the task.
+    Publishing/Deleting of an unpublished task is available only to the creator of the task.<br /><br />
+    
+    Users can also be requested to mentor an published task. If the user accepts the request, he also becomes the mentor of the task.
+    In this case, the mentor is equivalent to the creator of the task. He can select/remove users; request pynts; close/complete the task.
+    He will have complete control over the task.<br /><br />
+    
+    If a mentor requests a user to act as a mentor, he cannot make the same request to the same user again untill the previous one is 
+    rejected. However, another mentor in the task can request the same user to be a mentor, unless there is already a similar request to the user
+    from this mentor also.
 
 {% endblock %}
diff --git a/templates/about/mentor.html b/templates/about/mentor.html
index 7935185..8f1d2b1 100644
--- a/templates/about/mentor.html
+++ b/templates/about/mentor.html
@@ -1,10 +1,21 @@
 {% extends 'base.html' %}
 {% block title %}
-    {{PyTasks - Learn more - Mentor}}
+    PyTasks - About - Mentor
 {% endblock %}
 {% block content %}
-    The user who created a task will become a mentor for the task. Mentor is a person who mentors the task.
-    Mentor has all the rights over the task. A Mentor can request other users also to mentor the task.
-    Mentor can add/remove subtasks if applicable. Mentor can request assign of credits for task.
-    Mentor can mark the task as Invalid/Complete.<br />
+    Mentoring is a right specific to the task. The user who creates a task will become the mentor for the task. A Mentor can request 
+    other <sup><a href="/about/addmentors/" target="_blank">learn more</a></sup> users also to mentor the task.
+    Mentor is a person who mentors the task.  Mentor has all the rights over the task.<br />
+    
+    <ul>
+    <li>Mentor can view the task even if it is unpublished.</li>
+    <li>Mentor can edit the task when it is in unpublished state.</li>
+    <li>Mentor can add/remove subtasks/dependencies to a task.</li>
+    <li>Mentor decides whom to assign the task (choose from claimed users).</li>
+    <li>Mentor also has the rights to remove a working user from a task.</li>
+    <li>Mentor requests assigning of pynts to users/mentors for the task.</li>
+    <li>Mentor has the rights to close a task or mark the task as complete.</li>
+    <li>Publishing/Deleting an unpublished task is a special right available only to the creator of the task.</li>
+    </ul>
+    <a href="/about/tasklife/" target="_blank">click here</a> to know the complete life cycle of a task.
 {% endblock %}
diff --git a/templates/about/starthere.html b/templates/about/starthere.html
new file mode 100644
index 0000000..26130a3
--- /dev/null
+++ b/templates/about/starthere.html
@@ -0,0 +1,14 @@
+{% extends 'base.html' %}
+{% block title %}
+    PyTasks - Start here
+{% endblock %}
+{% block content %}
+    PyTasks is a website designed to encourage open source participation of people. Now that you are registered, you are a 
+    contributor in the website.
+    You can see your notifications and requests from the links available in side bar.
+    You can browse all the tasks through the tasks link in the side bar.<br />
+    Choose a task <sup><a href="/about/task/" target="_blank">learn more</a></sup> of your choice and claim it to start working on it.<br />
+    
+    <!-- To know more on your rights in the website <a href="/about/contributor" target="_blank">click here</a>.<br /> -->
+    <!-- To know more on tasks <a href="/about/task/" target="_blank">click here</a>.<br /> -->
+{% endblock %}
diff --git a/templates/about/task.html b/templates/about/task.html
new file mode 100644
index 0000000..76434ac
--- /dev/null
+++ b/templates/about/task.html
@@ -0,0 +1,22 @@
+{% extends 'base.html' %}
+{% block title %}
+    PyTasks - About - Task
+{% endblock %}
+{% block content %}
+    A task is an entity that people can work on and get pynts for their work. Every task has credits which are given to
+    users working on the task. A task is created by a privileged user and he becomes a 
+    mentor <sup><a href="/about/mentor/" target="_blank">learn more</a></sup> for the task. 
+    The task if open, can be claimed by other users if they would like to work on the task.<br /><br />
+    
+    The task can be claimed by submitting a proposal in the view claims page. The link to view claims page is available on the task page. 
+    By claiming the task, you are actually proposing that you would like to do the task and hence the mentor of the task will 
+    be given an option to choose you for the task. A user can only submit one claim per task. But if a user is assigned a task
+     and for some reason, is removed from the task later on, he can submit a second claim requesting to continue working on the task.<br /><br />
+    
+    A task can also have subtasks and dependencies.
+    The task can only be calimed when it is open for people to work on. If the link is unavailable it implies that the task is locked 
+    since it has subtasks or it has dependencies that are not complete or the task is closed or the task is complete.<br /><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/tasklife.html b/templates/about/tasklife.html
new file mode 100644
index 0000000..0eb9cd5
--- /dev/null
+++ b/templates/about/tasklife.html
@@ -0,0 +1,37 @@
+{% extends 'base.html' %}
+{% block title %}
+    PyTasks - About - Task life cycle
+{% endblock %}
+{% block content %}
+    The task is created by a user and will start life in unpublished state. The creator has all rights over the task. The task in this
+    stage will be visible only to the creator. He can anyways request other users to view and review the task. Then the requested user
+    can view the task untill he does not reply to the request. If the user accepts the request, he can view, edit and comment on the task.
+    The user can also add/remove subtasks or dependencies. If he rejects the request he is just like other users and cannot view the task.
+    When the creator decides the task is ready to be published, he publishes the task. Through out this phase,
+    the creator of the task can delete the task at any point in time.
+    <br /><br />
+    
+     If the task survives and is published, the task is available to be viewed by all the users. The task cannot be edited after this
+     point but subtasks/dependencies can be added/removed. If the task has subtasks, the task is locked forever. It implies that the task
+     cannot be claimed by anyone and exists only to show all of its subtasks in one place.<br /><br />
+     If a task has dependencies, the task is locked untill all of its dependencies are completed. If all its dependencies are completed,
+     the task is open for claims and can be claimed by users.
+     If a task has neither subtasks nor dependencies, it is open as well and users claim the task. Any of the mentors can select user(s) 
+     from the claimed users to work on the task . Dependencies can be added/removed only untill a user is selected to work on the task. This is due
+     to the fact that user had a chance to claim when the task had no dependencies or all its dependencies were satisfied.
+     Also selecting a user to work on the task implies the task has all its dependencies satisfied.<br /><br />
+     
+     During the working stage of task, a mentor can request assign of pynts to users working on task or the mentors. The assign pynts link 
+     will be available to mentor on the task page. If there are no users working, the mentor can request assign of credits to himself
+     or one of the other mentors, who ever has done work on the task. Even if there are no users working on task, if there is a 
+     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 />
+     
+     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/>
+     If a mentor feels that the task is invalid or decides to delete the task, he will not be allowed to do it. Instead he can close the task
+     by providing a closing message. The link to close task will be available to mentors on the task page itself.<br /><br/>
+     
+     Now all this can be done by any of the mentors and hence think twice before you request a user to mentor the task.
+{% endblock %}
diff --git a/templates/task/view.html b/templates/task/view.html
index 046d148..b0d96c9 100644
--- a/templates/task/view.html
+++ b/templates/task/view.html
@@ -127,7 +127,12 @@
         {% endif %}
         
         {% if task_claimable %}
-            <a href="/task/claim/tid={{task.id}}">View claims</a>
+            <a href="/task/claim/tid={{task.id}}">
+            {% if is_mentor %}
+                View claims
+            {% else %}
+                Claim the task
+            {% endif %}</a>
         {% endif %}
         
         {% if comments %}