diff --git a/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php b/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php index b57775efb..eef267f35 100644 --- a/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php +++ b/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php @@ -564,7 +564,7 @@ class SurveyInvitationsNew { echo ''; - echo '
'; + echo '
'; $this->displayAddRecipientsView($fields, $recipients_list); echo '
'; # id="inv_import" } @@ -1969,7 +1969,7 @@ class SurveyInvitationsNew { // Ce posiljamo preko emaila if($noEmailing != 1){ - echo '
'; + echo '
'; if ($this->checkDefaultMessage() == false) { echo ''; @@ -2201,7 +2201,7 @@ class SurveyInvitationsNew { echo '
'; - echo '
'; + echo '
'; if ($this->checkDefaultMessage() == false) { echo ''; @@ -3113,7 +3113,7 @@ class SurveyInvitationsNew { exit(); } - echo '
'; + echo '
'; # damo v tabelo zaradi prilagajanja oblike levo/desno echo '
'; @@ -3587,7 +3587,7 @@ class SurveyInvitationsNew { // Komentar pri posiljanju echo '

'; + echo ''; // Pobrisi podvojene maile echo ' '.Help::display('srv_inv_sending_double').'
'; @@ -7089,7 +7089,7 @@ class SurveyInvitationsNew { $isEmail = (int)SurveyInfo::getInstance()->checkSurveyModule('email'); $d = new Dostop(); - echo '
'; + echo '
'; // Pri volitvah prikazemo samo osnovne stevilke - zaradi anonimizacije ni trackinga if(SurveyInfo::getInstance()->checkSurveyModule('voting')){ @@ -7242,31 +7242,43 @@ class SurveyInvitationsNew { break; } } - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; + + + echo '
'.$lang['srv_inv_dashboard_tbl_all'].''.(int)$recipients_by_status['all'].'-100%
'; + + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; echo ''; + + echo ''; + echo ''; + #popslano enotam echo ''; - echo ''; - echo ''; - echo ''; - echo ''; + echo ''; #neodgovori echo ''; - echo ''; + echo ''; $unanswered = ((int)$recipients_by_status['send']-(int)$recipients_by_status['clicked']-(int)$recipients_by_status['finished']); echo ''; echo ''; echo ''; echo ''; + echo ''; - echo ''; + echo ''; echo ''; echo ''; echo ''; @@ -7275,20 +7287,21 @@ class SurveyInvitationsNew { #če se slučajno pojavijo kaki neznani statusi if ((int)$recipients_by_status['unknown'] > 0) { echo ''; - echo ''; + echo ''; echo ''; echo ''; echo ''; echo ''; } + echo ''; - echo ''; + echo ''; echo ''; echo ''; echo ''; echo ''; + echo '
'.$lang['srv_statistic_metric'].''.$lang['srv_analiza_frekvence_titleFrekvenca'].''.$lang['srv_analiza_frekvence_titleOdstotek'].''.$lang['srv_analiza_frekvence_titleKumulativa'].'
'.$lang['srv_inv_dashboard_tbl_all'].''; + echo ''.(int)$recipients_by_status['all'].''; + echo '-'; + echo '100%'; + echo '
'.$lang['srv_inv_dashboard_tbl_send'].''.(int)$recipients_by_status['send'].''.((int)$recipients_by_status['send'] > 0 ? '100%' : '0%').''.$this->formatNumber(((int)$recipients_by_status['send'] > 0 ? (int)$recipients_by_status['send']*100/(int)$recipients_by_status['all'] : 0),0,'%').''.$lang['srv_inv_dashboard_tbl_send'].''; + echo ''.(int)$recipients_by_status['send'].''; + echo ''.((int)$recipients_by_status['send'] > 0 ? '100%' : '0%').''; + echo ''.$this->formatNumber(((int)$recipients_by_status['send'] > 0 ? (int)$recipients_by_status['send']*100/(int)$recipients_by_status['all'] : 0),0,'%').''; echo '
'.$lang['srv_inv_dashboard_tbl_unanswered'].''.$lang['srv_inv_dashboard_tbl_unanswered'].''.$unanswered.''.$this->formatNumber(($unanswered > 0 ? $unanswered*100/(int)$recipients_by_status['send'] : 0),0,'%').''.$this->formatNumber(($unanswered > 0 ? $unanswered*100/(int)$recipients_by_status['all'] : 0),0,'%').'
'.$lang['srv_inv_dashboard_tbl_clicked'].''.$lang['srv_inv_dashboard_tbl_clicked'].''.(int)$recipients_by_status['clicked'].''.$this->formatNumber(((int)$recipients_by_status['clicked'] > 0 ? (int)$recipients_by_status['clicked']*100/(int)$recipients_by_status['send'] : 0),0,'%').''.$this->formatNumber(((int)$recipients_by_status['clicked'] > 0 ? (int)$recipients_by_status['clicked']*100/(int)$recipients_by_status['all'] : 0),0,'%').'
'.$lang['srv_inv_dashboard_tbl_unknown'].''.$lang['srv_inv_dashboard_tbl_unknown'].''.(int)$recipients_by_status['unknown'].''.$this->formatNumber(((int)$recipients_by_status['unknown'] > 0 ? (int)$recipients_by_status['unknown']*100/(int)$recipients_by_status['send'] : 0),0,'%').''.$this->formatNumber(((int)$recipients_by_status['unknown'] > 0 ? (int)$recipients_by_status['unknown']*100/(int)$recipients_by_status['all'] : 0),0,'%').'
'.$lang['srv_inv_dashboard_tbl_finished'].''.$lang['srv_inv_dashboard_tbl_finished'].''.(int)$recipients_by_status['finished'].''.$this->formatNumber(((int)$recipients_by_status['finished'] > 0 ? (int)$recipients_by_status['finished']*100/(int)$recipients_by_status['send'] : 0),0,'%').''.$this->formatNumber(((int)$recipients_by_status['finished'] > 0 ? (int)$recipients_by_status['finished']*100/(int)$recipients_by_status['all'] : 0),0,'%').'
'; - echo '
'; # POSAMEZNA pošiljanja @@ -7298,9 +7311,11 @@ class SurveyInvitationsNew { foreach ($archive_data AS $uid => $status) { if ((int)$status == 6 && $user_lurker[$uid] == 1) { $user_by_status_for_archive[$archive_id]['6l']++; - } else if ((int)$status == 5 && $user_lurker[$uid] == 1) { + } + elseif ((int)$status == 5 && $user_lurker[$uid] == 1) { $user_by_status_for_archive[$archive_id]['5l']++; - } else { + } + else { $user_by_status_for_archive[$archive_id][$status]++; } @@ -7313,8 +7328,10 @@ class SurveyInvitationsNew { foreach ($user_by_status_for_archive AS $arch_id => $archive_data) { $cnt++; if (count($archive_data ) > 0) { + $recipients_by_status = array(); $recipients_by_status['all']=(int)$array_archive_subdata[$arch_id]['rec_in_db']; + foreach ($archive_data AS $status => $cntUsers) { # 0 - E-pošta - ni poslana if( $status == '0') { @@ -7372,24 +7389,21 @@ class SurveyInvitationsNew { } $all_rec_in_survey = (int)$recipients_by_status['all']; - echo ''; + + echo '
'; + + + echo '
'; - echo ''; - echo '+ '; - echo '- '; - echo $cnt.$lang['srv_inv_dashboard_list_cnt_title']; - echo ''; - - // avtor - echo ''.$avtor_name.''; - - // datum - echo ', '; - echo ''.$array_archive_subdata[$arch_id]['ds'].''; + echo ''; + echo ' + '; + echo ' - '; + echo $cnt.$lang['srv_inv_dashboard_list_cnt_title']; + echo ' '; + echo $lang['sent_by2'].': '.$avtor_name.', '.$array_archive_subdata[$arch_id]['ds'].', '; + // nacin posiljanja - echo ', '; - echo ''; if ($array_archive_subdata[$arch_id]['tip'] == '0') echo ''.$lang['srv_inv_message_noemailing_type1'].''; elseif($array_archive_subdata[$arch_id]['tip'] == '1') @@ -7398,23 +7412,30 @@ class SurveyInvitationsNew { echo ''.$lang['srv_inv_message_noemailing_type3'].''; else echo ''.$lang['email'].''; - echo ''; - - echo ''; + + echo '
'; + + // Skriti spodnji del (arhiv link + tabela) + echo '
'; + // arhiv - echo ' arhiv '; - echo '
'; + echo ''.$lang['srv_archive'].''; - - echo ''; + echo '
'; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; - echo ''; - echo ''; - #echo ''; - echo ''; - echo ''; + echo ''; # poslano enotam @@ -7468,29 +7489,27 @@ class SurveyInvitationsNew { } echo '
'.$lang['srv_statistic_metric'].''.$lang['srv_analiza_frekvence_titleFrekvenca'].''.$lang['srv_analiza_frekvence_titleOdstotek'].''.$lang['srv_analiza_frekvence_titleKumulativa'].'
'.$lang['srv_inv_dashboard_tbl_all'].''.(int)$all_rec_in_survey.''.(int)$recipients_by_status['all'].' 100%'.$lang['srv_inv_dashboard_tbl_all'].''; + echo ''.(int)$all_rec_in_survey.''; + echo ' '; + echo '100%'; echo '
'; - + + echo '
'; + + echo '
'; } } } - } else { + } + else { // Imamo sezname, ni pa poslanih vabil if ((int)$cnt_all_in_db > 0){ echo $lang['srv_inv_dashboard_has_list2']; - //echo '

'.$lang['srv_inv_dashboard_add_list'].'

'; echo ''; echo ''; - echo '
'; - - //echo '

'.$lang['srv_inv_dashboard_view_list'].'

'; } // Ni seznamov in ni poslanih vabil else{ echo $lang['srv_inv_dashboard_empty']; - //echo '

'.$lang['srv_inv_dashboard_add_list'].'

'; echo ''; - echo '

'; } } @@ -7738,7 +7757,7 @@ class SurveyInvitationsNew { // Vklop vabil if ($_email == 0) { - echo '
'; + echo '
'; echo '
'.$lang['srv_invitation_nonActivated_title'].''; echo '
'; @@ -8034,7 +8053,7 @@ class SurveyInvitationsNew { # navadni uporabniki, ki nimajo dostopa - text kako lahko pridobijo dostop else { - echo '
'; + echo '
'; echo '
'.$lang['srv_invitation_nonActivated_title'].''; echo '
'; @@ -8158,14 +8177,22 @@ class SurveyInvitationsNew { $sql_query = sisplet_query($sql_string); } - if (mysqli_num_rows($sql_query)>0) { + if (mysqli_num_rows($sql_query) > 0) { echo ''; + echo ''; - echo ''; - if ($onlyThisSurvey != 2) { - echo ''; - echo ''; + + if ($onlyThisSurvey != 2) { + echo ''; } + else{ + echo ''; + } + echo ''; @@ -8182,24 +8209,34 @@ class SurveyInvitationsNew { echo $lang['srv_inv_list_table_author']; echo ''; echo ''; + while ($sql_row = mysqli_fetch_assoc($sql_query)) { echo ''; - echo ''; - if ($onlyThisSurvey != 2) { - echo ''; - echo ''; } + else{ + echo ''; + } + echo ''; + echo ''; - #echo ''; + echo ''; + echo ''; + echo ''; + echo ''; } + echo '
   '; + echo ' '; + echo ' '; + echo ' '; + echo ''; echo $lang['srv_inv_list_table_name']; echo '
'; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; + + if ($onlyThisSurvey != 2) { + + echo ''; + echo ' '; + echo ' '; + + echo ' '; + + echo ' '; echo ''; + echo ' '; + echo ' '; + echo ''; echo ''; echo ''; if (isset($sql_row['respondents'])) { $_recipients = str_replace("\n\r", "\n", $sql_row['respondents']); @@ -8209,39 +8246,29 @@ class SurveyInvitationsNew { echo (int)$sql_row['cnt_succsess']+(int)$sql_row['cnt_error']; } echo ''; - #$_fields = explode(",",$sql_row['fields']); - #$_fields_lang = array(); - #foreach ($_fields as $_field) { - # $_fields_lang[] = $lang['srv_inv_field_'.$_field]; - #} - #echo implode(',',$_fields_lang); - #echo ''; echo $sql_row['comment']; echo ''; echo $sql_row['ds']; echo ''; echo $sql_row['firstname']; echo ' '.$sql_row['surname']; echo '
'; - /* - * Osznačevanje vseh seznamov in brisanje le teh*/ - echo ''; - } else { + } + else { echo $lang['srv_inv_list_no_lists']; } + return (int)mysqli_num_rows($sql_query); } @@ -8265,51 +8292,62 @@ class SurveyInvitationsNew { } } - if (empty($pids)) - { - echo $lang['srv_inv_list_choose_left'].'
'; + if (empty($pids)){ + echo $lang['srv_inv_list_choose_left']; } session_start(); $infoBox = null; - if (is_array($pids) && count($pids) > 0) - { - echo '
'; - $respondents = array(); + if (is_array($pids) && count($pids) > 0){ + + echo '
'; + + $respondents = array(); $fields = array(); # info box prikazujemo samo ko imamo izbran 1 seznam - if ($onlyThisSurvey <= 1) - { + if ($onlyThisSurvey <= 1){ # če imamo normalne sezname if (is_array($pids) && count($pids) == 1) { $sql_string = "SELECT rp.respondents, fields,rp.name, rp.comment, u.email AS iemail, DATE_FORMAT(rp.insert_time,'%d.%m.%Y, %T') AS fitime, e.email AS eemail, DATE_FORMAT(rp.edit_time,'%d.%m.%Y, %T') AS fetime FROM srv_invitations_recipients_profiles AS rp LEFT JOIN users AS u ON rp.uid = u.id LEFT JOIN users AS e ON rp.uid = e.id WHERE rp.pid IN(".(implode(',',$pids)).")"; - } else { + } + else { $sql_string = "SELECT rp.respondents, fields FROM srv_invitations_recipients_profiles AS rp WHERE rp.pid IN(".(implode(',',$pids)).")"; } $sql_query = sisplet_query($sql_string); - while ($sql_row = mysqli_fetch_assoc($sql_query)) - { + while ($sql_row = mysqli_fetch_assoc($sql_query)){ + # info box prikazujemo samo ko imamo izbran 1 seznam - if (is_array($pids) && count($pids) == 1) - { - $infoBox .= ''; - $infoBox .= $lang['srv_inv_list_edit_added']; + if (is_array($pids) && count($pids) == 1){ + + $infoBox .= '
'; + + $infoBox .= ''; + $infoBox .= $lang['srv_inv_list_edit_added'].' '; $infoBox .= trim($sql_row['iemail']) != '' ? $sql_row['iemail'] : $lang['srv_inv_list_edit_1kasi']; $infoBox .= $lang['srv_inv_list_edit_date'].$sql_row['fitime']; + $infoBox .= ''; + if ($sql_row['fitime'] != $sql_row['fetime']) { - $infoBox .= '
'.$lang['srv_inv_list_edit_changed']; + $infoBox .= ''; + $infoBox .= $lang['srv_inv_list_edit_changed'].' '; $infoBox .= trim($sql_row['eemail']) != '' ? $sql_row['eemail'] : $lang['srv_inv_list_edit_1kasi']; $infoBox .= $lang['srv_inv_list_edit_date'].$sql_row['fetime']; + $infoBox .= ''; } - - $infoBox .= '
'; - $infoBox .= '
'; - + + $infoBox .= ''; + $infoBox .= ' '; + $infoBox .= ''; + + $infoBox .= ''; + $infoBox .= ' '; + $infoBox .= ''; + + $infoBox .= '
'; } - #$array_profiles[$sql_row['pid']] = array('name' => $sql_row['name']); $respondents_list = str_replace("\n\r", "\n", $sql_row['respondents']); $respondents_list = explode("\n",$respondents_list); @@ -8382,30 +8420,33 @@ class SurveyInvitationsNew { } } - if (count($default_fields) > 0) - { + if (count($default_fields) > 0){ foreach ($default_fields as $key =>$field) { $field_list[$key] = $field; unset($default_fields[$key]); } } $respondents = array_unique($respondents); + + echo ''; + echo ''; $fields_cnt = 0; - foreach ($field_list AS $field => $checked) - { + foreach ($field_list AS $field => $checked){ if ($checked == 1) { $fields_cnt++; echo ''; } } echo ''; - if (is_array($respondents) && count($respondents) > 0 ) - { - foreach ($respondents AS $respondent_data) { + + if (is_array($respondents) && count($respondents) > 0 ){ + foreach ($respondents AS $respondent_data){ $row_cnt = 0; + echo ''; + $respondent_data_array = explode('|~|',$respondent_data); if (count($respondent_data_array) > 0) { foreach ($respondent_data_array AS $tekst) { @@ -8415,11 +8456,14 @@ class SurveyInvitationsNew { } } } + echo ''; } } + echo '
'.$lang['srv_'.$field].'
'; } + echo $infoBox; } @@ -8443,14 +8487,15 @@ class SurveyInvitationsNew { echo $lang['srv_inv_list_choose_left'].'
'; } session_start(); - if (is_array($pids) && !empty($pids)) - { - echo '
'; - $respondents = array(); + if (is_array($pids) && !empty($pids)){ + + echo '
'; + + $respondents = array(); $fields = array(); $infoBox = null; - if ($onlyThisSurvey <= 1) - { + if ($onlyThisSurvey <= 1){ + # če imamo normalne sezname if (is_array($pids) && count($pids) == 1) { $sql_string = "SELECT rp.respondents, fields,rp.name, rp.comment, u.email AS iemail, DATE_FORMAT(rp.insert_time,'%d.%m.%Y, %T') AS fitime, e.email AS eemail, DATE_FORMAT(rp.edit_time,'%d.%m.%Y, %T') AS fetime FROM srv_invitations_recipients_profiles AS rp LEFT JOIN users AS u ON rp.uid = u.id LEFT JOIN users AS e ON rp.uid = e.id WHERE rp.pid IN(".(implode(',',$pids)).")"; @@ -8463,22 +8508,44 @@ class SurveyInvitationsNew { while ($sql_row = mysqli_fetch_assoc($sql_query)) { # info box prikazujemo samo ko imamo izbran 1 seznam - if (is_array($pids) && count($pids) == 1) - { - $infoBox = ''; - $infoBox .= $lang['srv_inv_list_edit_added']; + if (is_array($pids) && count($pids) == 1){ + + $infoBox = '
'; + + $infoBox .= ''; + $infoBox .= $lang['srv_inv_list_edit_added'].' '; $infoBox .= trim($sql_row['iemail']) != '' ? $sql_row['iemail'] : $lang['srv_inv_list_edit_1kasi']; $infoBox .= $lang['srv_inv_list_edit_date'].$sql_row['fitime']; - if ($sql_row['fitime'] != $sql_row['fetime']) - { - $infoBox .= '
'.$lang['srv_inv_list_edit_changed']; + $infoBox .= '
'; + + if ($sql_row['fitime'] != $sql_row['fetime']){ + $infoBox .= ''; + $infoBox .= $lang['srv_inv_list_edit_changed'].' '; $infoBox .= trim($sql_row['eemail']) != '' ? $sql_row['eemail'] : $lang['srv_inv_list_edit_1kasi']; $infoBox .= $lang['srv_inv_list_edit_date'].$sql_row['fetime']; + $infoBox .= ''; } - $infoBox .= '
'; - $infoBox .= '
'; + + $infoBox .= '
'; + $infoBox .= ''; + $infoBox .= $lang['srv_inv_list_edit_name']; + $infoBox .= ''; + $infoBox .= ''; + $infoBox .= ' '; + $infoBox .= ''; + $infoBox .= '
'; + + $infoBox .= '
'; + $infoBox .= ''; + $infoBox .= $lang['srv_inv_list_edit_comment']; + $infoBox .= ''; + $infoBox .= ''; + $infoBox .= ' '; + $infoBox .= ''; + $infoBox .= '
'; + + $infoBox .= '
'; } - #$array_profiles[$sql_row['pid']] = array('name' => $sql_row['name']); $respondents_list = str_replace("\n\r", "\n", $sql_row['respondents']); $respondents_list = explode("\n",$respondents_list); @@ -8584,7 +8651,6 @@ class SurveyInvitationsNew { echo ''; echo '
'; - echo '
'; echo ''; @@ -8597,14 +8663,15 @@ class SurveyInvitationsNew { echo '
'; echo $infoBox; - echo '
'; - echo '
'; - if (count($pids) <= 1 ) { - echo ''.$lang['srv_inv_list_save_old'].''; - } - echo ''.$lang['srv_inv_list_save_new'].''; - echo '
'; + + echo '
'; + + if (count($pids) <= 1 ) + echo ''; + echo ''; + + echo '
'; } } @@ -9089,7 +9156,7 @@ class SurveyInvitationsNew { } echo ''; echo '
'; - echo '
'; + echo ''; echo '
'; diff --git a/admin/survey/script/invitations.js b/admin/survey/script/invitations.js index 7f9f21d5e..21c935928 100644 --- a/admin/survey/script/invitations.js +++ b/admin/survey/script/invitations.js @@ -991,21 +991,21 @@ function inv_selectAll(checkbox){ } function inv_list_selectAll(val){ - $(document).ready(function(){ - if(val == true){ - $('.test_checkAll').each(function(){ - this.checked = true; - }) - $("#inv_switch_on").hide(); - $("#inv_switch_off").show(); - }else{ - $('.test_checkAll').each(function(){ - this.checked = false; - }) - $("#inv_switch_on").show(); - $("#inv_switch_off").hide(); - } - }); + + if(val == true){ + $('.test_checkAll').each(function(){ + this.checked = true; + }) + $("#inv_switch_on").hide(); + $("#inv_switch_off").show(); + } + else{ + $('.test_checkAll').each(function(){ + this.checked = false; + }) + $("#inv_switch_on").show(); + $("#inv_switch_off").hide(); + } } function inv_recipients_form_action(action) { diff --git a/lang/1.php b/lang/1.php index a31419e85..16852d086 100644 --- a/lang/1.php +++ b/lang/1.php @@ -340,6 +340,7 @@ $lang = array ( "add_category" => "Dodajanje kategorije", "add_category1" => "Dodaj kategorijo", "sent_by" => "Vpisal", + "sent_by2" => "Poslal", "edit_by" => "Popravil", "send_mail" => "Poslati maile", "no_one" => "Nikomur", @@ -5128,17 +5129,17 @@ $lang = array ( 'srv_inv_dashboard_view_list' => "Preglej sezname ankete >>", 'srv_inv_dashboard_view_other_list' => "Preglej ostale sezname >>", 'srv_inv_dashboard_add_link' => "Dodaj", - 'srv_inv_dashboard_tbl_all' => "Vseh enot:", - 'srv_inv_dashboard_tbl_send' => "Skupno poslano enotam:", - 'srv_inv_dashboard_tbl_clicked' => "   neustrezno - neveljavni odgovori:", - 'srv_inv_dashboard_tbl_finished' => "   ustrezne enote:", - 'srv_inv_dashboard_tbl_unanswered' => "   neustrezno - neodgovori:", - 'srv_inv_dashboard_tbl_unknown' => "Neznani status:", - 'srv_inv_dashboard_tbl_error' => "Napake (neuspelo pošiljanje):", + 'srv_inv_dashboard_tbl_all' => "Vseh enot", + 'srv_inv_dashboard_tbl_send' => "Skupno poslano enotam", + 'srv_inv_dashboard_tbl_clicked' => "neustrezno - neveljavni odgovori", + 'srv_inv_dashboard_tbl_finished' => "ustrezne enote", + 'srv_inv_dashboard_tbl_unanswered' => "neustrezno - neodgovori", + 'srv_inv_dashboard_tbl_unknown' => "Neznani status", + 'srv_inv_dashboard_tbl_error' => "Napake (neuspelo pošiljanje)", 'srv_inv_dashboard_lists' => "Seznami", 'srv_inv_dashboard_lists_cnt_this_survey' => "Število seznamov respondentov te ankete:", 'srv_inv_dashboard_lists_cnt_all' => "Število seznamov respondentov v drugih anketah:", - 'srv_inv_dashboard_list_cnt_title' => ". pošiljanje. Poslal: ", + 'srv_inv_dashboard_list_cnt_title' => ". pošiljanje.", 'srv_activation_header' => "Anketo ste aktivirali! Aktivna bo 3 mesece", 'srv_activation_expire' => "Anketa poteče dne: ", 'srv_activation_setting' => "Nastavitve aktivnosti lahko spremenite tukaj.", diff --git a/lang/2.php b/lang/2.php index d763389b9..4d953ca2c 100644 --- a/lang/2.php +++ b/lang/2.php @@ -328,6 +328,7 @@ $lang = array ( "add_category" => "Add category", "add_category1" => "Add category", "sent_by" => "Sent by", + "sent_by2" => "Sent by", "edit_by" => "Edited by", "send_mail" => "Send e-mails", "no_one" => "No one", @@ -5097,17 +5098,17 @@ $lang = array ( 'srv_inv_dashboard_view_list' => "View survey lists >>", 'srv_inv_dashboard_view_other_list' => "View other lists >>", 'srv_inv_dashboard_add_link' => "Add", - 'srv_inv_dashboard_tbl_all' => "All units:", - 'srv_inv_dashboard_tbl_send' => "Total units emailed:", - 'srv_inv_dashboard_tbl_clicked' => " - response - invalid:", - 'srv_inv_dashboard_tbl_finished' => " - response - valid:", - 'srv_inv_dashboard_tbl_unanswered' => " - nonresponse:", - 'srv_inv_dashboard_tbl_unknown' => "Unknown status:", - 'srv_inv_dashboard_tbl_error' => "Errors:", + 'srv_inv_dashboard_tbl_all' => "All units", + 'srv_inv_dashboard_tbl_send' => "Total units emailed", + 'srv_inv_dashboard_tbl_clicked' => "response - invalid", + 'srv_inv_dashboard_tbl_finished' => "response - valid", + 'srv_inv_dashboard_tbl_unanswered' => "nonresponse", + 'srv_inv_dashboard_tbl_unknown' => "Unknown status", + 'srv_inv_dashboard_tbl_error' => "Errors", 'srv_inv_dashboard_lists' => "Lists", 'srv_inv_dashboard_lists_cnt_this_survey' => "The number of respondents lists of this survey:", 'srv_inv_dashboard_lists_cnt_all' => "The number of respondents lists of all surveys:", - 'srv_inv_dashboard_list_cnt_title' => ". wave. Send by: ", + 'srv_inv_dashboard_list_cnt_title' => ". wave.", 'srv_mass_input' => "Mass (fast) survey input", 'srv_mass_input_0' => "Disabled", 'srv_mass_input_1' => "Enabled", diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 49b396127..ad5c9ac94 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -21789,6 +21789,38 @@ body #main_holder #main .page_invitations #inv_send_mail input[type=text] { body #main_holder #main .page_invitations #inv_send_mail button { width: 160px; } +body #main_holder #main .page_invitations .invitations_status table { + margin: 0; +} +body #main_holder #main .page_invitations .invitations_status .left_holder table tr td, +body #main_holder #main .page_invitations .invitations_status .left_holder table tr th { + text-align: right; +} +body #main_holder #main .page_invitations .invitations_status .left_holder table tr td:nth-child(1), +body #main_holder #main .page_invitations .invitations_status .left_holder table tr th:nth-child(1) { + text-align: left; +} +body #main_holder #main .page_invitations .invitations_status .left_holder table tr td.indent, +body #main_holder #main .page_invitations .invitations_status .left_holder table tr th.indent { + padding-left: 32px; +} +body #main_holder #main .page_invitations .invitations_status .left_holder .arhiv_holder { + margin: 16px 0 0 0; +} +body #main_holder #main .page_invitations .invitations_status .left_holder .arhiv_holder .arhiv_info_holder .inv_dashboard_sub_title { + cursor: pointer; + text-decoration: none; +} +body #main_holder #main .page_invitations .invitations_status .left_holder .arhiv_holder .arhiv_sub_holder { + margin: 8px 0 0 0; +} +body #main_holder #main .page_invitations .invitations_status .left_holder .arhiv_holder .arhiv_sub_holder table { + margin-top: 8px; +} +body #main_holder #main .page_invitations .invitations_status .right_holder table tr td, +body #main_holder #main .page_invitations .invitations_status .right_holder table tr th { + text-align: right; +} body #main_holder #main .page_invitations .invitation_lists .setting_item { display: flex; flex-direction: column; @@ -21813,9 +21845,70 @@ body #main_holder #main .page_invitations .invitation_lists .left_holder .top_se body #main_holder #main .page_invitations .invitation_lists .left_holder #inv_edit_rec_list { margin-top: 32px; } +body #main_holder #main .page_invitations .invitation_lists .left_holder #inv_edit_rec_list table tr td, +body #main_holder #main .page_invitations .invitation_lists .left_holder #inv_edit_rec_list table tr th { + font-size: 14px; +} +body #main_holder #main .page_invitations .invitation_lists .left_holder #inv_edit_rec_list table tr td label, +body #main_holder #main .page_invitations .invitation_lists .left_holder #inv_edit_rec_list table tr th label { + font-size: 14px; + margin: 0; +} +body #main_holder #main .page_invitations .invitation_lists .left_holder #inv_edit_rec_list table tr td input[type=checkbox] + label::before, +body #main_holder #main .page_invitations .invitation_lists .left_holder #inv_edit_rec_list table tr th input[type=checkbox] + label::before { + font-weight: 400; + letter-spacing: 0; +} +body #main_holder #main .page_invitations .invitation_lists .left_holder #inv_edit_rec_list table tr td input[type=checkbox]:checked + label::before, +body #main_holder #main .page_invitations .invitation_lists .left_holder #inv_edit_rec_list table tr th input[type=checkbox]:checked + label::before { + font-weight: 700; +} +body #main_holder #main .page_invitations .invitation_lists .left_holder #inv_edit_rec_list table tr td.edit, +body #main_holder #main .page_invitations .invitation_lists .left_holder #inv_edit_rec_list table tr th.edit { + width: 90px; +} +body #main_holder #main .page_invitations .invitation_lists .left_holder #inv_edit_rec_list table tr td.edit .faicon, +body #main_holder #main .page_invitations .invitation_lists .left_holder #inv_edit_rec_list table tr th.edit .faicon { + cursor: pointer; + margin-left: 16px; +} +body #main_holder #main .page_invitations .invitation_lists .left_holder #inv_edit_rec_list table tr td.edit .faicon:before, +body #main_holder #main .page_invitations .invitation_lists .left_holder #inv_edit_rec_list table tr th.edit .faicon:before { + font-size: 16px; + color: #1E88E5; +} body #main_holder #main .page_invitations .invitation_lists .right_holder { padding-left: 32px; } +body #main_holder #main .page_invitations .invitation_lists .right_holder table { + margin: 16px 0 0 0; +} +body #main_holder #main .page_invitations .invitation_lists .right_holder table tr { + border-bottom: 1px #E5E5E5 solid; +} +body #main_holder #main .page_invitations .invitation_lists .right_holder table tr td, +body #main_holder #main .page_invitations .invitation_lists .right_holder table tr th { + font-size: 14px; +} +body #main_holder #main .page_invitations .invitation_lists .right_holder textarea { + width: 100%; +} +body #main_holder #main .page_invitations .invitation_lists .right_holder .info_box { + display: flex; + flex-direction: column; + margin: 16px 0 0 0; +} +body #main_holder #main .page_invitations .invitation_lists .right_holder .info_box span { + margin-bottom: 4px; + color: #A0A0A0; +} +body #main_holder #main .page_invitations .invitation_lists .right_holder .info_box .setting_item { + margin: 16px 0 0 0; +} +body #main_holder #main .page_invitations .invitation_lists .right_holder .info_box .setting_item span { + margin-bottom: 0px; + color: #333333; +} /* .lbl_email_setting { 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 f2c1eadb5..0f947e739 100644 --- a/resources/sass/admin_new/pages/survey_objava/vabila_main.scss +++ b/resources/sass/admin_new/pages/survey_objava/vabila_main.scss @@ -498,10 +498,62 @@ body #main_holder #main .page_invitations{ // Pregled - table.inv_dashboard_table{ - tr{ - td{ - + .invitations_status{ + + table{ + margin: 0; + } + + .left_holder{ + + table{ + + tr{ + td, + th{ + text-align: right; + + &:nth-child(1){ + text-align: left; + } + + &.indent{ + padding-left: 32px; + } + } + } + } + + .arhiv_holder{ + margin: 16px 0 0 0; + + + + .arhiv_info_holder{ + + .inv_dashboard_sub_title{ + cursor: pointer; + text-decoration: none; + } + } + + .arhiv_sub_holder{ + margin: 8px 0 0 0; + + table{ + margin-top: 8px; + } + } + } + } + + .right_holder table{ + + tr{ + td, + th{ + text-align: right; + } } } } @@ -539,11 +591,86 @@ body #main_holder #main .page_invitations{ #inv_edit_rec_list{ margin-top: 32px; + + table tr{ + td, + th{ + font-size: 14px; + + label{ + font-size: 14px; + margin: 0; + } + + input[type="checkbox"] + label::before{ + font-weight: 400; + letter-spacing: 0; + } + input[type="checkbox"]:checked + label::before{ + font-weight: 700; + } + + &.edit{ + width: 90px; + + .faicon{ + cursor: pointer; + margin-left: 16px; + + &:before{ + font-size: 16px; + color: $blue; + } + } + } + } + } } } .right_holder{ padding-left: 32px; + + table{ + margin: 16px 0 0 0; + + tr{ + border-bottom: 1px $gray solid; + + td, + th{ + font-size: 14px; + } + } + } + + textarea{ + width: 100%; + } + + .info_box{ + display: flex; + flex-direction: column; + + margin: 16px 0 0 0; + + span{ + margin-bottom: 4px; + + color: #A0A0A0; + } + + .setting_item{ + margin: 16px 0 0 0; + + span{ + margin-bottom: 0px; + + color: $black; + } + + } + } } } }