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

[1KA Redesign] Placljive funkcionalnosti - ureditev zaklenjenih arhivov

Browse Source
This commit is contained in:
patrik2020 2022-10-26 22:18:58 +02:00
parent fd116bbc9d
commit 654083a60e
4 changed files with 1590 additions and 1547 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
admin/survey/SurveyAdmin.php
View File

@ -2163,9 +2163,9 @@ class SurveyAdmin
// Imamo levi meni
if($this->layout_menu == 'menu_left'){
$userAccess = UserAccess::getInstance($global_user_id);
// Prikazemo meni na levi po potrebi glede na podstran
echo '<div class="layout_left_item">';
echo '<div class="layout_left_item '.(!$userAccess->checkUserAccess('arhivi') ? 'user_access_locked' : '').'">';
$this->displayLeftMenu();
echo '</div>';
@ -2279,8 +2279,8 @@ class SurveyAdmin
// Prikazemo levi meni po potrebi
private function displayLeftMenu(){
global $lang;
global $lang, $global_user_id;
$userAccess = UserAccess::getInstance($global_user_id);
$hierarhija_type = (!empty($_SESSION['hierarhija'][$this->anketa]['type']) ? $_SESSION['hierarhija'][$this->anketa]['type'] : null);
// Levi meni v nastavitvah ankete
@ -2378,8 +2378,7 @@ class SurveyAdmin
// Arhiv levi meni
elseif(in_array($_GET['a'], ['arhivi', 'tracking', 'tracking-hierarhija']) || in_array($_GET['m'], ['anal_arch', 'view_archive'])){
echo '<span class="menu_left-title">'.$lang['srv_arhivi'].'</span>';
echo '<span class="menu_left-title title '.(!$userAccess->checkUserAccess('arhivi') ? 'user_access_locked' : '').'">'.$lang['srv_arhivi'].'</span>';
echo '<div id="globalSetingsLinks" class="globalSetingsLinks archive">';
$SSH = new SurveyStaticHtml($this->anketa);

8
admin/survey/classes/class.SurveyStaticHtml.php
View File

@ -107,6 +107,8 @@ class SurveyStaticHtml
public function displayArchiveNavigation()
{
global $lang, $admin_type, $global_user_id;
$userAccess = UserAccess::getInstance($global_user_id);
$d = new Dostop();
@ -114,7 +116,7 @@ class SurveyStaticHtml
$this->survey_type = $sa->getSurvey_type($this->sid);
echo '<div id="globalSetingsLinks" class="archive">';
echo '<ul class="menu_left-list">';
echo '<ul class="menu_left-list locked '.(!$userAccess->checkUserAccess('arhivi') ? 'user_access_locked' : '').' ">';
# arhivi vprasalnika
if ($d->checkDostopSub('edit')) {
@ -155,7 +157,7 @@ class SurveyStaticHtml
# uvoz/izvoz ankete ali ankete s podatki
if ($d->checkDostopSub('edit')) {
echo '<ul class="menu_left-list">';
echo '<ul class="menu_left-list '.(!$userAccess->checkUserAccess('arhivi') ? 'user_access_locked' : '').'">';
echo '<span class="menu_left-title">'.$lang['srv_survey_archives_other'].'</span>';
echo '<li' . ($_GET['a'] == A_ARHIVI && ($_GET['m'] == 'survey' || $_GET['m'] == 'survey_data') ? ' class="navi_tracking active"' : ' class="navi_tracking"') . $_js_links[1] . '>';
echo '<a href="index.php?anketa=' . $this->sid . '&a=' . A_ARHIVI . '&m=survey" title="' . $lang['srv_survey_archives'] . '"><span>' . $lang['srv_survey_archives'] . '</span></a>';
@ -175,6 +177,8 @@ class SurveyStaticHtml
echo '</li>';
echo '</ul>';
echo '</div>';
}
}

3063
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

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

@ -212,6 +212,61 @@ header #top_line #enka_nav .anketa_header_upgrade_package {
}
.menu_left-title.user_access_locked{
position: relative;
display: block;
width: 100%;
/* padding: 8px !important; */
padding: 8px 8px 0px 8px;
color: $dark-gray !important;
background-color: rgba(255, 248, 228, 0.4);
border-top: 1px solid #FFC700;
border-left: 1px solid #FFC700;
border-right: 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;
}
}
.menu_left-list.user_access_locked{
position: relative;
display: block;
width: 100%;
padding: 8px !important;
}
.menu_left-list.user_access_locked.locked{
background-color: rgba(255, 248, 228, 0.4);
border-bottom: 1px solid #FFC700;
border-left: 1px solid #FFC700;
border-right: 1px solid #FFC700;
border-radius: 2px;
box-sizing: border-box;
color: $dark-gray !important;
li {
&.active{
color: $dark-gray;
font-weight: 600;
}
}
}
.layout_left_item.user_access_locked{
padding: 16px;
}
// Filtri
#analiza_right_options.user_access_locked #div_analiza_filtri_right span{