may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Redizajn 1KA] - Urejanje --> Arhiv --> Arhivi vabil - v1

Browse Source
This commit is contained in:
tejagerjovic 2022-01-13 14:30:37 +01:00
parent 348a67f645
commit e96c961da5
8 changed files with 184 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php
View File

@ -3566,67 +3566,55 @@ class SurveyInvitationsNew {
if (mysqli_num_rows($sql_query) > 0 || count($simple_recipents) > 0) {
echo '<h2>'.$lang['srv_archive_invitation'].'</h2>';
echo '<fieldset><legend>'.$lang['srv_archive_invitation'].'</legend>';
echo '<p class="bottom16">'.$lang['srv_archive_invitation_text'].'</p>';
echo '<p class="bold">'.$lang['srv_archive_invitation_text2'].'</p>';
echo '<div class="table-horizontal-scroll-wrapper1">';
echo '<div class="table-horizontal-scroll-wrapper2">';
echo '<table id="tbl_archive_list">';
echo '<tr>';
echo '<th class="tbl_inv_center" title="'.$lang['srv_inv_archive_date_send'].'">'.$lang['srv_inv_archive_date_send'].'</th>';
echo '<th class="tbl_inv_center" title="'.$lang['srv_inv_archive_hour_send'].'">'.$lang['srv_inv_archive_hour_send'].'</th>';
echo '<th class="lead_column" title="'.$lang['srv_inv_archive_date_send'].'">'.$lang['srv_inv_archive_date_send'].'</th>';
echo '<th title="'.$lang['srv_inv_archive_subject_text'].'">'.$lang['srv_inv_archive_naslov'].'</th>';
echo '<th title="'.$lang['srv_inv_archive_subject_text'].'">'.$lang['srv_inv_archive_subject_text'].'</th>';
#echo '<th title="'.$lang['srv_inv_archive_body_text'].'">'.$lang['srv_inv_archive_body_text'].'</th>';
echo '<th class="tbl_inv_center" title="'.$lang['srv_inv_message_type'].'">'.$lang['srv_inv_message_type'].'</th>';
echo '<th class="tbl_inv_center" title="'.$lang['srv_inv_archive_cnt_succsess'].'">'.$lang['srv_inv_archive_cnt_succsess'].' '.Help::display('srv_inv_archive_sent').'</th>';
echo '<th class="tbl_inv_center" title="'.$lang['srv_inv_archive_cnt_error'].'">'.$lang['srv_inv_archive_cnt_error'].'</th>';
echo '<th title="'.$lang['srv_inv_archive_cnt_succsess'].'">'.$lang['srv_inv_archive_cnt_succsess'].' '.Help::display('srv_inv_archive_sent').'</th>';
echo '<th title="'.$lang['srv_inv_archive_cnt_error'].'">'.$lang['srv_inv_archive_cnt_error'].'</th>';
echo '<th title="'.$lang['srv_inv_archive_sender'].'">'.$lang['srv_inv_archive_sender'].'</th>';
echo '<th title="'.$lang['srv_inv_archive_comment'].'">'.$lang['srv_inv_archive_comment'].'</th>';
#echo '<th >&nbsp;</th>';
echo '</tr>';
while ($row = mysqli_fetch_assoc($sql_query)) {
echo '<tr>';
// Datum
echo '<td class="tbl_inv_center">'.$row['ds'].'</td>';
// Ura
echo '<td class="tbl_inv_center">'.$row['hs'].'</td>';
// Datum in ura
echo '<td class="lead_column">'.$row['ds'].' '.$row['hs'].'</td>';
// Email sporocilo
echo '<td class="tbl_inv_lef inv_arch_subject" title="'.$row['naslov'].'">';
echo '<td title="'.$row['naslov'].'">';
echo '<a href="#" onclick="inv_arch_edit_details(\''.$row['id'].'\'); return false;">'.$row['naslov'].'</a>';
echo '</td>';
// Subject
echo '<td class="tbl_inv_lef inv_arch_subject" title="'.$row['naslov'].'">';
echo '<td title="'.$row['naslov'].'">';
echo $row['subject_text'];
echo '</td>';
#echo '<td class="tbl_inv_left inv_arch_text" title="'.$row['body_text'].'">'.$row['body_text'].'</td>';
// Nacin posiljanja (email, posta, sms...)
echo '<td class="tbl_inv_center">';
if ($row['tip'] == '0')
echo '<span>'.$lang['srv_inv_message_noemailing_type1'].'</span>';
elseif($row['tip'] == '1')
echo '<span>'.$lang['srv_inv_message_noemailing_type2'].'</span>';
elseif($row['tip'] == '2')
echo '<span>'.$lang['srv_inv_message_noemailing_type3'].'</span>';
else
echo '<span>'.$lang['email'].'</span>';
echo '</td>';
# uspešno poslani
echo '<td class="tbl_inv_center">';
echo '<td class="right">';
if ((int)$row['cnt_succsess'] > 0 ) {
echo '<span class="as_link as_view strong" id="inv_arch_1_'.$row['id'].'" data-archtype="succ">'.$row['cnt_succsess'].'</span>';
echo '<span class="as_link as_view" id="inv_arch_1_'.$row['id'].'" data-archtype="succ">'.$row['cnt_succsess'].'</span>';
} else {
echo '<span>'.$row['cnt_succsess'].'</span>';
}
echo '</td>';
# neuspešno poslani
echo '<td class="tbl_inv_center">';
echo '<td class="right">';
if ((int)$row['cnt_error'] > 0 ) {
echo '<span class="as_link as_view strong" id="inv_arch_0_'.$row['id'].'" data-archtype="err">'.$row['cnt_error'].'</span>';
echo '<span class="as_link as_view" id="inv_arch_0_'.$row['id'].'" data-archtype="err">'.$row['cnt_error'].'</span>';
} else {
echo '<span>'.$row['cnt_error'].'</span>';
}
@ -3647,7 +3635,7 @@ class SurveyInvitationsNew {
# komentar
echo '<td>';
echo '<a href="#" onclick="inv_arch_edit_details(\''.$row['id'].'\'); return false;">'.$row['comment'];
echo (($row['comment'] == "") ? '/' : $row['comment']);
echo '</td>';
echo '</tr>';
@ -3655,6 +3643,9 @@ class SurveyInvitationsNew {
echo '</tr>';
echo '</table>';
echo '</div>';
echo '</div>';
# dodamo simpl pošiljanje
if ( count($simple_recipents) > 0 ) {
if (mysqli_num_rows($sql_query) > 0) {
@ -3693,19 +3684,15 @@ class SurveyInvitationsNew {
echo '</table>';
}
} else {
echo '<fieldset>';
echo '<legend>'.$lang['srv_archive_invitation'].'</legend>';
} else { //Če ni še nobenih poslanih vabil
echo $lang['srv_invitation_note4'].'';
echo '</fieldset>';
}
echo '</fieldset>';
echo '</div>'; # id="div_archive_content">';
echo '<br class="clr">';
}
@ -4685,9 +4672,11 @@ class SurveyInvitationsNew {
echo '</div>'; // id="arc_content"
echo '<div class="inv_FS_btm">';
echo '<div id="navigationBottom" class="printHide">';
echo '<span class="floatRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="inv_arch_save_comment(); return false;"><span>'.$lang['save'].'</span></a></div></span>';
echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="inv_arch_recipients_close(); return false;"><span>'.$lang['srv_zapri'].'</span></a></div></span>';
echo '<div class="clr" />';
echo '<div class="button_holder">';
echo '<button class="medium white-blue" onclick="inv_arch_recipients_close(); return false;">'.$lang['srv_zapri'].'</button>';
echo '<button class="medium blue" onclick="inv_arch_save_comment(); return false;">'.$lang['save'].'</button>';
echo '</div>';
echo '</div>';
echo '</div>';
@ -6694,9 +6683,9 @@ class SurveyInvitationsNew {
echo '</div>'; // id="arc_content"
echo '<div class="inv_FS_btm">';
echo '<div id="navigationBottom" class="printHide">';
#echo '<span class="floatRight spaceLeft"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="inv_arch_save_comment(); return false;"><span>'.$lang['save'].'</span></a></div></span>';
echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="inv_arch_recipients_close(); return false;"><span>'.$lang['srv_zapri'].'</span></a></div></span>';
echo '<div class="clr" />';
echo '<div class="button_holder">';
echo '<button class="medium white-blue" onclick="inv_arch_recipients_close(); return false;">'.$lang['srv_zapri'].'</button>';
echo '</div>';
echo '</div>';
echo '</div>';
@ -6872,9 +6861,9 @@ class SurveyInvitationsNew {
echo '<div class="inv_FS_btm">';
echo '<div id="navigationBottom" class="printHide">';
#echo '<span class="floatRight spaceLeft"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="inv_arch_save_comment(); return false;"><span>'.$lang['save'].'</span></a></div></span>';
echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="inv_arch_recipients_close(); return false;"><span>'.$lang['srv_zapri'].'</span></a></div></span>';
echo '<div class="clr" />';
echo '<div class="button_holder">';
echo '<button class="medium white-blue" onclick="inv_arch_recipients_close(); return false;">'.$lang['srv_zapri'].'</button>';
echo '</div>';
echo '</div>';
echo '</div>';
@ -6917,9 +6906,10 @@ class SurveyInvitationsNew {
echo '</div>'; // id="arc_content"
echo '<div class="inv_FS_btm">';
echo '<div id="navigationBottom" class="printHide">';
echo '<span class="floatRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="inv_arch_save_comment(); return false;"><span>'.$lang['save'].'</span></a></div></span>';
echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="inv_arch_recipients_close(); return false;"><span>'.$lang['srv_zapri'].'</span></a></div></span>';
echo '<div class="clr" />';
echo '<div class="button_holder">';
echo '<button class="medium white-blue" onclick="inv_arch_recipients_close(); return false;">'.$lang['srv_zapri'].'</button>';
echo '<button class="medium blue" onclick="inv_arch_save_comment(); return false;">'.$lang['save'].'</button>';
echo '</div>';
echo '</div>';
echo '</div>';
@ -6958,11 +6948,10 @@ class SurveyInvitationsNew {
echo '</div>'; // id="arc_content"
echo '<div class="inv_FS_btm">';
echo '<div id="navigationBottom" class="printHide">';
#echo '<span class="floatRight spaceLeft"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_orange" href="#" onclick="inv_arch_save_comment(); return false;"><span>'.$lang['save'].'</span></a></div></span>';
echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onclick="inv_arch_recipients_close(); return false;"><span>'.$lang['srv_zapri'].'</span></a></div></span>';
echo '<div class="clr" />';
echo '<div class="button_holder">';
echo '<button class="medium white-blue" onclick="inv_arch_recipients_close(); return false;">'.$lang['srv_zapri'].'</button>';
echo '</div>';
echo '</div>';
echo '</div>';
}

3
admin/survey/classes/tracking/CrossRoad.php
View File

@ -268,6 +268,9 @@ class CrossRoad {
$layout_width = 'wide';
if ($_GET['m'] == 'view_archive')
$layout_menu = "menu_left";
$status = 5;
break;

8
lang/1.php
View File

@ -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",

4
lang/2.php
View File

@ -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",

173
public/css/admin_new.css
View File

@ -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 {

6
resources/sass/admin_new/basic/typography.scss
View File

@ -22,6 +22,12 @@ p,span {
font-style: italic;
}
.as_link {
text-decoration: underline;
color: $blue;
cursor: pointer;
}
.bold {
font-weight: $extra-bold;
}

6
resources/sass/admin_new/components/popup/page_specific/archive.scss
View File

@ -95,3 +95,9 @@ dl.arch_email {
#email_archive_text {
height: 150px;
}
#inv_view_arch_recipients {
@include popup_general();
height: auto;
width: auto;
}

7
resources/sass/admin_new/components/table/table.scss
View File

@ -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 {