From 064bfe53c7bc11d427b06d9e78f145978c5b3a8f Mon Sep 17 00:00:00 2001
From: andrewmbacon <andrew.bacon@me.com>
Date: Mon, 6 Oct 2014 10:21:18 -0400
Subject: [PATCH 1/4] IE Conditional Move

---
 footer.php |  2 +-
 header.php | 16 +++++-----------
 2 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/footer.php b/footer.php
index dd2c600..3bfd884 100644
--- a/footer.php
+++ b/footer.php
@@ -73,7 +73,7 @@
 		</footer>
 	</div><!-- #footers -->
 </div><!-- #page -->
-
+<!--[if lte IE 9]></div><![endif]-->
 <?php wp_footer(); ?>
 
 </body>
diff --git a/header.php b/header.php
index ad50b60..23841ce 100644
--- a/header.php
+++ b/header.php
@@ -6,16 +6,9 @@
  *
  */
 include 'inc/vars.php';
-
 ?>
 <!DOCTYPE html>
-<!--[if lt IE 7]>      <html <?php language_attributes(); ?> class="ie lte9 lte8 lte7 lte6"> <![endif]-->
-<!--[if IE 7]>         <html <?php language_attributes(); ?> class="ie ie7 lte9 lte8 lte7"> <![endif]-->
-<!--[if IE 8]>         <html <?php language_attributes(); ?> class="ie ie8 lte9 lte8"> <![endif]-->
-<!--[if IE 9]>         <html <?php language_attributes(); ?> class="ie ie9 lte9"> <![endif]-->
-<!--[if gt IE 9]><!-->
 <html <?php language_attributes(); ?>>
-<!--<![endif]-->
 <head>
 <meta charset="<?php bloginfo( 'charset' ); ?>">
 <link rel="shortcut icon" href="<?php echo get_stylesheet_directory_uri(); ?>/favicon.ico" />
@@ -24,12 +17,13 @@
 <title><?php wp_title( '|', true, 'right' ); ?></title>
 <link rel="profile" href="http://gmpg.org/xfn/11">
 <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>">
-
 <?php wp_head(); ?>
 </head>
-
-<body <?php body_class(); ?> >
-
+<body <?php body_class(); ?>>
+<!--[if lt IE 7]>      <div class="ie lte9 lte8 lte7 lte6"> <![endif]-->
+<!--[if IE 7]>         <div class="ie ie7 lte9 lte8 lte7"> <![endif]-->
+<!--[if IE 8]>         <div class="ie ie8 lte9 lte8"> <![endif]-->
+<!--[if IE 9]>         <div class="ie ie9 lte9"> <![endif]-->
 <nav id="skiplinks">
 	<a href="#site-navigation">Skip to Navigation</a>
 	<a href="#uc-search">Skip to UConn Search</a>

From 133028124045ff025c4ffd075617200c96ada1fe Mon Sep 17 00:00:00 2001
From: andrewmbacon <andrew.bacon@me.com>
Date: Mon, 6 Oct 2014 14:42:49 -0400
Subject: [PATCH 2/4] Burning through some issues

* uup list formatting, link is longer a block, no more 100% wide hit
area.
* blog template allows for content above posts.
* search results limited to excerpts
* sidebar uses same grid breakpoint as main content area (md)
---
 css/uup.css   | 15 ++++++-----
 page-blog.php |  1 +
 sass/uup.scss | 72 +++++++++++++++++++++++++++------------------------
 search.php    |  5 ++--
 sidebar.php   |  2 +-
 style.css     | 21 ++++++++++-----
 6 files changed, 67 insertions(+), 49 deletions(-)

diff --git a/css/uup.css b/css/uup.css
index cb42e26..c6fa462 100644
--- a/css/uup.css
+++ b/css/uup.css
@@ -29,6 +29,9 @@
 .uup-list .uup-item .uup-text > span {
   display: block;
 }
+.uup-list .uup-item .uup-text a .uup-name {
+  display: inline;
+}
 .uup-list .uup-item .uup-text .uup-name {
   font-weight: bold;
 }
@@ -58,21 +61,21 @@
 /*
 	 Profile Page
 */
-.uup-user {
+.page-template-page-user-profile-php .uup-user {
   padding: 1em;
 }
-.uup-user > span {
+.page-template-page-user-profile-php .uup-user > span {
   display: block;
 }
-.uup-user .uup-image {
+.page-template-page-user-profile-php .uup-user .uup-image {
   margin-bottom: 1em;
 }
-.uup-user .uup-name {
+.page-template-page-user-profile-php .uup-user .uup-name {
   font-weight: bold;
 }
-.uup-user .uup-name .uup-first:after {
+.page-template-page-user-profile-php .uup-user .uup-name .uup-first:after {
   content: ' ';
 }
-.uup-user .uup-phones .uup-phone2 {
+.page-template-page-user-profile-php .uup-user .uup-phones .uup-phone2 {
   display: block;
 }
diff --git a/page-blog.php b/page-blog.php
index 647be33..35bcb0c 100644
--- a/page-blog.php
+++ b/page-blog.php
@@ -12,6 +12,7 @@
 				<div class="col-sm-<?php echo (is_active_sidebar( $sidebar )?9:12); ?>">
 					<div id="primary" class="content-area">
 						<main id="main" class="site-main" role="main">
+							<?php the_content();?>
 							<?php query_posts('post_type=post&post_status=publish&paged='. get_query_var('paged')); ?>
 							<?php if( have_posts() ): ?>
 								<?php while( have_posts() ): the_post(); ?>
diff --git a/sass/uup.scss b/sass/uup.scss
index bab8815..4d2658e 100644
--- a/sass/uup.scss
+++ b/sass/uup.scss
@@ -31,7 +31,9 @@
 			& > span {
 				display:block;
 			}
-		
+			a .uup-name {
+				display:inline;	
+			}
 			.uup-name {
 				font-weight:bold;
 		
@@ -99,40 +101,42 @@
 /*
 	 Profile Page
 */
-.uup-user {
-	padding: 1em;
-	& > span {
-		display:block;
-	}
-	.uup-image{
-		margin-bottom:1em;
-	}
-	.uup-name {
-		font-weight:bold;
-
-		.uup-first {
-			&:after {
-				content:' ';
+.page-template-page-user-profile-php {
+	.uup-user {
+		padding: 1em;
+		& > span {
+			display:block;
+		}
+		.uup-image{
+			margin-bottom:1em;
+		}
+		.uup-name {
+			font-weight:bold;
+	
+			.uup-first {
+				&:after {
+					content:' ';
+				}
 			}
+			.uup-last {}
 		}
-		.uup-last {}
-	}
-	.uup-title {
-	}
-	.uup-phones {
-		.uup-phone1 {}
-		.uup-phone2 {
-			display:block;
+		.uup-title {
 		}
+		.uup-phones {
+			.uup-phone1 {}
+			.uup-phone2 {
+				display:block;
+			}
+		}
+		.uup-email {
+		}
+		.uup-fax {
+		}
+		.uup-office-location {
+		}
+		.uup-office-hours {
+		}
+		.uup-mailing-address {
+		}	
 	}
-	.uup-email {
-	}
-	.uup-fax {
-	}
-	.uup-office-location {
-	}
-	.uup-office-hours {
-	}
-	.uup-mailing-address {
-	}	
-}
+}
\ No newline at end of file
diff --git a/search.php b/search.php
index 37df581..33069aa 100644
--- a/search.php
+++ b/search.php
@@ -20,8 +20,9 @@
 
 					<?php /* Start the Loop */ ?>
 					<?php while ( have_posts() ) : the_post(); ?>
-
-						<?php get_template_part( 'content', 'search' ); ?>
+	
+						<h3><a href="<?php the_permalink(); ?>"><?php the_title();?></a></h3>
+						<p><?php the_excerpt(); ?></p>
 
 					<?php endwhile; ?>
 
diff --git a/sidebar.php b/sidebar.php
index 507b357..e27e784 100755
--- a/sidebar.php
+++ b/sidebar.php
@@ -5,7 +5,7 @@
  * @package cornerstone
  */
 ?>
-	<div id="secondary" class="col-sm-3 widget-area" role="complementary">
+	<div id="secondary" class="col-md-3 widget-area" role="complementary">
 		<?php if ( ! dynamic_sidebar( 'sidebar' ) ) : ?>
 
 			<aside id="search" class="widget widget_search">
diff --git a/style.css b/style.css
index ddd8f7f..9823ff3 100644
--- a/style.css
+++ b/style.css
@@ -7434,6 +7434,12 @@ object {
 .widget.uc-contact-widget th {
   white-space: nowrap;
 }
+.widget.uc-contact-widget td.uc-output-email {
+  word-break: break-all;
+}
+.widget.uc-contact-widget td.uc-output-more {
+  word-break: break-all;
+}
 .widget.uc-ecw {
   padding-bottom: 1em;
 }
@@ -7664,6 +7670,9 @@ q:before, table q:after {
 .uup-list .uup-item .uup-text > span {
   display: block;
 }
+.uup-list .uup-item .uup-text a .uup-name {
+  display: inline;
+}
 .uup-list .uup-item .uup-text .uup-name {
   font-weight: bold;
 }
@@ -7693,22 +7702,22 @@ q:before, table q:after {
 /*
 	 Profile Page
 */
-.uup-user {
+.page-template-page-user-profile-php .uup-user {
   padding: 1em;
 }
-.uup-user > span {
+.page-template-page-user-profile-php .uup-user > span {
   display: block;
 }
-.uup-user .uup-image {
+.page-template-page-user-profile-php .uup-user .uup-image {
   margin-bottom: 1em;
 }
-.uup-user .uup-name {
+.page-template-page-user-profile-php .uup-user .uup-name {
   font-weight: bold;
 }
-.uup-user .uup-name .uup-first:after {
+.page-template-page-user-profile-php .uup-user .uup-name .uup-first:after {
   content: ' ';
 }
-.uup-user .uup-phones .uup-phone2 {
+.page-template-page-user-profile-php .uup-user .uup-phones .uup-phone2 {
   display: block;
 }
 

From 51375a0b0d19544be39f693268621823f104ce92 Mon Sep 17 00:00:00 2001
From: Joshua Roy <joshua.roy@uconn.edu>
Date: Wed, 8 Oct 2014 14:33:12 -0400
Subject: [PATCH 3/4] Update to homepage template to fix weird column width
 issue

---
 page-home.php | 75 ++++++++++++++++++++++++++-------------------------
 1 file changed, 38 insertions(+), 37 deletions(-)

diff --git a/page-home.php b/page-home.php
index 5fa91a7..de433ef 100644
--- a/page-home.php
+++ b/page-home.php
@@ -1,37 +1,38 @@
-<?php
-/**
-Template Name: Home
-
- * The template for displaying the homepage.
- *
- * @package cornerstone
- */
-$rows = get_theme_mod('homepagerows');
-$count = 1;
-get_header(); ?>
-
-<div id="page-home">
-	<?php while ( have_posts() ) : the_post(); ?>
-	<?php for($i=0; $i<$rows; $i++){ /* Begin Homepage Builder... */?>
-	<div class="row">
-		<?php 
-			$widths = get_theme_mod('homepage_'.$i);
-			$widths = explode(',',$widths);
-			foreach($widths as $width){
-			if($width == 0) break; 
-		?>
-		<div class="col-sm-<?php echo $width; ?>">
-			<div class="home-section" id="home-section-<?php echo $count; ?>">
-				<?php if ( is_active_sidebar( 'home'.$count ) ) { ?>
-				<?php dynamic_sidebar( 'home'.$count ); ?>
-				<?php } else { ?>
-				<?php }; ?>
-			</div>
-		</div>
-		<?php $count ++; } ?>
-	</div>
-	<!-- /row-->
-	<?php  } /* ... end Homepage Builder */?>
-	<?php endwhile; // end of the loop. ?>
-</div>
-<?php get_footer(); ?>
+<?php
+/**
+Template Name: Home
+
+ * The template for displaying the homepage.
+ *
+ * @package cornerstone
+ */
+$rows = get_theme_mod('homepagerows');
+$count = 1;
+get_header(); ?>
+
+<div id="page-home">
+	<?php while ( have_posts() ) : the_post(); ?>
+	<?php for($i=0; $i<$rows; $i++){ /* Begin Homepage Builder... */?>
+	<div class="row">
+		<?php 
+			$widths = get_theme_mod('homepage_'.$i);
+			$widths = explode(',',$widths);
+			if(count($widths) == 1) $widths[0] = 12;
+			foreach($widths as $width){
+			if($width == 0) break; 
+		?>
+		<div class="col-sm-<?php echo $width; ?>">
+			<div class="home-section" id="home-section-<?php echo $count; ?>">
+				<?php if ( is_active_sidebar( 'home'.$count ) ) { ?>
+				<?php dynamic_sidebar( 'home'.$count ); ?>
+				<?php } else { ?>
+				<?php }; ?>
+			</div>
+		</div>
+		<?php $count ++; } ?>
+	</div>
+	<!-- /row-->
+	<?php  } /* ... end Homepage Builder */?>
+	<?php endwhile; // end of the loop. ?>
+</div>
+<?php get_footer(); ?>

From 2c3810e1ec8c77b05c88a3364b203455d144d19c Mon Sep 17 00:00:00 2001
From: Joshua Roy <joshua.roy@uconn.edu>
Date: Thu, 9 Oct 2014 09:41:51 -0400
Subject: [PATCH 4/4] Update to include outbound link tracking

---
 functions.php      | 473 +++++++++++++++++++++++----------------------
 inc/settings.php   |  37 ++++
 js/linktracking.js |  30 +++
 3 files changed, 308 insertions(+), 232 deletions(-)
 create mode 100644 inc/settings.php
 create mode 100644 js/linktracking.js

diff --git a/functions.php b/functions.php
index 280ed95..746542c 100644
--- a/functions.php
+++ b/functions.php
@@ -1,233 +1,242 @@
-<?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', network_home_url().'wp-content/global/bootstrap-3.2.0-dist/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');
+<?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', network_home_url().'wp-content/global/bootstrap-3.2.0-dist/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 );
+	
+	$outboundtracking = get_option( 'outbound_tracking','');
+	if($outboundtracking == 'yes') wp_enqueue_script('uc-link-tracking', get_bloginfo('template_url').'/js/linktracking.js', array('jquery'));
+
+	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';
+
+
+/** 
+* Custom site settings
+*/
+require get_template_directory() . '/inc/settings.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/settings.php b/inc/settings.php
new file mode 100644
index 0000000..5961aed
--- /dev/null
+++ b/inc/settings.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Class for adding a link tracking to the options-general.php page
+ */
+class Add_Settings_Field {
+
+	/**
+	 * Class constructor
+	 */
+	public function __construct() {
+		add_filter( 'admin_init' , array( &$this , 'register_fields' ) );
+	}
+
+	/**
+	 * Add new fields to wp-admin/options-general.php page
+	 */
+	public function register_fields() {
+		register_setting( 'general', 'outbound_tracking', 'esc_attr' );
+		add_settings_field(
+			'fav_color',
+			'<label for="outbound_tracking">' . __( 'Track Outbound Links' , 'outbound_tracking' ) . '</label>',
+			array( &$this, 'fields_radio' ),
+			'general'
+		);
+	}
+
+	/**
+	 * HTML for extra settings
+	 */
+	public function fields_radio() {
+		$value = get_option( 'outbound_tracking', '' );
+		echo '<input type="radio" id="outbound_tracking_no" name="outbound_tracking" value="no"'.(strlen(esc_attr( $value )) == 0 || esc_attr( $value ) == 'no'?' checked':'' ).' /> No <input type="radio" id="outbound_tracking_yes" name="outbound_tracking" value="yes"'.(esc_attr( $value ) == 'yes'?' checked':'' ).' /> Yes ';
+	}
+
+}
+new Add_Settings_Field();
+?>
\ No newline at end of file
diff --git a/js/linktracking.js b/js/linktracking.js
new file mode 100644
index 0000000..9458a1f
--- /dev/null
+++ b/js/linktracking.js
@@ -0,0 +1,30 @@
+/* Attach tracking to all download & external links */
+var _gaq = _gaq || [];
+
+function _gaLt(event){
+    var el = event.srcElement || event.target;
+
+    /* Loop up the tree through parent elements if clicked element is not a link (eg: an image in a link) */
+    while(el && (typeof el.tagName == 'undefined' || el.tagName.toLowerCase() != 'a' || !el.href))
+        el = el.parentNode;
+
+    if(el && el.href){
+    if(el.href.indexOf(location.host) == -1){ /* external link */
+            _gaq.push(["_trackEvent", "Outgoing Links", el.href, document.location.pathname + document.location.search]);
+            /* if target not set then delay opening of window by 0.5s to allow tracking */
+            if(!el.target || el.target.match(/^_(self|parent|top)$/i)){
+                setTimeout(function(){
+                    document.location.href = el.href;
+                }.bind(el),500);
+                /* Prevent standard click */
+                event.preventDefault ? event.preventDefault() : event.returnValue = !1;
+            }
+        }
+
+    }
+}
+
+/* Attach the event to all clicks in the document after page has loaded */
+var w = window;
+w.addEventListener ? w.addEventListener("load",function(){document.body.addEventListener("click",_gaLt,!1)},!1)
+ : w.attachEvent && w.attachEvent("onload",function(){document.body.attachEvent("onclick",_gaLt)});
\ No newline at end of file
