some work on directory widgets

6 files changed, 38 insertions, 57 deletions

diff --git a/view/css/widgets.css b/view/css/widgets.css
index b5a99d5ae..a24f5fb29 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -12,6 +12,11 @@
 	padding: 6px 10px;
 }
 
+.widget-input {
+	border-top-right-radius: 0px;
+	border-bottom-right-radius: 0px;
+}
+
 /* suggest */
 
 .suggest-widget-more {
@@ -28,13 +33,6 @@
 	margin-top: 15px;
 }
 
-/* search */
-
-#search-text {
-	border-top-right-radius: 0px;
-	border-bottom-right-radius: 0px;
-}
-
 /* notes */ 
 
 #note-text {
@@ -51,21 +49,6 @@
 }
 
 
-/* peoplefind */
-
-#peoplefind-sidebar .btn {
-	margin: 10px 0 10px 0;
-}
-
-#side-peoplefind-url {
-	margin-top: 5px;
-}
-
-#side-peoplefind-url {
-	font-size: 1em;
-}
-
-
 /* fileas */
 
 
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index f3bf546ea..ea8aa3365 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2019,10 +2019,6 @@ img.mail-list-sender-photo {
 	-moz-border-radius: $radiuspx;
 }
 
-#saved-search-ul {
-	list-style-type: none;
-}
-
 .fileas-ul {
 	list-style-type: none;
 }
@@ -2032,15 +2028,6 @@ img.mail-list-sender-photo {
 	border-radius: $radiuspx;
 	-moz-border-radius: $radiuspx;
 }
-/*
-.categories-ul {
-	list-style-type: none;
-}
-
-#sidebar-group-list ul, #posted-date-selector {
-	list-style-type: none;
-}
-*/
 
 .profile-thing-list img, .thing-show img, .thing-edit-links a {
 	margin-top: 8px;
diff --git a/view/tpl/dir_sort_links.tpl b/view/tpl/dir_sort_links.tpl
index d78aec1f5..f6d8c3454 100644
--- a/view/tpl/dir_sort_links.tpl
+++ b/view/tpl/dir_sort_links.tpl
@@ -1,6 +1,8 @@
 <div class="widget" id="dir_sort_links">
 <h3>{{$header}}</h3>
-<a href="directory?f=&order=normal">{{$normal}}</a><br />
-<a href="directory?f=&order=reverse">{{$reverse}}</a><br />
-<a href="directory?f=&order=date">{{$date}}</a><br />
+<ul class="nav nav-pills nav-stacked">
+	<li><a href="directory?f=&order=normal">{{$normal}}</a></li>
+	<li><a href="directory?f=&order=reverse">{{$reverse}}</a></li>
+	<li><a href="directory?f=&order=date">{{$date}}</a></li>
+</ul>
 </div>
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>
-
diff --git a/view/tpl/safesearch.tpl b/view/tpl/safesearch.tpl
index e0b2ab538..58ce22741 100644
--- a/view/tpl/safesearch.tpl
+++ b/view/tpl/safesearch.tpl
@@ -1,4 +1,6 @@
 <div id="directory_safemode" class="widget">
 <h3>{{$safemode}}</h3>
-<a href="toggle_safesearch">{{$toggle}}</a>
+<ul class="nav nav-pills nav-stacked">
+	<li><a href="toggle_safesearch">{{$toggle}}</a></li>
+</ul>
 </div>
diff --git a/view/tpl/searchbox.tpl b/view/tpl/searchbox.tpl
index 02b2d4a50..f4301f0f5 100644
--- a/view/tpl/searchbox.tpl
+++ b/view/tpl/searchbox.tpl
@@ -1,7 +1,7 @@
 <form action="{{$action_url}}" method="get" >
 	<input type="hidden" name="f" value="" />
 	<div id="{{$id}}" class="input-group">
-		<input type="text" name="search" id="search-text" value="{{$s}}" onclick="this.submit();" />
+		<input class="widget-input" type="text" name="search" id="search-text" value="{{$s}}" onclick="this.submit();" />
 		<div class="input-group-btn">
 			<button type="submit" name="submit" class="btn btn-default btn-sm" id="search-submit" value="{{$search_label}}"><i class="icon-search"></i></button>
 			{{if $savedsearch}}