Merge pull request weblab#8 from szk11001/master

Search and mega footer
jmr06005 · Aug 5, 2014 · c2edc00 · c2edc00
2 parents 168335c + d6557bc
commit c2edc00
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/footer.php b/footer.php
@@ -10,7 +10,7 @@
 	</div><!-- .container-->
 	</div><!-- #content -->
 	<div id="footers">
-		<?php get_template_part('mega-footer'); ?>
+		<?php get_template_part( 'inc/mega', 'footer' ); ?>
 		<footer id="footer" class="site-footer" role="contentinfo">
 			<div class="container">
 				<ul id="uc-footer-links" class="clearfix">

diff --git a/mega-footer.php → inc/mega-footer.php b/mega-footer.php → inc/mega-footer.php
diff --git a/inc/reg-sidebars.php b/inc/reg-sidebars.php
@@ -147,10 +147,10 @@ function custom_searchform($form){
 		$search_counter = 0;
 	}
 	$search_counter++;
-
-	$form = '<div class="searchform"><form action="/" method="get" class="form-inline" role="form"><div class="form-group"><fieldset>';
-		$form .= '<label for="search-'.$search_counter.'" class="sr-only">Search in '.home_url( '/' ).'></label>';
-		$form .= '<input type="text" name="s" id="search-'.$search_counter.'" value="'.the_search_query().'" class="form-control" placeholder="Search... " />';
+	
+	$form = '<div class="searchform"><form action="'.home_url( '/' ).'" method="get" class="form-inline" role="form"><div class="form-group"><fieldset>';
+		$form .= '<label for="searchfield-'.$search_counter.'" class="sr-only">Search in '.home_url( '/' ).'></label>';
+		$form .= '<input type="text" name="s" id="searchfield-'.$search_counter.'" value="'.get_search_query().'" class="form-control search" placeholder="Search '.get_bloginfo("name").'... " />';
 		$form .= '<button type="submit" class="btn btn-default" title="Search"><i class="glyphicon glyphicon-search"></i><span class="sr-only">Search</span></button>';
 	$form .= '</fieldset></div></form></div>';
 

diff --git a/js/cs.js b/js/cs.js
@@ -203,11 +203,12 @@ function stickyFoot(){
 	var wrapperH = document.getElementById('page').clientHeight;
 	var footerH = document.getElementById('footers').clientHeight;
 	var comboH = wrapperH + footerH;
-	var windowH = window.innerHeight;
-	if(windowH>=comboH){
-		$('body').addClass('sticky')
+	var windowH = $(window).innerHeight();
+
+	if(windowH >= comboH){
+		$('body').addClass('sticky');
 	} else {
-		$('body').removeClass('sticky')
+		$('body').removeClass('sticky');
 	}
 }
 window.onload = function (){