Merge TENET and REANNZ work + upgrade deps

djnro/static/css/style.css

@@ -139,3 +139,7 @@ footer.auth {
 input[readonly].input {
 	color: rgba(51, 51, 51, 0.5);
 }
+
+dd.preproduction {
+	color: rgb(230, 93, 0);
+}

djnro/static/js/geolocate.js

@@ -20,9 +20,11 @@
 
 	function initialize() {
 		image = new google.maps.MarkerImage(pinImg,
-			new google.maps.Size(29, 40),
+			new google.maps.Size(50, 80),
 			new google.maps.Point(0, 0),
-			new google.maps.Point(14, 40)
+			// The anchor for this image is the base of the flagpole at 18,42.
+			new google.maps.Point(12, 40),
+			new google.maps.Size(25, 40)
 		);
 		var styleArray = [{
 			featureType : "all",

djnro/static/js/home-page-map.js

@@ -5,21 +5,29 @@
 	var map;
 	var bounds;
 	var image;
+	var imagePreProd;
 	var infoWindow;
 	var cityImg;
 	var countryImg;
 	var styles;
 	var markersUrl;
 	var pinImg;
+	var pinImgPreProd;
 
 	function initialize() {
 		image = new google.maps.MarkerImage(pinImg,
-		// This marker is 29 pixels wide by 40 pixels tall.
-		new google.maps.Size(29, 40),
-		// The origin for this image is 0,0.
-		new google.maps.Point(0, 0),
-		// The anchor for this image is the base of the flagpole at 18,42.
-		new google.maps.Point(14, 40));
+			new google.maps.Size(50, 80),
+			new google.maps.Point(0, 0),
+			// The anchor for this image is the base of the flagpole at 18,42.
+			new google.maps.Point(12, 40),
+			new google.maps.Size(25, 40)
+		);
+		imagePreProd = new google.maps.MarkerImage(pinImgPreProd,
+			new google.maps.Size(50, 80),
+			new google.maps.Point(0, 0),
+			new google.maps.Point(12, 40),
+			new google.maps.Size(25, 40)
+		);
 
 		var styleArray = [ {
 			featureType : "all",
@@ -126,12 +134,10 @@
 									marker,
 									'click',
 									function() {
-										infoWindow.setContent ( "<div><h4>"
+										infoWindow.setContent ( "<div" + (jsonMarker.stage == 1 ? '' : ' class="preproduction"') + "><h4>"
 												+ jsonMarker.inst
 												+ "</h4>"
-												+
-
-												"<div class='tabbable'>"
+												+ "<div class='tabbable'>"
 												+ "<ul class='nav nav-tabs'>"
 												+ "<li class='active'><a href='#tab1' data-toggle='tab'>Info</a></li>"
 												+ "<li><a href='#tab2' data-toggle='tab'>More...</a></li>"
@@ -141,6 +147,7 @@
 												+ "<dl class='dl-horizontal'>"
 												+ "<dt>Name</dt><dd>"
 												+ jsonMarker.name
+												+ (jsonMarker.nro_has_tested == 'None' ? '' : ' <span class="nro_has_tested nro_has_tested_yes" title="NRO tested on ' + jsonMarker.nro_has_tested + '">&check;</span>')
 												+ "&nbsp;</dd>"
 												+ "<dt>Address</dt><dd>"
 												+ jsonMarker.address
@@ -153,7 +160,9 @@
 												+ "&nbsp;</dd>"
 												+ "<dt>Number of APs</dt><dd>"
 												+ jsonMarker.AP_no
-												+ "&nbsp;</dd></dl>"
+												+ "&nbsp;</dd>"
+												+ (jsonMarker.stage == 1 ? '' : '<dt class="preproduction">Stage</dt><dd class="preproduction">Testing/Preproduction</dd>')
+												+ "</dl>"
 												+ "</div>"
 												+ "<div class='tab-pane' id='tab2'>"
 												+ "<dl class='dl-horizontal'>"
@@ -169,6 +178,9 @@
 												+ "<dt>NAT</dt><dd>"
 												+ jsonMarker.NAT
 												+ "&nbsp;</dd>"
+												+ '<dt>Location tested</td><dd class="nro_has_tested '
+												+ (jsonMarker.nro_has_tested == 'None' ? 'nro_has_tested_no">&#x274C;' : 'nro_has_tested_yes">' + jsonMarker.nro_has_tested)
+												+ "&nbsp;</dd>"
 												+ "<dt>Wired Number</dt><dd>"
 												+ jsonMarker.wired_no
 												+ "&nbsp;</dd></dl>"
@@ -203,7 +215,7 @@
 			'map' : map,
 			'title' : title,
 			'address' : address,
-			'icon' : pinImg,
+			'icon' : markerObj.stage == 1 ? image : imagePreProd,
 		});
 		return marker
 	}
@@ -350,6 +362,7 @@
 		image = '';
 		infoWindow;
 		pinImg = mapDiv.data("pin");
+		pinImgPreProd = mapDiv.data("pin-preprod");
 		pinGrpImg = mapDiv.data("group-pin");
 		addr = {};
 		styles = [{

djnro/static/js/management-map.js

@@ -13,13 +13,12 @@ var servicesEditUrl;
 
 function initialize() {
 	image = new google.maps.MarkerImage(pinImg,
-	// This marker is 29 pixels wide by 40 pixels tall.
-	new google.maps.Size(29, 40),
-	// The origin for this image is 0,0.
-	new google.maps.Point(0,0),
-	// The anchor for this image is the base of the flagpole at 18,42.
-	new google.maps.Point(14, 40)
-);
+		new google.maps.Size(50, 80),
+		new google.maps.Point(0, 0),
+		// The anchor for this image is the base of the flagpole at 18,42.
+		new google.maps.Point(12, 40),
+		new google.maps.Size(25, 40)
+	);
 var styleArray = [
 {
 	featureType: "all",

djnro/static/js/world-map.js

@@ -15,12 +15,12 @@
 
 	function initialize() {
 		image = new google.maps.MarkerImage(pinImg,
-		// This marker is 29 pixels wide by 40 pixels tall.
-		new google.maps.Size(29, 40),
-		// The origin for this image is 0,0.
-		new google.maps.Point(0, 0),
-		// The anchor for this image is the base of the flagpole at 18,42.
-		new google.maps.Point(14, 40));
+			new google.maps.Size(50, 80),
+			new google.maps.Point(0, 0),
+			// The anchor for this image is the base of the flagpole at 18,42.
+			new google.maps.Point(12, 40),
+			new google.maps.Size(25, 40)
+		);
 
 		var styleArray = [ {
 			featureType : "all",

djnro/templates/edumanage/monlocauthpar_edit.html

@@ -6,6 +6,12 @@
 {% block management_content %}
 <h4>{% if edit %}{{realm.realm}} {% trans 'parameters' %} ({% trans "edit" %}){% else %}{% trans "Add Monitored Realm Parameters" %} ({{realm.realm}}){% endif %}</h4>
 <hr>
+<div class="alert alert-info alert-dismissible" role="alert">
+Changes you make here will be automatically deployed to our <a class="alert-link" href="/status/technical/">monitoring system</a> within an hour, and will immediately update your <a class="alert-link" href="/faq/testing/#sp">test credentials</a>.
+</div>
+<div class="alert alert-warning alert-dismissible" role="alert">
+Note: The account you provide here only needs to be able to authenticate for eduroam and <strong>should not</strong> have privileged access to any other enterprise system.
+</div>
 <form method="POST" class="">
 	{% csrf_token %}
 	{% if form.non_field_errors %}
@@ -44,7 +50,7 @@ <h4>{% if edit %}{{realm.realm}} {% trans 'parameters' %} ({% trans "edit" %}){%
 			{% endif %} <span class="help-block"> {{ form.username.help_text }}</span>
 		</div>
 	</div>
-	<div class="control-group {% if form.passwp.errors %} error {% endif %}">
+	<div class="form-group control-group {% if form.passwp.errors %} error {% endif %}">
 		<label class="control-label" for="id_passwp"><b>{% trans "Password" %}</b></label>
 		<div class="controls">
 			<input type="password" maxlength="80" name="passwp" id="id_passwp" {% if edit %}value='{{form.instance.passwp}}'{% endif %} {% if form.data.passwp %}value='{{form.data.passwp}}'{% endif %}>
@@ -64,9 +70,14 @@ <h4>{% if edit %}{{realm.realm}} {% trans 'parameters' %} ({% trans "edit" %}){%
 
 {% block extrajs %}
 <script type="text/javascript" src="{% static 'js/showpass.js' %}"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/zxcvbn/4.4.2/zxcvbn.js" integrity="sha512-TZlMGFY9xKj38t/5m2FzJ+RM/aD5alMHDe26p0mYUMoCF5G7ibfHUQILq0qQPV3wlsnCwL+TPRNK4vIWGLOkUQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/pwstrength-bootstrap/3.1.1/pwstrength-bootstrap.min.js" integrity="sha512-VMd5IUFVM9MRhGzKSpKVZu/Rm4Wm3i8dC6eYqEtOcTaG1vn5RmwUWFiYfh4nagbeQRhQuSnHULnZ9B+st2rZ0g==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
 <script type="text/javascript">
 $(document).ready(function() {
+	$('#id_passwp').pwstrength({ common: { minChar: 12, maxChar: 64, usernameField: '#id_username', zxcvbn: true }, ui: {showProgressBar: false, showStatus: true, bootstrap3:true} });
 	$('#id_passwp').showPassword();
+	$('#id_passwp').attr('required',1);
+	$('.password-verdict').addClass('help-block');
 });
 </script>
 {% endblock %}

djnro/templates/edumanage/realms_edit.html

@@ -7,6 +7,9 @@
 {% block management_content %}
 <h4>{% if edit %}{{form.instance.realm}} ({% trans "edit" %}){% else %}{% trans "Add Realm" %}{% endif %}</h4>
 <hr>
+<div class="alert alert-info alert-dismissible" role="alert">
+Changes you make to your realm routing must be reviewed by the Roaming Operator before they are pushed into production. Your changes here will be queued, and will typically be processed within one working day. You will be contacted once this has happened.
+</div>
 {% if messages %}
 	<table class="table table-condensed">
 	    {% for message in messages %}