Redesign - placljivi elementi
This commit is contained in:
pero1203
parent
e46b199bfe
commit
c923749d53
@ -645,24 +645,21 @@ class SurveyAdmin
|
||||
|
||||
|
||||
// Gumb za nadgraditev paketa v mojih anketah (ce imamo vklopljene pakete in nimamo 3ka paketa)
|
||||
if($this->anketa == 0){
|
||||
|
||||
if(AppSettings::getInstance()->getSetting('app_settings-commercial_packages') === true){
|
||||
if(AppSettings::getInstance()->getSetting('app_settings-commercial_packages') === true){
|
||||
|
||||
// Preverimo trenuten paket uporabnika
|
||||
$userAccess = UserAccess::getInstance($global_user_id);
|
||||
$current_package = $userAccess->getPackage();
|
||||
if($current_package != '3' && !$userAccess->userNotAuthor()){
|
||||
|
||||
$drupal_url = ($lang['id'] == '2') ? $site_url.'d/en/' : $site_url.'d/';
|
||||
$upgrade_url = $drupal_url.'izvedi-nakup/3/podatki';
|
||||
// Preverimo trenuten paket uporabnika
|
||||
$userAccess = UserAccess::getInstance($global_user_id);
|
||||
$current_package = $userAccess->getPackage();
|
||||
if($current_package != '3' && !$userAccess->userNotAuthor()){
|
||||
|
||||
$drupal_url = ($lang['id'] == '2') ? $site_url.'d/en/' : $site_url.'d/';
|
||||
$upgrade_url = $drupal_url.'izvedi-nakup/3/podatki';
|
||||
|
||||
$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="upgrade_package">';
|
||||
echo '<div class="buttonwrapper"><a class="ovalbutton ovalbutton_purple" href="'.$upgrade_url.'" target="_blank"><span>'.$button_text.'</span></a></div>';
|
||||
echo '</div>';
|
||||
}
|
||||
echo '<div class="anketa_header_upgrade_package">';
|
||||
echo ' <a href="'.$upgrade_url.'"><button class="small yellow">'.$button_text.'</button></a>';
|
||||
echo '</div>';
|
||||
}
|
||||
}
|
||||
|
||||
@ -853,29 +850,6 @@ class SurveyAdmin
|
||||
}
|
||||
|
||||
|
||||
// Gumb za nadgraditev paketa (ce imamo vklopljene pakete in nimamo 3ka paketa)
|
||||
global $global_user_id;
|
||||
if(AppSettings::getInstance()->getSetting('app_settings-commercial_packages') === true){
|
||||
|
||||
// Preverimo trenuten paket uporabnika
|
||||
$userAccess = UserAccess::getInstance($global_user_id);
|
||||
$current_package = $userAccess->getPackage();
|
||||
if($current_package != '3' && !$userAccess->userNotAuthor()){
|
||||
|
||||
$drupal_url = ($lang['id'] == '2') ? $site_url.'d/en/' : $site_url.'d/';
|
||||
$upgrade_url = $drupal_url.'izvedi-nakup/3/podatki';
|
||||
|
||||
$button_text = ($current_package == '2') ? $lang['srv_access_upgrade2'] : $lang['srv_access_upgrade'];
|
||||
|
||||
echo '<div class="anketa_header_upgrade_package">';
|
||||
|
||||
echo '<button class="small yellow" onClick="window.location='.$upgrade_url.'; return false;">'.$button_text.'</button>';
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// email anketa
|
||||
$reloadSetting = ($_GET['a'] == "nastavitve") ? "'1'" : "'0'";
|
||||
|
||||
|
||||
@ -822,7 +822,7 @@ function toolbox_add_advanced() {
|
||||
|
||||
$('#fullscreen').show().load('ajax.php?t=branching&a=toolbox_add_advanced', {anketa: srv_meta_anketa_id}, function(){
|
||||
|
||||
$('.new_spr, .new_if:not(.user_access_locked), .new_block:not(.user_access_locked), .new_loop:not(.user_access_locked)').click(function() {
|
||||
$('.new_spr:not(.user_access_locked), .new_if:not(.user_access_locked), .new_block:not(.user_access_locked), .new_loop:not(.user_access_locked)').click(function() {
|
||||
|
||||
var ta = $(event.target);
|
||||
|
||||
|
||||
@ -387,15 +387,23 @@ class UserAccess{
|
||||
else
|
||||
$drupal_url = $site_url.'d/izvedi-nakup/'.$package_required.'/podatki';
|
||||
|
||||
|
||||
echo '<h2>'.$lang['srv_access_upgrade'].'</h2>';
|
||||
|
||||
echo '<div class="popup_close"><a href="#" onclick="popupUserAccess_close();">✕</a></div>';
|
||||
|
||||
// Ce user ni avtor ankete
|
||||
if($this->user_not_author){
|
||||
echo '<p>'.$lang['srv_access_no_access_not_author'].'</p>';
|
||||
}
|
||||
|
||||
echo '<p>'.$lang['srv_access_no_access'].' "'.$package_required_name.'".</p>';
|
||||
|
||||
echo '<div class="button_holder">';
|
||||
echo ' <button class="medium white-blue" href="#" onClick="popupUserAccess_close();">'.$lang['srv_zapri'].'</button>';
|
||||
if(!$this->user_not_author)
|
||||
echo '<span class="floatRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_blue" href="'.$drupal_url.'" target="_blank">'.$lang['srv_narocila_buy'].'</a></div></span>';
|
||||
echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onClick="popupUserAccess_close();">'.$lang['srv_zapri'].'</a></div></span>';
|
||||
echo ' <a href="'.$drupal_url.'" target="_blank"><button class="medium blue">'.$lang['srv_narocila_buy'].'</button></a>';
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
// Izpisemo obvestilo, da je funkcionalnost onemogocena in naj kupi paket
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -12,4 +12,7 @@
|
||||
|
||||
// Functional components
|
||||
@import "form/form";
|
||||
@import "table/table";
|
||||
@import "table/table";
|
||||
|
||||
// Payments
|
||||
@import "payments/payments";
|
||||
@ -215,10 +215,6 @@ header #top_line{
|
||||
padding: 0 16px;
|
||||
}
|
||||
}
|
||||
|
||||
.anketa_header_upgrade_package {
|
||||
margin-left: 16px;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
60
resources/sass/admin_new/components/payments/payments.scss
Normal file
60
resources/sass/admin_new/components/payments/payments.scss
Normal file
@ -0,0 +1,60 @@
|
||||
/*
|
||||
Placljive vsebine
|
||||
*/
|
||||
|
||||
|
||||
// Gumb za upgrade paketa v glavi
|
||||
header #top_line #enka_nav .anketa_header_upgrade_package {
|
||||
margin-left: 16px;
|
||||
|
||||
button{
|
||||
padding-top: 0;
|
||||
padding-bottom: 0;
|
||||
height: 28px;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Zaklenjene vsebine v toolbaru na levi
|
||||
.toolbox{
|
||||
|
||||
.toolbox_item.user_access_locked{
|
||||
background-color: #FFF0C5;
|
||||
border-bottom: 1px $yellow solid;
|
||||
|
||||
&:hover{
|
||||
background-color: $yellow;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Zaklenjene vsebine v toolboxu za dodajanje vprasanja
|
||||
#toolbox_add_advanced{
|
||||
|
||||
.segment_option.user_access_locked{
|
||||
background-color: #FFF0C5;
|
||||
|
||||
&:hover{
|
||||
background-color: $yellow;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Zaklenjene ikone in text
|
||||
.faicon.user_access_locked{
|
||||
color: $yellow;
|
||||
|
||||
&:hover{
|
||||
color: darken($yellow, 5%);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* Popup z obvestilom, da je funkcionalnost onemogocena in je potrebno kupiti paket */
|
||||
#popup_user_access{
|
||||
@include popup_general();
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -23,28 +23,3 @@
|
||||
min-height: 30px;
|
||||
width: 500px;
|
||||
}
|
||||
|
||||
|
||||
/* Popup z obvestilom, da je funkcionalnost onemogocena in je potrebno kupiti paket */
|
||||
#popup_user_access{
|
||||
@include popup_general();
|
||||
|
||||
display: none;
|
||||
|
||||
position: relative;
|
||||
z-index: 9999;
|
||||
|
||||
height: auto;
|
||||
width: 450px;
|
||||
|
||||
div.buttonwrapper a {
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
p{
|
||||
margin-top: 0;
|
||||
|
||||
font-size: 13px;
|
||||
font-weight: 500;
|
||||
}
|
||||
}
|
||||
@ -122,15 +122,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
&.user_access_locked{
|
||||
background-color: #FFF0C5;
|
||||
border-bottom: 1px #FFE59C solid;
|
||||
|
||||
&:hover{
|
||||
background-color: #FFE59C;
|
||||
}
|
||||
}
|
||||
|
||||
.item_icon{
|
||||
width: 40px;
|
||||
line-height: 40px;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user