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

Merge branch 'master' of https://git.1ka.si:/git/1ka

Browse Source
This commit is contained in:
tejagerjovic 2022-06-08 23:45:56 +02:00
commit 1bfd045afc
11 changed files with 1948 additions and 1723 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
admin/survey/SurveyAdmin.php
View File

@ -645,24 +645,21 @@ class SurveyAdmin
// Gumb za nadgraditev paketa v mojih anketah (ce imamo vklopljene pakete in nimamo 3ka paketa) // 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 // Preverimo trenuten paket uporabnika
$userAccess = UserAccess::getInstance($global_user_id); $userAccess = UserAccess::getInstance($global_user_id);
$current_package = $userAccess->getPackage(); $current_package = $userAccess->getPackage();
if($current_package != '3' && !$userAccess->userNotAuthor()){ if($current_package != '3' && !$userAccess->userNotAuthor()){
$drupal_url = ($lang['id'] == '2') ? $site_url.'d/en/' : $site_url.'d/'; $drupal_url = ($lang['id'] == '2') ? $site_url.'d/en/' : $site_url.'d/';
$upgrade_url = $drupal_url.'izvedi-nakup/3/podatki'; $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="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 ' <a href="'.$upgrade_url.'"><button class="small yellow">'.$button_text.'</button></a>';
echo '</div>'; 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 // email anketa
$reloadSetting = ($_GET['a'] == "nastavitve") ? "'1'" : "'0'"; $reloadSetting = ($_GET['a'] == "nastavitve") ? "'1'" : "'0'";

13
admin/survey/classes/class.Common.php
View File

@ -2143,15 +2143,14 @@ class Common {
echo '<p>'.$lang['srv_data_no_data2'].'</p>'; echo '<p>'.$lang['srv_data_no_data2'].'</p>';
echo '</div>'; echo '</div>';
$auto = "'". 'index.php?anketa='.$anketa.'&a=testiranje&m=testnipodatki' . "'"; $auto = 'index.php?anketa='.$anketa.'&a=testiranje&m=testnipodatki';
$manual = "'". SurveyInfo::getSurveyLink() . '?preview=on' . "'"; $manual = SurveyInfo::getSurveyLink() . '?preview=on&testdata=on';
$share = "'". 'index.php?anketa='.$anketa.'&amp;a=vabila' . "'"; $share = 'index.php?anketa='.$anketa.'&amp;a=vabila';
echo '<div id="buttons">'; echo '<div id="buttons">';
echo '<button class="medium white-blue" onClick="window.location.href='.$auto.';return false;">'.$lang['srv_testiranje_vnosi2'].'</button>'; echo ' <a href="'.$auto.'"><button class="medium white-blue" onClick="window.location.href='.$auto.';return false;">'.$lang['srv_testiranje_vnosi2'].'</button></a>';
echo '<button class="medium white-blue" onClick="window.open('.$manual.', \'_blank\');return false;">'.$lang['srv_archive_test_data_text2a'].'</button>'; echo ' <a href="'.$manual.'"><button class="medium white-blue" onClick="window.open('.$manual.', \'_blank\');return false;">'.$lang['srv_archive_test_data_text2a'].'</button></a>';
echo '<button class="medium blue" onclick="window.location.href='.$share.';return false;">'.$lang['srv_anketa_share'].'</button>'; echo ' <a href="'.$share.'"><button class="medium blue" onclick="window.location.href=;return false;">'.$lang['srv_anketa_share'].'</button></a>';
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';

2
admin/survey/script/branching.js
View File

@ -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(){ $('#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); var ta = $(event.target);

12
frontend/payments/classes/class.UserAccess.php
View File

@ -387,15 +387,23 @@ class UserAccess{
else else
$drupal_url = $site_url.'d/izvedi-nakup/'.$package_required.'/podatki'; $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 // Ce user ni avtor ankete
if($this->user_not_author){ if($this->user_not_author){
echo '<p>'.$lang['srv_access_no_access_not_author'].'</p>'; echo '<p>'.$lang['srv_access_no_access_not_author'].'</p>';
} }
echo '<p>'.$lang['srv_access_no_access'].' "'.$package_required_name.'".</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) 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 ' <a href="'.$drupal_url.'" target="_blank"><button class="medium blue">'.$lang['srv_narocila_buy'].'</button></a>';
echo '<span class="floatRight spaceRight"><div class="buttonwrapper"><a class="ovalbutton ovalbutton_gray" href="#" onClick="popupUserAccess_close();">'.$lang['srv_zapri'].'</a></div></span>'; echo '</div>';
} }
// Izpisemo obvestilo, da je funkcionalnost onemogocena in naj kupi paket // Izpisemo obvestilo, da je funkcionalnost onemogocena in naj kupi paket

3389
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

5
resources/sass/admin_new/components/components.scss
View File

@ -12,4 +12,7 @@
// Functional components // Functional components
@import "form/form"; @import "form/form";
@import "table/table"; @import "table/table";
// Payments
@import "payments/payments";

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

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

70
resources/sass/admin_new/components/payments/payments.scss Normal file
View File

@ -0,0 +1,70 @@
/*
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 !important;
&:hover{
color: darken($yellow, 5%);
}
&:before,
&:after{
color: $yellow !important;
}
}
/* Popup z obvestilom, da je funkcionalnost onemogocena in je potrebno kupiti paket */
#popup_user_access{
@include popup_general();
}
.user_access_warning{
p{
margin-bottom: 16px;
}
}

25
resources/sass/admin_new/components/popup/alert.scss
View File

@ -23,28 +23,3 @@
min-height: 30px; min-height: 30px;
width: 500px; 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;
}
}

9
resources/sass/admin_new/pages/survey_edit/toolbox.scss
View File

@ -122,15 +122,6 @@
} }
} }
&.user_access_locked{
background-color: #FFF0C5;
border-bottom: 1px #FFE59C solid;
&:hover{
background-color: #FFE59C;
}
}
.item_icon{ .item_icon{
width: 40px; width: 40px;
line-height: 40px; line-height: 40px;

92
resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
View File

@ -157,6 +157,98 @@ div.page_komentarji_anketa {
.add-variable{ .add-variable{
display: none !important; display: none !important;
} }
/* font awesom za admin */
input[type="checkbox"].enka-admin-custom,
input[type="radio"].enka-admin-custom {
display: none !important;
}
input[type="checkbox"].enka-admin-custom+ span.enka-checkbox-radio:before,
input[type="radio"].enka-admin-custom + span.enka-checkbox-radio:before {
font-family: $fontawesome;
display: inline-block;
font-size: 16px;
color: $dark-gray2;
font-weight: 400;
}
input[type="checkbox"].enka-admin-custom.enka-inline + span.enka-checkbox-radio:before,
input[type="radio"].enka-admin-custom.enka-inline + span.enka-checkbox-radio:before {
display: inline-block;
padding-top: 4px;
padding-left: 4px;
font-weight: 400;
}
input[type="checkbox"].enka-admin-custom + span.enka-checkbox-radio:before{
content: "\f0c8";
letter-spacing: 10px;
}
input[type="radio"].enka-admin-custom + span.enka-checkbox-radio:before{
content: "\f111";
letter-spacing: 8px;
}
/* select, checked */
input[type="checkbox"].enka-admin-custom:checked + span.enka-checkbox-radio:before{
content: "\f14a";
color: $dark-gray2;
letter-spacing: 8px;
}
input[type="radio"].enka-admin-custom:checked + span.enka-checkbox-radio:before{
content: "\f192";
color: $dark-gray2;
}
input[type="radio"] {
margin: 0 8px 4px 0;
display: none !important;
&+span.enka-checkbox-radio {
&:before {
font-family: $fontawesome;
display: inline-block;
content: "\f111";
letter-spacing: 10px;
}
font-size: 16px;
font-weight: 400;
}
&+span.enka-custom-radio {
&:before {
font-family: $fontawesome;
display: inline-block;
}
}
&:checked {
&+span.enka-checkbox-radio {
&:before {
content: "\f192";
}
}
}
}
input[type="checkbox"] {
display: none !important;
&+span.enka-checkbox-radio {
&:before {
font-family: $fontawesome;
display: inline-block;
content: "\f0c8";
letter-spacing: 10px;
}
font-size: 16px;
font-weight: 400;
color: $radio_selector;
}
&:checked {
&+span.enka-checkbox-radio {
&:before {
content: "\f14a";
letter-spacing: 8px;
}
}
}
}
} }
div.question_comment_holder { div.question_comment_holder {