From 8c4a546aca04cbdbb91e92430dee471364d93f93 Mon Sep 17 00:00:00 2001 From: pero1203 Date: Fri, 20 May 2022 12:40:44 +0200 Subject: [PATCH] Redesign - popravki napak - vabila --- .../class.SurveyInvitationsNew.php | 343 ++++++++++-------- .../surveyEmails/class.SurveyUnsubscribe.php | 2 +- admin/survey/script/invitations.js | 6 +- admin/survey/unsubscribe.php | 5 +- lang/1.php | 4 +- public/css/admin_new.css | 13 + .../pages/survey_objava/vabila_main.scss | 19 + 7 files changed, 236 insertions(+), 156 deletions(-) diff --git a/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php b/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php index b6e09fa06..c8d35b87d 100644 --- a/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php +++ b/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php @@ -774,9 +774,9 @@ class SurveyInvitationsNew { echo '
'; echo ' '; echo ' '; - echo ' '; echo ' '; echo ' '; + echo ' '; echo '
'; // Vnosno polje @@ -838,10 +838,10 @@ class SurveyInvitationsNew { echo '
'; echo ' '; - echo ' '; - echo ' '; - echo ' '; - echo ' '; + echo ' '; + echo ' '; + echo ' '; + echo ' '; echo '
'; echo ''; @@ -2231,117 +2231,143 @@ class SurveyInvitationsNew { echo ''.$lang['srv_invitation_message_choose'].':
'; - echo '
'; + + echo '
'; + echo '
    '; foreach ($array_messages AS $_m => $message) { - echo '
  1. '; + + echo '
  2. '; + echo $message['naslov']; + + if($message['id'] == $mid){ + + echo '
    '; + + if (count($array_messages) > 1) + echo ''; + + echo ''; + + echo '
    '; + } + echo '
    3. '; } echo '
'; + echo '
'; #invitation_messages - if (count($array_messages) > 1) { - echo ''.$lang['srv_inv_message_delete_profile'].'
'; - } - echo ''.$lang['srv_inv_message_rename_profile'].''; - { - # polovimo podatke profila - $sql_string = "SELECT sim.*, u.name, u.surname, e.name as ename, e.surname as esurname FROM srv_invitations_messages AS sim LEFT JOIN users AS u ON sim.uid = u.id LEFT JOIN users AS e ON sim.edit_uid = e.id WHERE sim.id = '".(int)$mid."'"; - $sql_query = sisplet_query($sql_string); - $sql_row = mysqli_fetch_assoc($sql_query); - $avtor = array(); - $edit = array(); - if (trim($sql_row['name'])) { - $avtor[] = trim ($sql_row['name']); - } - if (trim($sql_row['surname'])) { - $avtor[] = trim ($sql_row['surname']); - } + # polovimo podatke profila + $sql_string = "SELECT sim.*, u.name, u.surname, e.name as ename, e.surname as esurname FROM srv_invitations_messages AS sim LEFT JOIN users AS u ON sim.uid = u.id LEFT JOIN users AS e ON sim.edit_uid = e.id WHERE sim.id = '".(int)$mid."'"; + $sql_query = sisplet_query($sql_string); + $sql_row = mysqli_fetch_assoc($sql_query); - if ( count($avtor) > 0 ) { - echo '
'.$lang['srv_invitation_author'].' '.implode(' ',$avtor).'
'; - } - if ( count($avtor) > 0 ) { - echo '
'.$lang['srv_invitation_author_day'].' '.date("d.m.Y",strtotime($sql_row['insert_time'])).'
'; - } - if (trim($sql_row['ename'])) { - $edit[] = trim ($sql_row['ename']); - } - if (trim($sql_row['esurname'])) { - $edit[] = trim ($sql_row['esurname']); - } + $avtor = array(); + $edit = array(); + if (trim($sql_row['name'])) { + $avtor[] = trim ($sql_row['name']); + } + if (trim($sql_row['surname'])) { + $avtor[] = trim ($sql_row['surname']); + } + + + echo '
'; + + if ( count($avtor) > 0 ) { + echo '
'.$lang['srv_invitation_author'].' '.implode(' ',$avtor).'
'; + } + if ( count($avtor) > 0 ) { + echo '
'.$lang['srv_invitation_author_day'].' '.date("d.m.Y",strtotime($sql_row['insert_time'])).'
'; + } + if (trim($sql_row['ename'])) { + $edit[] = trim ($sql_row['ename']); + } + if (trim($sql_row['esurname'])) { + $edit[] = trim ($sql_row['esurname']); + } + + if ( count($edit) > 0 && $edit != $avtor) { + echo '
'.$lang['srv_invitation_changed'].' '.implode(' ',$edit).'
'; + } + if ($sql_row['insert_time'] != $sql_row['edit_time']) { + echo '
'.$lang['srv_invitation_changed_day'].' '.date("d.m.Y",strtotime($sql_row['insert_time'])).'
'; + } + + echo '
'.$lang['srv_invitation_comment'].' '. trim ($sql_row['comment']).'
'; + + echo '
'; - if ( count($edit) > 0 && $edit != $avtor) { - echo '
'.$lang['srv_invitation_changed'].' '.implode(' ',$edit).'
'; - } - if ($sql_row['insert_time'] != $sql_row['edit_time']) { - echo '
'.$lang['srv_invitation_changed_day'].' '.date("d.m.Y",strtotime($sql_row['insert_time'])).'
'; - } - - echo '
'.$lang['srv_invitation_comment'].' '. trim ($sql_row['comment']).'
'; - } echo ''; #inv_messages_profiles_holder $MA = new MailAdapter($this->sid, $type='invitation'); + # zlistamo seznam vseh sporočil # izpišemo primer besedila echo '
'; - echo ''.$lang['srv_inv_message_draft_content_heading'].' '.Help::display('srv_inv_message_title_noEmail'); + echo ''.$lang['message'].' '.Help::display('srv_inv_message_title_noEmail').''; - //echo ''.$lang['srv_inv_message_draft_settings'].''; - echo '
'; echo '
'; + + echo '
'; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; + echo '
'; + echo ' '; + echo ' '; + echo '
'; + + + echo '
'; + echo ' '; + echo ' '; + echo '
'; + + + ?> + + getUrlLists(); if (count($urls) > 0) { - echo ''; - echo ''; - echo ''; - } - echo '
'.$lang['srv_inv_message_draft_content_subject'].':'; - echo ''; - echo '
'.$lang['srv_inv_message_draft_content_body'].':
'; - echo ''; - echo '
'; - ?> -
'.$lang['srv_inv_message_draft_url'].''; - echo ''; foreach ($urls AS $url) { - $selected = ''; + $selected = ''; if ($preview_message['url'] == '') { - if ($preview_message['dc'] == true) { - $selected = ' selected="selected"'; + if ($preview_message['dc'] == true) { + $selected = ' selected="selected"'; } } else if ($preview_message['url'] == $url['url']) { - $selected = ' selected="selected"'; + $selected = ' selected="selected"'; } echo ''; } echo ''; - echo '
'; - echo '
'; - - echo '
'; - echo ''.$lang['srv_invitation_forward'].''; - echo ''.$lang['srv_inv_message_save'].''; - echo ''.$lang['srv_invitation_message_saveNew'].''; - + echo '
'; + } + + echo ''; + + + echo '
'; + echo ' '; + echo ' '; + echo ' '; + echo '
'; + + echo ''; } @@ -3480,8 +3506,6 @@ class SurveyInvitationsNew { $lists['-1'] = $lang['srv_invitation_new_templist']; $lists['0'] = $lang['srv_invitation_new_templist_author']; - - //echo '
Pošiljam . . . Prosimo počakajte.
'; echo ''; @@ -3580,54 +3604,64 @@ class SurveyInvitationsNew { // Način pošiljanja $noEmailingType = SurveySession::get('inv_noEmailing_type'); - echo ''; - echo $lang['srv_inv_message_type_external'].': '; + echo '
'; + echo ' '.$lang['srv_inv_message_type_external'].': '; if($noEmailingType == 1) - echo $lang['srv_inv_message_noemailing_type2']; + echo $lang['srv_inv_message_noemailing_type2']; elseif($noEmailingType == 2) - echo $lang['srv_inv_message_noemailing_type3']; + echo $lang['srv_inv_message_noemailing_type3']; else - echo $lang['srv_inv_message_noemailing_type1']; - echo '

'; + echo $lang['srv_inv_message_noemailing_type1']; + echo ' '; + + echo '
'; + echo ''; - // Komentar pri posiljanju - echo ''; + // Komentar pri posiljanju + echo '
'; + echo ' '; + echo ' '; + echo '
'; // Pobrisi podvojene maile - echo ' '.Help::display('srv_inv_sending_double').'
'; - - // Gumb poslji - echo '
'.$lang['srv_inv_nav_send_noEmailing'].''; - echo '

'; - + echo '
'; + echo ' '; + echo ' '; echo '
'; + + // Gumb Poslji + echo '
'; + echo ' '; + echo '
'; + // Seznam mailov na katere bomo poslali - if ((int)$this->invitationAdvancedConditionId > 0) - { - #if (is_array($this->user_inv_ids) && count($this->user_inv_ids) > 0) - { - echo ''; - $scp = new SurveyCondition($this->sid); - $note = $scp -> getConditionString($this->invitationAdvancedConditionId ); - echo $note; - #$scp -> displayConditionNote($this->invitationAdvancedConditionId ); - echo ''; - echo '
'; - } + if ((int)$this->invitationAdvancedConditionId > 0){ + + echo '
'; + + $scp = new SurveyCondition($this->sid); + $note = $scp -> getConditionString($this->invitationAdvancedConditionId ); + echo $note; + + echo '
'; } + # izpišemo seznam e-mailov in dodamo checkboxe - echo '
'.$lang['srv_inv_potencial_respondents'].' '.count($respondents).'
'; + echo '
'; + echo ''.$lang['srv_inv_potencial_respondents'].' '.count($respondents).''; + echo '
'; # izpišemo opozorilo kadar pošiljamo na več kakor 5000 naslovov - $text = (Common::checkModule('gorenje')) ? $lang['srv_inv_potencial_respondents_limit_gorenje'] : $lang['srv_inv_potencial_respondents_limit']; - echo '
'.$text.'
'; + $text = (Common::checkModule('gorenje')) ? $lang['srv_inv_potencial_respondents_limit_gorenje'] : $lang['srv_inv_potencial_respondents_limit']; + echo '
'; + echo $text; + echo '
'; echo ''; + # da preprečimo večkratno pošiljanje session_start(); list($short,$long) = $this->generateCode(); @@ -3650,9 +3684,8 @@ class SurveyInvitationsNew { $lists['-1'] = $lang['srv_invitation_new_templist']; $lists['0'] = $lang['srv_invitation_new_templist_author']; - echo '
Pošiljam . . . Prosimo počakajte.
'; - echo '
'; + echo '
'; echo ''; echo ''; echo ''; @@ -3662,20 +3695,34 @@ class SurveyInvitationsNew { echo ''; $cnt=1; foreach ($respondents as $pass => $respondent) { - echo ' $this->rec_send_page_limit ? ' class="displayNone"' : '').'>'; - echo ''; - echo ''; - echo ''; - echo ''; - if ($lists[$respondent['list_id']] != '') { - echo ''; - } else { - echo ''; + + echo ' $this->rec_send_page_limit ? ' class="displayNone"' : '').'>'; + + echo ' '; + + echo ' '; + + echo ' '; + + echo ' '; + + if ($lists[$respondent['list_id']] != '') { + echo ' '; + } + else { + echo ' '; } + echo ''; + $cnt++; } + echo '
'.''.$lang['srv_inv_recipients_email'].'
'.$respondent['email'].''.$respondent['firstname'].''.$lang['srv_userstatus_'.$respondent['status']].' ('.$respondent['status'].')'.''.$lists[$respondent['list_id']].''.$lang['srv_inv_send_who_table_list_deleted'].''; + echo ' '; + echo ' '; + echo ' '.$respondent['email'].''.$respondent['firstname'].''.$lang['srv_userstatus_'.$respondent['status']].' ('.$respondent['status'].')'.''.$lists[$respondent['list_id']].''.$lang['srv_inv_send_who_table_list_deleted'].'
'; + echo ''; } } @@ -4740,19 +4787,16 @@ class SurveyInvitationsNew { # če so napake jih prikažemo če ne obdelamo datoteko if (count($errors) > 0) { - - echo '
'; - echo ''.$lang['srv_inv_recipiens_upload_error'].''; - - echo '
'; - echo '
'; - - echo ''; + echo '
'; + + echo ''.$lang['srv_inv_recipiens_upload_error'].''; + foreach($errors as $error) { - echo '* '.$error.'
'; + echo '* '.$error.''; } - echo ''; + + echo '
'; $this->addRecipientsView($fields, $invalid_recipiens_array); } @@ -9251,17 +9295,19 @@ class SurveyInvitationsNew { # če so napake jih prikažemo če ne obdelamo datoteko if (count($errors) > 0) { - echo '
'; - echo ''.$lang['srv_inv_recipiens_upload_error'].''; - echo '
'; - echo '
'; - echo ''; + echo '
'; + + echo ''.$lang['srv_inv_recipiens_upload_error'].''; + foreach($errors as $error) { - echo '* '.$error.'
'; + echo '* '.$error.''; } - echo ''; + + echo '
'; + #$this->addRecipientsView($fields, $invalid_recipiens_array); - } else { + } + else { $fh = @fopen($file_tmp, "rb"); if ($fh) { @@ -10209,7 +10255,7 @@ class SurveyInvitationsNew { } else{ echo '
'; - echo ' is1KA() ? 'checked ="checked" ' : '').' '.($enabled1ka ? '' : ' disabled="disabled"').' onclick="$(\'#send_mail_mode1, #send_mail_mode2\').hide();$(\'#send_mail_mode0\').show();">'; + echo ' is1KA() ? 'checked ="checked" ' : '').' '.($enabled1ka ? '' : ' disabled="disabled"').' onclick="$(\'#send_mail_mode1, #send_mail_mode2\').addClass(\'displayNone\'); $(\'#send_mail_mode0\').removeClass(\'displayNone\');">'; echo ' '; echo '
'; } @@ -10217,14 +10263,14 @@ class SurveyInvitationsNew { // Google smtp je viden samo starim, kjer je ze vklopljen if($MA->isGoogle()){ echo '
'; - echo ' isGoogle() ? 'checked ="checked" ' : '').' onclick="$(\'#send_mail_mode0, #send_mail_mode2\').hide(); $(\'#send_mail_mode1\').show();">'; + echo ' isGoogle() ? 'checked ="checked" ' : '').' onclick="$(\'#send_mail_mode0, #send_mail_mode2\').addClass(\'displayNone\'); $(\'#send_mail_mode1\').removeClass(\'displayNone\');">'; echo ' '; echo '
'; } // Lastni smtp echo '
'; - echo ' isSMTP() ? 'checked ="checked" ' : '').' onclick="$(\'#send_mail_mode0, #send_mail_mode1\').hide(); $(\'#send_mail_mode2\').show();">'; + echo ' isSMTP() ? 'checked ="checked" ' : '').' onclick="$(\'#send_mail_mode0, #send_mail_mode1\').addClass(\'displayNone\'); $(\'#send_mail_mode2\').removeClass(\'displayNone\');">'; echo ' '; echo '
'; @@ -10447,7 +10493,9 @@ class SurveyInvitationsNew { echo ''; + echo ''; + echo ''; echo ''; @@ -10465,7 +10513,6 @@ class SurveyInvitationsNew { if ($_GET['s'] == '1') { - echo '
'; echo ''; } } diff --git a/admin/survey/classes/surveyEmails/class.SurveyUnsubscribe.php b/admin/survey/classes/surveyEmails/class.SurveyUnsubscribe.php index a8a050522..031a88854 100644 --- a/admin/survey/classes/surveyEmails/class.SurveyUnsubscribe.php +++ b/admin/survey/classes/surveyEmails/class.SurveyUnsubscribe.php @@ -117,7 +117,7 @@ class SurveyUnsubscribe { return array(substr($cookie,0,6), $cookie); } - function doUnsubscribe() { + public function doUnsubscribe() { global $lang; $anketa = self::$sid; diff --git a/admin/survey/script/invitations.js b/admin/survey/script/invitations.js index c3e36f972..67e9a18db 100644 --- a/admin/survey/script/invitations.js +++ b/admin/survey/script/invitations.js @@ -1656,12 +1656,12 @@ function smtpAAIAccept(){ function squaloSwitch(){ if($('#squalo_mode').prop('checked')){ - $('#send_mail_mode0, #send_mail_mode1, #send_mail_mode2, .mail_mode_switch, #send_mail_mode_test').hide(); + $('#send_mail_mode0, #send_mail_mode1, #send_mail_mode2, .mail_mode_switch, #send_mail_mode_test').addClass('displayNone'); $('#success_save').hide(); } else{ - $('.squalo_settings').hide(); - $('#send_mail_mode2, .mail_mode_switch, #send_mail_mode_test').show(); + $('.squalo_settings').addClass('displayNone'); + $('#send_mail_mode2, .mail_mode_switch, #send_mail_mode_test').removeClass('displayNone'); $('#success_save').hide(); } } diff --git a/admin/survey/unsubscribe.php b/admin/survey/unsubscribe.php index b35892470..e3d637aca 100644 --- a/admin/survey/unsubscribe.php +++ b/admin/survey/unsubscribe.php @@ -29,9 +29,10 @@ $anketa = $_GET['anketa']; if ((int)$anketa > 0) { $su = new SurveyUnsubscribe($anketa); - $su::doUnsubscribe(); + $su->doUnsubscribe(); - } else { + } + else { echo $lang['user_bye_missing_id']; exit; } diff --git a/lang/1.php b/lang/1.php index 14ddaba5c..c2ff62e97 100644 --- a/lang/1.php +++ b/lang/1.php @@ -4982,7 +4982,7 @@ $lang = array ( 'srv_inv_recipiens_add_invalid_note' => "Preverite naslove in njihov položaj v spodnjem oknu!", 'srv_inv_recipiens_add_invalid_note2' => "Enote z neveljavnim emailom ali geslom se ne dodajo v seznam", 'srv_inv_recipiens_add_invalid_upload_note' => "Preverite naslove v datoteki!", - 'srv_inv_recipiens_upload_error' => "Uporabnikov ne morem dodati, prosim odpravite spodnje napake!", + 'srv_inv_recipiens_upload_error' => "Uporabnikov ni mogoče dodati, prosim odpravite spodnje napake!", 'srv_inv_recipiens_upload_error_no_fields' => "Nobeno polje ni izbrano!", 'srv_inv_recipiens_onlyThisSurvey' => "Samo ta anketa", 'srv_inv_recipiens_from' => "Vnos prejemnikov", @@ -5091,7 +5091,7 @@ $lang = array ( 'srv_inv_potencial_respondents' => "Sporočilo bo poslano na spodnje naslove:", 'srv_inv_potencial_respondents_limit' => "Vabilo želite poslati več kot 5000 respondentom. Prosimo, če nas pred pošiljanjem o tem obvestite na info@1ka.si!", 'srv_inv_btn_add_recipients_add' => "Dodaj", - 'srv_inv_recipiens_file_note_1' => "Izberite datoteko z e-poštnimi naslovi prejemnikov. Vsak prejemnik mora biti v svoji vrstici. Če uvažate tudi dodatna personalizacijska polja, jih ločite z vejicami. Polja v datoteki morajo biti v enakem vrstnem redu kot ste označili zgoraj. Podvojeni zapisi se ne bodo dodajali.", + 'srv_inv_recipiens_file_note_1' => "Izberite datoteko z e-poštnimi naslovi prejemnikov. Vsak prejemnik mora biti v svoji vrstici. Če uvažate tudi dodatna personalizacijska polja, jih ločite z vejicami. Polja v datoteki morajo biti v enakem vrstnem redu, kot ste označili zgoraj. Podvojeni zapisi se ne bodo dodajali.", 'srv_inv_archive_heading' => "Arhivi pošiljanja", 'srv_inv_archive_date_send' => "Datum pošiljanja", 'srv_inv_archive_hour_send' => "Ura pošiljanja", diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 986a5e309..354aa76bc 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -22963,6 +22963,19 @@ body #main_holder #main .page_invitations .invitations_top_settings #srv_invitat margin-top: 8px; font-weight: 400; } +body #main_holder #main .page_invitations #inv_messages_holder_noEmailing { + margin-bottom: 16px; +} +body #main_holder #main .page_invitations #inv_message_errors { + display: flex; + flex-direction: column; + margin-bottom: 16px; +} +body #main_holder #main .page_invitations #inv_message_errors span { + padding-bottom: 8px; + color: red; + font-weight: 500; +} body #main_holder #main .page_invitations #inv_recipients_profiles_holder { min-height: 355px; padding: 16px; 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 f22fc4c25..bdbfd0e0c 100644 --- a/resources/sass/admin_new/pages/survey_objava/vabila_main.scss +++ b/resources/sass/admin_new/pages/survey_objava/vabila_main.scss @@ -41,6 +41,25 @@ body #main_holder #main .page_invitations{ } } + // Zgornja vrstica z textom pri sms, posti + #inv_messages_holder_noEmailing{ + margin-bottom: 16px; + } + + // Zgornja vrstica z napakami + #inv_message_errors{ + display: flex; + flex-direction: column; + + margin-bottom: 16px; + + span{ + padding-bottom: 8px; + color: red; + font-weight: 500; + } + } + // Leva stran s profili @mixin inv_left_list(){