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

[Redizajn 1KA] Nastavitve --> Moj profil - v5

Browse Source
This commit is contained in:
tejagerjovic 2022-01-05 22:07:10 +01:00
parent 7b7f372737
commit 60818f036d
3 changed files with 50 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/survey/SurveyAdminSettings.php
View File

@ -10168,7 +10168,7 @@ class SurveyAdminSettings {
echo '<div class="icon_holder">';
echo '<input class="large disabled" value="'.$row['email'].'" type="text">';
if(!empty($alternativni_emaili))
echo '<div class="default_radio"><input name="active_email" value="master" id="active-master" type="radio" '.(User::getInstance()->primaryEmail() == $row['email'] ? 'checked="checked"' : '').'><label for="active-master">'.$lang['login_email_subscription'].'</label></div>';
echo '<input name="active_email" value="master" id="active-master" type="radio" '.(User::getInstance()->primaryEmail() == $row['email'] ? 'checked="checked"' : '').'><label for="active-master">'.$lang['login_email_subscription'].'</label>';
echo '</div>';
echo '</div>';
@ -10180,7 +10180,7 @@ class SurveyAdminSettings {
echo '<div class="icon_holder">';
echo '<input class="large disabled" value="'.$email->email.'" type="text">';
echo '<div class="blue pointer altmail" onclick="izbrisiAlternativniEmail(\''.$email->id.'\')"><span class="faicon trash empty"></span></div>';
echo '<input value="'.($email->id).'" name="active_email" type="radio" '.($email->active == 1 ? 'checked="checked"' : '').'> <label for="active-master">'.$lang['login_email_subscription'].'</label>';
echo '<input value="'.($email->id).'" id="altemail'.($email->id).'" name="active_email" type="radio" '.($email->active == 1 ? 'checked="checked"' : '').'> <label for="altemail'.($email->id).'">'.$lang['login_email_subscription'].'</label>';
echo '</div>';
echo '</div>';
}

33
public/css/admin_new.css
View File

@ -13811,7 +13811,16 @@ textarea.gdpr_requests_comment {
height: 60px;
}
div#user_info_segment {
img.twoFAQRcode {
margin: 10px 0;
max-width: 115px;
}
label[for=active-master] {
margin-left: 16px;
}
div #user_info_segment {
background-color: #F8F8F8;
border: 1px solid #E5E5E5;
box-sizing: border-box;
@ -13820,20 +13829,14 @@ div#user_info_segment {
display: flex;
flex-direction: row;
}
div#user_info_segment .user_info {
div #user_info_segment .user_info {
display: flex;
flex-direction: column;
}
div#user_info_segment .user_info.text {
div #user_info_segment .user_info.text {
margin-right: 50px;
}
img.twoFAQRcode {
margin: 10px 0;
max-width: 115px;
}
div.myprofile_postget_wrap {
div .myprofile_postget_wrap {
max-width: 320px;
min-width: 320px;
overflow-wrap: break-word;
@ -13842,21 +13845,17 @@ div.myprofile_postget_wrap {
font-family: "Courier";
font-size: 12px;
}
div.myprofile_date_wrap {
div .myprofile_date_wrap {
width: auto;
white-space: nowrap;
}
div.altmail span.faicon {
div .altmail span.faicon {
margin-right: 8px;
margin-left: 16px;
}
div#klik-dodaj-email span.faicon {
div #klik-dodaj-email span.faicon {
margin-right: 8px;
}
div.default_radio {
margin-left: 16px;
}
/*
To change this license header, choose License Headers in Project Properties.

64
resources/sass/admin_new/pages/settings/moj_profil.scss
View File

@ -1,31 +1,37 @@
div#user_info_segment {
background-color: $light-gray;
border: 1px solid $gray;
box-sizing: border-box;
padding: 32px 20px;
margin-bottom: 16px;
display: flex;
flex-direction: row;
.user_info {
display: flex;
flex-direction: column;
&.text {
margin-right: 50px;
}
}
}
img.twoFAQRcode {
margin: 10px 0;
max-width: 115px;
}
label[for="active-master"]{
margin-left: 16px;
}
div {
&.myprofile_postget_wrap {
#user_info_segment {
background-color: $light-gray;
border: 1px solid $gray;
box-sizing: border-box;
padding: 32px 20px;
margin-bottom: 16px;
display: flex;
flex-direction: row;
.user_info {
display: flex;
flex-direction: column;
&.text {
margin-right: 50px;
}
}
}
.myprofile_postget_wrap {
max-width: 320px;
min-width: 320px;
overflow-wrap: break-word;
@ -36,28 +42,22 @@ div {
font-size: 12px;
}
&.myprofile_date_wrap {
.myprofile_date_wrap {
width: auto;
white-space: nowrap;
}
}
div{
&.altmail{
.altmail{
span.faicon {
margin-right: 8px;
margin-left: 16px;
}
}
&#klik-dodaj-email {
#klik-dodaj-email {
span.faicon {
margin-right: 8px;
}
}
&.default_radio {
margin-left: 16px;
}
}