Solve RFE #1210676: Assign DIV-Containers for CSS-styling the search results

diff --git a/docs/NEWS b/docs/NEWS
index 6fb714d92eb37c06a963abf86bae1ba1d7533e1e..f0ff153b3f9b2725328556e88bec7521b94307a5 100644 (file)
--- 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 7ccfaccf1b5b774a7c96ce6bbdff722a0dd8ae34..2746b956dc6950d5b90d9383bd07b6e7d498c2df 100644 (file)
--- 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 9f882672d2e3fe1212dd9ee0088fd8b0e67d18af..dd6e045442409d9717c7c1069d71da59fc69aeb0 100644 (file)
--- a/templates/default/content.tpl
+++ b/templates/default/content.tpl
@@ -1,6 +1,17 @@
 <!-- CONTENT START -->
 
-{$content_message}
+{if $searchresult_tooShort}
+       <div class="serendipity_search serendipity_search_tooshort">{$content_message}</div>
+{elseif $searchresult_error}
+       <div class="serendipity_search serendipity_search_error">{$content_message}</div>
+{elseif $searchresult_noEntries}
+       <div class="serendipity_search serendipity_search_noentries">{$content_message}</div>
+{elseif $searchresult_results}
+       <div class="serendipity_search serendipity_search_results">{$content_message}</div>
+{else}
+       <div class="serendipity_content_message">{$content_message}</div>
+{/if}
+
 {$ENTRIES}
 {$ARCHIVES}