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

Redesign - moje ankete - popravki filtrov 2

Browse Source
This commit is contained in:
pero1203 2022-01-19 11:26:27 +01:00
parent de979bdda3
commit 20669e1e48
4 changed files with 43 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1516,8 +1516,8 @@ class SurveyList {
// Ce preklapljamo v searchu moramo refreshati celo stran (druga js funkcija) // Ce preklapljamo v searchu moramo refreshati celo stran (druga js funkcija)
$reload = ($this->isSearch == 1) ? '_reload' : ''; $reload = ($this->isSearch == 1) ? '_reload' : '';
echo '<input type="radio" name="filter_mySurveys" id="filter_mySurveys_0" value="0" '.(!$this->user_id ? 'checked="checked"' : '').' onclick="surveyList_user'.$reload.'(\'clr\',\'0\');"> <label for="filter_mySurveys_0">'.$lang['srv_list_all_surveys'].'</label>'; echo '<span class="filter_line"><input type="radio" name="filter_mySurveys" id="filter_mySurveys_0" value="0" '.(!$this->user_id ? 'checked="checked"' : '').' onclick="surveyList_user'.$reload.'(\'clr\',\'0\');"> <label for="filter_mySurveys_0">'.$lang['srv_list_all_surveys'].'</label></span>';
echo '<br /><input type="radio" name="filter_mySurveys" id="filter_mySurveys_1" value="1" '.($this->user_id ? 'checked="checked"' : '').' onclick="surveyList_user'.$reload.'(\'uid\',\''.$this->g_uid.'\');"> <label for="filter_mySurveys_1">'.$lang['srv_list_my_surveys'].'</label>'; echo '<span class="filter_line"><input type="radio" name="filter_mySurveys" id="filter_mySurveys_1" value="1" '.($this->user_id ? 'checked="checked"' : '').' onclick="surveyList_user'.$reload.'(\'uid\',\''.$this->g_uid.'\');"> <label for="filter_mySurveys_1">'.$lang['srv_list_my_surveys'].'</label></span>';
echo '</li>'; echo '</li>';
@ -1527,9 +1527,9 @@ class SurveyList {
echo '<span class="filter_title">'.$lang['srv_sl_set_language'].'</span><br />'; echo '<span class="filter_title">'.$lang['srv_sl_set_language'].'</span><br />';
echo '<input type="radio" name="filter_language" id="filter_language_0" value="0" '.((int)$this->lang_id == 0 ? 'checked="checked"' : '').' onclick="surveyList_language'.$reload.'(\'0\');"> <label for="filter_language_0">'.$lang['srv_sl_set_language_all'].'</label>'; echo '<span class="filter_line"><input type="radio" name="filter_language" id="filter_language_0" value="0" '.((int)$this->lang_id == 0 ? 'checked="checked"' : '').' onclick="surveyList_language'.$reload.'(\'0\');"> <label for="filter_language_0">'.$lang['srv_sl_set_language_all'].'</label></span>';
echo '<br /><input type="radio" name="filter_language" id="filter_language_1" value="1" '.((int)$this->lang_id == 1 ? 'checked="checked"' : '').' onclick="surveyList_language'.$reload.'(\'1\');"> <label for="filter_language_1">'.$admin_languages['1'].'</label>'; echo '<span class="filter_line"><input type="radio" name="filter_language" id="filter_language_1" value="1" '.((int)$this->lang_id == 1 ? 'checked="checked"' : '').' onclick="surveyList_language'.$reload.'(\'1\');"> <label for="filter_language_1">'.$admin_languages['1'].'</label></span>';
echo '<br /><input type="radio" name="filter_language" id="filter_language_2" value="2" '.((int)$this->lang_id == 2 ? 'checked="checked"' : '').' onclick="surveyList_language'.$reload.'(\'2\');"> <label for="filter_language_2">'.$admin_languages['2'].'</label>'; echo '<span class="filter_line"><input type="radio" name="filter_language" id="filter_language_2" value="2" '.((int)$this->lang_id == 2 ? 'checked="checked"' : '').' onclick="surveyList_language'.$reload.'(\'2\');"> <label for="filter_language_2">'.$admin_languages['2'].'</label></span>';
echo '</li>'; echo '</li>';
@ -1539,9 +1539,8 @@ class SurveyList {
echo '<span class="filter_title">'.$lang['srv_gdpr'].'</span><br />'; echo '<span class="filter_title">'.$lang['srv_gdpr'].'</span><br />';
echo '<input type="radio" name="filter_gdpr" id="filter_gdpr_0" value="0" '.((int)$this->gdpr == 0 ? 'checked="checked"' : '').' onclick="surveyList_gdpr'.$reload.'(\'0\');"> <label for="filter_gdpr_0">'.$lang['srv_list_all_surveys'].'</label>'; echo '<span class="filter_line"><input type="radio" name="filter_gdpr" id="filter_gdpr_0" value="0" '.((int)$this->gdpr == 0 ? 'checked="checked"' : '').' onclick="surveyList_gdpr'.$reload.'(\'0\');"> <label for="filter_gdpr_0">'.$lang['srv_list_all_surveys'].'</label></span>';
echo '<br /><input type="radio" name="filter_gdpr" id="filter_gdpr_1" value="1" '.((int)$this->gdpr == 1 ? 'checked="checked"' : '').' onclick="surveyList_gdpr'.$reload.'(\'1\');"> <label for="filter_gdpr_1">'.$lang['srv_list_gdpr_gdpr'].'</label>'; echo '<span class="filter_line"><input type="radio" name="filter_gdpr" id="filter_gdpr_1" value="1" '.((int)$this->gdpr == 1 ? 'checked="checked"' : '').' onclick="surveyList_gdpr'.$reload.'(\'1\');"> <label for="filter_gdpr_1">'.$lang['srv_list_gdpr_gdpr'].'</label></span>';
//echo '<br /><input type="radio" name="filter_gdpr" id="filter_gdpr_2" value="2" '.((int)$this->gdpr == 2 ? 'checked="checked"' : '').' onclick="surveyList_gdpr'.$reload.'(\'2\');"> <label for="filter_gdpr_2">'.$lang['srv_list_gdpr_no_gdpr'].'</label>';
echo '</li>'; echo '</li>';

8
lang/1.php
View File

@ -5485,10 +5485,10 @@ $lang = array (
"srv_library_show" => "Prikaži knjižnico", "srv_library_show" => "Prikaži knjižnico",
"srv_library_hide" => "Skrij knjižnico", "srv_library_hide" => "Skrij knjižnico",
"srv_list_author" => "Avtor ankete", "srv_list_author" => "Avtor ankete",
"srv_list_my_surveys" => "Prikaži samo moje ankete", "srv_list_my_surveys" => "Moje ankete",
"srv_list_all_surveys" => "Prikaži vse ankete", "srv_list_all_surveys" => "Vse ankete",
"srv_list_gdpr_no_gdpr" => "Prikaži samo ankete brez GDPR", "srv_list_gdpr_no_gdpr" => "Ankete brez GDPR",
"srv_list_gdpr_gdpr" => "Prikaži samo GDPR ankete", "srv_list_gdpr_gdpr" => "GDPR ankete",
"srv_list_userFilter_surveys" => "Seznam je filtriran po uporabniku", "srv_list_userFilter_surveys" => "Seznam je filtriran po uporabniku",
"srv_default_setting" => "Privzete nastavitve za objavo", "srv_default_setting" => "Privzete nastavitve za objavo",
"srv_default_setting_unactive" => "Z aktiviranjem potrjujete privzete nastavitve", "srv_default_setting_unactive" => "Z aktiviranjem potrjujete privzete nastavitve",

17
public/css/admin_new.css
View File

@ -11240,6 +11240,23 @@ div .table-horizontal-scroll-wrapper2 table {
visibility: visible; visibility: visible;
opacity: 1; opacity: 1;
} }
#survey_list .second_line .filters #filterButton #filterSettings,
#survey_list .second_line .filters #sortButton #filterSettings {
width: 150px;
}
#survey_list .second_line .filters #filterButton #filterSettings ul li,
#survey_list .second_line .filters #sortButton #filterSettings ul li {
display: flex;
flex-direction: column;
}
#survey_list .second_line .filters #filterButton #filterSettings ul li .filter_title,
#survey_list .second_line .filters #sortButton #filterSettings ul li .filter_title {
font-weight: 600;
}
#survey_list .second_line .filters #filterButton #filterSettings ul li .filter_line,
#survey_list .second_line .filters #sortButton #filterSettings ul li .filter_line {
padding-top: 8px;
}
#survey_list .second_line .filters #filterButton #sortSettings, #survey_list .second_line .filters #filterButton #sortSettings,
#survey_list .second_line .filters #sortButton #sortSettings { #survey_list .second_line .filters #sortButton #sortSettings {
width: 150px; width: 150px;

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

@ -350,7 +350,22 @@
} }
#filterSettings{ #filterSettings{
width: 150px;
ul{
li{
display: flex;
flex-direction: column;
.filter_title{
font-weight: 600;
}
.filter_line{
padding-top: 8px;
}
}
}
} }
#sortSettings{ #sortSettings{