From 7b12a6926b540722b40b17933ab8c79761d318ad Mon Sep 17 00:00:00 2001
From: andrewmbacon <andrew.bacon@me.com>
Date: Fri, 22 Aug 2014 15:23:45 -0400
Subject: [PATCH 1/2] Merge branch 'master' of
 github.uconn.edu:szk11001/cornerstone into szk11001-master

Conflicts:
	css/widgets-area.php
	functions.php
	inc/reg-sidebars.php
	js/admin-style.js
	js/navigation.js
---
 css/widgets-area.php |  22 ---
 functions.php        | 437 +++++++++++++++++++++++--------------------
 inc/reg-sidebars.php | 318 +++++++++++++++----------------
 js/admin-style.js    |  27 ++-
 page.php             |   2 +-
 5 files changed, 406 insertions(+), 400 deletions(-)
 delete mode 100644 css/widgets-area.php

diff --git a/css/widgets-area.php b/css/widgets-area.php
deleted file mode 100644
index 042fcfc..0000000
--- a/css/widgets-area.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?php
-	$absolute_path = explode('wp-content', $_SERVER['SCRIPT_FILENAME']);
-	$wp_load = $absolute_path[0] . 'wp-load.php';
-	require_once($wp_load);
-
-	header("Content-type: text/css; charset: UTF-8");
-	header('Cache-control: must-revalidate');
-
-	$sidebars = wp_get_sidebars_widgets();
-	$index = 0;
-	for ($i=1; $i < 31 ; $i++) { 
-		if( !empty($sidebars['home'.$i]) ){
-			if( $i > $index ){
-				$index = $i; //$index is the biggest home widget area that has widgets, the next widget area doesn't have widgets
-			}
-		}
-	}
-	$start = ++$index;
-	for ($i=$start; $i < 31; $i++) { 
-		echo '#home'.$i.'{ display:none; } ';
-	}
-?>
\ No newline at end of file
diff --git a/functions.php b/functions.php
index a9c7158..f0600e5 100644
--- a/functions.php
+++ b/functions.php
@@ -1,204 +1,233 @@
-<?php
-/**
- * cornerstone functions and definitions
- *
- * @package cornerstone
- */
-
-/**
- * Set the content width based on the theme's design and stylesheet.
- */
-if ( ! isset( $content_width ) ) {
-	$content_width = 640; /* pixels */
-}
-
-if ( ! function_exists( 'cs_setup' ) ) :
-/**
- * Sets up theme defaults and registers support for various WordPress features.
- *
- * Note that this function is hooked into the after_setup_theme hook, which
- * runs before the init hook. The init hook is too late for some features, such
- * as indicating support for post thumbnails.
- */
-function cs_setup() {
-
-	/*
-	 * Make theme available for translation.
-	 * Translations can be filed in the /languages/ directory.
-	 * If you're building a theme based on cornerstone, use a find and replace
-	 * to change 'cs' to the name of your theme in all the template files
-	 */
-	load_theme_textdomain( 'cs', get_template_directory() . '/languages' );
-
-	// Add default posts and comments RSS feed links to head.
-	add_theme_support( 'automatic-feed-links' );
-
-	/*
-	 * Enable support for Post Thumbnails on posts and pages.
-	 *
-	 * @link http://codex.wordpress.org/Function_Reference/add_theme_support#Post_Thumbnails
-	 */
-	//add_theme_support( 'post-thumbnails' );
-
-	// This theme uses wp_nav_menu() in one location.
-	register_nav_menus( array(
-		'primary' => __( 'Primary Menu', 'cs' ),
-	) );
-
-	// Enable support for Post Formats.
-	add_theme_support( 'post-formats', array( 'aside', 'image', 'video', 'quote', 'link' ) );
-
-	// Setup the WordPress core custom background feature.
-	add_theme_support( 'custom-background', apply_filters( 'cs_custom_background_args', array(
-		'default-color' => 'ffffff',
-		'default-image' => '',
-	) ) );
-
-	// Enable support for HTML5 markup.
-	add_theme_support( 'html5', array(
-		'comment-list',
-		'search-form',
-		'comment-form',
-		'gallery',
-		'caption',
-	) );
-}
-endif; // cs_setup
-add_action( 'after_setup_theme', 'cs_setup' );
-
-/**
- * Register widget area.
- *
- * @link http://codex.wordpress.org/Function_Reference/register_sidebar
- */
-function cs_widgets_init() {
-	require get_template_directory() . '/inc/reg-sidebars.php';
-}
-add_action( 'widgets_init', 'cs_widgets_init' );
-
-/**
- * Enqueue scripts and styles.
- */
-function cs_scripts() {	
-
-	wp_enqueue_style( 'cs-style', get_stylesheet_uri());
-	
-	wp_enqueue_script( 'cs-bootstrap-js', get_template_directory_uri() . '/js/bootstrap.min.js', array( 'jquery' ));
-	wp_enqueue_script( 'cs-modernizr', get_template_directory_uri() . '/js/cs-modernizr.js', array( 'jquery' ));
-	wp_enqueue_script( 'cs', get_template_directory_uri() . '/js/cs.js', array( 'jquery' ));
-	wp_enqueue_script( 'cs-navigation', get_template_directory_uri() . '/js/navigation.js', array( 'cs-bootstrap-js'), '20120206', true );
-	wp_enqueue_script( 'cs-skip-link-focus-fix', get_template_directory_uri() . '/js/skip-link-focus-fix.js', array(), '20130115', true );
-
-	if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
-		wp_enqueue_script( 'comment-reply' );
-	}
-}
-
-add_action( 'wp_enqueue_scripts', 'cs_scripts' );
-
-function htmlShiv(){
-	$template = get_template_directory_uri();
-	echo 	'<!--[if lt IE 9]>
-			<script src="' . $template . '/js/html5shiv/html5shiv.min.js"></script>
-			<script src="' . $template . '/js/html5shiv/html5shiv-printshiv.min.js"></script>
-			<![endif]-->';	
-			
-		//needed for IE7 grid hack
-		/*echo	'<!--[if lt IE 8]>
-				<link href="'. $template .'/css/bootstrap.css" rel="stylesheet">
-				<![endif]-->'; */	
-}
-
-add_action( 'wp_head', htmlShiv, 1 );
-
-function ieBootstrap(){
-	$template = get_template_directory_uri();
-	echo 	'<!--[if lt IE 9]>
-			<script src="' . $template . '/js/respond.min.js"></script>
-			<![endif]-->';	
-	/*
-	echo	'<!--[if lt IE 8]>
-   			<link href="'. $template .'/css/bootstrap-ie7.css.php" rel="stylesheet">
-			<![endif]-->';
-		*/
-}
-add_action( 'wp_head', ieBootstrap, 99 );
-
-/**
- * Implement the Custom Header feature.
- */
-require get_template_directory() . '/inc/custom-header.php';
-
-/**
- * Custom template tags for this theme.
- */
-require get_template_directory() . '/inc/template-tags.php';
-
-/**
- * Custom functions that act independently of the theme templates.
- */
-require get_template_directory() . '/inc/extras.php';
-
-/**
- * Customizer additions.
- */
-require get_template_directory() . '/inc/customizer.php';
-
-/**
- * Load Jetpack compatibility file.
- */
-//require get_template_directory() . '/inc/jetpack.php';
-
-
-/** 
-* New versions of functions from Hale, added as includes
-*/
-require get_template_directory() . '/inc/nav-walker.php';
-
-
-/** 
-* Bootstrap the comment form.
-*/
-require get_template_directory() . '/inc/bootstrap-forms.php';
-
-
-// Change what's hidden by default
-add_filter('default_hidden_meta_boxes', 'be_hidden_meta_boxes', 10, 2);
-function be_hidden_meta_boxes($hidden, $screen) {
-	if ( 'post' == $screen->base || 'page' == $screen->base )
-		$hidden = array('slugdiv', 'trackbacksdiv', 'postexcerpt', 'commentstatusdiv', 'commentsdiv', 'authordiv', 'revisionsdiv');
-		// removed 'postcustom',
-	return $hidden;
-}
-
-
-function load_custom_wp_admin_style($hook) {
-	wp_register_style( 'custom_wp_admin_css', get_template_directory_uri() . '/css/admin-style.css', false, '1.0.0' );
-	wp_enqueue_style( 'custom_wp_admin_css' );
-	
-	
-	wp_register_script('uc-admin-js', get_template_directory_uri() . '/js/admin-style.js', false, '1.0.0');
-	wp_enqueue_script('uc-admin-js');
-		
-	if( 'widgets.php' != $hook )
-	    return;
-	wp_register_style( 'css-widgets-area', get_template_directory_uri().'/css/widgets-area.php' );
-	wp_enqueue_style( 'css-widgets-area' );
-}
-add_action( 'admin_enqueue_scripts', 'load_custom_wp_admin_style' );
-
-/*
-function remove_widgets() {
-	// removed to avoid confusion with UConn Calendar widget
-	unregister_widget('WP_Widget_Calendar');
-	// removed to de-emphasize blog use
-	unregister_widget('WP_Widget_Recent_Comments');
-	unregister_widget('WP_Widget_Meta');
-	// removed for conflict with simple social plugin on IE9
-	unregister_widget('WP_Widget_Categories');
-
-}
-add_action( 'widgets_init', 'remove_widgets' );
-*/
-
-add_theme_support( 'post-thumbnails' ); 
\ No newline at end of file
+<?php
+/**
+ * cornerstone functions and definitions
+ *
+ * @package cornerstone
+ */
+
+/**
+ * Set the content width based on the theme's design and stylesheet.
+ */
+if ( ! isset( $content_width ) ) {
+	$content_width = 640; /* pixels */
+}
+
+if ( ! function_exists( 'cs_setup' ) ) :
+/**
+ * Sets up theme defaults and registers support for various WordPress features.
+ *
+ * Note that this function is hooked into the after_setup_theme hook, which
+ * runs before the init hook. The init hook is too late for some features, such
+ * as indicating support for post thumbnails.
+ */
+function cs_setup() {
+
+	/*
+	 * Make theme available for translation.
+	 * Translations can be filed in the /languages/ directory.
+	 * If you're building a theme based on cornerstone, use a find and replace
+	 * to change 'cs' to the name of your theme in all the template files
+	 */
+	load_theme_textdomain( 'cs', get_template_directory() . '/languages' );
+
+	// Add default posts and comments RSS feed links to head.
+	add_theme_support( 'automatic-feed-links' );
+
+	/*
+	 * Enable support for Post Thumbnails on posts and pages.
+	 *
+	 * @link http://codex.wordpress.org/Function_Reference/add_theme_support#Post_Thumbnails
+	 */
+	//add_theme_support( 'post-thumbnails' );
+
+	// This theme uses wp_nav_menu() in one location.
+	register_nav_menus( array(
+		'primary' => __( 'Primary Menu', 'cs' ),
+	) );
+
+	// Enable support for Post Formats.
+	add_theme_support( 'post-formats', array( 'aside', 'image', 'video', 'quote', 'link' ) );
+
+	// Setup the WordPress core custom background feature.
+	add_theme_support( 'custom-background', apply_filters( 'cs_custom_background_args', array(
+		'default-color' => 'ffffff',
+		'default-image' => '',
+	) ) );
+
+	// Enable support for HTML5 markup.
+	add_theme_support( 'html5', array(
+		'comment-list',
+		'search-form',
+		'comment-form',
+		'gallery',
+		'caption',
+	) );
+}
+endif; // cs_setup
+add_action( 'after_setup_theme', 'cs_setup' );
+
+/**
+ * Register widget area.
+ *
+ * @link http://codex.wordpress.org/Function_Reference/register_sidebar
+ */
+function cs_widgets_init() {
+	require get_template_directory() . '/inc/reg-sidebars.php';
+}
+add_action( 'widgets_init', 'cs_widgets_init' );
+
+/**
+ * Enqueue scripts and styles.
+ */
+function cs_scripts() {	
+
+	wp_enqueue_style( 'cs-style', get_stylesheet_uri());
+	
+	wp_enqueue_script( 'cs-bootstrap-js', get_template_directory_uri() . '/js/bootstrap.min.js', array( 'jquery' ));
+	wp_enqueue_script( 'cs-modernizr', get_template_directory_uri() . '/js/cs-modernizr.js', array( 'jquery' ));
+	wp_enqueue_script( 'cs', get_template_directory_uri() . '/js/cs.js', array( 'jquery' ));
+	wp_enqueue_script( 'cs-navigation', get_template_directory_uri() . '/js/navigation.js', array( 'cs-bootstrap-js'), '20120206', true );
+	wp_enqueue_script( 'cs-skip-link-focus-fix', get_template_directory_uri() . '/js/skip-link-focus-fix.js', array(), '20130115', true );
+
+	if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
+		wp_enqueue_script( 'comment-reply' );
+	}
+}
+
+add_action( 'wp_enqueue_scripts', 'cs_scripts' );
+
+function htmlShiv(){
+	$template = get_template_directory_uri();
+	echo 	'<!--[if lt IE 9]>
+			<script src="' . $template . '/js/html5shiv/html5shiv.min.js"></script>
+			<script src="' . $template . '/js/html5shiv/html5shiv-printshiv.min.js"></script>
+			<![endif]-->';	
+			
+		//needed for IE7 grid hack
+		/*echo	'<!--[if lt IE 8]>
+				<link href="'. $template .'/css/bootstrap.css" rel="stylesheet">
+				<![endif]-->'; */	
+}
+
+add_action( 'wp_head', htmlShiv, 1 );
+
+function ieBootstrap(){
+	$template = get_template_directory_uri();
+	echo 	'<!--[if lt IE 9]>
+			<script src="' . $template . '/js/respond.min.js"></script>
+			<![endif]-->';	
+	/*
+	echo	'<!--[if lt IE 8]>
+   			<link href="'. $template .'/css/bootstrap-ie7.css.php" rel="stylesheet">
+			<![endif]-->';
+		*/
+}
+add_action( 'wp_head', ieBootstrap, 99 );
+
+/**
+ * Implement the Custom Header feature.
+ */
+require get_template_directory() . '/inc/custom-header.php';
+
+/**
+ * Custom template tags for this theme.
+ */
+require get_template_directory() . '/inc/template-tags.php';
+
+/**
+ * Custom functions that act independently of the theme templates.
+ */
+require get_template_directory() . '/inc/extras.php';
+
+/**
+ * Customizer additions.
+ */
+require get_template_directory() . '/inc/customizer.php';
+
+/**
+ * Load Jetpack compatibility file.
+ */
+//require get_template_directory() . '/inc/jetpack.php';
+
+
+/** 
+* New versions of functions from Hale, added as includes
+*/
+require get_template_directory() . '/inc/nav-walker.php';
+
+
+/** 
+* Bootstrap the comment form.
+*/
+require get_template_directory() . '/inc/bootstrap-forms.php';
+
+
+// Change what's hidden by default
+add_filter('default_hidden_meta_boxes', 'be_hidden_meta_boxes', 10, 2);
+function be_hidden_meta_boxes($hidden, $screen) {
+	if ( 'post' == $screen->base || 'page' == $screen->base )
+		$hidden = array('slugdiv', 'trackbacksdiv', 'postexcerpt', 'commentstatusdiv', 'commentsdiv', 'authordiv', 'revisionsdiv');
+		// removed 'postcustom',
+	return $hidden;
+}
+
+
+function load_custom_wp_admin_style($hook) {
+    wp_register_style( 'custom_wp_admin_css', get_template_directory_uri() . '/css/admin-style.css', false, '1.0.0' );
+    wp_enqueue_style( 'custom_wp_admin_css' );
+	
+	
+	wp_register_script('uc-admin-js', get_template_directory_uri() . '/js/admin-style.js', false, '1.0.0');
+	wp_enqueue_script('uc-admin-js');
+
+	if( 'widgets.php' != $hook )
+	    return;
+	wp_register_style( 'css-widgets-area', get_template_directory_uri().'/css/widgets-area.php' );
+	wp_enqueue_style( 'css-widgets-area' );
+}
+add_action( 'admin_enqueue_scripts', 'load_custom_wp_admin_style' );
+
+add_theme_support( 'post-thumbnails' ); 
+
+//Bootstrap whitelist
+function add_allowed_tags($tags) {
+	$newtags = array(
+			'div',
+			'ul',
+			'li',
+			'button',
+			'a');
+	$newattrs = array(
+			'data-toggle' => true,
+			'data-dismiss' => true,
+			'data-target' => true,
+			'data-spy' => true,
+			'data-loading-text' => true,
+			'data-parent' => true,
+			'data-slide' => true,
+			'data-slide-to' => true,
+			'data-provide' => true,
+			'data-interval' => true,
+			'data-pause' => true,
+			'data-animation' => true,
+			'data-html' => true,
+			'data-placement' => true,
+			'data-selector' => true,
+			'data-title' => true,
+			'data-trigger' => true,
+			'data-delay' => true,
+			'data-container' => true);
+
+	foreach($newtags as $newtag){
+		if( isset($tags[$newtag]) && is_array($tags[$newtag])){
+			$tags[$newtag] = array_merge($tags[$newtag], $newattrs);
+		}
+		else{
+			$tags[$newtag] = $newattrs;
+		}
+	}
+	
+    return $tags;
+}
+add_filter('wp_kses_allowed_html', 'add_allowed_tags');
+?>
\ No newline at end of file
diff --git a/inc/reg-sidebars.php b/inc/reg-sidebars.php
index ada2f54..89e9d7e 100644
--- a/inc/reg-sidebars.php
+++ b/inc/reg-sidebars.php
@@ -1,160 +1,160 @@
-<?php 
-
-/**
- * Register widget area.
- *
- * @link http://codex.wordpress.org/Function_Reference/register_sidebar
- */
- 
- 
-
-if ( function_exists('register_sidebar') ) {
-	$sidebars = get_option( 'uc_sidebars' );
-	if(!isset($sidebars['mega-footer'])){
-		$sidebars['mega-footer'] = array(
-			'name'         		=> __( 'Mega Footer', 'theme_text_domain' ),
-			'description'   	=> 'Limited to 6 widgets. Will appear at the bottom of every page in the site.',
-			'before_widget' 	=> '<aside class=""><div id="%1$s" class="%2$s widget">',
-			'after_widget'  	=> ' </div></aside>',
-			'before_title'  	=> '<div class="widget-head"><h2 class="widget-title">',
-			'after_title'   	=> '</h2></div>',
-			'pages' => array(),
-			'children' => 'off',
-			'force' => true
-		);
-		update_option('uc_sidebars',$sidebars);
-		$sidebars['mega-footer']['id'] = 'mega-footer';
-		register_sidebar($sidebars['mega-footer']);
-	}
-	if(!isset($sidebars['sidebar'])){
-		$sidebars['sidebar'] = array(
-			'name'         		=> __( 'Default Sidebar', 'theme_text_domain' ),
-			'description'   	=> 'Appears with Archives, Search Results, the Blog page template, and when viewing single posts.',
-			'class'        		=> 'sidebar',
-			'before_widget' 	=> '<aside id="%1$s" class="widget %2$s">',
-			'after_widget'  	=> '</aside>',
-			'before_title'  	=> '<div class="widget-head"><h2 class="widget-title">',
-			'after_title'   	=> '</h2></div>',
-			'pages' => array(),
-			'children' => 'off',
-			'force' => true
-		);
-		update_option('uc_sidebars',$sidebars);
-		$sidebars['sidebar']['id'] = 'sidebar';
-		register_sidebar($sidebars['sidebar']);
-	}
-	
-	/*register_sidebar(array(
-		'name'          	=> __( 'Sidebar', 'theme_text_domain' ),
-		'id'            	=> 'sidebar',
-		'description'   	=> 'Appears with Archives, Search Results, the Blog page template, and when viewing single posts.',
-		'class'        	=> 'sidebar',
-		'before_widget' 	=> '<aside id="%1$s" class="widget %2$s">',
-		'after_widget'  	=> '</aside>',
-		'before_title'  	=> '<div class="widget-head"><h2 class="widget-title">',
-		'after_title'   	=> '</h2></div>'
-	));
-
-	register_sidebar( array(
-	    'name'         	=> __( 'Mega Footer' ),
-	    'id'           	=> 'mega-footer',
-		'description'   	=> 'Limited to 6 widgets. Will appear at the bottom of every page in the site.',
-		'before_widget' 	=> '<aside id="%1$s" class="widget %2$s">',
-		'after_widget'  	=> '</aside>',
-		'before_title'  	=> '<div class="widget-head"><h2 class="widget-title">',
-		'after_title'   	=> '</h2></div>'
-	) );*/
-
-	for($i=1; $i<=30; $i++){
-		$sidebars['home'.$i] = array(
-			'name'         		=> __( 'Home '.$i, 'theme_text_domain' ),
-			'class'        		=> 'sidebar',
-			'before_widget' 	=> '<aside id="%1$s" class="widget %2$s">',
-			'after_widget'  	=> '</aside>',
-			'before_title'  	=> '<div class="widget-head"><h2 class="widget-title">',
-			'after_title'   	=> '</h2></div>',
-			'pages' => array(),
-			'children' => 'off',
-			'force' => true
-		);
-		update_option('uc_sidebars',$sidebars);
-		$sidebars['home'.$i]['id'] = 'home'.$i;
-		register_sidebar($sidebars['home'.$i]);
-	}
-}
-
-
-/**
- * Add the options page to the "Appearance" admin menu
- * 
- * @since Unique Page Sidebars 0.1
- */
-function uc_options_add_page() {
-	add_theme_page( 'Manage Sidebars', 'Manage Sidebars', 'edit_theme_options', 'uc_sidebars', 'uc_sidebars_do_page' );
-	//remove_submenu_page( 'themes.php', 'widgets.php' );
-}
-add_action( 'admin_menu', 'uc_options_add_page' );
-
-function remove_wp_widgets( $wp_admin_bar ) {
-	$wp_admin_bar->remove_node( 'widgets' );
-}
-add_action( 'admin_bar_menu', 'remove_wp_widgets', 999 );
-
-// if no title then add widget content wrapper to before widget
-function check_sidebar_params( $params ) {
-    global $wp_registered_widgets;
-	
-    $settings_getter = $wp_registered_widgets[ $params[0]['widget_id'] ]['callback'][0];
-    $settings = $settings_getter->get_settings();
-    $settings = $settings[ $params[1]['number'] ];
-
-    if ( $params[0][ 'after_widget' ] == '</div></aside>' && isset( $settings[ 'title' ] ) && empty( $settings[ 'title' ] ) ){
-        $params[0][ 'before_widget' ] .= '<div class="widget-content ccc">';
-    }
-	
-    #Counts widgets in mega footer and adds column class accordingly
-    if( $params[0]['id'] == 'mega-footer' ){
-		$sidebars = get_option('sidebars_widgets');
-		$widgets = $sidebars['mega-footer'];
-	    $count = count($widgets);
-	    if( $count > 6 ){
-			$cols = 2;
-	    } else {
-	    	$cols = floor(12 / $count);
-	    }
-	    $params[0]['before_widget'] = str_replace('aside class="', 'aside class="col-sm-' . $cols . ' ', $params[0]['before_widget']);
-    }
-    return $params;
-}
-add_filter( 'dynamic_sidebar_params', 'check_sidebar_params' );
-
-function mf_remove_extra( $sidebars_widgets ){
-	$widgets = $sidebars_widgets['mega-footer'];
-	if( is_array($sidebars_widgets['mega-footer']) ){
-		foreach ($sidebars_widgets['mega-footer'] as $i => $widget) {
-			if( $i > 5 ){
-				unset($sidebars_widgets['mega-footer'][$i]);
-			}
-		}
-	}
-	return $sidebars_widgets;
-}
-add_filter( 'sidebars_widgets', 'mf_remove_extra' );
-
-function custom_searchform($form){
-	global $search_counter;
-	if( !$search_counter ){
-		$search_counter = 0;
-	}
-	$search_counter++;
-	
-	$form = '<div class="searchform"><form action="'.home_url( '/' ).'" method="get" class="form-inline" role="form"><div class="form-group"><fieldset><legend class="sr-only">Search this Site</legend>';
-		$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>';
-
-	return $form;
-}
-add_filter('get_search_form', 'custom_searchform');
+<?php 
+
+/**
+ * Register widget area.
+ *
+ * @link http://codex.wordpress.org/Function_Reference/register_sidebar
+ */
+ 
+ 
+
+if ( function_exists('register_sidebar') ) {
+	$sidebars = get_option( 'uc_sidebars' );
+	if(!isset($sidebars['mega-footer'])){
+		$sidebars['mega-footer'] = array(
+			'name'         		=> __( 'Mega Footer', 'theme_text_domain' ),
+			'description'   	=> 'Limited to 6 widgets. Will appear at the bottom of every page in the site.',
+			'before_widget' 	=> '<aside class=""><div id="%1$s" class="%2$s widget">',
+			'after_widget'  	=> ' </div></aside>',
+			'before_title'  	=> '<div class="widget-head"><h2 class="widget-title">',
+			'after_title'   	=> '</h2></div>',
+			'pages' => array(),
+			'children' => 'off',
+			'force' => true
+		);
+		update_option('uc_sidebars',$sidebars);
+		$sidebars['mega-footer']['id'] = 'mega-footer';
+		register_sidebar($sidebars['mega-footer']);
+	}
+	if(!isset($sidebars['sidebar'])){
+		$sidebars['sidebar'] = array(
+			'name'         		=> __( 'Default Sidebar', 'theme_text_domain' ),
+			'description'   	=> 'Appears with Archives, Search Results, the Blog page template, and when viewing single posts.',
+			'class'        		=> 'sidebar',
+			'before_widget' 	=> '<aside id="%1$s" class="widget %2$s">',
+			'after_widget'  	=> '</aside>',
+			'before_title'  	=> '<div class="widget-head"><h2 class="widget-title">',
+			'after_title'   	=> '</h2></div>',
+			'pages' => array(),
+			'children' => 'off',
+			'force' => true
+		);
+		update_option('uc_sidebars',$sidebars);
+		$sidebars['sidebar']['id'] = 'sidebar';
+		register_sidebar($sidebars['sidebar']);
+	}
+	
+	/*register_sidebar(array(
+		'name'          	=> __( 'Sidebar', 'theme_text_domain' ),
+		'id'            	=> 'sidebar',
+		'description'   	=> 'Appears with Archives, Search Results, the Blog page template, and when viewing single posts.',
+		'class'        	=> 'sidebar',
+		'before_widget' 	=> '<aside id="%1$s" class="widget %2$s">',
+		'after_widget'  	=> '</aside>',
+		'before_title'  	=> '<div class="widget-head"><h2 class="widget-title">',
+		'after_title'   	=> '</h2></div>'
+	));
+
+	register_sidebar( array(
+	    'name'         	=> __( 'Mega Footer' ),
+	    'id'           	=> 'mega-footer',
+		'description'   	=> 'Limited to 6 widgets. Will appear at the bottom of every page in the site.',
+		'before_widget' 	=> '<aside id="%1$s" class="widget %2$s">',
+		'after_widget'  	=> '</aside>',
+		'before_title'  	=> '<div class="widget-head"><h2 class="widget-title">',
+		'after_title'   	=> '</h2></div>'
+	) );*/
+
+	for($i=1; $i<=30; $i++){
+		$sidebars['home'.$i] = array(
+			'name'         		=> __( 'Home '.$i, 'theme_text_domain' ),
+			'class'        		=> 'sidebar',
+			'before_widget' 	=> '<aside id="%1$s" class="widget %2$s">',
+			'after_widget'  	=> '</aside>',
+			'before_title'  	=> '<div class="widget-head"><h2 class="widget-title">',
+			'after_title'   	=> '</h2></div>',
+			'pages' => array(),
+			'children' => 'off',
+			'force' => true
+		);
+		update_option('uc_sidebars',$sidebars);
+		$sidebars['home'.$i]['id'] = 'home'.$i;
+		register_sidebar($sidebars['home'.$i]);
+	}
+}
+
+
+/**
+ * Add the options page to the "Appearance" admin menu
+ * 
+ * @since Unique Page Sidebars 0.1
+ */
+function uc_options_add_page() {
+	add_theme_page( 'Manage Sidebars', 'Manage Sidebars', 'edit_theme_options', 'uc_sidebars', 'uc_sidebars_do_page' );
+	//remove_submenu_page( 'themes.php', 'widgets.php' );
+}
+add_action( 'admin_menu', 'uc_options_add_page' );
+
+function remove_wp_widgets( $wp_admin_bar ) {
+	$wp_admin_bar->remove_node( 'widgets' );
+}
+add_action( 'admin_bar_menu', 'remove_wp_widgets', 999 );
+
+// if no title then add widget content wrapper to before widget
+function check_sidebar_params( $params ) {
+    global $wp_registered_widgets;
+	
+    $settings_getter = $wp_registered_widgets[ $params[0]['widget_id'] ]['callback'][0];
+    $settings = $settings_getter->get_settings();
+    $settings = $settings[ $params[1]['number'] ];
+
+    if ( $params[0][ 'after_widget' ] == '</div></aside>' && isset( $settings[ 'title' ] ) && empty( $settings[ 'title' ] ) ){
+        $params[0][ 'before_widget' ] .= '<div class="widget-content ccc">';
+    }
+	
+    #Counts widgets in mega footer and adds column class accordingly
+    if( $params[0]['id'] == 'mega-footer' ){
+		$sidebars = get_option('sidebars_widgets');
+		$widgets = $sidebars['mega-footer'];
+	    $count = count($widgets);
+	    if( $count > 6 ){
+			$cols = 2;
+	    } else {
+	    	$cols = floor(12 / $count);
+	    }
+	    $params[0]['before_widget'] = str_replace('aside class="', 'aside class="col-sm-' . $cols . ' ', $params[0]['before_widget']);
+    }
+    return $params;
+}
+add_filter( 'dynamic_sidebar_params', 'check_sidebar_params' );
+
+function mf_remove_extra( $sidebars_widgets ){
+	$widgets = $sidebars_widgets['mega-footer'];
+	if( is_array($sidebars_widgets['mega-footer']) ){
+		foreach ($sidebars_widgets['mega-footer'] as $i => $widget) {
+			if( $i > 5 ){
+				unset($sidebars_widgets['mega-footer'][$i]);
+			}
+		}
+	}
+	return $sidebars_widgets;
+}
+add_filter( 'sidebars_widgets', 'mf_remove_extra' );
+
+function custom_searchform($form){
+	global $search_counter;
+	if( !$search_counter ){
+		$search_counter = 0;
+	}
+	$search_counter++;
+	
+	$form = '<div class="searchform"><form action="'.home_url( '/' ).'" method="get" class="form-inline" role="form"><div class="form-group"><fieldset><legend class="sr-only">Search this Site</legend>';
+		$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>';
+
+	return $form;
+}
+add_filter('get_search_form', 'custom_searchform');
 ?>
\ No newline at end of file
diff --git a/js/admin-style.js b/js/admin-style.js
index edb996c..550878b 100644
--- a/js/admin-style.js
+++ b/js/admin-style.js
@@ -1,15 +1,14 @@
-jQuery(document).ready(function($) {
-	$('#accordion-section-layout_builder .ui-slider-handle').each(function(){
-		$(this).addClass('button button-primary');     
-	});
-	
-	var path = window.location.pathname;
-	if( path.split('/').indexOf('widgets.php') != -1 ){
-		$('.widgets-holder-wrap.sidebar-sidebar').each(function(i){
-			if( !($(this['children'][0]).is(":visible"))  ){
-				$(this).css('display', 'none');
-			}
-		});		
-	}
-
+jQuery(document).ready(function($) {
+	$('#accordion-section-layout_builder .ui-slider-handle').each(function(){
+		$(this).addClass('button button-primary');     
+	});
+	
+	var path = window.location.pathname;
+	if( path.split('/').indexOf('widgets.php') != -1 ){
+		$('.widgets-holder-wrap.sidebar-sidebar').each(function(i){
+			if( !($(this['children'][0]).is(":visible"))  ){
+				$(this).css('display', 'none');
+			}
+		});		
+	}
 });
\ No newline at end of file
diff --git a/page.php b/page.php
index 44e17cc..df71bf3 100644
--- a/page.php
+++ b/page.php
@@ -14,7 +14,7 @@
 <?php include('inc/sidebar-check.php')?>
 <div id="page-page">
 	<?php while ( have_posts() ) : the_post(); ?>
-		<?php include('inc/submenu-check.php')?>
+		<?php include('inc/submenu-check.php') ?>
 			<div class="row">
 				<div class="col-sm-<?php echo (is_active_sidebar( $sidebar )?9:12); ?>">
 					<div id="primary" class="content-area">

From 03c4b2e474344677b527e6f101113f7077c56c2e Mon Sep 17 00:00:00 2001
From: andrewmbacon <andrew.bacon@me.com>
Date: Fri, 22 Aug 2014 15:23:52 -0400
Subject: [PATCH 2/2] Merge conflicts

---
 css/widgets-area.php | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 css/widgets-area.php

diff --git a/css/widgets-area.php b/css/widgets-area.php
new file mode 100644
index 0000000..8ca618a
--- /dev/null
+++ b/css/widgets-area.php
@@ -0,0 +1,22 @@
+<?php
+	$absolute_path = explode('wp-content', $_SERVER['SCRIPT_FILENAME']);
+	$wp_load = $absolute_path[0] . 'wp-load.php';
+	require_once($wp_load);
+
+	header("Content-type: text/css; charset: UTF-8");
+	header('Cache-control: must-revalidate');
+
+	$sidebars = wp_get_sidebars_widgets();
+	$index = 0;
+	for ($i=1; $i < 31 ; $i++) { 
+		if( !empty($sidebars['home'.$i]) ){
+			if( $i > $index ){
+				$index = $i; //$index is the biggest home widget area that has widgets, the next widget area doesn't have widgets
+			}
+		}
+	}
+	$start = ++$index;
+	for ($i=$start; $i < 31; $i++) { 
+		echo '#home'.$i.'{ display:none; } ';
+	}
+?>
\ No newline at end of file