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

Merge branch 'master' of https://git.1ka.si/git/1ka

Browse Source
This commit is contained in:
pero1203 2021-07-26 12:45:10 +02:00
commit cb30bd72be
5 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
admin/survey/SurveyAdminAjax.php
View File

@ -6233,7 +6233,7 @@ class SurveyAdminAjax {
} }
// Alert na vsa vprašanja - popup // Dodeljevanje uredniskega dostopa do ankete
private function ajax_add_survey_dostop_popup(){ private function ajax_add_survey_dostop_popup(){
global $lang, $pass_salt, $global_user_id, $site_path, $site_url, $admin_type; global $lang, $pass_salt, $global_user_id, $site_path, $site_url, $admin_type;
@ -6407,10 +6407,9 @@ class SurveyAdminAjax {
echo '<span class="buttonwrapper floatRight" title="'.$lang['srv_zapri'].'"><a class="ovalbutton ovalbutton_gray" href="#" onclick="smtpAAIPopupClose(); return false;"><span>'.$lang['srv_zapri'].'</span></a></span>'; echo '<span class="buttonwrapper floatRight" title="'.$lang['srv_zapri'].'"><a class="ovalbutton ovalbutton_gray" href="#" onclick="smtpAAIPopupClose(); return false;"><span>'.$lang['srv_zapri'].'</span></a></span>';
echo '</div>'; echo '</div>';
} }
}
// Alert na vsa vprašanja - popup // Alert na vsa vprašanja - popup
function ajax_alert_all_popup(){ private function ajax_alert_all_popup(){
global $lang; global $lang;
$alert_type = $_POST['alert_type']; $alert_type = $_POST['alert_type'];
@ -6422,14 +6421,18 @@ function ajax_alert_all_popup(){
echo '<h2>'.$lang['srv_'.$alert_type.'_reminder_all'].'</h2>'; echo '<h2>'.$lang['srv_'.$alert_type.'_reminder_all'].'</h2>';
echo '<div class="popup_content">'; echo '<div class="popup_content">';
echo $alert_type; echo $lang['srv_reminder_popup_warning'];
echo '</div>'; echo '</div>';
echo '<div class="buttons_holder">'; echo '<div class="buttons_holder">';
echo '<span class="buttonwrapper floatRight" title="'.$lang['srv_zapri'] echo '<span class="buttonwrapper floatRight" style="margin:3px" title="'.$lang['srv_zapri']
.'"><a class="ovalbutton ovalbutton_gray" href="#" onclick="AlertAllPopupClose(); return false;"><span>' .'"><a class="ovalbutton ovalbutton_gray" href="#" onclick="AlertAllPopupClose(); return false;"><span>'
.$lang['srv_zapri'].'</span></a></span>'; .$lang['srv_zapri'].'</span></a></span>';
echo '<span class="buttonwrapper floatRight" style="margin:3px" title="'.$lang['srv_tip_sample_t6_8_o2']
.'"><a class="ovalbutton ovalbutton_gray" href="ajax.php?a=reminder_all&what='.$alert_type.'&anketa='.$this->anketa.'" onclick="AlertAllPopupClose(); return false;"><span>'
.$lang['srv_tip_sample_t6_8_o2'].'</span></a></span>';
echo '</div>'; echo '</div>';
} }
}
?> ?>

4
admin/survey/SurveyAdminSettings.php
View File

@ -279,8 +279,8 @@ class SurveyAdminSettings {
echo '<span class="nastavitveSpan3 bold">'.$lang['srv_opozorilo_vprasanja'].':</span>&nbsp; echo '<span class="nastavitveSpan3 bold">'.$lang['srv_opozorilo_vprasanja'].':</span>&nbsp;
<a href="#" onClick="popupAlertAll(\'soft\')">'.$lang['srv_soft_reminder_all'].'</a>, <a href="#" onClick="popupAlertAll(\'soft\')">'.$lang['srv_soft_reminder_all'].'</a>,
<a href="ajax.php?a=reminder_all&what=hard&anketa='.$this->anketa.'">'.$lang['srv_hard_reminder_all'].'</a>, <a hhref="#" onClick="popupAlertAll(\'hard\')">'.$lang['srv_hard_reminder_all'].'</a>,
<a href="ajax.php?a=reminder_all&what=no&anketa='.$this->anketa.'">'.$lang['srv_no_reminder_all'].'</a>'; <a hhref="#" onClick="popupAlertAll(\'no\')">'.$lang['srv_no_reminder_all'].'</a>';
echo '<br /><br />'; echo '<br /><br />';

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

@ -5521,7 +5521,7 @@ function popupAlertAll(alert_type){
$('#fade').fadeTo('slow', 1); $('#fade').fadeTo('slow', 1);
$('#popup_note').html('').fadeIn('slow'); $('#popup_note').html('').fadeIn('slow');
$("#popup_note").load('ajax.php?a=alert_all_popup', {alert_type, anketa:srv_meta_anketa_id}); $("#popup_note").load('ajax.php?a=alert_all_popup', {alert_type:alert_type, anketa:srv_meta_anketa_id});
} }
function AlertAllPopupClose(){ function AlertAllPopupClose(){

1
lang/1.php
View File

@ -5786,6 +5786,7 @@ $lang = array (
"srv_hard_reminder_all" => "Nastavi trdo opozorilo na vsa vprašanja", "srv_hard_reminder_all" => "Nastavi trdo opozorilo na vsa vprašanja",
"srv_soft_reminder_all" => "Nastavi mehko opozorilo na vsa vprašanja", "srv_soft_reminder_all" => "Nastavi mehko opozorilo na vsa vprašanja",
"srv_no_reminder_all" => "Odstrani opozorila iz vseh vprašanj", "srv_no_reminder_all" => "Odstrani opozorila iz vseh vprašanj",
"srv_reminder_popup_warning" => "Ta funkcionalnost se zelo dolgo izvaja. Želite nadaljevati?",
"srv_jump_to" => "Skoči na", "srv_jump_to" => "Skoči na",
"srv_recode_h_variable" => "Variable", "srv_recode_h_variable" => "Variable",
"srv_recode_h_actions" => "Funkcije rekodiranja", "srv_recode_h_actions" => "Funkcije rekodiranja",

1
lang/2.php
View File

@ -5683,6 +5683,7 @@ $lang = array (
"srv_hard_reminder_all" => "Set hard reminder to all questions", "srv_hard_reminder_all" => "Set hard reminder to all questions",
"srv_soft_reminder_all" => "Set soft reminder to all questions", "srv_soft_reminder_all" => "Set soft reminder to all questions",
"srv_no_reminder_all" => "Remove reminders from all questions", "srv_no_reminder_all" => "Remove reminders from all questions",
"srv_reminder_popup_warning" => "This functionality takes a long time to complete. Do you wish to proceed?",
"srv_jump_to" => "Jump to", "srv_jump_to" => "Jump to",
"srv_recode_h_variable" => "Variables", "srv_recode_h_variable" => "Variables",
"srv_recode_h_actions" => "Recode functions", "srv_recode_h_actions" => "Recode functions",