summaryrefslogtreecommitdiff
path: root/sbhs/templates/base.html
diff options
context:
space:
mode:
Diffstat (limited to 'sbhs/templates/base.html')
-rw-r--r--sbhs/templates/base.html128
1 files changed, 70 insertions, 58 deletions
diff --git a/sbhs/templates/base.html b/sbhs/templates/base.html
index a1e36f2..099488b 100644
--- a/sbhs/templates/base.html
+++ b/sbhs/templates/base.html
@@ -20,73 +20,82 @@
{% endblock %}
</head>
<body>
- {% block nav %}
- <nav class="navbar navbar-fixed-top navbar-inverse">
- <div class="container">
-
- <div class="navbar-header">
- <a class="navbar-brand navbar-left" href="{% url 'pages_index' %}" class="brand">Single Board Heater System Lab</a>
- </div>
+ <div id = "header">
+ {% block nav %}
- <div id="navbar" class="collapse navbar-collapse">
- <ul class="nav navbar-nav navbar-right">
- {% if user.is_authenticated %}
- <li id="book-slot-nav"><a href="{% url 'slot_new' %}">Book slot</a></li>
- <li id="download-log-nav"><a href="{% url 'experiment_logs' %}">Download log files</a></li>
- <li id="video-nav"><a href="">Show video</a></li>
- {% if user.profile.is_moderator %}
- <li id="admin-nav"><a href="{% url 'moderator_dashboard' %}">Moderator Dashboard</a></li>
- {% endif %}
- {% endif %}
- <li class="nav-item dropdown">
- <a class="dropdown-toggle nav-link" id="info_dropdown" data-toggle="dropdown" href="#">SBHS InfoCentre
- <span class="caret"></span></a>
- <div class="dropdown-menu">
- <ul class="nav">
- <li><a class="dropdown-item" href="{% url 'pages_info'%}#info">Info</a></li>
- <li><a class="dropdown-item" href="{% url 'pages_info'%}#theory">Theory</a><li>
- <li><a class="dropdown-item" href="{% url 'pages_info'%}#procedure">Procedure</a></li>
- </ul>
- </div>
- </li>
+ <nav class="navbar navbar-fixed-top navbar-inverse">
+ <div class="container">
+
+ <div class="navbar-header">
+ <a class="navbar-brand navbar-left" href="{% url 'pages_index' %}" class="brand">Single Board Heater System Lab</a>
+ </div>
+ <div id="navbar" class="collapse navbar-collapse">
+ <ul class="nav navbar-nav navbar-right">
{% if user.is_authenticated %}
+ <li id="book-slot-nav"><a href="{% url 'slot_new' %}">Book slot</a></li>
+ <li id="download-log-nav"><a href="{% url 'experiment_logs' %}">Download log files</a></li>
+ <li id="video-nav"><a href="">Show video</a></li>
+ {% if user.profile.is_moderator %}
+ <li id="admin-nav"><a href="{% url 'moderator_dashboard' %}">Moderator Dashboard</a></li>
+ {% endif %}
+ {% endif %}
<li class="nav-item dropdown">
- <a class="dropdown-toggle nav-link" id="user_dropdown" data-toggle="dropdown" href="#">{{ user.username|title }} <span class="caret"></span></a>
- <div class="dropdown-menu">
- <ul class="nav">
- <li><a class="dropdown-item" href="{% url 'password_change'%}">Change Password</a></li>
- <li><a>Request machine change</a></li>
- <li><a href="{% url 'account_logout' %}">Logout</a></li>
- </ul>
- </div>
+ <a class="dropdown-toggle nav-link" id="info_dropdown" data-toggle="dropdown" href="#">SBHS InfoCentre
+ <span class="caret"></span></a>
+ <div class="dropdown-menu">
+ <ul class="nav">
+ <li><a class="dropdown-item" href="{% url 'pages_info'%}#info">Info</a></li>
+ <li><a class="dropdown-item" href="{% url 'pages_info'%}#theory">Theory</a><li>
+ <li><a class="dropdown-item" href="{% url 'pages_info'%}#procedure">Procedure</a></li>
+ </ul>
+ </div>
</li>
- {% else %}
- <li><a href="{% url 'account_enter' %}">Log In</a></li>
- {% endif %}
- </div><!-- /.navbar -->
- </div><!-- /.container -->
- </nav><!-- /.navbar -->
-{% endblock %}
- {% if messages %}
- <div class = "container">
- {% for message in messages %}
- <div class = "alert alert-{{message.tags}}">
- {{message|safe}}
- <a href="#" data-dismiss="alert" class="close">x</a>
- </div>
- {% endfor %}
- </div>
- {% endif %}
- <div class="content">
- {% block content %}
+ {% if user.is_authenticated %}
+ <li class="nav-item dropdown">
+ <a class="dropdown-toggle nav-link" id="user_dropdown" data-toggle="dropdown" href="#">{{ user.username|title }} <span class="caret"></span></a>
+ <div class="dropdown-menu">
+ <ul class="nav">
+ <li><a class="dropdown-item" href="{% url 'password_change'%}">Change Password</a></li>
+ <li><a>Request machine change</a></li>
+ <li><a href="{% url 'account_logout' %}">Logout</a></li>
+ </ul>
+ </div>
+ </li>
+ {% else %}
+ <li><a href="{% url 'account_enter' %}">Log In</a></li>
+ {% endif %}
+ </div><!-- /.navbar -->
+ </div><!-- /.container -->
+ </nav><!-- /.navbar -->
{% endblock %}
</div>
+
+ <div id = "body">
+ <div class="content">
+
+ {% if messages %}
+ <div class = "container">
+ {% for message in messages %}
+ <div class = "alert alert-{{message.tags}}">
+ {{message|safe}}
+ <a href="#" data-dismiss="alert" class="close">x</a>
+ </div>
+ {% endfor %}
+ </div>
+ {% endif %}
+
+ {% block content %}
+ {% endblock %}
+
+ </div>
+ </div>
+
- <div class="footer">
- {% block footer %}
- <div class="footer-left">
+ <div class="footer" id = "footer">
+ {% block footer %}
+ <div class="footer-left text-center">
<p>Server time: <span id="timer">{% now "jS M Y h:i:s A" %}</span>
<span>Copyright &copy; {% now "Y" %}</span></p>
</div>
@@ -126,6 +135,9 @@
</script>
{% endblock %}
+ </div>
</div>
+
+
</body>
</html>