From 2c2fe0c2e429b7f43d0371d217e72f4271123d11 Mon Sep 17 00:00:00 2001 From: Laury GvR Date: Thu, 26 Feb 2015 10:25:18 -0500 Subject: [PATCH] Functions changes for correct app.js reference --- functions.php | 75 ++++++++++++++++++++++++++++++++------------------- header.php | 1 - 2 files changed, 48 insertions(+), 28 deletions(-) diff --git a/functions.php b/functions.php index 2842ccf..a105db8 100644 --- a/functions.php +++ b/functions.php @@ -23,23 +23,6 @@ if (!function_exists('glm_quicksite_widget_init')) { } } - -/** - * get_menu_options - * - * Grab the menu options from the theme.ini file - */ -function glm_get_menu_options() -{ - static $menu_options; - $themeConfig = get_template_directory() . '/theme.ini'; - - if (!$menu_options && is_file($themeConfig)) { - $menu_options = parse_ini_file($themeConfig, true); - } - return $menu_options; -} - /** * glm_page_menu * @@ -47,10 +30,9 @@ function glm_get_menu_options() */ function glm_page_menu($parent = 0, $class = '') { - $menuConfig = glm_get_menu_options(); $frontPageId = get_option('page_on_front'); - $parents = array(); - $args = array( + $parents = array(); + $pages = get_pages(array( 'post_type' => 'page', 'parent' => $parent, 'number' => '', @@ -58,11 +40,7 @@ function glm_page_menu($parent = 0, $class = '') 'post_status' => 'publish', 'sort_order' => 'asc', 'sort_column' => 'menu_order' - ); - if ($parent == 0 && $menuConfig['menu_options']['main_level_pages']) { - $args['include'] = $menuConfig['menu_options']['main_level_pages']; - } - $pages = get_pages($args); + )); echo ''."\n"; foreach ($pages as $page) { $childs = get_pages('child_of=' . $page->ID); @@ -106,6 +84,7 @@ function glm_offcanvas_menu() add_theme_support('post-thumbnails'); set_post_thumbnail_size(120, 100, true); + /** * glm_site_scripts * @@ -125,11 +104,29 @@ function glm_site_scripts() '1.0', true ); + + wp_enqueue_script( + 'dollarsign', + get_template_directory_uri() . '/js/dollarsign.js' + ); + wp_enqueue_script( + 'glm_foundation', + get_template_directory_uri() . '/js/app.js', + 'jquery', + '1.0', + true + ); if(is_front_page()) { + } } +add_action('wp_enqueue_scripts', 'glm_site_scripts'); +add_action( 'after_setup_theme', 'woocommerce_support' ); + function woocommerce_support() { + add_theme_support( 'woocommerce' ); +} /* Header for posts*/ function GLM_get_header() { @@ -161,7 +158,31 @@ function GLM_get_header() { // echo ''; // echo ''; +// Allows for .EPS files to be uploaded +add_filter('upload_mimes', 'custom_upload_mimes'); +function custom_upload_mimes ( $existing_mimes=array() ) +{ + // Add *.EPS files to Media upload + $existing_mimes['eps'] = 'application/postscript'; + // Add *.AI files to Media upload + $existing_mimes['ai'] = 'application/postscript'; + return $existing_mimes; +} +function redirect_user_on_role() +{ + if (!current_user_can('publish_pages') ) { + /* A non-admin, non-editor */ + wp_redirect( home_url() ); exit; + } + //If login user role is Subscriber + // if ($current_user->user_level !== 0) + //If login user role is Contributor + // if ($current_user->user_level > 1) + //If login user role is Editor + // if ($current_user->user_level > 8) + +} +add_action('admin_init', 'redirect_user_on_role'); - -add_action('wp_enqueue_scripts', 'glm_site_scripts'); ?> + diff --git a/header.php b/header.php index abe0a94..6c90842 100644 --- a/header.php +++ b/header.php @@ -7,7 +7,6 @@ -
-- 2.17.1