From 8ba41812ad345747463489b2af673c21a4982f76 Mon Sep 17 00:00:00 2001 From: Paul Beesley <830976+poll-busily@users.noreply.github.com> Date: Tue, 22 Dec 2020 09:33:08 +0000 Subject: [PATCH] Tweaks to text Touches page titles, some table headers (capitalisation mostly), menu items. --- application/controllers/Accumulated.php | 2 +- application/controllers/Awards.php | 2 +- application/controllers/Contesting.php | 2 +- application/controllers/Distances.php | 2 +- application/controllers/Kml.php | 2 +- application/language/english/general_words_lang.php | 2 +- application/views/awards/cq/index.php | 2 +- application/views/awards/dxcc/index.php | 2 +- application/views/awards/iota/index.php | 2 +- application/views/awards/sota/index.php | 2 +- application/views/awards/vucc/index.php | 4 ++-- application/views/awards/wab/index.php | 2 +- application/views/awards/wacral/index.php | 2 +- application/views/awards/was/index.php | 2 +- application/views/contesting/index.php | 8 ++++---- application/views/export/index.php | 2 +- application/views/interface_assets/footer.php | 4 ++-- application/views/interface_assets/header.php | 8 ++++---- application/views/kml/index.php | 2 +- application/views/map/qsos.php | 4 ++-- application/views/notes/add.php | 2 +- application/views/notes/edit.php | 2 +- application/views/options/index.php | 2 +- application/views/qso/index.php | 2 +- application/views/search/filter.php | 2 +- application/views/search/result_search.php | 2 +- application/views/statistics/custom_result.php | 2 +- application/views/timeline/index.php | 2 +- application/views/view_log/partial/log.php | 2 +- application/views/view_log/partial/log_ajax.php | 2 +- application/views/view_log/qso.php | 2 +- 31 files changed, 40 insertions(+), 40 deletions(-) diff --git a/application/controllers/Accumulated.php b/application/controllers/Accumulated.php index a3bc64dc..c299d4bf 100644 --- a/application/controllers/Accumulated.php +++ b/application/controllers/Accumulated.php @@ -14,7 +14,7 @@ class Accumulated extends CI_Controller { public function index() { // Render Page - $data['page_title'] = "Accumulated statistics"; + $data['page_title'] = "Accumulated Statistics"; $this->load->model('Accumulate_model'); diff --git a/application/controllers/Awards.php b/application/controllers/Awards.php index 0bfdceab..8318381d 100644 --- a/application/controllers/Awards.php +++ b/application/controllers/Awards.php @@ -174,7 +174,7 @@ class Awards extends CI_Controller { $data['type'] = $type; // Render Page - $data['page_title'] = "VUCC - band"; + $data['page_title'] = "VUCC - " .$band . " Band"; $data['filter'] = "band ".$band; $data['band'] = $band; $this->load->view('interface_assets/header', $data); diff --git a/application/controllers/Contesting.php b/application/controllers/Contesting.php index f6dbeca1..d49fc8a9 100644 --- a/application/controllers/Contesting.php +++ b/application/controllers/Contesting.php @@ -33,7 +33,7 @@ class Contesting extends CI_Controller { $this->form_validation->set_rules('start_time', 'Time', 'required'); $this->form_validation->set_rules('callsign', 'Callsign', 'required'); - $data['page_title'] = "Contest logging"; + $data['page_title'] = "Contest Logging"; $this->load->view('interface_assets/header', $data); $this->load->view('contesting/index'); diff --git a/application/controllers/Distances.php b/application/controllers/Distances.php index 1d032074..b10e0ce5 100644 --- a/application/controllers/Distances.php +++ b/application/controllers/Distances.php @@ -14,7 +14,7 @@ class Distances extends CI_Controller { public function index() { // Render Page - $data['page_title'] = "Distances worked"; + $data['page_title'] = "Distances Worked"; function js_str($s) { diff --git a/application/controllers/Kml.php b/application/controllers/Kml.php index 50776661..e404f6fb 100644 --- a/application/controllers/Kml.php +++ b/application/controllers/Kml.php @@ -99,7 +99,7 @@ class Kml extends CI_Controller { if ( ! write_file('kml/qsos.kml', $output)) { - echo 'Unable to write the file - Make sure the folder KML has write permissions.'; + echo 'Unable to write the file. Make sure the folder KML has write permissions.'; } else { diff --git a/application/language/english/general_words_lang.php b/application/language/english/general_words_lang.php index bf8615ef..98c9ae33 100644 --- a/application/language/english/general_words_lang.php +++ b/application/language/english/general_words_lang.php @@ -29,7 +29,7 @@ $lang['gen_hamradio_call'] = 'Call'; $lang['gen_hamradio_callsign'] = 'Callsign'; $lang['gen_hamradio_mode'] = 'Mode'; $lang['gen_hamradio_rst_sent'] = 'Sent'; -$lang['gen_hamradio_rst_recv'] = 'Recv'; +$lang['gen_hamradio_rst_recv'] = 'Recv\'d'; $lang['gen_hamradio_band'] = 'Band'; // Dashboard Words diff --git a/application/views/awards/cq/index.php b/application/views/awards/cq/index.php index e8a64823..c4374fd8 100644 --- a/application/views/awards/cq/index.php +++ b/application/views/awards/cq/index.php @@ -84,7 +84,7 @@
-
Worked / confirmed
+
Worked / Confirmed
input->post('worked') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > diff --git a/application/views/awards/dxcc/index.php b/application/views/awards/dxcc/index.php index d1d2d44a..0155d0c7 100644 --- a/application/views/awards/dxcc/index.php +++ b/application/views/awards/dxcc/index.php @@ -17,7 +17,7 @@
-
Worked / confirmed
+
Worked / Confirmed
input->post('worked') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > diff --git a/application/views/awards/iota/index.php b/application/views/awards/iota/index.php index e541a8c3..f82f85fa 100644 --- a/application/views/awards/iota/index.php +++ b/application/views/awards/iota/index.php @@ -18,7 +18,7 @@
-
Worked / confirmed
+
Worked / Confirmed
input->post('worked') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > diff --git a/application/views/awards/sota/index.php b/application/views/awards/sota/index.php index a3e096e8..8c2a495b 100644 --- a/application/views/awards/sota/index.php +++ b/application/views/awards/sota/index.php @@ -10,7 +10,7 @@ Callsign Band RST Sent - RST Recvd + RST Received Band - Grids worked - Grids confirmed + Grids Worked + Grids Confirmed diff --git a/application/views/awards/wab/index.php b/application/views/awards/wab/index.php index 81e6a690..a88a1557 100644 --- a/application/views/awards/wab/index.php +++ b/application/views/awards/wab/index.php @@ -10,7 +10,7 @@ Callsign Band RST Sent - RST Recvd + RST Received Callsign Band RST Sent - RST Recvd + RST Received
-
Worked / confirmed
+
Worked / Confirmed
input->post('worked') || $this->input->method() !== 'post') echo ' checked="checked"'; ?> > diff --git a/application/views/contesting/index.php b/application/views/contesting/index.php index 362a5240..ad1057b9 100644 --- a/application/views/contesting/index.php +++ b/application/views/contesting/index.php @@ -4,13 +4,13 @@
-
Logging form
+
Logging Form
- +
@@ -379,7 +379,7 @@
- +
@@ -396,7 +396,7 @@
-
Logbook (for this logging session)
+
Contest Logbook (Only for this session)
diff --git a/application/views/export/index.php b/application/views/export/index.php index 75960d00..5fac1319 100644 --- a/application/views/export/index.php +++ b/application/views/export/index.php @@ -6,7 +6,7 @@

Data Types

\ No newline at end of file diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index e53b79c4..63f3b3bc 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -1353,7 +1353,7 @@ $(document).ready(function(){ renderTo: 'graphcontainer' }, title: { - text: 'Distance distribution' + text: 'Distance Distribution' }, xAxis: { categories: [], @@ -2305,7 +2305,7 @@ $(document).ready(function(){ renderTo: 'container' }, title: { - text: 'Time distribution' + text: 'Time Distribution' }, xAxis: { categories: [], diff --git a/application/views/interface_assets/header.php b/application/views/interface_assets/header.php index 7001f1e4..c7438b7e 100644 --- a/application/views/interface_assets/header.php +++ b/application/views/interface_assets/header.php @@ -67,7 +67,7 @@
Post QSO
- Contest logging + Contest Logging
View QSL @@ -83,13 +83,13 @@
Gridsquares
- Distances worked + Distances Worked
- Days with QSOs + Days with QSOs
Timeline
- Accumulated statistics + Accumulated Statistics
Timeplotter
diff --git a/application/views/kml/index.php b/application/views/kml/index.php index c75cbe3b..bef91511 100644 --- a/application/views/kml/index.php +++ b/application/views/kml/index.php @@ -8,7 +8,7 @@
diff --git a/application/views/map/qsos.php b/application/views/map/qsos.php index 1fbb7c2a..4086c7ab 100644 --- a/application/views/map/qsos.php +++ b/application/views/map/qsos.php @@ -1,6 +1,6 @@
-

station_profile_name; ?> Station Profile QSOs (All)

+

Map: All QSOs for "station_profile_name; ?>" Station Profile

session->flashdata('notice')) { ?> - +
diff --git a/application/views/notes/edit.php b/application/views/notes/edit.php index 2824bcfe..62b2be80 100644 --- a/application/views/notes/edit.php +++ b/application/views/notes/edit.php @@ -47,7 +47,7 @@ - + diff --git a/application/views/options/index.php b/application/views/options/index.php index 321b8a30..072e24cd 100644 --- a/application/views/options/index.php +++ b/application/views/options/index.php @@ -10,7 +10,7 @@

-

Cloudlog Options are global settings used for all users of the installation, which are overriddden if theres a setting on a user level.

+

Cloudlog Options are global settings used for all users of the installation, which are overriddden if there's a setting on a user level.

diff --git a/application/views/qso/index.php b/application/views/qso/index.php index 312ba52f..f6a9fb16 100755 --- a/application/views/qso/index.php +++ b/application/views/qso/index.php @@ -468,7 +468,7 @@ - + diff --git a/application/views/search/filter.php b/application/views/search/filter.php index faecfebb..13ec4388 100644 --- a/application/views/search/filter.php +++ b/application/views/search/filter.php @@ -56,7 +56,7 @@ - + diff --git a/application/views/search/result_search.php b/application/views/search/result_search.php index 39cf56f9..58a3332e 100644 --- a/application/views/search/result_search.php +++ b/application/views/search/result_search.php @@ -7,7 +7,7 @@ - + config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?> diff --git a/application/views/statistics/custom_result.php b/application/views/statistics/custom_result.php index 670a3bce..3d380d82 100644 --- a/application/views/statistics/custom_result.php +++ b/application/views/statistics/custom_result.php @@ -87,7 +87,7 @@ - + diff --git a/application/views/timeline/index.php b/application/views/timeline/index.php index 7a3c9a39..b6a8506e 100644 --- a/application/views/timeline/index.php +++ b/application/views/timeline/index.php @@ -117,7 +117,7 @@ function write_dxcc_timeline($timeline_array, $custom_date_format, $bandselect, - + diff --git a/application/views/view_log/partial/log.php b/application/views/view_log/partial/log.php index b21ef4aa..4f07e76e 100644 --- a/application/views/view_log/partial/log.php +++ b/application/views/view_log/partial/log.php @@ -8,7 +8,7 @@ - + config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?> diff --git a/application/views/view_log/partial/log_ajax.php b/application/views/view_log/partial/log_ajax.php index 04aefb36..e8dca3b7 100644 --- a/application/views/view_log/partial/log_ajax.php +++ b/application/views/view_log/partial/log_ajax.php @@ -8,7 +8,7 @@ - + config->item('use_auth')) && ($this->session->userdata('user_type') >= 2)) { ?> diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php index 0f1d0ec1..c8e435aa 100644 --- a/application/views/view_log/qso.php +++ b/application/views/view_log/qso.php @@ -90,7 +90,7 @@ - +
Call Mode SentRecvRecv'd Band
Call Mode SentRecvRecv'd Band Country Call Mode SentRecvRecv'd Band Country Call Mode SentRecvRecv'd Band Country
Prefix Country DeletedEnd dateEnd Date Show QSOs
Call Mode SentRecvRecv'd Band Country Call Mode SentRecvRecv'd Band Country
RST Recv:RST Recv'd: COL_RST_RCVD; ?> COL_SRX) { ?>(COL_SRX;?>) COL_SRX_STRING) { ?>(COL_SRX_STRING;?>)