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-22 12:15:21 +02:00
commit 2e9b31a385
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,16 +47,16 @@ else {
}
//grey row
if (grey_row_count == 1){
text_box3_p.innerHTML = ' <span class="num_of_surveys" id="num_of_surveys1"> '+grey_row_count+' </span>anketa lahko vsebuje GDPR občutljive podatke';
text_box3_p.innerHTML = ' <span class="num_of_surveys" id="num_of_surveys1"> '+grey_row_count+' </span>anketa ne vsebuje GDPR občutljivih podatkov';
}
else if (grey_row_count == 2){
text_box3_p.innerHTML = ' <span class="num_of_surveys" id="num_of_surveys1"> '+grey_row_count+' </span>anketi lahko vsebujeta GDPR občutljive podatke';
text_box3_p.innerHTML = ' <span class="num_of_surveys" id="num_of_surveys1"> '+grey_row_count+' </span>anketi ne vsebujeta GDPR občutljivih podatkov';
}
else if (grey_row_count == 3){
text_box3_p.innerHTML = ' <span class="num_of_surveys" id="num_of_surveys1"> '+grey_row_count+' </span>ankete lahko vsebujejo GDPR občutljive podatke';
text_box3_p.innerHTML = ' <span class="num_of_surveys" id="num_of_surveys1"> '+grey_row_count+' </span>ankete ne vsebujejo GDPR občutljivih podatkov';
}
else {
text_box3_p.innerHTML = ' <span class="num_of_surveys" id="num_of_surveys1"> '+grey_row_count+' </span>anket lahko vsebuje GDPR občutljive podatke';
text_box3_p.innerHTML = ' <span class="num_of_surveys" id="num_of_surveys1"> '+grey_row_count+' </span>anket ne vsebuje GDPR občutljivih podatkov';
}
// Seznam anket - togle checkbox prikaz anket

2
public/css/admin_new.css
View File

@ -10167,6 +10167,7 @@ div .table-horizontal-scroll-wrapper2 table {
#anketa_edit .page_num_fieldset {
border: unset;
border-top: 1px dashed #E5E5E5;
width: 100%;
}
.page_num_fieldset {
@ -30053,6 +30054,7 @@ iframe#ifmcontentstoprint {
.analysis_icons_holder {
background-color: white;
border-radius: 2px;
box-shadow: 0px 0px 7px 0px #0000001F;
}
.analysis_icons_holder .icon_box {
margin-left: 16px;

2
resources/sass/admin_new/components/table/table.scss
View File

@ -110,6 +110,8 @@ div {
#anketa_edit .page_num_fieldset{
border: unset;
border-top: 1px dashed #E5E5E5;
width: 100%;
}
.page_num_fieldset{

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

@ -44,6 +44,7 @@
background-color: white;
border-radius: 2px;
box-shadow: 0px 0px 7px 0px #0000001F;