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

Filtri pri mojih anketah - zamenjane ikone, zamenjan vrstni red v mapah

Browse Source
This commit is contained in:
pero1203 2022-10-17 08:38:23 +02:00
parent 58b498821d
commit f490671938
5 changed files with 85 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/survey/classes/class.SurveyList.php
View File

@ -1510,7 +1510,7 @@ class SurveyList {
protected function displaySortButton(){ protected function displaySortButton(){
global $lang, $site_url; global $lang, $site_url;
echo $lang['orderby']; echo '<span class="faicon sort"></span>';
echo '<div id="sortSettings">'; echo '<div id="sortSettings">';
@ -1545,7 +1545,7 @@ class SurveyList {
echo '<div id="filterButton" '.(($this->user_id || $this->lang_id != 0 || $this->gdpr != 0) ? 'class="active"' : '').'>'; echo '<div id="filterButton" '.(($this->user_id || $this->lang_id != 0 || $this->gdpr != 0) ? 'class="active"' : '').'>';
echo $lang['srv_analiza_filter']; echo '<span class="faicon filter"></span>';
echo '<div id="filterSettings">'; echo '<div id="filterSettings">';
echo '<ul>'; echo '<ul>';

10
admin/survey/classes/class.SurveyListFolders.php
View File

@ -317,6 +317,11 @@ class SurveyListFolders extends SurveyList{
// Filtri na desni // Filtri na desni
echo '<div class="filters">'; echo '<div class="filters">';
// Okno za search po mojeih anketah
echo ' <div id="searchMySurveys">';
$this->displaySearch();
echo ' </div>';
// Preklop na pogled s folderji (samo ce imamo nov vmesnik) // Preklop na pogled s folderji (samo ce imamo nov vmesnik)
//echo '<div id="folderSwitch">'; //echo '<div id="folderSwitch">';
$this->displayFolderSwitch(); $this->displayFolderSwitch();
@ -331,11 +336,6 @@ class SurveyListFolders extends SurveyList{
echo ' <div id="sortButton">'; echo ' <div id="sortButton">';
$this->displaySortButton(); $this->displaySortButton();
echo ' </div>'; echo ' </div>';
// Okno za search po mojeih anketah
echo ' <div id="searchMySurveys">';
$this->displaySearch();
echo ' </div>';
echo '</div>'; echo '</div>';
} }

85
public/css/admin_new.css
View File

@ -10785,6 +10785,52 @@ span.cke_toolgroup .cke_button {
border-radius: 2px; border-radius: 2px;
transition: 0.2s; transition: 0.2s;
} }
#survey_list .second_line .filters #filterButton#filterButton, #survey_list .second_line .filters #filterButton#sortButton,
#survey_list .second_line .filters #sortButton#filterButton,
#survey_list .second_line .filters #sortButton#sortButton,
#survey_list .second_line .filters #folderSwitch#filterButton,
#survey_list .second_line .filters #folderSwitch#sortButton {
width: 40px;
padding: 10px 0;
text-align: center;
}
#survey_list .second_line .filters #filterButton#filterButton:after, #survey_list .second_line .filters #filterButton#sortButton:after,
#survey_list .second_line .filters #sortButton#filterButton:after,
#survey_list .second_line .filters #sortButton#sortButton:after,
#survey_list .second_line .filters #folderSwitch#filterButton:after,
#survey_list .second_line .filters #folderSwitch#sortButton:after {
content: "";
}
#survey_list .second_line .filters #filterButton#filterButton .faicon.filter, #survey_list .second_line .filters #filterButton#sortButton .faicon.filter,
#survey_list .second_line .filters #sortButton#filterButton .faicon.filter,
#survey_list .second_line .filters #sortButton#sortButton .faicon.filter,
#survey_list .second_line .filters #folderSwitch#filterButton .faicon.filter,
#survey_list .second_line .filters #folderSwitch#sortButton .faicon.filter {
line-height: 18px;
}
#survey_list .second_line .filters #filterButton#filterButton .faicon.filter:before, #survey_list .second_line .filters #filterButton#sortButton .faicon.filter:before,
#survey_list .second_line .filters #sortButton#filterButton .faicon.filter:before,
#survey_list .second_line .filters #sortButton#sortButton .faicon.filter:before,
#survey_list .second_line .filters #folderSwitch#filterButton .faicon.filter:before,
#survey_list .second_line .filters #folderSwitch#sortButton .faicon.filter:before {
font-size: 14px;
color: #1E88E5;
}
#survey_list .second_line .filters #filterButton#filterButton .faicon.sort, #survey_list .second_line .filters #filterButton#sortButton .faicon.sort,
#survey_list .second_line .filters #sortButton#filterButton .faicon.sort,
#survey_list .second_line .filters #sortButton#sortButton .faicon.sort,
#survey_list .second_line .filters #folderSwitch#filterButton .faicon.sort,
#survey_list .second_line .filters #folderSwitch#sortButton .faicon.sort {
line-height: 18px;
}
#survey_list .second_line .filters #filterButton#filterButton .faicon.sort:before, #survey_list .second_line .filters #filterButton#sortButton .faicon.sort:before,
#survey_list .second_line .filters #sortButton#filterButton .faicon.sort:before,
#survey_list .second_line .filters #sortButton#sortButton .faicon.sort:before,
#survey_list .second_line .filters #folderSwitch#filterButton .faicon.sort:before,
#survey_list .second_line .filters #folderSwitch#sortButton .faicon.sort:before {
font-size: 18px;
color: #1E88E5;
}
#survey_list .second_line .filters #filterButton#folderSwitch, #survey_list .second_line .filters #filterButton#folderSwitch,
#survey_list .second_line .filters #sortButton#folderSwitch, #survey_list .second_line .filters #sortButton#folderSwitch,
#survey_list .second_line .filters #folderSwitch#folderSwitch { #survey_list .second_line .filters #folderSwitch#folderSwitch {
@ -10814,19 +10860,6 @@ span.cke_toolgroup .cke_button {
background-size: 100% 100%; background-size: 100% 100%;
background-repeat: no-repeat; background-repeat: no-repeat;
} }
#survey_list .second_line .filters #filterButton#filterButton:after, #survey_list .second_line .filters #filterButton#sortButton:after,
#survey_list .second_line .filters #sortButton#filterButton:after,
#survey_list .second_line .filters #sortButton#sortButton:after,
#survey_list .second_line .filters #folderSwitch#filterButton:after,
#survey_list .second_line .filters #folderSwitch#sortButton:after {
position: absolute;
font-family: "Font Awesome 5 Free";
content: "";
right: 8px;
top: 13px;
font-weight: 600;
font-size: 12px;
}
#survey_list .second_line .filters #filterButton:hover, #survey_list .second_line .filters #filterButton:hover,
#survey_list .second_line .filters #sortButton:hover, #survey_list .second_line .filters #sortButton:hover,
#survey_list .second_line .filters #folderSwitch:hover { #survey_list .second_line .filters #folderSwitch:hover {
@ -10851,7 +10884,7 @@ span.cke_toolgroup .cke_button {
right: 0; right: 0;
z-index: 9999; z-index: 9999;
width: 200px; width: 200px;
top: 40px; top: 39px;
border-radius: 2px; border-radius: 2px;
} }
#survey_list .second_line .filters #filterButton #filterSettings a, #survey_list .second_line .filters #filterButton #filterSettings a,
@ -11342,30 +11375,6 @@ body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders
width: auto; width: auto;
margin-left: 16px; margin-left: 16px;
} }
body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .right_content .second_line .filters #filterButton,
body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .right_content .second_line .filters #sortButton {
width: 40px;
padding: 10px 0;
text-align: center;
}
body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .right_content .second_line .filters #filterButton:after,
body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .right_content .second_line .filters #sortButton:after {
content: "";
}
body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .right_content .second_line .filters #filterButton .faicon.filter:before,
body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .right_content .second_line .filters #sortButton .faicon.filter:before {
font-size: 14px;
color: #1E88E5;
}
body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .right_content .second_line .filters #filterButton .faicon.sort,
body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .right_content .second_line .filters #sortButton .faicon.sort {
line-height: 20px;
}
body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .right_content .second_line .filters #filterButton .faicon.sort:before,
body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .right_content .second_line .filters #sortButton .faicon.sort:before {
font-size: 18px;
color: #1E88E5;
}
body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .right_content .div_sl_new { body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .right_content .div_sl_new {
min-height: calc(100vh - 530px); min-height: calc(100vh - 530px);
} }

26
resources/sass/admin_new/pages/my_surveys/survey_list_folders.scss
View File

@ -216,32 +216,6 @@ body.body_mySurveys_folders{
width: auto; width: auto;
margin-left: 16px; margin-left: 16px;
} }
#filterButton,
#sortButton{
width: 40px;
padding: 10px 0;
text-align: center;
&:after{
content: "";
}
.faicon.filter:before{
font-size: 14px;
color: $blue;
}
.faicon.sort{
line-height: 20px;
&:before{
font-size: 18px;
color: $blue;
}
}
}
} }
} }

45
resources/sass/admin_new/pages/my_surveys/top_filters.scss
View File

@ -241,6 +241,36 @@
transition: 0.2s; transition: 0.2s;
&#filterButton,
&#sortButton{
width: 40px;
padding: 10px 0;
text-align: center;
&:after{
content: "";
}
.faicon.filter{
line-height: 18px;
&:before{
font-size: 14px;
color: $blue;
}
}
.faicon.sort{
line-height: 18px;
&:before{
font-size: 18px;
color: $blue;
}
}
}
&#folderSwitch{ &#folderSwitch{
display: flex; display: flex;
align-items: center; align-items: center;
@ -267,19 +297,6 @@
} }
} }
&#filterButton:after,
&#sortButton:after{
position: absolute;
font-family: $fontawesome;
content: "\f078";
right: 8px;
top: 13px;
font-weight: 600;
font-size: 12px;
}
&:hover{ &:hover{
background-color: $light-gray2; background-color: $light-gray2;
} }
@ -302,7 +319,7 @@
z-index: 9999; z-index: 9999;
width: 200px; width: 200px;
top: 40px; top: 39px;
border-radius: 2px; border-radius: 2px;
} }