framework/bedrock
Template
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/swalkinshaw/roots into swalkinshaw-c6fdd5f

Browse Source
This commit is contained in:
Ben Word
2011-03-30 20:39:11 -06:00
parent 0ecdbc1673 d3fa9a5683
commit 827a5c41f8
4 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
functions.php
View File

@@ -1,5 +1,8 @@
<?php <?php
//get active theme directory name (lets you rename roots)
$theme_name = next(explode('/themes/', get_template_directory()));
include_once('includes/roots-activation.php'); // activation include_once('includes/roots-activation.php'); // activation
include_once('includes/roots-admin.php'); // admin additions/mods include_once('includes/roots-admin.php'); // admin additions/mods
include_once('includes/roots-options.php'); // theme options menu include_once('includes/roots-options.php'); // theme options menu

6
includes/roots-admin.php
View File

@@ -9,9 +9,11 @@ function roots_admin_init() {
//wp_register_script('roots_codemirror', "$site_url/wp-content/themes/roots/includes/js/codemirror/codemirror.js"); //wp_register_script('roots_codemirror', "$site_url/wp-content/themes/roots/includes/js/codemirror/codemirror.js");
//wp_enqueue_script('roots_codemirror'); //wp_enqueue_script('roots_codemirror');
$theme_name = next(explode('/themes/', get_template_directory()));
wp_enqueue_script('jquery-ui-tabs'); wp_enqueue_script('jquery-ui-tabs');
wp_register_style('roots_admin', "$site_url/wp-content/themes/roots/includes/css/admin.css"); wp_register_style('roots_admin', "$site_url/wp-content/themes/$theme_name/includes/css/admin.css");
wp_register_script('roots_admin', "$site_url/wp-content/themes/roots/includes/js/scripts.js"); wp_register_script('roots_admin', "$site_url/wp-content/themes/$theme_name/includes/js/scripts.js");
wp_enqueue_style('roots_admin'); wp_enqueue_style('roots_admin');
wp_enqueue_script('roots_admin'); wp_enqueue_script('roots_admin');
} }

12
includes/roots-cleanup.php
View File

@@ -10,12 +10,13 @@ function roots_flush_rewrites() {
$wp_rewrite->flush_rules(); $wp_rewrite->flush_rules();
} }
function roots_add_rewrites() { function roots_add_rewrites($content) {
$theme_name = next(explode('/themes/', get_template_directory()));
global $wp_rewrite; global $wp_rewrite;
$roots_new_non_wp_rules = array( $roots_new_non_wp_rules = array(
'css/(.*)' => 'wp-content/themes/roots/css/$1', 'css/(.*)' => 'wp-content/themes/'. $theme_name . '/css/$1',
'js/(.*)' => 'wp-content/themes/roots/js/$1', 'js/(.*)' => 'wp-content/themes/'. $theme_name . '/js/$1',
'img/(.*)' => 'wp-content/themes/roots/img/$1', 'img/(.*)' => 'wp-content/themes/'. $theme_name . '/img/$1',
'plugins/(.*)' => 'wp-content/plugins/$1' 'plugins/(.*)' => 'wp-content/plugins/$1'
); );
$wp_rewrite->non_wp_rules += $roots_new_non_wp_rules; $wp_rewrite->non_wp_rules += $roots_new_non_wp_rules;
@@ -25,7 +26,8 @@ add_action('generate_rewrite_rules', 'roots_add_rewrites');
add_action('admin_init', 'roots_flush_rewrites'); add_action('admin_init', 'roots_flush_rewrites');
function roots_clean_assets($content) { function roots_clean_assets($content) {
$current_path = '/wp-content/themes/roots'; $theme_name = next(explode('/themes/', $content));
$current_path = '/wp-content/themes/' . $theme_name;
$new_path = ''; $new_path = '';
$content = str_replace($current_path, $new_path, $content); $content = str_replace($current_path, $new_path, $content);
return $content; return $content;

7
includes/roots-options.php
View File

@@ -7,7 +7,10 @@ function roots_create_menu() {
$icon = get_template_directory_uri() . '/includes/images/icon-roots.png'; $icon = get_template_directory_uri() . '/includes/images/icon-roots.png';
// create menu // create menu
add_object_page('Roots Settings', 'Roots', 'administrator', 'roots', 'roots_settings_page', $icon);
$theme_name = get_current_theme();
add_object_page($theme_name . ' Settings', $theme_name, 'administrator', 'roots', 'roots_settings_page', $icon);
// call register settings function // call register settings function
add_action('admin_init', 'roots_register_settings'); add_action('admin_init', 'roots_register_settings');
@@ -40,7 +43,7 @@ function roots_settings_page() { ?>
<div class="wrap"> <div class="wrap">
<div id="icon-options-general" class="icon32"></div> <div id="icon-options-general" class="icon32"></div>
<h2>Roots Settings</h2> <h2><?php echo get_current_theme(); ?> Settings</h2>
<?php if (isset($_GET['settings-updated']) && $_GET['settings-updated'] === 'true') { ?> <?php if (isset($_GET['settings-updated']) && $_GET['settings-updated'] === 'true') { ?>
<div id="setting-error-settings_updated" class="updated settings-error"><p><strong>Settings saved.</strong></p></div> <div id="setting-error-settings_updated" class="updated settings-error"><p><strong>Settings saved.</strong></p></div>