diff --git a/application/controllers/Settings.php b/application/controllers/Settings.php deleted file mode 100644 index 6b27c1308..000000000 --- a/application/controllers/Settings.php +++ /dev/null @@ -1,19 +0,0 @@ -load->view('interface_assets/header', $data); - $this->load->view('settings/index'); - $this->load->view('interface_assets/footer'); - } -} \ No newline at end of file diff --git a/application/views/awards/counties/index.php b/application/views/awards/counties/index.php index 05c61a981..08714c6b5 100644 --- a/application/views/awards/counties/index.php +++ b/application/views/awards/counties/index.php @@ -5,7 +5,7 @@ diff --git a/application/views/awards/cq/index.php b/application/views/awards/cq/index.php index 84b07e6bb..69ef546d5 100644 --- a/application/views/awards/cq/index.php +++ b/application/views/awards/cq/index.php @@ -18,7 +18,7 @@ var lang_award_info_ln1 = ""; var lang_award_info_ln2 = ""; var lang_award_info_ln3 = ""; - var lang_award_info_ln4 = "CQ Magazine"); ?>"; + var lang_award_info_ln4 = "CQ Magazine"); ?>";

diff --git a/application/views/awards/dok/index.php b/application/views/awards/dok/index.php index 10ca25307..fb5bf777f 100644 --- a/application/views/awards/dok/index.php +++ b/application/views/awards/dok/index.php @@ -7,7 +7,7 @@ var lang_award_info_ln1 = ""; var lang_award_info_ln2 = ""; var lang_award_info_ln3 = ""; - var lang_award_info_ln4 = "DARC website", "here"); ?>"; + var lang_award_info_ln4 = "DARC website", "here"); ?>";

diff --git a/application/views/awards/dxcc/index.php b/application/views/awards/dxcc/index.php index 51cd86c65..436c2d06f 100644 --- a/application/views/awards/dxcc/index.php +++ b/application/views/awards/dxcc/index.php @@ -12,8 +12,8 @@

diff --git a/application/views/awards/ffma/index.php b/application/views/awards/ffma/index.php index 4f225a790..8392a48b8 100644 --- a/application/views/awards/ffma/index.php +++ b/application/views/awards/ffma/index.php @@ -8,7 +8,7 @@ var lang_award_info_ln1 = ""; var lang_award_info_ln2 = ""; var lang_award_info_ln3 = ""; - var lang_award_info_ln4 = "https://www.arrl.org/ffma"); ?>"; + var lang_award_info_ln4 = "https://www.arrl.org/ffma"); ?>";

diff --git a/application/views/awards/gridmaster/index.php b/application/views/awards/gridmaster/index.php index 26f6fc5ea..aa1378f7c 100644 --- a/application/views/awards/gridmaster/index.php +++ b/application/views/awards/gridmaster/index.php @@ -6,7 +6,7 @@ var lang_awards_info_button = ""; var lang_award_info_ln1 = ""; var lang_award_info_ln2 = ""; - var lang_award_info_ln3 = "" . __("website") . ""); ?>"; + var lang_award_info_ln3 = "" . __("website") . ""); ?>"; var lang_award_info_ln4 = "";

diff --git a/application/views/awards/helvetia/index.php b/application/views/awards/helvetia/index.php index 278965dda..bf8b9fe9f 100644 --- a/application/views/awards/helvetia/index.php +++ b/application/views/awards/helvetia/index.php @@ -18,7 +18,7 @@ var lang_award_info_ln1 = ""; var lang_award_info_ln2 = ""; var lang_award_info_ln3 = ""; - var lang_award_info_ln4 = "https://www.uska.ch/contest/uska-diplome/"); ?>"; + var lang_award_info_ln4 = "https://www.uska.ch/contest/uska-diplome/"); ?>";

diff --git a/application/views/awards/iota/index.php b/application/views/awards/iota/index.php index a94e25435..1d4b8843d 100644 --- a/application/views/awards/iota/index.php +++ b/application/views/awards/iota/index.php @@ -16,7 +16,7 @@ var lang_award_info_ln1 = ""; var lang_award_info_ln2 = ""; var lang_award_info_ln3 = ""; - var lang_award_info_ln4 = "" . __("here") . ""); ?>"; + var lang_award_info_ln4 = "" . __("here") . ""); ?>";

diff --git a/application/views/awards/itu/index.php b/application/views/awards/itu/index.php index b97291bdb..c2fd670b5 100644 --- a/application/views/awards/itu/index.php +++ b/application/views/awards/itu/index.php @@ -17,7 +17,7 @@ var lang_awards_info_button = ""; var lang_award_info_ln1 = ""; var lang_award_info_ln2 = ""; - var lang_award_info_ln3 = "RSGB"); ?>"; + var lang_award_info_ln3 = "RSGB"); ?>"; var lang_award_info_ln4 = "";

diff --git a/application/views/awards/jcc/index.php b/application/views/awards/jcc/index.php index c9775ec5f..49a31c79a 100644 --- a/application/views/awards/jcc/index.php +++ b/application/views/awards/jcc/index.php @@ -16,7 +16,7 @@ var lang_award_info_ln1 = ""; var lang_award_info_ln2 = ""; var lang_award_info_ln3 = ""; - var lang_award_info_ln4 = "https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm"); ?>"; + var lang_award_info_ln4 = "https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm"); ?>";

diff --git a/application/views/awards/pota/index.php b/application/views/awards/pota/index.php index 49aae441e..daa117907 100644 --- a/application/views/awards/pota/index.php +++ b/application/views/awards/pota/index.php @@ -7,7 +7,7 @@ var lang_award_info_ln1 = ""; var lang_award_info_ln2 = ""; var lang_award_info_ln3 = ""; - var lang_award_info_ln4 = "Parks on the Air® website"); ?>"; + var lang_award_info_ln4 = "Parks on the Air® website"); ?>";

diff --git a/application/views/awards/sota/index.php b/application/views/awards/sota/index.php index 25a31a548..3cedb1eb6 100644 --- a/application/views/awards/sota/index.php +++ b/application/views/awards/sota/index.php @@ -7,7 +7,7 @@ var lang_award_info_ln1 = ""; var lang_award_info_ln2 = ""; var lang_award_info_ln3 = ""; - var lang_award_info_ln4 = "https://www.sota.org.uk/"); ?>"; + var lang_award_info_ln4 = "https://www.sota.org.uk/"); ?>";

diff --git a/application/views/awards/vucc/index.php b/application/views/awards/vucc/index.php index c123f15ec..88c0f2924 100644 --- a/application/views/awards/vucc/index.php +++ b/application/views/awards/vucc/index.php @@ -6,7 +6,7 @@ var lang_awards_info_button = ""; var lang_award_info_ln1 = ""; var lang_award_info_ln2 = ""; - var lang_award_info_ln3 = "https://www.arrl.org/vucc"); ?>"; + var lang_award_info_ln3 = "https://www.arrl.org/vucc"); ?>"; var lang_award_info_ln4 = "";

diff --git a/application/views/awards/wab/index.php b/application/views/awards/wab/index.php index a2923a547..cf20c7840 100644 --- a/application/views/awards/wab/index.php +++ b/application/views/awards/wab/index.php @@ -12,7 +12,7 @@ var lang_award_info_ln1 = ""; var lang_award_info_ln2 = ""; var lang_award_info_ln3 = ""; - var lang_award_info_ln4 = "https://wab.intermip.net/default.php"); ?>"; + var lang_award_info_ln4 = "https://wab.intermip.net/default.php"); ?>";

diff --git a/application/views/awards/waja/index.php b/application/views/awards/waja/index.php index 202db36e4..fd9c0b9da 100644 --- a/application/views/awards/waja/index.php +++ b/application/views/awards/waja/index.php @@ -17,7 +17,7 @@ var lang_award_info_ln1 = ""; var lang_award_info_ln2 = ""; var lang_award_info_ln3 = ""; - var lang_award_info_ln4 = "https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm"); ?>"; + var lang_award_info_ln4 = "https://www.jarl.org/English/4_Library/A-4-2_Awards/Award_Main.htm"); ?>";

diff --git a/application/views/awards/was/index.php b/application/views/awards/was/index.php index 4ed02ee4c..0e983f5c4 100644 --- a/application/views/awards/was/index.php +++ b/application/views/awards/was/index.php @@ -18,7 +18,7 @@ var lang_award_info_ln1 = ""; var lang_award_info_ln2 = ""; var lang_award_info_ln3 = ""; - var lang_award_info_ln4 = "here"); ?>"; + var lang_award_info_ln4 = "here"); ?>";

diff --git a/application/views/awards/wwff/index.php b/application/views/awards/wwff/index.php index c93c3a9f1..2f09b3643 100644 --- a/application/views/awards/wwff/index.php +++ b/application/views/awards/wwff/index.php @@ -7,7 +7,7 @@ var lang_award_info_ln1 = ""; var lang_award_info_ln2 = ""; var lang_award_info_ln3 = ""; - var lang_award_info_ln4 = "https://wwff.co/awards/"); ?>"; + var lang_award_info_ln4 = "https://wwff.co/awards/"); ?>";

diff --git a/application/views/cfd/index.php b/application/views/cfd/index.php index 8189901a3..64c0b04c3 100644 --- a/application/views/cfd/index.php +++ b/application/views/cfd/index.php @@ -4,7 +4,7 @@
- https://toplist.darc.de"); ?> + https://toplist.darc.de"); ?>
diff --git a/application/views/lotw/import.php b/application/views/lotw/import.php index de5646887..f7ef26194 100644 --- a/application/views/lotw/import.php +++ b/application/views/lotw/import.php @@ -21,7 +21,7 @@

-

".__("Download Report").""); ?>

+

".__("Download Report").""); ?>

diff --git a/application/views/options/dxcluster.php b/application/views/options/dxcluster.php index 61c4f5689..81bcbd4e9 100644 --- a/application/views/options/dxcluster.php +++ b/application/views/options/dxcluster.php @@ -36,9 +36,9 @@
-

".__("DXClusterAPI").""); ?>

+

".__("DXClusterAPI").""); ?>

- +
diff --git a/application/views/search/cqzones.php b/application/views/search/cqzones.php index a3ba7a457..23afcccb9 100644 --- a/application/views/search/cqzones.php +++ b/application/views/search/cqzones.php @@ -1,39 +1,39 @@ - ".__("click here").""); ?>
+ ".__("click here").""); ?>
@@ -139,25 +139,25 @@ - ".__("IOTA World website").""); ?> + ".__("IOTA World website").""); ?>
- ".__("SOTA Maps website").""); ?> + ".__("SOTA Maps website").""); ?>
- ".__("GMA Map website").""); ?> + ".__("GMA Map website").""); ?>
- ".__("POTA Map website").""); ?> + ".__("POTA Map website").""); ?>
@@ -209,7 +209,7 @@
- ".__("HRDLog.net Userprofile page").""); ?> + ".__("HRDLog.net Userprofile page").""); ?>
@@ -232,7 +232,7 @@
- ".__("the QRZ.com Logbook settings page").""); ?> + ".__("the QRZ.com Logbook settings page").""); ?>
@@ -248,7 +248,7 @@
- ".__("QO-100 Dx Club's profile page").""); ?> + ".__("QO-100 Dx Club's profile page").""); ?>
diff --git a/application/views/station_profile/edit.php b/application/views/station_profile/edit.php index aa3bcd86c..a6fc68f11 100644 --- a/application/views/station_profile/edit.php +++ b/application/views/station_profile/edit.php @@ -39,7 +39,7 @@
station_profile_name; } ?>" required> - +
@@ -135,7 +135,7 @@ } ?> - ".__("click here")." "); ?> + ".__("click here")." "); ?>
@@ -152,7 +152,7 @@ } ?> - ".__("click here")." "); ?> + ".__("click here")." "); ?>
@@ -176,7 +176,7 @@
- ".__("click here").""); ?>
+ ".__("click here").""); ?>
@@ -203,7 +203,7 @@ - ".__("IOTA World website").""); ?> + ".__("IOTA World website").""); ?> @@ -218,7 +218,7 @@
station_sota; } ?>"> - ".__("SOTA Maps website").""); ?> + ".__("SOTA Maps website").""); ?>
@@ -231,7 +231,7 @@
station_wwff; } ?>"> - ".__("GMA Map website").""); ?> + ".__("GMA Map website").""); ?>
@@ -244,7 +244,7 @@
station_pota; } ?>"> - ".__("POTA Map website").""); ?> + ".__("POTA Map website").""); ?>
@@ -303,7 +303,7 @@ - ".__("the QRZ.com Logbook settings page").""); ?> + ".__("the QRZ.com Logbook settings page").""); ?>
@@ -356,7 +356,7 @@
hrdlog_code; } ?>"> - ".__("HRDLog.net Userprofile page").""); ?> + ".__("HRDLog.net Userprofile page").""); ?>
@@ -377,7 +377,7 @@
webadifapikey; } ?>"> - ".__("QO-100 Dx Club's profile page").""); ?> + ".__("QO-100 Dx Club's profile page").""); ?>
diff --git a/application/views/station_profile/index.php b/application/views/station_profile/index.php index c484f1705..603320435 100644 --- a/application/views/station_profile/index.php +++ b/application/views/station_profile/index.php @@ -95,7 +95,10 @@ - station_id; ?>" class="btn btn-danger btn-sm" title= onclick="return confirm('');"> + + station_id; ?>" class="btn btn-danger btn-sm" title= onclick="return confirm('');"> station_active != 1) { diff --git a/application/views/stationsetup/edit.php b/application/views/stationsetup/edit.php index 5cb049ca6..e8c3df7a0 100644 --- a/application/views/stationsetup/edit.php +++ b/application/views/stationsetup/edit.php @@ -15,9 +15,9 @@
- + - You can call a container anything. +
diff --git a/application/views/stationsetup/exportmapoptions.php b/application/views/stationsetup/exportmapoptions.php index 6db0ec03b..23c43a7ef 100644 --- a/application/views/stationsetup/exportmapoptions.php +++ b/application/views/stationsetup/exportmapoptions.php @@ -2,35 +2,35 @@ - + - + - + - + - + - + - +
Options
CQ Zone overlay
option_value ?? "true") == "true") { echo 'checked'; } ?>>
Gridsquare overlay
option_value ?? "true") == "true") { echo 'checked'; } ?>>
Night shadow overlay
option_value ?? "true") == "true") { echo 'checked'; } ?>>
Path lines
option_value ?? "true") == "true") { echo 'checked'; } ?>>
# QSOs shown
Band
diff --git a/application/views/stationsetup/stationsetup.php b/application/views/stationsetup/stationsetup.php index f63f7d617..4d0b51b77 100644 --- a/application/views/stationsetup/stationsetup.php +++ b/application/views/stationsetup/stationsetup.php @@ -29,9 +29,9 @@ - Linked locations + - Visitor site + @@ -88,7 +88,7 @@
- Station Locations +

@@ -127,7 +127,7 @@ $quickswitch_enabled = ($this->user_options_model->get_options('header_menu', array('option_name'=>'locations_quickswitch'))->row()->option_value ?? 'false'); if ($quickswitch_enabled == 'true') { ?> - Favorite + @@ -172,11 +172,14 @@ } else { $favStarClasses = 'class="far fa-star" style="color: #a58118;"'; } ?> - station_id; ?>" title="mark/unmark as favorite" > + station_id; ?>" title="" > - station_id; ?>" class="btn btn-danger btn-sm" title= onclick="return confirm('');"> + + station_id; ?>" class="btn btn-danger btn-sm" title= onclick="return confirm('');"> station_active != 1) { diff --git a/application/views/statistics/custom.php b/application/views/statistics/custom.php index 617ec6670..0c12fa035 100644 --- a/application/views/statistics/custom.php +++ b/application/views/statistics/custom.php @@ -9,55 +9,55 @@

- Explore the logbook. +

-

This is a work in-progress

+

-

Options

+

-

Date

+

- + - +
Start
End
-

Band

+

6m 2m 70cm 23cm 3cm -

Mode

+

SSB CW Data @@ -71,7 +71,7 @@
-

Finished your selection? time to search!

+

@@ -83,7 +83,7 @@
-

Results go here

+

diff --git a/application/views/statistics/custom_result.php b/application/views/statistics/custom_result.php index 757d3a1f8..2c3878b10 100644 --- a/application/views/statistics/custom_result.php +++ b/application/views/statistics/custom_result.php @@ -9,57 +9,57 @@

- Explore the logbook. +

-

This is a work in-progress

+

-

Options

+

-

Date

+

- + - +
Start
End
-

Band

+

6m 2m 70cm 23cm 3cm -

Mode

+

SSB CW Data @@ -68,7 +68,7 @@
-

Finished your selection? time to search!

+

@@ -82,14 +82,14 @@
- - - - - - - - + + + + + + + + result() as $row) { ?> diff --git a/application/views/statistics/index.php b/application/views/statistics/index.php index 860e649bb..d9d287f00 100644 --- a/application/views/statistics/index.php +++ b/application/views/statistics/index.php @@ -32,11 +32,11 @@
DateTimeCallModeSentRecv'dBandCountry
- - + + diff --git a/application/views/themes/add.php b/application/views/themes/add.php index f81f50dcd..aef0f481d 100644 --- a/application/views/themes/add.php +++ b/application/views/themes/add.php @@ -1,38 +1,38 @@
- + - This is the name that is used to display the theme in the theme list. +
- + - This is the name of the folder where your CSS-files are placed under assets/css. +
- + - This defines wherever the theme is a light or a dark one. +
- + - This is the name of the file which is used as small Logo in the header placed in assets/logo.
Only PNG files with a size ratio of 1:1 are allowed.
+ ", ""); ?>
- + - This is the name of the file which is used as big Logo in the login screen placed in assets/logo.
Only PNG files with a size ratio of 1:1 are allowed.
+ ", ""); ?>
- +
\ No newline at end of file diff --git a/application/views/themes/edit.php b/application/views/themes/edit.php index 55f6c57bb..a61aa94c8 100644 --- a/application/views/themes/edit.php +++ b/application/views/themes/edit.php @@ -1,38 +1,38 @@
- + name; } ?>"> - This is the name that is used to display the theme in the theme list. +
- + foldername; } ?>"> - This is the name of the folder where your CSS-files are placed under assets/css. +
- + - This defines wherever the theme is a light or a dark one. On this basis the Logo is chosen. +
- + header_logo; } ?>"> - This is the name of the file which is used as small Logo in the header placed in assets/logo.
Only PNG files with a size ratio of 1:1 are allowed.
+ ", ""); ?>
- + main_logo; } ?>"> - This is the name of the file which is used as big Logo in the login screen placed in assets/logo.
Only PNG files with a size ratio of 1:1 are allowed.
+ ", ""); ?>
- +
diff --git a/application/views/themes/index.php b/application/views/themes/index.php index 0febf5ca4..cc8fe759f 100644 --- a/application/views/themes/index.php +++ b/application/views/themes/index.php @@ -19,58 +19,58 @@
- Themes list +
-

In this menu you can add and edit themes to Wavelog. The process of adding a theme is not really straightforward and should only be done by an admin who is aware of their actions.
- Also, it has to be said that this feature is still under development.

+


+

-
Process of adding a new theme
+
-
1. Step
+
-

Create a new folder in 'assets/css/' and upload a 'bootstrap.min.css' file which contains basic styling rules. We use the themes from https://bootswatch.com/

+

https://bootswatch.com/'); ?>

-
2. Step
+
-

Create a file in this folder called 'overrides.css'. Place your custom CSS code in there.

+

-
3. Step
+
-

For each new theme, you need two logo files. One for the login screen and one for the header.
- Only PNG files are allowed, and they should have a pixel ratio of 1:1 (e.g., 1000px height and 1000px width).
- Place the two logo files in the folder 'assets/logo/'

+


+
+

-
4. Step
+
-

Click here on 'Add a Theme' and type in the necessary data. Type in the filenames for the logos without the file extension '.png'

+

without the file extension '.png'"); ?>

@@ -79,11 +79,11 @@
#Satellite# of QSO's worked
- - - - - + + + + + @@ -96,15 +96,15 @@ @@ -113,6 +113,6 @@
NameFoldernameTheme ModeHeader LogoMain Logo
theme_mode != "") { echo $theme->theme_mode; } else { - echo "Theme-Mode undefined! Please edit"; + echo "Theme-Mode undefined! " . __("Please edit") . ""; } ?> header_logo; ?> main_logo; ?> - Edit + - Delete +

-

+

\ No newline at end of file diff --git a/application/views/timeline/index.php b/application/views/timeline/index.php index 0995c3f41..cea5392a8 100644 --- a/application/views/timeline/index.php +++ b/application/views/timeline/index.php @@ -41,11 +41,11 @@
@@ -97,7 +97,7 @@ } } else { - echo ''; + echo ''; } ?> diff --git a/application/views/update/index.php b/application/views/update/index.php index eacdcc5ce..c74330129 100644 --- a/application/views/update/index.php +++ b/application/views/update/index.php @@ -5,48 +5,48 @@
-

Here you can update the DXCC lookup data that is used for displaying callsign information.

-

This data is provided by .

+

+

.

-
Check for DXCC Data Updates
- +
+ -
Status:
+
:


-
Apply DXCC Data to Logbook
+

- After updating, Wavelog can fill in missing callsign information in the logbook using the newly-obtained DXCC data. +

-

Check QSOs missing DXCC data

+

-

Re-check all QSOs in logbook

+

-
Apply Continent Data to Logbook
+

- This function can be used to update QSO continent information for all QSOs in Wavelog missing that information. +

-

Check QSOs missing continent data

+