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

[1KA Redesign] Placljive funkcionalnosti - Lock izvozov na nivoju vprasalnika

Browse Source
This commit is contained in:
patrik2020 2022-10-18 22:23:58 +02:00
parent 3826f29796
commit 4b61615ac6
4 changed files with 1565 additions and 1562 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
admin/survey/SurveyAdmin.php
View File

@ -4329,6 +4329,11 @@ class SurveyAdmin
else {
if ($this->first_action == NAVI_UREJANJE || $_GET['a'] == '' || $_GET['a'] == 'reporti') {
if ($_GET['a'] == '' || $_GET['a'] == 'branching') {
if($userAccess->checkUserAccess('export') == ''){
echo '<div id="hover_export_rectangle">';
}
echo '<a href="' . makeEncodedIzvozUrlString('izvoz.php?a=vprasalnik_pdf&anketa=' . $this->anketa . '&type=1') . '" target="_blank" title="' . $lang['PDF_Izpis'] . '" class="srv_ico '.(!$userAccess->checkUserAccess('export') ? 'user_access_locked' : '').'"><span class="hover_export_icon"><span class="faicon pdf black very_large"></span></span>' . $lang['srv_export_hover_pdf'] . '</a>';
echo '<a href="' . makeEncodedIzvozUrlString('izvoz.php?a=vprasalnik_rtf&anketa=' . $this->anketa . '&type=1') . '" target="_blank" title="' . $lang['RTF_Izpis'] . '" class="srv_ico '.(!$userAccess->checkUserAccess('export') ? 'user_access_locked' : '').'"><span class="hover_export_icon"><span class="faicon rtf black very_large"></span></span>' . $lang['srv_export_hover_rtf'] . '</a>';
@ -4340,6 +4345,10 @@ class SurveyAdmin
if ($row['multilang'] == 1 && $full_view) {
echo '<a href="index.php?anketa=' . $this->anketa . '&a=prevajanje" title="' . $lang['srv_prevajanje'] . '" class="srv_ico '.(!$userAccess->checkUserAccess('export') ? 'user_access_locked' : '').'"><span class="hover_export_icon"><span class="sprites book"></span></span></a>';
}
if($userAccess->checkUserAccess('export') == 'user_access_locked'){
echo '</div>';
}
}
if ($_GET['a'] == 'reporti') {

2
admin/survey/classes/class.SurveyList.php
View File

@ -1604,7 +1604,7 @@ class SurveyList {
if(!$userAccess->checkUserAccess('my_survey_folders')){
echo '<div title="'.$lang['srv_mySurvey_show_folders_desc'].'" id="folderSwitch" class="user_access_locked" onClick="popupUserAccess(\'my_survey_folders\');">';
echo $lang['srv_mySurvey_show_folders'];
/* echo '<img src="'.$site_url.'public/img/icons/toggle_active.svg" />'; */
echo ' <div class="switch_folders on"></div>';
echo '</div>';
}
else{

3045
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

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

@ -114,15 +114,24 @@ header #top_line #enka_nav .anketa_header_upgrade_package {
// Vklop map v mojih anketah
#folderSwitch.user_access_locked{
justify-content: center !important;
/* justify-content: center !important; */ /* od kod? */
background-color: #FFF8E4 !important;
border: 1px $dark-gray solid !important;
color: $dark-gray;
/* &:hover{
&:hover{
background-color: $yellow !important;
} */
}
.switch_folders {
&.on{
fill: #808080;
left: 2px;
top: 1px
}
}
&:after{
/* content: '\f023';
@ -133,12 +142,6 @@ header #top_line #enka_nav .anketa_header_upgrade_package {
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;
@ -149,16 +152,48 @@ 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;
#hover_export{
padding: 8px;
#hover_export_rectangle{
position: relative;
width: 100%;
padding: 8px;
background-color: rgba(255, 248, 228, 0.4);
border: 1px solid #FFC700;
border-radius: 2px;
box-sizing: border-box;
&:after{
position: absolute;
content: '\f023';
font-family: $fontawesome;
font-weight: 900;
color: $yellow;
top: 8px;
right: 8px;
}
.user_access_locked{
color: $dark-gray !important;
width: 100%;
.faicon:before{
color: $dark-gray!important;
}
.hover_export_icon{
width: 19px;
left: 16px;
}
}
}
}
}
// Filtri
#analiza_right_options.user_access_locked #div_analiza_filtri_right span{