may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Redizajn 1KA] - Urejanje --> Nastavitve --> Obveščanje --> Nastavitve poštnega strežnika

Browse Source
This commit is contained in:
tejagerjovic 2022-06-09 01:02:45 +02:00
parent 1bfd045afc
commit dc20e7c006
6 changed files with 1665 additions and 1533 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

247
admin/survey/SurveyAdminSettings.php
View File

@ -3614,7 +3614,7 @@ class SurveyAdminSettings {
global $global_user_id; global $global_user_id;
global $mysql_database_name; global $mysql_database_name;
echo '<fieldset>'; echo '<fieldset id="gdpr_anketa">';
echo '<legend>'.$lang['srv_user_base_email_server_settings'].'</legend>'; echo '<legend>'.$lang['srv_user_base_email_server_settings'].'</legend>';
$row = SurveyInfo::getInstance()->getSurveyRow(); $row = SurveyInfo::getInstance()->getSurveyRow();
@ -3622,7 +3622,7 @@ class SurveyAdminSettings {
// Opozorilo, ce imamo vklopljena vabila, da gre za iste nastavitve // Opozorilo, ce imamo vklopljena vabila, da gre za iste nastavitve
$isEmail = (int)SurveyInfo::getInstance()->checkSurveyModule('email'); $isEmail = (int)SurveyInfo::getInstance()->checkSurveyModule('email');
if($isEmail) if($isEmail)
echo '<p class="red bold">'.$lang['srv_email_server_settings_warning'].'</p>'; echo '<p class="bottom16">'.$lang['srv_email_server_settings_warning'].'</p>';
echo '<form name="settingsanketa_' . $row['id'] . '" action="ajax.php?a=editanketasettings&m=email_server" method="post" autocomplete="off">' . "\n\r"; echo '<form name="settingsanketa_' . $row['id'] . '" action="ajax.php?a=editanketasettings&m=email_server" method="post" autocomplete="off">' . "\n\r";
@ -3637,20 +3637,31 @@ class SurveyAdminSettings {
// Dostop za posiljanje mailov preko 1ka serverja // Dostop za posiljanje mailov preko 1ka serverja
$enabled1ka = ( $MA->is1KA() || (($admin_type == 0) && ($mysql_database_name == 'www1kasi' || $mysql_database_name == 'test1kasi' || $mysql_database_name == 'real1kasi' || $mysql_database_name == '1kaarnessi')) ) ? true : false; $enabled1ka = ( $MA->is1KA() || (($admin_type == 0) && ($mysql_database_name == 'www1kasi' || $mysql_database_name == 'test1kasi' || $mysql_database_name == 'real1kasi' || $mysql_database_name == '1kaarnessi')) ) ? true : false;
echo '<p>';
echo '<span class="bold">'.$lang['srv_email_setting_select_server'].'</span>&nbsp;'; echo '<div class="setting_holder">';
echo '<label><input type="radio" name="SMTPMailMode" value="0" '.($MA->is1KA() ? 'checked ="checked" ' : '').' '.($enabled1ka ? '' : ' disabled="disabled"').' onclick="$(\'#send_mail_mode1, #send_mail_mode2\').hide();$(\'#send_mail_mode0\').show();">'; echo '<span class="setting_title">'.$lang['srv_email_setting_select_server'].'</span>';
echo $lang['srv_email_setting_adapter0']. ' </label>';
echo '<div class="setting_item">';
echo '<input type="radio" id="SMTPMailMode0" name="SMTPMailMode" value="0" '.($MA->is1KA() ? 'checked ="checked" ' : '').' '.($enabled1ka ? '' : ' disabled="disabled"').' onclick="$(\'#send_mail_mode1, #send_mail_mode2\').hide();$(\'#send_mail_mode0\').show();">';
echo '<label for="SMTPMailMode0">'.$lang['srv_email_setting_adapter0']. ' </label>';
echo '</div>';
// Google smtp je viden samo starim, kjer je ze vklopljen // Google smtp je viden samo starim, kjer je ze vklopljen
if($MA->isGoogle()){ if($MA->isGoogle()){
echo '<label><input type="radio" name="SMTPMailMode" value="1" '.($MA->isGoogle() ? 'checked ="checked" ' : '').' onclick="$(\'#send_mail_mode0, #send_mail_mode2\').hide(); $(\'#send_mail_mode1\').show();">'; echo '<div class="setting_item">';
echo $lang['srv_email_setting_adapter1'].' </label>'; echo '<input type="radio" name="SMTPMailMode" value="1" '.($MA->isGoogle() ? 'checked ="checked" ' : '').' onclick="$(\'#send_mail_mode0, #send_mail_mode2\').hide(); $(\'#send_mail_mode1\').show();">';
} echo '<label>'.$lang['srv_email_setting_adapter1'].' </label>';
echo '<label><input type="radio" name="SMTPMailMode" value="2" '.($MA->isSMTP() ? 'checked ="checked" ' : '').' onclick="$(\'#send_mail_mode0, #send_mail_mode1\').hide(); $(\'#send_mail_mode2\').show();">'; echo '</div>';
echo $lang['srv_email_setting_adapter2'].' </label>'; }
echo '<div class="setting_item">';
echo '<input type="radio" name="SMTPMailMode" value="2" '.($MA->isSMTP() ? 'checked ="checked" ' : '').' onclick="$(\'#send_mail_mode0, #send_mail_mode1\').hide(); $(\'#send_mail_mode2\').show();">';
echo '<label>'.$lang['srv_email_setting_adapter2'].' </label>';
echo Help :: display('srv_mail_mode'); echo Help :: display('srv_mail_mode');
echo '</p>'; echo '</div>';
echo '</div>';
#1KA #1KA
$enkaSettings = $MA->get1KASettings($raziskave=true); $enkaSettings = $MA->get1KASettings($raziskave=true);
@ -3684,84 +3695,154 @@ class SurveyAdminSettings {
#SMTP #SMTP
$enkaSettings = $MA->getSMTPSettings(); $enkaSettings = $MA->getSMTPSettings();
echo '<div id="send_mail_mode2" '.(!$MA->isSMTP() ? ' class="displayNone"' : '').'>'; echo '<div id="send_mail_mode2" '.(!$MA->isSMTP() ? ' class="displayNone"' : '').'>';
echo '<span class="italic">'.$lang['srv_email_setting_adapter2_note'].'</span><br />'; //echo '<span class="italic">'.$lang['srv_email_setting_adapter2_note'].'</span><br />';
echo '<br /><span class="bold">'.$lang['srv_email_setting_settings'].'</span><br />'; echo '<p class="semi-bold bottom16">'.$lang['srv_email_setting_settings'].'</p>';
# from - NICE
echo '<p><label>'.$lang['srv_email_setting_from_nice'].'<input type="text" name="SMTPFromNice2" value="'.$enkaSettings['SMTPFromNice'].'"></label>'; echo '<div class="setting_holder horizontal">';
echo '</p>';
# from # from - NICE
echo '<p><label>'.$lang['srv_email_setting_from'].'<input type="text" name="SMTPFrom2" value="'.$enkaSettings['SMTPFrom'].'"></label>'; echo '<div class="setting_holder">';
echo '</p>'; echo '<span class="setting_title">'.$lang['srv_email_setting_from_nice'].'</span>';
# replyTo echo '<input type="text" class="text large" name="SMTPFromNice2" value="'.$enkaSettings['SMTPFromNice'].'">';
echo '<p><label>'.$lang['srv_email_setting_reply'].Help::display('srv_obvescanje_odgovorZa').'<input type="text" name="SMTPReplyTo2" value="'.$enkaSettings['SMTPReplyTo'].'" ></label>'; echo '</div>';
echo '</p>';
#Username # from
echo '<p><label>'.$lang['srv_email_setting_username'].'<input type="text" name="SMTPUsername2" value="'.$enkaSettings['SMTPUsername'].'" ></label>'; echo '<div class="setting_holder">';
echo '</p>'; echo '<span class="setting_title">'.$lang['srv_email_setting_from'].'</span>';
#Password echo '<input type="text" class="text large" name="SMTPFrom2" value="'.$enkaSettings['SMTPFrom'].'">';
echo '<p><label>'.$lang['srv_email_setting_password'].'<input type="password" name="SMTPPassword2" placeholder="'.$lang['srv_email_setting_password_placeholder'].'"></label>'; echo '</div>';
echo '</p>';
#autentikacija echo '</div>';
echo '<p>';
echo $lang['srv_email_setting_autentication']; echo '<div class="setting_holder horizontal">';
echo '<label><input type="radio" name="SMTPAuth2" value="0" '.((int)$enkaSettings['SMTPAuth'] != 1 ? 'checked ="checked" ' : '').'>';
echo $lang['srv_email_setting_no'].'</label>'; # replyTo
echo '<label><input type="radio" name="SMTPAuth2" value="1" '.((int)$enkaSettings['SMTPAuth'] == 1 ? 'checked ="checked" ' : '').'>'; echo '<div class="setting_holder">';
echo $lang['srv_email_setting_yes'].'</label>'; echo '<span class="setting_title">'.$lang['srv_email_setting_reply'].Help::display('srv_obvescanje_odgovorZa').'</span>';
echo '</p>'; echo '<input type="text" class="text large" name="SMTPReplyTo2" value="'.$enkaSettings['SMTPReplyTo'].'" >';
#Varnost SMTPSecure echo '</div>';
echo '<p>';
echo $lang['srv_email_setting_encryption']; echo '</div>';
echo '<label><input type="radio" name="SMTPSecure2" value="0" '.((int)$enkaSettings['SMTPSecure'] == 0 ? 'checked ="checked" ' : '').'>';
echo $lang['srv_email_setting_encryption_none'].'</label>'; echo '<div class="setting_holder horizontal">';
echo '<label><input type="radio" name="SMTPSecure2" value="ssl" '.($enkaSettings['SMTPSecure'] == 'ssl' ? 'checked ="checked" ' : '').'>';
echo $lang['srv_email_setting_encryption_ssl'].'</label>'; #Username
echo '<label><input type="radio" name="SMTPSecure2" value="tls" '.($enkaSettings['SMTPSecure'] == 'tls' ? 'checked ="checked" ' : '').'>'; echo '<div class="setting_holder">';
echo $lang['srv_email_setting_encryption_tls'].'</label>'; echo '<span class="setting_title">'.$lang['srv_email_setting_username'].'</span>';
echo '</p>'; echo '<input type="text" class="text large" name="SMTPUsername2" value="'.$enkaSettings['SMTPUsername'].'" >';
#port echo '</div>';
echo '<p><label>'.$lang['srv_email_setting_port'].'<input type="number" min="0" max="65535" name="SMTPPort2" value="'.(int)$enkaSettings['SMTPPort'].'" style="width:80px;"></label>';
echo ' '.$lang['srv_email_setting_port_note']; #Password
echo '</p>'; echo '<div class="setting_holder">';
#host echo '<span class="setting_title">'.$lang['srv_email_setting_password'].'</span>';
echo '<p><label>'.$lang['srv_email_setting_host'].'<input type="text" name="SMTPHost2" value="'.$enkaSettings['SMTPHost'].'" ></label>'; echo '<input type="password" class="text large" name="SMTPPassword2" placeholder="'.$lang['srv_email_setting_password_placeholder'].'">';
echo '</p>'; echo '</div>';
#delay
echo '<p><label>'.$lang['srv_email_setting_smtp_delay'].' '.Help::display('srv_inv_delay').': <select name="SMTPDelay2">' echo '</div>';
/*. '<option value="0" '.($enkaSettings['SMTPDelay']=="0"?'selected="selected"':'') .'>0 </option>'
. '<option value="10000" '.($enkaSettings['SMTPDelay']=="10000"?'selected="selected"':'') .'>0.01 sec (max 100 / sec)</option>' echo '<div class="setting_holder horizontal">';
. '<option value="20000" '.($enkaSettings['SMTPDelay']=="20000"?'selected="selected"':'') .'>0.02 sec (max 50 / sec)</option>'
. '<option value="50000" '.($enkaSettings['SMTPDelay']=="50000"?'selected="selected"':'') .'>0.05 sec (max 20 / sec)</option>' #autentikacija
. '<option value="100000" '.($enkaSettings['SMTPDelay']=="100000"?'selected="selected"':'') .'>0.1 sec (max 10 / sec)</option>' echo '<div class="setting_holder">';
. '<option value="200000" '.($enkaSettings['SMTPDelay']=="200000"?'selected="selected"':'') .'>0.2 sec (max 5 / sec)</option>'*/ echo '<span class="setting_title">'.$lang['srv_email_setting_autentication'].'</span>';
. '<option value="500000" '.($enkaSettings['SMTPDelay']=="500000"?'selected="selected"':'') .'>0.5 sec (max 2 / sec)</option>'
. '<option value="1000000" '.($enkaSettings['SMTPDelay']=="1000000"?'selected="selected"':'') .'>1 sec (max 1 / sec)</option>' echo '<div class="fold">';
. '<option value="2000000" '.($enkaSettings['SMTPDelay']=="2000000"?'selected="selected"':'') .'>2 sec (max 30 / min)</option>'
. '<option value="4000000" '.($enkaSettings['SMTPDelay']=="4000000"?'selected="selected"':'') .'>4 sec (max 15 / min)</option>' echo '<div class="setting_item">';
. '<option value="5000000" '.($enkaSettings['SMTPDelay']=="5000000"?'selected="selected"':'') .'>5 sec (max 12 / min)</option>' echo '<input type="radio" id="SMTPAuth20" name="SMTPAuth2" value="0" '.((int)$enkaSettings['SMTPAuth'] != 1 ? 'checked ="checked" ' : '').'>';
. '<option value="10000000" '.($enkaSettings['SMTPDelay']=="10000000"?'selected="selected"':'') .'>10 sec (max 6 / min)</option>' echo '<label for="SMTPAuth20">'. $lang['srv_email_setting_no'].'</label>';
. '<option value="20000000" '.($enkaSettings['SMTPDelay']=="20000000"?'selected="selected"':'') .'>20 sec (max 3 / min)</option>' echo '</div>';
. '<option value="30000000" '.($enkaSettings['SMTPDelay']=="30000000"?'selected="selected"':'') .'>30 sec (max 2 / min)</option>'
. '</select></label>'; echo '<div class="setting_item">';
echo '</p>'; echo '<input type="radio" id="SMTPAuth21" name="SMTPAuth2" value="1" '.((int)$enkaSettings['SMTPAuth'] == 1 ? 'checked ="checked" ' : '').'>';
echo '<label for="SMTPAuth21">'. $lang['srv_email_setting_yes'].'</label>';
echo '</div>';
echo '</div>';
echo '</div>';
#Varnost SMTPSecure
echo '<div class="setting_holder">';
echo '<span class="setting_title">'.$lang['srv_email_setting_encryption'].'</span>';
echo '<div class="fold">';
echo '<div class="setting_item">';
echo '<input type="radio" name="SMTPSecure20" value="0" '.((int)$enkaSettings['SMTPSecure'] == 0 ? 'checked ="checked" ' : '').'>';
echo '<label for="SMTPSecure20">'. $lang['srv_email_setting_encryption_none'].'</label>';
echo '</div>';
echo '<div class="setting_item">';
echo '<input type="radio" name="SMTPSecure21" value="ssl" '.($enkaSettings['SMTPSecure'] == 'ssl' ? 'checked ="checked" ' : '').'>';
echo '<label for="SMTPSecure21">'. $lang['srv_email_setting_encryption_ssl'].'</label>';
echo '</div>';
echo '<div class="setting_item">';
echo '<input type="radio" name="SMTPSecure22" value="tls" '.($enkaSettings['SMTPSecure'] == 'tls' ? 'checked ="checked" ' : '').'>';
echo '<label for="SMTPSecure22">'. $lang['srv_email_setting_encryption_tls'].'</label>';
echo '</div>';
echo '</div>';
echo '</div>';
echo '</div>';
echo '<div class="setting_holder horizontal">';
#port
echo '<div class="setting_holder">';
echo '<span class="setting_title">'.$lang['srv_email_setting_port'].$lang['srv_email_setting_port_note'].'</span>';
echo '<input type="number" class="text large min="0" max="65535" name="SMTPPort2" value="'.(int)$enkaSettings['SMTPPort'].'">';
echo '</div>';
#host
echo '<div class="setting_holder">';
echo '<span class="setting_title">'.$lang['srv_email_setting_host'].'</span>';
echo '<input type="text" class="text large" name="SMTPHost2" value="'.$enkaSettings['SMTPHost'].'" >';
echo '</div>';
echo '</div>';
echo '<div class="setting_holder horizontal">';
#delay
echo '<div class="setting_holder">';
echo '<span class="setting_title">'.$lang['srv_email_setting_smtp_delay'].' '.Help::display('srv_inv_delay').':</span>';
echo '<select class="dropdown large" name="SMTPDelay2">'
/*. '<option value="0" '.($enkaSettings['SMTPDelay']=="0"?'selected="selected"':'') .'>0 </option>'
. '<option value="10000" '.($enkaSettings['SMTPDelay']=="10000"?'selected="selected"':'') .'>0.01 sec (max 100 / sec)</option>'
. '<option value="20000" '.($enkaSettings['SMTPDelay']=="20000"?'selected="selected"':'') .'>0.02 sec (max 50 / sec)</option>'
. '<option value="50000" '.($enkaSettings['SMTPDelay']=="50000"?'selected="selected"':'') .'>0.05 sec (max 20 / sec)</option>'
. '<option value="100000" '.($enkaSettings['SMTPDelay']=="100000"?'selected="selected"':'') .'>0.1 sec (max 10 / sec)</option>'
. '<option value="200000" '.($enkaSettings['SMTPDelay']=="200000"?'selected="selected"':'') .'>0.2 sec (max 5 / sec)</option>'*/
. '<option value="500000" '.($enkaSettings['SMTPDelay']=="500000"?'selected="selected"':'') .'>0.5 sec (max 2 / sec)</option>'
. '<option value="1000000" '.($enkaSettings['SMTPDelay']=="1000000"?'selected="selected"':'') .'>1 sec (max 1 / sec)</option>'
. '<option value="2000000" '.($enkaSettings['SMTPDelay']=="2000000"?'selected="selected"':'') .'>2 sec (max 30 / min)</option>'
. '<option value="4000000" '.($enkaSettings['SMTPDelay']=="4000000"?'selected="selected"':'') .'>4 sec (max 15 / min)</option>'
. '<option value="5000000" '.($enkaSettings['SMTPDelay']=="5000000"?'selected="selected"':'') .'>5 sec (max 12 / min)</option>'
. '<option value="10000000" '.($enkaSettings['SMTPDelay']=="10000000"?'selected="selected"':'') .'>10 sec (max 6 / min)</option>'
. '<option value="20000000" '.($enkaSettings['SMTPDelay']=="20000000"?'selected="selected"':'') .'>20 sec (max 3 / min)</option>'
. '<option value="30000000" '.($enkaSettings['SMTPDelay']=="30000000"?'selected="selected"':'') .'>30 sec (max 2 / min)</option>'
. '</select>';
echo '</div>';
echo '</div>';
echo '</div>';
echo '</form>'; echo '</form>';
echo '</fieldset>'; echo '</fieldset>';
// Gumb shrani
echo '<span class="floatLeft"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange btn_savesettings" href="#" onclick="document.settingsanketa_' . $row['id'] . '.submit(); return false;">'; echo '<div class="button_holder">';
echo $lang['srv_email_setting_btn_save'] . '</a></div></span>';
// Gumb preveri nastavitve // Gumb preveri nastavitve
echo '<span id="send_mail_mode_test" class="floatLeft spaceLeft"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_green" href="#" onclick="showTestSurveySMTP(); return false;">'; echo '<button class="medium white-black" onClick="showTestSurveySMTP(); return false;">'.$lang['srv_email_setting_btn_test'].'</button>';
echo $lang['srv_email_setting_btn_test'].'</a></div></span>'; // Gumb shrani
echo '<button class="medium blue" onclick="document.settingsanketa_' . $row['id'] . '.submit(); return false;">'.$lang['srv_email_setting_btn_save'].'</button>';
echo '</div>';
if ($_GET['s'] == '1') { if ($_GET['s'] == '1') {
echo '<div id="success_save" style="float:left; display:inline; margin: -2px 0 0 0;"></div>';
echo '<script type="text/javascript">$(document).ready(function() {actionNotePopup(\'success_save\', \'success\');});</script>'; echo '<script type="text/javascript">$(document).ready(function() {actionNotePopup(\'success_save\', \'success\');});</script>';
} }
} }

6
lang/1.php
View File

@ -2332,7 +2332,7 @@ $lang = array (
"srv_user_base_access_alert_1" => "Pri nastavitvi »DA« bodo v anekto lahko vstopali vsi respondenti!", "srv_user_base_access_alert_1" => "Pri nastavitvi »DA« bodo v anekto lahko vstopali vsi respondenti!",
"srv_user_base_access_alert_2" => "Do ankete lahko brez kode dostopa samo avtor!", "srv_user_base_access_alert_2" => "Do ankete lahko brez kode dostopa samo avtor!",
"srv_user_base_email_server_settings" => "Nastavitve poštnega strežnika", "srv_user_base_email_server_settings" => "Nastavitve poštnega strežnika",
"srv_email_server_settings_warning" => "Opozorilo! Iste nastavitve poštnega strežnika se upoštevajo pri obveščanju in pri pošiljanju email vabil!", "srv_email_server_settings_warning" => "<span class=\"red\">Opozorilo!</span> Iste nastavitve poštnega strežnika se upoštevajo pri obveščanju in pri pošiljanju email vabil!",
"srv_massinsert" => "Masovni vnos", "srv_massinsert" => "Masovni vnos",
"srv_massdelete" => "Pobri&#154;i vse vnose", "srv_massdelete" => "Pobri&#154;i vse vnose",
"srv_masstxt" => "Respondente dodajajte po enega v vrstico. Stolpce ločite z vejico, v enakem vrstnem redu kot so prikazani spodaj v odebeljenem tisku.<br /><br />Primeri:<br />janez.novak@example.com,Janez Novak<br />janez.novak@example.com<br />Janez Novak,M,Ljubljana", "srv_masstxt" => "Respondente dodajajte po enega v vrstico. Stolpce ločite z vejico, v enakem vrstnem redu kot so prikazani spodaj v odebeljenem tisku.<br /><br />Primeri:<br />janez.novak@example.com,Janez Novak<br />janez.novak@example.com<br />Janez Novak,M,Ljubljana",
@ -6762,7 +6762,7 @@ $lang = array (
'srv_email_setting_adapter1_note' => 'Uporabniško geslo pridobite v nastavitvah zasebnosti v vašem Gmail računu pod<br />\'Prijava in varnost\' – \'Gesla za aplikacije\'. <a href="https://www.1ka.si/d/sl/pomoc/prirocniki/posiljanje-emailov-preko-smtp-email-sistema-1ka-na-strezniku-uporabnika-oziroma?from1ka=1" target="_blank">Več >></a>', 'srv_email_setting_adapter1_note' => 'Uporabniško geslo pridobite v nastavitvah zasebnosti v vašem Gmail računu pod<br />\'Prijava in varnost\' – \'Gesla za aplikacije\'. <a href="https://www.1ka.si/d/sl/pomoc/prirocniki/posiljanje-emailov-preko-smtp-email-sistema-1ka-na-strezniku-uporabnika-oziroma?from1ka=1" target="_blank">Več >></a>',
'srv_email_setting_adapter2_note' => 'Za informacije kontaktirajte administratorja svojega poštnega strežnika. <a href="https://www.1ka.si/d/sl/pomoc/prirocniki/posiljanje-emailov-preko-smtp-email-sistema-1ka-na-strezniku-uporabnika-oziroma?from1ka=1" target="_blank">Več >></a>', 'srv_email_setting_adapter2_note' => 'Za informacije kontaktirajte administratorja svojega poštnega strežnika. <a href="https://www.1ka.si/d/sl/pomoc/prirocniki/posiljanje-emailov-preko-smtp-email-sistema-1ka-na-strezniku-uporabnika-oziroma?from1ka=1" target="_blank">Več >></a>',
'srv_email_setting_adapter_set' => 'Poštni strežnik morate nastaviti', 'srv_email_setting_adapter_set' => 'Poštni strežnik morate nastaviti',
'srv_email_setting_from' => 'Pošiljatelj (e-mail): ', 'srv_email_setting_from' => 'E-mail pošiljatelja: ',
'srv_email_setting_reply' => 'Odgovor za: ', 'srv_email_setting_reply' => 'Odgovor za: ',
'srv_email_setting_username' => 'Uporabniško ime: ', 'srv_email_setting_username' => 'Uporabniško ime: ',
'srv_email_setting_password' => 'Uporabniško geslo: ', 'srv_email_setting_password' => 'Uporabniško geslo: ',
@ -7751,7 +7751,7 @@ $lang = array (
"export_analysis_heatmap_image" => "ANALIZA - Heatmap poročilo", "export_analysis_heatmap_image" => "ANALIZA - Heatmap poročilo",
'export_analysis_heatmap_msg' => "Za prikazovanje heatmap, morate heatmap ustvariti s klikom na celico tabele Heatmap", 'export_analysis_heatmap_msg' => "Za prikazovanje heatmap, morate heatmap ustvariti s klikom na celico tabele Heatmap",
'srv_export_as' => "Izvozi kot", 'srv_export_as' => "Izvozi kot",
'srv_email_setting_from_nice' => "Pošiljatelj (naziv): ", 'srv_email_setting_from_nice' => "Naziv pošiljatelja: ",
'srv_ranking_available_categories' => "Razpoložljive kategorije", 'srv_ranking_available_categories' => "Razpoložljive kategorije",
'srv_export_hotspot_regions_names' => "Območja na sliki", 'srv_export_hotspot_regions_names' => "Območja na sliki",
'srv_export_hotspot_chosen_regions_names' => "Izbrana območja na sliki", 'srv_export_hotspot_chosen_regions_names' => "Izbrana območja na sliki",

6
lang/2.php
View File

@ -2317,7 +2317,7 @@ $lang = array (
"srv_user_base_access_alert_1" => "With setting »YES«, all respondents will be able to access survey!", "srv_user_base_access_alert_1" => "With setting »YES«, all respondents will be able to access survey!",
"srv_user_base_access_alert_2" => "Only author can access survey without a code!", "srv_user_base_access_alert_2" => "Only author can access survey without a code!",
"srv_user_base_email_server_settings" => "Email server settings", "srv_user_base_email_server_settings" => "Email server settings",
"srv_email_server_settings_warning" => "Warning! Same email server settings are used for email alerts and email invitations!", "srv_email_server_settings_warning" => "<span class=\"red\">Warning!</span> Same email server settings are used for email alerts and email invitations!",
"srv_massinsert" => "Mass insert", "srv_massinsert" => "Mass insert",
"srv_massdelete" => "Delete all entries", "srv_massdelete" => "Delete all entries",
"srv_masstxt" => "Add one user per line, starting with their email and following with their name (only e-mail or only name is ok too).<br /><br />Example:<br />john.smith@example.com John Smith<br />john.smith@example.com<br />John Smith", "srv_masstxt" => "Add one user per line, starting with their email and following with their name (only e-mail or only name is ok too).<br /><br />Example:<br />john.smith@example.com John Smith<br />john.smith@example.com<br />John Smith",
@ -6645,7 +6645,7 @@ $lang = array (
'srv_email_setting_adapter2' => 'Own SMTP settings', 'srv_email_setting_adapter2' => 'Own SMTP settings',
'srv_email_setting_adapter2_note' => 'Contact your mail server administrator for information. <a href="https://www.1ka.si/d/en/help/manuals/sending-emails-via-an-arbitrary-server-eg-gmail?from1ka=1" target="_blank">More >></a>', 'srv_email_setting_adapter2_note' => 'Contact your mail server administrator for information. <a href="https://www.1ka.si/d/en/help/manuals/sending-emails-via-an-arbitrary-server-eg-gmail?from1ka=1" target="_blank">More >></a>',
'srv_email_setting_adapter_set' => 'You must set mail server', 'srv_email_setting_adapter_set' => 'You must set mail server',
'srv_email_setting_from' => 'From (email): ', 'srv_email_setting_from' => 'Sender\'s e-mail: ',
'srv_email_setting_reply' => 'Reply-to: ', 'srv_email_setting_reply' => 'Reply-to: ',
'srv_email_setting_username' => 'Username: ', 'srv_email_setting_username' => 'Username: ',
'srv_email_setting_password' => 'Password: ', 'srv_email_setting_password' => 'Password: ',
@ -7635,7 +7635,7 @@ $lang = array (
"export_analysis_heatmap_image" => "ANALYSIS - Heatmap", "export_analysis_heatmap_image" => "ANALYSIS - Heatmap",
'export_analysis_heatmap_msg' => "To show the heatmap, you have to generate it with a click on the table cell Heatmap", 'export_analysis_heatmap_msg' => "To show the heatmap, you have to generate it with a click on the table cell Heatmap",
'srv_export_as' => "Export as", 'srv_export_as' => "Export as",
'srv_email_setting_from_nice' => "From (name): ", 'srv_email_setting_from_nice' => "Sender's name: ",
'srv_ranking_available_categories' => "Available categories", 'srv_ranking_available_categories' => "Available categories",
'srv_export_hotspot_regions_names' => "Image regions", 'srv_export_hotspot_regions_names' => "Image regions",
'srv_export_hotspot_chosen_regions_names' => "Chosen regions", 'srv_export_hotspot_chosen_regions_names' => "Chosen regions",

2906
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

29
resources/sass/admin_new/pages/survey_edit/gdpr_anketa.scss Normal file
View File

@ -0,0 +1,29 @@
fieldset#gdpr_anketa {
.setting_holder {
&.horizontal {
display: flex;
flex-direction: row;
gap: 16px;
.setting_holder {
margin-bottom: 0;
display: flex;
.large {
width: 300px;
}
.fold {
display: flex;
flex-direction: row;
height: 100%;
align-items: center;
width: 300px;
}
}
}
}
}

4
resources/sass/admin_new/pages/survey_edit/survey_edit.scss
View File

@ -23,4 +23,6 @@
@import "popups/popups"; @import "popups/popups";
@import "telefonska_anketa"; @import "telefonska_anketa";
@import "jezik"; @import "jezik";
@import "gdpr_anketa";