diff --git a/admin/survey/SurveyAdminAjax.php b/admin/survey/SurveyAdminAjax.php index f69f62c59..fb3340df6 100644 --- a/admin/survey/SurveyAdminAjax.php +++ b/admin/survey/SurveyAdminAjax.php @@ -5327,11 +5327,10 @@ class SurveyAdminAjax { $return['output'] .= '

'.$lang['srv_warning'].'

'; $return['output'] .= '

'.$lang['spremenljivka_delete_data'].'

'; - $return['output'] .= '

'.$lang['srv_brisispremenljivkoconfirm_data'].'


'; + $return['output'] .= '

'.$lang['srv_brisispremenljivkoconfirm_data'].'

'; - $return['output'] .= ''.$lang['srv_brisispremenljivko'].''; - $return['output'] .= ''.$lang['srv_analiza_arhiviraj_cancle'].''; - //$return['output'] .= '

'.$lang['srv_brisispremenljivko'].' '.$lang['srv_analiza_arhiviraj_cancle'].'

'; + $return['output'] .= '
'; + $return['output'] .= '
'; echo json_encode($return); diff --git a/admin/survey/script/branching.js b/admin/survey/script/branching.js index a73a6b6b1..4f8352e40 100644 --- a/admin/survey/script/branching.js +++ b/admin/survey/script/branching.js @@ -1048,7 +1048,7 @@ function if_remove(_if, all, confirmed) { // Warning da brisemo vsebino pogoja in imamo ze podatke, ki jih bomo pobrisali if (data.substring(0, 3) === '

' || data.substring(0, 4) === '

') { $('#fade').fadeIn("fast"); - $('#dropped_alert').html(data).fadeIn("fast").css('width', '400px'); + $('#dropped_alert').html(data).fadeIn("fast").css('width', '600px'); } else{ $('#branching').html(data); diff --git a/admin/survey/script/script.js b/admin/survey/script/script.js index 183c875de..0ff1bc388 100644 --- a/admin/survey/script/script.js +++ b/admin/survey/script/script.js @@ -1024,7 +1024,7 @@ function brisi_spremenljivko (spremenljivka, text, confirmed) { } else if (data.error == 2) { $('#fade').fadeIn('slow'); - $('#dropped_alert').html(data.output).fadeIn('slow').css('width', '400px'); + $('#dropped_alert').html(data.output).fadeIn('slow').css('width', '600px'); } } diff --git a/admin/survey/script/vprasanjeInline.js b/admin/survey/script/vprasanjeInline.js index a2d14bf8e..24c46bed1 100644 --- a/admin/survey/script/vprasanjeInline.js +++ b/admin/survey/script/vprasanjeInline.js @@ -621,7 +621,7 @@ function inline_vrednost_delete(spremenljivka, vrednost, confirmed/*, tip, other else if (data.error == 2) { $('#fade').fadeIn("fast"); - $('#dropped_alert').html(data.output).fadeIn("fast").css('width', '400px'); + $('#dropped_alert').html(data.output).fadeIn("fast").css('width', '600px'); //ce je posebna vrednost, se rabi dodat callbaack if(special_vrednost){