aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgrum <grum@piwigo.org>2008-10-28 21:19:25 +0000
committergrum <grum@piwigo.org>2008-10-28 21:19:25 +0000
commit059a02f5a76dfe7de0d63373f3da7d1ab44c1bc0 (patch)
tree17b63a572f9f87cf0986e097084cc9c81e0dae94
parent027055eb9fbbef68c6d3915e017d198fa9033774 (diff)
menu item "quicksearch" will be displayed only if a $block->data is set (like
other menu items) use of a boolean value for the "qsearch" $block->data variable (see topic #98370) git-svn-id: http://piwigo.org/svn/branches/2.0@2814 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--include/menubar.inc.php4
-rw-r--r--template/yoga/menubar_menu.tpl14
2 files changed, 12 insertions, 6 deletions
diff --git a/include/menubar.inc.php b/include/menubar.inc.php
index 6e9f73a86..2d620e1d6 100644
--- a/include/menubar.inc.php
+++ b/include/menubar.inc.php
@@ -215,6 +215,10 @@ function initialize_menu()
//---------------------------------------------------------------------- summary
if ( ($block=$menu->get_block('mbMenu')) != null )
{
+ // quick search block will be displayed only if data['qsearch'] is set
+ // to "yes"
+ $block->data['qsearch']=true;
+
// tags link
$block->data['tags'] =
array(
diff --git a/template/yoga/menubar_menu.tpl b/template/yoga/menubar_menu.tpl
index c16fae690..2600a8979 100644
--- a/template/yoga/menubar_menu.tpl
+++ b/template/yoga/menubar_menu.tpl
@@ -1,11 +1,13 @@
<dt>{'title_menu'|@translate}</dt>
<dd>
- <form action="{$ROOT_URL}qsearch.php" method="get" id="quicksearch" onsubmit="return this.q.value!='' && this.q.value!=qsearch_prompt;">
- <p style="margin:0;padding:0"{*this <p> is for html validation only - does not affect positioning*}>
- <input type="text" name="q" id="qsearchInput" onfocus="if (value==qsearch_prompt) value='';" onblur="if (value=='') value=qsearch_prompt;" style="width:90%"/>
- </p>
- </form>
- <script type="text/javascript">var qsearch_prompt="{'qsearch'|@translate|@escape:'javascript'}"; document.getElementById('qsearchInput').value=qsearch_prompt;</script>
+ {if isset($block->data.qsearch) and $block->data.qsearch==true}
+ <form action="{$ROOT_URL}qsearch.php" method="get" id="quicksearch" onsubmit="return this.q.value!='' && this.q.value!=qsearch_prompt;">
+ <p style="margin:0;padding:0"{*this <p> is for html validation only - does not affect positioning*}>
+ <input type="text" name="q" id="qsearchInput" onfocus="if (value==qsearch_prompt) value='';" onblur="if (value=='') value=qsearch_prompt;" style="width:90%"/>
+ </p>
+ </form>
+ <script type="text/javascript">var qsearch_prompt="{'qsearch'|@translate|@escape:'javascript'}"; document.getElementById('qsearchInput').value=qsearch_prompt;</script>
+ {/if}
<ul>
{foreach from=$block->data item=link}