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-08-19 12:51:01 +02:00
commit c28c68f1f0
14 changed files with 557 additions and 222 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,6 +179,7 @@ class SurveyTheme {
$groupId = 0;
echo '<div class="themes-content">';
echo '<script src="https://kit.fontawesome.com/c5e58c7f60.js" crossorigin="anonymous"></script>';
echo '<div id="div_theme_groups">';
$this->displayGroupSelector($groupId);
@ -372,7 +373,10 @@ class SurveyTheme {
echo '<script src="/admin/survey/script/urejanje_oblika.js"> </script>';
echo '<div class="options option1" >';
echo '<button id="btn-1" onclick="teme_options()"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<button id="btn-1" class="faicon dots" onclick="teme_options()"> ';
// echo '<img src="\public\img\icons\dots.svg">';
echo '<i class="fa-solid fa-ellipsis"></i>';
echo ' </button>';
echo '<div class= "buttons-window displayNone buttons-window1" id="buttons-window1">';
@ -424,7 +428,7 @@ class SurveyTheme {
//Gumbi
echo '<div class="options">';
echo '<button id="btn-2" onclick="teme_options2()"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<button id="btn-2" onclick="teme_options2()"> <i class="fa-solid fa-ellipsis"></i> </button>';
echo '<div class= "buttons-window displayNone " id="buttons-window2">';
@ -600,7 +604,7 @@ class SurveyTheme {
echo '<div class="options options'.$row['id'].'" id="options'.$row['id'].'">';
echo '<button onclick="show_settings(\''.$row['id'].'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<button onclick="show_settings(\''.$row['id'].'\')"> <i class="fa-solid fa-ellipsis"></i> </button>';
echo '<div class="buttons-window displayNone" id="additional_settings_'.$row['id'].'">';
@ -660,7 +664,7 @@ class SurveyTheme {
//Gumbi
echo '<div class="options options_mobile'.$row['id'].'" id="options'.$row['id'].'">';
echo '<button onclick="show_settings_mobile(\''.$row['id'].'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<button onclick="show_settings_mobile(\''.$row['id'].'\')"> <i class="fa-solid fa-ellipsis"></i> </button>';
echo '<div class="buttons-window" id="additional_settings_mobile_'.$row['id'].'">';

3
admin/survey/classes/class.VprasanjeDeleted.php
View File

@ -142,6 +142,9 @@ class VprasanjeDeleted {
// Odpremo popup s pobrisanimi vprasanji
if ($_GET['a'] == 'displayVprasanjeDeletedPopup') {
$this->displayDeletedVprasanja();
// Div za dodaten popup za preview
echo '<div id="vprasanje_deleted_preview" class="displayNone"></div>';
}
// Dodajanje pobrisanega vprasanja nazaj v vprasalnik

31
admin/survey/classes/surveyAnalysis/class.SurveyAnalysis.php
View File

@ -818,7 +818,7 @@ class SurveyAnalysis {
echo '<td class="cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,'desc');
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <i class="fa-solid fa-ellipsis"></i> </button>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,'desc');
echo '</div>'; //options
@ -1047,7 +1047,7 @@ class SurveyAnalysis {
#variabla
echo '<td class="cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,'freq');
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <i class="fa-solid fa-ellipsis"></i> </button>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,'freq');
echo '</div>'; //options
@ -1671,6 +1671,7 @@ class SurveyAnalysis {
}
# tekst vprašanja
echo '<script src="https://kit.fontawesome.com/c5e58c7f60.js" crossorigin="anonymous"></script>';
echo '<table class="table_sums sums_vertical">';
# naslovna vrstica
@ -1708,7 +1709,7 @@ class SurveyAnalysis {
# variabla - en odgovor
echo '<td class="cell_icons cell_icons'.$spid.' en_odgovor" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from);
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')" > <img src="\public\img\icons\dots.svg"> </button>';
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')" > <i class="fa-solid fa-ellipsis"></i> </button>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from);
echo '</div>'; //options
@ -1936,7 +1937,7 @@ class SurveyAnalysis {
# variabla
echo '<td class="cell_icons cell_icons'.$spid.'" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>false));
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <i class="fa-solid fa-ellipsis"></i> </button>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>false));
echo '</div>'; //options
@ -2099,7 +2100,7 @@ class SurveyAnalysis {
# variabla
echo '<td class="cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>true));
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <i class="fa-solid fa-ellipsis"></i> </button>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>true));
echo '</div>'; //options
@ -2324,7 +2325,7 @@ class SurveyAnalysis {
echo '<td class="cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from);
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <i class="fa-solid fa-ellipsis"></i> </button>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from);
echo '</div>'; //options
@ -2537,7 +2538,7 @@ class SurveyAnalysis {
# variabla - več odgovorov
echo '<td class="cell_icons cell_icons'.$spid.' vec_odgovorov sum" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>false));
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <i class="fa-solid fa-ellipsis"></i> </button>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>false));
echo '</div>'; //options
@ -2695,7 +2696,7 @@ class SurveyAnalysis {
# variabla
echo '<td class="cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>true));
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <i class="fa-solid fa-ellipsis"></i> </button>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>true));
echo '</div>'; //options
@ -2881,7 +2882,7 @@ class SurveyAnalysis {
# variabla - tabela en odgovor
echo '<td class="cell_icons cell_icons'.$spid.' tabela_en_odgovor" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from);
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <i class="fa-solid fa-ellipsis"></i> </button>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from);
echo '</div>'; //options
@ -3197,7 +3198,7 @@ class SurveyAnalysis {
echo '<td class="cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from);
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <i class="fa-solid fa-ellipsis"></i> </button>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from);
echo '</div>'; //options
@ -3580,7 +3581,7 @@ class SurveyAnalysis {
# variabla
echo '<td class="cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from);
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <i class="fa-solid fa-ellipsis"></i></button>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from);
echo '</div>'; //options
@ -3816,7 +3817,7 @@ class SurveyAnalysis {
# variabla
echo '<td class="cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from);
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <i class="fa-solid fa-ellipsis"></i> </button>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from);
echo '</div>'; //options
@ -4097,7 +4098,7 @@ class SurveyAnalysis {
# variabla - število
echo '<td class="cell_icons cell_icons'.$spid.' stevilo" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from);
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <i class="fa-solid fa-ellipsis"></i> </button>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from);
echo '</div>'; //options
@ -4401,7 +4402,7 @@ class SurveyAnalysis {
# variabla
echo '<td class="cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from);
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <i class="fa-solid fa-ellipsis"></i> </button>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from);
echo '</div>'; //options
@ -4758,7 +4759,7 @@ class SurveyAnalysis {
# variabla - besedilo
echo '<td class="cell_icons cell_icons'.$spid.' besedilo" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from);
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <img src="\public\img\icons\dots.svg"> </button>';
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <i class="fa-solid fa-ellipsis"></i> </button>';
echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from);
echo '</div>'; //options

10
admin/survey/script/vprasanjeDeleted.js
View File

@ -75,7 +75,15 @@ function insertVprasanjeDeletedItemsIntoSurvey(){
// Predogled pobrisanega vprasanja
function previewVprasanjeDeleted(spr_id){
preview_spremenljivka(spr_id);
$('#vprasanje_deleted_preview').load('ajax.php?a=preview_spremenljivka', {anketa: srv_meta_anketa_id, spremenljivka: spr_id, podstran: srv_meta_podstran}).removeClass('displayNone');
//preview_spremenljivka(spr_id);
event.stopPropagation();
}
// Predogled pobrisanega vprasanja
function closePreviewVprasanjeDeleted(){
$('#vprasanje_deleted_preview').html().addClass('displayNone');
}

2
editors/ckeditor_4_4/config.js
View File

@ -36,7 +36,7 @@ CKEDITOR.editorConfig = function (config) {
'/',
{name: 'other', items: ['Scayt', 'Strike', 'SpecialChar']},
{name: 'vec', items:['Styles', 'Format', 'Outdent', 'Indent', 'HorizontalRule']},
{name: 'insert', items: ['CreateDiv', 'Flash', 'Table', 'IFrame', 'Youtube', 'Abbr']},
{name: 'insert', items: ['CreateDiv', 'Table', 'IFrame', 'Youtube', 'Abbr']},
];
/*config.toolbar = [

612
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

29
resources/sass/admin_new/components/ckeditor/ckeditor.scss Normal file
View File

@ -0,0 +1,29 @@
.cke_1.cke_chrome {
border-bottom: 1px $gray solid !important;
border-radius: 2px 2px 0 0;
}
#cke_1_top{
border-bottom: 1px $gray solid;
}
.cke_dialog{
border: 1px $gray solid !important;
}
div.button_holder.editor_button_holder{
margin: 0;
padding: 8px 16px;
border-bottom: 1px rgb(204, 204, 204) solid;
border-left: 1px rgb(204, 204, 204) solid;
border-right: 1px rgb(204, 204, 204) solid;
border-radius: 0 0 2px 2px;
}
.cke_dialog table tr td,
.cke_dialog table tr th{
border-bottom: 0 !important;
}

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

@ -15,4 +15,7 @@
@import "table/table";
// Payments
@import "payments/payments";
@import "payments/payments";
// CKEditor
@import "ckeditor/ckeditor";

9
resources/sass/admin_new/components/form/button.scss
View File

@ -234,13 +234,4 @@ div.button_holder {
margin-right: 0;
}
}
&.editor_button_holder{
margin: 0;
padding: 8px 16px;
border-bottom: 1px rgb(204, 204, 204) solid;
border-left: 1px rgb(204, 204, 204) solid;
border-right: 1px rgb(204, 204, 204) solid;
}
}

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

@ -95,4 +95,7 @@ table.gdpr_surveys tr.green_row td {
table.gdpr_surveys tr.red_row td{
// background-color: #FF0000 !important;
background-color: rgba(255, 0, 0, 0.05) !important;
}
table.gdpr_surveys tr.grey_row {
background-color: #ffffff !important;
}

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

@ -9,7 +9,7 @@
}
.options{
width: 200px;
// width: 200px;
position: absolute;
left: 17px;
@ -65,6 +65,7 @@
color: #333333;
font-weight: 400;
margin-left: 14px;
margin-right: 16px;
}
.icon_text_margin{
@ -112,4 +113,23 @@
padding-bottom: 16px;
}
}
}
// span.faicon{
// font-family: "Source Sans Pro",sans-serif;
// font-weight: 700;
// font-style: italic;
// content: "f*";
// }
// .cell_icons button::before{
// font-family: "Source Sans Pro",sans-serif;
// font-weight: 700;
// font-style: italic;
// content: "f*";
// // content: "\f141";
// }

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

@ -2,6 +2,14 @@
display: none;
}
i{
font-size: 16px;
font-weight: 600;
color: #1e88e5;
vertical-align: bottom;
}
// Oblika - prva stran, meni s temami
@ -228,7 +236,7 @@ div.page_tema {
font-weight: $semi-bold;
// font-family: 'Roboto';
font-weight: 500;
font-weight: 600;
}
@ -242,10 +250,9 @@ div.page_tema {
margin-bottom: 16px;
span.theme_name {
font-weight: 500;
font-weight: 600;
text-transform: uppercase;
// font-family: 'Roboto';
font-size: 14px;
font-size: 16px;
display: flex;
align-items: center;

5
resources/sass/admin_new/pages/survey_edit/popups/preview_question.scss
View File

@ -27,7 +27,10 @@ $progress_bar_background: black;
*/
//Preview spremenljivka
#fullscreen {
#fullscreen,
#vprasanje_deleted_preview,
#library_preview{
#preview_spremenljivka {
@include popup_general();

19
resources/sass/admin_new/pages/survey_edit/vprasanje_deleted.scss
View File

@ -141,4 +141,23 @@
margin: 0 16px 16px 0;
}
}
/* Dodaten popup za preview */
#vprasanje_deleted_preview{
position: absolute;
z-index: 9999;
top: 0;
left: 0;
height: 100%;
width: 100%;
background-color: $white;
#preview_spremenljivka{
box-sizing: border-box;
width: 100%;
}
}
}