summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/account/index.html6
-rw-r--r--templates/account/sub_nav.html10
-rw-r--r--templates/admin/index.html6
-rw-r--r--templates/admin/sub_nav.html6
-rw-r--r--templates/experiment/logs.html2
-rw-r--r--templates/modals.html2
-rw-r--r--templates/nav.html20
-rw-r--r--templates/pages/e404.html2
-rw-r--r--templates/pages/e500.html2
-rw-r--r--templates/password/edit.html2
-rw-r--r--templates/password/new.html2
-rw-r--r--templates/slot/index.html4
-rw-r--r--templates/slot/new.html6
-rw-r--r--templates/webcam/show_video.html4
14 files changed, 37 insertions, 37 deletions
diff --git a/templates/account/index.html b/templates/account/index.html
index d90ba9d..a8b7f34 100644
--- a/templates/account/index.html
+++ b/templates/account/index.html
@@ -6,7 +6,7 @@
<div class="span5">
<h2>Login</h2>
<br>
- <form action="{% url 'sbhs_server.account.views.login' %}" method="POST">
+ <form action="{% url 'account_login' %}" method="POST">
{% csrf_token %}
<label for="login_username">Username</label>
<input type="text" name="username" id="login_username" required>
@@ -15,12 +15,12 @@
<input type="password" name="password" id="login_password" required>
<br>
<input type="submit" class="btn btn-primary" value="Login">
- &nbsp;&nbsp;<a href="{% url 'sbhs_server.password.views.new' %}">Forgot Password?</a>
+ &nbsp;&nbsp;<a href="{% url 'password_index' %}">Forgot Password?</a>
</form>
</div>
<div class="span5 pull-right">
<h2>Create Account</h2>
- <form action="{% url 'sbhs_server.account.views.create' %}" method="POST">
+ <form action="{% url 'account_create' %}" method="POST">
{% csrf_token %}
<label for="name">Name</label>
<input type="text" name="name" id="name" required>
diff --git a/templates/account/sub_nav.html b/templates/account/sub_nav.html
index 432ff9d..41b3731 100644
--- a/templates/account/sub_nav.html
+++ b/templates/account/sub_nav.html
@@ -1,9 +1,9 @@
<div class="span12">
<ul class="nav nav-pills">
- <li id="home-nav"><a href="{% url 'sbhs_server.account.views.home' %}">Home</a></li>
- <li id="book-slot-nav"><a href="{% url 'sbhs_server.slot.views.new' %}">Book slot</a></li>
- <li id="view-slot-nav"><a href="{% url 'sbhs_server.slot.views.index' %}">View/Delete slot</a></li>
- <li id="download-log-nav"><a href="{% url 'sbhs_server.experiment.views.logs' %}">Download log files</a></li>
- <li id="video-nav"><a href="{% url 'sbhs_server.webcam.views.show_video' %}">Show video</a></li>
+ <li id="home-nav"><a href="{% url 'account_home' %}">Home</a></li>
+ <li id="book-slot-nav"><a href="{% url 'slot_new' %}">Book slot</a></li>
+ <li id="view-slot-nav"><a href="{% url 'slot_index' %}">View/Delete slot</a></li>
+ <li id="download-log-nav"><a href="{% url 'experiment_logs' %}">Download log files</a></li>
+ <li id="video-nav"><a href="{% url 'webcam_show_video' %}">Show video</a></li>
</ul>
</div>
diff --git a/templates/admin/index.html b/templates/admin/index.html
index e954960..95956f5 100644
--- a/templates/admin/index.html
+++ b/templates/admin/index.html
@@ -7,7 +7,7 @@
{% include "account/sub_nav.html" %}
<div class="span12">
{% include "admin/sub_nav.html" %}
- <h4>MID allotment mode is {{ allotment_mode }}. <small>Change to <a href="{% url 'sbhs_server.admin.views.toggle_allotment_mode' %}">{% if allotment_mode == 'Random' %}Workshop mode{% else %}Random mode{% endif %}</a></small></h4>
+ <h4>MID allotment mode is {{ allotment_mode }}. <small>Change to <a href="{% url 'admin_toggle_allotment_mode' %}">{% if allotment_mode == 'Random' %}Workshop mode{% else %}Random mode{% endif %}</a></small></h4>
<h1>Board status</h1>
<table class="table table-bordered">
<thead>
@@ -22,8 +22,8 @@
<tr>
<td>{{ b.mid }}</td>
<td><span class="label label-{% if b.online %}success{% else %}important{% endif %}">{% if b.online %}Online{% else %}Offline{% endif %}</span></td>
- <td><a href="{% url 'sbhs_server.webcam.views.show_video_to_admin' b.mid %}" target="_blank">View image</a></td>
- <td><a href="{% url 'sbhs_server.admin.views.profile' b.mid %}">View temperature profile</a></td>
+ <td><a href="{% url 'webcam_show_video_to_admin' b.mid %}" target="_blank">View image</a></td>
+ <td><a href="{% url 'admin_profile' b.mid %}">View temperature profile</a></td>
</tr>
{% endfor %}
</tbody>
diff --git a/templates/admin/sub_nav.html b/templates/admin/sub_nav.html
index abbcce0..29d8840 100644
--- a/templates/admin/sub_nav.html
+++ b/templates/admin/sub_nav.html
@@ -1,4 +1,4 @@
-<a href="{% url 'sbhs_server.admin.views.index' %}" class="btn">Show all boards</a>
-<a href="{% url 'sbhs_server.admin.views.booking_index' %}" class="btn">Show all bookings</a>
-<a href="{% url 'sbhs_server.admin.views.webcam_index' %}" class="btn">Show all images</a>
+<a href="{% url 'admin_index' %}" class="btn">Show all boards</a>
+<a href="{% url 'admin_bookings' %}" class="btn">Show all bookings</a>
+<a href="{% url 'admin_webcam' %}" class="btn">Show all images</a>
<br><br> \ No newline at end of file
diff --git a/templates/experiment/logs.html b/templates/experiment/logs.html
index 61816dd..51c0c35 100644
--- a/templates/experiment/logs.html
+++ b/templates/experiment/logs.html
@@ -24,7 +24,7 @@
<td>{{ e.booking.start_time|date:"M d, Y" }}</td>
<td>{{ e.booking.slot }}</td>
<td>{{ e.logname }}</td>
- <td><a href="{% url 'sbhs_server.experiment.views.download_log' e.id e.logname %}" target="_blank">Download</a></td>
+ <td><a href="{% url 'experiment_logs' e.id e.logname %}" target="_blank">Download</a></td>
</tr>
{% endfor %}
</tbody>
diff --git a/templates/modals.html b/templates/modals.html
index 9d0f280..c6f3212 100644
--- a/templates/modals.html
+++ b/templates/modals.html
@@ -9,7 +9,7 @@
</div>
<div class="modal-footer">
<a data-dismiss="modal" aria-hidden="true" class="btn">Close</a>
- <a href="{% url 'sbhs_server.password.views.new' %}" class="btn btn-primary">Send password change link</a>
+ <a href="{% url 'password_index' %}" class="btn btn-primary">Send password change link</a>
</div>
</div>
diff --git a/templates/nav.html b/templates/nav.html
index 34559bd..cb5290a 100644
--- a/templates/nav.html
+++ b/templates/nav.html
@@ -1,7 +1,7 @@
<div class="navbar navbar-inverse navbar-fixed-top">
<div class="navbar-inner">
<div class="container">
- <a href="{% url 'sbhs_server.pages.views.index' %}" class="brand">Single Board Heater System Lab</a>
+ <a href="{% url 'pages_index' %}" class="brand">Single Board Heater System Lab</a>
<ul class="nav pull-right">
{% if user.is_authenticated %}
@@ -10,11 +10,11 @@
<ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
<li><a href="#passwordModal" role="button" data-toggle="modal">Change Password</a></li>
<li><a href="#machineModal" role="button" data-toggle="modal">Request machine change</a></li>
- <li><a href="{% url 'sbhs_server.account.views.logout' %}">Logout</a></li>
+ <li><a href="{% url 'account_logout' %}">Logout</a></li>
</ul>
</li>
{% else %}
- <li><a href="{% url 'sbhs_server.account.views.index' %}">Login / Register</a></li>
+ <li><a href="{% url 'account_enter' %}">Login / Register</a></li>
{% endif %}
</ul>
</div>
@@ -22,14 +22,14 @@
<div class="navbar-inner">
<div class="container">
<ul class="nav pull-right">
- <li><a href="{% url 'sbhs_server.pages.views.info' %}">SBHS InfoCentre</a></li>
+ <li><a href="{% url 'pages_info' %}">SBHS InfoCentre</a></li>
<li><a href="http://sbhs.os-hardware.in/downloads" target="_blank">Downloads</a></li>
- <li><a href="{% url 'sbhs_server.pages.views.theory' %}">Theory</a></li>
- <li><a href="{% url 'sbhs_server.pages.views.procedure' %}">Procedure</a></li>
- <li><a href="{% url 'sbhs_server.pages.views.experiments' %}">Experiments</a></li>
- <li><a href="{% url 'sbhs_server.pages.views.quiz' %} ">Quiz</a></li>
- <li><a href="{% url 'sbhs_server.pages.views.feedback' %}">Feedback / Contact Us</a></li>
- <li><a href="{% url 'sbhs_server.pages.views.about' %}">About Us</a></li>
+ <li><a href="{% url 'pages_theory' %}">Theory</a></li>
+ <li><a href="{% url 'pages_procedure' %}">Procedure</a></li>
+ <li><a href="{% url 'pages_experiments' %}">Experiments</a></li>
+ <li><a href="{% url 'pages_quiz' %} ">Quiz</a></li>
+ <li><a href="{% url 'pages_feedback' %}">Feedback / Contact Us</a></li>
+ <li><a href="{% url 'pages_about' %}">About Us</a></li>
</ul>
</div>
</div>
diff --git a/templates/pages/e404.html b/templates/pages/e404.html
index 62ef99d..6577fb8 100644
--- a/templates/pages/e404.html
+++ b/templates/pages/e404.html
@@ -6,7 +6,7 @@
<div class="span12">
<h1>Page not found <small>Error 404</small></h1>
<br>
- <p>The page you are looking for doesn't exist. Please click <a href="{% url 'sbhs_server.account.views.index' %}">here</a> to go to the homepage.</p>
+ <p>The page you are looking for doesn't exist. Please click <a href="{% url 'account_enter' %}">here</a> to go to the homepage.</p>
</div>
</div>
</div>
diff --git a/templates/pages/e500.html b/templates/pages/e500.html
index 2a5acb7..353300f 100644
--- a/templates/pages/e500.html
+++ b/templates/pages/e500.html
@@ -6,7 +6,7 @@
<div class="span12">
<h1>Internal server error <small>Error 500</small></h1>
<br>
- <p>Something went wrong on the server. We are correcting the issue. Contact vlabs team if the problem persists. Please click <a href="{% url 'sbhs_server.account.views.index' %}">here</a> to go to the homepage.</p>
+ <p>Something went wrong on the server. We are correcting the issue. Contact vlabs team if the problem persists. Please click <a href="{% url 'account_enter' %}">here</a> to go to the homepage.</p>
</div>
</div>
</div>
diff --git a/templates/password/edit.html b/templates/password/edit.html
index 487b552..38f2254 100644
--- a/templates/password/edit.html
+++ b/templates/password/edit.html
@@ -6,7 +6,7 @@
<div class="span11">
<h2>Change Password</h2>
<br>
- <form action="{% url 'sbhs_server.password.views.update' token %}" method="POST">
+ <form action="{% url 'password_update' token %}" method="POST">
{% csrf_token %}
<label for="email">Email</label>
<input type="email" name="email" id="email" required>
diff --git a/templates/password/new.html b/templates/password/new.html
index e45e24f..068b762 100644
--- a/templates/password/new.html
+++ b/templates/password/new.html
@@ -6,7 +6,7 @@
<div class="span11">
<h2>Change Password</h2>
<br>
- <form action="{% url 'sbhs_server.password.views.email' %}" method="POST">
+ <form action="{% url 'password_link' %}" method="POST">
{% csrf_token %}
<label for="email">Email</label>
<input type="email" name="email" id="email" required>
diff --git a/templates/slot/index.html b/templates/slot/index.html
index 1a25a1f..a8cdaef 100644
--- a/templates/slot/index.html
+++ b/templates/slot/index.html
@@ -17,13 +17,13 @@
<th>Delete</th>
</tr>
</thead>
- <tbody>
+ <tbody>url
{% for b in bookings %}
<tr>
<td>{{ b.booking_date|date:"M d, Y" }}</td>
<td>{{ b.slot }}</td>
{% if now_time < b.start_time %}
- <td><a class="btn btn-danger" href="{% url 'sbhs_server.slot.views.delete' b.id %}" onclick="return confirm('Are you sure you want to delete booking for slot {{b.slot}} ?');">Delete</a></td>
+ <td><a class="btn btn-danger" href="{% url 'slot_delete' b.id %}" onclick="return confirm('Are you sure you want to delete booking for slot {{b.slot}} ?');">Delete</a></td>
{% else %}
<td><a class="btn btn-disabled" disabled="disabled">Delete</a></td>
{% endif %}
diff --git a/templates/slot/new.html b/templates/slot/new.html
index c0a8b21..65ff482 100644
--- a/templates/slot/new.html
+++ b/templates/slot/new.html
@@ -17,7 +17,7 @@
<h3>Book slot</h3>
{% if cur_slots|length > 0 %}
<h4>Current slot {{ cur_slots.0 }} is vacant</h4>
- <form action="{% url 'sbhs_server.slot.views.create' %}" method="POST">
+ <form action="{% url 'slot_create' %}" method="POST">
{% csrf_token %}
<input type="hidden" name="slot" value="{{ cur_slots.0.id }}">
<input type="hidden" name="date" value="CURRENT">
@@ -26,7 +26,7 @@
{% endif %}
<br><br>
<h4>Book future slots</h4>
- <form action="{% url 'sbhs_server.slot.views.create' %}" method="POST">
+ <form action="{% url 'slot_create' %}" method="POST">
{% csrf_token %}
<label for="date">Booking date</label> <br>
<div class="input-append date" id="dp1" data-date="{{ nowdate }}" data-date-format="yyyy-mm-dd">
@@ -61,7 +61,7 @@
var newDate = new Date(ev.date);
var string = newDate.getFullYear() + "-" + (newDate.getMonth() + 1) + "-" + newDate.getDate();
$.ajax({
- url: "{% url 'sbhs_server.slot.views.show' '' %}" + string,
+ url: "{% url 'slot_show' '' %}" + string,
success: function(msg) {
$("#slotTimingWrap").html(msg);
}
diff --git a/templates/webcam/show_video.html b/templates/webcam/show_video.html
index c88cc9a..e3b49ca 100644
--- a/templates/webcam/show_video.html
+++ b/templates/webcam/show_video.html
@@ -36,7 +36,7 @@
{% if user.is_admin %}
setInterval(function() {
var refresh = new Image();
- refresh.src = "{% url 'sbhs_server.webcam.views.reload' mid %}";
+ refresh.src = "{% url 'webcam_reload_image' mid %}";
document.getElementById("videoImage").src = "{% static image_link %}?" + new Date().getTime();
}, 2000);
{% else %}
@@ -47,7 +47,7 @@ window.image_reloader = function() {
if (!button.disabled) {
button.setAttribute("disabled", true);
var refresh = new Image();
- refresh.src = "{% url 'sbhs_server.webcam.views.reload' mid %}";
+ refresh.src = "{% url 'webcam_reload_image' mid %}";
document.getElementById("videoImage").src = "{% static image_link %}?" + new Date().getTime();
setTimeout(function(){
button.removeAttribute('disabled');