arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-02-05 06:38:21 +00:00
Code Issues Projects Releases Wiki Activity

Remove animation on prefers-reduced-motion/low referesh rate devices

Browse Source 
Also normalises handling of asset list cable table & improves its use of space on large devices
This commit is contained in:
FreneticScribbler
2020-10-18 11:04:58 +01:00
parent 7736a2d3cc
commit 59756ab86a
11 changed files with 58 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
RIGS/static/css/screen.css
View File

File diff suppressed because one or more lines are too long

10
RIGS/static/scss/screen.scss
View File

@@ -2,6 +2,16 @@
@import "custom-variables"; @import "custom-variables";
@import "node_modules/bootstrap/scss/bootstrap"; @import "node_modules/bootstrap/scss/bootstrap";
@media screen and
(prefers-reduced-motion: reduce),
(update: slow) {
* {
animation-duration: 0.001ms !important;
animation-iteration-count: 1 !important;
transition-duration: 0.001ms !important;
}
}
#content { #content {
padding: 40px 15px; padding: 40px 15px;
} }

14
RIGS/templates/event_checklist_form.html
View File

@@ -29,17 +29,19 @@
{% include 'partials/datetime-fix.html' %} {% include 'partials/datetime-fix.html' %}
<script> <script>
const matches = window.matchMedia("(prefers-reduced-motion: reduce)").matches || window.matchMedia("(update: slow)").matches;
$(document).ready(function () { $(document).ready(function () {
dur = matches ? 0 : 500;
{% if not object.pk %} {% if not object.pk %}
$('.form-hide').slideUp(); $('.form-hide').slideUp(dur);
{% else %} {% else %}
$('#size-selector button[data-event-size={{object.event_size}}]').addClass('active'); $('#size-selector button[data-event-size={{object.event_size}}]').addClass('active');
for(i = 0; i < 3; i++) { for(i = 0; i < 3; i++) {
if(i == {{object.event_size}}) { if(i == {{object.event_size}}) {
$('#size-{{object.event_size}}').slideDown(); $('#size-{{object.event_size}}').slideDown(dur);
} }
else { else {
$('#size-' + i).slideUp(); $('#size-' + i).slideUp(dur);
} }
} }
{% endif %} {% endif %}
@@ -47,13 +49,13 @@
$('#{{form.event_size.auto_id}}').val($(this).data('event-size')) $('#{{form.event_size.auto_id}}').val($(this).data('event-size'))
$(this).toggleClass('active'); $(this).toggleClass('active');
$('#size-selector button').not(this).removeClass('active'); $('#size-selector button').not(this).removeClass('active');
$('#size-' + $(this).data('event-size')).slideDown(); $('#size-' + $(this).data('event-size')).slideDown(dur);
for(i = 0; i < 3; i++) { for(i = 0; i < 3; i++) {
if(i == $(this).data('event-size')) { if(i == $(this).data('event-size')) {
$('#size-' + $(this).data('event-size')).slideDown(); $('#size-' + $(this).data('event-size')).slideDown(dur);
} }
else { else {
$('#size-' + i).slideUp(); $('#size-' + i).slideUp(dur);
} }
} }
}); });

14
RIGS/templates/event_form.html
View File

@@ -45,10 +45,12 @@
} }
$('#'+id_end_time).val('02:00'); $('#'+id_end_time).val('02:00');
} }
const matches = window.matchMedia("(prefers-reduced-motion: reduce)").matches || window.matchMedia("(update: slow)").matches;
$(document).ready(function () { $(document).ready(function () {
dur = matches ? 0 : 500;
{% if not object.pk and not form.errors %} {% if not object.pk and not form.errors %}
$('.form-hws').slideUp(function () { $('.form-hws').slideUp(dur, function () {
$('.form-is_rig').slideUp(); $('.form-is_rig').slideUp(dur);
}); });
{% elif not object.pk and form.errors %} {% elif not object.pk and form.errors %}
if ($('#{{form.is_rig.auto_id}}').attr('checked') != 'checked') { if ($('#{{form.is_rig.auto_id}}').attr('checked') != 'checked') {
@@ -57,19 +59,19 @@
{% endif %} {% endif %}
{% if not object.pk %} {% if not object.pk %}
$('#is_rig-selector button').on('click', function () { $('#is_rig-selector button').on('click', function () {
$('.form-hws').removeAttr('style'); $('.form-non_rig').slideDown(dur);
$('.form-non_rig').slideDown();
if ($(this).data('is_rig') == 1) { if ($(this).data('is_rig') == 1) {
$('#{{form.is_rig.auto_id}}').prop('checked', true); $('#{{form.is_rig.auto_id}}').prop('checked', true);
if ($('.form-non_rig').is(':hidden')) { if ($('.form-non_rig').is(':hidden')) {
$('.form-is_rig').show(); $('.form-is_rig').show();
} else { } else {
$('.form-is_rig').slideDown(); $('.form-is_rig').slideDown(dur);
} }
$('.form-hws, .form-hws .form-is_rig').css('overflow', 'visible'); $('.form-hws, .form-hws .form-is_rig').css('overflow', 'visible');
} else { } else {
$('#{{form.is_rig.auto_id}}').prop('checked', false); $('#{{form.is_rig.auto_id}}').prop('checked', false);
$('.form-is_rig').slideUp(); $('.form-is_rig').slideUp(dur);
} }
}); });
{% endif %} {% endif %}

31
assets/templates/asset_form.html
View File

@@ -2,8 +2,6 @@
{% load widget_tweaks %} {% load widget_tweaks %}
{% load static %} {% load static %}
{% block title %}Asset {{ object.asset_id }}{% endblock %}
{% block css %} {% block css %}
<link rel="stylesheet" href="{% static 'css/bootstrap-select.css' %}"/> <link rel="stylesheet" href="{% static 'css/bootstrap-select.css' %}"/>
<link rel="stylesheet" href="{% static 'css/ajax-bootstrap-select.css' %}"/> <link rel="stylesheet" href="{% static 'css/ajax-bootstrap-select.css' %}"/>
@@ -14,11 +12,13 @@
<script src="{% static 'js/ajax-bootstrap-select.js' %}"></script> <script src="{% static 'js/ajax-bootstrap-select.js' %}"></script>
<script src="{% static 'js/autocompleter.js' %}"></script> <script src="{% static 'js/autocompleter.js' %}"></script>
<script> <script>
const matches = window.matchMedia("(prefers-reduced-motion: reduce)").matches || window.matchMedia("(update: slow)").matches;
dur = matches ? 0 : 500;
function checkIfCableHidden() { function checkIfCableHidden() {
if (document.getElementById("id_is_cable").checked) { if ($("#id_is_cable").prop('checked')) {
document.getElementById("cable-table").hidden = false; $("#cable-table").slideDown(dur);
} else { } else {
document.getElementById("cable-table").hidden = true; $("#cable-table").slideUp(dur);
} }
} }
checkIfCableHidden(); checkIfCableHidden();
@@ -71,15 +71,6 @@
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<h1>
{% if edit and object %}
Edit Asset: {{ object.asset_id }}
{% elif duplicate %}
Duplication of Asset: {{ previous_asset_id }}
{% else %}
Create Asset
{% endif %}
</h1>
{% if duplicate %} {% if duplicate %}
<form method="POST" id="asset_update_form" action="{% url 'asset_duplicate' pk=previous_asset_id %}"> <form method="POST" id="asset_update_form" action="{% url 'asset_duplicate' pk=previous_asset_id %}">
{% elif edit %} {% elif edit %}
@@ -90,24 +81,24 @@
{% include 'form_errors.html' %} {% include 'form_errors.html' %}
{% csrf_token %} {% csrf_token %}
<input type="hidden" name="id" value="{{ object.id|default:0 }}" hidden=true> <input type="hidden" name="id" value="{{ object.id|default:0 }}" hidden=true>
<div class="row pt-4"> <div class="row pt-2">
<div class="col-sm-12"> <div class="col-sm-12">
{% include 'partials/asset_detail_form.html' %} {% include 'partials/asset_detail_form.html' %}
</div> </div>
</div> </div>
<div class="row pt-4"> <div class="row pt-2">
<div class="col-md-6"> <div class="col-12 col-sm">
{% include 'partials/purchasedetails_form.html' %} {% include 'partials/purchasedetails_form.html' %}
</div> </div>
<div class="col-md-6" hidden="true" id="cable-table"> <div class="col-12 col-sm-6 col-md-4" id="cable-table">
{% include 'partials/cable_form.html' %} {% include 'partials/cable_form.html' %}
</div> </div>
<div class="col-md-4"> <div class="col-12 col-md-4">
{% include 'partials/parent_form.html' %} {% include 'partials/parent_form.html' %}
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-12">
{% include 'partials/asset_buttons.html' %} {% include 'partials/asset_buttons.html' %}
</div> </div>
</div> </div>

2
assets/templates/partials/cable_form.html
View File

@@ -1,5 +1,5 @@
{% load widget_tweaks %} {% load widget_tweaks %}
<div class="card"> <div class="card mb-2">
<div class="card-header"> <div class="card-header">
Cable Details Cable Details
</div> </div>

2
assets/templates/partials/parent_form.html
View File

@@ -1,5 +1,5 @@
{% load widget_tweaks %} {% load widget_tweaks %}
<div class="card"> <div class="card mb-2">
<div class="card-header"> <div class="card-header">
Collection Details Collection Details
</div> </div>

2
assets/templates/partials/purchasedetails_form.html
View File

@@ -1,5 +1,5 @@
{% load widget_tweaks %} {% load widget_tweaks %}
<div class="card"> <div class="card mb-2">
<div class="card-header"> <div class="card-header">
Purchase Details Purchase Details
</div> </div>

5
assets/views.py
View File

@@ -117,7 +117,7 @@ class AssetEdit(LoginRequiredMixin, AssetIDUrlMixin, generic.UpdateView):
context = super().get_context_data(**kwargs) context = super().get_context_data(**kwargs)
context["edit"] = True context["edit"] = True
context["connectors"] = models.Connector.objects.all() context["connectors"] = models.Connector.objects.all()
context["page_title"] = "Edit Asset: {}".format(self.object.display_id)
return context return context
def get_success_url(self): def get_success_url(self):
@@ -140,7 +140,7 @@ class AssetCreate(LoginRequiredMixin, generic.CreateView):
context = super(AssetCreate, self).get_context_data(**kwargs) context = super(AssetCreate, self).get_context_data(**kwargs)
context["create"] = True context["create"] = True
context["connectors"] = models.Connector.objects.all() context["connectors"] = models.Connector.objects.all()
context["page_title"] = "Create Asset"
return context return context
def get_initial(self, *args, **kwargs): def get_initial(self, *args, **kwargs):
@@ -165,6 +165,7 @@ class AssetDuplicate(DuplicateMixin, AssetIDUrlMixin, AssetCreate):
context["create"] = None context["create"] = None
context["duplicate"] = True context["duplicate"] = True
context['previous_asset_id'] = self.get_object().asset_id context['previous_asset_id'] = self.get_object().asset_id
context["page_title"] = "Duplication of Asset: {}".format(context['previous_asset_id'])
return context return context

1
templates/partials/datetime-fix.html
View File

@@ -4,6 +4,7 @@ function initDatetime() {
$('input[type=datetime-local]').not(':disabled').flatpickr({ $('input[type=datetime-local]').not(':disabled').flatpickr({
dateFormat: 'Y-m-dTH:m', dateFormat: 'Y-m-dTH:m',
enableTime: true, enableTime: true,
allowInput: true,
altInput: true, altInput: true,
altFormat: "d/m/y H:m", altFormat: "d/m/y H:m",
}); });

7
versioning/templates/activity_feed.html
View File

@@ -1,12 +1,15 @@
{% block js %} {% block js %}
{% include 'partials/version_scripts.html' %} {% include 'partials/version_scripts.html' %}
<script> <script>
const matches = window.matchMedia("(prefers-reduced-motion: reduce)").matches || window.matchMedia("(update: slow)").matches;
//TODO Maybe this should be a reduce rather than remove
dur = matches ? 0 : 'slow';
$(document).ready(function() { $(document).ready(function() {
$(function () { $(function () {
$( "#activity" ).hide(); $( "#activity" ).hide();
$( "#activity" ).load( "{% url 'activity_feed' %}", function() { $( "#activity" ).load( "{% url 'activity_feed' %}", function() {
$('#activity_loading').slideUp('slow',function(){ $('#activity_loading').slideUp(dur,function(){
$('#activity').slideDown('slow'); $('#activity').slideDown(dur);
}); });
var whiteList = $.fn.tooltip.Constructor.Default.whiteList var whiteList = $.fn.tooltip.Constructor.Default.whiteList
whiteList.ins = [] whiteList.ins = []