From 8ddb5afa4efa8b7b88fab2f15dabc0ee78e065aa Mon Sep 17 00:00:00 2001
From: Salman <salmankaleem94@gmail.com>
Date: Wed, 30 Jul 2014 11:21:31 -0400
Subject: [PATCH 1/3] Search and mega footer

-Fixed searching
-Moved mega footer to inc
---
 footer.php                             | 2 +-
 mega-footer.php => inc/mega-footer.php | 0
 inc/reg-sidebars.php                   | 8 ++++----
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename mega-footer.php => inc/mega-footer.php (100%)

diff --git a/footer.php b/footer.php
index c08955a..70e80d6 100755
--- a/footer.php
+++ b/footer.php
@@ -10,7 +10,7 @@
 	</div><!-- .container-->
 	</div><!-- #content -->
 	<div id="footers">
-		<?php get_template_part('mega-footer'); ?>
+		<?php include_once 'inc/mega-footer.php'; ?>
 		<footer id="footer" class="site-footer" role="contentinfo">
 			<div class="container">
 				<ul id="uc-footer-links" class="clearfix">
diff --git a/mega-footer.php b/inc/mega-footer.php
similarity index 100%
rename from mega-footer.php
rename to inc/mega-footer.php
diff --git a/inc/reg-sidebars.php b/inc/reg-sidebars.php
index 14ccc81..fccc61c 100644
--- a/inc/reg-sidebars.php
+++ b/inc/reg-sidebars.php
@@ -127,10 +127,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>';
 

From 667ccca0b1392f319f18390a091cdd4c384aa0d1 Mon Sep 17 00:00:00 2001
From: Salman <salmankaleem94@gmail.com>
Date: Fri, 1 Aug 2014 11:16:58 -0400
Subject: [PATCH 2/3] Sticky class fix

Changed the way window height was calculated (IE 7/8 couldn't find the
height)
---
 js/cs.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/js/cs.js b/js/cs.js
index dcdd7ba..ec1db1a 100644
--- a/js/cs.js
+++ b/js/cs.js
@@ -219,11 +219,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 (){

From d6557bc6b3284f97484fb73770daa6c70464f207 Mon Sep 17 00:00:00 2001
From: Salman <salmankaleem94@gmail.com>
Date: Fri, 1 Aug 2014 11:27:22 -0400
Subject: [PATCH 3/3] Changed megafooter call function

---
 footer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/footer.php b/footer.php
index 70e80d6..f4e7a19 100755
--- a/footer.php
+++ b/footer.php
@@ -10,7 +10,7 @@
 	</div><!-- .container-->
 	</div><!-- #content -->
 	<div id="footers">
-		<?php include_once 'inc/mega-footer.php'; ?>
+		<?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">