From 83ea120ac96c1f565a227a670023aa3128534e45 Mon Sep 17 00:00:00 2001
From: Stefan Parviainen <saparvia@caterva.eu>
Date: Sun, 7 Dec 2014 12:39:50 +0100
Subject: Revert "Revert "Directory shows channel suggestions by default""

This reverts commit bfde28f28eae1f4b00aac03b2714254d14ab7464.
---
 view/tpl/direntry.tpl   | 3 +++
 view/tpl/peoplefind.tpl | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'view/tpl')

diff --git a/view/tpl/direntry.tpl b/view/tpl/direntry.tpl
index 2da920ab1..cdc6f1f97 100755
--- a/view/tpl/direntry.tpl
+++ b/view/tpl/direntry.tpl
@@ -6,6 +6,9 @@
 {{if $entry.connect}}
 <div class="directory-connect btn btn-default"><a href="{{$entry.connect}}"><i class="icon-plus connect-icon"></i> {{$entry.conn_label}}</a></div>
 {{/if}}
+{{if $entry.ignlink}}
+<div class="directory-ignore btn btn-default"><a href="{{$entry.ignlink}}"> {{$entry.ignore_label}}</a></div>
+{{/if}}
 </div>
 </div>
 
diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl
index 2f23948c8..16af5d8ed 100755
--- a/view/tpl/peoplefind.tpl
+++ b/view/tpl/peoplefind.tpl
@@ -12,7 +12,6 @@
 	</form>
 	<ul class="nav nav-pills nav-stacked">
 		{{if $similar}}<li><a href="match" >{{$similar}}</a></li>{{/if}}
-		{{if $loggedin}}<li><a href="suggest" >{{$suggest}}</a></li>{{/if}}
 		<li><a href="randprof" >{{$random}}</a></li>
 		{{if $loggedin}}{{if $inv}}<li><a href="invite" >{{$inv}}</a></li>{{/if}}{{/if}}
 	</ul>
-- 
cgit v1.2.3


From c8818d83498d19262ba90f7f2954828c24cf03cb Mon Sep 17 00:00:00 2001
From: Stefan Parviainen <saparvia@caterva.eu>
Date: Sun, 7 Dec 2014 13:38:38 +0100
Subject: Suggestions in dir redux. Suggestions are now showed in directory if
 suggest=1 parameter is given to directory.

---
 view/tpl/peoplefind.tpl | 1 +
 1 file changed, 1 insertion(+)

(limited to 'view/tpl')

diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl
index 16af5d8ed..ba71c1e80 100755
--- a/view/tpl/peoplefind.tpl
+++ b/view/tpl/peoplefind.tpl
@@ -12,6 +12,7 @@
 	</form>
 	<ul class="nav nav-pills nav-stacked">
 		{{if $similar}}<li><a href="match" >{{$similar}}</a></li>{{/if}}
+		{{if $loggedin}}<li><a href="directory?suggest=1" >{{$suggest}}</a></li>{{/if}}
 		<li><a href="randprof" >{{$random}}</a></li>
 		{{if $loggedin}}{{if $inv}}<li><a href="invite" >{{$inv}}</a></li>{{/if}}{{/if}}
 	</ul>
-- 
cgit v1.2.3