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 add-date-format-dMy

Browse Source
This commit is contained in:
kc9uhi
2026-01-20 05:52:46 -07:00
committed by GitHub
parent 4b0f7ad776 41ea8b0399
commit 95a70dafe5
46 changed files with 15657 additions and 14383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
application/views/logbookadvanced/checkresult.php
View File

@@ -165,6 +165,7 @@ function check_incorrect_gridsquares($result, $custom_date_format) { ?>
<th class="select-filter" scope="col"><?= __("DXCC"); ?></th>
<th><?= __("Gridsquare"); ?></th>
<th><?= __("DXCC Gridsquare"); ?></th>
<th><?= __("Map"); ?></th>
</tr>
</thead>
<tbody>
@@ -193,6 +194,7 @@ function check_incorrect_gridsquares($result, $custom_date_format) { ?>
}
?>
</td>
<td><a href="javascript:showMapForIncorrectGrid('<?php echo $qso->col_gridsquare; ?>','<?php echo $qso->col_dxcc; ?>','<?php echo htmlspecialchars(ucwords(strtolower($qso->col_country), "- (/"), ENT_QUOTES, 'UTF-8'); ?>')"><i class="fas fa-map-marker-alt"></i> <?php echo __('View on map'); ?></a></td>
</tr>
<?php endforeach; ?>
</tbody>
@@ -207,6 +209,7 @@ function check_incorrect_gridsquares($result, $custom_date_format) { ?>
<th></th>
<th></th>
<th></th>
<th></th>
</tr>
</tfoot>
</table>

3
application/views/logbookadvanced/index.php
View File

@@ -77,7 +77,8 @@
let lang_gen_advanced_logbook_show_more = '<?= __("Show more"); ?>';
let lang_gen_advanced_logbook_show_less = '<?= __("Show less"); ?>';
let lang_gen_advanced_logbook_confirmedLabel = '<?= __("Gridsquares for"); ?>';
let lang_gen_advanced_logbook_workedLabel = '<?= __("Non DXCC matching gridsquare"); ?>';
let homegrid ='<?php echo strtoupper($homegrid[0]); ?>';
<?php

7
application/views/qso/index.php
View File

@@ -39,6 +39,9 @@ switch ($date_format) {
var lang_qso_wait_before_saving = "<?= __("Please wait before saving another QSO"); ?>";
var latlng=[<?php echo $lat.','.$lng;?>];
var user_date_format = "<?php echo $date_format; ?>"; // Pass the user's date format to JavaScript
var lang_qso_sat_lotw_support_not_found = "<?= __("Satellite not found"); ?>";
var lang_qso_sat_lotw_supported = "<?= __("Supported by LoTW"); ?>";
var lang_qso_sat_lotw_not_supported = "<?= __("Not supported by LoTW"); ?>";
</script>
<!--- DX Waterfall --->
@@ -669,7 +672,9 @@ if (typeof window.DX_WATERFALL_FIELD_MAP === 'undefined') {
<label for="sat_name"><?= __("Satellite Name"); ?></label>
<input list="satellite_names" id="sat_name" type="text" name="sat_name" class="form-control" value="<?php echo $this->session->userdata('sat_name'); ?>">
<div style="min-height: 24px;">
<small id="lotw_support" class="form-text text-muted" style="min-height: 20px;">&nbsp;</small>
</div>
<datalist id="satellite_names" class="satellite_names_list"></datalist>
</div>

2
application/views/satellite/tleinfo.php
View File

@@ -2,7 +2,7 @@
<div class="tleinfo">
<?php
if ($tleinfo) {
if ($tleinfo->tle) {
echo sprintf(__("TLE information for %s (last updated: %s)"), $satinfo[0]->name, date($custom_date_format . " H:i", strtotime($tleinfo->updated)));
echo '<br /><br /><pre>' . $tleinfo->tle . '</pre>';
echo '<button class="btn btn-sm btn-danger deletetlebutton" onclick="deleteTle(' . $satinfo[0]->id . ');">'.__("Delete TLE"). '</button>';