Verified Commit 5a79e193 authored by Elger Jonker's avatar Elger Jonker

mobile improvements, cleanup of js, start of markedcluster

parent 78166cc4
Pipeline #27449023 failed with stage
in 16 minutes and 49 seconds
......@@ -122,7 +122,8 @@ class OrganisationSubmissionForm(forms.Form):
organization_type_name = forms.ModelChoiceField(
queryset=OrganizationType.objects.all(),
widget=autocomplete.ModelSelect2(url='/game/autocomplete/organization-type-autocomplete/'),
label="Type"
label="Type",
help_text="All types are rendered as separate layers on the map."
)
organization_name = forms.CharField(
......@@ -236,7 +237,8 @@ class UrlSubmissionForm(forms.Form):
).order_by(Lower('name')),
widget=autocomplete.ModelSelect2Multiple(
url='/game/autocomplete/organization-autocomplete/',
forward=['organization_type_name', 'country']),
forward=['organization_type_name', 'country']
),
help_text="Hints:"
"<ul>"
"<li>If you can't find the organization, try the abbreviated name.</li>"
......
......@@ -4,6 +4,7 @@ Overrides some values given in CSS from frameworks and third party stuff.
body {
height: 100%;
width: 100%;
}
#history {
......
.marker-cluster-small {
background-color: rgba(181, 226, 140, 0.6);
}
.marker-cluster-small div {
background-color: rgba(110, 204, 57, 0.6);
}
.marker-cluster-medium {
background-color: rgba(241, 211, 87, 0.6);
}
.marker-cluster-medium div {
background-color: rgba(240, 194, 12, 0.6);
}
.marker-cluster-large {
background-color: rgba(253, 156, 115, 0.6);
}
.marker-cluster-large div {
background-color: rgba(241, 128, 23, 0.6);
}
/* IE 6-8 fallback colors */
.leaflet-oldie .marker-cluster-small {
background-color: rgb(181, 226, 140);
}
.leaflet-oldie .marker-cluster-small div {
background-color: rgb(110, 204, 57);
}
.leaflet-oldie .marker-cluster-medium {
background-color: rgb(241, 211, 87);
}
.leaflet-oldie .marker-cluster-medium div {
background-color: rgb(240, 194, 12);
}
.leaflet-oldie .marker-cluster-large {
background-color: rgb(253, 156, 115);
}
.leaflet-oldie .marker-cluster-large div {
background-color: rgb(241, 128, 23);
}
.marker-cluster {
background-clip: padding-box;
border-radius: 20px;
}
.marker-cluster div {
width: 30px;
height: 30px;
margin-left: 5px;
margin-top: 5px;
text-align: center;
border-radius: 15px;
font: 12px "Helvetica Neue", Arial, Helvetica, sans-serif;
}
.marker-cluster span {
line-height: 30px;
}
\ No newline at end of file
.leaflet-cluster-anim .leaflet-marker-icon, .leaflet-cluster-anim .leaflet-marker-shadow {
-webkit-transition: -webkit-transform 0.3s ease-out, opacity 0.3s ease-in;
-moz-transition: -moz-transform 0.3s ease-out, opacity 0.3s ease-in;
-o-transition: -o-transform 0.3s ease-out, opacity 0.3s ease-in;
transition: transform 0.3s ease-out, opacity 0.3s ease-in;
}
.leaflet-cluster-spider-leg {
/* stroke-dashoffset (duration and function) should match with leaflet-marker-icon transform in order to track it exactly */
-webkit-transition: -webkit-stroke-dashoffset 0.3s ease-out, -webkit-stroke-opacity 0.3s ease-in;
-moz-transition: -moz-stroke-dashoffset 0.3s ease-out, -moz-stroke-opacity 0.3s ease-in;
-o-transition: -o-stroke-dashoffset 0.3s ease-out, -o-stroke-opacity 0.3s ease-in;
transition: stroke-dashoffset 0.3s ease-out, stroke-opacity 0.3s ease-in;
}
This diff is collapsed.
......@@ -91,7 +91,7 @@ var dynamic_translations = function(){
};
$(document).ready(function () {
failmap.initializemap("nl");
failmap.initialize("nl");
views(); // start all vues
lazyload(); // allow for lazy loading of images
......
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
......@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=0.5, maximum-scale=0.5, user-scalable=no, minimal-ui">
<meta name="viewport" content="width=device-width, initial-scale=0.5, maximum-scale=1.5, user-scalable=yes, minimal-ui">
<meta name="theme-color" content="Tomato"/>
<!-- export variables to javascript from server configuration -->
<meta name="mailto" content="{{ config.PROJECT_MAIL }}">
......@@ -39,6 +39,8 @@
<link rel="stylesheet" type="text/css" href="{% static 'css/vendor/bootstrap-theme_v3.3.6.min.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'css/vendor/leaflet.fullscreen.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'css/vendor/fa-svg-with-js.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'css/vendor/MarkerCluster.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'css/vendor/MarkerCluster.Default.css' %}">
<link rel="stylesheet" type="text/css" href="{% static 'css/overrides.css' %}">
{% endcompress %}
......@@ -49,6 +51,7 @@
<script type="text/javascript" src="{% static 'js/vendor/bootstrap.js' %}"></script>
<script type="text/javascript" src="{% static 'js/vendor/leaflet-src.js' %}"></script>
<script type="text/javascript" src="{% static 'js/vendor/Leaflet.fullscreen.js' %}"></script>
<script type="text/javascript" src="{% static 'js/vendor/leaflet.markercluster-src.js' %}"></script>
<script type="text/javascript" src="{% static 'js/vendor/lazyload-custom.js' %}"></script>
<script type="text/javascript" src="{% static 'js/vendor/raven.min.vue.3.19.1.js' %}"></script>
<script type="text/javascript" src="{% static 'js/vendor/fontawesome.js' %}"></script>
......@@ -64,6 +67,7 @@
<script type="text/javascript" src="{% static 'js/vendor/bootstrap.min.js' %}"></script>
<script type="text/javascript" src="{% static 'js/vendor/leaflet.js' %}"></script>
<script type="text/javascript" src="{% static 'js/vendor/Leaflet.fullscreen.min.js' %}"></script>
<script type="text/javascript" src="{% static 'js/vendor/leaflet.markercluster.js' %}"></script>
<script type="text/javascript" src="{% static 'js/vendor/lazyload-custom.min.js' %}"></script>
<script type="text/javascript" src="{% static 'js/vendor/raven.min.vue.3.19.1.js' %}"></script>
<script type="text/javascript" src="{% static 'js/vendor/fontawesome.min.js' %}"></script>
......@@ -886,7 +890,7 @@
<div class="row">
<div class="col-md-12">
<h4>{% trans "Overall" %}</h4>
<svg id="graph_total" width="1110" height="300"></svg>
<svg id="graph_total" width="555" height="300"></svg>
</div>
</div>
......
......@@ -53,7 +53,7 @@ SECRET_KEY = os.environ.get('SECRET_KEY', 'ditisgeengeheimvriendachtjedatditeenw
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = os.environ.get('DEBUG', False)
ALLOWED_HOSTS = os.environ.get('ALLOWED_HOSTS', 'localhost,127.0.0.1,::1').split(',')
ALLOWED_HOSTS = os.environ.get('ALLOWED_HOSTS', 'localhost,127.0.0.1,::1,100.66.10.138,100.66.10.142').split(',')
# allow better debugging for these clients
# https://docs.djangoproject.com/en/1.11/ref/settings/#internal-ips
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment