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

Menjava show_success_save na actionNotePopup

Browse Source
This commit is contained in:
tejagerjovic 2022-03-11 00:34:08 +01:00
parent 50e2a7b780
commit 1279ba69c2
12 changed files with 29 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
admin/survey/SurveyAdmin.php
View File

@ -5724,21 +5724,6 @@ class SurveyAdmin
} }
} }
/** prikaze div da so nastavitve shranjene in ga nato skrije
*
*/
function displaySuccessSave(){
global $lang;
echo $lang['srv_success_save'];
}
function displaySuccessCopy() {
global $lang;
echo $lang['srv_diagnostika_testiranje_copied'];
}
/** pravilno redirekta admin url ankete /** pravilno redirekta admin url ankete
* če je anketa aktivna gre na dashboard * če je anketa aktivna gre na dashboard
* če anketa ni aktivna gre na: * če anketa ni aktivna gre na:

4
admin/survey/SurveyAdminAjax.php
View File

@ -4555,10 +4555,6 @@ class SurveyAdminAjax {
UserSetting::getInstance()->setUserSetting('full_screen_edit', $_POST['full_screen_edit']); UserSetting::getInstance()->setUserSetting('full_screen_edit', $_POST['full_screen_edit']);
} }
UserSetting::getInstance()->saveUserSetting(); UserSetting::getInstance()->saveUserSetting();
} elseif ($_GET['a'] == 'display_success_save') {
$this->SurveyAdmin->displaySuccessSave();
} elseif ($_GET['a'] == 'display_success_copy') {
$this->SurveyAdmin->displaySuccessCopy();
} elseif ($_GET['a'] == 'vnosi_show_status_casi') { } elseif ($_GET['a'] == 'vnosi_show_status_casi') {
SurveyStatusCasi :: Init($anketa); SurveyStatusCasi :: Init($anketa);
if (isset($pid) && $pid > 0) { if (isset($pid) && $pid > 0) {

38
admin/survey/SurveyAdminSettings.php
View File

@ -2083,7 +2083,7 @@ class SurveyAdminSettings {
if ($_GET['s'] == '1') { if ($_GET['s'] == '1') {
echo '<div id="success_save"></div>'; echo '<div id="success_save"></div>';
echo '<script type="text/javascript">$(document).ready(function() {show_success_save();});</script>'; echo '<script type="text/javascript">$(document).ready(function() {actionNotePopup(\'success_save\', \'success\');});</script>';
} }
echo '</form>'; echo '</form>';
@ -2216,7 +2216,7 @@ class SurveyAdminSettings {
if ($_GET['s'] == '1') { if ($_GET['s'] == '1') {
echo '<div id="success_save"></div>'; echo '<div id="success_save"></div>';
echo '<script type="text/javascript">$(document).ready(function() {show_success_save();});</script>'; echo '<script type="text/javascript">$(document).ready(function() {actionNotePopup(\'success_save\', \'success\');});</script>';
} }
} }
@ -3196,7 +3196,7 @@ class SurveyAdminSettings {
echo $lang['edit1337'] . '</span></a></div></span>'; echo $lang['edit1337'] . '</span></a></div></span>';
if ($_GET['s'] == '1') { if ($_GET['s'] == '1') {
echo '<div id="success_save"></div>'; echo '<div id="success_save"></div>';
echo '<script type="text/javascript">$(document).ready(function() {show_success_save();});</script>'; echo '<script type="text/javascript">$(document).ready(function() {actionNotePopup(\'success_save\', \'success\');});</script>';
} }
#echo '</div>'; #echo '</div>';
@ -3454,7 +3454,7 @@ class SurveyAdminSettings {
if ($_GET['s'] == '1') { if ($_GET['s'] == '1') {
echo '<div id="success_save"></div>'; echo '<div id="success_save"></div>';
echo '<script type="text/javascript">$(document).ready(function() {show_success_save();});</script>'; echo '<script type="text/javascript">$(document).ready(function() {actionNotePopup(\'success_save\', \'success\');});</script>';
} }
echo ' </form>'; echo ' </form>';
} else if ($tab == 'expired') { } else if ($tab == 'expired') {
@ -3555,7 +3555,7 @@ class SurveyAdminSettings {
if ($_GET['s'] == '1') { if ($_GET['s'] == '1') {
echo '<div id="success_save"></div>'; echo '<div id="success_save"></div>';
echo '<script type="text/javascript">$(document).ready(function() {show_success_save();});</script>'; echo '<script type="text/javascript">$(document).ready(function() {actionNotePopup(\'success_save\', \'success\');});</script>';
} }
echo '</form>'; echo '</form>';
} }
@ -3666,7 +3666,7 @@ class SurveyAdminSettings {
if ($_GET['s'] == '1') { if ($_GET['s'] == '1') {
echo '<div id="success_save"></div>'; echo '<div id="success_save"></div>';
echo '<script type="text/javascript">$(document).ready(function() {show_success_save();});</script>'; echo '<script type="text/javascript">$(document).ready(function() {actionNotePopup(\'success_save\', \'success\');});</script>';
} }
echo '</form>'; echo '</form>';
} }
@ -3752,7 +3752,7 @@ class SurveyAdminSettings {
if ($_GET['s'] == '1') { if ($_GET['s'] == '1') {
echo '<div id="success_save"></div>'; echo '<div id="success_save"></div>';
echo '<script type="text/javascript">$(document).ready(function() {show_success_save();});</script>'; echo '<script type="text/javascript">$(document).ready(function() {actionNotePopup(\'success_save\', \'success\');});</script>';
} }
echo '</form>'; echo '</form>';
@ -3951,7 +3951,7 @@ class SurveyAdminSettings {
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 '<div id="success_save" style="float:left; display:inline; margin: -2px 0 0 0;"></div>';
echo '<script type="text/javascript">$(document).ready(function() {show_success_save();});</script>'; echo '<script type="text/javascript">$(document).ready(function() {actionNotePopup(\'success_save\', \'success\');});</script>';
} }
} }
@ -4609,7 +4609,7 @@ class SurveyAdminSettings {
if ($_GET['s'] == '1') { if ($_GET['s'] == '1') {
echo '<div id="success_save"></div>'; echo '<div id="success_save"></div>';
echo '<script type="text/javascript">$(document).ready(function() {show_success_save();});</script>'; echo '<script type="text/javascript">$(document).ready(function() {actionNotePopup(\'success_save\', \'success\');});</script>';
} }
} }
@ -5782,7 +5782,7 @@ class SurveyAdminSettings {
// div za prikaz uspešnosti shranjevanja // div za prikaz uspešnosti shranjevanja
if ($_GET['s'] == '1') { if ($_GET['s'] == '1') {
echo '<div id="success_save"></div>'; echo '<div id="success_save"></div>';
echo '<script type="text/javascript">$(document).ready(function() {show_success_save();});</script>'; echo '<script type="text/javascript">$(document).ready(function() {actionNotePopup(\'success_save\', \'success\');});</script>';
} }
@ -5860,20 +5860,6 @@ class SurveyAdminSettings {
echo '</div>'; echo '</div>';
} }
/** prikaze div da so nastavitve shranjene in ga nato skrije
*
*/
function displaySuccessSave() {
global $lang;
echo $lang['srv_success_save'];
}
function displaySuccessCopy() {
global $lang;
echo $lang['srv_diagnostika_testiranje_copied'];
}
function tabTestiranje () { function tabTestiranje () {
global $lang; global $lang;
@ -10338,7 +10324,7 @@ class SurveyAdminSettings {
// div za prikaz uspešnosti shranjevanja // div za prikaz uspešnosti shranjevanja
if ($_GET['s'] == '1') { if ($_GET['s'] == '1') {
echo '<div id="success_save"></div>'; echo '<div id="success_save"></div>';
echo '<script type="text/javascript">$(document).ready(function() {show_success_save();});</script>'; echo '<script type="text/javascript">$(document).ready(function() {actionNotePopup(\'success_save\', \'success\');});</script>';
} }
echo '</div>'; echo '</div>';
@ -10601,7 +10587,7 @@ class SurveyAdminSettings {
// div za prikaz uspešnosti shranjevanja // div za prikaz uspešnosti shranjevanja
if ($_GET['s'] == '1') { if ($_GET['s'] == '1') {
echo '<div id="success_save"></div>'; echo '<div id="success_save"></div>';
echo '<script type="text/javascript">$(document).ready(function() {show_success_save();});</script>'; echo '<script type="text/javascript">$(document).ready(function() {actionNotePopup(\'success_save\', \'success\');});</script>';
} }
} }

2
admin/survey/classes/class.GDPR.php
View File

@ -310,7 +310,7 @@ class GDPR{
if ($_GET['s'] == '1') { if ($_GET['s'] == '1') {
echo '<span class="clr"></span>'; echo '<span class="clr"></span>';
echo '<div id="success_save"></div>'; echo '<div id="success_save"></div>';
echo '<script type="text/javascript">$(document).ready(function() {show_success_save();});</script>'; echo '<script type="text/javascript">$(document).ready(function() {actionNotePopup(\'success_save\', \'success\');});</script>';
} }
echo '</form>'; echo '</form>';

2
admin/survey/classes/class.SurveyDiagnostics.php
View File

@ -173,7 +173,7 @@ class SurveyDiagnostics
echo '<span class="faicon link-chain link-right blue"></span><span class="italic"></span>'; echo '<span class="faicon link-chain link-right blue"></span><span class="italic"></span>';
echo '<input type="text" onClick="this.select();" value="'.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.'" readonly/>'; echo '<input type="text" onClick="this.select();" value="'.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.'" readonly/>';
echo '</div>'; echo '</div>';
echo '<button type="button" class="medium blue" onclick="CopyToClipboard(\''.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.'\'); show_success_copy();">'.$lang['srv_diagnostika_testiranje_copy'].'</button>'; echo '<button type="button" class="medium blue" onclick="CopyToClipboard(\''.SurveyInfo::getSurveyLink().'&preview=on&testdata=on'.$preview_options.'\'); actionNotePopup(\'link_copied\', \'success\');">'.$lang['srv_diagnostika_testiranje_copy'].'</button>';
echo '</div>'; echo '</div>';
echo '<div id="success_copy"></div>'; echo '<div id="success_copy"></div>';

2
admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php
View File

@ -10026,7 +10026,7 @@ class SurveyInvitationsNew {
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 '<div id="success_save" style="float:left; display:inline; margin: -2px 0 0 0;"></div>';
echo '<script type="text/javascript">$(document).ready(function() {show_success_save();});</script>'; echo '<script type="text/javascript">$(document).ready(function() {actionNotePopup(\'success_save\', \'success\');});</script>';
} }
} }

35
admin/survey/script/script.js
View File

@ -3689,7 +3689,7 @@ function save_user_settings() {
var icons_always_on = $("input[name=icons_always_on]:checked").val(); var icons_always_on = $("input[name=icons_always_on]:checked").val();
var full_screen_edit = $("input[name=full_screen_edit]:checked").val(); var full_screen_edit = $("input[name=full_screen_edit]:checked").val();
$.post('ajax.php?a=save_user_settings', {icons_always_on: icons_always_on, full_screen_edit: full_screen_edit}, function() { $.post('ajax.php?a=save_user_settings', {icons_always_on: icons_always_on, full_screen_edit: full_screen_edit}, function() {
show_success_save(); actionNotePopup('success_save', 'success');
}); });
} }
@ -3700,25 +3700,13 @@ function updateManual1() {
$("#radioManual1").attr("checked", "checked"); $("#radioManual1").attr("checked", "checked");
} }
// SE POBRIŠE IN UPORABI "actionNotePopup"!!
function show_success_save(timeout){
if (timeout == undefined)
timeout = 10000;
$(".btn_savesettings").addClass('ovalbutton_orange').removeClass('ovalbutton_orange');
$('#success_save').load('ajax.php?a=display_success_save', {anketa: srv_meta_anketa_id}).show();
setTimeout(function() {$('#success_save').animate({opacity:0})}, timeout);
}
function chnage_full_screen_edit() { function chnage_full_screen_edit() {
//srv_meta_full_screen_edit = $("input[name=full_screen_edit]:checked").val(); //srv_meta_full_screen_edit = $("input[name=full_screen_edit]:checked").val();
srv_meta_full_screen_edit = $("input[name=full_screen_edit]").is(':checked') ? 1 : 0; srv_meta_full_screen_edit = $("input[name=full_screen_edit]").is(':checked') ? 1 : 0;
$.post('ajax.php?a=save_user_settings', {anketa: srv_meta_anketa_id, full_screen_edit: srv_meta_full_screen_edit}, function() { $.post('ajax.php?a=save_user_settings', {anketa: srv_meta_anketa_id, full_screen_edit: srv_meta_full_screen_edit}, function() {
show_success_save(); actionNotePopup('success_save', 'success');
}); });
} }
@ -4941,7 +4929,7 @@ function chat_save_settings() {
var chat_type = $('input[name=chat_type]:checked').val(); var chat_type = $('input[name=chat_type]:checked').val();
$.post('ajax.php?t=chat&a=save_settings', {anketa: srv_meta_anketa_id, code:code, chat_type:chat_type}, function(){ $.post('ajax.php?t=chat&a=save_settings', {anketa: srv_meta_anketa_id, code:code, chat_type:chat_type}, function(){
show_success_save(); actionNotePopup('success_save', 'success');
}); });
} }
@ -4953,7 +4941,7 @@ function quiz_save_settings() {
var results_chart = $("input[name=quiz_results_chart]:checked").val(); var results_chart = $("input[name=quiz_results_chart]:checked").val();
$.post('ajax.php?t=quiz&a=save_settings', {anketa: srv_meta_anketa_id, results:results, results_chart:results_chart}, function(){ $.post('ajax.php?t=quiz&a=save_settings', {anketa: srv_meta_anketa_id, results:results, results_chart:results_chart}, function(){
show_success_save(); actionNotePopup('success_save', 'success');
}); });
} }
@ -4964,7 +4952,7 @@ function advanced_paradata_save_settings() {
var collect_post_time = $("input[name=collect_post_time]:checked").val(); var collect_post_time = $("input[name=collect_post_time]:checked").val();
$.post('ajax.php?t=advanced_paradata&a=save_settings', {anketa: srv_meta_anketa_id, collect_post_time:collect_post_time}, function(){ $.post('ajax.php?t=advanced_paradata&a=save_settings', {anketa: srv_meta_anketa_id, collect_post_time:collect_post_time}, function(){
show_success_save(); actionNotePopup('success_save', 'success');
}); });
} }
// brisanje vseh podatkov ankete pri naprednih parapodatkih // brisanje vseh podatkov ankete pri naprednih parapodatkih
@ -4987,7 +4975,7 @@ function panel_save_settings() {
var url = $('input[name=url]').val(); var url = $('input[name=url]').val();
$("#globalSettingsInner").load('ajax.php?t=panel&a=save_settings', {anketa: srv_meta_anketa_id, user_id_name:user_id_name, status_name:status_name, status_default:status_default, url:url}, function(){ $("#globalSettingsInner").load('ajax.php?t=panel&a=save_settings', {anketa: srv_meta_anketa_id, user_id_name:user_id_name, status_name:status_name, status_default:status_default, url:url}, function(){
show_success_save(); actionNotePopup('success_save', 'success');
}); });
} }
@ -5541,14 +5529,3 @@ function actionNotePopupClose(){
$('#action_note_holder').html(''); $('#action_note_holder').html('');
}); });
} }
// SE POBRIŠE IN UPORABI "actionNotePopup"!!
function show_success_copy(timeout){
if (timeout == undefined)
timeout = 10000;
$('#success_copy').load('ajax.php?a=display_success_copy').show();
setTimeout(function() {$('#success_copy').animate({opacity:0})}, timeout);
}

2
admin/survey/script/slideshow.js
View File

@ -37,7 +37,7 @@ function slideshow_save_settings() {
$.post('ajax.php?t=slideshow&a=save_settings', $.post('ajax.php?t=slideshow&a=save_settings',
{anketa: srv_meta_anketa_id, timer:timer, fixed_interval:fixed_interval, save_entries:save_entries, autostart:autostart, next_btn:next_btn, back_btn:back_btn, pause_btn:pause_btn},function(){ {anketa: srv_meta_anketa_id, timer:timer, fixed_interval:fixed_interval, save_entries:save_entries, autostart:autostart, next_btn:next_btn, back_btn:back_btn, pause_btn:pause_btn},function(){
show_success_save(); actionNotePopup('success_save', 'success');
}); });
} }

2
admin/survey/script/telephone.js
View File

@ -39,7 +39,7 @@ function phn_settings_save() {
form_serialize[form_serialize.length] = {name:'anketa', value:srv_meta_anketa_id} form_serialize[form_serialize.length] = {name:'anketa', value:srv_meta_anketa_id}
$("#globalSettingsInner").load('ajax.php?t=telephone&m=settings_save', form_serialize, function(){ $("#globalSettingsInner").load('ajax.php?t=telephone&m=settings_save', form_serialize, function(){
show_success_save(); actionNotePopup('success_save', 'success');
}); });
} }

2
admin/survey/script/themes.js
View File

@ -74,7 +74,7 @@ function themes_init() {
$("#div_theme_group_holder").html(data.group_themes); $("#div_theme_group_holder").html(data.group_themes);
$('#div_theme_groups').html(data.theme_name); $('#div_theme_groups').html(data.theme_name);
$('#div_theme_group_holder').append('<div id="success_save">'+lang['srv_success_save']+'</div>'); $('#div_theme_group_holder').append('<div id="success_save">'+lang['srv_success_save']+'</div>');
show_success_save(); actionNotePopup('success_save', 'success');
}, 'json'); }, 'json');
}); });

5
lang/1.php
View File

@ -3911,7 +3911,6 @@ $lang = array (
"srv_respondents_admin" => "Admin", "srv_respondents_admin" => "Admin",
"srv_respondents_error_create" => "Napaka pri kreiranju novega profila", "srv_respondents_error_create" => "Napaka pri kreiranju novega profila",
"srv_respondents_error_data" => "Manjkajo podatki!", "srv_respondents_error_data" => "Manjkajo podatki!",
"srv_success_save" => "Nastavitve so bile shranjene ...",
"PastEventsInt" => "; kot pretekli se &#154;tejejo dogodki, starej&#154;i od ", "PastEventsInt" => "; kot pretekli se &#154;tejejo dogodki, starej&#154;i od ",
"srv_statistic_choose_interval" => "Izberite interval", "srv_statistic_choose_interval" => "Izberite interval",
"srv_statistic_choose_dates" => "Izberite datume", "srv_statistic_choose_dates" => "Izberite datume",
@ -5524,7 +5523,6 @@ $lang = array (
"srv_diagnostika_testiranje_noteb" => '\'TESTIRANJE\' - \'Avtomatski vnosi\'', "srv_diagnostika_testiranje_noteb" => '\'TESTIRANJE\' - \'Avtomatski vnosi\'',
"srv_diagnostika_testiranje_notec" => ' lahko testne podatke vnesete tudi avtomatsko.', "srv_diagnostika_testiranje_notec" => ' lahko testne podatke vnesete tudi avtomatsko.',
"srv_diagnostika_testiranje_copy" => 'Kopiraj', "srv_diagnostika_testiranje_copy" => 'Kopiraj',
"srv_diagnostika_testiranje_copied" => 'Povezava je bila kopirana',
"srv_diagnostika_table_title" => 'Status', "srv_diagnostika_table_title" => 'Status',
"srv_diagnostika_table_title1" => 'Kriterij', "srv_diagnostika_table_title1" => 'Kriterij',
"srv_diagnostika_table_title2" => 'Podrobnosti', "srv_diagnostika_table_title2" => 'Podrobnosti',
@ -8455,6 +8453,9 @@ $lang = array (
"action_note_lib_add_to_lib_type1" => "Vprašanje je bilo dodano v knjižnico", "action_note_lib_add_to_lib_type1" => "Vprašanje je bilo dodano v knjižnico",
"action_note_lib_add_to_lib_type2" => "Blok je bil dodan v knjižnico", "action_note_lib_add_to_lib_type2" => "Blok je bil dodan v knjižnico",
"action_note_lib_add_to_survey" => "Elementi so bili dodani v anketo", "action_note_lib_add_to_survey" => "Elementi so bili dodani v anketo",
"action_note_link_copied" => 'Povezava je bila kopirana',
"action_note_success_save" => "Nastavitve so bile shranjene",
); );

4
lang/2.php
View File

@ -3880,7 +3880,6 @@ $lang = array (
"srv_respondents_admin" => "Admin", "srv_respondents_admin" => "Admin",
"srv_respondents_error_create" => "Error creating a new profile", "srv_respondents_error_create" => "Error creating a new profile",
"srv_respondents_error_data" => "Missing data!", "srv_respondents_error_data" => "Missing data!",
"srv_success_save" => "The settings have been saved ...",
"PastEventsInt" => "; as past events are considered events older than ", "PastEventsInt" => "; as past events are considered events older than ",
"srv_extra_translations" => "Additional text settings", "srv_extra_translations" => "Additional text settings",
"srv_extra_translations2" => "- you can manage translation in Translation tab", "srv_extra_translations2" => "- you can manage translation in Translation tab",
@ -5484,7 +5483,6 @@ $lang = array (
"srv_diagnostika_testiranje_noteb" => '\'TEST\' - \'Test responses\'', "srv_diagnostika_testiranje_noteb" => '\'TEST\' - \'Test responses\'',
"srv_diagnostika_testiranje_notec" => ' tab, you can also enter the test data automatically.', "srv_diagnostika_testiranje_notec" => ' tab, you can also enter the test data automatically.',
"srv_diagnostika_testiranje_copy" => 'Copy', "srv_diagnostika_testiranje_copy" => 'Copy',
"srv_diagnostika_testiranje_copied" => 'The link has been copied',
"srv_diagnostika_table_title" => 'Status', "srv_diagnostika_table_title" => 'Status',
"srv_diagnostika_table_title1" => 'Criteria', "srv_diagnostika_table_title1" => 'Criteria',
"srv_diagnostika_table_title2" => 'Details', "srv_diagnostika_table_title2" => 'Details',
@ -8350,6 +8348,8 @@ GDPR introduction preview",
"action_note_lib_add_to_lib_type1" => "Question added to library", "action_note_lib_add_to_lib_type1" => "Question added to library",
"action_note_lib_add_to_lib_type2" => "Block added to library", "action_note_lib_add_to_lib_type2" => "Block added to library",
"action_note_lib_add_to_survey" => "Question added to survey", "action_note_lib_add_to_survey" => "Question added to survey",
"action_note_link_copied" => 'The link has been copied',
"action_note_success_save" => "The settings have been saved",