summaryrefslogtreecommitdiff
path: root/modules/search/views/search.html.php
diff options
context:
space:
mode:
authorNathan Kinkade <nath@nkinka.de>2012-12-17 22:34:12 +0000
committerNathan Kinkade <nath@nkinka.de>2012-12-17 22:34:12 +0000
commit77e2e58aeff49477242f789b367def4b08836a47 (patch)
treea5e260a21f471d7aca00362ac681cc8b96bf8a16 /modules/search/views/search.html.php
parentdf12e1bcf7547802a94a7b492cdb22fca9ec6e1c (diff)
parentf2a32526be0a307005052105ed09bc337e29d333 (diff)
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/search/views/search.html.php')
-rw-r--r--modules/search/views/search.html.php12
1 files changed, 12 insertions, 0 deletions
diff --git a/modules/search/views/search.html.php b/modules/search/views/search.html.php
index 4279cbab..f1906744 100644
--- a/modules/search/views/search.html.php
+++ b/modules/search/views/search.html.php
@@ -8,6 +8,7 @@
<ul>
<li>
<label for="q"><?= t("Search the gallery") ?></label>
+ <input name="album" type="hidden" value="<?= html::clean_attribute($album->id) ?>" />
<input name="q" id="q" type="text" value="<?= html::clean_attribute($q) ?>" class="text" />
</li>
<li>
@@ -20,6 +21,17 @@
<div id="g-search-results">
<h1><?= t("Search results") ?></h1>
+ <? if ($album->id == item::root()->id): ?>
+ <div>
+ <?= t("Searched the whole gallery.") ?>
+ </div>
+ <? else: ?>
+ <div>
+ <?= t("Searched within album <b>%album</b>.", array("album" => html::purify($album->title))) ?>
+ <a href="<?= url::site(url::merge(array("album" => item::root()->id))) ?>"><?= t("Search whole gallery") ?></a>
+ </div>
+ <? endif; ?>
+
<? if (count($items)): ?>
<ul id="g-album-grid" class="ui-helper-clearfix">
<? foreach ($items as $item): ?>