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

urejanje oblika: settings

Browse Source
This commit is contained in:
Nejc Kovač 2022-08-12 13:46:23 +02:00
parent 55da145676
commit cc435b99ac
5 changed files with 62 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
admin/survey/classes/class.SurveyTheme.php
View File

@ -374,7 +374,7 @@ class SurveyTheme {
echo '<button id="btn-1" onclick="teme_options()"> <img src="\public\img\icons\dots.svg"> </button>'; echo '<button id="btn-1" onclick="teme_options()"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<div class= "buttons-window buttons-window1" id="buttons-window1">'; echo '<div class= "buttons-window displayNone buttons-window1" id="buttons-window1">';
//Predogled //Predogled
echo '<div class="button theme_links_preview" src="'.$preview_link.'" title="'.$lang['srv_poglejanketo2'].'">'; echo '<div class="button theme_links_preview" src="'.$preview_link.'" title="'.$lang['srv_poglejanketo2'].'">';
@ -426,7 +426,7 @@ class SurveyTheme {
echo '<button id="btn-2" onclick="teme_options2()"> <img src="\public\img\icons\dots.svg"> </button>'; echo '<button id="btn-2" onclick="teme_options2()"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<div class= "buttons-window" id="buttons-window2">'; echo '<div class= "buttons-window displayNone " id="buttons-window2">';
//Predogled //Predogled
echo '<div class="button theme_links_preview" src="'.$preview_link.'" title="'.$lang['srv_poglejanketo2'].'">'; echo '<div class="button theme_links_preview" src="'.$preview_link.'" title="'.$lang['srv_poglejanketo2'].'">';
@ -602,7 +602,7 @@ class SurveyTheme {
echo '<button onclick="show_settings(\''.$row['id'].'\')"> <img src="\public\img\icons\dots.svg"> </button>'; echo '<button onclick="show_settings(\''.$row['id'].'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<div class="buttons-window" id="additional_settings_'.$row['id'].'">'; echo '<div class="buttons-window displayNone" id="additional_settings_'.$row['id'].'">';
//Aktiviraj //Aktiviraj
echo '<div class="button" onclick="te_change_profile(\''.$row['id'].'\', true); return false;" title="'.$lang['srv_te_theme_activate2'].'">'; echo '<div class="button" onclick="te_change_profile(\''.$row['id'].'\', true); return false;" title="'.$lang['srv_te_theme_activate2'].'">';
@ -698,6 +698,17 @@ class SurveyTheme {
} }
} }
// Klik izven - zapremo okno
echo '<script>
$(document).mouseup(function(e){
var container = $(".buttons-window, .options");
if (!container.is(e.target) && container.has(e.target).length === 0){
$(".buttons-window").addClass("displayNone");
}
});
</script>';
// Splošne teme - GRID // Splošne teme - GRID
if ( isset($this->groups[$groupId]['skins']) && count($this->groups[$groupId]['skins']) > 0 ) { if ( isset($this->groups[$groupId]['skins']) && count($this->groups[$groupId]['skins']) > 0 ) {

47
admin/survey/script/urejanje_oblika.js
View File

@ -7,11 +7,10 @@ function teme_options(){
document.onclick = function(e){ document.onclick = function(e){
if(e.target.id !== 'buttons-window1' && e.target.id !== 'btn-1' ){ if(e.target.id !== 'buttons-window1' && e.target.id !== 'btn-1' ){
toggle_id.classList.remove('active'); toggle_id.classList.addClass('displayNone');
} }
} }
toggle_id.classList.toggle('displayNone');
toggle_id.classList.toggle('active');
} }
function teme_options2(){ function teme_options2(){
@ -19,28 +18,37 @@ function teme_options2(){
document.onclick = function(e){ document.onclick = function(e){
if(e.target.id !== 'buttons-window2' && e.target.id !== 'btn-2' ){ if(e.target.id !== 'buttons-window2' && e.target.id !== 'btn-2' ){
toggle_id.classList.remove('active'); toggle_id.classList.addClass('displayNone');
} }
} }
toggle_id.classList.toggle('active'); toggle_id.classList.toggle('displayNone');
} }
function show_settings(id_of_element){ function show_settings(id_of_element){
var options_id = ("options"+id_of_element) // var options_id = ("options"+id_of_element)
var additional_settings = document.getElementById("additional_settings_"+id_of_element); // var additional_settings = document.getElementById("additional_settings_"+id_of_element);
var additional_settings_id = ("additional_settings_"+id_of_element); // var additional_settings_id = ("additional_settings_"+id_of_element);
// console.log(options_id); // console.log(options_id);
// console.log(additional_settings_id); // console.log(additional_settings_id);
// document.onclick = function(e){ // // document.onclick = function(e){
// if(e.target.id !== additional_settings_id && e.target.id !==options_id ){ // // if(e.target.id !== additional_settings_id && e.target.id !==options_id ){
// additional_settings.classList.remove('active'); // // additional_settings.classList.remove('active');
// } // // }
// } // // }
additional_settings.classList.toggle("active"); // additional_settings.classList.toggle("active");
if($('#additional_settings_'+id_of_element).hasClass('displayNone')){
$('.buttons-window').addClass('displayNone');
$('#additional_settings_'+id_of_element).removeClass('displayNone');
}
else{
$('.buttons-window').addClass('displayNone');
}
} }
@ -59,6 +67,17 @@ function show_settings_mobile(id_of_element){
// } // }
additional_settings.classList.toggle("active"); additional_settings.classList.toggle("active");
if($('#additional_settings_mobile_'+id_of_element).hasClass('displayNone')){
$('.buttons-window').addClass('displayNone');
$('#additional_settings_mobile_'+id_of_element).removeClass('displayNone');
}
else{
$('.buttons-window').addClass('displayNone');
}
} }

7
public/css/admin_new.css
View File

@ -20864,6 +20864,10 @@ textarea#addusers, textarea#addusers_note {
height: 120px; height: 120px;
} }
.buttons-window.displayNone {
display: none;
}
div.page_tema h2 { div.page_tema h2 {
font-size: 24px; font-size: 24px;
margin-top: 32px; margin-top: 32px;
@ -20913,7 +20917,6 @@ div.page_tema div.theme_list div.options div.buttons-window {
position: absolute; position: absolute;
bottom: 20px; bottom: 20px;
max-width: 113px; max-width: 113px;
display: none;
margin-right: 5px; margin-right: 5px;
} }
div.page_tema div.theme_list div.options div.buttons-window.active { div.page_tema div.theme_list div.options div.buttons-window.active {
@ -29490,7 +29493,7 @@ iframe#ifmcontentstoprint {
width: 100%; width: 100%;
} }
#div_analiza_data .cell_icons { #div_analiza_data .row2 {
position: relative; position: relative;
} }
#div_analiza_data .options { #div_analiza_data .options {

3
resources/sass/admin_new/pages/survey_analysis/icons.scss
View File

@ -2,6 +2,9 @@
#div_analiza_data{ #div_analiza_data{
.cell_icons { .cell_icons {
//
}
.row2{
position: relative; position: relative;
} }

8
resources/sass/admin_new/pages/survey_edit/oblika_teme.scss
View File

@ -1,3 +1,9 @@
.buttons-window.displayNone{
display: none;
}
// Oblika - prva stran, meni s temami // Oblika - prva stran, meni s temami
div.page_tema { div.page_tema {
@ -69,7 +75,7 @@ div.page_tema {
position: absolute; position: absolute;
bottom: 20px; bottom: 20px;
max-width: 113px; max-width: 113px;
display: none; // display: none;
margin-right: 5px; margin-right: 5px;
} }