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

Redesign - popravki placljivih funkcionalnosti

Browse Source
This commit is contained in:
pero1203 2022-06-13 11:44:27 +02:00
parent 9f2926d363
commit dceb2a9243
4 changed files with 74 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/survey/Branching.php
View File

@ -445,7 +445,7 @@ class Branching {
$userAccess = UserAccess::getInstance($global_user_id); $userAccess = UserAccess::getInstance($global_user_id);
echo '<div class="toolbox_item new_if '.(!$userAccess->checkUserAccess($what='if') ? 'user_access_locked' : '').'" tip="9999"><span class="item_icon faicon icon-white if_32"></span> <span class="item_text">'.$lang['srv_condition'].'</span></div>'; echo '<div class="toolbox_item new_if '.(!$userAccess->checkUserAccess($what='if') ? 'user_access_locked' : '').'" tip="9999"><span class="item_icon faicon icon-white if_32"></span> <span class="item_text">'.$lang['srv_condition'].'</span></div>';
echo '<div class="toolbox_border new_if"></div>'; echo '<div class="toolbox_border new_if '.(!$userAccess->checkUserAccess($what='if') ? 'user_access_locked' : '').'"></div>';
echo '<div class="toolbox_item new_block '.(!$userAccess->checkUserAccess($what='block') ? 'user_access_locked' : '').'" tip="9998"><span class="item_icon faicon icon-white block_32"></span> <span class="item_text">'.$lang['srv_block_random_blocks'].'</span></div>'; echo '<div class="toolbox_item new_block '.(!$userAccess->checkUserAccess($what='block') ? 'user_access_locked' : '').'" tip="9998"><span class="item_icon faicon icon-white block_32"></span> <span class="item_text">'.$lang['srv_block_random_blocks'].'</span></div>';
//echo '<div class="toolbox_border new_block"></div>'; //echo '<div class="toolbox_border new_block"></div>';

33
public/css/admin_new.css
View File

@ -9987,11 +9987,13 @@ header #top_line #enka_nav .anketa_header_upgrade_package button {
} }
.toolbox .toolbox_item.user_access_locked { .toolbox .toolbox_item.user_access_locked {
background-color: #FFF0C5; background-color: #FFF0C5 !important;
border-bottom: 1px #FFC700 solid;
} }
.toolbox .toolbox_item.user_access_locked:hover { .toolbox .toolbox_item.user_access_locked:hover {
background-color: #FFC700; background-color: #FFC700 !important;
}
.toolbox .toolbox_border.user_access_locked {
border-color: #FFC700 !important;
} }
#toolbox_add_advanced .segment_option.user_access_locked { #toolbox_add_advanced .segment_option.user_access_locked {
@ -10201,6 +10203,26 @@ header #top_line #enka_nav .anketa_header_upgrade_package button {
margin-right: 16px; margin-right: 16px;
} }
#folderSwitch.user_access_locked {
justify-content: center !important;
background-color: #FFF0C5 !important;
border: 1px #FFC700 solid !important;
}
#folderSwitch.user_access_locked:hover {
background-color: #FFC700 !important;
}
#hover_export .user_access_locked {
color: #FFC700 !important;
}
#hover_export .user_access_locked .faicon:before {
color: #FFC700 !important;
}
#analiza_right_options.user_access_locked #div_analiza_filtri_right span {
color: #FFC700 !important;
}
/* /*
Specific pages scss Specific pages scss
*/ */
@ -13730,6 +13752,11 @@ div.drop_setting_transition {
width: 200px; width: 200px;
margin-top: 4px; margin-top: 4px;
} }
.toolbox_preview .tip_preview_sub p.user_access_warning_text {
margin-top: 16px;
font-size: 14px;
font-weight: 600;
}
.toolbox_item.clone-dragging, .toolbox_item.clone-dragging,
.segment_option.clone-dragging { .segment_option.clone-dragging {

38
resources/sass/admin_new/components/payments/payments.scss
View File

@ -19,13 +19,16 @@ header #top_line #enka_nav .anketa_header_upgrade_package {
.toolbox{ .toolbox{
.toolbox_item.user_access_locked{ .toolbox_item.user_access_locked{
background-color: #FFF0C5; background-color: #FFF0C5 !important;
border-bottom: 1px $yellow solid;
&:hover{ &:hover{
background-color: $yellow; background-color: $yellow !important;
} }
} }
.toolbox_border.user_access_locked{
border-color: $yellow !important;
}
} }
// Zaklenjene vsebine v toolboxu za dodajanje vprasanja // Zaklenjene vsebine v toolboxu za dodajanje vprasanja
@ -78,3 +81,32 @@ header #top_line #enka_nav .anketa_header_upgrade_package {
} }
} }
// Vklop map v mojih anketah
#folderSwitch.user_access_locked{
justify-content: center !important;
background-color: #FFF0C5 !important;
border: 1px $yellow solid !important;
&:hover{
background-color: $yellow !important;
}
}
// Hover izvozi
#hover_export .user_access_locked{
color: $yellow !important;
.faicon:before{
color: $yellow !important;
}
}
// Filtri
#analiza_right_options.user_access_locked #div_analiza_filtri_right span{
color: $yellow !important;
}

7
resources/sass/admin_new/pages/survey_edit/toolbox.scss
View File

@ -622,6 +622,13 @@
} }
} }
} }
p.user_access_warning_text{
margin-top: 16px;
font-size: 14px;
font-weight: 600;
}
} }
} }