From d145ef2021da845e257681f1dc93d274d814e90f Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Tue, 11 Nov 2014 23:09:55 +0100
Subject: some work on directory widgets

---
 view/tpl/peoplefind.tpl | 41 ++++++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

(limited to 'view/tpl/peoplefind.tpl')

diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl
index 55bf1575f..6ec37539b 100755
--- a/view/tpl/peoplefind.tpl
+++ b/view/tpl/peoplefind.tpl
@@ -1,22 +1,29 @@
 <div id="peoplefind-sidebar" class="widget">
 	<h3>{{$findpeople}}</h3>
-	<div class="descriptive-text">{{$desc}}</div>
 	<form action="directory" method="post" />
-		<input class="icon-search" id="side-peoplefind-url" type="text" name="search" size="24" title="{{$hint}}" placeholder="&#xf002;"/>
-		<input id="side-peoplefind-submit" class="btn btn-default" type="submit" name="submit" value="{{$findthem}}" />
-		<br />
-		{{if $advanced_search}}
-		<a href="#" onclick="openClose('advanced-people-search-div'); return false;">{{$advanced_search}}</a>
-		<div id="advanced-people-search-div" style="display: none;">
-		<input class="icon-search" id="side-advanced-peoplefind-url" type="text" name="query" size="24" title="{{$advanced_hint}}" placeholder="&#xf002;"/>
-		<input id="side-advanced-peoplefind-submit" class="btn btn-default" type="submit" name="submit" value="{{$find_advanced}}" />
+	<div class="form-group">
+		<div class="input-group">
+			<input class="widget-input" type="text" name="search" title="{{$hint}}" placeholder="{{$desc}}" />
+		<div class="input-group-btn">
+				<button class="btn btn-default btn-sm" type="submit" name="submit"><i class="icon-search"></i></button>
+			</div>
 		</div>
-		<br />
-		{{/if}}
-	</form>
-	{{if $similar}}<a href="match" >{{$similar}}</a><br />{{/if}}
-	{{if $loggedin}}<a href="suggest" >{{$suggest}}</a><br />{{/if}}
-	<a href="randprof" >{{$random}}</a><br />
-	{{if $loggedin}}{{if $inv}}<a href="invite" >{{$inv}}</a>{{/if}}{{/if}}
+	</div>
+	{{if $advanced_search}}
+	<div class="form-group">
+		<div id="advanced-people-search-div" class="input-group">
+			<input class="widget-input" type="text" name="query" title="{{$advanced_hint}}" placeholder="{{$find_advanced}}" />
+			<div class="input-group-btn">
+				<button class="btn btn-default btn-sm" type="submit" name="submit"><i class="icon-search"></i></button>
+			</div>
+		</div>
+	</div>
+	{{/if}}
+</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>
 </div>
-
-- 
cgit v1.2.3


From 1ed144b83c3cefb685dfff37fd7d415bf5a2ffdb Mon Sep 17 00:00:00 2001
From: marijus <mario@mariovavti.com>
Date: Wed, 12 Nov 2014 10:27:13 +0100
Subject: make search and advanced search use the same input form

---
 view/tpl/peoplefind.tpl | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

(limited to 'view/tpl/peoplefind.tpl')

diff --git a/view/tpl/peoplefind.tpl b/view/tpl/peoplefind.tpl
index 6ec37539b..2f23948c8 100755
--- a/view/tpl/peoplefind.tpl
+++ b/view/tpl/peoplefind.tpl
@@ -1,25 +1,15 @@
 <div id="peoplefind-sidebar" class="widget">
 	<h3>{{$findpeople}}</h3>
 	<form action="directory" method="post" />
-	<div class="form-group">
-		<div class="input-group">
-			<input class="widget-input" type="text" name="search" title="{{$hint}}" placeholder="{{$desc}}" />
-		<div class="input-group-btn">
-				<button class="btn btn-default btn-sm" type="submit" name="submit"><i class="icon-search"></i></button>
-			</div>
-		</div>
-	</div>
-	{{if $advanced_search}}
-	<div class="form-group">
-		<div id="advanced-people-search-div" class="input-group">
-			<input class="widget-input" type="text" name="query" title="{{$advanced_hint}}" placeholder="{{$find_advanced}}" />
+		<div class="form-group">
+			<div class="input-group">
+				<input class="widget-input" type="text" name="search" title="{{$hint}}{{if $advanced_search}}{{$advanced_hint}}{{/if}}" placeholder="{{$desc}}" />
 			<div class="input-group-btn">
-				<button class="btn btn-default btn-sm" type="submit" name="submit"><i class="icon-search"></i></button>
+					<button class="btn btn-default btn-sm" type="submit" name="submit"><i class="icon-search"></i></button>
+				</div>
 			</div>
 		</div>
-	</div>
-	{{/if}}
-</form>
+	</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}}
-- 
cgit v1.2.3