Merge branch 'release/v1.4.2'

CHANGELOG.md

@@ -1,4 +1,14 @@
 #Changelog
+* 1.4.2:
+  * Improvements
+    * Community name is no longer hidden when menu collapses, also moved menu button to right side
+    * Using minfied version of the fitting stats tool script now
+    * Theme are now versioned like other assets allowing for easier cache control
+  * Fixes:
+    * Converted the date-time picker fields on comp history search to date and time native browser fields
+    * Properly apply scheme to swagger spec
+    * Fixed some bootstrap includes using the wrong version
+    * Fixed a typo on reform page
 * 1.4.1:
   * Fixes
     * Swagger spec not containing the scheme

static/css/themes/dark.css

@@ -8983,15 +8983,16 @@ a.text-dark:hover, a.text-dark:focus {
 }
 
 .eveui_window {
-  background: #6c757d !important;
-  color: #e9ecef !important;
+  background: #495057 !important;
+  color: #f8f9fa !important;
 }
 
 .eveui_title {
-  background: #212529;
+  background: #495057 !important;
   color: #f8f9fa !important;
 }
 
 #wl_hover table {
-  background: #ced4da !important;
+  background: #495057 !important;
+  color: #f8f9fa !important;
 }

static/css/themes/dark_purple.css

@@ -8983,15 +8983,16 @@ a.text-dark:hover, a.text-dark:focus {
 }
 
 .eveui_window {
-  background: #6c757d !important;
-  color: #e9ecef !important;
+  background: #495057 !important;
+  color: #f8f9fa !important;
 }
 
 .eveui_title {
-  background: #212529;
+  background: #495057 !important;
   color: #f8f9fa !important;
 }
 
 #wl_hover table {
-  background: #ced4da !important;
+  background: #495057 !important;
+  color: #f8f9fa !important;
 }

static/css/themes/default.css

@@ -8983,15 +8983,16 @@ a.text-dark:hover, a.text-dark:focus {
 }
 
 .eveui_window {
-  background: #6c757d !important;
-  color: #e9ecef !important;
+  background: #fff !important;
+  color: #212529 !important;
 }
 
 .eveui_title {
-  background: #212529;
-  color: #f8f9fa !important;
+  background: #fff !important;
+  color: #212529 !important;
 }
 
 #wl_hover table {
-  background: #ced4da !important;
+  background: #fff !important;
+  color: #212529 !important;
 }

static/js/history-search.js

@@ -9,7 +9,7 @@ waitlist.history.historysearch = (function() {
 	var getMetaData = waitlist.base.getMetaData;
 	var createHistoryEntryDOM = waitlist.history.base.createHistoryEntryDOM;
 
-	function loadData(sources, targets, actions, startdate, enddate) {
+	function loadData(sources, targets, actions, startdate, starttime, enddate, endtime) {
 		var data = {};
 		if (sources !== null) {
 			data.accs = sources;
@@ -20,14 +20,16 @@ waitlist.history.historysearch = (function() {
 		if (actions !== null) {
 			data.actions = actions;
 		}
-		data.start = startdate;
-		data.end = enddate;
+		data.startdate = startdate;
+		data.starttime = starttime;
+		data.enddate = enddate;
+		data.endtime = endtime;
 		$.getJSON(getMetaData('api-history-search'), data, function(data) {
 			var hbody = $('#historybody');
 			hbody.empty();
 			if (data.history.length <= 0) {
-				 hbody.append('<td cospan="5">No Results Found</td>');
-				 return;
+				hbody.append('<td cospan="5">No Results Found</td>');
+				return;
 			}
 			for (var i = 0; i < data.history.length; i++) {
 				var hEntryDOM = createHistoryEntryDOM(data.history[i]);
@@ -37,8 +39,8 @@ waitlist.history.historysearch = (function() {
 			}
 			if (data.history.length > 0) {
 				data.laststamp = (new Date(Date
-					.parse(data.history[data.history.length - 1].time)))
-					.getTime();
+				    .parse(data.history[data.history.length - 1].time)))
+				    .getTime();
 			}
 		});
 	}
@@ -50,8 +52,10 @@ waitlist.history.historysearch = (function() {
 		if (actions !== null) {
 			actions = actions.join('|');
 		}
-		var start = $('#startpicker > input').val();
-		var end = $('#endpicker > input').val();
+		let startDate = $('#startDate').val();
+		let startTime = $('#startTime').val();
+		let endDate = $('#endDate').val();
+		let endTime = $('#endTime').val();
 
 		if (sources === "") {
 			sources = null;
@@ -62,55 +66,28 @@ waitlist.history.historysearch = (function() {
 		if (actions === "") {
 			actions = null;
 		}
-		if (start === "") {
-			start = moment().subtract(1, 'day').format("YYYY/MM/DD HH:mm");
+		if (startDate === "" || startTime === "") {
+			return;
 		}
-		if (end === "") {
-			end = moment().format("YYYY/MM/DD HH:mm");
+		if (endDate === "" || endTime === "") {
+			return;
 		}
 
-		loadData(sources, targets, actions, start, end);
+		loadData(sources, targets, actions, startDate, startTime, endDate, endTime);
 	}
 
 	function init() {
 		$('#search').on('click', search_click_handler);
-		$('#startpicker').datetimepicker({
-			icons: {
-				time: "fa fa-clock-o",
-				date: "fa fa-calendar",
-				up: "fa fa-arrow-up",
-				down: "fa fa-arrow-down",
-				previous: 'fa fa-chevron-left',
-				next: 'fa fa-chevron-right',
-				today: 'fa fa-calendar-o',
-				clear: 'fa fa-trash',
-				close: 'fa fa-times'
-			},
-			format: "YYYY/MM/DD HH:mm",
-			sideBySide: true
-		});
-		$('#endpicker').datetimepicker({
-			useCurrent: false,
-			icons: {
-				time: "fa fa-clock-o",
-				date: "fa fa-calendar",
-				up: "fa fa-arrow-up",
-				down: "fa fa-arrow-down",
-				previous: 'fa fa-chevron-left',
-				next: 'fa fa-chevron-right',
-				today: 'fa fa-calendar-o',
-				clear: 'fa fa-trash',
-				close: 'fa fa-times'
-			},
-			format: "YYYY/MM/DD HH:mm",
-			sideBySide: true
-		});
-		$("#startpicker").on("dp.change", function(e) {
-			$('#endpicker').data("DateTimePicker").minDate(e.date);
-		});
-		$("#endpicker").on("dp.change", function(e) {
-			$('#startpicker').data("DateTimePicker").maxDate(e.date);
+		Date.prototype.toDateInputValue = (function() {
+			var local = new Date(this);
+			local.setMinutes(this.getMinutes() - this.getTimezoneOffset());
+			return local.toJSON().slice(0,10);
 		});
+		let nowValue = new Date();
+		document.getElementById('startDate').valueAsDate = nowValue;
+		document.getElementById('startTime').valueAsDate = nowValue;
+		document.getElementById('endDate').valueAsDate = nowValue;
+		document.getElementById('endTime').valueAsDate = nowValue;
 	}
 
 	$(document).ready(init);

templates/base.html

@@ -16,7 +16,8 @@
 {% endassets %}
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js" integrity="sha256-hwg4gsxgFZhOsEEamdOYGBf13FyQuiTwlAQgxVSNgt4=" crossorigin="anonymous"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.0/umd/popper.min.js" integrity="sha384-cs/chFZiN24E4KMATLdqdvsezGxaGsi4hLGOzlXwp5UZB1LY//20VyM2taTB4QvJ" crossorigin="anonymous"></script>
-<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.0/js/bootstrap.min.js" integrity="sha384-uefMccjFJAIv6A+rW+L4AHf99KvxDjWSu1z9VI8SKNVmz4sk7buKt/6v9KI65qnm" crossorigin="anonymous"></script>
+<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js" integrity="sha384-smHYKdLADwkXOn1EmN1qk/HfnUcbVRZyYmZ4qpPea6sjB/pTJ0euyQp0Mk8ck+5T" crossorigin="anonymous"></script>
+
 <title>{% block title %}{% endblock %}</title>
 {% endblock %}
 {% if header_insert is not none %}
@@ -33,11 +34,11 @@
 <body>
 	<nav class="navbar navbar-expand-md">
 	{% block menu %}
+		<a class="navbar-brand" href="/#">{{ title }}</a>
 		<button class="navbar-toggler navbar-toggler-right my-1" type="button" data-toggle="collapse" data-target="#mainNavbar" aria-label="Toggle navigation">
 			&#9776;
 		</button>
 		<div class="collapse navbar-collapse" id="mainNavbar">
-			<a class="navbar-brand" href="/#">{{ title }}</a>
 			<ul class="navbar-nav justify-content-start mr-auto">
 				<li class="nav-item">
 					<a class="nav-link" href="{{url_for('index')}}">Home</a>

templates/fleet/reform/index.html

@@ -12,7 +12,7 @@
 <fieldset class="form-group">
 <p>You can just copy and paste the ingame fleet channel member list into the field below.
 Then press Send Invites to start sending out the invites.
-People that are still in the old fleet will not get an invite of cause.</p>
+People that are still in the old fleet will not get an invite of course.</p>
 <p>This will not trigger, notifications or pokes.</p>
 <label for="char-list">Character List</label>
 <textarea class="form-control" id="char-list" name="chars" rows="10" cols="50" placeholder="Post character list here" required></textarea>