From 17755117ceb0c1d7204e785dcee92a14d63c874b Mon Sep 17 00:00:00 2001 From: garvinhicking Date: Mon, 30 May 2005 08:05:17 +0000 Subject: [PATCH] Solve RFE #1210676: Assign DIV-Containers for CSS-styling the search results --- docs/NEWS | 5 +++++ include/genpage.inc.php | 29 +++++++++++++++++++++++++---- templates/default/content.tpl | 13 ++++++++++++- 3 files changed, 42 insertions(+), 5 deletions(-) diff --git a/docs/NEWS b/docs/NEWS index 6fb714d..f0ff153 100644 --- a/docs/NEWS +++ b/docs/NEWS @@ -3,6 +3,11 @@ Version 0.9 () ------------------------------------------------------------------------ + * TEMPLATES: Added div.serendipity_search_* wrapping elements to be + able to style the search result messages specifically. Added new + Smarty variables $searchresult_* (content.tpl). + Solves RFE #1210676 (garvinhicking) + * Fix editing a draft article to be properly displayed as draft in PostgreSQL setups. Thanks to Penny Leach! (garvinhicking) diff --git a/include/genpage.inc.php b/include/genpage.inc.php index 7ccfacc..2746b95 100644 --- a/include/genpage.inc.php +++ b/include/genpage.inc.php @@ -38,19 +38,40 @@ if ($serendipity['smarty_raw_mode']) { case 'search': $r = serendipity_searchEntries($serendipity['GET']['searchTerm']); if (strlen($serendipity['GET']['searchTerm']) <= 3) { - $serendipity['smarty']->assign('content_message', SEARCH_TOO_SHORT); + $serendipity['smarty']->assign( + array( + 'content_message' => SEARCH_TOO_SHORT, + 'searchresult_tooShort' => true + ) + ); break; } if (is_string($r) && $r !== true) { - $serendipity['smarty']->assign('content_message', sprintf(SEARCH_ERROR, $serendipity['dbPrefix'], $r)); + $serendipity['smarty']->assign( + array( + 'content_message' => sprintf(SEARCH_ERROR, $serendipity['dbPrefix'], $r), + 'searchresult_error' => true + ) + ); break; } elseif ($r === true) { - $serendipity['smarty']->assign('content_message', sprintf(NO_ENTRIES_BLAHBLAH, $serendipity['GET']['searchTerm'])); + $serendipity['smarty']->assign( + array( + 'content_message' => sprintf(NO_ENTRIES_BLAHBLAH, $serendipity['GET']['searchTerm']), + 'searchresult_noEntries' => true + ) + ); break; } - $serendipity['smarty']->assign('content_message', sprintf(YOUR_SEARCH_RETURNED_BLAHBLAH, $serendipity['GET']['searchTerm'], count($r))); + $serendipity['smarty']->assign( + array( + 'content_message' => sprintf(YOUR_SEARCH_RETURNED_BLAHBLAH, $serendipity['GET']['searchTerm'], count($r)), + 'searchresult_results' => true + ) + ); + serendipity_printEntries($r); break; diff --git a/templates/default/content.tpl b/templates/default/content.tpl index 9f88267..dd6e045 100644 --- a/templates/default/content.tpl +++ b/templates/default/content.tpl @@ -1,6 +1,17 @@ -{$content_message} +{if $searchresult_tooShort} + +{elseif $searchresult_error} + +{elseif $searchresult_noEntries} + +{elseif $searchresult_results} + +{else} +
{$content_message}
+{/if} + {$ENTRIES} {$ARCHIVES} -- 2.39.5