+
+
+
-
+
-
+
-
-
+ " . sprintf(__('Please make sure your .htaccess file is writable ', 'roots'), admin_url('options-permalink.php')) . "
';")); + if ((!file_exists($htaccess_file) && is_writable($home_path) && $wp_rewrite->using_mod_rewrite_permalinks()) || is_writable($htaccess_file)) { + if ($mod_rewrite_enabled) { + $h5bp_rules = extract_from_markers($htaccess_file, 'HTML5 Boilerplate'); + if ($h5bp_rules === array()) { + $filename = dirname(__FILE__) . '/h5bp-htaccess'; + return insert_with_markers($htaccess_file, 'HTML5 Boilerplate', extract_from_markers($filename, 'HTML5 Boilerplate')); } } } - add_action('admin_init', 'roots_htaccess_writable'); + return $content; +} - function roots_add_rewrites($content) { - global $wp_rewrite; - $roots_new_non_wp_rules = array( - 'assets/css/(.*)' => THEME_PATH . '/assets/css/$1', - 'assets/js/(.*)' => THEME_PATH . '/assets/js/$1', - 'assets/img/(.*)' => THEME_PATH . '/assets/img/$1', - 'plugins/(.*)' => RELATIVE_PLUGIN_PATH . '/$1' - ); - $wp_rewrite->non_wp_rules = array_merge($wp_rewrite->non_wp_rules, $roots_new_non_wp_rules); - return $content; - } - - function roots_clean_urls($content) { - if (strpos($content, FULL_RELATIVE_PLUGIN_PATH) === 0) { - return str_replace(FULL_RELATIVE_PLUGIN_PATH, WP_BASE . '/plugins', $content); - } else { - return str_replace('/' . THEME_PATH, '', $content); - } - } - - if (!is_multisite() && !is_child_theme() && get_option('permalink_structure')) { - if (current_theme_supports('rewrite-urls')) { - add_action('generate_rewrite_rules', 'roots_add_rewrites'); - } - - if (current_theme_supports('h5bp-htaccess')) { - add_action('generate_rewrite_rules', 'roots_add_h5bp_htaccess'); - } - - if (!is_admin() && current_theme_supports('rewrite-urls')) { - $tags = array( - 'plugins_url', - 'bloginfo', - 'stylesheet_directory_uri', - 'template_directory_uri', - 'script_loader_src', - 'style_loader_src' - ); - - add_filters($tags, 'roots_clean_urls'); - } - } - - // Add the contents of h5bp-htaccess into the .htaccess file - function roots_add_h5bp_htaccess($content) { - global $wp_rewrite; - $home_path = function_exists('get_home_path') ? get_home_path() : ABSPATH; - $htaccess_file = $home_path . '.htaccess'; - $mod_rewrite_enabled = function_exists('got_mod_rewrite') ? got_mod_rewrite() : false; - - if ((!file_exists($htaccess_file) && is_writable($home_path) && $wp_rewrite->using_mod_rewrite_permalinks()) || is_writable($htaccess_file)) { - if ($mod_rewrite_enabled) { - $h5bp_rules = extract_from_markers($htaccess_file, 'HTML5 Boilerplate'); - if ($h5bp_rules === array()) { - $filename = dirname(__FILE__) . '/h5bp-htaccess'; - return insert_with_markers($htaccess_file, 'HTML5 Boilerplate', extract_from_markers($filename, 'HTML5 Boilerplate')); - } - } - } - - return $content; - } - -} \ No newline at end of file +if (current_theme_supports('h5bp-htaccess')) { + add_action('generate_rewrite_rules', 'roots_add_h5bp_htaccess'); +} diff --git a/lib/init.php b/lib/init.php index 65c440c..3314679 100644 --- a/lib/init.php +++ b/lib/init.php @@ -22,7 +22,7 @@ function roots_setup() { // add_theme_support('post-formats', array('aside', 'gallery', 'link', 'image', 'quote', 'status', 'video', 'audio', 'chat')); // Tell the TinyMCE editor to use a custom stylesheet - add_editor_style('assets/css/editor-style.css'); + add_editor_style('/assets/css/editor-style.css'); } diff --git a/lib/rewrites.php b/lib/rewrites.php new file mode 100644 index 0000000..72286eb --- /dev/null +++ b/lib/rewrites.php @@ -0,0 +1,56 @@ + THEME_PATH . '/assets/css/$1', + 'assets/js/(.*)' => THEME_PATH . '/assets/js/$1', + 'assets/img/(.*)' => THEME_PATH . '/assets/img/$1', + 'plugins/(.*)' => RELATIVE_PLUGIN_PATH . '/$1' + ); + $wp_rewrite->non_wp_rules = array_merge($wp_rewrite->non_wp_rules, $roots_new_non_wp_rules); + return $content; +} + +function roots_clean_urls($content) { + if (strpos($content, FULL_RELATIVE_PLUGIN_PATH) === 0) { + return str_replace(FULL_RELATIVE_PLUGIN_PATH, WP_BASE . '/plugins', $content); + } else { + return str_replace('/' . THEME_PATH, '', $content); + } +} + +if (!is_multisite() && !is_child_theme() && get_option('permalink_structure')) { + if (current_theme_supports('rewrites')) { + add_action('generate_rewrite_rules', 'roots_add_rewrites'); + } + + if (!is_admin() && current_theme_supports('rewrites')) { + $tags = array( + 'plugins_url', + 'bloginfo', + 'stylesheet_directory_uri', + 'template_directory_uri', + 'script_loader_src', + 'style_loader_src' + ); + + add_filters($tags, 'roots_clean_urls'); + } +} diff --git a/lib/scripts.php b/lib/scripts.php index cec9aa4..b4c1e25 100644 --- a/lib/scripts.php +++ b/lib/scripts.php @@ -6,26 +6,56 @@ * 1. /theme/assets/css/main.min.css * * Enqueue scripts in the following order: - * 1. /theme/assets/js/vendor/modernizr-2.6.2.min.js (in head.php) - * 2. jquery-1.9.0.min.js via Google CDN (in head.php) - * 3. /theme/assets/js/plugins.js - * 4. /theme/assets/js/main.js + * 1. /theme/assets/js/vendor/modernizr-2.6.2.min.js + * 2. jquery-1.9.0.min.js via Google CDN + * 3. /theme/assets/js/scripts.min.js */ function roots_scripts() { wp_enqueue_style('roots_main', get_template_directory_uri() . '/assets/css/main.min.css', false, '78911fc28d7ea4e9571fa2f37ad1bfd2'); + // Load style.css from child theme + if (is_child_theme()) { + wp_enqueue_style('roots_child', get_stylesheet_uri(), false, null); + } + + // jQuery is loaded using the same method from HTML5 Boilerplate: + // Grab Google CDN's latest jQuery with a protocol relative URL; fallback to local if offline + // It's kept in the header instead of footer to avoid conflicts with plugins. if (!is_admin()) { wp_deregister_script('jquery'); - wp_register_script('jquery', '', '', '1.9.0', false); + wp_register_script('jquery', '//ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js', array('modernizr'), null, false); } if (is_single() && comments_open() && get_option('thread_comments')) { wp_enqueue_script('comment-reply'); } - wp_register_script('roots_scripts', get_template_directory_uri() . '/assets/js/scripts.min.js', false, 'c40d165aabf0bf4734675f9fc726f3e6', true); + wp_register_script('modernizr', get_template_directory_uri() . '/assets/js/vendor/modernizr-2.6.2.min.js', false, null, false); + wp_register_script('roots_scripts', get_template_directory_uri() . '/assets/js/scripts.min.js', false, 'c40d165aabf0bf4734675f9fc726f3e6', false); + wp_enqueue_script('modernizr'); + wp_enqueue_script('jquery'); wp_enqueue_script('roots_scripts'); } add_action('wp_enqueue_scripts', 'roots_scripts', 100); + +// http://wordpress.stackexchange.com/a/12450 +function roots_jquery_local_fallback($src, $handle) { + static $add_jquery_fallback = false; + + if ($add_jquery_fallback) { + echo '' . "\n"; + $add_jquery_fallback = false; + } + + if ($handle === 'jquery') { + $add_jquery_fallback = true; + } + + return $src; +} + +if (!is_admin()) { + add_filter('script_loader_src', 'roots_jquery_local_fallback', 10, 2); +} diff --git a/lib/utils.php b/lib/utils.php index 0b07bb1..9aa8d71 100644 --- a/lib/utils.php +++ b/lib/utils.php @@ -5,7 +5,56 @@ * * @link http://scribu.net/wordpress/theme-wrappers.html */ +function roots_template_path() { + return Roots_Wrapping::$main_template; +} +function roots_sidebar_path() { + return Roots_Wrapping::sidebar(); +} + +class Roots_Wrapping { + // Stores the full path to the main template file + static $main_template; + + // Stores the base name of the template file; e.g. 'page' for 'page.php' etc. + static $base; + + static function wrap($template) { + self::$main_template = $template; + + self::$base = substr(basename(self::$main_template), 0, -4); + + if (self::$base === 'index') { + self::$base = false; + } + + $templates = array('base.php'); + + if (self::$base) { + array_unshift($templates, sprintf('base-%s.php', self::$base)); + } + + return locate_template($templates); + } + + static function sidebar() { + $templates = array('templates/sidebar.php'); + + if (self::$base) { + array_unshift($templates, sprintf('templates/sidebar-%s.php', self::$base)); + } + + return locate_template($templates); + } +} + +add_filter('template_include', array('Roots_Wrapping', 'wrap'), 99); + + +/** + * Page titles + */ function roots_title() { if (is_home()) { if (get_option('page_for_posts', true)) { @@ -41,38 +90,18 @@ function roots_title() { } } -function roots_template_path() { - return Roots_Wrapping::$main_template; -} - -class Roots_Wrapping { - - // Stores the full path to the main template file - static $main_template; - - // Stores the base name of the template file; e.g. 'page' for 'page.php' etc. - static $base; - - static function wrap($template) { - self::$main_template = $template; - - self::$base = substr(basename(self::$main_template), 0, -4); - - if (self::$base === 'index') { - self::$base = false; +/** + * Show an admin notice if .htaccess isn't writable + */ +function roots_htaccess_writable() { + if (!is_writable(get_home_path() . '.htaccess')) { + if (current_user_can('administrator')) { + add_action('admin_notices', create_function('', "echo '" . sprintf(__('Please make sure your .htaccess file is writable ', 'roots'), admin_url('options-permalink.php')) . "