diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index 2114bd23f..389c6da02 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -9681,6 +9681,11 @@ class SurveyAdminSettings { $ST->action($_GET['m']); } echo ''; + + $hide_tel_fieldset = ''; + if ($_GET['m'] == 'recipients_lists') { + $hide_tel_fieldset = 'displayNone'; + } // Ce je anketar ne vidi teh nastavitev $isAnketar = Common::isUserAnketar($this->anketa, $global_user_id); @@ -9692,7 +9697,7 @@ class SurveyAdminSettings { // Ce se nimamo nobene stevilke v bazi, pustimo da se lahko ugasne if($rowT['cnt'] == 0){ - echo '
'.$lang['srv_vrsta_survey_type_7'].' '.Help::display('srv_telephone_help').''; + echo '
'.$lang['srv_vrsta_survey_type_7'].' '.Help::display('srv_telephone_help').''; echo '
'; echo ''; @@ -9702,13 +9707,13 @@ class SurveyAdminSettings { echo '

'.$lang['srv_vrsta_survey_note_7_3'].'

'; echo '
'; } - else{ + /*else{ echo ''.$lang['srv_vrsta_survey_type_7'].' '.Help::display('srv_telephone_help'); echo '
'; - } + }*/ } else{ - echo '
'.$lang['srv_vrsta_survey_type_7'].' '.Help::display('srv_telephone_help').''; + echo '
'.$lang['srv_vrsta_survey_type_7'].' '.Help::display('srv_telephone_help').''; echo '
'; echo ''; echo ''; diff --git a/admin/survey/classes/class.SurveyTelephone.php b/admin/survey/classes/class.SurveyTelephone.php index 2610dae24..b8416f8b8 100644 --- a/admin/survey/classes/class.SurveyTelephone.php +++ b/admin/survey/classes/class.SurveyTelephone.php @@ -560,7 +560,7 @@ class SurveyTelephone { # profili respondentov echo '
'; - echo ''.$lang['srv_inv_recipient_select_list'].'
'; + echo '

'.$lang['srv_inv_recipient_select_list'].'

'; $this->listRecipientsProfiles(); echo '
'; # id=inv_recipients_profiles_holder @@ -588,8 +588,7 @@ class SurveyTelephone { } else { # sporočilo za personalizirana e-vabila in respondente iz baze - echo ''.$lang['srv_inv_recipiens_field_note'].''; - echo '
'; + echo '

'.$lang['srv_inv_recipiens_field_note'].'

'; echo '
'; echo '
    '; $field_lang = array(); @@ -613,30 +612,25 @@ class SurveyTelephone { } echo '
'; echo '
'; - echo '
'; echo ''; # iz seznama echo ''; # id=inv_import_list } echo '
'; # id=inv_import_list_container + echo ''; # id=inv_import - echo '
'; + echo '
'; + # če je začasen avtor, ne ponudimo shrani + if ((int)$ppid != 0) { + echo ''; + } + echo ''; + # če že imamo prejemnike v bazi ponudimo gumb naprej + echo ''; + echo '
'; } function listRecipientsProfiles() { @@ -1385,9 +1380,7 @@ class SurveyTelephone { global $lang, $site_url; #preglej prejemnike - #echo '

'.$lang['srv_inv_heading_step2'].$lang['srv_inv_edit_recipients_heading'].'

'; echo '

'.$lang['srv_inv_edit_recipients_heading'].'

'; - #polovimo prejemnike ki ne želijo prejemati obvestil # nastavimo filter session_start(); @@ -1547,14 +1540,14 @@ class SurveyTelephone { // dodamo filtriranje echo '
'; - echo ' '; + echo ''; + echo ''; echo '
'; echo '
'; echo ''; echo ''; - //echo '
'; echo '
'; if ($filter != '') { @@ -1570,17 +1563,17 @@ class SurveyTelephone { } echo '
'; - echo '
'; - if (mysqli_num_rows($sql_query_filterd) > 0 && $count_all > 0) { $this->displayPagination($filtred_all); - echo '
'; + echo '
'; + echo '
'; + echo '
'; echo ''; echo ''; # checkbox - echo ''; + echo ''; /* * # uredi echo ''; @@ -1595,7 +1588,7 @@ class SurveyTelephone { #echo ''; echo 'addSortField($fkey).' class="anl_ac tbl_icon_'.$fkey.'" title="'.$lang['srv_telephone_respondents_'.$fkey].'">'.$lang['srv_telephone_respondents_'.$fkey].$this->addSortIcon($fkey).''; } else if ($fkey == 'ps_icon' ) { - echo 'addSortField($fkey).' class="anl_ac tbl_icon" title="'.$lang['srv_telephone_respondents_'.$fkey].'">'.$lang['srv_telephone_respondents_'.$fkey].$this->addSortIcon($fkey).''; + //echo 'addSortField($fkey).' class="anl_ac tbl_icon" title="'.$lang['srv_telephone_respondents_'.$fkey].'">'.$lang['srv_telephone_respondents_'.$fkey].$this->addSortIcon($fkey).''; } else if ($fkey == 'date_inserted' || $fkey == 'schedule_call_time' ) { echo 'addSortField($fkey).' class="anl_ac tbl_date pointer" title="'.$lang['srv_telephone_respondents_'.$fkey].'">'.$lang['srv_telephone_respondents_'.$fkey].$this->addSortIcon($fkey).''; } else if ($fkey == 'schstatus' ) { @@ -1636,20 +1629,19 @@ class SurveyTelephone { echo ''; # checkbox - echo ''; + echo ''; + echo ''; #uredi - echo ''; + echo ''; foreach ($fields AS $fkey =>$field) { if ($field == 1) { switch ($fkey) { case 'ps_icon': - echo ''; + echo ''; + echo ''; break; case 'last_status': echo '
   
'; #izbriši - echo '
'; - echo ' '; - echo ''; @@ -1722,24 +1714,24 @@ class SurveyTelephone { @ob_flush(); } echo '
'; + echo '
'; + echo '
'; echo ''; echo '
'; } else { - echo $lang['srv_inv_list_no_recipients_filtred'].'
'; + echo $lang['srv_inv_list_no_recipients_filtred']; } echo ''; } else { - echo $lang['srv_inv_list_no_recipients'].'
'; + echo $lang['srv_inv_list_no_recipients']; } - - echo '

'; } @@ -1751,23 +1743,27 @@ class SurveyTelephone { #preverimo koliko številk imamo na voljo $numbersAvailable = $this->getAllNumbers(); + + echo '
'.$lang['srv_telephone_call_start'].''; # preverimo aktivnost ankete if ($this->surveySettings['active'] != 1) { - echo $lang['srv_inv_error9']; + echo '

'.$lang['srv_inv_error9'].'

'; if ($this->isAnketar == true) { return; } } if (count($numbersAvailable) > 0 ) { - echo '

'.$lang['srv_telephone_call_available']; + echo '

'.$lang['srv_telephone_call_available']; echo ' '.count($numbersAvailable); - echo '

'; - echo '

'.$lang['srv_call_start'].'

'; + echo '

'; + echo ''; } else { $this->getNextTimeCall(); } + + echo '
'; } /** @@ -3087,6 +3083,8 @@ class SurveyTelephone { $sql1 = sisplet_query("SELECT * FROM srv_invitations_recipients WHERE id = '$usr_id' AND deleted='0'"); $row1 = mysqli_fetch_array($sql1); + + echo '
'.$lang['srv_telephone_call_start'].''; echo ''; # echo '
'; @@ -3096,7 +3094,7 @@ class SurveyTelephone { '; - echo ''; - echo ''; - echo ''; echo '
'.$lang['srv_telephone_table_comments'].'
'; + echo '
'; $canCall = true; $userStatus = array(); $last_status = ''; @@ -3116,26 +3114,26 @@ class SurveyTelephone { } echo ''; + echo ''; if ($canCall == true) { if ($openedSurvey) { # zaprli smo aktivno anketo, prikažemo naslednji korak oz. izbiro zaključne akcije - echo '

'.$lang['srv_telephone_calling_number_end'].'

'; - echo '

'.$row1['phone'].'

'; + echo '

'.$lang['srv_telephone_calling_number_end'].$row1['phone'].'

'; } else { - echo '

'.$lang['srv_telephone_calling_number'].($schedule == true ? $lang['srv_telephone_call_was_schedule']:'').'

'; - echo '

'.$row1['phone'].'

'; + echo '

'.$lang['srv_telephone_calling_number'].($schedule == true ? $lang['srv_telephone_call_was_schedule']:' ').$row1['phone'].'

'; } + + echo '

'.$lang['srv_telephone_calling_number_info'].'

'; if($row1['firstname'] != '') - echo '

'.$lang['name'].': '.$row1['firstname'].'

'; + echo '

'.$lang['name'].': '.$row1['firstname'].'

'; if($row1['lastname'] != '') - echo '

'.$lang['surname'].': '.$row1['lastname'].'

'; + echo '

'.$lang['surname'].': '.$row1['lastname'].'

'; if($row1['email'] != '') - echo '

'.$lang['email'].': '.$row1['email'].'

'; + echo '

'.$lang['email'].': '.$row1['email'].'

'; if($row1['custom'] != '') - echo '

Custom: '.$row1['custom'].'

'; + echo '

Custom: '.$row1['custom'].'

'; } else { # onemogočimo ponovno klicanje uporabnika ker je zaključena ali je zavrnil @@ -3170,43 +3168,40 @@ class SurveyTelephone { $intro = $lang['srv_intro']; } - echo '

'.$lang['srv_telephone_call_introduction']; + echo '

'.$lang['srv_telephone_call_introduction'].'

'; echo '
'; echo $intro; echo '
'; - echo '

'; - echo '
'; echo '
'; - + echo ''; if ($canCall == true) { - if ($openedSurvey) { + /*if ($openedSurvey) { # zaprli smo aktivno anketo, prikažemo naslednji korak oz. izbiro zaključne akcije echo '

'.$lang['srv_telephone_calling_step_action'].'

'; } else { echo '

'.$lang['srv_telephone_calling_next_step'].'

'; - } + }*/ - echo '
'; + echo '
'; if ($openedSurvey) { # uporqabnik je odprl anketo - echo '

'.$lang['srv_call_successful2'].'

'; + echo '

'.$lang['srv_call_successful2'].'

'; } else { # uporabnik še ni odprl ankete - echo '

'.$lang['srv_call_open_startCall'].$lang['srv_call_open'].'

'; + echo ''; } if ($openedSurvey) { } else { # če smo na userju, potem smo ga dobili, zato ne more bit nedosegljiv ali zaseden - echo '

'.$lang['srv_call_zaseden'].'

'; - echo '

'.$lang['srv_call_ga_ni'].'

'; + echo '

'.$lang['srv_call_zaseden'].'

'; + echo '

'.$lang['srv_call_ga_ni'].'

'; } - echo '

'.$lang['srv_call_zmenjen'].'

'; - echo '

'.$lang['srv_call_prekinjen'].'

'; + echo '

'.$lang['srv_call_zmenjen'].'

'; + echo '

'.$lang['srv_call_prekinjen'].'

'; echo '

'.$lang['srv_call_prelozen'].'

'; # preverimo koliko številk še imamo razen trenutno izbrane @@ -3217,16 +3212,16 @@ class SurveyTelephone { if ($allUsers > 0) { // Dovolimo izbrati novo stevilko samo v primeru ko imamo nakljucno sortiranje if($this->call_order == 0) - echo '


'.$lang['srv_telephone_call_action_cancel_nextNumber'].' ('.count($toCall).')

'; + echo '

'.$lang['srv_telephone_call_action_cancel_nextNumber'].' ('.count($toCall).')

'; } # na voljo je samo ta številka, ne moremo ponudit druge else { - echo '


'.$lang['srv_telephone_call_action_cancel_preview'].' ('.count($toCall).')

'; + echo '

'.$lang['srv_telephone_call_action_cancel_preview'].' ('.count($toCall).')

'; } // Razveljavimo zadnji status (undo) if($last_status == 'A') - echo '

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

'; + echo '

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

'; echo '
'; echo '
'; @@ -3257,38 +3252,52 @@ class SurveyTelephone { // Razveljavimo zadnji status (undo) echo '

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

'; } + + $str_comment = "SELECT comment from srv_telephone_comment WHERE rec_id = '$usr_id'"; + $qry_comment = sisplet_query($str_comment); + $row_comment = mysqli_fetch_assoc($qry_comment); + echo $lang['srv_telephone_call_comment']; + echo '
'; + echo $row_comment['comment']; + echo '
'; + # spodnje akcije # če je anketar ne prikazujemo nextAction if ($this->isAnketar == false) { - echo '
'; - echo '

'; + session_start(); $nextAction = 1; if (isset($_SESSION['phnNextAction'][$this->sid]) && (int)$_SESSION['phnNextAction'][$this->sid]==0) { $nextAction = 0; } - echo '

'; + echo ''; + echo ''; + echo '
';*/ + + echo '
'; + + echo '
'; + echo ''; - echo ''; - echo '

'; echo '
'; + echo '
'; + echo ''; + echo '
'; + + echo '
'; + + + } - - $str_comment = "SELECT comment from srv_telephone_comment WHERE rec_id = '$usr_id'"; - $qry_comment = sisplet_query($str_comment); - $row_comment = mysqli_fetch_assoc($qry_comment); - echo '

'; - echo $lang['srv_telephone_call_comment']; - echo '

'; - echo $row_comment['comment']; - echo '
'; - echo '

'; echo '
'; + echo '
'; } diff --git a/admin/survey/script/telephone.js b/admin/survey/script/telephone.js index 09e28b38d..c77603e3b 100644 --- a/admin/survey/script/telephone.js +++ b/admin/survey/script/telephone.js @@ -118,7 +118,7 @@ function phnStartSurvey(usr_id){ } -function phnNextActionChange() { +function phnNextActionChange(phnNextAction) { var phnNextAction = $("input[name=phnNextAction]:checked").val(); $.post('ajax.php?t=telephone&m=setNextAction', {anketa:srv_meta_anketa_id,noNavi:'true',phnNextAction:phnNextAction}); } diff --git a/lang/1.php b/lang/1.php index 0ef2b7870..5f8bed569 100644 --- a/lang/1.php +++ b/lang/1.php @@ -2476,11 +2476,11 @@ $lang = array ( "srv_show_questions" => "Vprašanja na stran:", "srv_allpages" => "Vse strani", "srv_move" => "Premakni", - "srv_call_start" => "Začni s klicanjem telefonskih številk", + "srv_call_start" => "Začni s klicanjem", "srv_call_next" => "Naslednja telefonska številka", "srv_call_nonumber" => "Trenutno ni več prostih telefonskih številk.", "srv_call_call" => "Kliči", - "srv_call_open" => "Odpri anketo", + "srv_call_open" => "Odpri anketo in začni", "srv_call_open_startCall" => "»A« Začnimo z anketiranjem - ", "srv_call_history" => "Zgodovina klicev", "srv_call_calling" => "Kličem", @@ -4897,14 +4897,15 @@ $lang = array ( 'srv_inv_settings_code_0' => "koda je v URL", 'srv_inv_settings_code_1' => "ročni vnos kode", 'srv_inv_settings_code_2' => "brez kode", - 'srv_inv_add_recipients_heading' => "Dodajanje prejemnikov", - 'srv_inv_recipiens_field_note' => "Izberite polja, ki jih boste vnesli. Dodatne spremenljivke lahko dodate v urejanju. S premikanjem lahko določite vrstni red:", - 'srv_inv_recipiens_email_note' => "Vpišite ali kopirajte seznam prejemnikov, vsakega prejemnika dodajte v svojo vrstico. Če uvažate tudi dodatna polja, jih ločite s spodaj izbranim ločnikom in jih dodajte v enakem vrstnem redu kot ste označili polja zgoraj. Podvojeni zapisi bodo odstranjeni.", + 'srv_inv_add_recipients_heading' => "Dodaj respondente", + 'srv_inv_recipiens_field_note' => "Izberite podatke, ki jih boste vnesli. Dodatne spremenljivke lahko dodate v urejanju. S premikanjem lahko določite vrstni red:", + 'srv_inv_recipiens_email_note' => "Vpišite ali kopirajte seznam prejemnikov, vsakega prejemnika dodajte v svojo vrstico. Če uvažate tudi dodatna polja, jih ločite z vejico in jih dodajte v enakem vrstnem redu, kot ste označili polja zgoraj. Podvojeni zapisi bodo odstranjeni.", 'srv_inv_recipiens_email_note_append' => "Vpišite ali kopirajte podatke v tekstovni obliki, vsak zapis dodajte v svojo vrstico. Če dodajate več polj, jih ločite s spodaj izbranim ločilnikom in jih dodajte v enakem vrstnem redu kot ste označili polja zgoraj.", 'srv_inv_recipiens_pass_warning' => "Opozorilo! Maksimalna dolžina znakov za polje PASSWORD je 20 znakov.", - 'srv_inv_recipiens_fields' => "Polja:", + 'srv_inv_recipiens_fields' => "Vnesite podatke respondentov po sledečem vrstnem redu:", 'srv_inv_recipiens_sample' => "Primer:", 'srv_inv_recipiens_sample1' => "janez.novak@example.com,Janez,Novak,g.
janja.novak@example.com,,,ga.", + "srv_inv_recipiens_sample2" => "Primer - vnos podatkov za primer, ko želimo za dva respondenta vnesti podatke za njuno telefonsko številko, ime in priimek:", 'srv_inv_edit_recipients_heading' => "Vpogled in urejanje prejemnikov", 'srv_inv_recipients_email' => "EMAIL", #"Email", 'srv_inv_recipients_password' => "PASSWORD", #"Geslo", @@ -5628,7 +5629,8 @@ $lang = array ( "srv_invitation_recipients_add_type3" => 'Shrani v seznam, vendar še ne dodaj v anketo', "srv_invitation_recipients_add_type4" => 'Dodaj v anketo', "srv_invitation_recipients_add_type5" => 'Shrani kot nov seznam', - "srv_invitation_recipients_filter" => 'Filtriraj:', + "srv_invitation_recipients_filter" => 'Filtriraj po tabeli', + "srv_invitation_recipients_filter_button" => 'Filtriraj', "srv_invitation_recipients_filter_advanced" => 'Napredno filtriranje', "srv_invitation_recipients_filter_sent" => 'Poslano:', "srv_invitation_recipients_filter_answered" => 'Odgovorjeno:', @@ -6377,11 +6379,11 @@ $lang = array ( 'srv_telephone_respondents_custom' => 'CUSTOM', 'srv_telephone_respondents_priimek' => 'Priimek', 'srv_telephone_respondents_telefon' => 'Telefon', - 'srv_telephone_respondents_phone' => 'PHONE', + 'srv_telephone_respondents_phone' => 'Telefonska številka', 'srv_telephone_respondents_email' => 'EMAIL', 'srv_telephone_respondents_schedule_call_time' => 'Naslednji klic', 'srv_telephone_respondents_comment' => 'Komentar', - 'srv_telephone_respondents_schstatus' => 'Status klica', + 'srv_telephone_respondents_schstatus' => 'Status', 'srv_telephone_respondents_date_inserted' => 'Dodan dne', 'srv_telephone_respondents_list_id' => 'Seznam', 'srv_telephone_respondents_usr_email' => 'Dodal', @@ -6399,9 +6401,11 @@ $lang = array ( 'srv_telephone_status_Z' => '»Z« - Zaseden', 'srv_telephone_status_N' => '»N« - Nedosegljiv', 'srv_telephone_status_D' => '»D« - Preložen', - 'srv_telephone_add_sample' => "040 987 654,Janez,Novak,g.
040 987 654,,,ga.", + 'srv_telephone_add_sample' => "000 111 222,Janez,Novak,
000 333 444,,Novak", + 'srv_telephone_call_start' => 'Začni s klicanjem', 'srv_telephone_call_available' => 'Prostih telefonskih številk na voljo:', 'srv_telephone_calling_number' => 'Kličete številko:', + 'srv_telephone_calling_number_info' => 'Podatki', 'srv_telephone_calling_number_end' => 'Zaključujete številko:', 'srv_telephone_calling_next_step' => 'Izberite naslednji korak izmed naslednjih možnosti:', 'srv_telephone_calling_step_action' => 'Izberite kaj se je zgodilo:', @@ -6414,8 +6418,8 @@ $lang = array ( 'srv_telephone_call_action_cant_edit_R' => 'Uporabnik je zavrnil sodelovanje v telefonski anketi!', 'srv_telephone_call_action_cancel_preview' => 'Prekliči', 'srv_telephone_call_action_undo_status' => 'Pobriši zadnji status respondenta', - 'srv_telephone_call_introduction' => 'Uvod:', - 'srv_telephone_call_comment' => 'Morebitni komentar anketarja na to številko:', + 'srv_telephone_call_introduction' => 'Uvod', + 'srv_telephone_call_comment' => 'Komentar anketarja na klic:', 'srv_telephone_settings_access_list' => 'Seznam anketarjev in urednikov z dostopom:', 'srv_telephone_settings_access_list_link' => ' (podrobno lahko urednike urejate tukaj)', 'srv_telephone_no_respondents' => 'V bazi nimate respondentov s telefonskimi številkami.', diff --git a/lang/2.php b/lang/2.php index 01d583a39..ee78ad091 100644 --- a/lang/2.php +++ b/lang/2.php @@ -2453,11 +2453,11 @@ $lang = array ( "srv_show_questions" => "Questions per page:", "srv_allpages" => "All pages", "srv_move" => "Move", - "srv_call_start" => "Start calling telephone numbers", + "srv_call_start" => "Start calling", "srv_call_next" => "Next phone number", "srv_call_nonumber" => "Currently there is no more available phone numbers.", "srv_call_call" => "Call", - "srv_call_open" => "Open Survey", + "srv_call_open" => "Open survey and start", "srv_call_open_startCall"=> "»A« Start with survey - ", "srv_call_history" => "Call history", "srv_call_calling" => "Calling", @@ -4867,14 +4867,15 @@ $lang = array ( 'srv_inv_settings_code_0' => "Code is in URL", 'srv_inv_settings_code_1' => "Manual code input", 'srv_inv_settings_code_2' => "Without code", - 'srv_inv_add_recipients_heading' => "Adding recipients:", - 'srv_inv_recipiens_field_note' => "Select fields which you would like to enter. Additional variables can be added in the editing section. You can determine the order of the variables:", - 'srv_inv_recipiens_email_note' => "Enter or copy the data in text form; add each record in a new row. If you import additional fields, separate them by a comma and add them in the same order as above. Duplicate entries will be removed automatically.", + 'srv_inv_add_recipients_heading' => "Add respondents", + 'srv_inv_recipiens_field_note' => "Select data which you would like to enter. Additional variables can be added in the editing section. You can determine the order of the variables:", + 'srv_inv_recipiens_email_note' => "Enter or copy the data in text form; add each record in a new row. If you import additional fields, separate them with a comma and add them in the same order as above. Duplicate entries will be removed automatically.", 'srv_inv_recipiens_email_note_append' => "Enter or copy the data in text form; add each record in a new row. If you import additional fields, separate them by a comma and add them in the same order as above. Duplicate entries will be removed automatically.", 'srv_inv_recipiens_pass_warning' => "Warning! Maximum length of field PASSWORD is 20 characters.", - 'srv_inv_recipiens_fields' => "Fields:", + 'srv_inv_recipiens_fields' => "Enter the respondents' details in the following order: ", 'srv_inv_recipiens_sample' => "Example:", 'srv_inv_recipiens_sample1' => "john.smith@gmail.com,John,Smith,Mr.
johana.smith@gmail.com,,,mrs.", + "srv_inv_recipiens_sample2" => "Example - data entry for if you want to enter the phone number, surname and name of two respondents:", 'srv_inv_edit_recipients_heading' => "Preview and edit recipients:", 'srv_inv_recipients_email' => "Email", 'srv_inv_recipients_password' => "Password", @@ -5587,7 +5588,8 @@ $lang = array ( "srv_invitation_recipients_add_type3" => 'Only save recipients in a list', "srv_invitation_recipients_add_type4" => 'Add this list to the survey', "srv_invitation_recipients_add_type5" => 'Edit the labels of the list', - "srv_invitation_recipients_filter" => 'Filter:', + "srv_invitation_recipients_filter" => 'Filter table', + "srv_invitation_recipients_filter_button" => 'Filter', "srv_invitation_recipients_filter_advanced" => 'Advanced:', "srv_invitation_recipients_filter_sent" => 'Sent:', "srv_invitation_recipients_filter_answered" => 'Answered:', @@ -6270,11 +6272,11 @@ $lang = array ( 'srv_telephone_respondents_status' => 'Status', 'srv_telephone_respondents_ime' => 'First name', 'srv_telephone_respondents_priimek' => 'Last name', - 'srv_telephone_respondents_telefon' => 'Tepelhone', + 'srv_telephone_respondents_telefon' => 'Telephone number', 'srv_telephone_respondents_email' => 'Email', 'srv_telephone_respondents_schedule_call_time' => 'Next call', 'srv_telephone_respondents_comment' => 'Comment', - 'srv_telephone_respondents_schstatus' => 'Call status', + 'srv_telephone_respondents_schstatus' => 'Status', 'srv_telephone_respondents_date_inserted' => 'Added on', 'srv_telephone_respondents_list_id' => 'List', 'srv_telephone_respondents_usr_email' => 'Added by', @@ -6292,9 +6294,11 @@ $lang = array ( 'srv_telephone_status_Z' => '»Z« - Busy', 'srv_telephone_status_N' => '»N« - No answer - Offline', 'srv_telephone_status_D' => '»D« - Delayed', - 'srv_telephone_add_sample' => "040 987 654,Janez,Novak,g.
040 987 654,,,ga.", + 'srv_telephone_add_sample' => "000 111 222,John,Smith
000 333 444,,Smith,", + 'srv_telephone_call_start' => 'Start calling', 'srv_telephone_call_available' => 'Number of available telephone numbers:', 'srv_telephone_calling_number' => 'You are calling number:', + 'srv_telephone_calling_number_info' => 'Details', 'srv_telephone_calling_number_end' => 'You are finishing number:', 'srv_telephone_calling_next_step' => 'Select the next step from the options:', 'srv_telephone_calling_step_action' => 'Select what happened:', @@ -6307,8 +6311,8 @@ $lang = array ( 'srv_telephone_call_action_cant_edit_R' => 'User has refused to participate in the telephone survey!', 'srv_telephone_call_action_cancel_preview' => 'Cancel', 'srv_telephone_call_action_undo_status' => 'Undo last respondent status', - 'srv_telephone_call_introduction' => 'Introduction:', - 'srv_telephone_call_comment' => 'Any comment for this number:', + 'srv_telephone_call_introduction' => 'Introduction', + 'srv_telephone_call_comment' => 'Any comment for this call:', 'srv_telephone_settings_access_list' => 'List of interviewers and editors with access to the survey:', 'srv_telephone_settings_access_list_link' => ' (for detailed editing of editors click here)', 'srv_telephone_no_respondents' => 'There are no respondents with telephone numbers in your database.', diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 6b299f14b..237591722 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -5933,7 +5933,6 @@ button.ui-datepicker-trigger::before { span.faicon.arrow_up::before { font-size: 14px; content: "\f062"; - color: #E5E5E5; } span.faicon.arrow2_r::before { @@ -6123,6 +6122,10 @@ span.faicon.fa-1::before { content: "1"; } +span.faicon.phone::before { + content: "\f095"; +} + /* To change this license header, choose License Headers in Project Properties. To change this template file, choose Tools | Templates @@ -19342,6 +19345,121 @@ div.page_telephone div.phone_settings_top div#inv_top_navi div.phn_step_nav div. } div.page_telephone div.phone_settings_top div#inv_top_navi div.phn_step_nav div.phn_step.settings { margin-right: 32px; + display: none; +} +div.page_telephone h2 { + font-weight: 300; +} +div.page_telephone div#inv_import { + display: flex; + flex-direction: row; + width: 100%; + gap: 8px; + box-sizing: border-box; +} +div.page_telephone div#inv_import div#inv_recipients_profiles_holder { + padding: 16px 8px; + min-height: 355px; + width: 25%; + border: 1px solid #E5E5E5; + overflow: hidden; + box-sizing: border-box; + background-color: #F8F8F8; +} +div.page_telephone div#inv_import div#inv_recipients_profiles_holder div#phn_import_list_profiles { + border: 1px solid #E5E5E5; + background-color: #FFFFFF; + min-height: 100px; + max-height: 600px; +} +div.page_telephone div#inv_import div#inv_recipients_profiles_holder div#phn_import_list_profiles ol { + margin: 0; + padding: 0; + border-bottom: 1px solid #E5E5E5; +} +div.page_telephone div#inv_import div#inv_recipients_profiles_holder div#phn_import_list_profiles ol li { + list-style-image: none; + list-style-position: outside; + list-style-type: none; + line-height: 20px; + border-top: 1px solid #E5E5E5; + padding: 0 5px; + cursor: pointer; +} +div.page_telephone div#inv_import div#inv_recipients_profiles_holder div#phn_import_list_profiles ol li.active { + color: #FFFFFF; + background-color: #1E88E5; +} +div.page_telephone div#inv_import div#inv_import_list_container { + padding: 16px; + min-height: 355px; + width: 75%; + border: 1px solid #E5E5E5; + box-sizing: border-box; +} +div.page_telephone div#inv_import div#inv_import_list_container textarea { + width: 100%; + height: 120px; +} +div.page_telephone div.button_holder { + justify-content: right; + margin-top: 32px; +} +div.page_telephone div.button_holder button:last-of-type { + margin-right: 0; +} +div.page_telephone div#inv_rec_filter { + border: none; + padding: 0; +} +div.page_telephone div#inv_rec_filter input { + margin: 0; + height: 42px; +} +div.page_telephone table td div.icons { + display: flex; + flex-direction: row; + gap: 16px; +} +div.page_telephone table td div.icons span.faicon { + cursor: pointer; +} +div.page_telephone div#inv_bottom_edit { + margin-left: 18px; +} +div.page_telephone div#inv_bottom_edit a { + text-decoration: none; +} +div.page_telephone table#phn_call_table td, div.page_telephone table#phn_call_table th { + border: none; + background-color: #FFFFFF; + vertical-align: top; + padding: 0 12px; +} +div.page_telephone table#phn_call_table td:not(:last-of-type), div.page_telephone table#phn_call_table th:not(:last-of-type) { + border-right: 1px solid #E5E5E5; +} +div.page_telephone table#phn_call_table td:first-of-type, div.page_telephone table#phn_call_table th:first-of-type { + padding-left: 0; +} +div.page_telephone table#phn_call_table td:last-of-type, div.page_telephone table#phn_call_table th:last-of-type { + padding-right: 0; +} +div.page_telephone table#phn_call_table th { + text-transform: uppercase; + padding-bottom: 16px; +} +div.page_telephone table#phn_call_table button { + margin-bottom: 16px; +} +div.page_telephone table#phn_call_table p a { + text-decoration: none; +} +div.page_telephone div#phn_user_comment { + height: 60px; + border: 1px solid #E5E5E5; + border-radius: 2px; + margin-top: 4px; } div.subpage_predvidenicas table, @@ -20551,45 +20669,10 @@ body #main_holder #main .page_invitations #invitation_messages ol li:hover { padding: 4px 2px; } -#tbl_recipients_list { - padding: 0px; - margin: 0px; - border-spacing: 0px; - border-collapse: collapse; - table-layout: auto; - clear: both; -} -#tbl_recipients_list th { - color: #E5E5E5; - padding: 2px 5px; - padding-left: 7px; - font-size: 12px; - font-weight: normal; - height: 27px; - vertical-align: middle; - background-color: #E5E5E5; - border-top: 1px solid #E5E5E5; - border-bottom: 1px solid #E5E5E5; - width: auto; - min-width: 100px; - max-width: 128px; - overflow: hidden; - text-align: left; -} -#tbl_recipients_list td { - padding: 5px; - padding-left: 7px; - font-size: 11px; - vertical-align: middle; - border-bottom: 1px solid #E5E5E5; -} -#tbl_recipients_list tr:nth-child(odd) { - background-color: #EAF9FE; -} -#tbl_recipients_list tr:nth-child(even) { - background-color: white; -} - +/*#tbl_recipients_list { + @include recepient_list(); + clear: both; +}*/ #tbl_archive_list { padding: 0px; margin: 0px; @@ -20962,11 +21045,6 @@ textarea#inv_recipients_list { padding: 5px; } -#inv_field_list { - color: #E5E5E5; - font-style: italic; -} - #inv_recipiens_added { font-size: 12px; color: #1E88E5; diff --git a/resources/sass/admin/icons/standard.scss b/resources/sass/admin/icons/standard.scss index b8a501f6d..4b53b8db4 100644 --- a/resources/sass/admin/icons/standard.scss +++ b/resources/sass/admin/icons/standard.scss @@ -469,7 +469,6 @@ button.ui-datepicker-trigger::before{ span.faicon.arrow_up::before{ font-size: 14px; content: "\f062"; - color: $grey_super_dark; } span.faicon.arrow2_r::before{ diff --git a/resources/sass/admin_new/basic/icons/standard.scss b/resources/sass/admin_new/basic/icons/standard.scss index 41f8e7a2d..4a2812504 100644 --- a/resources/sass/admin_new/basic/icons/standard.scss +++ b/resources/sass/admin_new/basic/icons/standard.scss @@ -504,7 +504,6 @@ button.ui-datepicker-trigger::before{ span.faicon.arrow_up::before{ font-size: 14px; content: "\f062"; - color: $gray; } span.faicon.arrow2_r::before{ font-size: 14px; @@ -707,4 +706,8 @@ span.faicon.checkbox-empty::before{ span.faicon.fa-1::before{ content: "\31"; +} + +span.faicon.phone::before{ + content: "\f095"; } \ No newline at end of file diff --git a/resources/sass/admin_new/pages/survey_edit/telefonska_anketa.scss b/resources/sass/admin_new/pages/survey_edit/telefonska_anketa.scss index f9ef60075..8e9b02660 100644 --- a/resources/sass/admin_new/pages/survey_edit/telefonska_anketa.scss +++ b/resources/sass/admin_new/pages/survey_edit/telefonska_anketa.scss @@ -92,9 +92,167 @@ div.page_telephone { &.settings { margin-right: 32px; + display: none; } } } } } + + h2 { + font-weight: $light; + } + + //Dodaj + div#inv_import { + display: flex; + flex-direction: row; + width: 100%; + gap: 8px; + + box-sizing: border-box; + + div#inv_recipients_profiles_holder { + padding: 16px 8px; + min-height: 355px; + width: 25%; + border: 1px solid $gray; + overflow: hidden; + box-sizing: border-box; + background-color: $light-gray; + + div#phn_import_list_profiles { + border: 1px solid $gray; + background-color: $white; + min-height: 100px; + max-height: 600px; + + ol { + margin: 0; + padding: 0; + border-bottom: 1px solid $gray; + + li { + list-style-image: none; + list-style-position: outside; + list-style-type: none; + line-height: 20px; + border-top: 1px solid $gray; + padding: 0 5px; + cursor: pointer; + + &.active { + color: $white; + background-color: $blue; + } + } + } + } + } + + div#inv_import_list_container { + padding: 16px; + min-height: 355px; + width: 75%; + border: 1px solid $gray; + box-sizing: border-box; + + // Stlying za boxe? + + textarea { + width: 100%; + height: 120px; + } + } + + } + + div.button_holder { + justify-content: right; + margin-top: 32px; + + button { + &:last-of-type { + margin-right: 0; + } + } + } + + //Preglej + + div#inv_rec_filter { + border: none; + padding: 0; + + input { + margin: 0; + height: 42px; + } + } + + table { + td { + div.icons { + display: flex; + flex-direction: row; + gap: 16px; + + span.faicon { + cursor: pointer; + } + } + } + } + + div#inv_bottom_edit { + margin-left: 18px; + + a { + text-decoration: none; + } + } + + //Klicanje + + table#phn_call_table { + td,th { + border: none; + background-color: $white; + vertical-align: top; + + &:not(:last-of-type){ + border-right: 1px solid $gray; + } + + padding: 0 12px; + &:first-of-type { + padding-left: 0; + } + &:last-of-type { + padding-right: 0; + } + } + + th { + text-transform: uppercase; + padding-bottom: 16px; + } + + button{ + margin-bottom: 16px; + } + + p { + a { + text-decoration: none; + } + } + } + + div#phn_user_comment { + height: 60px; + border: 1px solid $gray; + border-radius: 2px; + margin-top: 4px; + } } \ No newline at end of file diff --git a/resources/sass/admin_new/pages/survey_objava/vabila_main.scss b/resources/sass/admin_new/pages/survey_objava/vabila_main.scss index 105f19af5..762d1b6e1 100644 --- a/resources/sass/admin_new/pages/survey_objava/vabila_main.scss +++ b/resources/sass/admin_new/pages/survey_objava/vabila_main.scss @@ -287,10 +287,10 @@ $background_color_26: #ffe6d6; } } } -#tbl_recipients_list { +/*#tbl_recipients_list { @include recepient_list(); clear: both; -} +}*/ #tbl_archive_list { @include recepient_list(); } @@ -518,8 +518,6 @@ textarea#inv_recipients_list { } } #inv_field_list { - color: $gray; - font-style: italic; } #inv_recipiens_added { font-size: 12px;