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

Popravki popupov

Browse Source
This commit is contained in:
pero1203 2020-08-18 14:09:41 +02:00
parent 590ceabc83
commit 3cc685c03d
11 changed files with 170 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
admin/survey/Branching.php
View File

@ -9732,7 +9732,12 @@ class Branching {
$text = $lang['srv_dropped_alert'];
echo '<div id="dropped_alert" style="display:none">';
echo ' <h2>'.$lang['srv_warning'].'</h2>';
echo ' <div class="popup_close"><a href="#" onClick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;">✕</a></div>';
echo ' <p>'.$text.'</p>';
echo '</div>';
echo ' <script type="text/javascript"> '."\n\r";

12
admin/survey/BranchingAjax.php
View File

@ -684,13 +684,21 @@ class BranchingAjax {
// preverimo, ce obstajajo ze podatki za spremenljivko - v tem primeru damo dodaten error
$confirmed = $_POST['confirmed'];
if ($all == 1 && $confirmed != '1') {
$sql = sisplet_query("SELECT count(*) AS count FROM srv_user WHERE ank_id='$this->anketa' AND deleted='0' AND preview='0'");
$row = mysqli_fetch_array($sql);
if ($row['count'] > 0) {
echo '<h2>'.$lang['srv_warning'].'</h2>';
echo '<div class="popup_close"><a href="#" onClick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;">✕</a></div>';
echo '<p>'.$lang['if_delete_data'].'</p>';
echo '<p>'.$lang['srv_brisiifconfirm_all'].'</p>';
echo '<p><a href="#" onclick="if_remove(\''.$if.'\', \'1\'); return false;">'.$lang['srv_if_rem_all'].'</a> <a href="#" onclick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;">'.$lang['srv_analiza_arhiviraj_cancle'].'</a></p>';
echo '<p>'.$lang['srv_brisiifconfirm_all'].'</p><br />';
echo '<span class="buttonwrapper floatRight"><a class="ovalbutton ovalbutton_orange" href="#" onclick="if_remove(\''.$if.'\', \'1\'); return false;"><span>'.$lang['srv_if_rem_all'].'</span></a></span>';
echo '<span class="buttonwrapper floatRight spaceRight"><a class="ovalbutton ovalbutton_gray" href="#" onclick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;"><span>'.$lang['srv_analiza_arhiviraj_cancle'].'</span></a></span>';
//echo '<p><a href="#" onclick="if_remove(\''.$if.'\', \'1\'); return false;">'.$lang['srv_if_rem_all'].'</a> <a href="#" onclick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;">'.$lang['srv_analiza_arhiviraj_cancle'].'</a></p>';
return;
}

30
admin/survey/SurveyAdminAjax.php
View File

@ -5418,21 +5418,41 @@ class SurveyAdminAjax {
// preverimo, da ni spremenljivka v kaksnem pogoju, preden jo zbrisemo
if (!$this->SurveyAdmin->check_spremenljivka_delete($spremenljivka)) {
$return['error'] = 1;
$return['output'] = '<p>'.$lang['spremenljivka_delete_in_if'].'</p>';
$return['output'] = '<div class="popup_close"><a href="#" onClick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;">✕</a></div>';
$return['output'] .= '<h2>'.$lang['srv_warning'].'</h2>';
$return['output'] .= '<p>'.$lang['spremenljivka_delete_in_if'].'</p>';
$return['output'] .= '<span class="buttonwrapper floatRight"><a class="ovalbutton ovalbutton_gray" href="#" onclick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;"><span>'.$lang['srv_analiza_arhiviraj_cancle'].'</span></a></span>';
echo json_encode($return);
return;
}
// preverimo, ce obstajajo ze podatki za spremenljivko - v tem primeru damo dodaten error
if ($confirmed != '1') {
$sql = sisplet_query("SELECT count(*) AS count FROM srv_user WHERE ank_id='$this->anketa' AND deleted='0' AND preview='0'");
$row = mysqli_fetch_array($sql);
if ($row['count'] > 0) {
$return['error'] = 2;
$return['output'] = '<p>'.$lang['spremenljivka_delete_data'].'</p>';
$return['output'] .= '<p>'.$lang['srv_brisispremenljivkoconfirm'].'</p>';
$return['output'] .= '<p><a href="#" onclick="brisi_spremenljivko(\''.$spremenljivka.'\', \'\', \'1\'); return false;">'.$lang['srv_brisispremenljivko'].'</a> <a href="#" onclick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;">'.$lang['srv_analiza_arhiviraj_cancle'].'</a></p>';
$return['output'] = '<div class="popup_close"><a href="#" onClick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;">✕</a></div>';
$return['output'] .= '<h2>'.$lang['srv_warning'].'</h2>';
$return['output'] .= '<p>'.$lang['spremenljivka_delete_data'].'</p>';
$return['output'] .= '<p>'.$lang['srv_brisispremenljivkoconfirm'].'</p><br />';
$return['output'] .= '<span class="buttonwrapper floatRight"><a class="ovalbutton ovalbutton_orange" href="#" onclick="brisi_spremenljivko(\''.$spremenljivka.'\', \'\', \'1\'); return false;"><span>'.$lang['srv_brisispremenljivko'].'</span></a></span>';
$return['output'] .= '<span class="buttonwrapper floatRight spaceRight"><a class="ovalbutton ovalbutton_gray" href="#" onclick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;"><span>'.$lang['srv_analiza_arhiviraj_cancle'].'</span></a></span>';
//$return['output'] .= '<p><a href="#" onclick="brisi_spremenljivko(\''.$spremenljivka.'\', \'\', \'1\'); return false;">'.$lang['srv_brisispremenljivko'].'</a> <a href="#" onclick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;">'.$lang['srv_analiza_arhiviraj_cancle'].'</a></p>';
echo json_encode($return);
return;
}
@ -5440,7 +5460,9 @@ class SurveyAdminAjax {
if(SurveyInfo::getInstance()->checkSurveyModule('hierarhija') && Cache::get_spremenljivka($spremenljivka, 'variable') == 'vloga'){
$return['error'] = 1;
$return['output'] = '<p>'.$lang['srv_hierarchy_delete_vloga'].'</p>';
echo json_encode($return);
return;
}
}

17
admin/survey/classes/class.Vprasanje.php
View File

@ -6671,13 +6671,24 @@ class Vprasanje {
if ($confirmed != '1') {
$sql = sisplet_query("SELECT count(*) AS count FROM srv_user WHERE ank_id='$this->anketa' AND deleted='0' AND preview='0'");
$row = mysqli_fetch_array($sql);
if ($row['count'] > 0) {
$return['error'] = 2;
$return['output'] = '<p>'.$lang['spremenljivka_delete_data_vre'].'</p>';
$return['output'] .= '<p>'.$lang['srv_brisivrednostconfirm'].'</p>';
$return['output'] = '<h2>'.$lang['srv_warning'].'</h2>';
$return['output'] .= '<div class="popup_close"><a href="#" onClick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;">✕</a></div>';
$return['output'] .= '<p>'.$lang['spremenljivka_delete_data_vre'].'</p>';
$return['output'] .= '<p>'.$lang['srv_brisivrednostconfirm'].'</p><br />';
//ce se spremeni onclick, se prosim spremeni v datoteki vprasanjeInline.js v funkciji inline_vrednost_delete v else if (data.error == 2)
$return['output'] .= '<p><a href="#" id="brisivrednostchecked" onclick="inline_vrednost_delete(\''.$spremenljivka.'\', \''.$vrednost.'\', \'1\'); $(\'#dropped_alert\').html(\'\').hide(); $(\'#fade\').fadeOut(); return false;">'.$lang['srv_brisivrednost'].'</a> <a href="#" onclick="$(\'#dropped_alert\').html(\'\').hide(); $(\'#fade\').fadeOut(); return false;">'.$lang['srv_analiza_arhiviraj_cancle'].'</a></p>';
$return['output'] .= '<span class="buttonwrapper floatRight"><a class="ovalbutton ovalbutton_orange" href="#" onclick="inline_vrednost_delete(\''.$spremenljivka.'\', \''.$vrednost.'\', \'1\'); $(\'#dropped_alert\').html(\'\').hide(); $(\'#fade\').fadeOut(); return false;"><span>'.$lang['srv_brisivrednost'].'</span></a></span>';
$return['output'] .= '<span class="buttonwrapper floatRight spaceRight"><a class="ovalbutton ovalbutton_gray" href="#" onclick="$(\'#dropped_alert\').hide(); $(\'#fade\').fadeOut(); return false;"><span>'.$lang['srv_analiza_arhiviraj_cancle'].'</span></a></span>';
//$return['output'] .= '<p><a href="#" id="brisivrednostchecked" onclick="inline_vrednost_delete(\''.$spremenljivka.'\', \''.$vrednost.'\', \'1\'); $(\'#dropped_alert\').html(\'\').hide(); $(\'#fade\').fadeOut(); return false;">'.$lang['srv_brisivrednost'].'</a> <a href="#" onclick="$(\'#dropped_alert\').html(\'\').hide(); $(\'#fade\').fadeOut(); return false;">'.$lang['srv_analiza_arhiviraj_cancle'].'</a></p>';
echo json_encode($return);
return;
}
}

4
admin/survey/script/branching.js
View File

@ -1037,13 +1037,13 @@ function if_remove(_if, all, confirmed) {
}
else if (confirm(besedilo)) {
close_all_editing();
//close_all_editing();
$.post('ajax.php?t=branching&a=if_remove', {'if': _if, all: all, anketa: srv_meta_anketa_id, confirmed: confirmed},
function (data) {
// Warning da brisemo vsebino pogoja in imamo ze podatke, ki jih bomo pobrisali
if (data.substring(0, 3) === '<p>') {
if (data.substring(0, 3) === '<p>' || data.substring(0, 4) === '<h2>') {
$('#fade').fadeIn("fast");
$('#dropped_alert').html(data).fadeIn("fast").css('width', '400px');
}

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

@ -1033,7 +1033,10 @@ function brisi_spremenljivko (spremenljivka, text, confirmed) {
}
else if (data.error == 1) {
$('#fade').fadeIn('slow');
$('#dropped_alert').html(data.output).fadeIn('slow').animate({opacity: 1.0}, 3000).fadeOut("slow");
$('#dropped_alert').html(data.output).fadeIn('slow').animate({opacity: 1.0}, 3000, function(){
$('#fade').fadeOut("slow");
$('#dropped_alert').fadeOut("slow");
});
}
else if (data.error == 2) {
$('#fade').fadeIn('slow');

2
lang/1.php
View File

@ -2061,7 +2061,7 @@ $lang = array (
"srv_label" => "Labela",
"srv_variable" => "Ime",
"srv_variable_error" => "Spremenljivka s tem imenom &#382;e obstaja!",
"srv_warning" => "<b>Opozorilo!</b><br>",
"srv_warning" => "Opozorilo!",
"srv_variable_error_vnosi" => "Spremenljivka z imenom: #VARIABLE# se pojavi #VARIABLE_COUNT# krat!<br>",
"srv_variable_error_vnosi_warning" => "Pri analizah in izvozih lahko prihaja do napak!",
"srv_branching" => "Pogoji in vejitve",

2
lang/2.php
View File

@ -2048,7 +2048,7 @@ $lang = array (
"srv_label" => "Label",
"srv_variable" => "Variable name",
"srv_variable_error" => "Variable with this name already exists!",
"srv_warning" => "<b>Warning!</b><br>",
"srv_warning" => "Warning!",
"srv_variable_error_vnosi" => "Variable named: #VARIABLE# appears #VARIABLE_COUNT# times!<br>",
"srv_variable_error_vnosi_warning" => "Analyses and exports may contain errors!",
"srv_branching" => "Branching",

89
public/css/admin.css
View File

@ -8184,6 +8184,9 @@ span.faicon.inv_unsubscribed_1::before {
font-weight: 500;
color: #333;
}
#fade .popup_holder .divPopUp p {
line-height: 20px;
}
#fade .popup_holder .divPopUp.popup_violet, #fade .popup_holder .divPopUp#popup_user_access {
border-left: 6px #921ee5 solid !important;
}
@ -8513,6 +8516,9 @@ body.waitlong #loading {
font-weight: 500;
color: #333;
}
.qtip p {
line-height: 20px;
}
.qtip.popup_violet, .qtip#popup_user_access {
border-left: 6px #921ee5 solid !important;
}
@ -8676,6 +8682,9 @@ body.waitlong #loading {
font-weight: 500;
color: #333;
}
.expanded-tooltip p {
line-height: 20px;
}
.expanded-tooltip.popup_violet, .expanded-tooltip#popup_user_access {
border-left: 6px #921ee5 solid !important;
}
@ -9046,6 +9055,9 @@ body.waitlong #loading {
font-weight: 500;
color: #333;
}
#check_pogoji p {
line-height: 20px;
}
#check_pogoji.popup_violet {
border-left: 6px #921ee5 solid !important;
}
@ -9146,6 +9158,9 @@ body.waitlong #loading {
font-weight: 500;
color: #333;
}
#dropped_alert p {
line-height: 20px;
}
#dropped_alert.popup_violet {
border-left: 6px #921ee5 solid !important;
}
@ -9203,11 +9218,6 @@ body.waitlong #loading {
color: white !important;
background-color: #ff0000 !important;
}
#dropped_alert a {
margin: 0 20px;
font-weight: 500;
text-decoration: underline;
}
#alert_close_block {
display: none;
@ -9260,6 +9270,9 @@ body.waitlong #loading {
font-weight: 500;
color: #333;
}
#popup_user_access p {
line-height: 20px;
}
#popup_user_access.popup_violet, #popup_user_access {
border-left: 6px #921ee5 solid !important;
}
@ -9486,6 +9499,9 @@ and open the template in the editor.
font-weight: 500;
color: #333;
}
#div_export_setting_show p {
line-height: 20px;
}
#div_export_setting_show.popup_violet {
border-left: 6px #921ee5 solid !important;
}
@ -10601,6 +10617,9 @@ and open the template in the editor.
font-weight: 500;
color: #333;
}
#preview_spremenljivka p {
line-height: 20px;
}
#preview_spremenljivka.popup_violet {
border-left: 6px #921ee5 solid !important;
}
@ -12739,6 +12758,9 @@ table#surveyList_new tr.sl_header_new td.col10 {
font-weight: 500;
color: #333;
}
#survey_list_info p {
line-height: 20px;
}
#survey_list_info.popup_violet {
border-left: 6px #921ee5 solid !important;
}
@ -13255,6 +13277,9 @@ li.sortable_noGroup {
font-weight: 500;
color: #333;
}
#vrednost_edit.edit_user p {
line-height: 20px;
}
#vrednost_edit.edit_user.popup_violet {
border-left: 6px #921ee5 solid !important;
}
@ -15172,6 +15197,9 @@ and open the template in the editor.
font-weight: 500;
color: #333;
}
#vrednost_edit p {
line-height: 20px;
}
#vrednost_edit.popup_violet {
border-left: 6px #921ee5 solid !important;
}
@ -17603,6 +17631,9 @@ and open the template in the editor.
font-weight: 500;
color: #333;
}
#inv_recipient_edit p {
line-height: 20px;
}
#inv_recipient_edit.popup_violet {
border-left: 6px #921ee5 solid !important;
}
@ -18525,6 +18556,9 @@ div.inv_step.active a span.circle {
font-weight: 500;
color: #333;
}
#inv_view_arch_recipients p {
line-height: 20px;
}
#inv_view_arch_recipients.popup_violet {
border-left: 6px #921ee5 solid !important;
}
@ -18698,6 +18732,9 @@ div.inv_step.active a span.circle {
font-weight: 500;
color: #333;
}
#inv_recipients_profile_name p {
line-height: 20px;
}
#inv_recipients_profile_name.popup_violet {
border-left: 6px #921ee5 solid !important;
}
@ -18865,6 +18902,9 @@ div.inv_step.active a span.circle {
font-weight: 500;
color: #333;
}
#inv_delete_rec_confirm p {
line-height: 20px;
}
#inv_delete_rec_confirm.popup_violet {
border-left: 6px #921ee5 solid !important;
}
@ -19131,6 +19171,9 @@ div.listAccess_uid {
font-weight: 500;
color: #333;
}
#inv_upload_list p {
line-height: 20px;
}
#inv_upload_list.popup_violet {
border-left: 6px #921ee5 solid !important;
}
@ -20042,6 +20085,9 @@ and open the template in the editor.
font-weight: 500;
color: #333;
}
.coding-refresh p {
line-height: 20px;
}
.coding-refresh.popup_violet, .coding-refresh#popup_user_access {
border-left: 6px #921ee5 solid !important;
}
@ -20143,6 +20189,9 @@ and open the template in the editor.
font-weight: 500;
color: #333;
}
#coding p {
line-height: 20px;
}
#coding.popup_violet {
border-left: 6px #921ee5 solid !important;
}
@ -20277,6 +20326,9 @@ ul.recode_number_sort li {
font-weight: 500;
color: #333;
}
.floatRecodeSpremenljivka p {
line-height: 20px;
}
.floatRecodeSpremenljivka.popup_violet, .floatRecodeSpremenljivka#popup_user_access {
border-left: 6px #921ee5 solid !important;
}
@ -20420,6 +20472,9 @@ table#recode_table tr.border_top_lite {
font-weight: 500;
color: #333;
}
#question_recode p {
line-height: 20px;
}
#question_recode.popup_violet {
border-left: 6px #921ee5 solid !important;
}
@ -21498,6 +21553,9 @@ and open the template in the editor.
font-weight: 500;
color: #333;
}
#surveyTrajanje p {
line-height: 20px;
}
#surveyTrajanje.popup_violet {
border-left: 6px #921ee5 solid !important;
}
@ -21920,6 +21978,9 @@ and open the template in the editor.
font-weight: 500;
color: #333;
}
#survey_archive_note p {
line-height: 20px;
}
#survey_archive_note.popup_violet {
border-left: 6px #921ee5 solid !important;
}
@ -24116,6 +24177,9 @@ table.analysis_reports tr td a {
font-weight: 500;
color: #333;
}
#newCReportProfile p {
line-height: 20px;
}
#newCReportProfile.popup_violet {
border-left: 6px #921ee5 solid !important;
}
@ -24799,6 +24863,9 @@ and open the template in the editor.
font-weight: 500;
color: #333;
}
.mc_table_settings p {
line-height: 20px;
}
.mc_table_settings.popup_violet, .mc_table_settings#popup_user_access {
border-left: 6px #921ee5 solid !important;
}
@ -24954,6 +25021,9 @@ and open the template in the editor.
font-weight: 500;
color: #333;
}
#newMCTable p {
line-height: 20px;
}
#newMCTable.popup_violet {
border-left: 6px #921ee5 solid !important;
}
@ -25059,6 +25129,9 @@ and open the template in the editor.
font-weight: 500;
color: #333;
}
#renameMCTable p {
line-height: 20px;
}
#renameMCTable.popup_violet {
border-left: 6px #921ee5 solid !important;
}
@ -25164,6 +25237,9 @@ and open the template in the editor.
font-weight: 500;
color: #333;
}
#deleteMCTable p {
line-height: 20px;
}
#deleteMCTable.popup_violet {
border-left: 6px #921ee5 solid !important;
}
@ -27544,6 +27620,9 @@ div.theme_label.span_theme_current img {
font-weight: 500;
color: #333;
}
#theme-editor #picker p {
line-height: 20px;
}
#theme-editor #picker.popup_violet {
border-left: 6px #921ee5 solid !important;
}

6
resources/sass/admin/popup/alert.scss
View File

@ -18,12 +18,6 @@
display: none;
min-height: 30px;
width: 300px;
a {
margin: 0 20px;
font-weight: 500;
text-decoration: underline;
}
}
#alert_close_block {

4
resources/sass/admin/popup/basic.scss
View File

@ -52,6 +52,10 @@
color: $main_text;
}
p{
line-height: 20px;
}
&.popup_violet{
border-left: 6px $violet solid !important;