Merge branch 'master' into es_17_01

This commit is contained in:
2017-02-08 19:38:54 +01:00
4 changed files with 78 additions and 30 deletions

View File

@@ -42,7 +42,7 @@
<div class="col-md-2 col-md-offset-9">
<form action="{$site_url/}gcse" class="search-form" id="gcse_search_form">
<div class="form-group has-feedback">
<input type="search" class="form-control" name="q" id="gcse_search" placeholder="search" value="{$google_search/}" >
<input type="search" class="form-control" name="q" id="gcse_search" placeholder="search" value="{$cms_search_query/}" >
<span class="glyphicon glyphicon-search form-control-feedback"></span>
</div>
</form>