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

Redesign - popravki vabil

Browse Source
This commit is contained in:
pero1203 2022-04-17 13:51:42 +02:00
parent a776d75423
commit 391c8bdc77
5 changed files with 240 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -760,12 +760,11 @@ class SurveyInvitationsNew {
echo '<div class="setting_line inv_sample">';
echo '<div class="semi-bold">'.$lang['srv_inv_recipiens_sample'].'</div>';
echo $lang['srv_inv_recipiens_sample1'];
echo '<div class="italic">'.$lang['srv_inv_recipiens_sample1'].'</div>';
echo '</div>';
echo '<div class="setting_line">';
echo $lang['srv_inv_recipiens_fields'].' <span id="inv_field_list" class="inv_type_0">';
echo implode(',',$field_lang);
echo $lang['srv_inv_recipiens_fields'].' <span id="inv_field_list" class="semi-bold inv_type_0">'.implode(',',$field_lang).'</span>';
echo '</div>';
// Opozorilo za limit znakov pri passwordu (20)
@ -851,7 +850,7 @@ class SurveyInvitationsNew {
echo '<div class="setting_line inv_sample">';
echo ' <div class="semi-bold">'.$lang['srv_inv_recipiens_sample'].'</div>';
echo $lang['srv_inv_recipiens_sample1'];
echo ' <div class="italic">'.$lang['srv_inv_recipiens_sample1'].'</div>';
echo '</div>';
@ -1796,15 +1795,21 @@ class SurveyInvitationsNew {
echo '<tr>';
echo '<td colspan="3">';
# checkbox
echo '<td><input type="checkbox" id="inv_rids'.$sql_row['id'].'" name="inv_rids[]" value="'.$sql_row['id'].'"><label for="inv_rids'.$sql_row['id'].'"></label></td>';
echo '<input type="checkbox" id="inv_rids'.$sql_row['id'].'" name="inv_rids[]" value="'.$sql_row['id'].'"><label for="inv_rids'.$sql_row['id'].'"></label>';
#izbriši
echo '<td class="tbl_inv_left"><span class="faicon delete_circle icon-orange_link" onclick="deleteRecipient_confirm(\''.$sql_row['id'].'\'); return false;" title="'.$lang['srv_inv_list_profiles_delete'].'"></span></td>';
echo '<span class="faicon delete" onclick="deleteRecipient_confirm(\''.$sql_row['id'].'\'); return false;" title="'.$lang['srv_inv_list_profiles_delete'].'"></span>';
#uredi
echo '<td class="tbl_inv_left"><span class="faicon edit smaller icon-as_link" onclick="editRecipient(\''.$sql_row['id'].'\'); return false;" title="'.$lang['srv_inv_list_profiles_edit'].'"></span></td>';
echo '<span class="faicon edit" onclick="editRecipient(\''.$sql_row['id'].'\'); return false;" title="'.$lang['srv_inv_list_profiles_edit'].'"></span>';
echo '</td>';
// Skoci na urejanje odgovorov - ce imamo identifikatorje povezane s podatki
if($this->surveySettings['show_email'] == 1)
echo '<td class="tbl_inv_left"><span class="icon-grey_dark_link" onclick="window.open(\''.$site_url.'/main/survey/edit_anketa.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&usr_id='.$sql_row['id'].'&code='.$sql_row['password'].'\', \'blank\')" title="'.$lang['srv_edit_data_row'].'"></span></td>';
@ -1902,9 +1907,9 @@ class SurveyInvitationsNew {
echo ' <a href="'.$this->addUrl('view_message').'"><button type="button" class="medium blue">'.$lang['srv_invitation_forward'].'</div></a>';
echo '</div>';
}
}
}
else {
echo '<span>'.$lang['srv_inv_list_no_recipients_filtred'].'</span>';
echo '<span class="search_count">'.$lang['srv_inv_list_no_recipients_filtred'].'</span>';
}
echo '</form>';
@ -3335,7 +3340,6 @@ class SurveyInvitationsNew {
echo '<span class="inv_send_span"><input name="mailto" id="mailto2" value="2" type="radio" onclick="mailToRadioChange();"><label for="mailto2">' . $lang['srv_inv_send_recipients2'] . '</label></span>';
echo '<span class="inv_send_span"><input name="mailto" id="mailto3" value="3 " type="radio" onclick="mailToRadioChange();"><label for="mailto3">' . $lang['srv_inv_send_recipients3'] . '</label></span>';
echo '<span class="inv_send_span">'.$lang['srv_invitation_send_advanced'].'</span><br/>';
echo '<span class="inv_send_span"><input name="mailto" id="mailto4" value="4 " type="radio" onclick="mailToRadioChange();"><label for="mailto4">' . $lang['srv_inv_send_recipients4'] . '</label></span>';
echo '<div id="inv_send_advanced_div" class="setting_item ver">';
@ -9485,29 +9489,34 @@ class SurveyInvitationsNew {
$sqlSpremenlivka = sisplet_query($qryString);
if (mysqli_num_rows($sqlSpremenlivka) > 0) {
echo '<form id="inv_ValidateSysVarsMappingFrm" name="inv_ValidateSysVarsMappingFrm">';
echo $lang['srv_invitation_system_email_choose'];
echo '<table>';
echo '<div class="setting_holder">';
while ($row = mysqli_fetch_assoc($sqlSpremenlivka)) {
$system_variables[$row['id']] = $row;
echo '<tr>';
echo '<td>';
$system_variables[$row['id']] = $row;
echo '<div class="setting_item">';
$checked = (isset($mappingArray[$row['id']]) && $mappingArray[$row['id']] == 'email' )?' checked="checked"':'';
echo '<input type="radio" name="sysVarMap" id="sysVarMap_'.$row['id'].'" value="'.$row['id'].'"'.$checked.'>';
echo '</td>';
echo '<td><label for="sysVarMap_'.$row['id'].'"><span style="color: #78a971;">'.$row['variable'].'</span></label></td>';
echo '<td><label for="sysVarMap_'.$row['id'].'">'.$row['naslov'].'</label></td>';
echo '</tr>';
echo '<label for="sysVarMap_'.$row['id'].'"><span>'.$row['variable'].'</span>'.$row['naslov'].'</label>';
echo '</div>';
}
echo '</table>';
echo '<form/>';
echo '<br/>';
echo '<div id="inv_ValidateSysVarsMappingDiv">';
echo '<span onclick="inv_ValidateSysVarsMapping();" class="buttonwrapper floatLeft spaceLeft" ><a class="ovalbutton ovalbutton_orange" ><span>'.$lang['srv_invitation_system_validate'].'</span></a></span>';
echo '</div>';
echo '</form>';
echo '<div id="inv_ValidateSysVarsMappingDiv" class="button_holder below">';
echo ' <button class="medium white-blue" onclick="inv_ValidateSysVarsMapping();">'.$lang['srv_invitation_system_validate'].'</button>';
echo '</div>';
} else {
}
else {
echo '<span>'.$lang['srv_invitation_system_error3'].'</span>';
}
}
@ -9553,7 +9562,8 @@ class SurveyInvitationsNew {
} else {
$errors[] = $lang['srv_invitation_system_error2'];
}
} else {
}
else {
if ((int)$cntSistemske == 0) {
# ni sistemskih spremenljivk
@ -9563,18 +9573,25 @@ class SurveyInvitationsNew {
$errors[] = $lang['srv_invitation_system_error4'];
}
}
echo '<span onclick="inv_ValidateSysVarsMapping();" class="buttonwrapper floatLeft spaceLeft spaceRight" ><a class="ovalbutton ovalbutton_gray" ><span>'.$lang['srv_invitation_system_validate'].'</span></a></span>';
if (count($emailsToAdd)) {
echo '<span onclick="inv_addSysVarsMapping();" class="buttonwrapper floatLeft spaceLeft spaceRight" ><a class="ovalbutton ovalbutton_orange" ><span>'.$lang['srv_invitation_system_validateAndAdd'].'</span></a></span>';
echo '<button class="medium white-blue" onclick="inv_ValidateSysVarsMapping();">'.$lang['srv_invitation_system_validate'].'</button>';
if (count($emailsToAdd)) {
echo '<button class="medium white-blue" onclick="inv_addSysVarsMapping();">'.$lang['srv_invitation_system_validateAndAdd'].'</button>';
}
if (mysqli_num_rows($queryUser) > 0)
{ # če je kaj novih zapisov v bazi
# če že imamo prejemnike v bazi ponudimo gumb naprej
if (mysqli_num_rows($queryUser) > 0){
echo '<a href="'.$this->addUrl('view_recipients').'"><button class="medium blue">'.$lang['srv_invitation_forward'].'</button></a>';
}
echo '<div class="setting_holder">';
# če je kaj novih zapisov v bazi
if (mysqli_num_rows($queryUser) > 0){
# če že imamo prejemnike v bazi ponudimo gumb naprej
echo '<span class="buttonwrapper floatLeft spaceLeft" ><a class="ovalbutton ovalbutton_orange" href="'.$this->addUrl('view_recipients').'"><span>'.$lang['srv_invitation_forward'].'</span></a></span>';
echo '<br class="clr"/>';
echo '<br/>';
echo '<span class="strong">';
printf($lang['srv_invitation_system_found'],mysqli_num_rows($queryUser));
echo '</span>';
@ -9592,12 +9609,13 @@ class SurveyInvitationsNew {
echo $lang['srv_invitation_system_from_this_invalid'].(int)count($invalidEmails);
}
}
else
{
else{
echo '<br class="clr"/>';
echo '<br/>';
echo $lang['srv_invitation_system_not_found'];
}
echo '</div>';
}
function addSysVarsMapping() {
global $lang,$global_user_id;
@ -10038,7 +10056,9 @@ class SurveyInvitationsNew {
function advancedCondition(){
global $lang;
echo '<div id="conditionProfileNote" class="setting">';
echo '<div class="condition_holder" class="setting">';
echo '<div id="conditionProfileNote">';
echo $lang['srv_inv_condition_filter'].' ';
@ -10054,8 +10074,8 @@ class SurveyInvitationsNew {
else
{
}
echo '<span class="as_link spaceLeft" onclick="showInvitationAdvancedConditions(\''.(int)$this->invitationAdvancedConditionId.'\'); return false;">'.$lang['srv_profile_edit'].'</span>';
echo '<span class="as_link spaceLeft" onclick="invitationSetCondition(\'0\'); return false;">'.$lang['srv_profile_remove'].'</span>';
echo '<span onclick="showInvitationAdvancedConditions(\''.(int)$this->invitationAdvancedConditionId.'\'); return false;" title=""'.$lang['srv_profile_edit'].'"><span class="faicon edit"></span></span>';
echo '<span onclick="invitationSetCondition(\'0\'); return false;" title="'.$lang['srv_profile_remove'].'"><span class="faicon delete"></span></span></span>';
}
else{
echo '<span>'.$lang['srv_inv_condition_no_filter'].'</span>';
@ -10063,6 +10083,8 @@ class SurveyInvitationsNew {
}
echo '</div>';
echo '</div>';
}
function listCondition(){
@ -10301,8 +10323,11 @@ class SurveyInvitationsNew {
echo '<div id="send_mail_mode2" '.(!$MA->isSMTP() || $squalo->getSqualoActive() ? ' class="displayNone"' : '').'>';
echo '<div class="setting_holder">';
echo ' <div class="setting_item italic">'.$lang['srv_email_setting_adapter2_note'].'</div>';
echo ' <div class="setting_item semi-bold">'.$lang['srv_email_setting_settings'].'</div>';
echo ' <div class="italic">'.$lang['srv_email_setting_adapter2_note'].'</div>';
echo '</div>';
echo '<div class="setting_holder">';
echo ' <div class="semi-bold">'.$lang['srv_email_setting_settings'].'</div>';
echo '</div>';
@ -10367,7 +10392,7 @@ class SurveyInvitationsNew {
#Varnost SMTPSecure
echo ' <div class="setting_item">';
echo ' <label>'.$lang['srv_email_setting_encryption'].':</label>';
echo ' <label>'.$lang['srv_email_setting_encryption'].'</label>';
echo ' <select class="dropdown medium" name="SMTPSecure2">'
. '<option value="0" '.($enkaSettings['SMTPSecure']=="0" ? 'selected="selected"' : '') .'>'.$lang['srv_email_setting_encryption_none'].'</option>'
. '<option value="ssl" '.($enkaSettings['SMTPSecure']=="ssl" ? 'selected="selected"' : '') .'>'.$lang['srv_email_setting_encryption_ssl'].'</option>'
@ -10383,7 +10408,7 @@ class SurveyInvitationsNew {
#port
echo ' <div class="setting_item">';
echo ' <label>'.$lang['srv_email_setting_port'].$lang['srv_email_setting_port_note'].'</label>';
echo ' <label>'.$lang['srv_email_setting_port'].$lang['srv_email_setting_port_note'].':</label>';
echo ' <input type="number" class="medium" min="0" max="65535" name="SMTPPort2" value="'.(int)$enkaSettings['SMTPPort'].'">';
echo ' </div>';

8
lang/1.php
View File

@ -5666,7 +5666,7 @@ $lang = array (
"srv_invitation_choosen" => '(izbran)',
"srv_invitation_note1" => 'Polje s prejemniki je prazno!',
"srv_invitation_note2" => 'Izbrano ni nobeno polje!',
"srv_invitation_note3" => 'Ni ustrezih respondentov!',
"srv_invitation_note3" => 'Ni ustreznih respondentov!',
"srv_invitation_note4" => 'Nič sporočil še ni bilo poslanih!',
"srv_invitation_note5" => 'Sporočilo je bilo uspešno poslano na vse naslove!',
"srv_invitation_note5_noEmailing" => 'Obvestilo o vabilu je bilo dokumentirano in shranjeno v sistem 1KA. Podrobnosti so v <a href="%s" class="bold">arhivih</a>.',
@ -6724,12 +6724,12 @@ $lang = array (
'srv_email_setting_encryption_none' => 'Brez',
'srv_email_setting_encryption_ssl' => 'SSL',
'srv_email_setting_encryption_tls' => 'TLS',
'srv_email_setting_port' => 'Vrata: ',
'srv_email_setting_port_note' => '(V večini primerov, standardna vrata: 25, 465 ali 587)',
'srv_email_setting_port' => 'Vrata ',
'srv_email_setting_port_note' => '(v večini standardna: 25, 465, 587)',
'srv_email_setting_host' => 'Strežnik: ',
'srv_email_setting_btn_test' => 'Preveri nastavitve',
'srv_email_setting_btn_save' => 'Shrani',
'srv_email_setting_smtp_delay' => 'Časovni zamik pri posameznem pošiljanju',
'srv_email_setting_smtp_delay' => 'Čas. zamik pri posam. pošiljanju',
'srv_parapodatki' => 'Napredni parapodatki',
'pasteFromWordAlert' => '<b>Kopiranje besedila močno odsvetujemo!</b> <a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/zakaj-priporocljivo-kopiranje-besedila?from1ka=1" target="_blank">Več >></a>',
'srv_interaktivni_elementi' => 'Interaktivni elementi',

4
lang/2.php
View File

@ -6607,8 +6607,8 @@ $lang = array (
'srv_email_setting_encryption_none' => 'None',
'srv_email_setting_encryption_ssl' => 'SSL',
'srv_email_setting_encryption_tls' => 'TLS',
'srv_email_setting_port' => 'Port: ',
'srv_email_setting_port_note' => '(Set the SMTP port number - likely to be 25, 465 or 587)',
'srv_email_setting_port' => 'Port ',
'srv_email_setting_port_note' => '(likely 25, 465 or 587)',
'srv_email_setting_host' => 'Host: ',
'srv_email_setting_btn_test' => 'Test settings',
'srv_email_setting_btn_save' => 'Save',

75
public/css/admin_new.css
View File

@ -21644,6 +21644,16 @@ body #main_holder #main .page_invitations #inv_import_list_container .setting_li
body #main_holder #main .page_invitations #inv_import_list_container .setting_line textarea {
width: 100%;
}
body #main_holder #main .page_invitations #inv_import_list_container #inv_field_container {
margin: 16px 0;
}
body #main_holder #main .page_invitations #inv_import_list_container .inv_sample .italic {
color: #A0A0A0;
}
body #main_holder #main .page_invitations #inv_import_list_container #inv_ValidateSysVarsMappingFrm span {
margin-right: 16px;
color: #A0A0A0;
}
body #main_holder #main .page_invitations #inv_rec_filter {
display: flex;
align-items: center;
@ -21662,10 +21672,12 @@ body #main_holder #main .page_invitations #inv_rec_filter .setting#conditionProf
display: flex;
align-items: center;
padding: 4px 8px;
font-size: 14px;
background-color: #E5E5E5;
}
body #main_holder #main .page_invitations #inv_rec_filter .setting#conditionProfileNote span {
margin-left: 8px;
font-size: 14px;
}
body #main_holder #main .page_invitations #inv_rec_filter .setting#conditionProfileNote a {
margin-left: 4px;
@ -21698,6 +21710,9 @@ body #main_holder #main .page_invitations #srv_invitation_note span {
body #main_holder #main .page_invitations #srv_invitation_note label {
font-size: 14px;
}
body #main_holder #main .page_invitations .search_count {
font-size: 14px;
}
body #main_holder #main .page_invitations .excel_export {
font-size: 14px;
}
@ -21768,6 +21783,7 @@ body #main_holder #main .page_invitations .table_holder table#tbl_recipients_lis
}
body #main_holder #main .page_invitations .table_holder table#tbl_recipients_list tr th input[type=checkbox] + label::before {
font-weight: 400;
letter-spacing: 0;
}
body #main_holder #main .page_invitations .table_holder table#tbl_recipients_list tr th input[type=checkbox]:checked + label::before {
font-weight: 600;
@ -21778,6 +21794,20 @@ body #main_holder #main .page_invitations .table_holder table#tbl_recipients_lis
padding: 10px 16px;
font-size: 14px;
}
body #main_holder #main .page_invitations .table_holder table#tbl_recipients_list tr td .faicon.delete,
body #main_holder #main .page_invitations .table_holder table#tbl_recipients_list tr td .faicon.edit {
cursor: pointer;
}
body #main_holder #main .page_invitations .table_holder table#tbl_recipients_list tr td .faicon.delete:before,
body #main_holder #main .page_invitations .table_holder table#tbl_recipients_list tr td .faicon.edit:before {
color: #1E88E5;
font-size: 16px;
}
body #main_holder #main .page_invitations .table_holder table#tbl_recipients_list tr td .faicon.delete.faicon.delete,
body #main_holder #main .page_invitations .table_holder table#tbl_recipients_list tr td .faicon.edit.faicon.delete {
margin-right: 16px;
margin-left: -8px;
}
body #main_holder #main .page_invitations #inv_bottom_edit .bottom_actions {
display: flex;
align-items: center;
@ -21903,13 +21933,48 @@ body #main_holder #main .page_invitations #inv_send_mail .setting_item.hor label
body #main_holder #main .page_invitations #inv_send_mail .setting_item.ver {
display: flex;
flex-direction: column;
position: relative;
margin-bottom: 16px;
}
body #main_holder #main .page_invitations #inv_send_mail .setting_item.ver span,
body #main_holder #main .page_invitations #inv_send_mail .setting_item.ver label,
body #main_holder #main .page_invitations #inv_send_mail .setting_item.ver div {
body #main_holder #main .page_invitations #inv_send_mail .setting_item.ver > span,
body #main_holder #main .page_invitations #inv_send_mail .setting_item.ver > label,
body #main_holder #main .page_invitations #inv_send_mail .setting_item.ver > div {
margin-bottom: 8px;
}
body #main_holder #main .page_invitations #inv_send_mail .setting_item.ver > span:last-child,
body #main_holder #main .page_invitations #inv_send_mail .setting_item.ver > label:last-child,
body #main_holder #main .page_invitations #inv_send_mail .setting_item.ver > div:last-child {
margin-bottom: 0px;
}
body #main_holder #main .page_invitations #inv_send_mail .condition_holder {
display: flex;
position: absolute;
top: 27px;
left: 220px;
}
body #main_holder #main .page_invitations #inv_send_mail .condition_holder #conditionProfileNote {
display: flex;
align-items: center;
padding: 4px 8px;
font-size: 14px;
background-color: #E5E5E5;
}
body #main_holder #main .page_invitations #inv_send_mail .condition_holder #conditionProfileNote span {
margin-left: 8px;
font-size: 14px;
}
body #main_holder #main .page_invitations #inv_send_mail .condition_holder #conditionProfileNote a {
margin-left: 4px;
}
body #main_holder #main .page_invitations #inv_send_mail .condition_holder #conditionProfileNote .faicon.edit,
body #main_holder #main .page_invitations #inv_send_mail .condition_holder #conditionProfileNote .faicon.delete {
cursor: pointer;
}
body #main_holder #main .page_invitations #inv_send_mail .condition_holder #conditionProfileNote .faicon.edit:before,
body #main_holder #main .page_invitations #inv_send_mail .condition_holder #conditionProfileNote .faicon.delete:before {
color: #1E88E5;
font-size: 14px;
}
body #main_holder #main .page_invitations #inv_send_mail #inv_send_advanced_div {
margin: 0 0 0 16px;
}
@ -22010,6 +22075,10 @@ body #main_holder #main .page_invitations .invitation_lists .left_holder #inv_ed
font-size: 16px;
color: #1E88E5;
}
body #main_holder #main .page_invitations .invitation_lists .left_holder #inv_edit_rec_list table tr td:nth-child(3),
body #main_holder #main .page_invitations .invitation_lists .left_holder #inv_edit_rec_list table tr th:nth-child(3) {
text-align: right;
}
body #main_holder #main .page_invitations .invitation_lists .right_holder {
padding-left: 32px;
}

95
resources/sass/admin_new/pages/survey_objava/vabila_main.scss
View File

@ -144,6 +144,24 @@ body #main_holder #main .page_invitations{
width: 100%;
}
}
#inv_field_container{
margin: 16px 0;
}
.inv_sample{
.italic{
color: #A0A0A0;
}
}
#inv_ValidateSysVarsMappingFrm{
span{
margin-right: 16px;
color: #A0A0A0;
}
}
}
@ -171,10 +189,13 @@ body #main_holder #main .page_invitations{
padding: 4px 8px;
font-size: 14px;
background-color: $gray;
span{
margin-left: 8px;
font-size: 14px;
}
a{
@ -218,6 +239,10 @@ body #main_holder #main .page_invitations{
}
}
.search_count{
font-size: 14px;
}
.excel_export{
font-size: 14px;
@ -313,6 +338,7 @@ body #main_holder #main .page_invitations{
input[type="checkbox"] + label::before{
font-weight: 400;
letter-spacing: 0;
}
input[type="checkbox"]:checked + label::before{
font-weight: 600;
@ -326,6 +352,21 @@ body #main_holder #main .page_invitations{
padding: 10px 16px;
font-size: 14px;
.faicon.delete,
.faicon.edit{
cursor: pointer;
&:before{
color: $blue;
font-size: 16px;
}
&.faicon.delete{
margin-right: 16px;
margin-left: -8px;
}
}
}
}
@ -465,13 +506,57 @@ body #main_holder #main .page_invitations{
.setting_item.ver{
display: flex;
flex-direction: column;
position: relative;
margin-bottom: 16px;
span,
label,
div{
> span,
> label,
> div{
margin-bottom: 8px;
&:last-child{
margin-bottom: 0px;
}
}
}
.condition_holder{
display: flex;
position: absolute;
top: 27px;
left: 220px;
#conditionProfileNote{
display: flex;
align-items: center;
padding: 4px 8px;
font-size: 14px;
background-color: $gray;
span{
margin-left: 8px;
font-size: 14px;
}
a{
margin-left: 4px;
}
.faicon.edit,
.faicon.delete{
cursor: pointer;
&:before{
color: $blue;
font-size: 14px;
}
}
}
}
@ -623,6 +708,10 @@ body #main_holder #main .page_invitations{
}
}
}
&:nth-child(3){
text-align: right;
}
}
}
}