diff --git a/functions.php b/functions.php
index 47d7e4d..93b1ba0 100644
--- a/functions.php
+++ b/functions.php
@@ -61,6 +61,7 @@ function cs_setup() {
'comment-form',
'gallery',
'caption',
+ 'post-thumbnails',
) );
}
endif; // cs_setup
@@ -79,57 +80,17 @@ function cs_widgets_init() {
/**
* Enqueue scripts and styles.
*/
-function cs_scripts() {
-
- wp_enqueue_style( 'cs-glyph', network_home_url().'wp-content/global/glyphicons_pro/glyphicons/web/html_css/css/glyphicons.css');
- wp_enqueue_style( 'cs-glyph-filetypes', network_home_url().'wp-content/global/glyphicons_pro/glyphicons_filetypes/web/html_css/css/glyphicons-filetypes.css');
- wp_enqueue_style( 'cs-glyph-halflings', network_home_url().'wp-content/global/glyphicons_pro/glyphicons_halflings/web/html_css/css/glyphicons-halflings.css');
- wp_enqueue_style( 'cs-glyph-social', network_home_url().'wp-content/global/glyphicons_pro/glyphicons_social/web/html_css/css/glyphicons-social.css');
- wp_enqueue_style( 'cs-style', get_stylesheet_uri(), array( 'cs-glyph' ));
-
- 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 '';
-
- //needed for IE7 grid hack
- /*echo ''; */
-}
+require get_template_directory() . '/inc/scripts-and-styles.php';
-add_action( 'wp_head', htmlShiv, 1 );
+/**
+ * Browser hacks
+ */
+require get_template_directory() . '/inc/ie-hacks.php';
-function ieBootstrap(){
- $template = get_template_directory_uri();
- echo '';
- /*
- echo '';
- */
-}
-add_action( 'wp_head', ieBootstrap, 99 );
+/**
+ * Private Pages
+ */
+require get_template_directory() . '/inc/private-pages.php';
/**
* Implement the Custom Header feature.
@@ -151,29 +112,31 @@ function ieBootstrap(){
*/
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';
+/**
+* Bootstrap Whitelist
+*/
+require get_template_directory() . '/inc/bootstrap-whitelist.php';
+
+
+
+
+
+
// Change what's hidden by default
add_filter('default_hidden_meta_boxes', 'be_hidden_meta_boxes', 10, 2);
@@ -185,64 +148,6 @@ function be_hidden_meta_boxes($hidden, $screen) {
}
-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');
/*the fallback from wp_nav_menu, we want to replicate the output of wp_page_menu to be similar to wp_nav_menu
@param args, it comes from the wp_nav_menu arguments*/
diff --git a/inc/bootstrap-whitelist.php b/inc/bootstrap-whitelist.php
new file mode 100644
index 0000000..aaa53cb
--- /dev/null
+++ b/inc/bootstrap-whitelist.php
@@ -0,0 +1,43 @@
+ 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/ie-hacks.php b/inc/ie-hacks.php
new file mode 100644
index 0000000..73e19fe
--- /dev/null
+++ b/inc/ie-hacks.php
@@ -0,0 +1,30 @@
+
+
+
+ ';
+
+ //needed for IE7 grid hack
+ /*echo ''; */
+}
+
+add_action( 'wp_head', htmlShiv, 1 );
+
+function ieBootstrap(){
+ $template = get_template_directory_uri();
+ echo '';
+ /*
+ echo '';
+ */
+}
+add_action( 'wp_head', ieBootstrap, 99 );
+
+?>
\ No newline at end of file
diff --git a/inc/private-pages.php b/inc/private-pages.php
new file mode 100644
index 0000000..784454c
--- /dev/null
+++ b/inc/private-pages.php
@@ -0,0 +1,20 @@
+post_parent > 0){
+ $parent = get_post($page->post_parent);
+ $private = get_post_meta($parent->ID, 'uc-private', true);
+ if($private == 'admins' || $private == 'users' || $private == 'list'){
+ return $parent->ID;
+ }
+ else return is_parent_private($parent->ID);
+ }
+ else{
+ return false;
+ }
+ }
+}
+?>
\ No newline at end of file
diff --git a/inc/scripts-and-styles.php b/inc/scripts-and-styles.php
new file mode 100644
index 0000000..69e582a
--- /dev/null
+++ b/inc/scripts-and-styles.php
@@ -0,0 +1,43 @@
+
\ No newline at end of file