diff --git a/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php b/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php index 17869232f..9d59389da 100644 --- a/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php +++ b/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php @@ -3566,67 +3566,55 @@ class SurveyInvitationsNew { if (mysqli_num_rows($sql_query) > 0 || count($simple_recipents) > 0) { - echo '

'.$lang['srv_archive_invitation'].'

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

'.$lang['srv_archive_invitation_text'].'

'; + + echo '

'.$lang['srv_archive_invitation_text2'].'

'; + + echo '
'; + echo '
'; echo ''; echo ''; - echo ''; - echo ''; + echo ''; echo ''; echo ''; - #echo ''; - echo ''; - echo ''; - echo ''; + echo ''; + echo ''; echo ''; echo ''; - #echo ''; echo ''; + while ($row = mysqli_fetch_assoc($sql_query)) { echo ''; - // Datum - echo ''; - - // Ura - echo ''; + // Datum in ura + echo ''; // Email sporocilo - echo ''; // Subject - echo ''; - #echo ''; - - // Nacin posiljanja (email, posta, sms...) - echo ''; # uspešno poslani - echo ''; # neuspešno poslani - echo ''; echo ''; } echo ''; echo '
'.$lang['srv_inv_archive_date_send'].''.$lang['srv_inv_archive_hour_send'].''.$lang['srv_inv_archive_date_send'].''.$lang['srv_inv_archive_naslov'].''.$lang['srv_inv_archive_subject_text'].''.$lang['srv_inv_archive_body_text'].''.$lang['srv_inv_message_type'].''.$lang['srv_inv_archive_cnt_succsess'].' '.Help::display('srv_inv_archive_sent').''.$lang['srv_inv_archive_cnt_error'].''.$lang['srv_inv_archive_cnt_succsess'].' '.Help::display('srv_inv_archive_sent').''.$lang['srv_inv_archive_cnt_error'].''.$lang['srv_inv_archive_sender'].''.$lang['srv_inv_archive_comment'].' 
'.$row['ds'].''.$row['hs'].''.$row['ds'].' '.$row['hs'].''; + echo ''; echo ''.$row['naslov'].''; echo ''; + echo ''; echo $row['subject_text']; echo ''.$row['body_text'].''; - if ($row['tip'] == '0') - echo ''.$lang['srv_inv_message_noemailing_type1'].''; - elseif($row['tip'] == '1') - echo ''.$lang['srv_inv_message_noemailing_type2'].''; - elseif($row['tip'] == '2') - echo ''.$lang['srv_inv_message_noemailing_type3'].''; - else - echo ''.$lang['email'].''; - echo ''; + echo ''; if ((int)$row['cnt_succsess'] > 0 ) { - echo ''.$row['cnt_succsess'].''; + echo ''.$row['cnt_succsess'].''; } else { echo ''.$row['cnt_succsess'].''; } echo ''; + echo ''; if ((int)$row['cnt_error'] > 0 ) { - echo ''.$row['cnt_error'].''; + echo ''.$row['cnt_error'].''; } else { echo ''.$row['cnt_error'].''; } @@ -3647,13 +3635,16 @@ class SurveyInvitationsNew { # komentar echo ''; - echo ''.$row['comment']; + echo (($row['comment'] == "") ? '/' : $row['comment']); echo '
'; + + echo '
'; + echo '
'; # dodamo simpl pošiljanje if ( count($simple_recipents) > 0 ) { @@ -3693,19 +3684,15 @@ class SurveyInvitationsNew { echo ''; } - } else { - echo '
'; - echo ''.$lang['srv_archive_invitation'].''; + } else { //Če ni še nobenih poslanih vabil echo $lang['srv_invitation_note4'].''; - echo '
'; } - + echo '
'; echo ''; # id="div_archive_content">'; - echo '
'; } @@ -4685,9 +4672,11 @@ class SurveyInvitationsNew { echo ''; // id="arc_content" echo '
'; echo ''; @@ -6694,9 +6683,9 @@ class SurveyInvitationsNew { echo '
'; // id="arc_content" echo '
'; echo ''; @@ -6872,9 +6861,9 @@ class SurveyInvitationsNew { echo '
'; echo ''; @@ -6917,9 +6906,10 @@ class SurveyInvitationsNew { echo '
'; // id="arc_content" echo '
'; echo ''; @@ -6958,11 +6948,10 @@ class SurveyInvitationsNew { echo '
'; // id="arc_content" echo '
'; echo ''; } diff --git a/admin/survey/classes/tracking/CrossRoad.php b/admin/survey/classes/tracking/CrossRoad.php index f5b53ed0a..748457ed0 100644 --- a/admin/survey/classes/tracking/CrossRoad.php +++ b/admin/survey/classes/tracking/CrossRoad.php @@ -267,6 +267,9 @@ class CrossRoad { $second_action = ($_GET['m'] == 'view_archive') ? NAVI_ARHIVI : 'invitations'; $layout_width = 'wide'; + + if ($_GET['m'] == 'view_archive') + $layout_menu = "menu_left"; $status = 5; diff --git a/lang/1.php b/lang/1.php index b446df29f..68606af4a 100644 --- a/lang/1.php +++ b/lang/1.php @@ -4926,14 +4926,14 @@ $lang = array ( 'srv_inv_archive_heading' => "Arhivi pošiljanja", 'srv_inv_archive_date_send' => "Datum pošiljanja", 'srv_inv_archive_hour_send' => "Ura pošiljanja", - 'srv_inv_archive_subject_text' => "Naslov sporočila", - 'srv_inv_archive_naslov' => "Email sporočilo", + 'srv_inv_archive_subject_text' => "Zadeva sporočila", + 'srv_inv_archive_naslov' => "Ime sporočila", 'srv_inv_archive_subject' => "Naslov sporočila", 'srv_inv_archive_body_text' => "Vsebina sporočila", 'srv_inv_archive_cnt_succsess' => "Uspešno poslanih", 'srv_inv_archive_cnt_error' => "Napak", 'srv_inv_archive_comment' => "Komentar", - 'srv_inv_archive_sender' => "Poslal", + 'srv_inv_archive_sender' => "Poslal/-a", 'srv_inv_archive_email_address' => "Email prejemnika", 'srv_inv_archive_status' => "Status", 'srv_inv_archive_edit' => "Uredi", @@ -5762,6 +5762,8 @@ $lang = array ( "srv_deleteSurveyDataFile_success_note" => "Datoteka s podatki je bila uspešno izbrisana!", "srv_archive_survey" => "Arhivi vprašalnika", "srv_archive_invitation" => "Arhivi vabil", + "srv_archive_invitation_text" => "Vsako poslano email vabilo se avtomatsko shrani v spodnji seznam, kjer je navedena tudi statistika pošiljanja.", + "srv_archive_invitation_text2" => "Seznam poslanih email vabil", "srv_archive_analysis" => "Arhivi analiz", "srv_toolbox_if" => "Določite pogoje za prikaz vprašanja", "srv_toolbox_block" => "Bloki za strukturiranje daljših vprašalnikov", diff --git a/lang/2.php b/lang/2.php index 61e9eea25..510aada8e 100644 --- a/lang/2.php +++ b/lang/2.php @@ -4898,7 +4898,7 @@ $lang = array ( 'srv_inv_archive_date_send' => "Sending date", 'srv_inv_archive_hour_send' => "Sending time", 'srv_inv_archive_subject_text' => "Message subject", - 'srv_inv_archive_naslov' => "Subject", + 'srv_inv_archive_naslov' => "Message name", 'srv_inv_archive_subject' => "Message title", 'srv_inv_archive_body_text' => "Message content", 'srv_inv_archive_cnt_succsess' => "Successfully sent", @@ -5662,6 +5662,8 @@ $lang = array ( "srv_deleteSurveyDataFile_success_note" => "Data file was successfully deleted.", "srv_archive_survey" => "Survey archive", "srv_archive_invitation" => "Invitation archive", + "srv_archive_invitation_text" => "Each sent email invitation is automatically saved in the list below, where you can also see the sending statistics.", + "srv_archive_invitation_text2" => "List of sent email invitations", "srv_archive_analysis" => "Analysis archive", "srv_data_emailstatus_0" => "No", "srv_data_emailstatus_1" => "Yes", diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 01a4a5e80..6e26382f9 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -5075,6 +5075,12 @@ p, span { font-style: italic; } +.as_link { + text-decoration: underline; + color: #1E88E5; + cursor: pointer; +} + .bold { font-weight: 800; } @@ -7685,20 +7691,28 @@ table { border-collapse: collapse; text-align: left; } -table td, table th { +table td, +table th { padding: 8px 16px; border-top: 1px solid #E5E5E5; vertical-align: middle; } -table td.center, table th.center { +table td.center, +table th.center { text-align: center; } -table td.right, table th.right { +table td.right, +table th.right { text-align: right; } -table td.wrap, table th.wrap { +table td.wrap, +table th.wrap { white-space: normal; } +table td.lead_column, +table th.lead_column { + border-right: 3px solid #E5E5E5; +} table th { font-weight: 600; background-color: #F8F8F8; @@ -9925,6 +9939,64 @@ dl.arch_email dd { height: 150px; } +#inv_view_arch_recipients { + /*max-height: 90vh; + overflow-y: scroll;*/ + max-width: 90vw; + padding: 16px; + font-size: 16px; + line-height: 20px; + background-color: white; + height: auto; + width: auto; +} +#inv_view_arch_recipients .popup_close { + position: absolute !important; + top: 10px; + right: 10px; + z-index: 9999; + font-size: 12px !important; + color: #777777; +} +#inv_view_arch_recipients .popup_close:hover { + color: #333333; +} +#inv_view_arch_recipients .popup_close a { + color: #777777; + text-decoration: none; +} +#inv_view_arch_recipients .popup_close a:hover { + color: #333333; +} +#inv_view_arch_recipients h2, +#inv_view_arch_recipients .divPopUp_top { + width: 100%; + margin-top: 3px; + margin-bottom: 16px; + padding-bottom: 8px; + font-weight: 600; + font-size: 16px; + text-transform: uppercase; + border-bottom: 1px #E5E5E5 solid; +} +#inv_view_arch_recipients p { + line-height: 20px; +} +#inv_view_arch_recipients .button_holder { + justify-content: end !important; + margin: 16px 0 0 0; +} +#inv_view_arch_recipients .button_holder button:last-child { + margin-right: 0; +} +#inv_view_arch_recipients.warning_popup h2::before { + padding-right: 8px; + font-family: "Font Awesome 5 Free"; + content: "\f071"; + font-size: 14px; + color: #FFC700; +} + /* To change this license header, choose License Headers in Project Properties. To change this template file, choose Tools | Templates @@ -10789,23 +10861,23 @@ and open the template in the editor. } #branching #variable_holder input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio:before { /*content: "\f096";*/ - content: ""; + content: "\f0c8"; letter-spacing: 10px; } #branching #variable_holder input[type=radio].enka-admin-custom + span.enka-checkbox-radio:before { /*content: "\f10c";*/ - content: ""; + content: "\f111"; letter-spacing: 8px; } #branching #variable_holder input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio:before { /*content: "\f046";*/ - content: ""; + content: "\f14a"; color: #D3D3D3; letter-spacing: 8px; } #branching #variable_holder input[type=radio].enka-admin-custom:checked + span.enka-checkbox-radio:before { /*content: "\f192";*/ - content: ""; + content: "\f192"; color: #D3D3D3; } #branching span.faicon.delete_circle::before { @@ -10839,8 +10911,6 @@ and open the template in the editor. width: calc(100% - 401px - 304px); margin: 0 0 0 304px; background-color: white; - /* font awesom za admin */ - /* select, checked */ /* Okno za drop vprasanja, ko je anketa prazna */ } #branching ul { @@ -10944,53 +11014,6 @@ and open the template in the editor. cursor: move; margin-top: -2px; } -#branching #variable_holder input[type=checkbox].enka-admin-custom, -#branching #variable_holder input[type=radio].enka-admin-custom { - display: none !important; -} -#branching #variable_holder input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio:before, -#branching #variable_holder input[type=radio].enka-admin-custom + span.enka-checkbox-radio:before { - font-family: "Font Awesome 5 Free"; - display: inline-block; - font-size: 16px; - color: #D3D3D3; - font-weight: 400; -} -#branching #variable_holder input[type=checkbox].enka-admin-custom.enka-inline + span.enka-checkbox-radio:before, -#branching #variable_holder input[type=radio].enka-admin-custom.enka-inline + span.enka-checkbox-radio:before { - display: inline-block; - float: left; - padding-top: 4px; - padding-left: 4px; - font-weight: 400; -} -#branching #variable_holder input[type=checkbox].enka-admin-custom + span.enka-checkbox-radio:before { - /*content: "\f096";*/ - content: "\f0c8"; - letter-spacing: 10px; -} -#branching #variable_holder input[type=radio].enka-admin-custom + span.enka-checkbox-radio:before { - /*content: "\f10c";*/ - content: "\f111"; - letter-spacing: 8px; -} -#branching #variable_holder input[type=checkbox].enka-admin-custom:checked + span.enka-checkbox-radio:before { - /*content: "\f046";*/ - content: "\f14a"; - color: #D3D3D3; - letter-spacing: 8px; -} -#branching #variable_holder input[type=radio].enka-admin-custom:checked + span.enka-checkbox-radio:before { - /*content: "\f192";*/ - content: "\f192"; - color: #D3D3D3; -} -#branching span.faicon.delete_circle::before { - font-size: 14px; -} -#branching span.faicon.add::before { - font-size: 14px; -} #branching .empty_vrivanje { display: flex; flex-direction: column; @@ -11020,12 +11043,38 @@ and open the template in the editor. background: 0 !important; background-color: #E5E5E5; } -#branching #bottom_icons_holder { - /*display: none;*/ +#branching #bottom_icons_holder .forma_bottom { + display: flex; + flex-direction: row; + justify-content: space-between; + align-items: center; + width: 100%; + height: auto; + padding: 64px 0 0 0; } - -.branchinghover { - background: url("../../../admin/survey/img_0/hover_background.png") repeat-x top left !important; +#branching #bottom_icons_holder .forma_bottom .forma_bottom_inner { + display: flex; + align-items: baseline; + padding: 0; + margin: 0; +} +#branching #bottom_icons_holder .forma_bottom .forma_bottom_inner > span { + font-size: 14px; + color: #333333; +} +#branching #bottom_icons_holder .forma_bottom .forma_bottom_inner a { + display: flex; + align-items: baseline; + margin: 0 16px 0 0; + padding: 0; + font-size: 14px; + text-decoration: none; +} +#branching #bottom_icons_holder .forma_bottom .forma_bottom_inner a:hover { + text-decoration: none; +} +#branching #bottom_icons_holder .forma_bottom .forma_bottom_inner .faicon { + margin-right: 8px; } .blockSwitch { diff --git a/resources/sass/admin_new/basic/typography.scss b/resources/sass/admin_new/basic/typography.scss index a3e9fe125..7c4db62ee 100644 --- a/resources/sass/admin_new/basic/typography.scss +++ b/resources/sass/admin_new/basic/typography.scss @@ -22,6 +22,12 @@ p,span { font-style: italic; } +.as_link { + text-decoration: underline; + color: $blue; + cursor: pointer; +} + .bold { font-weight: $extra-bold; } diff --git a/resources/sass/admin_new/components/popup/page_specific/archive.scss b/resources/sass/admin_new/components/popup/page_specific/archive.scss index e8df48c41..123ec770f 100644 --- a/resources/sass/admin_new/components/popup/page_specific/archive.scss +++ b/resources/sass/admin_new/components/popup/page_specific/archive.scss @@ -95,3 +95,9 @@ dl.arch_email { #email_archive_text { height: 150px; } +#inv_view_arch_recipients { + @include popup_general(); + + height: auto; + width: auto; +} diff --git a/resources/sass/admin_new/components/table/table.scss b/resources/sass/admin_new/components/table/table.scss index ef3ab9145..062057427 100644 --- a/resources/sass/admin_new/components/table/table.scss +++ b/resources/sass/admin_new/components/table/table.scss @@ -4,7 +4,8 @@ table { border-collapse: collapse; text-align: left; - td, th { + td, + th { padding: 8px 16px; border-top: 1px solid $gray; vertical-align: middle; @@ -19,6 +20,10 @@ table { &.wrap { white-space: normal; } + + &.lead_column { + border-right: 3px solid $gray; + } } th {