Pull back extends templatetag to the top of every template file.

40 files changed, 80 insertions, 75 deletions

diff --git a/pytask/templates/404.html b/pytask/templates/404.html
index d8abc8d..b23f27e 100644
--- a/pytask/templates/404.html
+++ b/pytask/templates/404.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,7 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% 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.
diff --git a/pytask/templates/500.html b/pytask/templates/500.html
index b33bbb7..05fd805 100644
--- a/pytask/templates/500.html
+++ b/pytask/templates/500.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,7 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends 'base.html' %}
 {% block content %}
     There was an error in rendering the page you requested for. The admin has been notified about it.<br />
     Please <a href="javascript:history.go(-1)">click here</a> to get back to the previous page.
diff --git a/pytask/templates/error.html b/pytask/templates/error.html
index 2d5d91b..6bf142f 100644
--- a/pytask/templates/error.html
+++ b/pytask/templates/error.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,7 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends "base.html" %}
 {% block content %}
   <div class="exception">
     {{ error_message }}
diff --git a/pytask/templates/index.html b/pytask/templates/index.html
index 4bab93c..7713185 100644
--- a/pytask/templates/index.html
+++ b/pytask/templates/index.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,7 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends 'base.html' %}
 {% block content %}
     {% if not user %}
     Checkout the tasks on the left panel for tasks that have been recently created.<br />
diff --git a/pytask/templates/profile/browse_notifications.html b/pytask/templates/profile/browse_notifications.html
index be93c8c..ea71e24 100644
--- a/pytask/templates/profile/browse_notifications.html
+++ b/pytask/templates/profile/browse_notifications.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,8 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends "base.html" %}
-
 {% block content %}
   {% if not notifications %}
     You have no notifications.
diff --git a/pytask/templates/profile/edit.html b/pytask/templates/profile/edit.html
index 5ea8fff..f0397f6 100644
--- a/pytask/templates/profile/edit.html
+++ b/pytask/templates/profile/edit.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -17,7 +19,6 @@ You should have received a copy of the GNU General Public License
 along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
-{% extends "base.html" %}
 
 {% load form_helpers %}
 
diff --git a/pytask/templates/profile/view.html b/pytask/templates/profile/view.html
index ac3a18a..ff0bb29 100644
--- a/pytask/templates/profile/view.html
+++ b/pytask/templates/profile/view.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,9 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends "base.html" %}
-
-
 {% block content %}
 
 {% if all %}
diff --git a/pytask/templates/profile/view_notification.html b/pytask/templates/profile/view_notification.html
index a31d934..89ba1e9 100644
--- a/pytask/templates/profile/view_notification.html
+++ b/pytask/templates/profile/view_notification.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,7 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends 'base.html' %}
 {% block content %}
 {% if newest %}
 <a href="{% url view_notification newest.id %}">&lt;&lt;newest</a>
diff --git a/pytask/templates/registration/activate.html b/pytask/templates/registration/activate.html
index 7e68a1f..d03aa64 100644
--- a/pytask/templates/registration/activate.html
+++ b/pytask/templates/registration/activate.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,8 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends "base.html" %}
-
 {% block content %}
    The key provided for activation is invalid. This is either because
    your account has already been activated or the activation key
diff --git a/pytask/templates/registration/activation_complete.html b/pytask/templates/registration/activation_complete.html
index 8b52e7a..3b10a3b 100644
--- a/pytask/templates/registration/activation_complete.html
+++ b/pytask/templates/registration/activation_complete.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,8 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends "base.html" %}
-
 {% block content %}
   Your account has been successfully activated.<br />
   Please proceed to login.
diff --git a/pytask/templates/registration/logged_out.html b/pytask/templates/registration/logged_out.html
index 85f62c0..25c6f6a 100644
--- a/pytask/templates/registration/logged_out.html
+++ b/pytask/templates/registration/logged_out.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,7 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends "base.html" %}
 {% load i18n %}
 
 {% block breadcrumbs %}<div class="breadcrumbs"><a href="../">{% trans 'Home' %}</a></div>{% endblock %}
diff --git a/pytask/templates/registration/login.html b/pytask/templates/registration/login.html
index 24d282f..4754f5b 100644
--- a/pytask/templates/registration/login.html
+++ b/pytask/templates/registration/login.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,8 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends "base.html" %}
-
 {% load form_helpers %}
 
 {% block content %}
diff --git a/pytask/templates/registration/logout.html b/pytask/templates/registration/logout.html
index 954d2db..38136cc 100644
--- a/pytask/templates/registration/logout.html
+++ b/pytask/templates/registration/logout.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,7 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends 'base.html' %}
 {% block content %}
 You have successfully logged out.
 <br><br>
diff --git a/pytask/templates/registration/password_change_done.html b/pytask/templates/registration/password_change_done.html
index 8114ecd..45bc14e 100644
--- a/pytask/templates/registration/password_change_done.html
+++ b/pytask/templates/registration/password_change_done.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,7 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends "base.html" %}
 {% load i18n %}
 
 {% block title %}{% trans 'Password change successful' %}{% endblock %}
diff --git a/pytask/templates/registration/password_change_form.html b/pytask/templates/registration/password_change_form.html
index fe200d5..5e9c892 100644
--- a/pytask/templates/registration/password_change_form.html
+++ b/pytask/templates/registration/password_change_form.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,8 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends "base.html" %}
-
 {% load i18n %}
 {% load form_helpers %}
 
diff --git a/pytask/templates/registration/password_reset_complete.html b/pytask/templates/registration/password_reset_complete.html
index be8efce..33a7034 100644
--- a/pytask/templates/registration/password_reset_complete.html
+++ b/pytask/templates/registration/password_reset_complete.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,7 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends "base.html" %}
 {% load i18n %}
 
 {% block breadcrumbs %}<div class="breadcrumbs"><a href="../../">{% trans 'Home' %}</a> &rsaquo; {% trans 'Password reset' %}</div>{% endblock %}
diff --git a/pytask/templates/registration/password_reset_confirm.html b/pytask/templates/registration/password_reset_confirm.html
index ebd7e96..41fa55e 100644
--- a/pytask/templates/registration/password_reset_confirm.html
+++ b/pytask/templates/registration/password_reset_confirm.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,9 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends "base.html" %}
-
-
 {% load i18n %}
 {% load form_helpers %}
 
diff --git a/pytask/templates/registration/password_reset_done.html b/pytask/templates/registration/password_reset_done.html
index 73320fc..39d7a7b 100644
--- a/pytask/templates/registration/password_reset_done.html
+++ b/pytask/templates/registration/password_reset_done.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,7 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends "base.html" %}
 {% load i18n %}
 
 {% block breadcrumbs %}<div class="breadcrumbs"><a href="../">{% trans 'Home' %}</a> &rsaquo; {% trans 'Password reset' %}</div>{% endblock %}
diff --git a/pytask/templates/registration/password_reset_form.html b/pytask/templates/registration/password_reset_form.html
index c59fa25..9d4d5d4 100644
--- a/pytask/templates/registration/password_reset_form.html
+++ b/pytask/templates/registration/password_reset_form.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,9 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends "base.html" %}
-
-
 {% load i18n %}
 {% load form_helpers %}
 
diff --git a/pytask/templates/registration/registration_complete.html b/pytask/templates/registration/registration_complete.html
index da73e0f..d53734e 100644
--- a/pytask/templates/registration/registration_complete.html
+++ b/pytask/templates/registration/registration_complete.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,7 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends 'base.html' %}
 {% block content %}
 Please check your email for instructions on activating your account.
 {% endblock %}
diff --git a/pytask/templates/registration/registration_form.html b/pytask/templates/registration/registration_form.html
index 9182250..83a74dd 100644
--- a/pytask/templates/registration/registration_form.html
+++ b/pytask/templates/registration/registration_form.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,8 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends "base.html" %}
-
 {% load form_helpers %}
 
 
diff --git a/pytask/templates/show_msg.html b/pytask/templates/show_msg.html
index 975bec4..288cfb7 100644
--- a/pytask/templates/show_msg.html
+++ b/pytask/templates/show_msg.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,7 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends 'base.html' %}
 {% block js_script %}
     <script language="JavaScript"> 
     <!--
diff --git a/pytask/templates/task/addreviewer.html b/pytask/templates/task/addreviewer.html
index a7a66dc..4910131 100644
--- a/pytask/templates/task/addreviewer.html
+++ b/pytask/templates/task/addreviewer.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,9 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends "base.html" %}
-
-
 {% load form_helpers %}
 
 
diff --git a/pytask/templates/task/approved_task.html b/pytask/templates/task/approved_task.html
index 1d6f1d3..8f16629 100644
--- a/pytask/templates/task/approved_task.html
+++ b/pytask/templates/task/approved_task.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,8 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends "base.html" %}
-
 {% block content %}
 The task <a href="{% url view_task task.id %}">{{task.title}}</a>
 has been approved.
diff --git a/pytask/templates/task/approved_textbook.html b/pytask/templates/task/approved_textbook.html
index 6f8c2f6..35acd15 100644
--- a/pytask/templates/task/approved_textbook.html
+++ b/pytask/templates/task/approved_textbook.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,8 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends "base.html" %}
-
 {% block content %}
 The textbook <a href="{% url view_textbook textbook.id %}">
 {{textbook.name}}</a> has been approved.
diff --git a/pytask/templates/task/browse.html b/pytask/templates/task/browse.html
index 478ba86..a717d76 100644
--- a/pytask/templates/task/browse.html
+++ b/pytask/templates/task/browse.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,9 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends "base.html" %}
-
-
 {% block content %}
   {% if open_tasks %}
     Tasks that are open for contribution
diff --git a/pytask/templates/task/browse_textbooks.html b/pytask/templates/task/browse_textbooks.html
index 94ded48..09e7869 100644
--- a/pytask/templates/task/browse_textbooks.html
+++ b/pytask/templates/task/browse_textbooks.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,9 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends "base.html" %}
-
-
 {% load browse_helpers %}
 
 
diff --git a/pytask/templates/task/chapter_edit.html b/pytask/templates/task/chapter_edit.html
index c903e6e..5e8546c 100644
--- a/pytask/templates/task/chapter_edit.html
+++ b/pytask/templates/task/chapter_edit.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,8 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends "base.html" %}
-
 {% load form_helpers %}
 
 {% block css %}
diff --git a/pytask/templates/task/claim.html b/pytask/templates/task/claim.html
index 69f93c8..afb5d46 100644
--- a/pytask/templates/task/claim.html
+++ b/pytask/templates/task/claim.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,8 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends "base.html" %}
-
 {% load form_helpers %}
 
 {% block content %}
diff --git a/pytask/templates/task/confirm_approval.html b/pytask/templates/task/confirm_approval.html
index 832e248..04d3182 100644
--- a/pytask/templates/task/confirm_approval.html
+++ b/pytask/templates/task/confirm_approval.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,8 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends "base.html" %}
-
 {% block content %}
   You are about to approve the task <a href="{% url view_task task.id %}">
   {{task.title}}</a>
diff --git a/pytask/templates/task/confirm_textbook_approval.html b/pytask/templates/task/confirm_textbook_approval.html
index 3612c13..96077e3 100644
--- a/pytask/templates/task/confirm_textbook_approval.html
+++ b/pytask/templates/task/confirm_textbook_approval.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,8 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends "base.html" %}
-
 {% block content %}
 You are about to approve the textbook 
 <a href="{% url view_textbook textbook.id %}">{{textbook.name}}</a>
diff --git a/pytask/templates/task/edit.html b/pytask/templates/task/edit.html
index 7689f04..be9b096 100644
--- a/pytask/templates/task/edit.html
+++ b/pytask/templates/task/edit.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,8 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends "base.html" %}
-
 {% load form_helpers %}
 
 {% block css %}
diff --git a/pytask/templates/task/select_user.html b/pytask/templates/task/select_user.html
index 2ab44fa..098d346 100644
--- a/pytask/templates/task/select_user.html
+++ b/pytask/templates/task/select_user.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,8 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends "base.html" %}
-
 {% load form_helpers %}
 
 {% block content %}
diff --git a/pytask/templates/task/submit_report.html b/pytask/templates/task/submit_report.html
index 7cbbc49..e43eb38 100644
--- a/pytask/templates/task/submit_report.html
+++ b/pytask/templates/task/submit_report.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,8 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends "base.html" %}
-
 {% load form_helpers %}
 
 {% block title %}
diff --git a/pytask/templates/task/view.html b/pytask/templates/task/view.html
index 4a352f7..b98cad1 100644
--- a/pytask/templates/task/view.html
+++ b/pytask/templates/task/view.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,9 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends "base.html" %}
-
-
 {% load form_helpers %}
 {% load browse_helpers %}
 
diff --git a/pytask/templates/task/view_report.html b/pytask/templates/task/view_report.html
index 2b34026..6ca52a3 100644
--- a/pytask/templates/task/view_report.html
+++ b/pytask/templates/task/view_report.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,8 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends "base.html" %}
-
 {% block content %}
 Report for {{report.task.title}} <br />
 
diff --git a/pytask/templates/task/view_tag.html b/pytask/templates/task/view_tag.html
index e8dca85..c6bcf8e 100644
--- a/pytask/templates/task/view_tag.html
+++ b/pytask/templates/task/view_tag.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,9 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends "base.html" %}
-
-
 {% load browse_helpers %}
 
 
diff --git a/pytask/templates/task/view_textbook.html b/pytask/templates/task/view_textbook.html
index e3dba5e..553e9be 100644
--- a/pytask/templates/task/view_textbook.html
+++ b/pytask/templates/task/view_textbook.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,9 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends "base.html" %}
-
-
 {% load form_helpers %}
 {% load browse_helpers %}
 
diff --git a/pytask/templates/task/view_work.html b/pytask/templates/task/view_work.html
index f784679..b8029b7 100644
--- a/pytask/templates/task/view_work.html
+++ b/pytask/templates/task/view_work.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,8 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends "base.html" %}
-
 {% block title %}
   {{task.title}}
 {% endblock %}
diff --git a/pytask/templates/under_construction.html b/pytask/templates/under_construction.html
index 393d6e6..dc9ce68 100644
--- a/pytask/templates/under_construction.html
+++ b/pytask/templates/under_construction.html
@@ -1,3 +1,5 @@
+{% extends "base.html" %}
+
 {% comment %}
 Copyright 2011 Authors of PyTask.
 
@@ -18,7 +20,6 @@ along with PyTask.  If not, see <http://www.gnu.org/licenses/>.
 {% endcomment%}
 
 
-{% extends 'base.html' %}
 {% block content %}
 <h1> Page Under Construction </h1>
 {% endblock %}