diff options
| -rw-r--r-- | mod/directory.php | 6 | ||||
| -rw-r--r-- | view/directory_header.tpl | 2 | ||||
| -rw-r--r-- | view/style.css | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/mod/directory.php b/mod/directory.php index 4499f0414..094cf028f 100644 --- 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 926e6df81..8fc1d2cfc 100644 --- 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 3093dd745..292f8d1af 100644 --- 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 { |