mirror of
https://github.com/wavelog/wavelog.git
synced 2026-03-22 10:24:14 +00:00
Merge branch 'dev' into cron_expressions
This commit is contained in:
HB9HIL
@@ -613,6 +613,7 @@ class User extends CI_Controller {
|
||||
'qsoconfirm'=>array('0', 'fas fa-broadcast-tower', 'fas fa-user', 'fas fa-dot-circle', 'fas fa-check-circle' ));
|
||||
|
||||
$data['user_locations_quickswitch'] = ($this->user_options_model->get_options('header_menu', array('option_name'=>'locations_quickswitch'))->row()->option_value ?? 'false');
|
||||
$data['user_utc_headermenu'] = ($this->user_options_model->get_options('header_menu', array('option_name'=>'utc_headermenu'))->row()->option_value ?? 'false');
|
||||
|
||||
$this->load->view('interface_assets/header', $data);
|
||||
$this->load->view('user/edit', $data);
|
||||
@@ -661,6 +662,7 @@ class User extends CI_Controller {
|
||||
$this->user_options_model->del_option('map_custom','gridsquare');
|
||||
}
|
||||
$this->user_options_model->set_option('header_menu', 'locations_quickswitch', array('boolean'=>xss_clean($this->input->post('user_locations_quickswitch', true))));
|
||||
$this->user_options_model->set_option('header_menu', 'utc_headermenu', array('boolean'=>xss_clean($this->input->post('user_utc_headermenu', true))));
|
||||
$this->session->set_flashdata('success', lang('account_user').' '.$this->input->post('user_name', true).' '.lang('account_word_edited'));
|
||||
redirect('user/edit/'.$this->uri->segment(3));
|
||||
} else {
|
||||
@@ -703,6 +705,7 @@ class User extends CI_Controller {
|
||||
$data['user_quicklog'] = $this->input->post('user_quicklog');
|
||||
$data['user_quicklog_enter'] = $this->input->post('user_quicklog_enter');
|
||||
$data['user_locations_quickswitch'] = $this->input->post('user_locations_quickswitch', true);
|
||||
$data['user_utc_headermenu'] = $this->input->post('user_utc_headermenu', true);
|
||||
$data['language'] = $this->input->post('language');
|
||||
$data['user_winkey'] = $this->input->post('user_winkey');
|
||||
$data['user_hamsat_key'] = $this->input->post('user_hamsat_key');
|
||||
|
||||
@@ -14,6 +14,7 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos
|
||||
|
||||
$lang['gridsquares_grid_squares'] = 'grid square';
|
||||
$lang['gridsquares_total_count'] = 'Total count';
|
||||
$lang['gridsquares_orbit'] = "Orbit";
|
||||
|
||||
$lang['gridsquares_minimum_count'] = "Minimum Count";
|
||||
$lang['gridsquares_show_qsos'] = "Show QSO's";
|
||||
|
||||
@@ -14,6 +14,7 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos
|
||||
|
||||
$lang['gridsquares_grid_squares'] = '网格';
|
||||
$lang['gridsquares_total_count'] = '总数';
|
||||
$lang['gridsquares_orbit'] = "Orbit";
|
||||
|
||||
$lang['gridsquares_minimum_count'] = "最低数量";
|
||||
$lang['gridsquares_show_qsos'] = "显示 QSO";
|
||||
|
||||
@@ -14,6 +14,7 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos
|
||||
|
||||
$lang['gridsquares_grid_squares'] = 'lokátor';
|
||||
$lang['gridsquares_total_count'] = 'Celkový počet';
|
||||
$lang['gridsquares_orbit'] = "Orbit";
|
||||
|
||||
$lang['gridsquares_minimum_count'] = "Minimum Count";
|
||||
$lang['gridsquares_show_qsos'] = "Show QSO's";
|
||||
|
||||
@@ -14,6 +14,7 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos
|
||||
|
||||
$lang['gridsquares_grid_squares'] = 'grid square';
|
||||
$lang['gridsquares_total_count'] = 'Total count';
|
||||
$lang['gridsquares_orbit'] = "Orbit";
|
||||
|
||||
$lang['gridsquares_minimum_count'] = "Minimum Count";
|
||||
$lang['gridsquares_show_qsos'] = "Show QSO's";
|
||||
|
||||
@@ -14,13 +14,13 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos
|
||||
|
||||
$lang['gridsquares_grid_squares'] = 'grid square';
|
||||
$lang['gridsquares_total_count'] = 'Total count';
|
||||
$lang['gridsquares_orbit'] = "Orbit";
|
||||
|
||||
$lang['gridsquares_minimum_count'] = "Minimum Count";
|
||||
$lang['gridsquares_show_qsos'] = "Show QSO's";
|
||||
$lang['gridsquares_show_map'] = "Show Map";
|
||||
$lang['gridsquares_band'] = 'Band';
|
||||
$lang['gridsquares_mode'] = 'Mode';
|
||||
$lang['gridsquares_orbit'] = 'Orbit';
|
||||
$lang['gridsquares_sat'] = 'Satellite';
|
||||
$lang['gridsquares_confirmation'] = 'Confirmation';
|
||||
|
||||
|
||||
@@ -14,6 +14,7 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos
|
||||
|
||||
$lang['gridsquares_grid_squares'] = 'grid square';
|
||||
$lang['gridsquares_total_count'] = 'Total count';
|
||||
$lang['gridsquares_orbit'] = "Orbit";
|
||||
|
||||
$lang['gridsquares_minimum_count'] = "Minimum Count";
|
||||
$lang['gridsquares_show_qsos'] = "Show QSO's";
|
||||
|
||||
@@ -14,6 +14,7 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos
|
||||
|
||||
$lang['gridsquares_grid_squares'] = "Grilles des Locators";
|
||||
$lang['gridsquares_total_count'] = "Total";
|
||||
$lang['gridsquares_orbit'] = "Orbit";
|
||||
|
||||
$lang['gridsquares_minimum_count'] = "Nbre d'activation minimum";
|
||||
$lang['gridsquares_show_qsos'] = "Afficher les QSO";
|
||||
@@ -34,4 +35,3 @@ $lang['gridsquares_gridsquares_paper'] = "Locator confirmé par Carte QSL";
|
||||
$lang['gridsquares_gridsquares_not_confirmed'] = "Locator non confirmés";
|
||||
$lang['gridsquares_gridsquares_total_worked'] = "Total des Locator réalisés";
|
||||
$lang['gridsquares_gridsquares_total_activated'] = "Total des Locator activatés";
|
||||
|
||||
|
||||
@@ -14,6 +14,7 @@ $lang['gridsquares_activated_but_not_confirmed_is_red'] = 'Aktiviert aber nicht
|
||||
$lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos'] = 'Diese Karte beinhaltet keine Satelliten-, Internet- oder Relais-QSOs';
|
||||
|
||||
$lang['gridsquares_grid_squares'] = 'Planquadrate';
|
||||
$lang['gridsquares_orbit'] = "Orbit";
|
||||
$lang['gridsquares_total_count'] = 'Summe';
|
||||
$lang['gridsquares_minimum_count'] = "Minimale Anzahl";
|
||||
$lang['gridsquares_show_qsos'] = "Zeige QSO's";
|
||||
|
||||
@@ -14,6 +14,7 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos
|
||||
|
||||
$lang['gridsquares_grid_squares'] = 'grid square';
|
||||
$lang['gridsquares_total_count'] = 'Total count';
|
||||
$lang['gridsquares_orbit'] = "Orbit";
|
||||
|
||||
$lang['gridsquares_minimum_count'] = "Minimum Count";
|
||||
$lang['gridsquares_show_qsos'] = "Show QSO's";
|
||||
|
||||
@@ -14,6 +14,7 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos
|
||||
|
||||
$lang['gridsquares_grid_squares'] = 'grid square';
|
||||
$lang['gridsquares_total_count'] = 'Total count';
|
||||
$lang['gridsquares_orbit'] = "Orbit";
|
||||
|
||||
$lang['gridsquares_minimum_count'] = "Minimum Count";
|
||||
$lang['gridsquares_show_qsos'] = "Show QSO's";
|
||||
|
||||
@@ -14,6 +14,7 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos
|
||||
|
||||
$lang['gridsquares_grid_squares'] = 'grid square';
|
||||
$lang['gridsquares_total_count'] = 'Total count';
|
||||
$lang['gridsquares_orbit'] = "Orbit";
|
||||
|
||||
$lang['gridsquares_minimum_count'] = "Minimum Count";
|
||||
$lang['gridsquares_show_qsos'] = "Show QSO's";
|
||||
|
||||
@@ -14,6 +14,7 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos
|
||||
|
||||
$lang['gridsquares_grid_squares'] = 'квадрат(/-а/-ов)';
|
||||
$lang['gridsquares_total_count'] = 'Всего';
|
||||
$lang['gridsquares_orbit'] = "Orbit";
|
||||
|
||||
$lang['gridsquares_minimum_count'] = "Минимальное количество";
|
||||
$lang['gridsquares_show_qsos'] = "Показать QSO";
|
||||
|
||||
@@ -14,6 +14,7 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos
|
||||
|
||||
$lang['gridsquares_grid_squares'] = 'grid squares';
|
||||
$lang['gridsquares_total_count'] = 'Cuenta total';
|
||||
$lang['gridsquares_orbit'] = "Orbit";
|
||||
|
||||
$lang['gridsquares_minimum_count'] = "Cuenta Mínima";
|
||||
$lang['gridsquares_show_qsos'] = "Ver QSOs";
|
||||
|
||||
@@ -14,6 +14,7 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos
|
||||
|
||||
$lang['gridsquares_grid_squares'] = 'grid square';
|
||||
$lang['gridsquares_total_count'] = 'Totalt antal';
|
||||
$lang['gridsquares_orbit'] = "Orbit";
|
||||
|
||||
$lang['gridsquares_minimum_count'] = "Minimum Count";
|
||||
$lang['gridsquares_show_qsos'] = "Show QSO's";
|
||||
|
||||
@@ -14,6 +14,7 @@ $lang['gridsquares_this_map_does_not_include_satellite_internet_or_repeater_qsos
|
||||
|
||||
$lang['gridsquares_grid_squares'] = 'grid square';
|
||||
$lang['gridsquares_total_count'] = 'Total count';
|
||||
$lang['gridsquares_orbit'] = "Orbit";
|
||||
|
||||
$lang['gridsquares_minimum_count'] = "Minimum Count";
|
||||
$lang['gridsquares_show_qsos'] = "Show QSO's";
|
||||
|
||||
@@ -467,7 +467,16 @@
|
||||
<li><a class="dropdown-item" href="<?php echo site_url('stationsetup'); ?>" title="Manage station locations"><?php echo lang('menu_station_setup'); ?>...</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
<?php }
|
||||
<?php } ?>
|
||||
<?php
|
||||
$utc_headermenu = ($this->user_options_model->get_options('header_menu', array('option_name' => 'utc_headermenu'))->row()->option_value ?? 'false');
|
||||
if ($utc_headermenu == 'true') {
|
||||
?>
|
||||
<li class="nav-link disabled">
|
||||
<a id="utc_header" style="width: 70px; display: inline-block;"></a>
|
||||
</li>
|
||||
|
||||
<?php }
|
||||
|
||||
// Can add extra menu items by defining them in options. The format is json.
|
||||
// Useful to add extra things in Wavelog without the need for modifying files. If you add extras, these files will not be overwritten when updating.
|
||||
|
||||
@@ -457,6 +457,15 @@
|
||||
</select>
|
||||
<small id="SelectDateFormatHelp" class="form-text text-muted">Show the Station Locations Quickswitch in the main menu</small>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<label for="utc_headermenu">UTC Time in Menu</label>
|
||||
<select class="form-select" id="utc_headermenu" name="user_utc_headermenu">
|
||||
<option value="false" <?php if ($user_utc_headermenu == 'false') { echo " selected =\"selected\""; } ?>>Disabled</option>
|
||||
<option value="true" <?php if ($user_utc_headermenu == 'true') { echo " selected =\"selected\""; } ?>>Enabled</option>
|
||||
</select>
|
||||
<small id="SelectDateFormatHelp" class="form-text text-muted">Show the current UTC Time in the menu</small>
|
||||
</div>
|
||||
<?php } ?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -910,6 +910,24 @@ function set_active_loc_quickswitcher(new_active) {
|
||||
});
|
||||
}
|
||||
|
||||
$(document).ready(function() {
|
||||
if ($('#utc_header').length > 0) {
|
||||
function getCurrentUTCTime() {
|
||||
var now = new Date();
|
||||
var hours = now.getUTCHours().toString().padStart(2, '0');
|
||||
var minutes = now.getUTCMinutes().toString().padStart(2, '0');
|
||||
var seconds = now.getUTCSeconds().toString().padStart(2, '0');
|
||||
return hours + ':' + minutes + ':' + seconds;
|
||||
}
|
||||
|
||||
function updateUTCTime() {
|
||||
$('#utc_header').text(getCurrentUTCTime() + 'z');
|
||||
}
|
||||
|
||||
setInterval(updateUTCTime, 1000);
|
||||
updateUTCTime();
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
console.log("Ready to unleash your coding prowess and join the fun?\n\n" +
|
||||
|
||||
Reference in New Issue
Block a user