diff --git a/CHANGELOG.md b/CHANGELOG.md index 897a67d..15d5054 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,6 @@ ### HEAD +* Remove `lib/post-types.php` and `lib/metaboxes.php` +* Make sure Primary Navigation menu always gets created and has the location set upon activation, update activation permalink method * Update to Bootstrap 2.2.1 * Update conditional feed method * Update to Bootstrap 2.2.0 diff --git a/doc/lib.md b/doc/lib.md index 833ff69..2982c70 100644 --- a/doc/lib.md +++ b/doc/lib.md @@ -50,18 +50,10 @@ This file handles the clean URL rewrites and HTML5 Boilerplate `.htaccess`. [Abo This file runs the initial theme setup and defines helper constants for later use -### metaboxes.php - -This file is a placeholder for you to put in custom metaboxes. We recommend the use of [Custom Metaboxes and Fields for WordPress](https://github.com/jaredatch/Custom-Metaboxes-and-Fields-for-WordPress). - ### nav.php This file contains all the custom nav modifications (for Bootstrap) and clean up. -### post-types.php - -This file is a placeholder for you to put in [custom post types](http://codex.wordpress.org/Function_Reference/register_post_type) and [taxonomies](http://codex.wordpress.org/Function_Reference/register_taxonomy). - ### scripts.php This file handles all of the CSS and JavaScript. diff --git a/doc/usage.md b/doc/usage.md index 5c7fcbb..b87c124 100755 --- a/doc/usage.md +++ b/doc/usage.md @@ -34,17 +34,16 @@ A basic Roots theme initially looks like this: ├── lang │ └── roots.pot ├── lib -│ ├── actions.php │ ├── activation.php │ ├── cleanup.php │ ├── config.php │ ├── custom.php │ ├── h5bp-htaccess │ ├── htaccess.php -│ ├── metaboxes.php -│ ├── post-types.php +│ ├── init.php +│ ├── nav.php │ ├── scripts.php -│ ├── template-tags.php +│ ├── sidebar.php │ ├── utils.php │ └── widgets.php ├── templates @@ -52,6 +51,7 @@ A basic Roots theme initially looks like this: │ ├── content.php │ ├── content-page.php │ ├── content-single.php +│ ├── entry-meta.php │ ├── footer.php │ ├── head.php │ ├── header.php diff --git a/functions.php b/functions.php index 08c0bbf..fd3960c 100644 --- a/functions.php +++ b/functions.php @@ -15,6 +15,4 @@ require_once locate_template('/lib/nav.php'); // Custom nav modifica require_once locate_template('/lib/htaccess.php'); // Rewrites for assets, H5BP .htaccess require_once locate_template('/lib/widgets.php'); // Sidebars and widgets require_once locate_template('/lib/scripts.php'); // Scripts and stylesheets -require_once locate_template('/lib/post-types.php'); // Custom post types -require_once locate_template('/lib/metaboxes.php'); // Custom metaboxes require_once locate_template('/lib/custom.php'); // Custom functions diff --git a/lib/activation.php b/lib/activation.php index c885892..43d33a5 100644 --- a/lib/activation.php +++ b/lib/activation.php @@ -16,13 +16,11 @@ function roots_theme_activation_options_init() { 'roots_theme_activation_options_validate' ); } - add_action('admin_init', 'roots_theme_activation_options_init'); function roots_activation_options_page_capability($capability) { return 'edit_theme_options'; } - add_filter('option_page_capability_roots_activation_options', 'roots_activation_options_page_capability'); function roots_theme_activation_options_add_page() { @@ -43,9 +41,7 @@ function roots_theme_activation_options_add_page() { exit; } } - } - add_action('admin_menu', 'roots_theme_activation_options_add_page', 50); function roots_get_default_theme_activation_options() { @@ -66,10 +62,9 @@ function roots_get_theme_activation_options() { } function roots_theme_activation_options_render_page() { ?> -
-

+

@@ -80,7 +75,7 @@ function roots_theme_activation_options_render_page() { ?> $roots_default_activation_options = roots_get_default_theme_activation_options(); ?> - + @@ -91,7 +86,7 @@ function roots_theme_activation_options_render_page() { ?> -
+
@@ -104,7 +99,7 @@ function roots_theme_activation_options_render_page() { ?> -
+
@@ -117,7 +112,7 @@ function roots_theme_activation_options_render_page() { ?> -
+
@@ -130,7 +125,7 @@ function roots_theme_activation_options_render_page() { ?> -
+
@@ -143,7 +138,7 @@ function roots_theme_activation_options_render_page() { ?> -
+
@@ -260,12 +255,12 @@ function roots_theme_activation_action() { if ($roots_theme_activation_options['change_permalink_structure']) { $roots_theme_activation_options['change_permalink_structure'] = false; + global $wp_rewrite; if (get_option('permalink_structure') !== '/%postname%/') { - update_option('permalink_structure', '/%postname%/'); + $wp_rewrite->set_permalink_structure('/%postname%/'); } - global $wp_rewrite; $wp_rewrite->init(); $wp_rewrite->flush_rules(); } @@ -282,9 +277,13 @@ function roots_theme_activation_action() { $roots_nav_theme_mod = false; - if (!has_nav_menu('primary_navigation')) { + $existing_nav = wp_get_nav_menu_object('Primary Navigation'); + if (!$existing_nav) { $primary_nav_id = wp_create_nav_menu('Primary Navigation', array('slug' => 'primary_navigation')); $roots_nav_theme_mod['primary_navigation'] = $primary_nav_id; + } else { + $primary_nav = wp_get_nav_menu_object('Primary Navigation'); + $roots_nav_theme_mod['primary_navigation'] = $primary_nav->term_id; } if ($roots_nav_theme_mod) { @@ -314,11 +313,9 @@ function roots_theme_activation_action() { update_option('roots_theme_activation_options', $roots_theme_activation_options); } - add_action('admin_init','roots_theme_activation_action'); -function roots_deactivation_action() { - update_option('roots_theme_activation_options', roots_get_default_theme_activation_options()); +function roots_deactivation() { + delete_option('roots_theme_activation_options'); } - -add_action('switch_theme', 'roots_deactivation_action'); \ No newline at end of file +add_action('switch_theme', 'roots_deactivation'); diff --git a/lib/metaboxes.php b/lib/metaboxes.php deleted file mode 100644 index eea11e3..0000000 --- a/lib/metaboxes.php +++ /dev/null @@ -1,3 +0,0 @@ -