misc fixes

diff --git a/mod/directory.php b/mod/directory.php
index 4499f0414f0cb6bc66d9d9ab82b821a035b8d049..094cf028f9a3f4ef0def72085f8481aa20b96b0c 100644 (file)
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -10,13 +10,13 @@ function directory_content(&$a) {
        $tpl .= file_get_contents('view/directory_header.tpl');
 
        $o .= replace_macros($tpl, array(
-               '$search' => $search
-
+               '$search' => $search,
+               '$finding' => (strlen($search) ? "<h4>Finding: '$search'</h4>" : "")
        ));
 
        if($search)
                $search = dbesc($search);
-       $sql_extra = ((strlen($search)) ? " AND MATCH (`profile`.`name`, `user`.`nickname`, `locality`,`region`,`country-name`,`gender`,`marital`,`sexual`,`about`,`romance`,`employer`,`school`) AGAINST ('$search' IN BOOLEAN MODE) " : "");
+       $sql_extra = ((strlen($search)) ? " AND MATCH (`profile`.`name`, `user`.`nickname`, `locality`,`region`,`country-name`,`gender`,`marital`,`sexual`,`about`,`romance`,`work`,`education`) AGAINST ('$search' IN BOOLEAN MODE) " : "");
 
 
        $r = q("SELECT COUNT(*) AS `total` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 AND `publish` = 1 AND `user`.`blocked` = 0 $sql_extra ");

diff --git a/view/directory_header.tpl b/view/directory_header.tpl
index 926e6df816da371c564143d44e0ad219f4cd9c8c..8fc1d2cfccec51b9da86ec76842a7a62c9e0c824 100644 (file)
--- a/view/directory_header.tpl
+++ b/view/directory_header.tpl
@@ -1,5 +1,7 @@
 <h1>Site Directory</h1>
 
+$finding
+
 <div id="directory-search-wrapper">
 <form id="directory-search-form" action="directory" method="get" >
 <input type="text" name="search" id="directory-search" class="search-input" onfocus="this.select();" value="$search" />

diff --git a/view/style.css b/view/style.css
index 3093dd745889977061e1a28a53b18dfb68212ce4..292f8d1af5f28536c9b61604cbb7ac85d4b8fbbd 100644 (file)
--- a/view/style.css
+++ b/view/style.css
@@ -538,13 +538,12 @@ input#dfrn-url {
 }
 
 #directory-search-wrapper {
-       float: right;
+       margin-left: 350px;
        margin-right: 20px;
        margin-bottom: 50px;
 }
 
 #directory-search-end {
-       clear: both;
 }
 
 .pager {