Merge remote-tracking branch 'origin/slurm-16.05' into slurm-17.02

doc/html/header.txt

@@ -13,25 +13,16 @@
 	<link rel="stylesheet" type="text/css" href="style.css" />
 	<link rel="stylesheet" type="text/css" href="slurm.css" />
 
-	<script src="jquery.min.js"></script>
-	<script src="https://www.google.com/jsapi" type="text/javascript"></script>
 	<script type="text/javascript">
-	jQuery(document).ready(function() {
-		jQuery('.menu-trigger').bind('click touchstart', function() {
-			jQuery(this).find('.menu-trigger__lines').toggleClass('menu-trigger__lines--closed');
-			jQuery(this).parents('.site-header').find('.site-nav').toggleClass('site-nav--active');
-
-			return false;
-		});
-	});
-
-	google.load('search', '1', {language : 'en', style : google.loader.themes.V2_DEFAULT});
-	google.setOnLoadCallback(function() {
-	    var customSearchOptions = {};  var customSearchControl = new google.search.CustomSearchControl(
-	      '011890816164765777536:jvrtxrd3f0w', customSearchOptions);
-	    customSearchControl.setResultSetSize(google.search.Search.SMALL_RESULTSET);
-	    customSearchControl.draw('cse');
-	}, true);
+	(function() {
+	  var cx = '011890816164765777536:jvrtxrd3f0w';
+	  var gcse = document.createElement('script');
+	  gcse.type = 'text/javascript';
+	  gcse.async = true;
+	  gcse.src = 'https://cse.google.com/cse.js?cx=' + cx;
+	  var s = document.getElementsByTagName('script')[0];
+	  s.parentNode.insertBefore(gcse, s);
+	})();
 	</script>
 </head>
 
@@ -110,8 +101,8 @@
 
 	<div class="content" role="main">
 		<section class="slurm-search">
-			<div class="container">
-				<div id="cse"></div>
+			<div class="container" id="cse">
+				<gcse:search></gcse:search>
 			</div>
 		</section>