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

[Redizajn 1KA] - Nastavitve --> Nastavitve uporabnika v1

Browse Source
This commit is contained in:
tejagerjovic 2021-12-22 16:42:29 +01:00
parent 9124db089a
commit aecaa3312d
3 changed files with 82 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
admin/survey/SurveyAdminSettings.php
View File

@ -9724,7 +9724,10 @@ class SurveyAdminSettings {
} }
function globalUserSettings () { function globalUserSettings () {
global $lang, $global_user_id, $admin_type; global $lang, $global_user_id, $admin_type, $site_url;
$preklici_url = ltrim(str_replace("&s=1","",$_SERVER['REQUEST_URI']),"/");
$preklici_url = "'". $site_url . $preklici_url . "'";
# polovimo nastavitve uporabnika # polovimo nastavitve uporabnika
UserSetting::getInstance()->Init($global_user_id); UserSetting::getInstance()->Init($global_user_id);
@ -9766,41 +9769,44 @@ class SurveyAdminSettings {
$sql = sisplet_query("SELECT lang FROM users WHERE id = '$global_user_id'"); $sql = sisplet_query("SELECT lang FROM users WHERE id = '$global_user_id'");
$row = mysqli_fetch_array($sql); $row = mysqli_fetch_array($sql);
$lang_admin = $row['lang']; $lang_admin = $row['lang'];
echo '<span class="nastavitveSpan6">'.$lang['lang'] . ':</span><select name="language">';
echo '<div class="setting_holder">';
echo '<label for="language">'.$lang['lang'] . ':</label><select class="dropdown large" name="language" id="language">';
echo '<option value="1"'.($lang_admin == 1?' selected':'').'>Slovenščina</option>'; echo '<option value="1"'.($lang_admin == 1?' selected':'').'>Slovenščina</option>';
echo '<option value="2"'.($lang_admin == 2?' selected':'').'>English</option>'; echo '<option value="2"'.($lang_admin == 2?' selected':'').'>English</option>';
echo '</select>'; echo '</select>';
echo '</div>';
echo '<br />';
// Napredni vmesnik (star design za moje ankete) // Napredni vmesnik (star design za moje ankete)
echo '<label><span class="nastavitveSpan6">'.$lang['srv_settings_language_shortcut'].':</span>'; echo '<div class="setting_holder">';
echo '<input name="showLanguageShortcut" type="hidden" value="0">'; echo '<input name="showLanguageShortcut" type="hidden" value="0">';
echo '<input name="showLanguageShortcut" type="checkbox" value="1" '.($showLanguageShortcut == 1?' checked="checked"':'').'></label>'; echo '<input id="showLanguageShortcut" name="showLanguageShortcut" type="checkbox" value="1" '.($showLanguageShortcut == 1?' checked="checked"':'').'>';
echo '<label for="showLanguageShortcut">'.$lang['srv_settings_language_shortcut'].'</label>';
echo '<br />'; echo '</div>';
// Prikaži ikono za jezik v navigacijski vrstici ankete, desno zgoraj // Prikaži ikono za jezik v navigacijski vrstici ankete, desno zgoraj
echo '<label><span class="nastavitveSpan6">'.$lang['srv_lock_survey_when_activate'].' </span>'; echo '<div class="setting_holder">';
echo '<input name="lockSurvey" type="hidden" value="0">'; echo '<input name="lockSurvey" type="hidden" value="0">';
echo '<input name="lockSurvey" type="checkbox" value="1" '.($lockSurvey == 1?' checked="checked"':'').'></label>'; echo '<input name="lockSurvey" id="lockSurvey" type="checkbox" value="1" '.($lockSurvey == 1?' checked="checked"':'').'>';
echo '<label for="lockSurvey">'.$lang['srv_lock_survey_when_activate'].'</label>';
echo '<br />'; echo '</div>';
// Opcija enklik ustvarjanja ankete (v mojih anketah) // Opcija enklik ustvarjanja ankete (v mojih anketah)
echo '<label><span class="nastavitveSpan6">'.$lang['srv_settings_oneClickCreate'].':</span>'; echo '<div class="setting_holder">';
echo '<input name="oneclickCreateMySurveys" type="hidden" value="0">'; echo '<input name="oneclickCreateMySurveys" type="hidden" value="0">';
echo '<input name="oneclickCreateMySurveys" type="checkbox" value="1" '.($oneclickCreateMySurveys == 1?' checked="checked"':'').'></label>'; echo '<input id="oneclickCreateMySurveys" name="oneclickCreateMySurveys" type="checkbox" value="1" '.($oneclickCreateMySurveys == 1?' checked="checked"':'').'>';
echo '<label for="oneclickCreateMySurveys">'.$lang['srv_settings_oneClickCreate'].'</label>';
echo '<br />'; echo '</div>';
// Možnost prikaza SA ikone pri vseh anketah // Možnost prikaza SA ikone pri vseh anketah
if($admin_type < 3) { if($admin_type < 3) {
$showSAicon = UserSetting::getInstance()->getUserSetting('showSAicon'); $showSAicon = UserSetting::getInstance()->getUserSetting('showSAicon');
echo '<label><span class="nastavitveSpan6">' . $lang['srv_settings_showSAicon'] . ':</span>'; echo '<div class="setting_holder">';
echo '<input name="showSAicon" type="hidden" value="0">'; echo '<input name="showSAicon" type="hidden" value="0">';
echo '<input name="showSAicon" type="checkbox" value="1" ' . ($showSAicon == 1 ? ' checked="checked"' : '') . '></label>'; echo '<input id="showSAicon" name="showSAicon" type="checkbox" value="1" ' . ($showSAicon == 1 ? ' checked="checked"' : '') . '>';
echo '<label for="showSAicon">' . $lang['srv_settings_showSAicon'] .'</label>';
echo '</div>';
} }
echo '</fieldset>'; echo '</fieldset>';
@ -9808,41 +9814,44 @@ class SurveyAdminSettings {
echo '<fieldset><legend>'.$lang['srv_survey_settings'].'</legend>'; echo '<fieldset><legend>'.$lang['srv_survey_settings'].'</legend>';
echo '<p class="bottom16">'.$lang['srv_settings_oncreation'].'</p>';
// Aktivna anketa ob aktivaciji - TO PUSTIMO SAMO ADMINOM ZARADI GDPR OPOZORILA OB AKTIVACIJI // Aktivna anketa ob aktivaciji - TO PUSTIMO SAMO ADMINOM ZARADI GDPR OPOZORILA OB AKTIVACIJI
if($admin_type == '0'){ if($admin_type == '0'){
echo '<label><span class="nastavitveSpan6">'.$lang['srv_settings_autoActiveSurvey'].': </span>'; echo '<div class="setting_holder">';
echo '<input name="autoActiveSurvey" type="hidden" value="0">'; echo '<input name="autoActiveSurvey" type="hidden" value="0">';
echo '<input name="autoActiveSurvey" type="checkbox" value="1" '.($autoActiveSurvey == 1?' checked="checked"':'').'></label>'; echo '<input id="autoActiveSurvey" name="autoActiveSurvey" type="checkbox" value="1" '.($autoActiveSurvey == 1?' checked="checked"':'').'>';
echo '<label for="autoActiveSurvey">'.$lang['srv_settings_autoActiveSurvey'].'</label>';
echo '<br />'; echo '</div>';
} }
// Komentarji aktivirani ob kreaciji ankete // Komentarji aktivirani ob kreaciji ankete
echo '<label><span class="nastavitveSpan6">'.$lang['srv_settings_activeComments'].': </span>'; echo '<div class="setting_holder">';
echo '<input name="activeComments" type="hidden" value="0">'; echo '<input name="activeComments" type="hidden" value="0">';
echo '<input name="activeComments" type="checkbox" value="1" '.($activeComments == 1?' checked="checked"':'').'></label>'; echo '<input id="activeComments" name="activeComments" type="checkbox" value="1" '.($activeComments == 1?' checked="checked"':'').'>';
echo '<label for="activeComments">'.$lang['srv_settings_activeComments'].'</label>';
echo '<br /><br />'; echo '</div>';
// Uvod ob aktivaciji prikazan // Uvod ob aktivaciji prikazan
echo '<label><span class="nastavitveSpan6">'.$lang['srv_create_show_intro'].': </span>'; echo '<div class="setting_holder">';
echo '<input name="showIntro" type="hidden" value="0">'; echo '<input name="showIntro" type="hidden" value="0">';
echo '<input name="showIntro" type="checkbox" value="1" '.($showIntro == 1?' checked="checked"':'').'></label>'; echo '<input id="showIntro" name="showIntro" type="checkbox" value="1" '.($showIntro == 1?' checked="checked"':'').'>';
echo '<label for="showIntro">'.$lang['srv_create_show_intro'].'</label>';
echo '<br />'; echo '</div>';
// Zakljucek ob aktivaciji prikazan // Zakljucek ob aktivaciji prikazan
echo '<label><span class="nastavitveSpan6">'.$lang['srv_create_show_concl'].': </span>'; echo '<div class="setting_holder">';
echo '<input name="showConcl" type="hidden" value="0">'; echo '<input name="showConcl" type="hidden" value="0">';
echo '<input name="showConcl" type="checkbox" value="1" '.($showConcl == 1?' checked="checked"':'').'></label>'; echo '<input id="showConcl" name="showConcl" type="checkbox" value="1" '.($showConcl == 1?' checked="checked"':'').'>';
echo '<label for="showConcl">'.$lang['srv_create_show_concl'].'</label>';
echo '<br />'; echo '</div>';
// Ime ob aktivaciji prikazano za respondente // Ime ob aktivaciji prikazano za respondente
echo '<label><span class="nastavitveSpan6">'.$lang['srv_create_show_title'].': </span>'; echo '<div class="setting_holder">';
echo '<input name="showSurveyTitle" type="hidden" value="0">'; echo '<input name="showSurveyTitle" type="hidden" value="0">';
echo '<input name="showSurveyTitle" type="checkbox" value="1" '.($showSurveyTitle == 1?' checked="checked"':'').'></label>'; echo '<input name="showSurveyTitle" type="checkbox" value="1" '.($showSurveyTitle == 1?' checked="checked"':'').'>';
echo '<label>'.$lang['srv_create_show_title'].'</label>';
echo '</div>';
echo '</fieldset>'; echo '</fieldset>';
@ -9852,9 +9861,12 @@ class SurveyAdminSettings {
// API avtentikacija // API avtentikacija
echo '<fieldset><legend>'.$lang['srv_api'].'</legend>'; echo '<fieldset><legend>'.$lang['srv_api'].'</legend>';
echo '<span class="nastavitveSpan6">'.$lang['srv_api_auth'].': </span>'; echo '<p class="bottom16">'.$lang['srv_api_auth'].':</p>';
echo '<a href="#" onClick="generate_API_key(); return false;">'.$lang['srv_api_auth2'].'</a>';
echo '<br /><br />'; echo '<div class="button_holder bottom16">';
echo '<button type="button" class="medium white-black" onClick="generate_API_key(); return false;">'.$lang['srv_api_auth2'].'</button>';
echo '</div>';
echo $lang['additional_info_api']; echo $lang['additional_info_api'];
@ -9862,9 +9874,10 @@ class SurveyAdminSettings {
// save gumb // save gumb
echo ' <div class="buttonwrapper floatLeft spaceLeft"><a class="ovalbutton ovalbutton_orange btn_savesettings" href="#" onclick="document.settingsanketa.submit();"><span>'.$lang['edit1337'] . '</span></a></div>'; echo '<div class="button_holder">';
echo '<button class="medium white-blue" onClick="window.location='.$preklici_url.';return false;">'.$lang['edit1338'].'</button>';
echo '<span class="clr"></span>'; echo '<button class="medium blue" onclick="document.settingsanketa.submit();">'.$lang['edit1337'].'</button>';
echo '</div>';
// div za prikaz uspešnosti shranjevanja // div za prikaz uspešnosti shranjevanja
if ($_GET['s'] == '1') { if ($_GET['s'] == '1') {

19
lang/1.php
View File

@ -5785,7 +5785,7 @@ $lang = array (
"srv_user_notbanned" => "Uporabnik je aktiven", "srv_user_notbanned" => "Uporabnik je aktiven",
"srv_displayifs" => "Prikaži pogoje in bloke pred vprašanjem", "srv_displayifs" => "Prikaži pogoje in bloke pred vprašanjem",
"srv_user_settings" => "Nastavitve uporabnika", "srv_user_settings" => "Nastavitve uporabnika",
"srv_lock_survey_when_activate" => "Zakleni anketo ob aktivaciji:", "srv_lock_survey_when_activate" => "Zakleni urejanje ankete ob aktivaciji",
"srv_validation" => "Validacija", "srv_validation" => "Validacija",
"srv_validation_no" => "Vprašanje nima nastavljenih validacijskih omejitev", "srv_validation_no" => "Vprašanje nima nastavljenih validacijskih omejitev",
"srv_validation_new" => "Dodaj validacijo", "srv_validation_new" => "Dodaj validacijo",
@ -6664,10 +6664,11 @@ $lang = array (
'more' => 'še', 'more' => 'še',
'more2' => 'Več', 'more2' => 'Več',
'srv_settings_activity' => 'Aktivnost / kvote', 'srv_settings_activity' => 'Aktivnost / kvote',
'srv_settings_autoActiveSurvey' => 'Anketa je ob kreaciji aktivna', 'srv_settings_oncreation' => 'Ob kreaciji ankete',
'srv_settings_activeComments' => 'Komentarji so ob kreaciji vklopljeni', 'srv_settings_autoActiveSurvey' => 'Anketa je aktivna',
'srv_settings_activeComments' => 'Komentarji so vklopljeni',
'srv_settings_advancedMySurveys' => 'Napredni vmesnik za "Moje ankete"', 'srv_settings_advancedMySurveys' => 'Napredni vmesnik za "Moje ankete"',
'srv_settings_oneClickCreate' => 'Možnost enklik kreiranja ankete', 'srv_settings_oneClickCreate' => 'Možnost kreiranja ankete z enim klikom (ENKLIK kreiranje)',
'srv_settings_language_shortcut' => 'Prikaži ikono za izbiro jezika v statusni vrstici ankete', 'srv_settings_language_shortcut' => 'Prikaži ikono za izbiro jezika v statusni vrstici ankete',
'srv_settings_showSAicon' => 'Prikaži ikono za hitro aktiviranje SA modula', 'srv_settings_showSAicon' => 'Prikaži ikono za hitro aktiviranje SA modula',
'srv_language_mySurveys' => 'Jezik za "Moje ankete" lahko urejate v <a href="index.php?a=nastavitve&m=global_user_settings">nastavitvah uporabnika</a>', 'srv_language_mySurveys' => 'Jezik za "Moje ankete" lahko urejate v <a href="index.php?a=nastavitve&m=global_user_settings">nastavitvah uporabnika</a>',
@ -6779,9 +6780,9 @@ $lang = array (
'edit_hide' => "Skrij", 'edit_hide' => "Skrij",
'edit_show' => "Prikaži", 'edit_show' => "Prikaži",
'srv_show_title' => "Naslov ankete za uporabnike", 'srv_show_title' => "Naslov ankete za uporabnike",
'srv_create_show_intro' => "Uvod je ob kreaciji prikazan", 'srv_create_show_intro' => "Uvod je viden respondentom",
'srv_create_show_concl' => "Zaključek je ob kreaciji prikazan", 'srv_create_show_concl' => "Zaključek je viden respondentom",
'srv_create_show_title' => "Naslov ankete je ob kreaciji prikazan za respondente", 'srv_create_show_title' => "Naslov ankete je viden respondentom",
'srv_displayData_search' => "Podatki so filtrirani", 'srv_displayData_search' => "Podatki so filtrirani",
'srv_signature_clear' => "Počisti podpis", 'srv_signature_clear' => "Počisti podpis",
'srv_signature_name' => "Podpis osebe:", 'srv_signature_name' => "Podpis osebe:",
@ -7383,7 +7384,7 @@ $lang = array (
'srv_diferencial_trak_starting_num' => "Trak začni s številom", 'srv_diferencial_trak_starting_num' => "Trak začni s številom",
'srv_api' => "API", 'srv_api' => "API",
'srv_api_auth' => "Pridobitev ključa za API", 'srv_api_auth' => "Pridobitev ključa za API",
'srv_api_auth2' => "Generiraj", 'srv_api_auth2' => "Generiranje ključa",
'srv_api_auth_title' => "Podatki za API dostop", 'srv_api_auth_title' => "Podatki za API dostop",
'srv_login_tracking_title' => "Zgodovina prijav", 'srv_login_tracking_title' => "Zgodovina prijav",
'srv_login_tracking_noData' => "Ni podatkov o prijavah", 'srv_login_tracking_noData' => "Ni podatkov o prijavah",
@ -7447,7 +7448,7 @@ $lang = array (
'srv_export_no_chart' => "Ni ustreznega grafa za prikazovanje", 'srv_export_no_chart' => "Ni ustreznega grafa za prikazovanje",
'srv_export_2_xls_button' => "Izvozi v Excel", 'srv_export_2_xls_button' => "Izvozi v Excel",
'srv_pc_unavailable' => "Prikaz slike ni mogoč", 'srv_pc_unavailable' => "Prikaz slike ni mogoč",
"additional_info_api" => "<a href=\"https://www.1ka.si/d/sl/o-1ka/1ka-api\" target=\"_blank\"><span class=\"bold\">Dodatne informacije</span></a>", "additional_info_api" => "<a href=\"https://www.1ka.si/d/sl/o-1ka/1ka-api\" target=\"_blank\"><p>Dodatne informacije</p></a>",

19
lang/2.php
View File

@ -5682,7 +5682,7 @@ $lang = array (
"srv_user_notbanned" => "User is not banned", "srv_user_notbanned" => "User is not banned",
"srv_displayifs" => "Display conditions and blocks above the question", "srv_displayifs" => "Display conditions and blocks above the question",
"srv_user_settings" => "User settings", "srv_user_settings" => "User settings",
"srv_lock_survey_when_activate" => "Lock survey when activated:", "srv_lock_survey_when_activate" => "Lock survey editing upon activation",
"srv_validation" => "Validation", "srv_validation" => "Validation",
"srv_validation_no" => "Question does not have any validations", "srv_validation_no" => "Question does not have any validations",
"srv_validation_new" => "New validation", "srv_validation_new" => "New validation",
@ -6549,10 +6549,11 @@ $lang = array (
'more' => '', 'more' => '',
'more2' => 'More', 'more2' => 'More',
'srv_settings_activity' => 'Activity / quotas', 'srv_settings_activity' => 'Activity / quotas',
'srv_settings_autoActiveSurvey' => 'Survey is active after creation', 'srv_settings_oncreation' => 'After survey creation',
'srv_settings_activeComments' => 'Comments are enabled after creation', 'srv_settings_autoActiveSurvey' => 'Survey is active',
'srv_settings_activeComments' => 'Comments are enabled',
'srv_settings_advancedMySurveys' => 'Advanced interface for "My surveys"', 'srv_settings_advancedMySurveys' => 'Advanced interface for "My surveys"',
'srv_settings_oneClickCreate' => 'Show option oneclick create survey', 'srv_settings_oneClickCreate' => 'Option to create a survey with one click (ONECLICK Creation)',
'srv_settings_language_shortcut' => 'Show the language selection icon in the survey status bar', 'srv_settings_language_shortcut' => 'Show the language selection icon in the survey status bar',
'srv_settings_showSAicon' => 'Show icon for quick activation of SA module', 'srv_settings_showSAicon' => 'Show icon for quick activation of SA module',
'srv_language_mySurveys' => 'Language for "My surveys" can be edited in <a href="index.php?a=nastavitve&m=global_user_settings">user settings</a>', 'srv_language_mySurveys' => 'Language for "My surveys" can be edited in <a href="index.php?a=nastavitve&m=global_user_settings">user settings</a>',
@ -6665,9 +6666,9 @@ $lang = array (
'edit_hide' => "Hide", 'edit_hide' => "Hide",
'edit_show' => "Show", 'edit_show' => "Show",
'srv_show_title' => "Survey title for respondents", 'srv_show_title' => "Survey title for respondents",
'srv_create_show_intro' => "Intro is displayed at survey creation", 'srv_create_show_intro' => "Intro is visible to respondents",
'srv_create_show_concl' => "Conclusion is displayed at survey creation", 'srv_create_show_concl' => "Conclusion is visible to respondents",
'srv_create_show_title' => "Title is displayed at survey creation", 'srv_create_show_title' => "Title is visible to respondents",
'srv_displayData_search' => "Data is filtered", 'srv_displayData_search' => "Data is filtered",
'srv_signature_clear' => "Clear signature", 'srv_signature_clear' => "Clear signature",
'srv_signature_name' => "Signature of:", 'srv_signature_name' => "Signature of:",
@ -7267,7 +7268,7 @@ $lang = array (
'srv_hotspot_visibility_color_text' => "Color of visible region", 'srv_hotspot_visibility_color_text' => "Color of visible region",
'srv_api' => "API", 'srv_api' => "API",
'srv_api_auth' => "Get API key", 'srv_api_auth' => "Get API key",
'srv_api_auth2' => "Generate", 'srv_api_auth2' => "Generate key",
'srv_api_auth_title' => "API Access", 'srv_api_auth_title' => "API Access",
'srv_login_tracking_title' => "Login history", 'srv_login_tracking_title' => "Login history",
'srv_login_tracking_noData' => "No login data", 'srv_login_tracking_noData' => "No login data",
@ -7332,7 +7333,7 @@ $lang = array (
'srv_export_respondent_data_heatmap_regions_number' => "Number of clicks inside region", 'srv_export_respondent_data_heatmap_regions_number' => "Number of clicks inside region",
'srv_export_2_xls_button' => "Export to Excel", 'srv_export_2_xls_button' => "Export to Excel",
'srv_pc_unavailable' => "Image unavailable", 'srv_pc_unavailable' => "Image unavailable",
"additional_info_api" => "<a href=\"https://www.1ka.si/d/en/about/1ka-api\" target=\"_blank\"><span class=\"bold\">Additional information</span></a>", "additional_info_api" => "<a href=\"https://www.1ka.si/d/en/about/1ka-api\" target=\"_blank\"><p>Additional information</p></a>",