From b3faba41ef990733013be93e965a0bfcbefa8679 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Tue, 29 Mar 2022 10:15:34 +0200
Subject: [PATCH] Redesign - knjiznica search, popravki drugega nivoja
 navigacije (aktivni link)

---
 admin/survey/SurveyAdmin.php                  |  38 ++--
 admin/survey/classes/class.Library.php        | 101 ++++------
 admin/survey/classes/class.SurveyList.php     | 186 ++++++++----------
 lang/1.php                                    |   8 +-
 lang/2.php                                    |   8 +-
 public/css/admin_new.css                      |  81 ++++++++
 .../sass/admin_new/pages/library/library.scss | 109 +++++++++-
 .../pages/my_surveys/top_filters.scss         |   1 +
 8 files changed, 341 insertions(+), 191 deletions(-)

diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php
index de0529dd7..08a2b3887 100644
--- a/admin/survey/SurveyAdmin.php
+++ b/admin/survey/SurveyAdmin.php
@@ -1789,7 +1789,7 @@ class SurveyAdmin
                     || isset($modules['social_network'])
                     || isset($modules['slideshow'])) ? '' : ' side-right';
 
-                echo '<li><a class="no-img' . $_right . $_active . '" href="' . $site_url . 'admin/survey/index.php?anketa=' . $this->anketa . '&amp;a=' . A_UPORABNOST . '" title="' . $lang['srv_uporabnost'] . '">' . $lang['srv_uporabnost'] . '</a></li>';
+                echo '<li class="'.$_active.'"><a href="' . $site_url . 'admin/survey/index.php?anketa=' . $this->anketa . '&amp;a=' . A_UPORABNOST . '" title="' . $lang['srv_uporabnost'] . '">' . $lang['srv_uporabnost'] . '</a></li>';
             }
             # vnos
             if ($row['user_from_cms'] == 2 && $row['cookie'] == -1) {
@@ -1798,7 +1798,7 @@ class SurveyAdmin
                     || isset($modules['social_network'])
                     || isset($modules['slideshow'])) ? '' : ' side-right';
 
-                echo '<li><a class="no-img' . $_right . $_active . '" href="' . $site_url . 'admin/survey/index.php?anketa=' . $this->anketa . '&amp;a=' . A_VNOS . '" title="' . $lang['srv_vnos'] . '">' . $lang['srv_vnos'] . '</a></li>';
+                echo '<li class="'.$_active.'"><a href="' . $site_url . 'admin/survey/index.php?anketa=' . $this->anketa . '&amp;a=' . A_VNOS . '" title="' . $lang['srv_vnos'] . '">' . $lang['srv_vnos'] . '</a></li>';
             }
             #kviz
             if (isset($modules['quiz'])) {
@@ -1806,7 +1806,7 @@ class SurveyAdmin
                 $_right = (isset($modules['social_network'])
                     || isset($modules['slideshow'])) ? '' : ' side-right';
 
-                echo '<li><a class="no-img' . $_right . $_active . '" href="' . $site_url . 'admin/survey/index.php?anketa=' . $this->anketa . '&amp;a=' . A_KVIZ . '" title="' . $lang['srv_kviz'] . '">' . $lang['srv_kviz'] . '</a></li>';
+                echo '<li class="'.$_active.'"><a href="' . $site_url . 'admin/survey/index.php?anketa=' . $this->anketa . '&amp;a=' . A_KVIZ . '" title="' . $lang['srv_kviz'] . '">' . $lang['srv_kviz'] . '</a></li>';
             }
             #volitve
             if (isset($modules['voting'])) {
@@ -1814,7 +1814,7 @@ class SurveyAdmin
                 $_right = (isset($modules['social_network'])
                     || isset($modules['slideshow'])) ? '' : ' side-right';
 
-                echo '<li><a class="no-img' . $_right . $_active . '" href="' . $site_url . 'admin/survey/index.php?anketa=' . $this->anketa . '&amp;a=' . A_VOTING . '" title="' . $lang['srv_voting'] . '">' . $lang['srv_voting'] . '</a></li>';
+                echo '<li class="'.$_active.'"><a href="' . $site_url . 'admin/survey/index.php?anketa=' . $this->anketa . '&amp;a=' . A_VOTING . '" title="' . $lang['srv_voting'] . '">' . $lang['srv_voting'] . '</a></li>';
             }
 			#napredni parapodatki
             if (isset($modules['advanced_paradata'])) {
@@ -1822,20 +1822,20 @@ class SurveyAdmin
                 $_right = (isset($modules['advanced_paradata'])
                     || isset($modules['advanced_paradata'])) ? '' : ' side-right';
 
-                echo '<li><a class="no-img' . $_right . $_active . '" href="' . $site_url . 'admin/survey/index.php?anketa=' . $this->anketa . '&amp;a=' . A_ADVANCED_PARADATA . '" title="' . $lang['srv_advanced_paradata'] . '">' . $lang['srv_advanced_paradata'] . '</a></li>';
+                echo '<li class="'.$_active.'"><a href="' . $site_url . 'admin/survey/index.php?anketa=' . $this->anketa . '&amp;a=' . A_ADVANCED_PARADATA . '" title="' . $lang['srv_advanced_paradata'] . '">' . $lang['srv_advanced_paradata'] . '</a></li>';
             }
             # SN
             if (isset($modules['social_network'])) {
                 $_active = ($_GET['a'] == A_SOCIAL_NETWORK) ? ' active' : '';
                 $_right = (isset($modules['slideshow'])) ? '' : ' side-right';
 
-                echo '<li><a class="no-img' . $_right . $_active . '" href="' . $site_url . 'admin/survey/index.php?anketa=' . $this->anketa . '&amp;a=' . A_SOCIAL_NETWORK . '" title="' . $lang['srv_vrsta_survey_type_8'] . '">' . $lang['srv_vrsta_survey_type_8'] . '</a></li>';
+                echo '<li class="'.$_active.'"><a href="' . $site_url . 'admin/survey/index.php?anketa=' . $this->anketa . '&amp;a=' . A_SOCIAL_NETWORK . '" title="' . $lang['srv_vrsta_survey_type_8'] . '">' . $lang['srv_vrsta_survey_type_8'] . '</a></li>';
             }
             #slideshow
             if (isset($modules['slideshow'])) {
                 $_active = ($_GET['a'] == A_SLIDESHOW) ? ' active' : '';
 
-                echo '<li><a class="no-img side-right' . $_active . '" href="' . $site_url . 'admin/survey/index.php?anketa=' . $this->anketa . '&amp;a=' . A_SLIDESHOW . '" title="' . $lang['srv_vrsta_survey_type_9'] . '">' . $lang['srv_vrsta_survey_type_9'] . '</a></li>';
+                echo '<li class="'.$_active.'"><a href="' . $site_url . 'admin/survey/index.php?anketa=' . $this->anketa . '&amp;a=' . A_SLIDESHOW . '" title="' . $lang['srv_vrsta_survey_type_9'] . '">' . $lang['srv_vrsta_survey_type_9'] . '</a></li>';
             }
 
             echo '</ul>';
@@ -1855,33 +1855,29 @@ class SurveyAdmin
             echo '<ul class="secondNavigation">';
 
             # dashboard
-            echo '<li>';
-            echo '<a class="no-img single' . ($_GET['a'] == A_REPORTI ? ' active' : '') . '"'
-                . ' href="index.php?anketa=' . $this->anketa . '&a=' . A_REPORTI . '" title="' . $lang['srv_status_osnovni'] . '">';
+            echo '<li class="'.($_GET['a'] == A_REPORTI ? ' active' : '').'">';
+            echo '<a href="index.php?anketa=' . $this->anketa . '&a=' . A_REPORTI . '" title="' . $lang['srv_status_osnovni'] . '">';
             echo $lang['srv_status_summary'] . '</a>';
             echo '</li>';
 
             # parapodatki (browser, os, js...) - volitve imajo to ugasnjeno
             if(!SurveyInfo::getInstance()->checkSurveyModule('voting')) {
-                echo '<li>';
-                echo '<a class="no-img' . ($_GET['a'] == A_PARA_GRAPH ? ' active' : '') . '"'
-                    . ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_PARA_GRAPH . '" title="' . $lang['srv_metapodatki'] . '">';
+                echo '<li class="' . ($_GET['a'] == A_PARA_GRAPH ? ' active' : '') . '">';
+                echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_PARA_GRAPH . '" title="' . $lang['srv_metapodatki'] . '">';
                 echo $lang['srv_metapodatki'] . '</a>';
                 echo '</li>';
             }
 
             # neodgovori in uporabnost enot
             # non-responses
-            echo '<li>';
-            echo '<a class="no-img' . ($_GET['a'] == A_NONRESPONSE_GRAPH ? ' active' : '') . '"'
-                . ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_NONRESPONSE_GRAPH . '" title="' . $lang['srv_para_neodgovori'] . '">';
+            echo '<li class="' . ($_GET['a'] == A_NONRESPONSE_GRAPH ? ' active' : '') . '">';
+            echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_NONRESPONSE_GRAPH . '" title="' . $lang['srv_para_neodgovori'] . '">';
             echo $lang['srv_para_neodgovori'] . '</a>';
             echo '</li>';
 
             # Gumb za novo stran napredni statusi
-            echo '<li>';
-            echo '<a class="no-img' . ($_GET['a'] == A_STATUS_ADVANCED ? ' active' : '') . '"'
-                . ' href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_STATUS_ADVANCED . '" title="' . $lang['srv_status_advanced'] . '">';
+            echo '<li class="' . ($_GET['a'] == A_STATUS_ADVANCED ? ' active' : '') . '">';
+            echo '<a href="index.php?anketa=' . $this->anketa . '&amp;a=' . A_STATUS_ADVANCED . '" title="' . $lang['srv_status_advanced'] . '">';
             echo $lang['srv_status_advanced'] . ' >></a>';
             echo '</li>';
 
@@ -1892,14 +1888,14 @@ class SurveyAdmin
         #quicksettings
         if ($_GET['a'] == 'quicksettings') {
             echo '<ul class="secondNavigation">';
-            echo '<li><a class="no-img single active" href="' . $site_url . 'admin/survey/index.php?anketa=' . $this->anketa . '&a=' . A_QUICK_SETTINGS . '" title="' . $lang['srv_settings_quick'] . '">' . $lang['srv_settings_quick'] . '</a></li>';
+            echo '<li class="active"><a href="' . $site_url . 'admin/survey/index.php?anketa=' . $this->anketa . '&a=' . A_QUICK_SETTINGS . '" title="' . $lang['srv_settings_quick'] . '">' . $lang['srv_settings_quick'] . '</a></li>';
             echo '</ul>';
         }
 
 
         if ($_GET['a'] == 'data' && $_GET['m'] == 'monitoring') {
             echo '<ul class="secondNavigation">';
-            echo '<li><a class="no-img single active" href="' . $site_url . 'admin/survey/index.php?anketa=' . $this->anketa . '&amp;a=data&m=monitoring" title="' . $lang['srv_monitoring'] . '">' . $lang['srv_monitoring'] . '</a></li>';
+            echo '<li class="active"><a href="' . $site_url . 'admin/survey/index.php?anketa=' . $this->anketa . '&amp;a=data&m=monitoring" title="' . $lang['srv_monitoring'] . '">' . $lang['srv_monitoring'] . '</a></li>';
             echo '</ul>';
         }
 
diff --git a/admin/survey/classes/class.Library.php b/admin/survey/classes/class.Library.php
index 50faa7560..0a2ceff75 100644
--- a/admin/survey/classes/class.Library.php
+++ b/admin/survey/classes/class.Library.php
@@ -65,19 +65,19 @@ class Library {
 		global $global_user_id;
 		global $lang;
 
+        echo '<div class="advanced_search">';
+        echo '  <div id="searchLibrarySettings">';
+        $this->displaySearchSettings();
+        echo '  </div>';
+        echo '</div>';
+        
         // Na prvi strani imamo search	
         if($this->isSearch == 1){
-            echo '<div id="searchLibrarySettings">';
-            $this->displaySearchSettings();
-            echo '</div>';
-            
+            echo '<div class="library_title">'.($this->tab == '3' ? $lang['srv_library_title_search_my'] : $lang['srv_library_title_search_public']).'</div>';
             $this->display_contentfolders_searchList();
         }				
         else{
-            echo '<div id="searchLibrarySurveys">';
-            $this->displaySearch();
-            echo '</div>';
-                            
+            echo '<div class="library_title">'.($this->tab == '3' ? $lang['srv_library_title_my'] : $lang['srv_library_title_public']).'</div>';
             $this->display_contentfolders();
         }
     }
@@ -367,14 +367,14 @@ class Library {
 				
                 // Preview
                 if(SurveyInfo::getInstance()->checkSurveyModule('uporabnost')){
-				    echo '<a href="'.$site_url.'main/survey/uporabnost.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'">';
+				    echo '<a href="'.$site_url.'main/survey/uporabnost.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" class="noline" target="_blank" title="'.$lang['srv_poglejanketo'].'">';
                     echo '  <button class="medium-rounded white-gray">';
                     echo '      <span class="faicon monitor"></span>'.$lang['srv_poglejanketo2'];
                     echo '  </button>';
                     echo '</a>';
                 }
                 else{
-				    echo '<a href="'.$site_url.'main/survey/index.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" target="_blank" title="'.$lang['srv_poglejanketo'].'">';
+				    echo '<a href="'.$site_url.'main/survey/index.php?anketa='.SurveyInfo::getInstance()->getSurveyHash().'&preview=on" class="noline" target="_blank" title="'.$lang['srv_poglejanketo'].'">';
                     echo '  <button class="medium-rounded white-gray">';
 				    echo '      <span class="faicon monitor"></span>'.$lang['srv_poglejanketo2'];
                     echo '  </button>';
@@ -388,7 +388,7 @@ class Library {
 				
 				// Urejanje - admin
 				if ($admin_type == 0){
-					echo ' <a href="index.php?anketa='.$row1['id'].'" title="'.$lang['srv_editirajanketo'].'">';
+					echo ' <a href="index.php?anketa='.$row1['id'].'" class="noline" title="'.$lang['srv_editirajanketo'].'">';
                     echo '  <button class="medium-rounded white-gray">';
 					echo '      <span class="faicon edit"></span>'.$lang['edit3'];
                     echo '  </button>';
@@ -441,68 +441,51 @@ class Library {
 		global $lang;
 		global $site_url;
 
-		echo '<span class="title">'.$lang['s_search_settings_lib'].'</span>';
-
 		echo '<form method="GET" id="1kasf2" action="'.$site_url.'admin/survey/index.php?a=knjiznica">';
 
-		// Hidden polja za knjiznico
+        // Hidden polja za knjiznico
 		echo '<input type="hidden" name="a" value="knjiznica">';
 		if($this->tab == '3')
 			echo '<input type="hidden" name="t" value="moje_ankete">';
 
+        // Zgornja vrstica z geslom in gumbom za iskanje
+        echo '<div class="search_settings_top">';
+
 		// Iskano geslo
-		echo '<p>';
-        echo '	<span class="bold">'.$lang['s_search2'].':</span> <input type="text" name="search" id="searchMySurveyText" value="'.htmlentities($this->searchString).'" placeholder="' . $lang['s_search'] . '" />';
-		echo '</p>';
+		echo '<div class="search_text">';
+        echo '	<input type="text" name="search" id="searchMySurveyText" value="'.htmlentities($this->searchString).'" placeholder="'.($this->tab == '3' ? $lang['s_search_Library_my'] : $lang['s_search_Library_public']).'" />';
+		echo '</div>';
 		
 		// Iskanje po naslovu ali avtorju ali besedilu
-		echo '<p>';
-		echo '	<span>'.$lang['s_thru'].': </span>';
-		echo '	<label for="stype_0"><input type="radio" name="stype" id="stype_0" value="0" '.($this->searchSettings['stype'] == '0' ? ' checked="checked"' : '').' />'.$lang['s_title'].'</label>';
-		echo '	<label for="stype_1"><input type="radio" name="stype" id="stype_1" value="1" '.($this->searchSettings['stype'] == '1' ? ' checked="checked"' : '').' />'.$lang['s_text'].'</label>';
-		echo '</p>';
-				
-		// Gumba isci in zapri
-		echo '<span style="margin-top: 10px;" class="floatRight spaceRight">';
-		echo '	<div class="buttonwrapper floatLeft spaceRight">';
-		echo '		<a class="ovalbutton ovalbutton_gray" href="'.$site_url.'admin/survey/index.php?a=knjiznica'.($this->tab == '3' ? '&t=moje_ankete' : '').'"><span>'.$lang['srv_zapri'].'</span></a>';
-		echo '	</div>';
-		echo '	<div class="buttonwrapper floatRight">';
-		echo '		<a class="ovalbutton ovalbutton_orange" href="#" onclick="$(\'#1kasf2\').submit(); return false;"><span>'.$lang['s_search'].'</span></a>';
-		echo '	</div>';
-		echo '</span>';
+		echo '<div class="search_type">';
+		echo '	<select name="stype" id="stype">';
+		echo '	    <option value="0" '.($this->searchSettings['stype'] == '0' ? ' selected="selected"' : '').'>'.$lang['s_title'].'</option>';
+		echo '	    <option value="1" '.($this->searchSettings['stype'] == '1' ? ' selected="selected"' : '').'>'.$lang['s_text'].'</option>';
+		echo '  </select>';
+		echo '</div>';
+        
+        // Gumb isci
+		echo '<div class="search_button">';
+		echo '	<a href="#" onclick="$(\'#1kasf2\').submit(); return false;"><button class="medium blue">'.$lang['s_search'].'</button></a>';
+		echo '</div>';
+
+		echo '</div>';
 		
-		// Link na isci po mojih anketah
-		echo '<span class="link"><a href="'.$site_url.'admin/survey/index.php?search='.$this->searchString.'">'.$lang['s_search_mySurvey'].'</a></span>';
-		
-		echo '<input style="display: none;" value="Išči" type="submit">';
+        // Gumba za napredne nastavitve
+        echo '<div class="search_settings_advanced_buttons">';		
+        
+        // Gumb nazaj na moje ankete
+        echo '  <a href="'.$site_url.'admin/survey/index.php?a=pregledovanje&search='.htmlentities($this->searchString).'"><button type="button" class="white-black small">';
+        echo '      <span class="faicon clipboard_notes"></span>'.$lang['s_search_mySurvey'];
+        echo '  </button></a>';
+
+        echo '</div>';
+          
+        echo '<input style="display: none;" value="Išči" type="submit">';
 		
         echo '</form>';		
 	}
-	
-	// Prikazemo search okno za iskanje po anketah znotraj knjiznice
-	private function displaySearch(){
-		global $lang;
-		global $site_url;
 		
-		echo '<form method="GET" id="1kasmysurvey" action="'.$site_url.'admin/survey/index.php">';      
-	    
-		// Hidden polja za knjiznico
-		echo '<input type="hidden" name="a" value="knjiznica">';
-		if($this->tab == '3')
-			echo '<input type="hidden" name="t" value="moje_ankete">';
-		
-		//echo '<span class="sprites search"></span> ';
-        echo '<input id="searchMySurvey" class="floatLeft" type="text" value="" placeholder="' . $lang['s_search_Library'] . '" name="search" />';
-		
-		//echo '<input type="submit" value="' . $lang['s_search'] . '" />'; 
-		echo '	<div class="buttonwrapper floatLeft">';
-		echo '		<a class="ovalbutton ovalbutton_orange" href="#" onclick="$(\'#1kasmysurvey\').submit(); return false;"><span>'.$lang['s_search2'].'</span></a>';
-		echo '	</div>';
-          		
-		echo '</form>';
-	}
-	
 	// vrne sql string za search po anketah glede na nastavitve searcha
 	private function getSearchString(){
 		
diff --git a/admin/survey/classes/class.SurveyList.php b/admin/survey/classes/class.SurveyList.php
index 2c886670a..84ab851e4 100644
--- a/admin/survey/classes/class.SurveyList.php
+++ b/admin/survey/classes/class.SurveyList.php
@@ -248,44 +248,38 @@ class SurveyList {
 					echo '<ul class="secondNavigation">';
 
                     #zavihek osnovni pregled uporabnikov
-					echo '<li>';
-					echo '<a class="no-img single '.((!isset($_GET['m']) || $_GET['m'] == 'my') ? 'active' : '').'"'
-						 .' href="index.php?a=diagnostics&t=uporabniki" title="'.$lang['n_users_list_all'].'">';
+					echo '<li class="'.((!isset($_GET['m']) || $_GET['m'] == 'my') ? 'active' : '').'">';
+					echo '<a href="index.php?a=diagnostics&t=uporabniki" title="'.$lang['n_users_list_all'].'">';
 					echo $lang['n_users_list'].'</a>';
                     echo '</li>';
                     
 					#zavihek seznam vseh uporabnikov
-					echo '<li>';
-					echo '<a class="no-img single '.($_GET['m'] == 'all' ? 'active' : '').'"'
-						 .' href="index.php?a=diagnostics&t=uporabniki&m=all" title="'.$lang['n_users_list_all'].'">';
+					echo '<li class="'.($_GET['m'] == 'all' ? 'active' : '').'">';
+					echo '<a href="index.php?a=diagnostics&t=uporabniki&m=all" title="'.$lang['n_users_list_all'].'">';
 					echo $lang['n_users_list_all'].'</a>';
 					echo '</li>';
 					
 					#zavihek izbrisani uporabniki
-					echo '<li>';
-						echo '<a class="no-img single '.(!empty($_GET['m']) && $_GET['m'] == 'izbrisani' ? 'active' : '').'"'
-							.' href="index.php?a=diagnostics&t=uporabniki&m=izbrisani" title="'.$lang['n_deleted_users'].'">';
+					echo '<li class="'.(!empty($_GET['m']) && $_GET['m'] == 'izbrisani' ? 'active' : '').'">';
+						echo '<a href="index.php?a=diagnostics&t=uporabniki&m=izbrisani" title="'.$lang['n_deleted_users'].'">';
 						echo $lang['n_deleted_users'].'</a>';
 					echo '</li>';
 					
 					#zavihek odjavljeni uporabniki
-					echo '<li>';
-						echo '<a class="no-img single '.(!empty($_GET['m']) && $_GET['m'] == 'nepotrjeni' ? 'active' : '').'"'
-							.' href="index.php?a=diagnostics&t=uporabniki&m=nepotrjeni" title="'.$lang['n_unconfirmed_users'].'">';
+					echo '<li class="'.(!empty($_GET['m']) && $_GET['m'] == 'nepotrjeni' ? 'active' : '').'">';
+						echo '<a href="index.php?a=diagnostics&t=uporabniki&m=nepotrjeni" title="'.$lang['n_unconfirmed_users'].'">';
 						echo $lang['n_unconfirmed_users'].'</a>';
 					echo '</li>';
 					
 					#zavihek nepotrjenih uporabnikov
-					echo '<li>';
-						echo '<a class="no-img single '.(!empty($_GET['m']) && $_GET['m'] == 'odjavljeni' ? 'active' : '').'"'
-							.' href="index.php?a=diagnostics&t=uporabniki&m=odjavljeni" title="'.$lang['n_unsigned_users'].'">';
+					echo '<li class="'.(!empty($_GET['m']) && $_GET['m'] == 'odjavljeni' ? 'active' : '').'">';
+						echo '<a href="index.php?a=diagnostics&t=uporabniki&m=odjavljeni" title="'.$lang['n_unsigned_users'].'">';
 						echo $lang['n_unsigned_users'].'</a>';
 					echo '</li>';
 					
 					#zavihek sa modul
-					echo '<li>';
-					echo '<a class="no-img single '.(!empty($_GET['m']) && $_GET['m'] == 'sa-modul' ? 'active' : '').'"'
-						.' href="index.php?a=diagnostics&t=uporabniki&m=sa-modul" title="'.$lang['srv_hierarchy_users_access'].'">';
+					echo '<li class="'.(!empty($_GET['m']) && $_GET['m'] == 'sa-modul' ? 'active' : '').'">';
+					echo '<a href="index.php?a=diagnostics&t=uporabniki&m=sa-modul" title="'.$lang['srv_hierarchy_users_access'].'">';
 					echo $lang['srv_hierarchy_users_access'].'</a>';
 					echo '</li>';
 
@@ -298,8 +292,8 @@ class SurveyList {
 					echo '<ul class="secondNavigation">';
 
                     #zavihek osnovni pregled uporabnikov
-					echo '<li>';
-					echo '<a class="no-img single active" href="index.php?a=diagnostics&t=uporabniki" title="'.$lang['n_users_list_all'].'">';
+					echo '<li class="active">';
+					echo '<a href="index.php?a=diagnostics&t=uporabniki" title="'.$lang['n_users_list_all'].'">';
 					echo $lang['n_users_list'].'</a>';
                     echo '</li>';
                     
@@ -310,40 +304,35 @@ class SurveyList {
 
 				if ($admin_type == 0) {
 					echo '<ul class="secondNavigation">';
+
 					#zavihek ankete
-					echo '<li>';
-					echo '<a class="no-img side-left'.(($_GET['t']=='ankete'||$_GET['a']=='diagnostics')&& !isset($_GET['t']) ? ' active' : '').'"'
-						 .' href="index.php?a=diagnostics" title="'.$lang['srv_ankete'].'">';
+					echo '<li class="'.(($_GET['t']=='ankete'||$_GET['a']=='diagnostics')&& !isset($_GET['t']) ? ' active' : '').'">';
+					echo '<a href="index.php?a=diagnostics" title="'.$lang['srv_ankete'].'">';
 					echo $lang['srv_ankete'].'</a>';
 					echo '</li>';
 					
-					echo '<li>';
-					echo '<a class="no-img'.(($_GET['t']=='time_span_daily') ? ' active' : '').'"'
-						 .' href="index.php?a=diagnostics&t=time_span_daily" title="'.$lang['srv_weekly_diagnostics'].'">';
+					echo '<li class="'.(($_GET['t']=='time_span_daily') ? ' active' : '').'">';
+					echo '<a href="index.php?a=diagnostics&t=time_span_daily" title="'.$lang['srv_weekly_diagnostics'].'">';
 					echo $lang['srv_weekly_diagnostics'].'</a>';
 					echo '</li>';
 					
-					echo '<li>';
-					echo '<a class="no-img'.(($_GET['t']=='time_span_monthly') ? ' active' : '').'"'
-						 .' href="index.php?a=diagnostics&t=time_span_monthly" title="'.$lang['srv_monthly_diagnostics'].'">';
+					echo '<li class="'.(($_GET['t']=='time_span_monthly') ? ' active' : '').'">';
+					echo '<a href="index.php?a=diagnostics&t=time_span_monthly" title="'.$lang['srv_monthly_diagnostics'].'">';
 					echo $lang['srv_monthly_diagnostics'].'</a>';
 					echo '</li>';
 					
-					echo '<li>';
-					echo '<a class="no-img'.(($_GET['t']=='time_span_yearly') ? ' active' : '').'"'
-						 .' href="index.php?a=diagnostics&t=time_span_yearly" title="'.$lang['srv_yearly_diagnostics'].'">';
+					echo '<li class="'.(($_GET['t']=='time_span_yearly') ? ' active' : '').'">';
+					echo '<a href="index.php?a=diagnostics&t=time_span_yearly" title="'.$lang['srv_yearly_diagnostics'].'">';
 					echo $lang['srv_yearly_diagnostics'].'</a>';
 					echo '</li>';
 					
-					echo '<li>';
-					echo '<a class="no-img side-right'.(($_GET['t']=='time_span') ? ' active' : '').'"'
-						 .' href="index.php?a=diagnostics&t=time_span&uvoz=0&ustrezni=1&delnoustrezni=1&neustrezni=0" title="'.$lang['srv_all_diagnostics'].'">';
+					echo '<li class="'.(($_GET['t']=='time_span') ? ' active' : '').'">';
+					echo '<a href="index.php?a=diagnostics&t=time_span&uvoz=0&ustrezni=1&delnoustrezni=1&neustrezni=0" title="'.$lang['srv_all_diagnostics'].'">';
 					echo $lang['srv_all_diagnostics'].'</a>';
 					echo '</li>';
 					
-					echo '<li>';
-					echo '<a class="no-img side-right'.(($_GET['t']=='paradata') ? ' active' : '').'"'
-						 .' href="index.php?a=diagnostics&t=paradata" title="'.$lang['srv_metapodatki'].'">';
+					echo '<li class="'.(($_GET['t']=='paradata') ? ' active' : '').'">';
+					echo '<a href="index.php?a=diagnostics&t=paradata" title="'.$lang['srv_metapodatki'].'">';
 					echo $lang['srv_metapodatki'].'</a>';
 					echo '</li>';
 	
@@ -358,16 +347,14 @@ class SurveyList {
 			echo '<ul class="secondNavigation">';
 			
 			#zavihek javna knjižnica
-			echo '<li>';
-			echo '<a class="no-img side-left'.(($_GET['t']=='javne_ankete'||$_GET['a']=='knjiznica')&& !isset($_GET['t']) ? ' active' : '').'"'
-				 .' href="index.php?a=knjiznica" title="'.$lang['srv_javna_knjiznica'].'">';
+			echo '<li class="'.(($_GET['t']=='javne_ankete'||$_GET['a']=='knjiznica')&& !isset($_GET['t']) ? ' active' : '').'">';
+			echo '<a href="index.php?a=knjiznica" title="'.$lang['srv_javna_knjiznica'].'">';
 			echo $lang['srv_javna_knjiznica'].'</a>';
 			echo '</li>';
 			
 			# Zavihek moja knjižnica	
-			echo '<li>';
-			echo '<a class="no-img side-right'.($_GET['t'] == 'moje_ankete' ? ' active' : '').'"'
-				 .' href="index.php?a=knjiznica&t=moje_ankete" title="'.$lang['srv_moja_knjiznica'].'">';
+			echo '<li class="'.($_GET['t'] == 'moje_ankete' ? ' active' : '').'">';
+			echo '<a href="index.php?a=knjiznica&t=moje_ankete" title="'.$lang['srv_moja_knjiznica'].'">';
 			echo $lang['srv_moja_knjiznica'].'</a>';
 			echo '</li>';
 			
@@ -381,65 +368,58 @@ class SurveyList {
 			echo '<ul class="secondNavigation">';
 			
 			if ($admin_type == '0') {
+
 				#zavihek sistemske
-				echo '<li>';
-				echo '<a class="no-img side-left'.($tab=='system' || $tab == '' ? ' active' : '').'"'
-					 .' href="index.php?a=nastavitve&amp;m=system" title="'.$lang['srv_settingsSystem'].'">';
+				echo '<li class="'.($tab=='system' || $tab == '' ? ' active' : '').'">';
+				echo '<a href="index.php?a=nastavitve&amp;m=system" title="'.$lang['srv_settingsSystem'].'">';
 				echo $lang['srv_settingsSystem'].'</a>';
 				echo '</li>';
 
 				# Zavihek ocenjevanje trajanja	
-				echo '<li>';
-				echo '<a class="no-img'.($tab=='predvidenicasi' ? ' active' : '').'"'
-					 .' href="index.php?a=nastavitve&amp;m=predvidenicasi" title="'.$lang['srv_testiranje_predvidenicas'].'">';
+				echo '<li class="'.($tab=='predvidenicasi' ? ' active' : '').'">';
+				echo '<a href="index.php?a=nastavitve&amp;m=predvidenicasi" title="'.$lang['srv_testiranje_predvidenicas'].'">';
 				echo $lang['srv_testiranje_predvidenicas'].'</a>';
 				echo '</li>';
 
 				# Zavihek mape	
-				echo '<li>';
-				echo '<a class="no-img'.($tab=='collectData' ? ' active' : '').'"'
-					 .' href="index.php?a=nastavitve&amp;m=collectData" title="'.$lang['srv_collectData'].'">';
+				echo '<li class="'.($tab=='collectData' ? ' active' : '').'">';
+				echo '<a href="index.php?a=nastavitve&amp;m=collectData" title="'.$lang['srv_collectData'].'">';
 				echo $lang['srv_collectData'].'</a>';
 				echo '</li>';
 
 				# Zavihek lep url
-				echo '<li>';
-				echo '<a class="no-img'.($tab=='nice_links' ? ' active' : '').'"'
-					 .' href="index.php?a=nastavitve&amp;m=nice_links" title="'.$lang['srv_nice_url'].'">';
+				echo '<li class="'.($tab=='nice_links' ? ' active' : '').'">';
+				echo '<a href="index.php?a=nastavitve&amp;m=nice_links" title="'.$lang['srv_nice_url'].'">';
 				echo $lang['srv_nice_url'].'</a>';
 				echo '</li>';
 
 				# ankete z administrativnim dostopom
-				echo '<li>';
-				echo '<a class="no-img'.($tab=='anketa_admin' ? ' active' : '').'"'
-					 .' href="index.php?a=nastavitve&amp;m=anketa_admin" title="'.$lang['srv_anketa_admin'].'">';
+				echo '<li class="'.($tab=='anketa_admin' ? ' active' : '').'">';
+				echo '<a href="index.php?a=nastavitve&amp;m=anketa_admin" title="'.$lang['srv_anketa_admin'].'">';
 				echo $lang['srv_anketa_admin'].'</a>';
 				echo '</li>';
 
 				# zbrisane ankete
-				echo '<li>';
-				echo '<a class="no-img'.($tab=='anketa_deleted' ? ' active' : '').'"'
-					 .' href="index.php?a=nastavitve&amp;m=anketa_deleted" title="'.$lang['srv_anketa_deleted'].'">';
+				echo '<li class="'.($tab=='anketa_deleted' ? ' active' : '').'">';
+				echo '<a href="index.php?a=nastavitve&amp;m=anketa_deleted" title="'.$lang['srv_anketa_deleted'].'">';
 				echo $lang['srv_anketa_deleted'].'</a>';
 				echo '</li>';
 
 				# Zbrisani podatki
-				echo '<li>';
-				echo '<a class="no-img'.($tab=='data_deleted' ? ' active' : '').'"'
-					 .' href="index.php?a=nastavitve&amp;m=data_deleted" title="'.$lang['srv_data_deleted'].'">';
+				echo '<li class="'.($tab=='data_deleted' ? ' active' : '').'">';
+				echo '<a href="index.php?a=nastavitve&amp;m=data_deleted" title="'.$lang['srv_data_deleted'].'">';
 				echo $lang['srv_data_deleted'].'</a>';
 				echo '</li>';
 			}
 						
-			echo '<li>';
-			echo '<a class="no-img side-right'.($tab=='global_user_settings' ? ' active' : '').'"'
-				 .' href="index.php?a=nastavitve&amp;m=global_user_settings" title="'.$lang['srv_user_settings'].'">';
+			echo '<li class="'.($tab=='global_user_settings' ? ' active' : '').'">';
+			echo '<a href="index.php?a=nastavitve&amp;m=global_user_settings" title="'.$lang['srv_user_settings'].'">';
 			echo $lang['srv_user_settings'].'</a>';
 			echo '</li>';
 						
 			// Moj profil
-            echo '<li>';
-            echo '<a class="no-img side-right' . ($tab == 'global_user_myProfile' ? ' active' : '') . '"' . ' href="index.php?a=nastavitve&amp;m=global_user_myProfile" title="' . $lang['edit_data'] . '">';
+            echo '<li class="'.($tab == 'global_user_myProfile' ? ' active' : '').'">';
+            echo '<a href="index.php?a=nastavitve&amp;m=global_user_myProfile" title="' . $lang['edit_data'] . '">';
             echo $lang['edit_data'] . '</a>';
             echo '</li>';
 			
@@ -451,17 +431,16 @@ class SurveyList {
 			echo '<ul class="secondNavigation">';
 			
 			# prejeta obvestila
-			echo '<li>';
-			echo '<a class="no-img side-right'.(!isset($_GET['t']) ? ' active' : '').'"'
-				 .' href="index.php?a=obvestila" title="'.$lang['srv_notifications_recieved'].'">';
+			echo '<li class="'.(!isset($_GET['t']) ? ' active' : '').'">';
+			echo '<a href="index.php?a=obvestila" title="'.$lang['srv_notifications_recieved'].'">';
 			echo $lang['srv_notifications_recieved'].'</a>';
 			echo '</li>';
 			
-			if ($admin_type == '0') {				
+			if ($admin_type == '0') {
+
 				# poslana obvestila
-				echo '<li>';
-				echo '<a class="no-img side-left'.($_GET['t']=='sent' ? ' active' : '').'"'
-					 .' href="index.php?a=obvestila&amp;t=sent" title="'.$lang['srv_notifications_sent'].'">';
+				echo '<li class="'.($_GET['t']=='sent' ? ' active' : '').'">';
+				echo '<a href="index.php?a=obvestila&amp;t=sent" title="'.$lang['srv_notifications_sent'].'">';
 				echo $lang['srv_notifications_sent'].'</a>';
 				echo '</li>';
 			}
@@ -474,17 +453,15 @@ class SurveyList {
 			echo '<ul class="secondNavigation">';
 			
 			# moja narocila
-			echo '<li>';
-			echo '<a class="no-img side-right'.(!isset($_GET['m']) ? ' active' : '').'"'
-				 .' href="index.php?a=narocila" title="'.$lang['srv_narocila_my'].'">';
+			echo '<li class="'.(!isset($_GET['m']) ? ' active' : '').'">';
+			echo '<a href="index.php?a=narocila" title="'.$lang['srv_narocila_my'].'">';
 			echo $lang['srv_narocila_my'].'</a>';
             echo '</li>';
             
             # placila - samo admini
             if ($admin_type == '0') {
-                echo '<li>';
-                echo '<a class="no-img side-right'.((isset($_GET['m']) && $_GET['m'] == 'placila') ? ' active' : '').'"'
-                    .' href="index.php?a=narocila&m=placila" title="'.$lang['srv_placila'].'">';
+                echo '<li class="'.((isset($_GET['m']) && $_GET['m'] == 'placila') ? ' active' : '').'">';
+                echo '<a href="index.php?a=narocila&m=placila" title="'.$lang['srv_placila'].'">';
                 echo $lang['srv_placila'].'</a>';
                 echo '</li>';
             }
@@ -497,40 +474,35 @@ class SurveyList {
 			echo '<ul class="secondNavigation">';
 			
 			// Nastavitve uporabnika
-			echo '<li>';
-			echo '<a class="no-img side-right'.(!isset($_GET['m']) || $_GET['m']=='gdpr_user' ? ' active' : '').'"'
-				 .' href="index.php?a=gdpr&amp;m=gdpr_user" title="'.$lang['srv_gdpr_user_settings'].'">';
+			echo '<li class="'.(!isset($_GET['m']) || $_GET['m']=='gdpr_user' ? ' active' : '').'">';
+			echo '<a href="index.php?a=gdpr&amp;m=gdpr_user" title="'.$lang['srv_gdpr_user_settings'].'">';
 			echo $lang['srv_gdpr_user_settings'].'</a>';
 			echo '</li>';
 			
 			// Seznam anket
-			echo '<li>';
-			echo '<a class="no-img side-right'.($_GET['m']=='gdpr_survey_list' ? ' active' : '').'"'
-				 .' href="index.php?a=gdpr&amp;m=gdpr_survey_list" title="'.$lang['srv_gdpr_survey_list'].'">';
+			echo '<li class="'.($_GET['m']=='gdpr_survey_list' ? ' active' : '').'">';
+			echo '<a href="index.php?a=gdpr&amp;m=gdpr_survey_list" title="'.$lang['srv_gdpr_survey_list'].'">';
 			echo $lang['srv_gdpr_survey_list'].'</a>';
 			echo '</li>';
             
             // DPA
-			echo '<li>';
-			echo '<a class="no-img side-right'.($_GET['m']=='gdpr_dpa' ? ' active' : '').'"'
-				 .' href="index.php?a=gdpr&amp;m=gdpr_dpa" title="'.$lang['srv_gdpr_dpa'].'">';
+			echo '<li class="'.($_GET['m']=='gdpr_dpa' ? ' active' : '').'">';
+			echo '<a href="index.php?a=gdpr&amp;m=gdpr_dpa" title="'.$lang['srv_gdpr_dpa'].'">';
 			echo $lang['srv_gdpr_dpa'].'</a>';
 			echo '</li>';
 			
 			// Zahteve za izbris
-			echo '<li>';
+			echo '<li class="'.($_GET['m']=='gdpr_requests' ? ' active' : '').'">';
 			$request_counter = GDPR::countUserUnfinishedRequests();
 			$request_counter_text = ($request_counter > 0) ? ' <sup class="red" style="vertical-align: top;">('.$request_counter.')</sup>' : '';
-			echo '<a class="no-img side-right'.($_GET['m']=='gdpr_requests' ? ' active' : '').'"'
-				 .' href="index.php?a=gdpr&amp;m=gdpr_requests" title="'.$lang['srv_gdpr_requests'].'">';
+			echo '<a href="index.php?a=gdpr&amp;m=gdpr_requests" title="'.$lang['srv_gdpr_requests'].'">';
 			echo $lang['srv_gdpr_requests'].$request_counter_text.'</a>';
 			echo '</li>';
 			
 			// Vse zahteve za izbris - samo ADMINI
 			if($admin_type == '0'){			
-				echo '<li>';
-				echo '<a class="no-img side-right'.($_GET['m']=='gdpr_requests_all' ? ' active' : '').'"'
-					 .' href="index.php?a=gdpr&amp;m=gdpr_requests_all" title="'.$lang['srv_gdpr_requests_all'].'">';
+				echo '<li class="'.($_GET['m']=='gdpr_requests_all' ? ' active' : '').'">';
+				echo '<a href="index.php?a=gdpr&amp;m=gdpr_requests_all" title="'.$lang['srv_gdpr_requests_all'].'">';
 				echo $lang['srv_gdpr_requests_all'].'</a>';
 				echo '</li>';
 			}
@@ -541,9 +513,8 @@ class SurveyList {
 			echo '<ul class="secondNavigation">';
 			
 			# Izvozi za ul evalvacijo
-			echo '<li>';
-			echo '<a class="no-img side-right'.((!isset($_GET['t']) || $_GET['t'] == 'export') ? ' active' : '').'"'
-				 .' href="index.php?a=ul_evalvation" title="Izvozi">';
+			echo '<li class="'.((!isset($_GET['t']) || $_GET['t'] == 'export') ? ' active' : '').'">';
+			echo '<a href="index.php?a=ul_evalvation" title="Izvozi">';
 			echo 'Izvozi</a>';
 			echo '</li>';
 			
@@ -551,21 +522,20 @@ class SurveyList {
 			if ($admin_type == 0) {		
 			
 				# Uvozi - samo admini
-				echo '<li>';
-				echo '<a class="no-img side-left'.($_GET['t']=='import' ? ' active' : '').'"'
-					 .' href="index.php?a=ul_evalvation&amp;t=import" title="Uvozi">';
+				echo '<li class="'.($_GET['t']=='import' ? ' active' : '').'">';
+				echo '<a href="index.php?a=ul_evalvation&amp;t=import" title="Uvozi">';
 				echo 'Uvozi</a>';
 				echo '</li>';
 				
 				# Testiranje - samo admini
-				echo '<li>';
-				echo '<a class="no-img side-left'.($_GET['t']=='test' ? ' active' : '').'" href="index.php?a=ul_evalvation&amp;t=test" title="Testiranje">';
+				echo '<li class="'.($_GET['t']=='test' ? ' active' : '').'">';
+				echo '<a href="index.php?a=ul_evalvation&amp;t=test" title="Testiranje">';
 				echo 'Testiranje</a>';
 				echo '</li>';
 								
 				# GC - samo admini
-				echo '<li>';
-				echo '<a class="no-img side-left'.($_GET['t']=='gc' ? ' active' : '').'" href="index.php?a=ul_evalvation&amp;t=gc" title="GC">';
+				echo '<li class="'.($_GET['t']=='gc' ? ' active' : '').'">';
+				echo '<a href="index.php?a=ul_evalvation&amp;t=gc" title="GC">';
 				echo 'GC</a>';
 				echo '</li>';
 			}
diff --git a/lang/1.php b/lang/1.php
index 5caa10352..c0532404c 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -765,9 +765,11 @@ $lang = array (
 	"date_dec"				=>	"Dec",
 	"s_search"				=>	"I&#353;&#269;i",
 	"s_search2"				=>	"Išči",
-	"s_search_mySurvey"		=>	"Išči po mojih anketah",
 	"s_search_Library"		=>	"Išči po knjižnici",
+	"s_search_Library_public"	=>	"Išči po javni knjižnici",
+	"s_search_Library_my"	    =>	"Išči po moji knjižnici",
 	"s_search_metaadmin"	=>	"Išči samo po avtorju",
+	"s_search_mySurvey"		=>	"Išči po mojih anketah",
 	"s_search_mySurvey_title"	=>	"Rezultati iskanja po mojih anketah",
 	"s_search_mySurvey_nothing"	=>	"Za poizvedbo ni bilo mogoče najti nobene ankete",
 	"s_search_mySurvey_back"	=>	"Nazaj na Moje ankete",
@@ -2443,6 +2445,10 @@ $lang = array (
     "srv_library_help_prva"		=>	"&#268;e &#382;elite novo anketo ustvariti iz knji&#382;nice, vpi&#154;ite ime ankete na vrhu in kliknite na ikono kopiraj %s na desni.",
     "srv_library_help_druga"	=>	"&#268;e &#382;elite novo anketo ustvariti iz knji&#382;nice, vpi&#154;ite ime ankete na vrhu in kliknite na ikono kopiraj %s na levi.",
     "srv_library_anketa_help"   =>	"Anketo shranite v knjiznico na prvi strani s klikom na ikono vozicka. Za kopiranje kliknite na ikono kopiraj na desni.",
+    "srv_library_title_my"              =>	"Vse ankete v moji knjižnici",
+    "srv_library_title_public"          =>	"Vse ankete v javni knjižnici",
+    "srv_library_title_search_my"       =>	"Rezultati iskanja po anketah v moji knjižnici",
+    "srv_library_title_search_public"   =>	"Rezultati iskanja po anketah v javni knjižnici",
     "srv_vstavi"          		=>	"Vstavi",
     "srv_1cs"          			=>	"1KA",
     "srv_no_library"        =>	 "brez predloge",
diff --git a/lang/2.php b/lang/2.php
index 866ba4abc..9b3cd239b 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -751,8 +751,10 @@ $lang = array (
 	"date_dec"		=>	"Dec",
 	"s_search"		=>	"search",
 	"s_search2"				=>	"Search",
-	"s_search_mySurvey"		=>	"Search my surveys",
 	"s_search_Library"		=>	"Search library",
+    "s_search_Library_public"	=>	"Search public library",
+	"s_search_Library_my"	    =>	"Search my library",
+	"s_search_mySurvey"		=>	"Search my surveys",
 	"s_search_metaadmin"	=>	"Search only author",
 	"s_search_mySurvey_title"	=>	"Survey search results",
 	"s_search_mySurvey_nothing"	=>	"No surveys found",
@@ -2419,6 +2421,10 @@ $lang = array (
     "srv_library_help_prva" =>  "To create a new survey from the library, enter its name in the box above and click on the copy icon %s on the right.",
 	"srv_library_help_druga"	=>	"To create a new survey from the library, enter its name in the box above and click on the copy icon %s on the left.",
     "srv_library_anketa_help"	=>  "The survey is stored in the library on the first page by clicking on the icon of the cart. To copy, click on the Copy icon on the right.",
+    "srv_library_title_my"              =>	"All surveys in my library",
+    "srv_library_title_public"          =>	"All surveys in public library",
+    "srv_library_title_search_my"       =>	"Search results in my library",
+    "srv_library_title_search_public"   =>	"Search results in public library",
     "srv_urejanje"          =>  "Edit",
     "srv_vstavi"          	=>  "Insert",
     "srv_1cs"          		=>  "OneClick Survey",
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 46f10256b..b0dcd47a4 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -9578,6 +9578,7 @@ div .table-horizontal-scroll-wrapper2 table {
   display: flex;
   padding: 20px 32px;
   background-color: #F8F8F8;
+  border-bottom: 1px #E5E5E5 solid;
 }
 #survey_list .second_line #searchSettings .search_settings_top > div,
 #survey_list .second_line #searchLibrarySettings .search_settings_top > div {
@@ -22629,6 +22630,86 @@ div.page_obvestila #unread_notifications .gdpr_popup_radio input {
   display: flex;
   flex-direction: column;
 }
+#anketa_knjiznica #libraryInner .advanced_search {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-bottom: 30px;
+}
+#anketa_knjiznica #libraryInner .advanced_search #searchLibrarySettings {
+  display: flex;
+  flex-direction: column;
+  max-width: 750px;
+  width: 100%;
+  background-color: #FFFFFF;
+  border: 1px solid #E5E5E5;
+  border-radius: 2px;
+}
+#anketa_knjiznica #libraryInner .advanced_search #searchLibrarySettings .search_settings_top {
+  display: flex;
+  padding: 20px 32px;
+  background-color: #F8F8F8;
+  border-bottom: 1px #E5E5E5 solid;
+}
+#anketa_knjiznica #libraryInner .advanced_search #searchLibrarySettings .search_settings_top > div {
+  padding-right: 8px;
+  margin-right: 8px;
+  border-right: 1px #E5E5E5 solid;
+}
+#anketa_knjiznica #libraryInner .advanced_search #searchLibrarySettings .search_settings_top > div.search_text {
+  width: 100%;
+}
+#anketa_knjiznica #libraryInner .advanced_search #searchLibrarySettings .search_settings_top > div.search_text input[type=text] {
+  width: 100%;
+  box-sizing: border-box;
+  padding: 12px 16px;
+  margin: 0;
+  font-size: 16px;
+  background: #FFFFFF;
+  border: 1px solid #C4C4C4;
+  border-radius: 2px;
+}
+#anketa_knjiznica #libraryInner .advanced_search #searchLibrarySettings .search_settings_top > div.search_type select {
+  cursor: pointer;
+  width: 160px;
+  box-sizing: border-box;
+  padding: 12px 16px;
+  margin: 0;
+  font-size: 16px;
+  background: #FFFFFF;
+  border: 1px solid #C4C4C4;
+  border-radius: 2px;
+}
+#anketa_knjiznica #libraryInner .advanced_search #searchLibrarySettings .search_settings_top > div.search_button {
+  padding-right: 0px;
+  margin-right: 0px;
+  border: none;
+}
+#anketa_knjiznica #libraryInner .advanced_search #searchLibrarySettings .search_settings_advanced_buttons {
+  display: flex;
+  justify-content: space-between;
+  padding: 8px 32px;
+}
+#anketa_knjiznica #libraryInner .advanced_search #searchLibrarySettings .search_settings_advanced_buttons button {
+  padding: 5px 16px;
+  font-size: 14px;
+  font-weight: 400;
+  border: 1px #E5E5E5 solid;
+  border-radius: 2px;
+}
+#anketa_knjiznica #libraryInner .advanced_search #searchLibrarySettings .search_settings_advanced_buttons button.active {
+  border: 1px #1E88E5 solid;
+}
+#anketa_knjiznica #libraryInner .advanced_search #searchLibrarySettings .search_settings_advanced_buttons button .faicon::before {
+  margin-right: 8px;
+  color: #1E88E5;
+  font-size: 14px;
+}
+#anketa_knjiznica #libraryInner .library_title {
+  margin-bottom: 16px;
+  font-weight: 600;
+  font-size: 18px;
+}
 #anketa_knjiznica #libraryInner ul {
   list-style-type: none;
   margin: 0;
diff --git a/resources/sass/admin_new/pages/library/library.scss b/resources/sass/admin_new/pages/library/library.scss
index 5338c305c..6a65043f7 100644
--- a/resources/sass/admin_new/pages/library/library.scss
+++ b/resources/sass/admin_new/pages/library/library.scss
@@ -5,11 +5,118 @@
         flex-direction: column;
 
 
-        #searchLibrarySurveys{
+        .advanced_search{
+            display: flex;
+            justify-content: center;
+            align-items: center;
+    
+            margin-bottom: 30px;
 
+            #searchLibrarySettings {
+                display: flex;
+                flex-direction: column;
 
+                max-width: 750px;
+                width: 100%;
+
+                background-color: $white;
+                border: 1px solid $gray;
+                border-radius: 2px;
+
+                .search_settings_top{
+                    display: flex;
+
+                    padding: 20px 32px;
+
+                    background-color: $light-gray;
+                    border-bottom: 1px $gray solid;
+
+                    >div{
+                        padding-right: 8px;
+                        margin-right: 8px;
+
+                        border-right: 1px $gray solid;
+
+                        &.search_text{
+                            width: 100%;
+
+                            input[type="text"]{
+                                width: 100%;
+                                box-sizing: border-box;
+                                padding: 12px 16px;
+                                margin: 0;
+
+                                font-size: 16px;
+
+                                background: $white;
+                                border: 1px solid $dark-gray;
+                                border-radius: 2px;
+                            }
+                        }
+
+                        &.search_type{
+
+                            select{
+                                cursor: pointer;
+
+                                width: 160px;
+                                box-sizing: border-box;
+                                padding: 12px 16px;
+                                margin: 0;
+
+                                font-size: 16px;
+
+                                background: $white;
+                                border: 1px solid $dark-gray;
+                                border-radius: 2px;
+                            }
+                        }
+
+                        &.search_button{
+                            padding-right: 0px;
+                            margin-right: 0px;
+
+                            border: none;
+                        }
+                    }
+                }
+
+                .search_settings_advanced_buttons{
+                    display: flex;
+                    justify-content: space-between;
+
+                    padding: 8px 32px;
+
+                    button{
+                        padding: 5px 16px;
+
+                        font-size: 14px;
+                        font-weight: 400;
+
+                        border: 1px $gray solid;
+                        border-radius: 2px;
+
+                        &.active{
+                            border: 1px $blue solid;
+                        }
+
+                        .faicon::before{
+                            margin-right: 8px;
+
+                            color: $blue;
+                            font-size: 14px;
+                        }
+                    }
+                }
+            }
         }
 
+        .library_title{
+            margin-bottom: 16px;
+
+            font-weight: 600;
+            font-size: 18px;
+        }
 
         ul{
             list-style-type: none;
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 c3518ed5b..af4e3a0d8 100644
--- a/resources/sass/admin_new/pages/my_surveys/top_filters.scss
+++ b/resources/sass/admin_new/pages/my_surveys/top_filters.scss
@@ -57,6 +57,7 @@
                 padding: 20px 32px;
 
                 background-color: $light-gray;
+                border-bottom: 1px $gray solid;
 
                 >div{
                     padding-right: 8px;