diff --git a/anatomy/static/css/anatomy.css b/anatomy/static/css/anatomy.css index a5bef0dd..6a206cfb 100644 --- a/anatomy/static/css/anatomy.css +++ b/anatomy/static/css/anatomy.css @@ -118,7 +118,7 @@ button a { color: inherit; } -#admin-link, #logout-link, #profile-link, #physics-link, #anatomy-link { +#admin-link, #logout-link, #profile-link, #physics-link, #anatomy-link, #rapids-link { float: right; padding-left: 10px; } diff --git a/anatomy/templates/anatomy/base.html b/anatomy/templates/anatomy/base.html index a5b9bd8c..e8181a28 100644 --- a/anatomy/templates/anatomy/base.html +++ b/anatomy/templates/anatomy/base.html @@ -1,66 +1,16 @@ -{% load static %} - +{% extends 'base.html' %} - - Anatomy - - - - - - - - - - - - - - - - - {% block js %} - {% endblock %} - +{% block title %} +Anatomy +{% endblock %} - -
- {% if request.user.is_authenticated %} - - Physics - - - Rapids - - - Logout - - - Profile - - {% endif %} - {% if request.user.is_staff %} - - Admin - - {% endif %} -
-
- Anatomy - - {% if request.user.is_authenticated %} - Exams / - Questions / - Create Question - {% endif %} - {% block navigation %} - {% endblock %} -
-
- {% block content %} - {% endblock %} -
-
-
- - - \ No newline at end of file +{% block navigation %} +Anatomy - +{% if request.user.is_authenticated %} +Exams / +Questions / +Create Question +{% endif %} +{% endblock %} +{% block content %} +{% endblock %} \ No newline at end of file diff --git a/anatomy/templates/anatomy/exams.html b/anatomy/templates/anatomy/exams.html index 8fb0af78..901b63f9 100644 --- a/anatomy/templates/anatomy/exams.html +++ b/anatomy/templates/anatomy/exams.html @@ -1,6 +1,7 @@ {% extends 'anatomy/base.html' %} {% block navigation %} +{{block.super}}
{{exam.name}}-> Overview / Mark / Scores {% endblock %} \ No newline at end of file diff --git a/physics/templates/physics/base.html b/physics/templates/physics/base.html index d8c31457..1bc5cf17 100644 --- a/physics/templates/physics/base.html +++ b/physics/templates/physics/base.html @@ -1,65 +1,14 @@ -{% load static %} - +{% extends 'base.html' %} - - Physics - - - - - - - - - - - - - - - - - - {% block js %} - {% endblock %} - +{% block title %} +Physics +{% endblock %} - -
- {% if request.user.is_authenticated %} - - Anatomy - - - Rapids - - - Logout - - - Profile - - {% endif %} - {% if request.user.is_staff %} - - Admin - - {% endif %} -
-
- Physics - - {% if request.user.is_authenticated %} - Exams / - {% endif %} - {% block navigation %} - {% endblock %} -
-
- {% block content %} - {% endblock %} -
-
-
- - - \ No newline at end of file +{% block navigation %} +Physics - +{% if request.user.is_authenticated %} +Exams / +{% endif %} +{% endblock %} +{% block content %} +{% endblock %} \ No newline at end of file diff --git a/rapids/templates/rapids/base.html b/rapids/templates/rapids/base.html index 7725b483..245a7405 100755 --- a/rapids/templates/rapids/base.html +++ b/rapids/templates/rapids/base.html @@ -1,77 +1,26 @@ -{% load static %} - +{% extends 'base.html' %} - - Rapids - {% block css %} - {% endblock %} - - - - - +{% block title %} +Rapids +{% endblock %} - {% comment %} - - - {% endcomment %} - - - - - - - - - - - - {% block js %} - {% endblock %} +{% block css %} +{% endblock %} - +{% block js %} +{% endblock %} - -
- {% if request.user.is_authenticated %} - - Physics - - - Anatomy - - - Logout - - - Profile - - {% endif %} - {% if request.user.is_staff %} - - Admin - - {% endif %} -
-
- {% if request.user.is_authenticated %} - Exams / - Questions / - Create Question - {% endif %} -{% comment %}
- Questions by: - author {% endcomment %} - {% block navigation %} - {% endblock %} -
-
- {% block content %} - {% endblock %} -
-
-
- - \ No newline at end of file +{% block content %} +{% endblock %} +{% block navigation %} +{% if request.user.is_authenticated %} +Exams / +Questions / +Create Question +{% endif %} +{% comment %}
+Questions by: +author {% endcomment %} +{% endblock %} \ No newline at end of file diff --git a/rapids/templates/rapids/exams.html b/rapids/templates/rapids/exams.html index 9f90e2c4..89cb72c6 100644 --- a/rapids/templates/rapids/exams.html +++ b/rapids/templates/rapids/exams.html @@ -1,6 +1,7 @@ {% extends 'rapids/base.html' %} {% block navigation %} +{{block.super}}
{{exam.name}}-> Overview / Mark / Scores {% endblock %} \ No newline at end of file diff --git a/templates/base.html b/templates/base.html index bfc79460..3c7aad72 100644 --- a/templates/base.html +++ b/templates/base.html @@ -2,20 +2,66 @@ - PENRA Courses + + {% block title %} + PENRA Courses + {% endblock %} + + {% block css %} + {% endblock %} + + + + + + + + + + + + + + + + + + + {% block js %} + {% endblock %}
- {% if request.user.is_staff %}Admin{% endif %} + {% if request.user.is_authenticated %} + + Rapids + + + Physics + + + Anatomy + + + Logout + + + Profile + + {% endif %} + {% if request.user.is_staff %} + + Admin + + {% endif %}
{% block navigation %}