diff --git a/admin/survey/classes/class.SurveyList.php b/admin/survey/classes/class.SurveyList.php index ba025639f..f53a515dd 100644 --- a/admin/survey/classes/class.SurveyList.php +++ b/admin/survey/classes/class.SurveyList.php @@ -1593,7 +1593,7 @@ class SurveyList { // Prikazemo preklop med navadnim pogledom in pogledom s folderji protected function displayFolderSwitch(){ - global $lang, $global_user_id; + global $lang, $global_user_id, $site_url; // Preverimo, ce je funkcionalnost v paketu, ki ga ima uporabnik $userAccess = UserAccess::getInstance($global_user_id); @@ -1602,6 +1602,7 @@ class SurveyList { if(!$userAccess->checkUserAccess('my_survey_folders')){ echo '
'; echo $lang['srv_mySurvey_show_folders']; + /* echo ''; */ echo '
'; } else{ diff --git a/public/css/admin_new.css b/public/css/admin_new.css index e45248201..3b888c041 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -10175,13 +10175,33 @@ header #top_line #enka_nav .anketa_header_upgrade_package button { } .toolbox .toolbox_item.user_access_locked { - background-color: #FFF0C5 !important; + background-color: #FFF8E4 !important; + /* &:hover{ + background-color: $yellow !important; + } */ } -.toolbox .toolbox_item.user_access_locked:hover { - background-color: #FFC700 !important; +.toolbox .toolbox_item.user_access_locked.new_if { + background-color: #FFF8E4 !important; +} +.toolbox .toolbox_item.user_access_locked.new_if:after { + position: absolute; + content: url("../../public/img/icons/lock_yellow.svg"); + top: 340px; + right: 14.68px; + height: 14px; +} +.toolbox .toolbox_item.user_access_locked.new_block { + background-color: #FFF8E4 !important; +} +.toolbox .toolbox_item.user_access_locked.new_block:after { + position: absolute; + content: url("../../public/img/icons/lock_yellow.svg"); + top: 379px; + right: 14.68px; + height: 14px; } .toolbox .toolbox_border.user_access_locked { - border-color: #FFC700 !important; + border-color: #FFEAAE !important; } #toolbox_add_advanced .segment_option.user_access_locked { @@ -10393,15 +10413,39 @@ header #top_line #enka_nav .anketa_header_upgrade_package button { #folderSwitch.user_access_locked { justify-content: center !important; - background-color: #FFF0C5 !important; - border: 1px #FFC700 solid !important; + background-color: #FFF8E4 !important; + border: 1px #C4C4C4 solid !important; + color: #C4C4C4; + /* &:hover{ + background-color: $yellow !important; + } */ } -#folderSwitch.user_access_locked:hover { - background-color: #FFC700 !important; +#folderSwitch.user_access_locked:after { + /* content: '\f023'; + font-family: $fontawesome; + position: absolute; + color: $yellow; + font-weight: 900; + left: 87px; + top: 4px; */ + /* position: absolute; + content: url("../../public/img/icons/toggle_active.svg"); + top: 4px; + right: 4.4px; + height: 12px; */ + position: absolute; + content: url("../../public/img/icons/lock_yellow.svg"); + top: 4px; + right: 4.4px; + height: 12px; } #hover_export .user_access_locked { color: #FFC700 !important; + /* background-color: rgba(255, 248, 228, 0.4); + border: 1px solid #FFC700; + border-radius: 2px; + box-sizing: border-box; */ } #hover_export .user_access_locked .faicon:before { color: #FFC700 !important; diff --git a/resources/sass/admin_new/components/payments/payments.scss b/resources/sass/admin_new/components/payments/payments.scss index 5b5e56cef..e55604c8c 100644 --- a/resources/sass/admin_new/components/payments/payments.scss +++ b/resources/sass/admin_new/components/payments/payments.scss @@ -22,15 +22,42 @@ header #top_line #enka_nav .anketa_header_upgrade_package { .toolbox{ .toolbox_item.user_access_locked{ - background-color: #FFF0C5 !important; + background-color: #FFF8E4 !important; - &:hover{ +/* &:hover{ background-color: $yellow !important; + } */ + + } + + .toolbox_item.user_access_locked.new_if{ + background-color: #FFF8E4 !important; + + &:after{ + position: absolute; + content: url("../../public/img/icons/lock_yellow.svg"); + top: 340px; + right: 14.68px; + height: 14px; + } - } + } + + .toolbox_item.user_access_locked.new_block{ + background-color: #FFF8E4 !important; + + &:after{ + position: absolute; + content: url("../../public/img/icons/lock_yellow.svg"); + top: 379px; + right: 14.68px; + height: 14px; + + } + } .toolbox_border.user_access_locked{ - border-color: $yellow !important; + border-color: #FFEAAE !important; } } @@ -89,11 +116,34 @@ header #top_line #enka_nav .anketa_header_upgrade_package { #folderSwitch.user_access_locked{ justify-content: center !important; - background-color: #FFF0C5 !important; - border: 1px $yellow solid !important; - - &:hover{ + background-color: #FFF8E4 !important; + border: 1px $dark-gray solid !important; + color: $dark-gray; + + /* &:hover{ background-color: $yellow !important; + } */ + + &:after{ + /* content: '\f023'; + font-family: $fontawesome; + position: absolute; + color: $yellow; + font-weight: 900; + left: 87px; + top: 4px; */ + +/* position: absolute; + content: url("../../public/img/icons/toggle_active.svg"); + top: 4px; + right: 4.4px; + height: 12px; */ + + position: absolute; + content: url("../../public/img/icons/lock_yellow.svg"); + top: 4px; + right: 4.4px; + height: 12px; } } @@ -101,7 +151,10 @@ header #top_line #enka_nav .anketa_header_upgrade_package { // Hover izvozi #hover_export .user_access_locked{ color: $yellow !important; - +/* background-color: rgba(255, 248, 228, 0.4); + border: 1px solid #FFC700; + border-radius: 2px; + box-sizing: border-box; */ .faicon:before{ color: $yellow !important; }