diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php index 44101bfb3..a833e00e0 100644 --- a/admin/survey/SurveyAdmin.php +++ b/admin/survey/SurveyAdmin.php @@ -502,6 +502,9 @@ class SurveyAdmin // NAROCILA in PLACILA echo '
'; echo '
'; + + //Telefonska anketa + echo '
'; echo ''; diff --git a/admin/survey/classes/class.SurveyTelephone.php b/admin/survey/classes/class.SurveyTelephone.php index 7dd7aa677..761bdae58 100644 --- a/admin/survey/classes/class.SurveyTelephone.php +++ b/admin/survey/classes/class.SurveyTelephone.php @@ -3293,8 +3293,6 @@ class SurveyTelephone { // Razveljavimo zadnji status (undo) if($last_status == 'A') echo '

'.$lang['srv_telephone_call_action_undo_status'].' (»'.$last_status.'«)

'; - - echo '
'; echo '
'; } else { @@ -3559,6 +3557,11 @@ class SurveyTelephone { $newDate = date('d.m.Y H:i', time()+3600 ); $marker = $_POST['marker']; $usr_id = (int)$_POST['usr_id']; + + echo '

'.$lang['srv_inv_recipients_status'].'

'; + echo ''; + + $button_setting = ''; if ($usr_id > 0 && ($marker == 'P' || $marker == 'T')) { if ($marker == 'T') { @@ -3570,8 +3573,11 @@ class SurveyTelephone { } echo '

'; - echo ' - + + echo '
'; + echo '
'; + echo ' + -

'; - + '; + echo '
'; + echo '
'; + } + + echo '
'; + echo ''; + + if ($usr_id > 0 && ($marker == 'P' || $marker == 'T')){ + if ($marker == 'T') { - echo ''.$lang['srv_call_zmenjen'].''; + echo ''; } else if ($marker == 'P') { - echo ''.$lang['srv_call_prekinjen'].''; + echo ''; } } - echo ''.$lang['srv_cancel'].''; + echo '
'; } // Nastavimo filter za pregled respondentov diff --git a/lang/1.php b/lang/1.php index 8e2eec659..43580f74f 100644 --- a/lang/1.php +++ b/lang/1.php @@ -6476,8 +6476,8 @@ $lang = array ( 'srv_telephone_dashboard_all_respondents' => 'Vseh enot s telefonsko številko:', 'srv_telephone_dashboard_all_contacted' => 'Vseh klicanih enot:', 'srv_telephone_dashboard_all_started' => 'Enot, ki so začele izpolnjevati:', - 'srv_telephone_call_mark_T_note' => 'Številka je dogovorjena čez 60min,
oziroma določite nov datum in ure.', - 'srv_telephone_call_mark_P_note' => 'Številka je prekinjena za 60min,
oziroma določite nov datum in ure.', + 'srv_telephone_call_mark_T_note' => 'Številka je dogovorjena čez 60min, oziroma določite nov datum in uro.', + 'srv_telephone_call_mark_P_note' => 'Številka je prekinjena za 60min, oziroma določite nov datum in uro.', 'srv_coding_one' => 'Kodiraj eno vrednost na odgovor', 'srv_coding_multi' => 'Kodiraj več vrednosti na odgovor', 'srv_profileManager_link' => 'Profili', diff --git a/public/css/admin_new.css b/public/css/admin_new.css index d20d18207..f024d87f1 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -8222,6 +8222,24 @@ table#inv_edit_recipient { width: 100%; } +div#telephone_popup .setting_holder { + margin-bottom: 16px; + display: flex; + flex-direction: column; +} +div#telephone_popup .setting_holder:first-of-type { + margin-top: 0; +} +div#telephone_popup .setting_holder .setting_item { + margin-top: 8px; +} +div#telephone_popup .setting_holder .setting_item input.text { + margin: 0 4px 0 4px; +} +div#telephone_popup .setting_holder .setting_item span.faicon { + margin-right: 16px; +} + /* Header scss - top line, menu... */ diff --git a/resources/sass/admin_new/components/popup/page_specific.scss b/resources/sass/admin_new/components/popup/page_specific.scss index 447d4bdd9..de8415932 100644 --- a/resources/sass/admin_new/components/popup/page_specific.scss +++ b/resources/sass/admin_new/components/popup/page_specific.scss @@ -29,7 +29,7 @@ div#renameProfileDiv { /////// STATUS ////////// // Povzetek > Nastavitev obdobja -div#time_profile_content { +div#time_profile_content{ .setting_holder { margin-bottom: 16px; @@ -130,7 +130,33 @@ div.setting_holder { } } -//Nastavitve > Telefonska anketa > Izbriši respondenta +//Nastavitve > Telefonska anketa table#inv_edit_recipient { width: 100%; +} + +div#telephone_popup { + + .setting_holder { + margin-bottom: 16px; + display: flex; + flex-direction: column; + + &:first-of-type{ + margin-top: 0; + } + + .setting_item { + margin-top: 8px; + + input.text { + margin: 0 4px 0 4px; + } + + span.faicon { + margin-right: 16px; + } + } + } + } \ No newline at end of file