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:
pero1203 2022-08-09 12:34:42 +02:00
commit ca17ee2935
5 changed files with 49 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
admin/survey/classes/class.GDPR.php
View File

@ -64,7 +64,7 @@ class GDPR{
echo '<div class="box-container">'; echo '<div class="box-container">';
echo '<div class= "num_box num_box1 checked">'; echo '<div class= "num_box num_box1 checked" id="num_box1">';
echo '<div class="box_flex" id="box_flex">'; echo '<div class="box_flex" id="box_flex">';
echo '<input type="checkbox" name="GDPR ankete checkbox" id="gdpr_ankete_check" checked="checked" onclick="test_function()">'; echo '<input type="checkbox" name="GDPR ankete checkbox" id="gdpr_ankete_check" checked="checked" onclick="test_function()">';
@ -82,7 +82,7 @@ class GDPR{
echo '</div>'; echo '</div>';
echo '<div class= "num_box num_box2 checked">'; echo '<div class= "num_box num_box2 checked" id="num_box2">';
echo '<div class="box_flex" id="box_flex potenc_gdpr">'; echo '<div class="box_flex" id="box_flex potenc_gdpr">';
echo '<input type="checkbox" name="Potencialno GDPR ankete" id="potenc_gdpr_ankete_check" checked="checked" onclick="test_function()">'; echo '<input type="checkbox" name="Potencialno GDPR ankete" id="potenc_gdpr_ankete_check" checked="checked" onclick="test_function()">';
@ -101,7 +101,7 @@ class GDPR{
echo '</div>'; echo '</div>';
echo '<div class= "num_box num_box3 checked">'; echo '<div class= "num_box num_box3 checked" id="num_box3">';
echo '<div class="box_flex" id="box_flex">'; echo '<div class="box_flex" id="box_flex">';
echo '<input type="checkbox" name="ne-gdpr ankete" id="ne_gdpr_ankete" checked="checked" onclick="test_function()" >'; echo '<input type="checkbox" name="ne-gdpr ankete" id="ne_gdpr_ankete" checked="checked" onclick="test_function()" >';

11
admin/survey/script/GDPR_seznam_anket.js
View File

@ -31,8 +31,13 @@ function test_function() {
// GDPR ANKETE togle // GDPR ANKETE togle
var box1 = document.getElementsByClassName("num_box1")[0]; var box1 = document.getElementsByClassName("num_box1")[0];
var box1_Color = document.getElementById("num_box1");
box1_Color.style.backgroundColor="rgba(20, 255, 0, 0.05)";
if (!inputs.checked){ if (!inputs.checked){
box1_Color.style.background="#ffffff";
box1.classList.remove("checked"); box1.classList.remove("checked");
@ -42,6 +47,9 @@ function test_function() {
}; };
} }
else{ else{
box1_Color.style.background="rgba(20, 255, 0, 0.05)";
// box1.classList.toggle("checked"); // box1.classList.toggle("checked");
box1.classList.add("checked"); box1.classList.add("checked");
@ -54,9 +62,11 @@ function test_function() {
// potencialno GDPR ankete togle // potencialno GDPR ankete togle
var box2 = document.getElementsByClassName("num_box2")[0]; var box2 = document.getElementsByClassName("num_box2")[0];
var box2_Color = document.getElementById("num_box2");
if (!potenc_gdpr.checked){ if (!potenc_gdpr.checked){
box2_Color.style.backgroundColor="#ffffff";
box2.classList.remove("checked"); box2.classList.remove("checked");
for(var i=0; i < red_row.length; i++){ for(var i=0; i < red_row.length; i++){
@ -64,6 +74,7 @@ function test_function() {
}; };
} }
else{ else{
box2_Color.style.backgroundColor="rgba(20, 255, 0, 0.05)";
box2.classList.add("checked"); box2.classList.add("checked");
for(var i=0; i < red_row.length; i++){ for(var i=0; i < red_row.length; i++){

18
public/css/admin_new.css
View File

@ -10048,11 +10048,23 @@ textarea:focus {
} }
.box-container .checked { .box-container .checked {
border: #1E88E5 solid 1px; border: #1E88E5 solid 1px;
background-color: #FFEFEF;
} }
.box-container .num_box2 { .box-container .num_box2 {
margin: 0px 32px; margin: 0px 32px;
} }
.box-container #num_box1 {
background-color: rgba(20, 255, 0, 0.05);
}
.box-container #num_box2 {
background-color: rgba(255, 0, 0, 0.05);
}
table.gdpr_surveys tr.green_row td {
background-color: rgba(20, 255, 0, 0.05) !important;
}
table.gdpr_surveys tr.red_row td {
background-color: rgba(255, 0, 0, 0.05) !important;
}
table { table {
margin: 8px 0; margin: 8px 0;
@ -11119,10 +11131,10 @@ table.gdpr_surveys td {
border: 1px solid #E5E5E5; 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;
} }
table.gdpr_surveys tr.green_row td { table.gdpr_surveys tr.green_row td {
background-color: #a8eea8 !important; background-color: #a8eea8;
} }
table.gdpr_surveys.requests td div.gdpr_requests_wrap { table.gdpr_surveys.requests td div.gdpr_requests_wrap {
max-width: 204px; max-width: 204px;

21
resources/sass/admin_new/components/form/seznam_anket.scss
View File

@ -63,12 +63,29 @@
.checked { .checked {
border: #1E88E5 solid 1px; border: #1E88E5 solid 1px;
background-color: #FFEFEF;
} }
.num_box2{ .num_box2{
margin: 0px 32px ; margin: 0px 32px ;
} }
#num_box1 {
background-color: rgba(20, 255, 0, 0.05);
}
#num_box2{
background-color: rgba(255, 0, 0, 0.05);
}
#num_box3{
//
}
}
table.gdpr_surveys tr.green_row td {
background-color: rgba(20, 255, 0, 0.05) !important;
}
table.gdpr_surveys tr.red_row td{
// background-color: #FF0000 !important;
background-color: rgba(255, 0, 0, 0.05) !important;
} }

4
resources/sass/admin_new/pages/gdpr_pages/gdpr_tables.scss
View File

@ -25,12 +25,12 @@ table {
tr.red_row { tr.red_row {
td { td {
background-color: $light-red !important; background-color: $light-red ;
} }
} }
tr.green_row { tr.green_row {
td { td {
background-color: $light-green !important; background-color: $light-green ;
} }
} }