summaryrefslogtreecommitdiff
path: root/sbhs/templates/base.html
diff options
context:
space:
mode:
authorCruiseDevice2018-11-01 17:35:00 +0530
committerCruiseDevice2018-11-01 17:35:00 +0530
commit4050ec641b8cc4fef8d8a757c27bde0802b5c3e9 (patch)
tree68698c8b3da1a0b2a4a6540f667792192601e802 /sbhs/templates/base.html
parent0bb3e3efd22a5a0f48c88720f6142bc3f49bc349 (diff)
downloadsbhs_server-4050ec641b8cc4fef8d8a757c27bde0802b5c3e9.tar.gz
sbhs_server-4050ec641b8cc4fef8d8a757c27bde0802b5c3e9.tar.bz2
sbhs_server-4050ec641b8cc4fef8d8a757c27bde0802b5c3e9.zip
Update documentation in README and Add webcam features in SBHS
- Admin can view all SBHS live feeds. - User can view their allocated live feed. - Request machine change modal fix in base.html.
Diffstat (limited to 'sbhs/templates/base.html')
-rw-r--r--sbhs/templates/base.html27
1 files changed, 23 insertions, 4 deletions
diff --git a/sbhs/templates/base.html b/sbhs/templates/base.html
index 099488b..65f05b9 100644
--- a/sbhs/templates/base.html
+++ b/sbhs/templates/base.html
@@ -20,6 +20,7 @@
{% endblock %}
</head>
<body>
+
<div id = "header">
{% block nav %}
@@ -35,7 +36,7 @@
{% 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>
+ <li id="video-nav"><a href="{% url 'show_video' %}">Show video</a></li>
{% if user.profile.is_moderator %}
<li id="admin-nav"><a href="{% url 'moderator_dashboard' %}">Moderator Dashboard</a></li>
{% endif %}
@@ -58,7 +59,7 @@
<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 data-toggle="modal" data-target="#myModal">Request Machine Change</a></li>
<li><a href="{% url 'account_logout' %}">Logout</a></li>
</ul>
</div>
@@ -91,7 +92,6 @@
</div>
</div>
-
<div class="footer" id = "footer">
{% block footer %}
@@ -138,6 +138,25 @@
</div>
</div>
-
+{% if user.is_authenticated %}
+ <!-- Modal -->
+ <div class="modal fade" id="myModal" role="dialog">
+ <div class="modal-dialog">
+ <!-- Modal content-->
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal">&times;</button>
+ <h3>Machine change</h3>
+ </div>
+ <div class="modal-body">
+ <p>Please send an email to <strong>rupakrokade@iitb.ac.in</strong> stating the reasons why machine change is required.</p>
+ </div>
+ <div class="modal-footer">
+ <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+ </div>
+ </div>
+ </div>
+ </div>
+{% endif %}
</body>
</html>