aboutsummaryrefslogtreecommitdiffstats
path: root/themes
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2014-03-22 13:03:45 +0000
committerrvelices <rv-github@modusoptimus.com>2014-03-22 13:03:45 +0000
commitdc17fc9ba94b9490ed79fc82b9c4d5bf7f2640af (patch)
tree00bc3c25778d848ac4d51fe6f2f5b06462c7b28e /themes
parenteeb9c387cc4b2f131e3a98afa255992042d9904e (diff)
bug 3056: quick search OR operator priority taken into account
search for 'mary qwerty' will ignore 'qwerty' and return only results for 'mary' if there is no such thing as 'qwerty' in the photos (if there was 'mary' and 'qwerty', the results for both 'mary' AND 'qwerty' would be shown) git-svn-id: http://piwigo.org/svn/trunk@27882 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'themes')
-rw-r--r--themes/default/template/index.tpl19
-rw-r--r--themes/default/theme.css2
2 files changed, 16 insertions, 5 deletions
diff --git a/themes/default/template/index.tpl b/themes/default/template/index.tpl
index 00dccca5e..e8009b9d2 100644
--- a/themes/default/template/index.tpl
+++ b/themes/default/template/index.tpl
@@ -121,25 +121,36 @@
{if !empty($PLUGIN_INDEX_CONTENT_BEGIN)}{$PLUGIN_INDEX_CONTENT_BEGIN}{/if}
+{if !empty($no_search_results)}
+<p class="search_results">{'No results for'|@translate} :
+ <em><strong>
+ {foreach $no_search_results as $res}
+ {if !$res@first} &mdash; {/if}
+ {$res}
+ {/foreach}
+ </strong></em>
+</p>
+{/if}
+
{if !empty($category_search_results)}
-<div class="category_search_results">{'Album results for'|@translate} <strong>{$QUERY_SEARCH}</strong> :
+<p class="search_results">{'Album results for'|@translate} <strong>{$QUERY_SEARCH}</strong> :
<em><strong>
{foreach from=$category_search_results item=res name=res_loop}
{if !$smarty.foreach.res_loop.first} &mdash; {/if}
{$res}
{/foreach}
</strong></em>
-</div>
+</p>
{/if}
{if !empty($tag_search_results)}
-<div class="tag_search_results">{'Tag results for'|@translate} <strong>{$QUERY_SEARCH}</strong> :
+<p class="search_results">{'Tag results for'|@translate} <strong>{$QUERY_SEARCH}</strong> :
<em><strong>
{foreach from=$tag_search_results item=tag name=res_loop}
{if !$smarty.foreach.res_loop.first} &mdash; {/if} <a href="{$tag.URL}">{$tag.name}</a>
{/foreach}
</strong></em>
-</div>
+</p>
{/if}
{if isset($FILE_CHRONOLOGY_VIEW)}
diff --git a/themes/default/theme.css b/themes/default/theme.css
index a5f8e49ad..08114a392 100644
--- a/themes/default/theme.css
+++ b/themes/default/theme.css
@@ -114,7 +114,7 @@
}
/* category and tag results paragraphs on a quick search */
-.category_search_results, .tag_search_results {
+.search_results {
font-size: 16px;
margin: 10px 16px;
}