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

[Redizajn 1ka] Dostop paketi - meni v urejanju, header gumb

Browse Source
This commit is contained in:
tejagerjovic 2022-05-27 05:37:37 +02:00
parent eb441f24f7
commit ad81009446
4 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
admin/survey/SurveyAdmin.php
View File

@ -868,7 +868,9 @@ class SurveyAdmin
$button_text = ($current_package == '2') ? $lang['srv_access_upgrade2'] : $lang['srv_access_upgrade']; $button_text = ($current_package == '2') ? $lang['srv_access_upgrade2'] : $lang['srv_access_upgrade'];
echo '<div class="anketa_header_upgrade_package">'; echo '<div class="anketa_header_upgrade_package">';
echo '<div class="buttonwrapper"><a class="ovalbutton ovalbutton_purple" href="'.$upgrade_url.'" target="_blank"><span>'.$button_text.'</span></a></div>';
echo '<button class="small yellow" onClick="window.location='.$upgrade_url.'; return false;">'.$button_text.'</button>';
echo '</div>'; echo '</div>';
} }
} }
@ -3295,20 +3297,22 @@ class SurveyAdmin
$userAccess = UserAccess::getInstance($global_user_id); $userAccess = UserAccess::getInstance($global_user_id);
//TODO: paid_locked (ključavnica poleg naslova + siv cel seznam) @TG1 $user_package = $userAccess->getPackage(); // paket, ki ga ima uporabnik (1, 2 , 3)
$user_package == 1; // paket, ki ga ima uporabnik (1,2 ali 3)
echo '<span class="menu_left-title '. ($user_package = 1 ? 'paid_locked' : '').'">' . $lang['srv_moduli'] . '</span>'; $dostop_styling = "";
if ($user_package = 1) { if ($user_package != "")
$dostop_styling = "dostop_".$user_package."ka";
echo '<span class="menu_left-title '.$dostop_styling.'">' . $lang['srv_moduli'] . '</span>';
if ($dostop_styling != "") {
echo '<span class="faicon lock_close yellow"></span>'; echo '<span class="faicon lock_close yellow"></span>';
} }
echo '<ul class="menu_left-list '. ($user_package = 1 ? 'paid_locked' : '').'">'; echo '<ul class="menu_left-list '.$dostop_styling.'">';
# Evalvacija # Evalvacija
echo '<li ' . ($get == A_UPORABNOST ? 'class="active"' : '') . '>'; echo '<li ' . ($get == A_UPORABNOST ? 'class="active"' : '') . '>';
echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_UPORABNOST . '" title="' . $lang['srv_vrsta_survey_type_4'] . '" '.(!$userAccess->checkUserAccess($what='uporabnost') ? 'class="paid_locked"' : '').'>' . $lang['srv_vrsta_survey_type_4'] . '</a></li> '; echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_UPORABNOST . '" title="' . $lang['srv_vrsta_survey_type_4'] . '" '.(!$userAccess->checkUserAccess($what='uporabnost') ? 'class="'.$dostop_styling.'"' : '').'>' . $lang['srv_vrsta_survey_type_4'] . '</a></li> ';
# Samoevalvacija hirarhija - hierarhija_superadmin # Samoevalvacija hirarhija - hierarhija_superadmin
//$row_user se zacasno uporabi tudi za modul MAZA //$row_user se zacasno uporabi tudi za modul MAZA
@ -3326,18 +3330,18 @@ class SurveyAdmin
# Kviz # Kviz
echo '<li ' . ($get == A_KVIZ ? 'class="active"' : '') . '>'; echo '<li ' . ($get == A_KVIZ ? 'class="active"' : '') . '>';
echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a='.A_KVIZ.'" title="' . $lang['srv_vrsta_survey_type_6'] . '" '.(!$userAccess->checkUserAccess($what='kviz') ? 'class="paid_locked"' : '').'>' . $lang['srv_vrsta_survey_type_6'] . '</a></li> '; echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a='.A_KVIZ.'" title="' . $lang['srv_vrsta_survey_type_6'] . '" '.(!$userAccess->checkUserAccess($what='kviz') ? 'class="'.$dostop_styling.'"' : '').'>' . $lang['srv_vrsta_survey_type_6'] . '</a></li> ';
# Volitve - po novem za vse s paketom 3ka # Volitve - po novem za vse s paketom 3ka
//global $mysql_database_name; //global $mysql_database_name;
//if ($admin_type == 0 || $mysql_database_name == 'test1kasi') { //if ($admin_type == 0 || $mysql_database_name == 'test1kasi') {
echo '<li ' . ($get == A_VOTING ? 'class="active"' : '') . '>'; echo '<li ' . ($get == A_VOTING ? 'class="active"' : '') . '>';
echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a='.A_VOTING.'" title="' . $lang['srv_vrsta_survey_type_18'] . '" '.(!$userAccess->checkUserAccess($what='voting') ? 'class="paid_locked"' : '').'>' . $lang['srv_vrsta_survey_type_18'] . '</a></li> '; echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a='.A_VOTING.'" title="' . $lang['srv_vrsta_survey_type_18'] . '" '.(!$userAccess->checkUserAccess($what='voting') ? 'class="'.$dostop_styling.'"' : '').'>' . $lang['srv_vrsta_survey_type_18'] . '</a></li> ';
//} //}
# Socialna omrezja # Socialna omrezja
echo '<li ' . ($get == A_SOCIAL_NETWORK ? 'class="active"' : '') . '>'; echo '<li ' . ($get == A_SOCIAL_NETWORK ? 'class="active"' : '') . '>';
echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_SOCIAL_NETWORK . '" title="' . $lang['srv_vrsta_survey_type_8'] . '" '.(!$userAccess->checkUserAccess($what='social_network') ? 'class="paid_locked"' : '').'>' . $lang['srv_vrsta_survey_type_8'] . '</a></li> '; echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_SOCIAL_NETWORK . '" title="' . $lang['srv_vrsta_survey_type_8'] . '" '.(!$userAccess->checkUserAccess($what='social_network') ? 'class="'.$dostop_styling.'"' : '').'>' . $lang['srv_vrsta_survey_type_8'] . '</a></li> ';
# Prezentacija # Prezentacija
/*echo '<li ' . ($get == A_SLIDESHOW ? 'class="active"' : '') . '>'; /*echo '<li ' . ($get == A_SLIDESHOW ? 'class="active"' : '') . '>';
@ -3345,15 +3349,15 @@ class SurveyAdmin
# Telefonska anketa # Telefonska anketa
echo '<li ' . ($get == A_TELEPHONE ? 'class="active"' : '') . '>'; echo '<li ' . ($get == A_TELEPHONE ? 'class="active"' : '') . '>';
echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_TELEPHONE . '" title="' . $lang['srv_vrsta_survey_type_7'] . '" '.(!$userAccess->checkUserAccess($what='telephone') ? 'class="paid_locked"' : '').'>' . $lang['srv_vrsta_survey_type_7'] . '</a></li> '; echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_TELEPHONE . '" title="' . $lang['srv_vrsta_survey_type_7'] . '" '.(!$userAccess->checkUserAccess($what='telephone') ? 'class="'.$dostop_styling.'"' : '').'>' . $lang['srv_vrsta_survey_type_7'] . '</a></li> ';
# Chat # Chat
echo '<li ' . ($get == A_CHAT ? 'class="active"' : '') . '>'; echo '<li ' . ($get == A_CHAT ? 'class="active"' : '') . '>';
echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_CHAT . '" title="' . $lang['srv_vrsta_survey_type_14'] . '" '.(!$userAccess->checkUserAccess($what='chat') ? 'class="paid_locked"' : '').'>' . $lang['srv_vrsta_survey_type_14'] . '</a></li> '; echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_CHAT . '" title="' . $lang['srv_vrsta_survey_type_14'] . '" '.(!$userAccess->checkUserAccess($what='chat') ? 'class="'.$dostop_styling.'"' : '').'>' . $lang['srv_vrsta_survey_type_14'] . '</a></li> ';
# Panel # Panel
echo '<li ' . ($get == A_PANEL ? 'class="active"' : '') . '>'; echo '<li ' . ($get == A_PANEL ? 'class="active"' : '') . '>';
echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_PANEL . '" title="' . $lang['srv_vrsta_survey_type_15'] . '" '.(!$userAccess->checkUserAccess($what='panel') ? 'class="paid_locked"' : '').'>' . $lang['srv_vrsta_survey_type_15'] . '</a></li> '; echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_PANEL . '" title="' . $lang['srv_vrsta_survey_type_15'] . '" '.(!$userAccess->checkUserAccess($what='panel') ? 'class="'.$dostop_styling.'"' : '').'>' . $lang['srv_vrsta_survey_type_15'] . '</a></li> ';
# Napredni parapodatki - samo admini oz. ce je vklopljen # Napredni parapodatki - samo admini oz. ce je vklopljen
if ($admin_type == 0 || SurveyInfo::getInstance()->checkSurveyModule('advanced_paradata')) { if ($admin_type == 0 || SurveyInfo::getInstance()->checkSurveyModule('advanced_paradata')) {

16
public/css/admin_new.css
View File

@ -8735,6 +8735,9 @@ header #top_line #anketa_header_settings .anketa_header_quick_settings {
header #top_line #anketa_header_settings .anketa_header_quick_settings a { header #top_line #anketa_header_settings .anketa_header_quick_settings a {
padding: 0 16px; padding: 0 16px;
} }
header #top_line #anketa_header_settings .anketa_header_upgrade_package {
margin-left: 16px;
}
header #top_line #enka_nav { header #top_line #enka_nav {
display: flex; display: flex;
align-items: center; align-items: center;
@ -9420,7 +9423,7 @@ div.layout_left_item span.menu_left-title {
line-height: 21px; line-height: 21px;
text-transform: uppercase; text-transform: uppercase;
} }
div.layout_left_item span.menu_left-title.paid_locked { div.layout_left_item span.menu_left-title.dostop_1ka {
color: #FFC700; color: #FFC700;
} }
div.layout_left_item ul.menu_left-list { div.layout_left_item ul.menu_left-list {
@ -9433,10 +9436,11 @@ div.layout_left_item ul.menu_left-list {
div.layout_left_item ul.menu_left-list:last-of-type { div.layout_left_item ul.menu_left-list:last-of-type {
margin-bottom: 0; margin-bottom: 0;
} }
div.layout_left_item ul.menu_left-list.paid_locked { div.layout_left_item ul.menu_left-list.dostop_1ka {
color: #777777; color: #777777;
pointer-events: none;
} }
div.layout_left_item ul.menu_left-list.paid_locked a:hover { div.layout_left_item ul.menu_left-list.dostop_1ka a:hover {
color: #777777; color: #777777;
} }
div.layout_left_item ul.menu_left-list li { div.layout_left_item ul.menu_left-list li {
@ -9447,11 +9451,9 @@ div.layout_left_item ul.menu_left-list li.active {
color: #1E88E5; color: #1E88E5;
font-weight: 600; font-weight: 600;
} }
div.layout_left_item ul.menu_left-list li a.paid_locked { div.layout_left_item ul.menu_left-list li a.dostop_1ka {
color: #777777;
}
div.layout_left_item ul.menu_left-list li a.paid_locked a:hover {
color: #777777; color: #777777;
pointer-events: none;
} }
div.layout_left_item ul.menu_left-list.second { div.layout_left_item ul.menu_left-list.second {
padding-left: 30px; padding-left: 30px;

4
resources/sass/admin_new/components/header/top_line.scss
View File

@ -282,6 +282,10 @@ header #top_line{
padding: 0 16px; padding: 0 16px;
} }
} }
.anketa_header_upgrade_package {
margin-left: 16px;
}
} }

11
resources/sass/admin_new/components/main/menu_left.scss
View File

@ -18,7 +18,7 @@ div.layout_left_item{
text-transform: uppercase; text-transform: uppercase;
&.paid_locked { &.dostop_1ka {
color: $yellow; color: $yellow;
} }
} }
@ -34,8 +34,9 @@ div.layout_left_item{
margin-bottom: 0; margin-bottom: 0;
} }
&.paid_locked { &.dostop_1ka {
color: $very-dark-gray; color: $very-dark-gray;
pointer-events: none;
& a:hover{ & a:hover{
color: $very-dark-gray; color: $very-dark-gray;
@ -52,11 +53,9 @@ div.layout_left_item{
font-weight: 600; font-weight: 600;
} }
& a.paid_locked { a.dostop_1ka {
color: $very-dark-gray; color: $very-dark-gray;
& a:hover{ pointer-events: none;
color: $very-dark-gray;
}
} }
} }