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

urejanje --> oblika : meatball ikone toggle + show settings

Browse Source
This commit is contained in:
Nejc Kovač 2022-08-08 17:36:20 +02:00
parent b164bd0cb6
commit 8288ddbd1a
4 changed files with 122 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -595,39 +595,42 @@ class SurveyTheme {
// show_settings(\''.$row['id'].'\'); // show_settings(\''.$row['id'].'\');
// div z setingsi // div z setingsi
// <div id="theme_additional_settings_'.$row['id'].'"> // <div id="theme_additional_settings_'.$row['id'].'">
echo '<div class="options">'; echo '<div class="options options'.$row['id'].'" id="options'.$row['id'].'">';
echo '<button onclick="show_settings()"> <img src="\public\img\icons\dots.svg"> </button>'; echo '<button onclick="show_settings(\''.$row['id'].'\')"> <img src="\public\img\icons\dots.svg"> </button>';
//Aktiviraj echo '<div class="buttons-window" id="additional_settings_'.$row['id'].'">';
echo '<div class="button" onclick="te_change_profile(\''.$row['id'].'\', true); return false;" title="'.$lang['srv_te_theme_activate2'].'">';
echo '<span class="faicon fa-hand-pointer"></span>';
echo $lang['srv_te_theme_activate'];
echo '</div>';
//Predogled //Aktiviraj
echo '<div class="button theme_links_preview" src="'.$src.'" title="'.$lang['srv_poglejanketo2'].'">'; echo '<div class="button" onclick="te_change_profile(\''.$row['id'].'\', true); return false;" title="'.$lang['srv_te_theme_activate2'].'">';
echo '<span class="faicon fa-desktop"></span>'; echo '<span class="faicon fa-hand-pointer"></span>';
echo $lang['srv_poglejanketo2']; echo $lang['srv_te_theme_activate'];
echo '</div>';
//Prilagodi
echo '<div class="button" onclick="window.location.href=\'index.php?anketa='.$this->sid.'&a=theme-editor&profile='.$row['id'].'\'" title="'.$lang['srv_te_theme_edit'].'">';
echo '<span class="faicon palette"></span>';
echo $lang['srv_te_theme_edit'];
echo '</div>';
//Izbriši
if ($groupId == -1) {
echo '<div class="button theme_delete" onclick="if (confirm(\''.$lang['srv_ask_delete'].'\')) te_delete_profile(\''.$row['id'].'\', false); return false;" title="'.$lang['srv_te_theme_delete2'].'">';
echo '<span class="faicon trash empty"></span>';
echo $lang['srv_anketadelete_txt'];
echo '</div>'; echo '</div>';
}
//Predogled
echo '<div class="button theme_links_preview" src="'.$src.'" title="'.$lang['srv_poglejanketo2'].'">';
echo '<span class="faicon fa-desktop"></span>';
echo $lang['srv_poglejanketo2'];
echo '</div>';
//Prilagodi
echo '<div class="button" onclick="window.location.href=\'index.php?anketa='.$this->sid.'&a=theme-editor&profile='.$row['id'].'\'" title="'.$lang['srv_te_theme_edit'].'">';
echo '<span class="faicon palette"></span>';
echo $lang['srv_te_theme_edit'];
echo '</div>';
//Izbriši
if ($groupId == -1) {
echo '<div class="button theme_delete" onclick="if (confirm(\''.$lang['srv_ask_delete'].'\')) te_delete_profile(\''.$row['id'].'\', false); return false;" title="'.$lang['srv_te_theme_delete2'].'">';
echo '<span class="faicon trash empty"></span>';
echo $lang['srv_anketadelete_txt'];
echo '</div>';
}
echo '</div>'; // additional_settings
echo '</div>'; //div.options echo '</div>'; //div.options
@ -653,35 +656,39 @@ class SurveyTheme {
echo '</div>'; echo '</div>';
//Gumbi //Gumbi
echo '<div class="options">'; echo '<div class="options options_mobile'.$row['id'].'" id="options'.$row['id'].'">';
echo '<button onclick="show_settings()"> <img src="\public\img\icons\dots.svg"> </button>'; echo '<button onclick="show_settings_mobile(\''.$row['id'].'\')"> <img src="\public\img\icons\dots.svg"> </button>';
//Aktiviraj
echo '<div class="button" onclick="te_change_profile(\''.$row['id'].'\', true, true); return false;" title="'.$lang['srv_te_theme_activate2'].'">';
echo '<span class="faicon fa-hand-pointer"></span>';
echo $lang['srv_te_theme_activate'];
echo '</div>';
//Predogled echo '<div class="buttons-window" id="additional_settings_mobile_'.$row['id'].'">';
echo '<div class="button theme_links_preview" src="'.$src.'" title="'.$lang['srv_poglejanketo2'].'">'; //Aktiviraj
echo '<span class="faicon fa-desktop"></span>'; echo '<div class="button" onclick="te_change_profile(\''.$row['id'].'\', true, true); return false;" title="'.$lang['srv_te_theme_activate2'].'">';
echo $lang['srv_poglejanketo2']; echo '<span class="faicon fa-hand-pointer"></span>';
echo '</div>'; echo $lang['srv_te_theme_activate'];
//Prilagodi
echo '<div class="button" onclick="window.location.href=\'index.php?anketa='.$this->sid.'&a=theme-editor&profile='.$row['id'].'&mobile=1\'" title="'.$lang['srv_te_theme_edit'].'">';
echo '<span class="faicon palette"></span>';
echo $lang['srv_te_theme_edit'];
echo '</div>';
//Izbriši
if ($groupId == -1) {
echo '<div class="button theme_delete" onclick="if (confirm(\''.$lang['srv_ask_delete'].'\')) te_delete_profile(\''.$row['id'].'\', true); return false;" title="'.$lang['srv_te_theme_delete2'].'">';
echo '<span class="faicon trash empty"></span>';
echo $lang['srv_anketadelete_txt'];
echo '</div>'; echo '</div>';
}
//Predogled
echo '<div class="button theme_links_preview" src="'.$src.'" title="'.$lang['srv_poglejanketo2'].'">';
echo '<span class="faicon fa-desktop"></span>';
echo $lang['srv_poglejanketo2'];
echo '</div>';
//Prilagodi
echo '<div class="button" onclick="window.location.href=\'index.php?anketa='.$this->sid.'&a=theme-editor&profile='.$row['id'].'&mobile=1\'" title="'.$lang['srv_te_theme_edit'].'">';
echo '<span class="faicon palette"></span>';
echo $lang['srv_te_theme_edit'];
echo '</div>';
//Izbriši
if ($groupId == -1) {
echo '<div class="button theme_delete" onclick="if (confirm(\''.$lang['srv_ask_delete'].'\')) te_delete_profile(\''.$row['id'].'\', true); return false;" title="'.$lang['srv_te_theme_delete2'].'">';
echo '<span class="faicon trash empty"></span>';
echo $lang['srv_anketadelete_txt'];
echo '</div>';
}
echo '</div>'; //additional settings
echo '</div>'; //div.options echo '</div>'; //div.options

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

@ -12,8 +12,6 @@ function teme_options(){
} }
toggle_id.classList.toggle('active'); toggle_id.classList.toggle('active');
} }
function teme_options2(){ function teme_options2(){
@ -24,6 +22,40 @@ function teme_options2(){
toggle_id.classList.remove('active'); toggle_id.classList.remove('active');
} }
} }
toggle_id.classList.toggle('active'); toggle_id.classList.toggle('active');
} }
function show_settings(id_of_element){
// var options = document.getElementsByClassName("options"+id_of_element)[0];
var options = document.getElementById("options"+id_of_element);
var additional_settings = document.getElementById("additional_settings_"+id_of_element);
// document.onclick = function(e){
// if(e.target.id !== additional_settings && e.target.id !== options ){
// additional_settings.classList.remove('active');
// }
// }
additional_settings.classList.toggle("active");
}
function show_settings_mobile(id_of_element){
// var options = document.getElementsByClassName("options_mobile"+id_of_element)[0];
var options = document.getElementById("options_mobile"+id_of_element);
var additional_settings = document.getElementById("additional_settings_mobile_"+id_of_element);
// document.onclick = function(e){
// if(e.target.id !== additional_settings && e.target.id !== options ){
// additional_settings.classList.remove('active');
// }
// }
additional_settings.classList.toggle("active");
}

26
public/css/admin_new.css
View File

@ -10012,7 +10012,8 @@ textarea:focus {
margin-top: 16px; margin-top: 16px;
} }
.box-container .num_box { .box-container .num_box {
border: #1E88E5 solid 1px; border: unset;
background-color: white;
margin: 0px; margin: 0px;
padding: 0px; padding: 0px;
} }
@ -10032,7 +10033,7 @@ textarea:focus {
margin-right: 8px; margin-right: 8px;
} }
.box-container .num_box .box_text { .box-container .num_box .box_text {
padding: 0px 16px 16px 16px; padding: 5px 16px 16px 16px;
font-size: 16px; font-size: 16px;
line-height: 20px; line-height: 20px;
color: #808080; color: #808080;
@ -10040,11 +10041,15 @@ textarea:focus {
align-items: center; align-items: center;
} }
.box-container .num_box .box_text .num_of_surveys { .box-container .num_box .box_text .num_of_surveys {
font-size: 40px; font-size: 32px;
color: #333; color: #333;
font-weight: 400; font-weight: 400;
margin-right: 5px; margin-right: 5px;
} }
.box-container .checked {
border: #1E88E5 solid 1px;
background-color: #FFEFEF;
}
.box-container .num_box2 { .box-container .num_box2 {
margin: 0px 32px; margin: 0px 32px;
} }
@ -11100,9 +11105,19 @@ table.variableView {
} }
table.gdpr_surveys { table.gdpr_surveys {
table-layout: fixed; table-layout: auto;
width: 100%; width: 100%;
} }
table.gdpr_surveys th {
background-color: #F8F8F8;
}
table.gdpr_surveys tr {
background-color: #FFEFEF;
}
table.gdpr_surveys th,
table.gdpr_surveys td {
border: 1px solid #E5E5E5;
}
table.gdpr_surveys tr.red_row td { table.gdpr_surveys tr.red_row td {
background-color: #FFEFEF !important; background-color: #FFEFEF !important;
} }
@ -20754,9 +20769,10 @@ div.page_tema div.theme_list div.options {
} }
div.page_tema div.theme_list div.options div.buttons-window { div.page_tema div.theme_list div.options div.buttons-window {
position: absolute; position: absolute;
bottom: 12px; bottom: 15px;
max-width: 113px; max-width: 113px;
display: none; display: none;
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 {
display: block; display: block;

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

@ -55,6 +55,10 @@ div.page_tema {
} }
} }
//Gumbi //Gumbi
div.options { div.options {
display: flex; display: flex;
@ -63,9 +67,11 @@ div.page_tema {
div.buttons-window{ div.buttons-window{
position: absolute; position: absolute;
bottom: 12px; bottom: 15px;
max-width: 113px; max-width: 113px;
display: none; display: none;
margin-right: 5px;
} }
div.buttons-window.active { div.buttons-window.active {
display: block; display: block;