Merge branch 'master' of https://github.com/git-marijus/red

Conflicts:
	view/theme/redbasic/css/style.css

3 files changed, 19 insertions, 3 deletions

diff --git a/include/text.php b/include/text.php
index 9254508a4..f425690ba 100755
--- a/include/text.php
+++ b/include/text.php
@@ -734,7 +734,7 @@ function search($s,$id='search-box',$url='/search',$save = false) {
 	$o .= '<form action="' . $a->get_baseurl((stristr($url,'network')) ? true : false) . $url . '" method="get" >';
 	$o .= '<input type="text" class="icon-search" name="search" id="search-text" placeholder="&#xf002;" value="' . $s .'" onclick="this.submit();" />';
 	$o .= '<input type="submit" name="submit" id="search-submit" value="' . t('Search') . '" />'; 
-	if($save)
+	if(feature_enabled(local_user(),'savedsearch'))
 		$o .= '<input type="submit" name="save" id="search-save" value="' . t('Save') . '" />'; 
 	$o .= '</form></div>';
 	return $o;
diff --git a/mod/search.php b/mod/search.php
index bad071936..7651b3a4e 100644
--- a/mod/search.php
+++ b/mod/search.php
@@ -17,7 +17,7 @@ function search_saved_searches() {
 		$o .= '<h3>' . t('Saved Searches') . '</h3>' . "\r\n";
 		$o .= '<ul id="saved-search-ul">' . "\r\n";
 		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" >' . htmlspecialchars($rr['term']) . '</a></li>' . "\r\n";
+			$o .= '<li class="saved-search-li clear"><a href="search/?f=&remove=1&search=' . rawurlencode($rr['term']) . '" title="' . t('Remove term') . '" onclick="return confirmDelete();"><i class="icon-remove drop-icons"></i></a> <a href="search/?f=&search=' . $rr['term'] . '" class="savedsearchterm" >' . htmlspecialchars($rr['term']) . '</a></li>' . "\r\n";
 		}
 		$o .= '</ul><div class="clear"></div></div>' . "\r\n";
 	}		
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 31aa45995..83781ebb9 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1232,13 +1232,26 @@ a.mail-list-link {
 .groupsideedit {
 	margin-right: 10px;
 }
+
 #saved-search-ul {
 	list-style-type: none;
 }
+
+.saved-search-li i {
+	opacity: 0;
+}
+
+.saved-search-li:hover i {
+	opacity: 1;
+}
+
+/*
 .savedsearchdrop, .savedsearchterm {
 	float: left;
 	margin-top: 10px;
 }
+*/
+
 .savedsearchterm {
 	margin-left: 10px;
 }
@@ -2987,9 +3000,12 @@ img.mail-list-sender-photo {
 }
 .suggest-widget-more { margin-top: 10px; }
 
+
 #note-text {
 	width: 190px;
 	max-width: 190px;
 	height: 150px;
 }
-#note-save { margin-top: 10px; }
\ No newline at end of file
+#note-save { margin-top: 10px; }
+
+