X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fsearch.php;h=ac848a0ceced8af051aee13655c98c95155d61f3;hb=286578542f5bbd4695904103cee7d90eecf8087f;hp=300eb912c13c59412786c36b6c6a9c98974d6959;hpb=9bf8efc45f51455257410c98c827002551bd330d;p=friendica.git

diff --git a/mod/search.php b/mod/search.php
index 300eb912c1..ac848a0cec 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -9,13 +9,26 @@ function search_saved_searches() {
 	);
 
 	if(count($r)) {
-		$o .= '<div id="saved-search-list" class="widget">';
-		$o .= '<h3>' . t('Saved Searches') . '</h3>' . "\r\n";
-		$o .= '<ul id="saved-search-ul">' . "\r\n";
+		$saved = array();
 		foreach($r as $rr) {
-			$o .= '<li class="saved-search-li clear"><a href="search/?f=&remove=1&search=' . $rr['term'] . '" class="icon drophide savedsearchdrop" title="' . t('Remove term') . '" onclick="return confirmDelete();" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a> <a href="search/?f=&search=' . $rr['term'] . '" class="savedsearchterm" >' . $rr['term'] . '</a></li>' . "\r\n";
+			$saved[] = array(
+				'id'            => $rr['id'],
+				'term'			=> $rr['term'],
+				'encodedterm' 	=> urlencode($rr['term']),
+				'delete'		=> t('Remove term'),
+				'selected'		=> ($search==$rr['term']),
+			);
 		}
-		$o .= '</ul><div class="clear"></div></div>' . "\r\n";
+
+		
+		$tpl = get_markup_template("saved_searches_aside.tpl");
+
+		$o .= replace_macros($tpl, array(
+			'$title'	 => t('Saved Searches'),
+			'$add'		 => '',
+			'$searchbox' => '',
+			'$saved' 	 => $saved,
+		));
 	}		
 
 	return $o;
@@ -80,9 +93,7 @@ function search_content(&$a) {
 	require_once('include/security.php');
 	require_once('include/conversation.php');
 
-	$o = '<div id="live-search"></div>' . "\r\n";
-
-	$o .= '<h3>' . t('Search') . '</h3>';
+	$o = '<h3>' . t('Search') . '</h3>';
 
 	if(x($a->data,'search'))
 		$search = notags(trim($a->data['search']));