arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-22 16:02:16 +00:00
Code Issues Projects Releases Wiki Activity

More refactoring of rigboard

Browse Source
This commit is contained in:
FreneticScribbler
2020-03-10 16:46:53 +00:00
parent 1526a2f22b
commit 3b8789e49e
7 changed files with 101 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
templates/base.html
View File

@@ -21,8 +21,6 @@
{% block css %}
{% endblock %}
<script src="{% static 'js/moment.js' %}"></script>
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha384-KJ3o2DKtIkvYIK3UENzmM7KCkRr/rE9/Qpg6aAZGJwFDMVNA/GpGFF93hXpG5KkN" crossorigin="anonymous"></script>
<script src="https://cdn.ravenjs.com/1.3.0/jquery,native/raven.min.js"></script>
<script>Raven.config('{% sentry_public_dsn %}').install()</script>
{% block preload_js %}
@@ -87,9 +85,13 @@
<div class="modal fade" id="modal" role="dialog" tabindex=-1></div>
<script src="{% static 'js/jquery.js' %}"></script>
<script src="{% static 'js/interaction.js' %}"></script>
<script src="{% static 'js/konami.js' %}"></script>
<script src="{% static 'js/moment.js' %}"></script>
<script src="{% static 'js/popper.js' %}"></script>
<script src="{% static 'js/bootstrap.min.js' %}"></script>
<script src="{% static 'js/fontawesome.min.js' %}"></script>
<script src="{% static 'js/all.js' %}"></script>
<script>
Date.prototype.getISOString = function () {
var yyyy = this.getFullYear().toString();

28
templates/base_rigs.html
View File

@@ -51,19 +51,6 @@
{% if perms.RIGS.view_venue %}
<li class="nav-item"><a class="nav-link" href="{% url 'venue_list' %}">Venues</a></li>
{% endif %}
<script>
$(document).ready(function(){
$('#search-options option').click(function(){
$('#searchForm').attr('action', $(this).data('action')).submit();
});
$('#id_search_input').keypress(function (e) {
if (e.which == 13) {
$('#searchForm').attr('action', $('#search-options option').first().data('action')).submit();
return false;
}
});
});
</script>
<form id="searchForm" class="form form-inline" role="form" method="GET">
<input id="id_search_input" type="search" name="q" class="form-control" placeholder="Search..." />
<div class="input-group-append">
@@ -81,3 +68,18 @@
</form>
<a href="{% url 'search_help' %}" class="nav-link modal-href"><span class="fas fa-question"></span></a></h4>
{% endblock %}
{% block js %}
<script>
$(document).ready(function(){
$('#search-options option').click(function(){
$('#searchForm').attr('action', $(this).data('action')).submit();
});
$('#id_search_input').keypress(function (e) {
if (e.which == 13) {
$('#searchForm').attr('action', $('#search-options option').first().data('action')).submit();
return false;
}
});
});
</script>
{% endblock %}