openstack/releases
Code Issues Proposed changes

move search to a normal sidebar element

Browse Source 
Change-Id: Ic3572166e9080741aff1929608017e5746af9d81
Signed-off-by: Doug Hellmann <doug@doughellmann.com>
This commit is contained in:
Doug Hellmann
2016-02-08 18:15:39 -05:00
parent 9128ba1600
commit da695f130d
6 changed files with 16 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/_themes/releases/header.html
View File

@@ -10,7 +10,7 @@
<div class="brand-wrapper">
<a class="navbar-brand" href="/"></a>
</div>
<div class="search-icon show"><i class="fa fa-search"></i> Search</div></div>
</div>
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<div class="search-container tiny">
<div id="gcse">

1
doc/source/_themes/releases/layout.html
View File

@@ -60,6 +60,7 @@ ga('send', 'pageview');
</div>
</div>
</div>
{% include 'sidebar_search.html' %}
{% include 'sidebartoc.html' %}
</div>
</div>

14
doc/source/_themes/releases/script_footer.html
View File

@@ -55,17 +55,3 @@
logABug(bugTitle, bugProject, fieldComment, fieldTags);
</script>
<!-- Javascript for search boxes (both sidebar and top nav) -->
<script type="text/javascript">
(function() {
var cx = '000108871792296872333:noj9nikm74i';
var gcse = document.createElement('script');
gcse.type = 'text/javascript';
gcse.async = true;
gcse.src = (document.location.protocol == 'https:' ? 'https:' : 'http:') +
'//www.google.com/cse/cse.js?cx=' + cx;
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(gcse, s);
})();
</script>

28
doc/source/_themes/releases/script_search.html
View File

@@ -1,28 +0,0 @@
<script src="http://www.google.com/jsapi" type="text/javascript"></script>
<script type="text/javascript">
//<![CDATA[
google.load('search', '1', {
language: 'en'
});
var _gaq = _gaq ||[];
_gaq.push([ "_setAccount", "UA-17511903-1"]);
function _trackQuery(control, searcher, query) {
var gaQueryParamName = "q";
var loc = document.location;
var url =[
loc.pathname,
loc.search,
loc.search ? '&': '?',
gaQueryParamName == '' ? 'q': encodeURIComponent(gaQueryParamName),
'=',
encodeURIComponent(query)].join('');
_gaq.push([ "_trackPageview", url]);
}
google.setOnLoadCallback(function () {
var customSearchControl = new google.search.CustomSearchControl('011012898598057286222:elxsl505o0o');
customSearchControl.setResultSetSize(google.search.Search.FILTERED_CSE_RESULTSET);
customSearchControl.setSearchStartingCallback(null, _trackQuery);
customSearchControl.draw('cse');
},
true);//]]>
</script>

14
doc/source/_themes/releases/sidebar_search.html Normal file
View File

@@ -0,0 +1,14 @@
{%- block sidebarsearch %}
{%- if pagename != "search" %}
<div class="col-lg-3 col-md-4 col-sm-4 col-lg-pull-9 col-md-pull-8 col-sm-pull-8 docs-sidebar">
<div id="searchbox">
<form class="search" action="{{ pathto('search') }}" method="get">
<input type="text" name="q" size="18" />
<input type="submit" value="{{ _('Search') }}" />
<input type="hidden" name="check_keywords" value="yes" />
<input type="hidden" name="area" value="default" />
</form>
</div>
</div>
{%- endif %}
{%- endblock %}

3
doc/source/_themes/releases/sidebartoc.html
View File

@@ -1,7 +1,4 @@
<div class="col-lg-3 col-md-4 col-sm-4 col-lg-pull-9 col-md-pull-8 col-sm-pull-8 docs-sidebar">
<div class="search-icon show">
<i class="fa fa-search"></i> Search
</div>
<div class="btn-group docs-sidebar-releases">
<button onclick="location.href='/'" class="btn docs-sidebar-home" data-toggle="tooltip" data-placement="top" title="Releases Home"><i class="fa fa-arrow-circle-o-left"></i> Releases Home</button>
</div>