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

oblika,statistike --> faicon dots

Browse Source
This commit is contained in:
Nejc Kovač 2022-08-19 15:21:53 +02:00
parent c28c68f1f0
commit eed1e0b54b
5 changed files with 64 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -1671,7 +1671,7 @@ class SurveyAnalysis {
} }
# tekst vprašanja # tekst vprašanja
echo '<script src="https://kit.fontawesome.com/c5e58c7f60.js" crossorigin="anonymous"></script>'; // echo '<script src="https://kit.fontawesome.com/c5e58c7f60.js" crossorigin="anonymous"></script>';
echo '<table class="table_sums sums_vertical">'; echo '<table class="table_sums sums_vertical">';
# naslovna vrstica # naslovna vrstica
@ -1709,7 +1709,7 @@ class SurveyAnalysis {
# variabla - en odgovor # variabla - en odgovor
echo '<td class="cell_icons cell_icons'.$spid.' en_odgovor" id="cell_icons'.$spid.'">'; echo '<td class="cell_icons cell_icons'.$spid.' en_odgovor" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from); // self::showIcons($spid,$spremenljivka,$_from);
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')" > <i class="fa-solid fa-ellipsis"></i> </button>'; echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
echo '<div class= "options displayNone" id="options'.$spid.'">'; echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from); self::showIcons($spid,$spremenljivka,$_from);
echo '</div>'; //options echo '</div>'; //options
@ -1937,7 +1937,7 @@ class SurveyAnalysis {
# variabla # variabla
echo '<td class="cell_icons cell_icons'.$spid.'" id="cell_icons'.$spid.'">'; echo '<td class="cell_icons cell_icons'.$spid.'" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>false)); // self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>false));
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <i class="fa-solid fa-ellipsis"></i> </button>'; echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
echo '<div class= "options displayNone" id="options'.$spid.'">'; echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>false)); self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>false));
echo '</div>'; //options echo '</div>'; //options
@ -2100,7 +2100,7 @@ class SurveyAnalysis {
# variabla # variabla
echo '<td class="cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">'; echo '<td class="cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>true)); // self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>true));
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <i class="fa-solid fa-ellipsis"></i> </button>'; echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
echo '<div class= "options displayNone" id="options'.$spid.'">'; echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>true)); self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>true));
echo '</div>'; //options echo '</div>'; //options
@ -2325,7 +2325,7 @@ class SurveyAnalysis {
echo '<td class="cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">'; echo '<td class="cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from); // self::showIcons($spid,$spremenljivka,$_from);
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <i class="fa-solid fa-ellipsis"></i> </button>'; echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
echo '<div class= "options displayNone" id="options'.$spid.'">'; echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from); self::showIcons($spid,$spremenljivka,$_from);
echo '</div>'; //options echo '</div>'; //options
@ -2538,7 +2538,7 @@ class SurveyAnalysis {
# variabla - več odgovorov # variabla - več odgovorov
echo '<td class="cell_icons cell_icons'.$spid.' vec_odgovorov sum" id="cell_icons'.$spid.'">'; echo '<td class="cell_icons cell_icons'.$spid.' vec_odgovorov sum" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>false)); // self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>false));
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <i class="fa-solid fa-ellipsis"></i> </button>'; echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
echo '<div class= "options displayNone" id="options'.$spid.'">'; echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>false)); self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>false));
echo '</div>'; //options echo '</div>'; //options
@ -2696,7 +2696,7 @@ class SurveyAnalysis {
# variabla # variabla
echo '<td class="cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">'; echo '<td class="cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>true)); // self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>true));
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <i class="fa-solid fa-ellipsis"></i> </button>'; echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
echo '<div class= "options displayNone" id="options'.$spid.'">'; echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>true)); self::showIcons($spid,$spremenljivka,$_from, array('navedbe'=>true));
echo '</div>'; //options echo '</div>'; //options
@ -2882,7 +2882,7 @@ class SurveyAnalysis {
# variabla - tabela en odgovor # variabla - tabela en odgovor
echo '<td class="cell_icons cell_icons'.$spid.' tabela_en_odgovor" id="cell_icons'.$spid.'">'; echo '<td class="cell_icons cell_icons'.$spid.' tabela_en_odgovor" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from); // self::showIcons($spid,$spremenljivka,$_from);
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <i class="fa-solid fa-ellipsis"></i> </button>'; echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
echo '<div class= "options displayNone" id="options'.$spid.'">'; echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from); self::showIcons($spid,$spremenljivka,$_from);
echo '</div>'; //options echo '</div>'; //options
@ -3198,7 +3198,7 @@ class SurveyAnalysis {
echo '<td class="cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">'; echo '<td class="cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from); // self::showIcons($spid,$spremenljivka,$_from);
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <i class="fa-solid fa-ellipsis"></i> </button>'; echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
echo '<div class= "options displayNone" id="options'.$spid.'">'; echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from); self::showIcons($spid,$spremenljivka,$_from);
echo '</div>'; //options echo '</div>'; //options
@ -3581,7 +3581,7 @@ class SurveyAnalysis {
# variabla # variabla
echo '<td class="cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">'; echo '<td class="cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from); // self::showIcons($spid,$spremenljivka,$_from);
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <i class="fa-solid fa-ellipsis"></i></button>'; echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
echo '<div class= "options displayNone" id="options'.$spid.'">'; echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from); self::showIcons($spid,$spremenljivka,$_from);
echo '</div>'; //options echo '</div>'; //options
@ -3817,7 +3817,7 @@ class SurveyAnalysis {
# variabla # variabla
echo '<td class="cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">'; echo '<td class="cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from); // self::showIcons($spid,$spremenljivka,$_from);
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <i class="fa-solid fa-ellipsis"></i> </button>'; echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
echo '<div class= "options displayNone" id="options'.$spid.'">'; echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from); self::showIcons($spid,$spremenljivka,$_from);
echo '</div>'; //options echo '</div>'; //options
@ -4098,7 +4098,7 @@ class SurveyAnalysis {
# variabla - število # variabla - število
echo '<td class="cell_icons cell_icons'.$spid.' stevilo" id="cell_icons'.$spid.'">'; echo '<td class="cell_icons cell_icons'.$spid.' stevilo" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from); // self::showIcons($spid,$spremenljivka,$_from);
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <i class="fa-solid fa-ellipsis"></i> </button>'; echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
echo '<div class= "options displayNone" id="options'.$spid.'">'; echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from); self::showIcons($spid,$spremenljivka,$_from);
echo '</div>'; //options echo '</div>'; //options
@ -4402,7 +4402,7 @@ class SurveyAnalysis {
# variabla # variabla
echo '<td class="cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">'; echo '<td class="cell_icons cell_icons'.$spid.' test" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from); // self::showIcons($spid,$spremenljivka,$_from);
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <i class="fa-solid fa-ellipsis"></i> </button>'; echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
echo '<div class= "options displayNone" id="options'.$spid.'">'; echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from); self::showIcons($spid,$spremenljivka,$_from);
echo '</div>'; //options echo '</div>'; //options
@ -4759,7 +4759,7 @@ class SurveyAnalysis {
# variabla - besedilo # variabla - besedilo
echo '<td class="cell_icons cell_icons'.$spid.' besedilo" id="cell_icons'.$spid.'">'; echo '<td class="cell_icons cell_icons'.$spid.' besedilo" id="cell_icons'.$spid.'">';
// self::showIcons($spid,$spremenljivka,$_from); // self::showIcons($spid,$spremenljivka,$_from);
echo '<button onclick="show_settings_survey_analysis(\''.$spid.'\')"> <i class="fa-solid fa-ellipsis"></i> </button>'; echo '<span class="faicon dots" onclick="show_settings_survey_analysis(\''.$spid.'\')" > </span>';
echo '<div class= "options displayNone" id="options'.$spid.'">'; echo '<div class= "options displayNone" id="options'.$spid.'">';
self::showIcons($spid,$spremenljivka,$_from); self::showIcons($spid,$spremenljivka,$_from);
echo '</div>'; //options echo '</div>'; //options

23
public/css/admin_new.css
View File

@ -20974,11 +20974,9 @@ textarea#addusers, textarea#addusers_note {
display: none; display: none;
} }
i { .faicon.dots {
font-size: 16px; cursor: pointer;
font-weight: 600;
color: #1e88e5; color: #1e88e5;
vertical-align: bottom;
} }
div.page_tema h2 { div.page_tema h2 {
@ -30096,6 +30094,10 @@ iframe#ifmcontentstoprint {
top: 40px; top: 40px;
box-shadow: 0px 0px 7px 0px rgba(0, 0, 0, 0.1215686275); box-shadow: 0px 0px 7px 0px rgba(0, 0, 0, 0.1215686275);
} }
#div_analiza_data .faicon.dots {
cursor: pointer;
color: #1e88e5;
}
.analysis_icons_holder { .analysis_icons_holder {
background-color: white; background-color: white;
@ -30121,7 +30123,7 @@ iframe#ifmcontentstoprint {
margin-left: 16px; margin-left: 16px;
} }
.analysis_icons_holder .icon_box > a .sum_frekv { .analysis_icons_holder .icon_box > a .sum_frekv {
margin-left: 11px; margin-left: 12px;
} }
.analysis_icons_holder .icon_box > a .star_icon { .analysis_icons_holder .icon_box > a .star_icon {
margin-left: 9px; margin-left: 9px;
@ -30146,6 +30148,17 @@ iframe#ifmcontentstoprint {
padding-bottom: 16px; padding-bottom: 16px;
} }
.cell_icons button::before {
font-weight: 700;
content: "\f141";
}
div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options div.button {
background-color: #f8f8f8 !important;
background: unset;
border: unset;
}
#div_analiza_data table.table_desc tr td, #div_analiza_data table.table_desc tr td,
.custom_report_elements table.table_desc tr td, .custom_report_elements table.table_desc tr td,
#arch_body_div table.table_desc tr td { #arch_body_div table.table_desc tr td {

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

@ -1,9 +1,7 @@
// Ikone (frekvenca, suma...) // Ikone (frekvenca, suma...)
#div_analiza_data{ #div_analiza_data{
.cell_icons {
//
}
.row2{ .row2{
position: relative; position: relative;
} }
@ -18,9 +16,11 @@
box-shadow: 0px 0px 7px 0px #0000001F; box-shadow: 0px 0px 7px 0px #0000001F;
} }
// .displayNone{ .faicon.dots {
// background-color: blue; cursor: pointer;
// } color: #1e88e5;
}
} }
@ -75,7 +75,7 @@
margin-left: 16px; margin-left: 16px;
} }
.sum_frekv{ .sum_frekv{
margin-left: 11px; margin-left: 12px;
} }
.star_icon{ .star_icon{
margin-left: 9px; margin-left: 9px;
@ -125,11 +125,15 @@
// content: "f*"; // content: "f*";
// } // }
// .cell_icons button::before{ .cell_icons button::before{
// font-family: "Source Sans Pro",sans-serif; font-weight: 700;
// font-weight: 700;
// font-style: italic;
// content: "f*"; // content: "f*";
// // content: "\f141"; content: "\f141";
// } }
div.page_tema div#theme_grid_holder div.div_theme_group div.theme_label .theme_label_options div.button {
background-color: #f8f8f8 !important;
background: unset;
border: unset;
}

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

@ -2,12 +2,9 @@
display: none; display: none;
} }
i{ .faicon.dots{
font-size: 16px; cursor: pointer;
font-weight: 600;
color: #1e88e5; color: #1e88e5;
vertical-align: bottom;
} }
@ -548,3 +545,4 @@ fieldset#theme-upload {
.fa-desktop{ .fa-desktop{
color: #0059AB; color: #0059AB;
} }