From 871b7be5a2ef75fe4dc548548e6ce24b6e503907 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Thu, 13 Oct 2022 09:21:30 +0200
Subject: [PATCH] Moje ankete direktoriji - popravki, dodani filtri

---
 admin/survey/classes/class.SurveyList.php     |   3 +-
 .../classes/class.SurveyListFolders.php       | 103 ++++++++++-
 public/css/admin_new.css                      | 160 +++++++++++++-----
 .../sass/admin_new/basic/icons/standard.scss  |   4 +
 .../admin_new/components/header/icons.scss    |   2 +-
 .../admin_new/components/hover/hover.scss     |  11 +-
 .../pages/my_surveys/survey_list.scss         |   4 +
 .../pages/my_surveys/survey_list_folders.scss |  38 ++++-
 .../pages/my_surveys/top_filters.scss         |  17 +-
 9 files changed, 283 insertions(+), 59 deletions(-)

diff --git a/admin/survey/classes/class.SurveyList.php b/admin/survey/classes/class.SurveyList.php
index 2444245a2..a3d2a1614 100644
--- a/admin/survey/classes/class.SurveyList.php
+++ b/admin/survey/classes/class.SurveyList.php
@@ -1758,7 +1758,8 @@ class SurveyList {
         echo '<input id="searchMySurvey" type="text" value="" placeholder="'.$lang['s_search_mySurvey'].'" name="search" />';
 		
 		echo '	<button class="medium white-black" onclick="$(\'#1kasmysurvey\').submit(); return false;">';
-		echo $lang['s_search2'];
+		//echo $lang['s_search2'];
+		echo '      <span class="faicon search"></span>';
 		echo '	</button>';
           		
 		echo '</form>';
diff --git a/admin/survey/classes/class.SurveyListFolders.php b/admin/survey/classes/class.SurveyListFolders.php
index 5392f763a..4b06436fa 100644
--- a/admin/survey/classes/class.SurveyListFolders.php
+++ b/admin/survey/classes/class.SurveyListFolders.php
@@ -161,7 +161,7 @@ class SurveyListFolders extends SurveyList{
         
             echo '<span class="faicon folder"></span>';
 
-            echo $lang['srv_mySurvey_all_surveys'];  
+            echo '<div class="folder_item_title">'.$lang['srv_mySurvey_all_surveys'].'</div>';  
             echo '<span class="folder_item_child_count">'.$survey_count.'</span>';
         }
         else{            
@@ -170,7 +170,7 @@ class SurveyListFolders extends SurveyList{
             echo '<span class="faicon arrow" onClick="mySurvey_folder_toggle(\''.$folder_id.'\');"></span>';
             echo '<span class="faicon folder"></span>';
 
-            echo $row['naslov'];
+            echo '<div class="folder_item_title">'.$row['naslov'].'</div>';
             echo '<span class="folder_item_child_count">'.$survey_count.'</span>';
 
             // Urejanje folderja
@@ -311,12 +311,6 @@ class SurveyListFolders extends SurveyList{
         $this->displayFolderSwitch();
         //echo '</div>';
 
-        // Okno za search po mojeih anketah
-        echo '  <div id="searchMySurveys">';
-        $this->displaySearch();	
-        echo '  </div>';
-        
-        /*
         // Gumb za filtriranje
         //echo '<div id="filterButton">';
         $this->displayFilterButton();
@@ -326,11 +320,102 @@ class SurveyListFolders extends SurveyList{
         echo '  <div id="sortButton">';
         $this->displaySortButton();
         echo '  </div>';
-        */
 
+        // Okno za search po mojeih anketah
+        echo '  <div id="searchMySurveys">';
+        $this->displaySearch();	
+        echo '  </div>';
+        
         echo '</div>';
     }
 
+    // Prikazemo gumb za sortiranje seznama anket
+	protected function displaySortButton(){
+		global $lang, $site_url;
+		
+        echo '<span class="faicon sort"></span>';
+				
+		echo '<div id="sortSettings">';
+		
+		echo '<ul>';
+		
+		if($this->sorttype == 2){
+			$sort = 1;
+			$img_src = 'sort_ascending';
+		} 
+		else{
+			$sort = 2;
+			$img_src = 'sort_descending';
+		}
+		
+		echo '<li '.($this->sortby == 1 ? ' class="active"' : '').'><a href="#" onClick="surveyList_goTo(\'1\',\''.($this->sortby != 1 ? '1' : $sort).'\')">'.$lang['sort_by_title'].' <span class="faicon '.($this->sortby != 1 ? 'sort_unsorted' : $img_src).'"></span></a></li>';
+		echo '<li '.($this->sortby == 6 ? ' class="active"' : '').'><a href="#" onClick="surveyList_goTo(\'6\',\''.($this->sortby != 6 ? '1' : $sort).'\')">'.$lang['sort_by_qcount'].' <span class="faicon '.($this->sortby != 6 ? 'sort_unsorted' : $img_src).'"></span></a></li>';
+		echo '<li '.($this->sortby == 5 ? ' class="active"' : '').'><a href="#" onClick="surveyList_goTo(\'5\',\''.($this->sortby != 5 ? '1' : $sort).'\')">'.$lang['sort_by_answercount'].' <span class="faicon '.($this->sortby != 5 ? 'sort_unsorted' : $img_src).'"></span></a></li>';
+		echo '<li '.($this->sortby == 16 ? ' class="active"' : '').'><a href="#" onClick="surveyList_goTo(\'16\',\''.($this->sortby != 16 ? '1' : $sort).'\')">'.$lang['sort_by_insert'].' <span class="faicon '.($this->sortby != 16 ? 'sort_unsorted' : $img_src).'"></span></a></li>';
+		echo '<li '.($this->sortby == 14 ? ' class="active"' : '').'><a href="#" onClick="surveyList_goTo(\'14\',\''.($this->sortby != 14 ? '1' : $sort).'\')">'.$lang['sort_by_edit'].' <span class="faicon '.($this->sortby != 14 ? 'sort_unsorted' : $img_src).'"></span></a></li>';
+		echo '<li '.($this->sortby == 18 ? ' class="active"' : '').'><a href="#" onClick="surveyList_goTo(\'18\',\''.($this->sortby != 18 ? '1' : $sort).'\')">Status <span class="faicon '.($this->sortby != 18 ? 'sort_unsorted' : $img_src).'"></span></a></li>';
+		echo '<li '.($this->sortby == 7 ? ' class="active"' : '').'><a href="#" onClick="surveyList_goTo(\'7\',\''.($this->sortby != 7 ? '1' : $sort).'\')"><li '.($this->sortby == 7 ? ' class="active"' : '').'>'.$lang['sort_by_author'].' <span class="faicon '.($this->sortby != 7 ? 'sort_unsorted' : $img_src).'"></span></a></li>';
+		echo '<li '.($this->sortby == 11 ? ' class="active"' : '').' style="border:0;"><a href="#" onClick="surveyList_goTo(\'11\',\''.($this->sortby != 11 ? '1' : $sort).'\')">'.$lang['sort_by_editor'].' <span class="faicon '.($this->sortby != 11 ? 'sort_unsorted' : $img_src).'"></span></a></li>';
+		
+		echo '</ul>';
+		
+		echo '</div>';
+	}
+	
+	// Prikazemo gumb za filtriranje seznama anket
+	protected function displayFilterButton(){
+		global $lang, $site_url, $admin_languages;
+		
+		echo '<div id="filterButton" '.(($this->user_id || $this->lang_id != 0 || $this->gdpr != 0) ? 'class="active"' : '').'>';
+		
+		echo '<span class="faicon filter"></span>';
+		
+		echo '<div id="filterSettings">';		
+		echo '<ul>';
+               
+		# filter po uporabniku
+		echo '<li>';
+		
+		echo '<span class="filter_title">'.$lang['srv_list_author'].'</span>';
+		
+		// Ce preklapljamo v searchu moramo refreshati celo stran (druga js funkcija)
+		$reload = ($this->isSearch == 1) ? '_reload' : '';
+		
+		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 '<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>';
+        
+        
+		# filter po jeziku
+		echo '<li>';	
+		
+		echo '<span class="filter_title">'.$lang['srv_sl_set_language'].'</span>';
+		
+		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 '<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 '<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>';	
+
+
+        # filter po GDPR anketah
+		echo '<li>';	
+		
+		echo '<span class="filter_title">'.$lang['srv_gdpr'].'</span>';
+		
+		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 '<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 '</li>';	
+        
+		
+		echo '</ul>';			
+		echo '</div>';
+		
+		echo '</div>';
+	}
+
     // Izpisemo footer
     private function displayFooter(){
         global $lang;
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 2bdc1916b..e51fd72a9 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -5558,6 +5558,10 @@ span.faicon.filter::before {
   content: "";
 }
 
+span.faicon.sort::before {
+  content: "";
+}
+
 span.faicon.grip::before {
   content: "";
 }
@@ -6940,12 +6944,12 @@ a.read-more .faicon:before {
   padding: 16px;
   color: #333333;
   font-weight: 400;
-  font-size: 16px;
+  font-size: 14px;
   line-height: 20px;
   text-align: left;
   background: #FFFFFF;
-  border: 1px solid #C4C4C4;
-  box-shadow: 0px 4px 7px rgba(0, 0, 0, 0.07);
+  box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.12);
+  border-radius: 2px 2px 0px 2px;
   cursor: auto;
   margin-top: 14px;
   padding: 12px;
@@ -6955,6 +6959,9 @@ a.read-more .faicon:before {
 .tooltip .expanded-tooltip .expanded-tooltip-box a {
   text-decoration: none;
 }
+.tooltip .expanded-tooltip .expanded-tooltip-box label {
+  font-size: 14px;
+}
 .tooltip .expanded-tooltip .expanded-tooltip-box ul {
   margin: 0;
   padding: 0;
@@ -8790,12 +8797,12 @@ header #top_line #xtradiv #xtradivSettings {
   padding: 16px;
   color: #333333;
   font-weight: 400;
-  font-size: 16px;
+  font-size: 14px;
   line-height: 20px;
   text-align: left;
   background: #FFFFFF;
-  border: 1px solid #C4C4C4;
-  box-shadow: 0px 4px 7px rgba(0, 0, 0, 0.07);
+  box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.12);
+  border-radius: 2px 2px 0px 2px;
   display: none;
   position: absolute;
   z-index: 99999;
@@ -8806,6 +8813,9 @@ header #top_line #xtradiv #xtradivSettings {
 header #top_line #xtradiv #xtradivSettings a {
   text-decoration: none;
 }
+header #top_line #xtradiv #xtradivSettings label {
+  font-size: 14px;
+}
 header #top_line #xtradiv #xtradivSettings ul {
   margin: 0;
   padding: 0;
@@ -9211,12 +9221,12 @@ header #topSettingsHolder .right_options_holder#analiza_right_options_holder #di
   padding: 16px;
   color: #333333;
   font-weight: 400;
-  font-size: 16px;
+  font-size: 14px;
   line-height: 20px;
   text-align: left;
   background: #FFFFFF;
-  border: 1px solid #C4C4C4;
-  box-shadow: 0px 4px 7px rgba(0, 0, 0, 0.07);
+  box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.12);
+  border-radius: 2px 2px 0px 2px;
   display: none;
   position: absolute;
   z-index: 78;
@@ -9227,6 +9237,10 @@ header #topSettingsHolder .right_options_holder#analiza_right_options_holder #di
 header #topSettingsHolder .right_options_holder#analiza_right_options_holder #div_analiza_filtri_right2 a {
   text-decoration: none;
 }
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder #div_analiza_filtri_right label,
+header #topSettingsHolder .right_options_holder#analiza_right_options_holder #div_analiza_filtri_right2 label {
+  font-size: 14px;
+}
 header #topSettingsHolder .right_options_holder#analiza_right_options_holder #div_analiza_filtri_right ul,
 header #topSettingsHolder .right_options_holder#analiza_right_options_holder #div_analiza_filtri_right2 ul {
   margin: 0;
@@ -9306,12 +9320,12 @@ div.breadcrumbs {
   padding: 16px;
   color: #333333;
   font-weight: 400;
-  font-size: 16px;
+  font-size: 14px;
   line-height: 20px;
   text-align: left;
   background: #FFFFFF;
-  border: 1px solid #C4C4C4;
-  box-shadow: 0px 4px 7px rgba(0, 0, 0, 0.07);
+  box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.12);
+  border-radius: 2px 2px 0px 2px;
   display: none;
   position: absolute;
   z-index: 99999;
@@ -9322,6 +9336,9 @@ div.breadcrumbs {
 #hover_export a {
   text-decoration: none;
 }
+#hover_export label {
+  font-size: 14px;
+}
 #hover_export ul {
   margin: 0;
   padding: 0;
@@ -9345,7 +9362,7 @@ div.breadcrumbs {
   padding: 6px 0;
   margin: 0 !important;
   text-decoration: none;
-  font-size: 16px;
+  font-size: 14px;
   transition: 0.2s;
 }
 #hover_export a:hover {
@@ -10545,6 +10562,7 @@ span.cke_toolgroup .cke_button {
   box-sizing: border-box;
   padding: 12px 14px;
   margin: 0;
+  height: 40px;
   font-size: 16px;
   background: #FFFFFF;
   border: 1px solid #C4C4C4;
@@ -10552,7 +10570,13 @@ span.cke_toolgroup .cke_button {
   border-radius: 2px 0 0 2px;
 }
 #survey_list .second_line #searchMySurveys form button {
-  min-width: 100px;
+  height: 40px;
+  width: 40px;
+  min-width: auto;
+  padding: 10px 0;
+}
+#survey_list .second_line #searchMySurveys form button .faicon:before {
+  font-size: 16px;
 }
 #survey_list .second_line #searchSettings,
 #survey_list .second_line #searchLibrarySettings {
@@ -10771,12 +10795,12 @@ span.cke_toolgroup .cke_button {
   padding: 16px;
   color: #333333;
   font-weight: 400;
-  font-size: 16px;
+  font-size: 14px;
   line-height: 20px;
   text-align: left;
   background: #FFFFFF;
-  border: 1px solid #C4C4C4;
-  box-shadow: 0px 4px 7px rgba(0, 0, 0, 0.07);
+  box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.12);
+  border-radius: 2px 2px 0px 2px;
   visibility: hidden;
   opacity: 0;
   position: absolute;
@@ -10792,6 +10816,12 @@ span.cke_toolgroup .cke_button {
 #survey_list .second_line .filters #sortButton #sortSettings a {
   text-decoration: none;
 }
+#survey_list .second_line .filters #filterButton #filterSettings label,
+#survey_list .second_line .filters #filterButton #sortSettings label,
+#survey_list .second_line .filters #sortButton #filterSettings label,
+#survey_list .second_line .filters #sortButton #sortSettings label {
+  font-size: 14px;
+}
 #survey_list .second_line .filters #filterButton #filterSettings ul,
 #survey_list .second_line .filters #filterButton #sortSettings ul,
 #survey_list .second_line .filters #sortButton #filterSettings ul,
@@ -10843,6 +10873,7 @@ span.cke_toolgroup .cke_button {
 }
 #survey_list .second_line .filters #filterButton #filterSettings ul li .filter_title,
 #survey_list .second_line .filters #sortButton #filterSettings ul li .filter_title {
+  font-size: 14px;
   font-weight: 600;
 }
 #survey_list .second_line .filters #filterButton #filterSettings ul li .filter_line,
@@ -10998,12 +11029,12 @@ body.eng #survey_list .filters #folderSwitch {
   padding: 16px;
   color: #333333;
   font-weight: 400;
-  font-size: 16px;
+  font-size: 14px;
   line-height: 20px;
   text-align: left;
   background: #FFFFFF;
-  border: 1px solid #C4C4C4;
-  box-shadow: 0px 4px 7px rgba(0, 0, 0, 0.07);
+  box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.12);
+  border-radius: 2px 2px 0px 2px;
   display: flex;
   flex-direction: column;
   position: absolute;
@@ -11015,6 +11046,9 @@ body.eng #survey_list .filters #folderSwitch {
 #survey_list .div_sl_new table#surveyList_new tr td.other_link .survey_other_box_holder .survey_other_box a {
   text-decoration: none;
 }
+#survey_list .div_sl_new table#surveyList_new tr td.other_link .survey_other_box_holder .survey_other_box label {
+  font-size: 14px;
+}
 #survey_list .div_sl_new table#surveyList_new tr td.other_link .survey_other_box_holder .survey_other_box ul {
   margin: 0;
   padding: 0;
@@ -11043,6 +11077,9 @@ body.eng #survey_list .filters #folderSwitch {
   margin-right: 8px;
   color: #1E88E5;
 }
+#survey_list .div_sl_new table#surveyList_new tr td.other_link .survey_other_box_holder .survey_other_box label {
+  font-size: 14px;
+}
 #survey_list .div_sl_new table#surveyList_new tr.sl_header_new td {
   height: 62px;
   padding: 0 16px;
@@ -11111,6 +11148,7 @@ body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders
   width: 100%;
   padding: 0 8px;
   margin-bottom: 8px;
+  font-size: 14px;
   border: 1px solid #E5E5E5;
   border-radius: 2px;
   transition: background-color 0.2s;
@@ -11151,6 +11189,11 @@ body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders
   margin-right: 8px;
   font-size: 14px;
 }
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_title {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_child_count {
   margin-left: 8px;
   font-size: 12px;
@@ -11170,12 +11213,12 @@ body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders
   padding: 16px;
   color: #333333;
   font-weight: 400;
-  font-size: 16px;
+  font-size: 14px;
   line-height: 20px;
   text-align: left;
   background: #FFFFFF;
-  border: 1px solid #C4C4C4;
-  box-shadow: 0px 4px 7px rgba(0, 0, 0, 0.07);
+  box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.12);
+  border-radius: 2px 2px 0px 2px;
   position: absolute;
   z-index: 9999;
   right: 0;
@@ -11185,6 +11228,9 @@ body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders
 body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings a {
   text-decoration: none;
 }
+body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings label {
+  font-size: 14px;
+}
 body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .left_content ul li.folder_item .folder_item_settings ul {
   margin: 0;
   padding: 0;
@@ -11252,11 +11298,33 @@ body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders
   width: auto;
   margin-left: 16px;
 }
-body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .right_content .second_line .filters #searchMySurveys #searchMySurvey,
-body.body_mySurveys_folders #moje_ankete_edit #survey_list .survey_list_folders .right_content .second_line .filters #searchMySurveys button {
-  height: 40px;
+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 footer {
+  /*position: fixed;
+  bottom: 0;*/
   width: calc(100% + 32px);
   margin-left: -16px;
 }
@@ -11754,12 +11822,12 @@ div.page_diagnostics .data_table_top_holder #dataSettingsCheckboxes_Date {
   padding: 16px;
   color: #333333;
   font-weight: 400;
-  font-size: 16px;
+  font-size: 14px;
   line-height: 20px;
   text-align: left;
   background: #FFFFFF;
-  border: 1px solid #C4C4C4;
-  box-shadow: 0px 4px 7px rgba(0, 0, 0, 0.07);
+  box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.12);
+  border-radius: 2px 2px 0px 2px;
   z-index: 998;
   position: absolute;
   top: 41px;
@@ -11769,6 +11837,10 @@ div.page_diagnostics .data_table_top_holder #dataSettingsCheckboxes a,
 div.page_diagnostics .data_table_top_holder #dataSettingsCheckboxes_Date a {
   text-decoration: none;
 }
+div.page_diagnostics .data_table_top_holder #dataSettingsCheckboxes label,
+div.page_diagnostics .data_table_top_holder #dataSettingsCheckboxes_Date label {
+  font-size: 14px;
+}
 div.page_diagnostics .data_table_top_holder #dataSettingsCheckboxes ul,
 div.page_diagnostics .data_table_top_holder #dataSettingsCheckboxes_Date ul {
   margin: 0;
@@ -20350,12 +20422,12 @@ and open the template in the editor.
   padding: 16px;
   color: #333333;
   font-weight: 400;
-  font-size: 16px;
+  font-size: 14px;
   line-height: 20px;
   text-align: left;
   background: #FFFFFF;
-  border: 1px solid #C4C4C4;
-  box-shadow: 0px 4px 7px rgba(0, 0, 0, 0.07);
+  box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.12);
+  border-radius: 2px 2px 0px 2px;
   position: absolute;
   z-index: 9999;
   right: 0;
@@ -20365,6 +20437,9 @@ and open the template in the editor.
 .tab_content .content_left ul li.folder_item .folder_item_settings a {
   text-decoration: none;
 }
+.tab_content .content_left ul li.folder_item .folder_item_settings label {
+  font-size: 14px;
+}
 .tab_content .content_left ul li.folder_item .folder_item_settings ul {
   margin: 0;
   padding: 0;
@@ -20586,12 +20661,12 @@ and open the template in the editor.
   padding: 16px;
   color: #333333;
   font-weight: 400;
-  font-size: 16px;
+  font-size: 14px;
   line-height: 20px;
   text-align: left;
   background: #FFFFFF;
-  border: 1px solid #C4C4C4;
-  box-shadow: 0px 4px 7px rgba(0, 0, 0, 0.07);
+  box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.12);
+  border-radius: 2px 2px 0px 2px;
   position: absolute;
   z-index: 9999;
   right: 0;
@@ -20607,6 +20682,12 @@ and open the template in the editor.
 .tab_content .content_right .question_list .folder_item_holder .folder_item_info .item_settings a {
   text-decoration: none;
 }
+.tab_content .content_right .question_list .question_item_holder .question_item_info .item_settings label,
+.tab_content .content_right .question_list .question_item_holder .folder_item_info .item_settings label,
+.tab_content .content_right .question_list .folder_item_holder .question_item_info .item_settings label,
+.tab_content .content_right .question_list .folder_item_holder .folder_item_info .item_settings label {
+  font-size: 14px;
+}
 .tab_content .content_right .question_list .question_item_holder .question_item_info .item_settings ul,
 .tab_content .content_right .question_list .question_item_holder .folder_item_info .item_settings ul,
 .tab_content .content_right .question_list .folder_item_holder .question_item_info .item_settings ul,
@@ -27135,12 +27216,12 @@ body #main_holder #main .page_invitations .invitation_lists .right_holder .info_
   padding: 16px;
   color: #333333;
   font-weight: 400;
-  font-size: 16px;
+  font-size: 14px;
   line-height: 20px;
   text-align: left;
   background: #FFFFFF;
-  border: 1px solid #C4C4C4;
-  box-shadow: 0px 4px 7px rgba(0, 0, 0, 0.07);
+  box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.12);
+  border-radius: 2px 2px 0px 2px;
   z-index: 99999;
   position: absolute;
   top: 41px;
@@ -27150,6 +27231,9 @@ body #main_holder #main .page_invitations .invitation_lists .right_holder .info_
 .data_table_top_holder #dataSettingsCheckboxes a {
   text-decoration: none;
 }
+.data_table_top_holder #dataSettingsCheckboxes label {
+  font-size: 14px;
+}
 .data_table_top_holder #dataSettingsCheckboxes ul {
   margin: 0;
   padding: 0;
diff --git a/resources/sass/admin_new/basic/icons/standard.scss b/resources/sass/admin_new/basic/icons/standard.scss
index a4f62e43c..20ddfd8cb 100644
--- a/resources/sass/admin_new/basic/icons/standard.scss
+++ b/resources/sass/admin_new/basic/icons/standard.scss
@@ -152,6 +152,10 @@ span.faicon.filter::before{
         content: "\f0b0";
 }
 
+span.faicon.sort::before{
+    content: "\f0dc";
+}
+
 span.faicon.grip::before{
     content: "\f58e";
 }
diff --git a/resources/sass/admin_new/components/header/icons.scss b/resources/sass/admin_new/components/header/icons.scss
index b2677da00..e67851772 100644
--- a/resources/sass/admin_new/components/header/icons.scss
+++ b/resources/sass/admin_new/components/header/icons.scss
@@ -53,7 +53,7 @@
         margin: 0 !important;
 
         text-decoration: none;
-        font-size: 16px;
+        font-size: 14px;
         
         transition: 0.2s;
 
diff --git a/resources/sass/admin_new/components/hover/hover.scss b/resources/sass/admin_new/components/hover/hover.scss
index 7d742222a..1784eed4d 100644
--- a/resources/sass/admin_new/components/hover/hover.scss
+++ b/resources/sass/admin_new/components/hover/hover.scss
@@ -3,18 +3,23 @@
 
     color: $black;
     font-weight: 400;
-    font-size: 16px;
+    font-size: 14px;
     line-height: 20px;
     text-align: left;
 
     background: $white;
-    border: 1px solid $dark-gray;
-    box-shadow: 0px 4px 7px rgba(0, 0, 0, 0.07);
+    //border: 1px solid $dark-gray;
+    box-shadow: 0px 0px 7px rgba(0, 0, 0, 0.12);
+    border-radius: 2px 2px 0px 2px;
 
     a{
         text-decoration: none;
     }
 
+    label{
+        font-size: 14px;
+    }
+
     ul{
         margin: 0;
         padding: 0;
diff --git a/resources/sass/admin_new/pages/my_surveys/survey_list.scss b/resources/sass/admin_new/pages/my_surveys/survey_list.scss
index bbcb13939..fc15098eb 100644
--- a/resources/sass/admin_new/pages/my_surveys/survey_list.scss
+++ b/resources/sass/admin_new/pages/my_surveys/survey_list.scss
@@ -118,6 +118,10 @@
                                 margin-right: 8px;
                                 color: $blue;
                             }
+
+                            label{
+                                font-size: 14px;
+                            }
                         }
                     }
                 }
diff --git a/resources/sass/admin_new/pages/my_surveys/survey_list_folders.scss b/resources/sass/admin_new/pages/my_surveys/survey_list_folders.scss
index 39808127b..c2ab22fe4 100644
--- a/resources/sass/admin_new/pages/my_surveys/survey_list_folders.scss
+++ b/resources/sass/admin_new/pages/my_surveys/survey_list_folders.scss
@@ -57,6 +57,8 @@ body.body_mySurveys_folders{
                         width: 100%;
                         padding: 0 8px;
                         margin-bottom: 8px;
+
+                        font-size: 14px;
             
                         border: 1px solid $gray;
                         border-radius: 2px;
@@ -109,6 +111,12 @@ body.body_mySurveys_folders{
                             font-size: 14px;
                         }
         
+                        .folder_item_title{
+                            white-space: nowrap;
+                            overflow: hidden;
+                            text-overflow: ellipsis;
+                        }
+
                         .folder_item_child_count{
                             margin-left: 8px;
                             font-size: 12px;
@@ -207,16 +215,40 @@ body.body_mySurveys_folders{
                         #searchMySurveys{
                             width: auto;
                             margin-left: 16px;
+                        }
 
-                            #searchMySurvey,
-                            button{
-                                height: 40px;
+                        #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;
+                                }
                             }
                         }
                     }
                 }
                 
                 footer{
+                    /*position: fixed;
+                    bottom: 0;*/
+
                     width: calc(100% + 32px);
                     margin-left: -16px;
                 }
diff --git a/resources/sass/admin_new/pages/my_surveys/top_filters.scss b/resources/sass/admin_new/pages/my_surveys/top_filters.scss
index 692861bf2..f3557bf64 100644
--- a/resources/sass/admin_new/pages/my_surveys/top_filters.scss
+++ b/resources/sass/admin_new/pages/my_surveys/top_filters.scss
@@ -22,6 +22,7 @@
                     box-sizing: border-box;
                     padding: 12px 14px;
                     margin: 0;
+                    height: 40px;
 
                     font-size: 16px;
 
@@ -32,8 +33,15 @@
                 }
 
                 button{
-                    // width: 100px;
-                    min-width: 100px;
+                    height: 40px;
+                    width: 40px;
+                    min-width: auto;
+
+                    padding: 10px 0;
+
+                    .faicon:before{
+                        font-size: 16px;
+                    }
                 }
             }
         }
@@ -295,7 +303,7 @@
 
                     width: 200px;
                     top: 40px;
-                    
+
                     border-radius: 2px;
                 }
 
@@ -316,7 +324,8 @@
                             display: flex;
                             flex-direction: column;
 
-                            .filter_title{        
+                            .filter_title{       
+                                font-size: 14px; 
                                 font-weight: 600;
                             }