From 5d23802e16200accc7166d91312dbb2b19bc5e13 Mon Sep 17 00:00:00 2001
From: Paul Beesley <830976+poll-busily@users.noreply.github.com>
Date: Wed, 28 Oct 2020 18:03:30 +0000
Subject: [PATCH] Further tweaks to text and text formatting
This commit has some further changes to text throughout the application. There are also some small fixes for text formatting. E.g. making sure that the small "helper" text under certain form fields is all consistent in terms of colour, font, etc.
---
application/controllers/Clublog.php | 2 +-
application/controllers/Qrz.php | 10 +++----
application/models/Distances_model.php | 2 +-
application/models/Timeplotter_model.php | 2 +-
application/views/adif/import.php | 18 ++++++-------
application/views/api/help.php | 2 +-
application/views/eqsl/export.php | 8 +++---
application/views/eqsl/import.php | 6 ++---
application/views/interface_assets/footer.php | 10 +++----
application/views/lotw_views/index.php | 4 +--
application/views/mode/index.php | 9 +++++--
application/views/notes/add.php | 2 +-
application/views/notes/edit.php | 2 +-
application/views/qso/index.php | 12 +++++----
application/views/station_profile/create.php | 24 +++++++++--------
application/views/station_profile/edit.php | 26 ++++++++++---------
application/views/station_profile/index.php | 8 +++---
application/views/timeplotter/index.php | 2 +-
application/views/user/edit.php | 14 +++++-----
application/views/user/main.php | 2 +-
20 files changed, 88 insertions(+), 77 deletions(-)
diff --git a/application/controllers/Clublog.php b/application/controllers/Clublog.php
index 3ea9ca743..842b95de4 100644
--- a/application/controllers/Clublog.php
+++ b/application/controllers/Clublog.php
@@ -199,7 +199,7 @@ class Clublog extends CI_Controller {
curl_close ($request);
}
} else {
- echo "no qsos to upload";
+ echo "No QSOs to upload";
}
}
}
diff --git a/application/controllers/Qrz.php b/application/controllers/Qrz.php
index 9346cc0c1..4a8643c78 100644
--- a/application/controllers/Qrz.php
+++ b/application/controllers/Qrz.php
@@ -27,16 +27,16 @@ class Qrz extends CI_Controller {
foreach ($station_ids as $station_id) {
$qrz_api_key = $this->logbook_model->exists_qrz_api_key($station_id);
if($this->mass_upload_qsos($station_id, $qrz_api_key)) {
- echo "QSOs has been uploaded to QRZ.com.";
- log_message('info', 'QSOs has been uploaded to QRZ.com.');
+ echo "QSOs have been uploaded to QRZ.com.";
+ log_message('info', 'QSOs have been uploaded to QRZ.com.');
} else{
echo "No QSOs found for upload.";
log_message('info', 'No QSOs found for upload.');
}
}
} else {
- echo "No station_id's with a QRZ API Key found";
- log_message('error', "No station_id's with a QRZ API Key found");
+ echo "No station profiles with a QRZ API Key found.";
+ log_message('error', "No station profiles with a QRZ API Key found.");
}
}
@@ -139,7 +139,7 @@ class Qrz extends CI_Controller {
echo json_encode($data);
} else {
$data['status'] = 'Error';
- $data['info'] = 'Error, no QSOs to upload found';
+ $data['info'] = 'Error: No QSOs found to upload.';
$data['errormessages'] = $result['errormessages'];
echo json_encode($data);
}
diff --git a/application/models/Distances_model.php b/application/models/Distances_model.php
index a6da9d683..b2f2a7a06 100644
--- a/application/models/Distances_model.php
+++ b/application/models/Distances_model.php
@@ -91,7 +91,7 @@ class Distances_model extends CI_Model
}
else {
header('Content-Type: application/json');
- echo json_encode(array('Error' => 'No qsoes to plot found'));
+ echo json_encode(array('Error' => 'No QSOs found to plot.'));
}
}
}
diff --git a/application/models/Timeplotter_model.php b/application/models/Timeplotter_model.php
index 2cf36bce2..ba8d0c868 100644
--- a/application/models/Timeplotter_model.php
+++ b/application/models/Timeplotter_model.php
@@ -143,7 +143,7 @@ class Timeplotter_model extends CI_Model
}
else {
header('Content-Type: application/json');
- $data['error'] = 'No qsoes to plot found!';
+ $data['error'] = 'No QSOs found to plot!';
echo json_encode($data);
}
diff --git a/application/views/adif/import.php b/application/views/adif/import.php
index 444357ad5..7f56d40ec 100644
--- a/application/views/adif/import.php
+++ b/application/views/adif/import.php
@@ -15,7 +15,8 @@
-
Important Log files must have the file type .adi
+
Important Log files must have the file type .adi
+
Warning Maximum file upload size is B.
-
-
Warning Maximum file upload size is B.
-
@@ -70,7 +70,7 @@
- Exporting QSOs from the Active Station Profile Name station_profile_name;?> with the station callsign station_callsign;?>
+ Exporting QSOs from the active station profile station_profile_name;?> with the station callsign station_callsign;?>
@@ -120,7 +120,7 @@
Logbook of The World
-
If no date are chosen, that means all QSOs will be marked!
+
Warning If a date range is not selected then all QSOs will be marked!