Merge remote-tracking branch 'upstream/dev' into ans-fix-qso-time-end
这个提交包含在：
abarrau
当前提交
638c2c649a
共有 30 个文件被更改，包括 777 次插入 和 42 次删除
|
|
@ -127,7 +127,7 @@ $autoload['language'] = array(
|
|||
|
|
||||
*/
|
||||
|
||||
$autoload['model'] = array();
|
||||
$autoload['model'] = array('user_options_model');
|
||||
|
||||
|
||||
/* End of file autoload.php */
|
||||
|
|
|
|||
|
|
@ -390,4 +390,59 @@ class Options extends CI_Controller {
|
|||
redirect('/options/email');
|
||||
}
|
||||
|
||||
// function used to display the /version_dialog url
|
||||
function version_dialog() {
|
||||
|
||||
$data['page_title'] = $this->lang->line('options_cloudlog_options');
|
||||
$data['sub_heading'] = $this->lang->line('options_version_dialog_settings');
|
||||
|
||||
$this->load->view('interface_assets/header', $data);
|
||||
$this->load->view('options/version_dialog');
|
||||
$this->load->view('interface_assets/footer');
|
||||
}
|
||||
|
||||
function version_dialog_save() {
|
||||
|
||||
// Get Language Options
|
||||
|
||||
$data['page_title'] = $this->lang->line('options_cloudlog_options');
|
||||
$data['sub_heading'] = $this->lang->line('options_version_dialog_settings');
|
||||
|
||||
$this->load->helper(array('form', 'url'));
|
||||
|
||||
$version_dialog_header_update = $this->optionslib->update('version_dialog_header', $this->input->post('version_dialog_header'), 'yes');
|
||||
if($version_dialog_header_update == TRUE) {
|
||||
$this->session->set_flashdata('success0', $this->lang->line('options_version_dialog_header_changed_to')." "."'".$this->input->post('version_dialog_header')."'");
|
||||
}
|
||||
$version_dialog_mode_update = $this->optionslib->update('version_dialog', $this->input->post('version_dialog_mode'), 'yes');
|
||||
if($version_dialog_mode_update == TRUE) {
|
||||
$this->session->set_flashdata('success1', $this->lang->line('options_version_dialog_mode_changed_to')." "."'".$this->input->post('version_dialog_mode')."'");
|
||||
}
|
||||
if ($this->input->post('version_dialog_mode') == "both" || $this->input->post('version_dialog_mode') == "custom_text" ) {
|
||||
$version_dialog_custom_text_update = $this->optionslib->update('version_dialog_text', $this->input->post('version_dialog_custom_text'), 'yes');
|
||||
if($version_dialog_custom_text_update == TRUE) {
|
||||
$this->session->set_flashdata('success2', $this->lang->line('options_version_dialog_custom_text_saved'));
|
||||
}
|
||||
}
|
||||
|
||||
redirect('/options/version_dialog');
|
||||
|
||||
}
|
||||
|
||||
function version_dialog_show_to_all() {
|
||||
$update_vd_confirmation_to_false = $this->user_options_model->set_option_at_all_users('version_dialog', 'confirmed', array('boolean' => 'false'));
|
||||
if($update_vd_confirmation_to_false == TRUE) {
|
||||
$this->session->set_flashdata('success_trigger', $this->lang->line('options_version_dialog_success_show_all'));
|
||||
}
|
||||
redirect('/options/version_dialog');
|
||||
}
|
||||
|
||||
function version_dialog_show_to_none() {
|
||||
$update_vd_confirmation_to_true = $this->user_options_model->set_option_at_all_users('version_dialog', 'confirmed', array('boolean' => 'true'));
|
||||
if($update_vd_confirmation_to_true == TRUE) {
|
||||
$this->session->set_flashdata('success_trigger', $this->lang->line('options_version_dialog_success_hide_all'));
|
||||
}
|
||||
redirect('/options/version_dialog');
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -57,6 +57,10 @@ class User_Options extends CI_Controller {
|
|||
}
|
||||
header('Content-Type: application/json');
|
||||
echo json_encode($jsonout);
|
||||
}
|
||||
|
||||
public function dismissVersionDialog() {
|
||||
$this->user_options_model->set_option('version_dialog', 'confirmed', array('boolean' => 'true'));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,9 @@
|
|||
<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
|
||||
|
||||
class Version_Dialog extends CI_Controller {
|
||||
|
||||
public function displayVersionDialog() {
|
||||
$this->load->view('version_dialog/index');
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
|
@ -73,6 +73,31 @@ $lang['options_dxcluster_maxage_changed_to']='Maximum age of spots changed to ';
|
|||
$lang['options_dxcluster_decont_changed_to']='de continent changed to ';
|
||||
$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown';
|
||||
|
||||
$lang['options_version_dialog'] = "Version Info";
|
||||
$lang['options_version_dialog_close'] = "Close";
|
||||
$lang['options_version_dialog_dismiss'] = "Don't show again";
|
||||
$lang['options_version_dialog_settings'] = "Version Info Settings";
|
||||
$lang['options_version_dialog_header'] = "Version Info Header";
|
||||
$lang['options_version_dialog_header_hint'] = "You can change the header of the version info dialog.";
|
||||
$lang['options_version_dialog_header_changed_to'] = "Version Info Header changed to";
|
||||
$lang['options_version_dialog_mode'] = "Version Info Mode";
|
||||
$lang['options_version_dialog_mode_release_notes'] = "Only Release Notes";
|
||||
$lang['options_version_dialog_mode_custom_text'] = "Only Custom Text";
|
||||
$lang['options_version_dialog_mode_both'] = "Release Notes and Custom Text";
|
||||
$lang['options_version_dialog_mode_disabled'] = "Disabled";
|
||||
$lang['options_version_dialog_mode_hint'] = "The Version Info is shown to every user. The user has the option to dismiss the dialog after he read it. Select if you want to show only release notes (fetched from github), only custom text or both.";
|
||||
$lang['options_version_dialog_custom_text'] = "Version Info Custom Text";
|
||||
$lang['options_version_dialog_custom_text_hint'] = "This is the custom text which is shown in the dialog.";
|
||||
$lang['options_version_dialog_mode_changed_to'] = "Version Info Mode changed to";
|
||||
$lang['options_version_dialog_custom_text_saved'] = "Version Info Custom Text saved!";
|
||||
$lang['options_version_dialog_success_show_all'] = "Version Info will be shown to all users again";
|
||||
$lang['options_version_dialog_success_hide_all'] = "Version Info will not be shown to any user";
|
||||
$lang['options_version_dialog_show_hide'] = "Show/Hide Version Info Dialog for all Users";
|
||||
$lang['options_version_dialog_show_all'] = "Show for all Users";
|
||||
$lang['options_version_dialog_hide_all'] = "Hide for all Users";
|
||||
$lang['options_version_dialog_show_all_hint'] = "This will show the version dialog automatically to all users on their next page reload.";
|
||||
$lang['options_version_dialog_hide_all_hint'] = "This will deactivate the automatic popup of the version dialog for all users.";
|
||||
|
||||
$lang['options_save'] = 'Save';
|
||||
|
||||
// Bands
|
||||
|
|
|
|||
|
|
@ -73,6 +73,31 @@ $lang['options_dxcluster_maxage_changed_to']='Maximum age of spots changed to ';
|
|||
$lang['options_dxcluster_decont_changed_to']='de continent changed to ';
|
||||
$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown';
|
||||
|
||||
$lang['options_version_dialog'] = "Version Info";
|
||||
$lang['options_version_dialog_close'] = "Close";
|
||||
$lang['options_version_dialog_dismiss'] = "Don't show again";
|
||||
$lang['options_version_dialog_settings'] = "Version Info Settings";
|
||||
$lang['options_version_dialog_header'] = "Version Info Header";
|
||||
$lang['options_version_dialog_header_hint'] = "You can change the header of the version info dialog.";
|
||||
$lang['options_version_dialog_header_changed_to'] = "Version Info Header changed to";
|
||||
$lang['options_version_dialog_mode'] = "Version Info Mode";
|
||||
$lang['options_version_dialog_mode_release_notes'] = "Only Release Notes";
|
||||
$lang['options_version_dialog_mode_custom_text'] = "Only Custom Text";
|
||||
$lang['options_version_dialog_mode_both'] = "Release Notes and Custom Text";
|
||||
$lang['options_version_dialog_mode_disabled'] = "Disabled";
|
||||
$lang['options_version_dialog_mode_hint'] = "The Version Info is shown to every user. The user has the option to dismiss the dialog after he read it. Select if you want to show only release notes (fetched from github), only custom text or both.";
|
||||
$lang['options_version_dialog_custom_text'] = "Version Info Custom Text";
|
||||
$lang['options_version_dialog_custom_text_hint'] = "This is the custom text which is shown in the dialog.";
|
||||
$lang['options_version_dialog_mode_changed_to'] = "Version Info Mode changed to";
|
||||
$lang['options_version_dialog_custom_text_saved'] = "Version Info Custom Text saved!";
|
||||
$lang['options_version_dialog_success_show_all'] = "Version Info will be shown to all users again";
|
||||
$lang['options_version_dialog_success_hide_all'] = "Version Info will not be shown to any user";
|
||||
$lang['options_version_dialog_show_hide'] = "Show/Hide Version Info Dialog for all Users";
|
||||
$lang['options_version_dialog_show_all'] = "Show for all Users";
|
||||
$lang['options_version_dialog_hide_all'] = "Hide for all Users";
|
||||
$lang['options_version_dialog_show_all_hint'] = "This will show the version dialog automatically to all users on their next page reload.";
|
||||
$lang['options_version_dialog_hide_all_hint'] = "This will deactivate the automatic popup of the version dialog for all users.";
|
||||
|
||||
$lang['options_save'] = '保存';
|
||||
|
||||
// Bands
|
||||
|
|
|
|||
|
|
@ -73,6 +73,31 @@ $lang['options_dxcluster_maxage_changed_to']='Maximum age of spots changed to ';
|
|||
$lang['options_dxcluster_decont_changed_to']='de continent changed to ';
|
||||
$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown';
|
||||
|
||||
$lang['options_version_dialog'] = "Version Info";
|
||||
$lang['options_version_dialog_close'] = "Close";
|
||||
$lang['options_version_dialog_dismiss'] = "Don't show again";
|
||||
$lang['options_version_dialog_settings'] = "Version Info Settings";
|
||||
$lang['options_version_dialog_header'] = "Version Info Header";
|
||||
$lang['options_version_dialog_header_hint'] = "You can change the header of the version info dialog.";
|
||||
$lang['options_version_dialog_header_changed_to'] = "Version Info Header changed to";
|
||||
$lang['options_version_dialog_mode'] = "Version Info Mode";
|
||||
$lang['options_version_dialog_mode_release_notes'] = "Only Release Notes";
|
||||
$lang['options_version_dialog_mode_custom_text'] = "Only Custom Text";
|
||||
$lang['options_version_dialog_mode_both'] = "Release Notes and Custom Text";
|
||||
$lang['options_version_dialog_mode_disabled'] = "Disabled";
|
||||
$lang['options_version_dialog_mode_hint'] = "The Version Info is shown to every user. The user has the option to dismiss the dialog after he read it. Select if you want to show only release notes (fetched from github), only custom text or both.";
|
||||
$lang['options_version_dialog_custom_text'] = "Version Info Custom Text";
|
||||
$lang['options_version_dialog_custom_text_hint'] = "This is the custom text which is shown in the dialog.";
|
||||
$lang['options_version_dialog_mode_changed_to'] = "Version Info Mode changed to";
|
||||
$lang['options_version_dialog_custom_text_saved'] = "Version Info Custom Text saved!";
|
||||
$lang['options_version_dialog_success_show_all'] = "Version Info will be shown to all users again";
|
||||
$lang['options_version_dialog_success_hide_all'] = "Version Info will not be shown to any user";
|
||||
$lang['options_version_dialog_show_hide'] = "Show/Hide Version Info Dialog for all Users";
|
||||
$lang['options_version_dialog_show_all'] = "Show for all Users";
|
||||
$lang['options_version_dialog_hide_all'] = "Hide for all Users";
|
||||
$lang['options_version_dialog_show_all_hint'] = "This will show the version dialog automatically to all users on their next page reload.";
|
||||
$lang['options_version_dialog_hide_all_hint'] = "This will deactivate the automatic popup of the version dialog for all users.";
|
||||
|
||||
$lang['options_save'] = 'Uložit';
|
||||
|
||||
// Bands
|
||||
|
|
|
|||
|
|
@ -73,6 +73,31 @@ $lang['options_dxcluster_maxage_changed_to']='Maximum age of spots changed to ';
|
|||
$lang['options_dxcluster_decont_changed_to']='de continent changed to ';
|
||||
$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown';
|
||||
|
||||
$lang['options_version_dialog'] = "Version Info";
|
||||
$lang['options_version_dialog_close'] = "Close";
|
||||
$lang['options_version_dialog_dismiss'] = "Don't show again";
|
||||
$lang['options_version_dialog_settings'] = "Version Info Settings";
|
||||
$lang['options_version_dialog_header'] = "Version Info Header";
|
||||
$lang['options_version_dialog_header_hint'] = "You can change the header of the version info dialog.";
|
||||
$lang['options_version_dialog_header_changed_to'] = "Version Info Header changed to";
|
||||
$lang['options_version_dialog_mode'] = "Version Info Mode";
|
||||
$lang['options_version_dialog_mode_release_notes'] = "Only Release Notes";
|
||||
$lang['options_version_dialog_mode_custom_text'] = "Only Custom Text";
|
||||
$lang['options_version_dialog_mode_both'] = "Release Notes and Custom Text";
|
||||
$lang['options_version_dialog_mode_disabled'] = "Disabled";
|
||||
$lang['options_version_dialog_mode_hint'] = "The Version Info is shown to every user. The user has the option to dismiss the dialog after he read it. Select if you want to show only release notes (fetched from github), only custom text or both.";
|
||||
$lang['options_version_dialog_custom_text'] = "Version Info Custom Text";
|
||||
$lang['options_version_dialog_custom_text_hint'] = "This is the custom text which is shown in the dialog.";
|
||||
$lang['options_version_dialog_mode_changed_to'] = "Version Info Mode changed to";
|
||||
$lang['options_version_dialog_custom_text_saved'] = "Version Info Custom Text saved!";
|
||||
$lang['options_version_dialog_success_show_all'] = "Version Info will be shown to all users again";
|
||||
$lang['options_version_dialog_success_hide_all'] = "Version Info will not be shown to any user";
|
||||
$lang['options_version_dialog_show_hide'] = "Show/Hide Version Info Dialog for all Users";
|
||||
$lang['options_version_dialog_show_all'] = "Show for all Users";
|
||||
$lang['options_version_dialog_hide_all'] = "Hide for all Users";
|
||||
$lang['options_version_dialog_show_all_hint'] = "This will show the version dialog automatically to all users on their next page reload.";
|
||||
$lang['options_version_dialog_hide_all_hint'] = "This will deactivate the automatic popup of the version dialog for all users.";
|
||||
|
||||
$lang['options_save'] = 'Save';
|
||||
|
||||
// Bands
|
||||
|
|
|
|||
|
|
@ -73,6 +73,31 @@ $lang['options_dxcluster_maxage_changed_to']='Maximum age of spots changed to ';
|
|||
$lang['options_dxcluster_decont_changed_to']='de continent changed to ';
|
||||
$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown';
|
||||
|
||||
$lang['options_version_dialog'] = "Version Info";
|
||||
$lang['options_version_dialog_close'] = "Close";
|
||||
$lang['options_version_dialog_dismiss'] = "Don't show again";
|
||||
$lang['options_version_dialog_settings'] = "Version Info Settings";
|
||||
$lang['options_version_dialog_header'] = "Version Info Header";
|
||||
$lang['options_version_dialog_header_hint'] = "You can change the header of the version info dialog.";
|
||||
$lang['options_version_dialog_header_changed_to'] = "Version Info Header changed to";
|
||||
$lang['options_version_dialog_mode'] = "Version Info Mode";
|
||||
$lang['options_version_dialog_mode_release_notes'] = "Only Release Notes";
|
||||
$lang['options_version_dialog_mode_custom_text'] = "Only Custom Text";
|
||||
$lang['options_version_dialog_mode_both'] = "Release Notes and Custom Text";
|
||||
$lang['options_version_dialog_mode_disabled'] = "Disabled";
|
||||
$lang['options_version_dialog_mode_hint'] = "The Version Info is shown to every user. The user has the option to dismiss the dialog after he read it. Select if you want to show only release notes (fetched from github), only custom text or both.";
|
||||
$lang['options_version_dialog_custom_text'] = "Version Info Custom Text";
|
||||
$lang['options_version_dialog_custom_text_hint'] = "This is the custom text which is shown in the dialog.";
|
||||
$lang['options_version_dialog_mode_changed_to'] = "Version Info Mode changed to";
|
||||
$lang['options_version_dialog_custom_text_saved'] = "Version Info Custom Text saved!";
|
||||
$lang['options_version_dialog_success_show_all'] = "Version Info will be shown to all users again";
|
||||
$lang['options_version_dialog_success_hide_all'] = "Version Info will not be shown to any user";
|
||||
$lang['options_version_dialog_show_hide'] = "Show/Hide Version Info Dialog for all Users";
|
||||
$lang['options_version_dialog_show_all'] = "Show for all Users";
|
||||
$lang['options_version_dialog_hide_all'] = "Hide for all Users";
|
||||
$lang['options_version_dialog_show_all_hint'] = "This will show the version dialog automatically to all users on their next page reload.";
|
||||
$lang['options_version_dialog_hide_all_hint'] = "This will deactivate the automatic popup of the version dialog for all users.";
|
||||
|
||||
$lang['options_save'] = 'Save';
|
||||
|
||||
// Bands
|
||||
|
|
|
|||
|
|
@ -73,6 +73,31 @@ $lang['options_dxcluster_maxage_changed_to']='Maximum age of spots changed to ';
|
|||
$lang['options_dxcluster_decont_changed_to']='de continent changed to ';
|
||||
$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown';
|
||||
|
||||
$lang['options_version_dialog'] = "Version Info";
|
||||
$lang['options_version_dialog_close'] = "Close";
|
||||
$lang['options_version_dialog_dismiss'] = "Don't show again";
|
||||
$lang['options_version_dialog_settings'] = "Version Info Settings";
|
||||
$lang['options_version_dialog_header'] = "Version Info Header";
|
||||
$lang['options_version_dialog_header_hint'] = "You can change the header of the version info dialog.";
|
||||
$lang['options_version_dialog_header_changed_to'] = "Version Info Header changed to";
|
||||
$lang['options_version_dialog_mode'] = "Version Info Mode";
|
||||
$lang['options_version_dialog_mode_release_notes'] = "Only Release Notes";
|
||||
$lang['options_version_dialog_mode_custom_text'] = "Only Custom Text";
|
||||
$lang['options_version_dialog_mode_both'] = "Release Notes and Custom Text";
|
||||
$lang['options_version_dialog_mode_disabled'] = "Disabled";
|
||||
$lang['options_version_dialog_mode_hint'] = "The Version Info is shown to every user. The user has the option to dismiss the dialog after he read it. Select if you want to show only release notes (fetched from github), only custom text or both.";
|
||||
$lang['options_version_dialog_custom_text'] = "Version Info Custom Text";
|
||||
$lang['options_version_dialog_custom_text_hint'] = "This is the custom text which is shown in the dialog.";
|
||||
$lang['options_version_dialog_mode_changed_to'] = "Version Info Mode changed to";
|
||||
$lang['options_version_dialog_custom_text_saved'] = "Version Info Custom Text saved!";
|
||||
$lang['options_version_dialog_success_show_all'] = "Version Info will be shown to all users again";
|
||||
$lang['options_version_dialog_success_hide_all'] = "Version Info will not be shown to any user";
|
||||
$lang['options_version_dialog_show_hide'] = "Show/Hide Version Info Dialog for all Users";
|
||||
$lang['options_version_dialog_show_all'] = "Show for all Users";
|
||||
$lang['options_version_dialog_hide_all'] = "Hide for all Users";
|
||||
$lang['options_version_dialog_show_all_hint'] = "This will show the version dialog automatically to all users on their next page reload.";
|
||||
$lang['options_version_dialog_hide_all_hint'] = "This will deactivate the automatic popup of the version dialog for all users.";
|
||||
|
||||
$lang['options_save'] = 'Save';
|
||||
|
||||
// Bands
|
||||
|
|
|
|||
|
|
@ -73,6 +73,31 @@ $lang['options_dxcluster_maxage_changed_to']='Maximum age of spots changed to ';
|
|||
$lang['options_dxcluster_decont_changed_to']='de continent changed to ';
|
||||
$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown';
|
||||
|
||||
$lang['options_version_dialog'] = "Version Info";
|
||||
$lang['options_version_dialog_close'] = "Close";
|
||||
$lang['options_version_dialog_dismiss'] = "Don't show again";
|
||||
$lang['options_version_dialog_settings'] = "Version Info Settings";
|
||||
$lang['options_version_dialog_header'] = "Version Info Header";
|
||||
$lang['options_version_dialog_header_hint'] = "You can change the header of the version info dialog.";
|
||||
$lang['options_version_dialog_header_changed_to'] = "Version Info Header changed to";
|
||||
$lang['options_version_dialog_mode'] = "Version Info Mode";
|
||||
$lang['options_version_dialog_mode_release_notes'] = "Only Release Notes";
|
||||
$lang['options_version_dialog_mode_custom_text'] = "Only Custom Text";
|
||||
$lang['options_version_dialog_mode_both'] = "Release Notes and Custom Text";
|
||||
$lang['options_version_dialog_mode_disabled'] = "Disabled";
|
||||
$lang['options_version_dialog_mode_hint'] = "The Version Info is shown to every user. The user has the option to dismiss the dialog after he read it. Select if you want to show only release notes (fetched from github), only custom text or both.";
|
||||
$lang['options_version_dialog_custom_text'] = "Version Info Custom Text";
|
||||
$lang['options_version_dialog_custom_text_hint'] = "This is the custom text which is shown in the dialog.";
|
||||
$lang['options_version_dialog_mode_changed_to'] = "Version Info Mode changed to";
|
||||
$lang['options_version_dialog_custom_text_saved'] = "Version Info Custom Text saved!";
|
||||
$lang['options_version_dialog_success_show_all'] = "Version Info will be shown to all users again";
|
||||
$lang['options_version_dialog_success_hide_all'] = "Version Info will not be shown to any user";
|
||||
$lang['options_version_dialog_show_hide'] = "Show/Hide Version Info Dialog for all Users";
|
||||
$lang['options_version_dialog_show_all'] = "Show for all Users";
|
||||
$lang['options_version_dialog_hide_all'] = "Hide for all Users";
|
||||
$lang['options_version_dialog_show_all_hint'] = "This will show the version dialog automatically to all users on their next page reload.";
|
||||
$lang['options_version_dialog_hide_all_hint'] = "This will deactivate the automatic popup of the version dialog for all users.";
|
||||
|
||||
$lang['options_save'] = 'Save';
|
||||
|
||||
// Bands
|
||||
|
|
|
|||
|
|
@ -73,6 +73,31 @@ $lang['options_dxcluster_maxage_changed_to']='Maximales Spot-Alter geändert auf
|
|||
$lang['options_dxcluster_decont_changed_to']='Spotterkontinent geändert auf ';
|
||||
$lang['options_dxcluster_decont_hint']='Nur Spots von Spottern dieses Kontinents werden angezeigt';
|
||||
|
||||
$lang['options_version_dialog'] = "Versionsinfo";
|
||||
$lang['options_version_dialog_close'] = "Schliessen";
|
||||
$lang['options_version_dialog_dismiss'] = "Nicht mehr anzeigen";
|
||||
$lang['options_version_dialog_settings'] = "Versionsinfo Einstellungen";
|
||||
$lang['options_version_dialog_header'] = "Überschrift der Versionsinfo";
|
||||
$lang['options_version_dialog_header_hint'] = "Du kannst die Überschrift des Versionsinfo-Fensters verändern.";
|
||||
$lang['options_version_dialog_header_changed_to'] = "Überschrift der Versionsinfo geändert zu";
|
||||
$lang['options_version_dialog_mode'] = "Versionsinfo-Modus";
|
||||
$lang['options_version_dialog_mode_release_notes'] = "Nur Versionshinweise";
|
||||
$lang['options_version_dialog_mode_custom_text'] = "Nur benutzerdefinierter Text";
|
||||
$lang['options_version_dialog_mode_both'] = "Versionshinweise und benutzerdefinierter Text";
|
||||
$lang['options_version_dialog_mode_disabled'] = "Deaktiviert";
|
||||
$lang['options_version_dialog_mode_hint'] = "Die Versionsinfo wird jedem Benutzer angezeigt. Der Benutzer hat die Möglichkeit, den Dialog zu schließen, nachdem er ihn gelesen hat. Wähle aus, ob nur Versionshinweise (von GitHub abgerufen), nur benutzerdefinierter Text oder beides angezeigt werden soll.";
|
||||
$lang['options_version_dialog_custom_text'] = "Versionsinfo - Benutzerdefinierter Text";
|
||||
$lang['options_version_dialog_custom_text_hint'] = "Dies ist der benutzerdefinierte Text, der im Versionsinfo-Fenster angezeigt wird.";
|
||||
$lang['options_version_dialog_mode_changed_to'] = "Versionsinfo-Modus geändert zu";
|
||||
$lang['options_version_dialog_custom_text_saved'] = "Benutzerdefinierter Text der Versionsinfo gespeichert!";
|
||||
$lang['options_version_dialog_success_show_all'] = "Versionsinfo wird wieder allen Benutzern angezeigt";
|
||||
$lang['options_version_dialog_success_hide_all'] = "Versionsinfo wird keinem Benutzer angezeigt";
|
||||
$lang['options_version_dialog_show_hide'] = "Versionsinfo-Dialog für alle Benutzer ein-/ausblenden";
|
||||
$lang['options_version_dialog_show_all'] = "Allen Benutzern anzeigen";
|
||||
$lang['options_version_dialog_hide_all'] = "Allen Benutzern ausblenden";
|
||||
$lang['options_version_dialog_show_all_hint'] = "Dies zeigt den Versionsdialog automatisch allen Benutzern bei der nächsten Seiten-Aktualisierung an.";
|
||||
$lang['options_version_dialog_hide_all_hint'] = "Dies deaktiviert das automatische Einblenden des Versionsdialogs für alle Benutzer.";
|
||||
|
||||
$lang['options_save'] = 'Speichern';
|
||||
|
||||
// Bands
|
||||
|
|
|
|||
|
|
@ -73,6 +73,31 @@ $lang['options_dxcluster_maxage_changed_to']='Maximum age of spots changed to ';
|
|||
$lang['options_dxcluster_decont_changed_to']='de continent changed to ';
|
||||
$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown';
|
||||
|
||||
$lang['options_version_dialog'] = "Version Info";
|
||||
$lang['options_version_dialog_close'] = "Close";
|
||||
$lang['options_version_dialog_dismiss'] = "Don't show again";
|
||||
$lang['options_version_dialog_settings'] = "Version Info Settings";
|
||||
$lang['options_version_dialog_header'] = "Version Info Header";
|
||||
$lang['options_version_dialog_header_hint'] = "You can change the header of the version info dialog.";
|
||||
$lang['options_version_dialog_header_changed_to'] = "Version Info Header changed to";
|
||||
$lang['options_version_dialog_mode'] = "Version Info Mode";
|
||||
$lang['options_version_dialog_mode_release_notes'] = "Only Release Notes";
|
||||
$lang['options_version_dialog_mode_custom_text'] = "Only Custom Text";
|
||||
$lang['options_version_dialog_mode_both'] = "Release Notes and Custom Text";
|
||||
$lang['options_version_dialog_mode_disabled'] = "Disabled";
|
||||
$lang['options_version_dialog_mode_hint'] = "The Version Info is shown to every user. The user has the option to dismiss the dialog after he read it. Select if you want to show only release notes (fetched from github), only custom text or both.";
|
||||
$lang['options_version_dialog_custom_text'] = "Version Info Custom Text";
|
||||
$lang['options_version_dialog_custom_text_hint'] = "This is the custom text which is shown in the dialog.";
|
||||
$lang['options_version_dialog_mode_changed_to'] = "Version Info Mode changed to";
|
||||
$lang['options_version_dialog_custom_text_saved'] = "Version Info Custom Text saved!";
|
||||
$lang['options_version_dialog_success_show_all'] = "Version Info will be shown to all users again";
|
||||
$lang['options_version_dialog_success_hide_all'] = "Version Info will not be shown to any user";
|
||||
$lang['options_version_dialog_show_hide'] = "Show/Hide Version Info Dialog for all Users";
|
||||
$lang['options_version_dialog_show_all'] = "Show for all Users";
|
||||
$lang['options_version_dialog_hide_all'] = "Hide for all Users";
|
||||
$lang['options_version_dialog_show_all_hint'] = "This will show the version dialog automatically to all users on their next page reload.";
|
||||
$lang['options_version_dialog_hide_all_hint'] = "This will deactivate the automatic popup of the version dialog for all users.";
|
||||
|
||||
$lang['options_save'] = 'Save';
|
||||
|
||||
// Bands
|
||||
|
|
|
|||
|
|
@ -73,6 +73,31 @@ $lang['options_dxcluster_maxage_changed_to']='Maximum age of spots changed to ';
|
|||
$lang['options_dxcluster_decont_changed_to']='de continent changed to ';
|
||||
$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown';
|
||||
|
||||
$lang['options_version_dialog'] = "Version Info";
|
||||
$lang['options_version_dialog_close'] = "Close";
|
||||
$lang['options_version_dialog_dismiss'] = "Don't show again";
|
||||
$lang['options_version_dialog_settings'] = "Version Info Settings";
|
||||
$lang['options_version_dialog_header'] = "Version Info Header";
|
||||
$lang['options_version_dialog_header_hint'] = "You can change the header of the version info dialog.";
|
||||
$lang['options_version_dialog_header_changed_to'] = "Version Info Header changed to";
|
||||
$lang['options_version_dialog_mode'] = "Version Info Mode";
|
||||
$lang['options_version_dialog_mode_release_notes'] = "Only Release Notes";
|
||||
$lang['options_version_dialog_mode_custom_text'] = "Only Custom Text";
|
||||
$lang['options_version_dialog_mode_both'] = "Release Notes and Custom Text";
|
||||
$lang['options_version_dialog_mode_disabled'] = "Disabled";
|
||||
$lang['options_version_dialog_mode_hint'] = "The Version Info is shown to every user. The user has the option to dismiss the dialog after he read it. Select if you want to show only release notes (fetched from github), only custom text or both.";
|
||||
$lang['options_version_dialog_custom_text'] = "Version Info Custom Text";
|
||||
$lang['options_version_dialog_custom_text_hint'] = "This is the custom text which is shown in the dialog.";
|
||||
$lang['options_version_dialog_mode_changed_to'] = "Version Info Mode changed to";
|
||||
$lang['options_version_dialog_custom_text_saved'] = "Version Info Custom Text saved!";
|
||||
$lang['options_version_dialog_success_show_all'] = "Version Info will be shown to all users again";
|
||||
$lang['options_version_dialog_success_hide_all'] = "Version Info will not be shown to any user";
|
||||
$lang['options_version_dialog_show_hide'] = "Show/Hide Version Info Dialog for all Users";
|
||||
$lang['options_version_dialog_show_all'] = "Show for all Users";
|
||||
$lang['options_version_dialog_hide_all'] = "Hide for all Users";
|
||||
$lang['options_version_dialog_show_all_hint'] = "This will show the version dialog automatically to all users on their next page reload.";
|
||||
$lang['options_version_dialog_hide_all_hint'] = "This will deactivate the automatic popup of the version dialog for all users.";
|
||||
|
||||
$lang['options_save'] = 'Save';
|
||||
|
||||
// Bands
|
||||
|
|
|
|||
|
|
@ -73,6 +73,31 @@ $lang['options_dxcluster_maxage_changed_to']='Maximum age of spots changed to ';
|
|||
$lang['options_dxcluster_decont_changed_to']='de continent changed to ';
|
||||
$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown';
|
||||
|
||||
$lang['options_version_dialog'] = "Version Info";
|
||||
$lang['options_version_dialog_close'] = "Close";
|
||||
$lang['options_version_dialog_dismiss'] = "Don't show again";
|
||||
$lang['options_version_dialog_settings'] = "Version Info Settings";
|
||||
$lang['options_version_dialog_header'] = "Version Info Header";
|
||||
$lang['options_version_dialog_header_hint'] = "You can change the header of the version info dialog.";
|
||||
$lang['options_version_dialog_header_changed_to'] = "Version Info Header changed to";
|
||||
$lang['options_version_dialog_mode'] = "Version Info Mode";
|
||||
$lang['options_version_dialog_mode_release_notes'] = "Only Release Notes";
|
||||
$lang['options_version_dialog_mode_custom_text'] = "Only Custom Text";
|
||||
$lang['options_version_dialog_mode_both'] = "Release Notes and Custom Text";
|
||||
$lang['options_version_dialog_mode_disabled'] = "Disabled";
|
||||
$lang['options_version_dialog_mode_hint'] = "The Version Info is shown to every user. The user has the option to dismiss the dialog after he read it. Select if you want to show only release notes (fetched from github), only custom text or both.";
|
||||
$lang['options_version_dialog_custom_text'] = "Version Info Custom Text";
|
||||
$lang['options_version_dialog_custom_text_hint'] = "This is the custom text which is shown in the dialog.";
|
||||
$lang['options_version_dialog_mode_changed_to'] = "Version Info Mode changed to";
|
||||
$lang['options_version_dialog_custom_text_saved'] = "Version Info Custom Text saved!";
|
||||
$lang['options_version_dialog_success_show_all'] = "Version Info will be shown to all users again";
|
||||
$lang['options_version_dialog_success_hide_all'] = "Version Info will not be shown to any user";
|
||||
$lang['options_version_dialog_show_hide'] = "Show/Hide Version Info Dialog for all Users";
|
||||
$lang['options_version_dialog_show_all'] = "Show for all Users";
|
||||
$lang['options_version_dialog_hide_all'] = "Hide for all Users";
|
||||
$lang['options_version_dialog_show_all_hint'] = "This will show the version dialog automatically to all users on their next page reload.";
|
||||
$lang['options_version_dialog_hide_all_hint'] = "This will deactivate the automatic popup of the version dialog for all users.";
|
||||
|
||||
$lang['options_save'] = 'Save';
|
||||
|
||||
// Bands
|
||||
|
|
|
|||
|
|
@ -73,6 +73,31 @@ $lang['options_dxcluster_maxage_changed_to']='Максимальный возр
|
|||
$lang['options_dxcluster_decont_changed_to']='континент изменён на ';
|
||||
$lang['options_dxcluster_decont_hint']='Бубт показаны споты только от споттеров с указанного континента';
|
||||
|
||||
$lang['options_version_dialog'] = "Version Info";
|
||||
$lang['options_version_dialog_close'] = "Close";
|
||||
$lang['options_version_dialog_dismiss'] = "Don't show again";
|
||||
$lang['options_version_dialog_settings'] = "Version Info Settings";
|
||||
$lang['options_version_dialog_header'] = "Version Info Header";
|
||||
$lang['options_version_dialog_header_hint'] = "You can change the header of the version info dialog.";
|
||||
$lang['options_version_dialog_header_changed_to'] = "Version Info Header changed to";
|
||||
$lang['options_version_dialog_mode'] = "Version Info Mode";
|
||||
$lang['options_version_dialog_mode_release_notes'] = "Only Release Notes";
|
||||
$lang['options_version_dialog_mode_custom_text'] = "Only Custom Text";
|
||||
$lang['options_version_dialog_mode_both'] = "Release Notes and Custom Text";
|
||||
$lang['options_version_dialog_mode_disabled'] = "Disabled";
|
||||
$lang['options_version_dialog_mode_hint'] = "The Version Info is shown to every user. The user has the option to dismiss the dialog after he read it. Select if you want to show only release notes (fetched from github), only custom text or both.";
|
||||
$lang['options_version_dialog_custom_text'] = "Version Info Custom Text";
|
||||
$lang['options_version_dialog_custom_text_hint'] = "This is the custom text which is shown in the dialog.";
|
||||
$lang['options_version_dialog_mode_changed_to'] = "Version Info Mode changed to";
|
||||
$lang['options_version_dialog_custom_text_saved'] = "Version Info Custom Text saved!";
|
||||
$lang['options_version_dialog_success_show_all'] = "Version Info will be shown to all users again";
|
||||
$lang['options_version_dialog_success_hide_all'] = "Version Info will not be shown to any user";
|
||||
$lang['options_version_dialog_show_hide'] = "Show/Hide Version Info Dialog for all Users";
|
||||
$lang['options_version_dialog_show_all'] = "Show for all Users";
|
||||
$lang['options_version_dialog_hide_all'] = "Hide for all Users";
|
||||
$lang['options_version_dialog_show_all_hint'] = "This will show the version dialog automatically to all users on their next page reload.";
|
||||
$lang['options_version_dialog_hide_all_hint'] = "This will deactivate the automatic popup of the version dialog for all users.";
|
||||
|
||||
$lang['options_save'] = 'Сохранить';
|
||||
|
||||
// Bands
|
||||
|
|
|
|||
|
|
@ -73,6 +73,31 @@ $lang['options_dxcluster_maxage_changed_to']='Maximum age of spots changed to ';
|
|||
$lang['options_dxcluster_decont_changed_to']='de continent changed to ';
|
||||
$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown';
|
||||
|
||||
$lang['options_version_dialog'] = "Version Info";
|
||||
$lang['options_version_dialog_close'] = "Close";
|
||||
$lang['options_version_dialog_dismiss'] = "Don't show again";
|
||||
$lang['options_version_dialog_settings'] = "Version Info Settings";
|
||||
$lang['options_version_dialog_header'] = "Version Info Header";
|
||||
$lang['options_version_dialog_header_hint'] = "You can change the header of the version info dialog.";
|
||||
$lang['options_version_dialog_header_changed_to'] = "Version Info Header changed to";
|
||||
$lang['options_version_dialog_mode'] = "Version Info Mode";
|
||||
$lang['options_version_dialog_mode_release_notes'] = "Only Release Notes";
|
||||
$lang['options_version_dialog_mode_custom_text'] = "Only Custom Text";
|
||||
$lang['options_version_dialog_mode_both'] = "Release Notes and Custom Text";
|
||||
$lang['options_version_dialog_mode_disabled'] = "Disabled";
|
||||
$lang['options_version_dialog_mode_hint'] = "The Version Info is shown to every user. The user has the option to dismiss the dialog after he read it. Select if you want to show only release notes (fetched from github), only custom text or both.";
|
||||
$lang['options_version_dialog_custom_text'] = "Version Info Custom Text";
|
||||
$lang['options_version_dialog_custom_text_hint'] = "This is the custom text which is shown in the dialog.";
|
||||
$lang['options_version_dialog_mode_changed_to'] = "Version Info Mode changed to";
|
||||
$lang['options_version_dialog_custom_text_saved'] = "Version Info Custom Text saved!";
|
||||
$lang['options_version_dialog_success_show_all'] = "Version Info will be shown to all users again";
|
||||
$lang['options_version_dialog_success_hide_all'] = "Version Info will not be shown to any user";
|
||||
$lang['options_version_dialog_show_hide'] = "Show/Hide Version Info Dialog for all Users";
|
||||
$lang['options_version_dialog_show_all'] = "Show for all Users";
|
||||
$lang['options_version_dialog_hide_all'] = "Hide for all Users";
|
||||
$lang['options_version_dialog_show_all_hint'] = "This will show the version dialog automatically to all users on their next page reload.";
|
||||
$lang['options_version_dialog_hide_all_hint'] = "This will deactivate the automatic popup of the version dialog for all users.";
|
||||
|
||||
$lang['options_save'] = 'Save';
|
||||
|
||||
// Bands
|
||||
|
|
|
|||
|
|
@ -73,6 +73,31 @@ $lang['options_dxcluster_maxage_changed_to']='Maximal ålder för fläckar ändr
|
|||
$lang['options_dxcluster_decont_changed_to']='kontinenten ändrats till ';
|
||||
$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown';
|
||||
|
||||
$lang['options_version_dialog'] = "Version Info";
|
||||
$lang['options_version_dialog_close'] = "Close";
|
||||
$lang['options_version_dialog_dismiss'] = "Don't show again";
|
||||
$lang['options_version_dialog_settings'] = "Version Info Settings";
|
||||
$lang['options_version_dialog_header'] = "Version Info Header";
|
||||
$lang['options_version_dialog_header_hint'] = "You can change the header of the version info dialog.";
|
||||
$lang['options_version_dialog_header_changed_to'] = "Version Info Header changed to";
|
||||
$lang['options_version_dialog_mode'] = "Version Info Mode";
|
||||
$lang['options_version_dialog_mode_release_notes'] = "Only Release Notes";
|
||||
$lang['options_version_dialog_mode_custom_text'] = "Only Custom Text";
|
||||
$lang['options_version_dialog_mode_both'] = "Release Notes and Custom Text";
|
||||
$lang['options_version_dialog_mode_disabled'] = "Disabled";
|
||||
$lang['options_version_dialog_mode_hint'] = "The Version Info is shown to every user. The user has the option to dismiss the dialog after he read it. Select if you want to show only release notes (fetched from github), only custom text or both.";
|
||||
$lang['options_version_dialog_custom_text'] = "Version Info Custom Text";
|
||||
$lang['options_version_dialog_custom_text_hint'] = "This is the custom text which is shown in the dialog.";
|
||||
$lang['options_version_dialog_mode_changed_to'] = "Version Info Mode changed to";
|
||||
$lang['options_version_dialog_custom_text_saved'] = "Version Info Custom Text saved!";
|
||||
$lang['options_version_dialog_success_show_all'] = "Version Info will be shown to all users again";
|
||||
$lang['options_version_dialog_success_hide_all'] = "Version Info will not be shown to any user";
|
||||
$lang['options_version_dialog_show_hide'] = "Show/Hide Version Info Dialog for all Users";
|
||||
$lang['options_version_dialog_show_all'] = "Show for all Users";
|
||||
$lang['options_version_dialog_hide_all'] = "Hide for all Users";
|
||||
$lang['options_version_dialog_show_all_hint'] = "This will show the version dialog automatically to all users on their next page reload.";
|
||||
$lang['options_version_dialog_hide_all_hint'] = "This will deactivate the automatic popup of the version dialog for all users.";
|
||||
|
||||
$lang['options_save'] = 'Spara';
|
||||
|
||||
// Bands
|
||||
|
|
|
|||
|
|
@ -73,6 +73,31 @@ $lang['options_dxcluster_maxage_changed_to']='Maximum age of spots changed to ';
|
|||
$lang['options_dxcluster_decont_changed_to']='de continent changed to ';
|
||||
$lang['options_dxcluster_decont_hint']='Only spots by spotters from this continent are shown';
|
||||
|
||||
$lang['options_version_dialog'] = "Version Info";
|
||||
$lang['options_version_dialog_close'] = "Close";
|
||||
$lang['options_version_dialog_dismiss'] = "Don't show again";
|
||||
$lang['options_version_dialog_settings'] = "Version Info Settings";
|
||||
$lang['options_version_dialog_header'] = "Version Info Header";
|
||||
$lang['options_version_dialog_header_hint'] = "You can change the header of the version info dialog.";
|
||||
$lang['options_version_dialog_header_changed_to'] = "Version Info Header changed to";
|
||||
$lang['options_version_dialog_mode'] = "Version Info Mode";
|
||||
$lang['options_version_dialog_mode_release_notes'] = "Only Release Notes";
|
||||
$lang['options_version_dialog_mode_custom_text'] = "Only Custom Text";
|
||||
$lang['options_version_dialog_mode_both'] = "Release Notes and Custom Text";
|
||||
$lang['options_version_dialog_mode_disabled'] = "Disabled";
|
||||
$lang['options_version_dialog_mode_hint'] = "The Version Info is shown to every user. The user has the option to dismiss the dialog after he read it. Select if you want to show only release notes (fetched from github), only custom text or both.";
|
||||
$lang['options_version_dialog_custom_text'] = "Version Info Custom Text";
|
||||
$lang['options_version_dialog_custom_text_hint'] = "This is the custom text which is shown in the dialog.";
|
||||
$lang['options_version_dialog_mode_changed_to'] = "Version Info Mode changed to";
|
||||
$lang['options_version_dialog_custom_text_saved'] = "Version Info Custom Text saved!";
|
||||
$lang['options_version_dialog_success_show_all'] = "Version Info will be shown to all users again";
|
||||
$lang['options_version_dialog_success_hide_all'] = "Version Info will not be shown to any user";
|
||||
$lang['options_version_dialog_show_hide'] = "Show/Hide Version Info Dialog for all Users";
|
||||
$lang['options_version_dialog_show_all'] = "Show for all Users";
|
||||
$lang['options_version_dialog_hide_all'] = "Hide for all Users";
|
||||
$lang['options_version_dialog_show_all_hint'] = "This will show the version dialog automatically to all users on their next page reload.";
|
||||
$lang['options_version_dialog_hide_all_hint'] = "This will deactivate the automatic popup of the version dialog for all users.";
|
||||
|
||||
$lang['options_save'] = 'Save';
|
||||
|
||||
// Bands
|
||||
|
|
|
|||
|
|
@ -153,6 +153,10 @@ class ADIF_Parser
|
|||
{
|
||||
$tag_name = $tag_name.mb_substr($record, $a, 1, "UTF-8"); //append this char to the tag name
|
||||
$a++;
|
||||
// Prevent iterating $a past record length
|
||||
if ($a == mb_strlen($record, "UTF-8")) {
|
||||
return;
|
||||
}
|
||||
};
|
||||
$a++; //iterate past the colon
|
||||
while(mb_substr($record, $a, 1, "UTF-8") != '>' && mb_substr($record, $a, 1, "UTF-8") != ':')
|
||||
|
|
|
|||
|
|
@ -16,6 +16,23 @@ class User_options_model extends CI_Model {
|
|||
}
|
||||
}
|
||||
|
||||
public function set_option_at_all_users($option_type, $option_name, $option_array) {
|
||||
$query = $this->db->select('user_id')->get('users');
|
||||
if ($query->num_rows() > 0) {
|
||||
foreach ($query->result() as $row) {
|
||||
$user_id = $row->user_id;
|
||||
$sql = 'INSERT INTO user_options (user_id, option_type, option_name, option_key, option_value) VALUES (?, ?, ?, ?, ?)
|
||||
ON DUPLICATE KEY UPDATE option_value = ?';
|
||||
foreach ($option_array as $option_key => $option_value) {
|
||||
$this->db->query($sql, array($user_id, $option_type, $option_name, $option_key, $option_value, $option_value));
|
||||
return true;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
log_message('error','set_option_at_all_users() failed because users table is empty');
|
||||
}
|
||||
}
|
||||
|
||||
public function get_options($option_type, $option_array=null) {
|
||||
$uid=$this->session->userdata('user_id');
|
||||
$sql_more = "";
|
||||
|
|
|
|||
|
|
@ -46,6 +46,7 @@
|
|||
<script type="text/javascript" src="<?php echo base_url() ;?>assets/js/easyprint.js"></script>
|
||||
<script type="text/javascript" src="<?php echo base_url() ;?>assets/js/sections/common.js"></script>
|
||||
<script type="text/javascript" src="<?php echo base_url() ;?>assets/js/sections/eqslcharcounter.js"></script>
|
||||
<script type="text/javascript" src="<?php echo base_url() ;?>assets/js/sections/version_dialog.js"></script>
|
||||
|
||||
<script src="https://unpkg.com/htmx.org@1.6.1"></script>
|
||||
|
||||
|
|
@ -67,6 +68,33 @@ function load_was_map() {
|
|||
</script>
|
||||
<?php } ?>
|
||||
|
||||
<!-- Version Dialog START -->
|
||||
|
||||
<?php
|
||||
if($this->session->userdata('user_id') != null) {
|
||||
$versionDialog = $this->optionslib->get_option('version_dialog');
|
||||
if (empty($versionDialog)) {
|
||||
$this->optionslib->update('version_dialog', 'release_notes', 'yes');
|
||||
}
|
||||
$versionDialogHeader = $this->optionslib->get_option('version_dialog_header');
|
||||
if (empty($versionDialogHeader)) {
|
||||
$this->optionslib->update('version_dialog_header', $this->lang->line('options_version_dialog'), 'yes');
|
||||
}
|
||||
if($versionDialog != "disabled") {
|
||||
$confirmed = $this->user_options_model->get_options('version_dialog', array('option_name'=>'confirmed'))->result();
|
||||
$confirmation_value = (isset($confirmed[0]->option_value))?$confirmed[0]->option_value:'false';
|
||||
if ($confirmation_value != 'true') {
|
||||
$this->user_options_model->set_option('version_dialog', 'confirmed', array('boolean' => $confirmation_value));
|
||||
?><script>
|
||||
displayVersionDialog();
|
||||
</script><?php
|
||||
}
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
||||
<!-- Version Dialog END -->
|
||||
|
||||
<?php if ($this->uri->segment(1) == "oqrs") { ?>
|
||||
<script src="<?php echo base_url() ;?>assets/js/sections/oqrs.js"></script>
|
||||
<?php } ?>
|
||||
|
|
|
|||
|
|
@ -368,6 +368,8 @@
|
|||
|
||||
<div class="dropdown-divider"></div>
|
||||
|
||||
<a class="dropdown-item" href="javascript:displayVersionDialog();" title="Version Information"><i class="fas fa-star"></i> <?php echo lang('options_version_dialog'); ?></a>
|
||||
|
||||
<a class="dropdown-item" target="_blank" href="https://github.com/magicbug/Cloudlog/wiki" title="Help"><i class="fas fa-question"></i> <?php echo lang('menu_help'); ?></a>
|
||||
|
||||
<a class="dropdown-item" target="_blank" href="https://github.com/magicbug/Cloudlog/discussions" title="Forum"><i class="far fa-comment-dots"></i> <?php echo lang('menu_forum'); ?></a>
|
||||
|
|
|
|||
|
|
@ -468,6 +468,9 @@ $options = json_decode($options);
|
|||
<?php if (($options->iota->show ?? "true") == "true") {
|
||||
echo '<th>' . lang('gen_hamradio_iota') . '</th>';
|
||||
} ?>
|
||||
<?php if (($options->pota->show ?? "true") == "true") {
|
||||
echo '<th>' . lang('gen_hamradio_pota') . '</th>';
|
||||
} ?>
|
||||
<?php if (($options->operator->show ?? "true") == "true") {
|
||||
echo '<th>' . lang('gen_hamradio_operator') . '</th>';
|
||||
} ?>
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
<li class="list-group-item"><a class="nav-link" href="<?php echo site_url('options/email'); ?>"><?php echo lang('options_email'); ?></a></li>
|
||||
<li class="list-group-item"><a class="nav-link" href="<?php echo site_url('options/oqrs'); ?>"><?php echo lang('options_oqrs'); ?></a></li>
|
||||
<li class="list-group-item"><a class="nav-link" href="<?php echo site_url('options/dxcluster'); ?>"><?php echo lang('options_dxcluster'); ?></a></li>
|
||||
<li class="list-group-item"><a class="nav-link" href="<?php echo site_url('options/version_dialog'); ?>"><?php echo lang('options_version_dialog'); ?></a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,116 @@
|
|||
<div class="container settings">
|
||||
|
||||
<div class="row">
|
||||
<!-- Nav Start -->
|
||||
<?php $this->load->view('options/sidebar') ?>
|
||||
<!-- Nav End -->
|
||||
|
||||
<!-- Content -->
|
||||
<div class="col-md-9">
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
<h2><?php echo $page_title; ?> - <?php echo $sub_heading; ?></h2>
|
||||
</div>
|
||||
|
||||
<div class="card-body">
|
||||
<?php if ($this->session->flashdata('success0')) { ?>
|
||||
<!-- Display Success Message -->
|
||||
<div class="alert alert-success">
|
||||
<?php echo $this->session->flashdata('success0'); ?>
|
||||
</div>
|
||||
<?php } ?>
|
||||
|
||||
<?php if ($this->session->flashdata('success1')) { ?>
|
||||
<!-- Display Success Message -->
|
||||
<div class="alert alert-success">
|
||||
<?php echo $this->session->flashdata('success1'); ?>
|
||||
</div>
|
||||
<?php } ?>
|
||||
|
||||
<?php if ($this->session->flashdata('success2')) { ?>
|
||||
<!-- Display Success Message -->
|
||||
<div class="alert alert-success">
|
||||
<?php echo $this->session->flashdata('success2'); ?>
|
||||
</div>
|
||||
<?php } ?>
|
||||
|
||||
<?php if ($this->session->flashdata('message')) { ?>
|
||||
<!-- Display Message -->
|
||||
<div class="alert-message error">
|
||||
<?php echo $this->session->flashdata('message'); ?>
|
||||
</div>
|
||||
<?php } ?>
|
||||
|
||||
<?php echo form_open('options/version_dialog_save'); ?>
|
||||
|
||||
<div class="mb-3">
|
||||
<label for="version_dialog_header"><?php echo lang('options_version_dialog_header'); ?></label>
|
||||
<input type="text" name="version_dialog_header" class="form-control" id="version_dialog_header" aria-describedby="version_dialog_header" value="<?php echo htmlspecialchars($this->optionslib->get_option('version_dialog_header') ?? ''); ?>">
|
||||
<small id="version_dialog_header_hint" class="form-text text-muted"><?php echo lang('options_version_dialog_header_hint'); ?></small>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<label for="version_dialog_mode"><?php echo lang('options_version_dialog_mode'); ?></label>
|
||||
<select name="version_dialog_mode" class="form-select" id="version_dialog_mode">
|
||||
<option value="release_notes" <?php if ($this->optionslib->get_option('version_dialog') == "release_notes") {
|
||||
echo "selected=\"selected\"";
|
||||
} ?>><?php echo lang('options_version_dialog_mode_release_notes'); ?></option>
|
||||
<option value="custom_text" <?php if ($this->optionslib->get_option('version_dialog') == "custom_text") {
|
||||
echo "selected=\"selected\"";
|
||||
} ?>><?php echo lang('options_version_dialog_mode_custom_text'); ?></option>
|
||||
<option value="both" <?php if ($this->optionslib->get_option('version_dialog') == "both") {
|
||||
echo "selected=\"selected\"";
|
||||
} ?>><?php echo lang('options_version_dialog_mode_both'); ?></option>
|
||||
<option value="disabled" <?php if ($this->optionslib->get_option('version_dialog') == "disabled") {
|
||||
echo "selected=\"selected\"";
|
||||
} ?>><?php echo lang('options_version_dialog_mode_disabled'); ?></option>
|
||||
</select>
|
||||
<small id="version_dialog_mode_hint" class="form-text text-muted"><?php echo lang('options_version_dialog_mode_hint'); ?></small>
|
||||
</div>
|
||||
|
||||
<div class="mb-3" id="version_dialog_custom_textarea" style="display: none" role="alert">
|
||||
<label for="version_dialog_custom_text"><?php echo lang('options_version_dialog_custom_text'); ?></label>
|
||||
<textarea type="text" rows="6" name="version_dialog_custom_text" class="form-control" id="version_dialog_custom_text" aria-describedby="version_dialog_custom_text"><?php echo htmlspecialchars($this->optionslib->get_option('version_dialog_text') ?? ''); ?></textarea>
|
||||
<small id="version_dialog_custom_text_hint" class="form-text text-muted"><?php echo lang('options_version_dialog_custom_text_hint'); ?></small>
|
||||
</div>
|
||||
|
||||
<!-- Save the Form -->
|
||||
<input class="btn btn-primary" type="submit" value="<?php echo lang('options_save'); ?>" />
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card mt-4 mb-4">
|
||||
<div class="card-header">
|
||||
<h5><?php echo lang('options_version_dialog_show_hide'); ?></h5>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<?php if ($this->session->flashdata('success_trigger')) { ?>
|
||||
<!-- Display Success Message -->
|
||||
<div class="alert alert-info">
|
||||
<?php echo $this->session->flashdata('success_trigger'); ?>
|
||||
</div>
|
||||
<?php } ?>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-6 border-end d-flex flex-column align-items-center text-center">
|
||||
<?php echo form_open('options/version_dialog_show_to_all'); ?>
|
||||
<button class="btn btn-success m-2"><?php echo lang('options_version_dialog_show_all'); ?></button>
|
||||
</form>
|
||||
<small class="form-text text-muted"><?php echo lang('options_version_dialog_show_all_hint'); ?></small>
|
||||
</div>
|
||||
|
||||
<div class="col-md-6 d-flex flex-column align-items-center text-center">
|
||||
<?php echo form_open('options/version_dialog_show_to_none'); ?>
|
||||
<button class="btn btn-danger m-2"><?php echo lang('options_version_dialog_hide_all'); ?></button>
|
||||
</form>
|
||||
<small class="form-text text-muted"><?php echo lang('options_version_dialog_hide_all_hint'); ?></small>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
|
@ -0,0 +1,73 @@
|
|||
<div class="modal fade" id="versionDialogModal" tabindex="-1" aria-labelledby="versionDialogLabel" aria-hidden="true" data-bs-backdrop="static" data-bs-keyboard="false">
|
||||
<div class="modal-dialog modal-dialog-centered modal-lg">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<h5 class="modal-title" id="versionDialogLabel"><?php echo $this->optionslib->get_option('version_dialog_header'); ?></h5>
|
||||
<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<?php
|
||||
$versionDialogMode = isset($this->optionslib) ? $this->optionslib->get_option('version_dialog') : 'release_notes';
|
||||
if ($versionDialogMode == 'custom_text' || $versionDialogMode == 'both') {
|
||||
?>
|
||||
<div class="border-bottom border-top p-4 m-4">
|
||||
<?php
|
||||
$versionDialogText = isset($this->optionslib) ? $this->optionslib->get_option('version_dialog_text') : null;
|
||||
if ($versionDialogText !== null) {
|
||||
$versionDialogTextWithLinks = preg_replace('/(https?:\/\/[^\s<]+)/', '<a href="$1" target="_blank">$1</a>', $versionDialogText);
|
||||
echo nl2br($versionDialogTextWithLinks);
|
||||
} else {
|
||||
echo 'No Version Dialog text set. Go to the Admin Menu and set one.';
|
||||
}
|
||||
?>
|
||||
</div>
|
||||
<?php
|
||||
}
|
||||
if ($versionDialogMode == 'release_notes' || $versionDialogMode == 'both' || $versionDialogMode == 'disabled') {
|
||||
?>
|
||||
<div>
|
||||
<?php
|
||||
$url = 'https://api.github.com/repos/magicbug/Cloudlog/releases';
|
||||
$options = [
|
||||
'http' => [
|
||||
'header' => 'User-Agent: Cloudlog - Amateur Radio Logbook'
|
||||
]
|
||||
];
|
||||
$context = stream_context_create($options);
|
||||
$response = file_get_contents($url, false, $context);
|
||||
|
||||
if ($response !== false) {
|
||||
$data = json_decode($response, true);
|
||||
|
||||
if ($data !== null && !empty($data)) {
|
||||
$firstRelease = $data[0];
|
||||
|
||||
$releaseBody = isset($firstRelease['body']) ? $firstRelease['body'] : 'No release information available';
|
||||
$htmlReleaseBody = htmlspecialchars($releaseBody);
|
||||
$htmlReleaseBodyWithLinks = preg_replace('/(https?:\/\/[^\s<]+)/', '<a href="$1" target="_blank">$1</a>', $htmlReleaseBody);
|
||||
echo nl2br($htmlReleaseBodyWithLinks);
|
||||
} else {
|
||||
echo 'Fehler beim Decodieren der JSON-Daten oder leere Antwort erhalten.';
|
||||
}
|
||||
} else {
|
||||
echo 'Fehler beim Abrufen der Daten von der GitHub API.';
|
||||
}
|
||||
?>
|
||||
</div>
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<?php
|
||||
if ($versionDialogMode !== 'disabled') {
|
||||
?>
|
||||
<button class="btn btn-secondary" onclick="dismissVersionDialog()" data-bs-dismiss="modal"><?php echo lang('options_version_dialog_dismiss'); ?></button>
|
||||
<?php
|
||||
}
|
||||
?>
|
||||
<button type="button" class="btn btn-primary" data-bs-dismiss="modal"><?php echo lang('options_version_dialog_close'); ?></button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -81,9 +81,9 @@ function updateRow(qso) {
|
|||
if (user_options.iota.show == "true"){
|
||||
cells.eq(c++).html(qso.iota);
|
||||
}
|
||||
// if (user_options.pota.show == "true"){
|
||||
// cells.eq(c++).html(qso.pota);
|
||||
// }
|
||||
if (user_options.pota.show == "true"){
|
||||
cells.eq(c++).html(qso.pota);
|
||||
}
|
||||
if ( (user_options.operator) && (user_options.operator.show == "true")){
|
||||
cells.eq(c++).html(qso.operator);
|
||||
}
|
||||
|
|
@ -180,9 +180,9 @@ function loadQSOTable(rows) {
|
|||
if (user_options.iota.show == "true"){
|
||||
data.push(qso.iota);
|
||||
}
|
||||
// if (user_options.pota.show == "true"){
|
||||
// data.push(qso.pota);
|
||||
// }
|
||||
if (user_options.pota.show == "true"){
|
||||
data.push(qso.pota);
|
||||
}
|
||||
if (user_options.operator.show == "true"){
|
||||
data.push(qso.operator);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,48 @@
|
|||
|
||||
// Admin Menu - Version Dialog Settings
|
||||
|
||||
function showCustomTextarea() {
|
||||
var selectedOptionValue = $("#version_dialog_mode option:selected").val();
|
||||
|
||||
if (selectedOptionValue === "custom_text" || selectedOptionValue === "both") {
|
||||
$('#version_dialog_custom_textarea').show();
|
||||
} else {
|
||||
$('#version_dialog_custom_textarea').hide();
|
||||
}
|
||||
}
|
||||
|
||||
$(document).ready(function () {
|
||||
showCustomTextarea();
|
||||
});
|
||||
|
||||
$('#version_dialog_mode').on('change', function () {
|
||||
showCustomTextarea();
|
||||
});
|
||||
|
||||
// JavaScript-Funktion displayVersionDialog für Bootstrap 5
|
||||
function displayVersionDialog() {
|
||||
|
||||
$.ajax({
|
||||
url: base_url + "index.php/Version_Dialog/displayVersionDialog",
|
||||
type: 'GET',
|
||||
dataType: 'html',
|
||||
success: function(data) {
|
||||
$('body').append(data);
|
||||
|
||||
// Aktiviere das Bootstrap-Modal
|
||||
var versionDialogModal = new bootstrap.Modal(document.getElementById('versionDialogModal'));
|
||||
versionDialogModal.show();
|
||||
},
|
||||
error: function() {
|
||||
// Behandlung von Fehlern
|
||||
console.log('Fehler beim Laden der PHP-Datei.');
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function dismissVersionDialog() {
|
||||
$.ajax({
|
||||
url: base_url + 'index.php/user_options/dismissVersionDialog',
|
||||
method: 'POST',
|
||||
});
|
||||
}
|
||||
文件差异因一行或多行过长而隐藏
正在加载…
在新工单中引用