Public_Tools/wavelog
2
0
Fork 0
mirror of https://github.com/wavelog/wavelog.git synced 2026-03-22 10:24:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into dev_dx_waterfall_fixes

Browse Source
This commit is contained in:
Szymon Porwolik
2025-11-10 12:59:16 +01:00
committed by GitHub
parent 78dc1fa230 a1c968e083
commit ff14c48391
67 changed files with 45510 additions and 18140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
application/views/interface_assets/footer.php
View File

@@ -58,6 +58,7 @@
var lang_general_word_please_wait = "<?= __("Please Wait ..."); ?>";
var lang_general_states_deprecated = "<?= _pgettext("Word for country states that are deprecated but kept for legacy reasons.", "deprecated"); ?>";
var lang_gen_hamradio_sat_info = "<?= __("Satellite Information"); ?>";
var lang_notes_error_loading = "<?= __("Error loading notes"); ?>";
var lang_notes_sort = "<?= __("Sorting"); ?>";
var lang_notes_duplication_disabled = "<?= __("Duplication is disabled for Contacts notes"); ?>";
@@ -113,7 +114,7 @@
var lang_qso_gridsquare_help = "<?= __("Enter multiple (4-digit) grids separated with commas. For example: IO77,IO78"); ?>";
var lang_cat_live = "<?= __("live"); ?>";
var lang_cat_polling = "<?= __("polling"); ?>";
var lang_cat_polling_tooltip = "<?= __("Periodic polling is slow. When operating locally, WebSockets are a more convenient way to control your radio in real-time."); ?>";
var lang_cat_polling_tooltip = "<?= __("Note: Periodic polling is slow. When operating locally, WebSockets are a more convenient way to control your radio in real-time."); ?>";
var lang_cat_tx = "<?= __("TX"); ?>";
var lang_cat_rx = "<?= __("RX"); ?>";
var lang_cat_tx_rx = "<?= __("TX/RX"); ?>";
@@ -132,6 +133,11 @@
var lang_qso_location_is_fetched_from_provided_gridsquare = "<?= __("Location is fetched from provided gridsquare"); ?>";
var lang_qso_location_is_fetched_from_dxcc_coordinates = "<?= __("Location is fetched from DXCC coordinates (no gridsquare provided)"); ?>";
// CAT Offline Status Messages
var lang_cat_working_offline = "<?= __("Working without CAT connection"); ?>";
var lang_cat_offline_cat_disabled = "<?= __("CAT connection is currently disabled. Enable CAT connection to work in online mode with your radio."); ?>";
var lang_cat_offline_no_radio = "<?= __("To connect your radio to Wavelog, visit the Wavelog Wiki for setup instructions."); ?>";
// CAT Configuration
var cat_timeout_minutes = Math.floor(<?php echo $this->optionslib->get_option('cat_timeout_interval'); ?> / 60);
</script>
@@ -1464,6 +1470,15 @@ mymap.on('mousemove', onQsoMapMove);
<?php } ?>
<!--- Bandmap CAT Integration --->
<?php if ($this->uri->segment(1) == "bandmap" && $this->uri->segment(2) == "list") { ?>
<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/cat.js?v=<?php echo time(); ?>"></script>
<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/leaflet/leaflet.geodesic.js?v=<?php echo time(); ?>"></script>
<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/leaflet.polylineDecorator.js?v=<?php echo time(); ?>"></script>
<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/leaflet/L.Terminator.js?v=<?php echo time(); ?>"></script>
<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/sections/bandmap_list.js?v=<?php echo time(); ?>"></script>
<?php } ?>
<?php if ($this->uri->segment(1) == "logbook" && $this->uri->segment(2) == "view") { ?>
<script>
@@ -3343,6 +3358,6 @@ if (isset($scripts) && is_array($scripts)){
}
?>
<!-- Toast Notification - used by showToast() from common.js -->
<div id="toast-container" class="position-fixed top-0 end-0 p-3" style="z-index: 1100;"></div>
<div id="toast-container" class="position-fixed top-0 end-0 p-3" style="z-index: 10100;"></div>
</body>
</html>

4
application/views/interface_assets/header.php
View File

@@ -282,14 +282,14 @@
<li class="nav-item dropdown"> <!-- TOOLS -->
<a class="nav-link dropdown-toggle" data-bs-toggle="dropdown" href="#"><?= __("Tools"); ?></a>
<ul class="dropdown-menu header-dropdown">
<li><a class="dropdown-item" href="<?php echo site_url('bandmap/list'); ?>" title="DX Cluster"><i class="fa fa-tower-broadcast"></i> <?= __("DX Cluster"); ?></a></li>
<div class="dropdown-divider"></div>
<li><a class="dropdown-item" href="<?php echo site_url('dxcalendar'); ?>" title="DX Calendar"><i class="fas fa-calendar"></i> <?= __("DX Calendar"); ?></a></li>
<div class="dropdown-divider"></div>
<li><a class="dropdown-item" href="<?php echo site_url('contestcalendar'); ?>" title="Contest Calendar"><i class="fas fa-calendar"></i> <?= __("Contest Calendar"); ?></a></li>
<div class="dropdown-divider"></div>
<li><a class="dropdown-item" href="<?php echo site_url('hamsat'); ?>" title="Hams.at"><i class="fas fa-list"></i> Hams.at</a></li>
<div class="dropdown-divider"></div>
<li><a class="dropdown-item" href="<?php echo site_url('bandmap/list'); ?>" title="Bandmap"><i class="fa fa-id-card"></i> <?= __("Bandmap"); ?></a></li>
<div class="dropdown-divider"></div>
<li><a class="dropdown-item" href="<?php echo site_url('sattimers'); ?>" title="SAT Timers"><i class="fas fa-satellite"></i> <?= __("SAT Timers"); ?></a></li>
<div class="dropdown-divider"></div>
<li><a class="dropdown-item" href="<?php echo site_url('satellite/flightpath'); ?>" title="Show Satellite Flight Path"><i class="fas fa-satellite"></i> <?= __("Satellite Flightpath"); ?></a></li>