Merge remote-tracking branch 'origin/dev' into dev

assets/js/sections/labels.js

@@ -39,7 +39,7 @@ function printat(stationid) {
 		data: {'stationid': stationid},
 		success: function (html) {
 			BootstrapDialog.show({
-				title: 'Start printing at which label?',
+				title: '<i class="fas fa-print me-2"></i>'+lang_label_print_options,
 				size: BootstrapDialog.SIZE_NORMAL,
 				cssClass: 'qso-dialog',
 				nl2br: false,
@@ -51,20 +51,21 @@ function printat(stationid) {
 				{
 					label: lang_print_queue,
 					id: "button1id",
-					cssClass: "btn btn-primary",
-					action: function() { 
+					cssClass: "btn btn-primary btn-sm me-3",
+					action: function() {
 						$('#button_markprint').removeClass("disabled");
 						$('#button_markprint').attr("disabled", false);
-						$("#pform").submit(); 
+						$("#pform").submit();
 					}
 				},
 				{
 					label: lang_mark_qsl_as_printed+'<div class="ld ld-ring ld-spin"></div>',
-					cssClass: "btn btn-secondary me-3 ld-ext-right",
+					cssClass: "btn btn-secondary btn-sm me-3 ld-ext-right",
 					id: "button_markprint"
 				},
 				{
 					label: lang_admin_close,
+					cssClass: "btn btn-secondary btn-sm me-3",
 					action: function (dialogItself) {
 						dialogItself.close();
 						location.reload(); 	// Refresh Mainpage, because labels could have been marked as sent

assets/js/sections/logbookadvanced.js

@@ -63,6 +63,9 @@ function updateRow(qso) {
 	if ((user_options.datetime.show ?? 'true') == "true"){
 		cells.eq(c++).text(qso.qsoDateTime);
 	}
+	if ((user_options.duration.show ?? 'true') == "true"){
+		cells.eq(c++).text(qso.duration);
+	}
 	if ((user_options.last_modification.show ?? 'true') == "true"){
 		cells.eq(c++).text(qso.last_modified);
 	}
@@ -283,6 +286,9 @@ function loadQSOTable(rows) {
 				data.push(qso.qsoDateTime);
 			}
 		}
+		if ((user_options.duration.show ?? 'true') == "true"){
+			data.push(qso.duration);
+		}
 		if ((user_options.last_modification.show ?? 'true') == "true"){
 			data.push(qso.last_modified);
 		}
@@ -765,7 +771,8 @@ $(document).ready(function () {
 				qrzReceived: this.qrzReceived.value,
 				distance: this.distance.value,
 				sortcolumn: this.sortcolumn.value,
-				sortdirection: this.sortdirection.value
+				sortdirection: this.sortdirection.value,
+				duration: this.duration.value,
 			},
 			dataType: 'json',
 			success: function (data) {
@@ -831,7 +838,7 @@ $(document).ready(function () {
 					buttons: [
 					{
 						label: lang_admin_close,
-						cssClass: 'btn-sm btn-secondary',
+						cssClass: 'btn btn-sm btn-secondary',
 						id: 'closeButton',
 						action: function (dialogItself) {
 							dialogItself.close();
@@ -839,7 +846,7 @@ $(document).ready(function () {
 					},
 					{
 						label: 'Update',
-						cssClass: 'btn-sm btn-primary',
+						cssClass: 'btn btn-sm btn-primary',
 						id: 'updateButton',
 						action: function (dialogItself) {
 							startProcessingCallbook(nElements, $('[name="gridsquareaccuracycheck"]').is(":checked"));
@@ -1620,7 +1627,7 @@ $(document).ready(function () {
 			type: 'post',
 			success: function (html) {
 				BootstrapDialog.show({
-					title: lang_gen_advanced_logbook_start_printing_at_which_label,
+					title: '<i class="fas fa-print me-2"></i>'+lang_label_print_options,
 					size: BootstrapDialog.SIZE_NORMAL,
 					cssClass: 'qso-dialog',
 					nl2br: false,
@@ -1629,7 +1636,7 @@ $(document).ready(function () {
 					},
 					buttons: [{
 						label: 'Print',
-						cssClass: 'btn-primary btn-sm',
+						cssClass: 'btn btn-primary btn-sm',
 						action: function (dialogItself) {
 							printlabel(id_list);
 							dialogItself.close();
@@ -1637,6 +1644,7 @@ $(document).ready(function () {
 					},
 						{
 						label: lang_admin_close,
+						cssClass: 'btn btn-secondary btn-sm',
 						action: function (dialogItself) {
 							$('#printLabel').prop("disabled", false);
 							dialogItself.close();
@@ -1764,7 +1772,8 @@ function printlabel(id_list) {
 				'via': $('#via')[0].checked,
 				'tnxmsg': $('#tnxmsg')[0].checked,
 				'qslmsg': $('#qslmsg')[0].checked,
-				'reference': $('#reference')[0].checked
+				'reference': $('#reference')[0].checked,
+				'mycall': $('#mycall')[0].checked
 			},
 		xhr:function(){
 			var xhr = new XMLHttpRequest();
@@ -1816,6 +1825,7 @@ function saveOptions() {
 			type: 'post',
 			data: {
 				datetime: $('input[name="datetime"]').is(':checked') ? true : false,
+				duration: $('input[name="duration"]').is(':checked') ? true : false,
 				last_modification: $('input[name="last_modification"]').is(':checked') ? true : false,
 				de: $('input[name="de"]').is(':checked') ? true : false,
 				dx: $('input[name="dx"]').is(':checked') ? true : false,

assets/js/sections/logbookadvanced_map.js

@@ -551,7 +551,8 @@ function getFormData(form) {
 		qrzReceived: form.qrzReceived.value,
 		distance: form.distance.value,
 		sortcolumn: form.sortcolumn.value,
-		sortdirection: form.sortdirection.value
+		sortdirection: form.sortdirection.value,
+		duration: form.duration.value
 	};
 }