Skip to content
Browse files

Get rid of a ton of deprecated Hybrid Core calls and start bringing t…

…his theme up to date with the latest Hybrid Core.

git-svn-id: http://svn.locallylost.com/themes/hybrid/trunk@441 dba0f204-706d-4bc1-bc29-8b92e0485636
  • Loading branch information...
1 parent f4f81ef commit 779262bcd4f39c6e4ca54861cd5d397b58deafeb greenshady committed Oct 20, 2010
View
4 404.php
@@ -20,7 +20,7 @@
<div id="content" class="hfeed content">
- <?php hybrid_before_content(); // Before content hook ?>
+ <?php do_atomic( 'before_content' ); // Before content hook ?>
<?php if ( is_active_sidebar( 'error-404-template' ) ) : ?>
@@ -48,7 +48,7 @@
<?php endif; ?>
- <?php hybrid_after_content(); // After content hook ?>
+ <?php do_atomic( 'after_content' ); // After content hook ?>
</div><!-- .content .hfeed -->
View
8 archive.php
@@ -14,7 +14,7 @@
<div id="content" class="hfeed content">
- <?php hybrid_before_content(); // Before content hook ?>
+ <?php do_atomic( 'before_content' ); // Before content hook ?>
<div class="archive-info">
@@ -34,13 +34,13 @@
<?php get_the_image( array( 'custom_key' => array( 'Thumbnail' ), 'size' => 'thumbnail' ) ); ?>
- <?php hybrid_before_entry(); // Before entry hook ?>
+ <?php do_atomic( 'before_entry' ); // Before entry hook ?>
<div class="entry-summary">
<?php the_excerpt(); ?>
</div><!-- .entry-summary -->
- <?php hybrid_after_entry(); // After entry hook ?>
+ <?php do_atomic( 'after_entry' ); // After entry hook ?>
</div><!-- .hentry -->
@@ -54,7 +54,7 @@
<?php endif; ?>
- <?php hybrid_after_content(); // After content hook ?>
+ <?php do_atomic( 'after_content' ); // After content hook ?>
</div><!-- .content .hfeed -->
View
10 attachment-application.php
@@ -14,13 +14,13 @@
<div id="content" class="hfeed content">
- <?php hybrid_before_content(); // Before content hook ?>
+ <?php do_atomic( 'before_content' ); // Before content hook ?>
<?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
<div id="post-<?php the_ID(); ?>" class="<?php hybrid_entry_class(); ?>">
- <?php hybrid_before_entry(); // Before entry hook ?>
+ <?php do_atomic( 'before_entry' ); // Before entry hook ?>
<div class="entry-content">
@@ -36,11 +36,11 @@
</div><!-- .entry-content -->
- <?php hybrid_after_entry(); // After entry hook ?>
+ <?php do_atomic( 'after_entry' ); // After entry hook ?>
</div><!-- .hentry -->
- <?php hybrid_after_singular(); // After singular hook ?>
+ <?php do_atomic( 'after_singular' ); // After singular hook ?>
<?php comments_template( '/comments.php', true ); ?>
@@ -54,7 +54,7 @@
<?php endif; ?>
- <?php hybrid_after_content(); // After content hook ?>
+ <?php do_atomic( 'after_content' ); // After content hook ?>
</div><!-- .content .hfeed -->
View
10 attachment-audio.php
@@ -14,13 +14,13 @@
<div id="content" class="hfeed content">
- <?php hybrid_before_content(); // Before content hook ?>
+ <?php do_atomic( 'before_content' ); // Before content hook ?>
<?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
<div id="post-<?php the_ID(); ?>" class="<?php hybrid_entry_class( 'haudio' ); ?>">
- <?php hybrid_before_entry(); // Before entry hook ?>
+ <?php do_atomic( 'before_entry' ); // Before entry hook ?>
<div class="entry-content">
@@ -38,11 +38,11 @@
</div><!-- .entry-content -->
- <?php hybrid_after_entry(); // After entry hook ?>
+ <?php do_atomic( 'after_entry' ); // After entry hook ?>
</div><!-- .haudio .post -->
- <?php hybrid_after_singular(); // After singular hook ?>
+ <?php do_atomic( 'after_singular' ); // After singular hook ?>
<?php comments_template( '/comments.php', true ); ?>
@@ -56,7 +56,7 @@
<?php endif; ?>
- <?php hybrid_after_content(); // After content hook ?>
+ <?php do_atomic( 'after_content' ); // After content hook ?>
</div><!-- .content .hfeed -->
View
10 attachment-image.php
@@ -16,13 +16,13 @@
<div id="content" class="hfeed content">
- <?php hybrid_before_content(); // Before content hook ?>
+ <?php do_atomic( 'before_content' ); // Before content hook ?>
<?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
<div id="post-<?php the_ID(); ?>" class="<?php hybrid_entry_class( 'hmedia' ); ?>">
- <?php hybrid_before_entry(); // Before entry hook ?>
+ <?php do_atomic( 'before_entry' ); // Before entry hook ?>
<div class="entry-content">
@@ -41,11 +41,11 @@
<span class="alignright"><?php next_image_link(); ?></span>
</p><!-- .navigation-attachment -->
- <?php hybrid_after_entry(); // After entry hook ?>
+ <?php do_atomic( 'after_entry' ); // After entry hook ?>
</div><!-- .hentry -->
- <?php hybrid_after_singular(); // After singular hook ?>
+ <?php do_atomic( 'after_singular' ); // After singular hook ?>
<?php comments_template( '/comments.php', true ); ?>
@@ -59,7 +59,7 @@
<?php endif; ?>
- <?php hybrid_after_content(); // After content hook ?>
+ <?php do_atomic( 'after_content' ); // After content hook ?>
</div><!-- .content .hfeed -->
View
10 attachment-text.php
@@ -14,13 +14,13 @@
<div id="content" class="hfeed content">
- <?php hybrid_before_content(); // Before content hook ?>
+ <?php do_atomic( 'before_content' ); // Before content hook ?>
<?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
<div id="post-<?php the_ID(); ?>" class="<?php hybrid_entry_class(); ?>">
- <?php hybrid_before_entry(); // Before entry hook ?>
+ <?php do_atomic( 'before_entry' ); // Before entry hook ?>
<div class="entry-content">
@@ -36,11 +36,11 @@
</div><!-- .entry-content -->
- <?php hybrid_after_entry(); // After entry hook ?>
+ <?php do_atomic( 'after_entry' ); // After entry hook ?>
</div><!-- .hentry -->
- <?php hybrid_after_singular(); // After singular hook ?>
+ <?php do_atomic( 'after_singular' ); // After singular hook ?>
<?php comments_template( '/comments.php', true ); ?>
@@ -54,7 +54,7 @@
<?php endif; ?>
- <?php hybrid_after_content(); // After content hook ?>
+ <?php do_atomic( 'after_content' ); // After content hook ?>
</div><!-- .content .hfeed -->
View
10 attachment-video.php
@@ -14,13 +14,13 @@
<div id="content" class="hfeed content">
- <?php hybrid_before_content(); // Before content hook ?>
+ <?php do_atomic( 'before_content' ); // Before content hook ?>
<?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
<div id="post-<?php the_ID(); ?>" class="<?php hybrid_entry_class( 'hmedia' ); ?>">
- <?php hybrid_before_entry(); // Before entry hook ?>
+ <?php do_atomic( 'before_entry' ); // Before entry hook ?>
<div class="entry-content">
@@ -36,11 +36,11 @@
</div><!-- .entry-content -->
- <?php hybrid_after_entry(); // After entry hook ?>
+ <?php do_atomic( 'after_entry' ); // After entry hook ?>
</div><!-- .hmedia -->
- <?php hybrid_after_singular(); // After singular hook ?>
+ <?php do_atomic( 'after_singular' ); // After singular hook ?>
<?php comments_template( '/comments.php', true ); ?>
@@ -54,7 +54,7 @@
<?php endif; ?>
- <?php hybrid_after_content(); // After content hook ?>
+ <?php do_atomic( 'after_content' ); // After content hook ?>
</div><!-- .content .hfeed -->
View
10 attachment.php
@@ -16,13 +16,13 @@
<div id="content" class="hfeed content">
- <?php hybrid_before_content(); // Before content hook ?>
+ <?php do_atomic( 'before_content' ); // Before content hook ?>
<?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
<div id="post-<?php the_ID(); ?>" class="<?php hybrid_entry_class(); ?>">
- <?php hybrid_before_entry(); // Before entry hook ?>
+ <?php do_atomic( 'before_entry' ); // Before entry hook ?>
<div class="entry-content">
@@ -38,11 +38,11 @@
</div><!-- .entry-content -->
- <?php hybrid_after_entry(); // After entry hook ?>
+ <?php do_atomic( 'after_entry' ); // After entry hook ?>
</div><!-- .hentry -->
- <?php hybrid_after_singular(); // After singular hook ?>
+ <?php do_atomic( 'after_singular' ); // After singular hook ?>
<?php comments_template( '/comments.php', true ); ?>
@@ -56,7 +56,7 @@
<?php endif; ?>
- <?php hybrid_after_content(); // After content hook ?>
+ <?php do_atomic( 'after_content' ); // After content hook ?>
</div><!-- .content .hfeed -->
View
4 comment.php
@@ -15,7 +15,7 @@
<li id="comment-<?php comment_ID(); ?>" class="<?php hybrid_comment_class(); ?>">
- <?php hybrid_before_comment(); // Before comment hook ?>
+ <?php do_atomic( 'before_comment' ); // Before comment hook ?>
<div class="comment-text">
<?php if ( '0' == $comment->comment_approved ) : ?>
@@ -25,6 +25,6 @@
<?php comment_text( $comment->comment_ID ); ?>
</div><!-- .comment-text -->
- <?php hybrid_after_comment(); // After comment hook ?>
+ <?php do_atomic( 'after_comment' ); // After comment hook ?>
<?php /* No closing </li> is needed. WordPress will know where to add it. */ ?>
View
4 comments.php
@@ -32,13 +32,13 @@
<h3 id="comments-number" class="comments-header"><?php comments_number( sprintf( __( 'No responses to %1$s', 'hybrid' ), the_title( '&#8220;', '&#8221;', false ) ), sprintf( __( 'One response to %1$s', 'hybrid' ), the_title( '&#8220;', '&#8221;', false ) ), sprintf( __( '%1$s responses to %2$s', 'hybrid' ), '%', the_title( '&#8220;', '&#8221;', false ) ) ); ?></h3>
- <?php hybrid_before_comment_list(); // Before comment list hook ?>
+ <?php do_atomic( 'before_comment_list' ); // Before comment list hook ?>
<ol class="comment-list">
<?php wp_list_comments( hybrid_list_comments_args() ); ?>
</ol><!-- .comment-list -->
- <?php hybrid_after_comment_list(); // After comment list hook ?>
+ <?php do_atomic( 'after_comment_list' ); // After comment list hook ?>
<?php if ( get_option( 'page_comments' ) ) : ?>
<div class="comment-navigation paged-navigation">
View
8 date.php
@@ -14,7 +14,7 @@
<div id="content" class="hfeed content">
- <?php hybrid_before_content(); // Before content hook ?>
+ <?php do_atomic( 'before_content' ); // Before content hook ?>
<div class="archive-info date-info">
<h1 class="archive-title date-title"><?php the_time( __( 'F jS, Y', 'hybrid' ) ); ?></h1>
@@ -33,13 +33,13 @@
<?php get_the_image( array( 'custom_key' => array( 'Thumbnail' ), 'size' => 'thumbnail' ) ); ?>
- <?php hybrid_before_entry(); // Before entry hook ?>
+ <?php do_atomic( 'before_entry' ); // Before entry hook ?>
<div class="entry-summary">
<?php the_excerpt(); ?>
</div><!-- .entry-summary -->
- <?php hybrid_after_entry(); // After entry hook ?>
+ <?php do_atomic( 'after_entry' ); // After entry hook ?>
</div><!-- .hentry -->
@@ -53,7 +53,7 @@
<?php endif; ?>
- <?php hybrid_after_content(); // After content hook ?>
+ <?php do_atomic( 'after_content' ); // After content hook ?>
</div><!-- .content .hfeed -->
View
8 day.php
@@ -12,7 +12,7 @@
<div id="content" class="hfeed content">
- <?php hybrid_before_content(); // Before content hook ?>
+ <?php do_atomic( 'before_content' ); // Before content hook ?>
<div class="archive-info date-info day-info">
@@ -32,13 +32,13 @@
<?php get_the_image( array( 'custom_key' => array( 'Thumbnail' ), 'size' => 'thumbnail' ) ); ?>
- <?php hybrid_before_entry(); // Before entry hook ?>
+ <?php do_atomic( 'before_entry' ); // Before entry hook ?>
<div class="entry-summary">
<?php the_excerpt(); ?>
</div><!-- .entry-summary -->
- <?php hybrid_after_entry(); // After entry hook ?>
+ <?php do_atomic( 'after_entry' ); // After entry hook ?>
</div><!-- .hentry -->
@@ -52,7 +52,7 @@
<?php endif; ?>
- <?php hybrid_after_content(); // After content hook ?>
+ <?php do_atomic( 'after_content' ); // After content hook ?>
</div><!-- .content .hfeed -->
View
10 footer.php
@@ -11,28 +11,28 @@
* @subpackage Template
*/
?>
- <?php hybrid_after_container(); // After container hook ?>
+ <?php do_atomic( 'after_container' ); // After container hook ?>
</div><!-- #container -->
<div id="footer-container">
- <?php hybrid_before_footer(); // Before footer hook ?>
+ <?php do_atomic( 'before_footer' ); // Before footer hook ?>
<div id="footer">
- <?php hybrid_footer(); // Hybrid footer hook ?>
+ <?php do_atomic( 'footer' ); // Hybrid footer hook ?>
</div><!-- #footer -->
- <?php hybrid_after_footer(); // After footer hook ?>
+ <?php do_atomic( 'after_footer' ); // After footer hook ?>
</div><!-- #footer-container -->
</div><!-- #body-container -->
+<?php do_atomic( 'after_html' ); // After HTML hook ?>
<?php wp_footer(); // WordPress footer hook ?>
-<?php hybrid_after_html(); // After HTML hook ?>
</body>
</html>
View
167 functions.php
@@ -63,7 +63,7 @@ function hybrid_setup_theme() {
/* Add support for the core print stylesheet. */
if ( hybrid_get_setting( 'print_style' ) )
- add_theme_support( 'hybrid-core-print-style' );
+ add_action( 'template_redirect', 'hybrid_theme_enqueue_style' );
/* Add support for core theme settings meta boxes. */
add_theme_support( 'hybrid-core-theme-settings' );
@@ -134,8 +134,8 @@ function hybrid_setup_theme() {
add_filter( 'body_class', 'hybrid_theme_body_class' );
/* Add elements to the <head> area. */
- add_action( "{$prefix}_head", 'hybrid_meta_content_type' );
- add_action( 'wp_head', 'hybrid_favicon' );
+ //add_action( "{$prefix}_head", 'hybrid_meta_content_type' );
+ //add_action( 'wp_head', 'hybrid_favicon' );
/* Feed links. */
add_filter( 'feed_link', 'hybrid_feed_link', 1, 2 );
@@ -148,6 +148,35 @@ function hybrid_setup_theme() {
add_action( 'wp_print_styles', 'hybrid_disable_styles' );
add_action( "load-appearance_page_theme-settings", 'hybrid_theme_create_settings_meta_boxes', 11 );
+
+ /* Add same filters to user description as term descriptions. */
+ add_filter( 'get_the_author_description', 'wptexturize' );
+ add_filter( 'get_the_author_description', 'convert_chars' );
+ add_filter( 'get_the_author_description', 'wpautop' );
+
+ //add_action( 'wp_head', 'hybrid_head_pingback' );
+}
+
+/**
+ * Function to load CSS at an appropriate time. Adds print.css if user chooses to use it.
+ * Users should load their own CSS using wp_enqueue_style() in their child theme's
+ * functions.php file.
+ *
+ * @since 0.9
+ * @link http://codex.wordpress.org/Function_Reference/wp_enqueue_style
+ */
+function hybrid_theme_enqueue_style() {
+ global $wp_query;
+
+ /* If is admin, don't load styles. */
+ if ( is_admin() )
+ return;
+
+ /* Get the theme prefix. */
+ $prefix = hybrid_get_prefix();
+
+ /* Load the print stylesheet. */
+ wp_enqueue_style( "{$prefix}-print", esc_url( apply_atomic( 'print_style', THEME_URI . '/css/print.css' ) ), false, 0.7, 'print' );
}
function hybrid_theme_create_settings_meta_boxes() {
@@ -377,6 +406,25 @@ function hybrid_entry_meta( $metadata = '' ) {
}
/**
+ * Function for displaying a comment's metadata.
+ *
+ * @since 0.7.0
+ * @param string $metadata Custom metadata to use.
+ * @global $comment The global comment object.
+ * @global $post The global post object.
+ */
+function hybrid_comment_meta( $metadata = '' ) {
+ global $comment, $post;
+
+ if ( !$metadata )
+ $metadata = '[comment-author] [comment-published] [comment-permalink before="| "] [comment-edit-link before="| "] [comment-reply-link before="| "]';
+
+ $metadata = '<div class="comment-meta comment-meta-data">' . $metadata . '</div>';
+
+ echo do_shortcode( apply_filters( hybrid_get_prefix() . '_comment_meta', $metadata ) );
+}
+
+/**
* Disables stylesheets for particular plugins to allow the theme to easily write its own
* styles for the plugins' features.
*
@@ -414,4 +462,117 @@ function hybrid_navigation_links() {
get_template_part( 'navigation-links' );
}
+/**
+ * Displays the footer insert from the theme settings page. Users can also use shortcodes in their footer
+ * area, which will be displayed with this function.
+ *
+ * @since 0.2.1
+ * @uses do_shortcode() Allows users to add shortcodes to their footer.
+ * @uses stripslashes() Strips any slashes added from the admin form.
+ * @uses hybrid_get_setting() Grabs the 'footer_insert' theme setting.
+ */
+function hybrid_footer_insert() {
+ $footer_insert = do_shortcode( hybrid_get_setting( 'footer_insert' ) );
+
+ if ( !empty( $footer_insert ) )
+ echo '<div class="footer-insert">' . $footer_insert . '</div>';
+}
+
+/* Disables widget areas. */
+add_filter( 'sidebars_widgets', 'remove_sidebars' );
+
+/**
+ * Removes all widget areas on the No Widgets page template. We're only going to run
+ * it on the No Widgets template. Users that need additional templates without widgets
+ * should create a simliar function in their child theme.
+ *
+ * @since 0.5.0
+ * @uses sidebars_widgets Filter to remove all widget areas
+ */
+function remove_sidebars( $sidebars_widgets ) {
+ global $wp_query;
+
+ if ( is_singular() ) {
+ $template = get_post_meta( $wp_query->post->ID, "_wp_{$wp_query->post->post_type}_template", true );
+ if ( 'no-widgets.php' == $template || "{$wp_query->post->post_type}-no-widgets.php" == $template )
+ $sidebars_widgets = array( false );
+ }
+ return $sidebars_widgets;
+}
+
+/**
+ * Loads the Primary widget area. Users can overwrite 'sidebar-primary.php'.
+ *
+ * @since 0.2.2
+ * @uses get_sidebar() Checks for the template in the child and parent theme.
+ */
+function hybrid_get_primary() {
+ get_sidebar( 'primary' );
+}
+
+/**
+ * Loads the Secondary widget area. Users can overwrite 'sidebar-secondary.php'.
+ *
+ * @since 0.2.2
+ * @uses get_sidebar() Checks for the template in the child and parent theme.
+ */
+function hybrid_get_secondary() {
+ get_sidebar( 'secondary' );
+}
+
+/**
+ * Loads the Subsidiary widget area. Users can overwrite 'sidebar-subsidiary.php'.
+ *
+ * @since 0.3.1
+ * @uses get_sidebar() Checks for the template in the child and parent theme.
+ */
+function hybrid_get_subsidiary() {
+ get_sidebar( 'subsidiary' );
+}
+
+/**
+ * Loads the Utility: Before Content widget area. Users can overwrite
+ * 'sidebar-before-content.php' in child themes.
+ *
+ * @since 0.4.0
+ * @uses get_sidebar() Checks for the template in the child and parent theme.
+ */
+function hybrid_get_utility_before_content() {
+ get_sidebar( 'before-content' );
+}
+
+/**
+ * Loads the Utility: After Content widget area. Users can overwrite
+ * 'sidebar-after-content.php' in child themes.
+ *
+ * @since 0.4.0
+ * @uses get_sidebar() Checks for the template in the child and parent theme.
+ */
+function hybrid_get_utility_after_content() {
+ get_sidebar( 'after-content' );
+}
+
+/**
+ * Loads the Utility: After Singular widget area. Users can overwrite
+ * 'sidebar-after-singular.php' in child themes.
+ *
+ * @since 0.7.0
+ * @uses get_sidebar() Checks for the template in the child and parent theme.
+ */
+function hybrid_get_utility_after_singular() {
+ get_sidebar( 'after-singular' );
+}
+
+/**
+ * Loads the 'Primary Menu' template file. Users can overwrite menu-primary.php in their child
+ * theme folder.
+ *
+ * @since 0.8.0
+ * @uses get_template_part() Checks for template in child and parent theme.
+ * @link http://codex.wordpress.org/Function_Reference/get_template_part
+ */
+function hybrid_get_primary_menu() {
+ get_template_part( 'menu', 'primary' );
+}
+
?>
View
20 header.php
@@ -10,39 +10,41 @@
* @package Hybrid
* @subpackage Template
*/
-
-hybrid_doctype(); ?>
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes( 'xhtml' ); ?>>
-<head profile="<?php hybrid_profile_uri(); ?>">
+<head profile="http://gmpg.org/xfn/11">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title><?php hybrid_document_title(); ?></title>
<link rel="stylesheet" href="<?php echo get_stylesheet_uri(); ?>" type="text/css" media="screen" />
+<link rel="pingback" href="http://localhost/xmlrpc.php" />
-<?php hybrid_head(); // Hybrid head hook ?>
+<?php do_atomic( 'head' ); // @deprecated 0.9. Use 'wp_head'. ?>
<?php wp_head(); // WP head hook ?>
</head>
<body class="<?php hybrid_body_class(); ?>">
-<?php hybrid_before_html(); // Before HTML hook ?>
+<?php do_atomic( 'before_html' ); // Before HTML hook ?>
<div id="body-container">
- <?php hybrid_before_header(); // Before header hook ?>
+ <?php do_atomic( 'before_header' ); // Before header hook ?>
<div id="header-container">
<div id="header">
- <?php hybrid_header(); // Header hook ?>
+ <?php do_atomic( 'header' ); // Header hook ?>
</div><!-- #header -->
</div><!-- #header-container -->
- <?php hybrid_after_header(); // After header hook ?>
+ <?php do_atomic( 'after_header' ); // After header hook ?>
<div id="container">
- <?php hybrid_before_container(); // Before container hook ?>
+ <?php do_atomic( 'before_container' ); // Before container hook ?>
View
8 home.php
@@ -12,20 +12,20 @@
<div id="content" class="hfeed content">
- <?php hybrid_before_content(); // Before content hook ?>
+ <?php do_atomic( 'before_content' ); // Before content hook ?>
<?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
<div id="post-<?php the_ID(); ?>" class="<?php hybrid_entry_class(); ?>">
- <?php hybrid_before_entry(); // Before entry hook ?>
+ <?php do_atomic( 'before_entry' ); // Before entry hook ?>
<div class="entry-content">
<?php the_content( sprintf( __( 'Continue reading %1$s', 'hybrid' ), the_title( ' "', '"', false ) ) ); ?>
<?php wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', 'hybrid' ), 'after' => '</p>' ) ); ?>
</div><!-- .entry-content -->
- <?php hybrid_after_entry(); // After entry hook ?>
+ <?php do_atomic( 'after_entry' ); // After entry hook ?>
</div><!-- .hentry -->
@@ -39,7 +39,7 @@
<?php endif; ?>
- <?php hybrid_after_content(); // After content hook ?>
+ <?php do_atomic( 'after_content' ); // After content hook ?>
</div><!-- .content .hfeed -->
View
8 hour.php
@@ -12,7 +12,7 @@
<div id="content" class="hfeed content">
- <?php hybrid_before_content(); // Before content hook ?>
+ <?php do_atomic( 'before_content' ); // Before content hook ?>
<div class="archive-info date-info time-info">
<h1 class="archive-title date-title time-title"><?php the_time( __( 'g a', 'hybrid' ) ); ?></h1>
@@ -31,13 +31,13 @@
<?php get_the_image( array( 'custom_key' => array( 'Thumbnail' ), 'size' => 'thumbnail' ) ); ?>
- <?php hybrid_before_entry(); // Before entry hook ?>
+ <?php do_atomic( 'before_entry' ); // Before entry hook ?>
<div class="entry-summary">
<?php the_excerpt(); ?>
</div><!-- .entry-summary -->
- <?php hybrid_after_entry(); // After entry hook ?>
+ <?php do_atomic( 'after_entry' ); // After entry hook ?>
</div><!-- .hentry -->
@@ -51,7 +51,7 @@
<?php endif; ?>
- <?php hybrid_after_content(); // After content hook ?>
+ <?php do_atomic( 'after_content' ); // After content hook ?>
</div><!-- .content .hfeed -->
View
8 menu-primary.php
@@ -9,15 +9,15 @@
* @subpackage Template
*/
-if ( has_nav_menu( 'primary-menu' ) ) : ?>
+if ( has_nav_menu( 'primary' ) ) : ?>
<div id="primary-menu" class="menu-container">
- <?php hybrid_before_primary_menu(); // Before primary menu hook ?>
+ <?php do_atomic( 'before_primary_menu' ); // Before primary menu hook ?>
- <?php wp_nav_menu( array( 'theme_location' => 'primary-menu', 'container_class' => 'menu', 'menu_class' => '', 'fallback_cb' => '' ) ); ?>
+ <?php wp_nav_menu( array( 'theme_location' => 'primary', 'container_class' => 'menu', 'menu_class' => '', 'fallback_cb' => '' ) ); ?>
- <?php hybrid_after_primary_menu(); // After primary menu hook ?>
+ <?php do_atomic( 'after_primary_menu' ); // After primary menu hook ?>
</div><!-- #primary-menu .menu-container -->
View
8 minute.php
@@ -12,7 +12,7 @@
<div id="content" class="hfeed content">
- <?php hybrid_before_content(); // Before content hook ?>
+ <?php do_atomic( 'before_content' ); // Before content hook ?>
<div class="archive-info date-info time-info">
<h1 class="archive-title date-title time-title"><?php echo ( get_query_var( 'hour' ) ) ? get_the_time( __( 'g:i a', 'hybrid' ) ) : sprintf( __( 'Minute %1$s', 'hybrid' ), get_the_time( __( 'i', 'hybrid' ) ) ); ?></h1>
@@ -35,13 +35,13 @@
<?php get_the_image( array( 'custom_key' => array( 'Thumbnail' ), 'size' => 'thumbnail' ) ); ?>
- <?php hybrid_before_entry(); // Before entry hook ?>
+ <?php do_atomic( 'before_entry' ); // Before entry hook ?>
<div class="entry-summary">
<?php the_excerpt(); ?>
</div><!-- .entry-summary -->
- <?php hybrid_after_entry(); // After entry hook ?>
+ <?php do_atomic( 'after_entry' ); // After entry hook ?>
</div><!-- .hentry -->
@@ -55,7 +55,7 @@
<?php endif; ?>
- <?php hybrid_after_content(); // After content hook ?>
+ <?php do_atomic( 'after_content' ); // After content hook ?>
</div><!-- .content .hfeed -->
View
8 month.php
@@ -12,7 +12,7 @@
<div id="content" class="hfeed content">
- <?php hybrid_before_content(); // Before content hook ?>
+ <?php do_atomic( 'before_content' ); // Before content hook ?>
<div class="archive-info date-info month-info">
@@ -32,13 +32,13 @@
<?php get_the_image( array( 'custom_key' => array( 'Thumbnail' ), 'size' => 'thumbnail' ) ); ?>
- <?php hybrid_before_entry(); // Before entry hook ?>
+ <?php do_atomic( 'before_entry' ); // Before entry hook ?>
<div class="entry-summary">
<?php the_excerpt(); ?>
</div><!-- .entry-summary -->
- <?php hybrid_after_entry(); // After entry hook ?>
+ <?php do_atomic( 'after_entry' ); // After entry hook ?>
</div><!-- .hentry -->
@@ -52,7 +52,7 @@
<?php endif; ?>
- <?php hybrid_after_content(); // After content hook ?>
+ <?php do_atomic( 'after_content' ); // After content hook ?>
</div><!-- .content .hfeed -->
View
10 page-archives.php
@@ -18,13 +18,13 @@
<div id="content" class="hfeed content">
- <?php hybrid_before_content(); // Before content hook ?>
+ <?php do_atomic( 'before_content' ); // Before content hook ?>
<?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
<div id="post-<?php the_ID(); ?>" class="<?php hybrid_entry_class(); ?>">
- <?php hybrid_before_entry(); // Before entry hook ?>
+ <?php do_atomic( 'before_entry' ); // Before entry hook ?>
<div class="entry-content">
@@ -56,11 +56,11 @@
</div><!-- .entry-content -->
- <?php hybrid_after_entry(); // After entry hook ?>
+ <?php do_atomic( 'after_entry' ); // After entry hook ?>
</div><!-- .hentry -->
- <?php hybrid_after_singular(); // After singular hook ?>
+ <?php do_atomic( 'after_singular' ); // After singular hook ?>
<?php comments_template( '/comments.php', true ); ?>
@@ -74,7 +74,7 @@
<?php endif; ?>
- <?php hybrid_after_content(); // After content hook ?>
+ <?php do_atomic( 'after_content' ); // After content hook ?>
</div><!-- .content .hfeed -->
View
10 page-authors.php
@@ -14,13 +14,13 @@
<div id="content" class="hfeed content">
- <?php hybrid_before_content(); // Before content hook ?>
+ <?php do_atomic( 'before_content' ); // Before content hook ?>
<?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
<div id="post-<?php the_ID(); ?>" class="<?php hybrid_entry_class(); ?>">
- <?php hybrid_before_entry(); // Before entry hook ?>
+ <?php do_atomic( 'before_entry' ); // Before entry hook ?>
<div class="entry-content">
@@ -54,11 +54,11 @@
</div><!-- .entry-content -->
- <?php hybrid_after_entry(); // After entry hook ?>
+ <?php do_atomic( 'after_entry' ); // After entry hook ?>
</div><!-- .hentry -->
- <?php hybrid_after_singular(); // After singular hook ?>
+ <?php do_atomic( 'after_singular' ); // After singular hook ?>
<?php comments_template( '/comments.php', true ); ?>
@@ -72,7 +72,7 @@
<?php endif; ?>
- <?php hybrid_after_content(); // After content hook ?>
+ <?php do_atomic( 'after_content' ); // After content hook ?>
</div><!-- .content .hfeed -->
View
10 page-biography.php
@@ -14,13 +14,13 @@
<div id="content" class="hfeed content">
- <?php hybrid_before_content(); // Before content hook ?>
+ <?php do_atomic( 'before_content' ); // Before content hook ?>
<?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
<div id="post-<?php the_ID(); ?>" class="<?php hybrid_entry_class(); ?>">
- <?php hybrid_before_entry(); // Before entry hook ?>
+ <?php do_atomic( 'before_entry' ); // Before entry hook ?>
<div class="entry-content">
@@ -69,11 +69,11 @@
</div><!-- .entry-content -->
- <?php hybrid_after_entry(); // After entry hook ?>
+ <?php do_atomic( 'after_entry' ); // After entry hook ?>
</div><!-- .hentry -->
- <?php hybrid_after_singular(); // After singular hook ?>
+ <?php do_atomic( 'after_singular' ); // After singular hook ?>
<?php comments_template( '/comments.php', true ); ?>
@@ -87,7 +87,7 @@
<?php endif; ?>
- <?php hybrid_after_content(); // After content hook ?>
+ <?php do_atomic( 'after_content' ); // After content hook ?>
</div><!-- .content .hfeed -->
View
10 page-blog.php
@@ -14,7 +14,7 @@
<div id="content" class="hfeed content">
- <?php hybrid_before_content(); // Before content hook ?>
+ <?php do_atomic( 'before_content' ); // Before content hook ?>
<?php
$wp_query = new WP_Query();
@@ -26,20 +26,20 @@
<div id="post-<?php the_ID(); ?>" class="<?php hybrid_entry_class(); ?>">
- <?php hybrid_before_entry(); // Before entry hook ?>
+ <?php do_atomic( 'before_entry' ); // Before entry hook ?>
<div class="entry-content">
<?php the_content( sprintf( __( 'Continue reading %1$s', 'hybrid' ), the_title( ' "', '"', false ) ) ); ?>
<?php wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', 'hybrid' ), 'after' => '</p>' ) ); ?>
</div><!-- .entry-content -->
- <?php hybrid_after_entry(); // After entry hook ?>
+ <?php do_atomic( 'after_entry' ); // After entry hook ?>
</div><!-- .hentry -->
<?php endwhile; ?>
- <?php hybrid_after_singular(); // After singular hook ?>
+ <?php do_atomic( 'after_singular' ); // After singular hook ?>
<?php else: ?>
@@ -49,7 +49,7 @@
<?php endif; ?>
- <?php hybrid_after_content(); // After content hook ?>
+ <?php do_atomic( 'after_content' ); // After content hook ?>
</div><!-- .content .hfeed -->
View
10 page-bookmarks.php
@@ -14,13 +14,13 @@
<div id="content" class="hfeed content">
- <?php hybrid_before_content(); // Before content hook ?>
+ <?php do_atomic( 'before_content' ); // Before content hook ?>
<?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
<div id="post-<?php the_ID(); ?>" class="<?php hybrid_entry_class(); ?>">
- <?php hybrid_before_entry(); // Before entry hook ?>
+ <?php do_atomic( 'before_entry' ); // Before entry hook ?>
<div class="entry-content">
@@ -44,11 +44,11 @@
</div><!-- .entry-content -->
- <?php hybrid_after_entry(); // After entry hook ?>
+ <?php do_atomic( 'after_entry' ); // After entry hook ?>
</div><!-- .hentry -->
- <?php hybrid_after_singular(); // After singular hook ?>
+ <?php do_atomic( 'after_singular' ); // After singular hook ?>
<?php comments_template( '/comments.php', true ); ?>
@@ -62,7 +62,7 @@
<?php endif; ?>
- <?php hybrid_after_content(); // After content hook ?>
+ <?php do_atomic( 'after_content' ); // After content hook ?>
</div><!-- .content .hfeed -->
View
10 page-categories.php
@@ -14,13 +14,13 @@
<div id="content" class="hfeed content">
- <?php hybrid_before_content(); // Before content hook ?>
+ <?php do_atomic( 'before_content' ); // Before content hook ?>
<?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
<div id="post-<?php the_ID(); ?>" class="<?php hybrid_entry_class(); ?>">
- <?php hybrid_before_entry(); // Before entry hook ?>
+ <?php do_atomic( 'before_entry' ); // Before entry hook ?>
<div class="entry-content">
@@ -34,11 +34,11 @@
</div><!-- .entry-content -->
- <?php hybrid_after_entry(); // After entry hook ?>
+ <?php do_atomic( 'after_entry' ); // After entry hook ?>
</div><!-- .hentry -->
- <?php hybrid_after_singular(); // After singular hook ?>
+ <?php do_atomic( 'after_singular' ); // After singular hook ?>
<?php comments_template( '/comments.php', true ); ?>
@@ -52,7 +52,7 @@
<?php endif; ?>
- <?php hybrid_after_content(); // After content hook ?>
+ <?php do_atomic( 'after_content' ); // After content hook ?>
</div><!-- .content .hfeed -->
View
10 page-daily.php
@@ -13,13 +13,13 @@
<div id="content" class="hfeed content">
- <?php hybrid_before_content(); // Before content hook ?>
+ <?php do_atomic( 'before_content' ); // Before content hook ?>
<?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
<div id="post-<?php the_ID(); ?>" class="<?php hybrid_entry_class(); ?>">
- <?php hybrid_before_entry(); // Before entry hook ?>
+ <?php do_atomic( 'before_entry' ); // Before entry hook ?>
<div class="entry-content">
@@ -33,11 +33,11 @@
</div><!-- .entry-content -->
- <?php hybrid_after_entry(); // After entry hook ?>
+ <?php do_atomic( 'after_entry' ); // After entry hook ?>
</div><!-- .hentry -->
- <?php hybrid_after_singular(); // After singular hook ?>
+ <?php do_atomic( 'after_singular' ); // After singular hook ?>
<?php comments_template( '/comments.php', true ); ?>
@@ -51,7 +51,7 @@
<?php endif; ?>
- <?php hybrid_after_content(); // After content hook ?>
+ <?php do_atomic( 'after_content' ); // After content hook ?>
</div><!-- .content .hfeed -->
View
16 page-logged-in.php
@@ -16,24 +16,24 @@
<div id="content" class="hfeed content">
- <?php hybrid_before_content(); // Before content hook ?>
+ <?php do_atomic( 'before_content' ); // Before content hook ?>
<?php if ( have_posts() && is_user_logged_in() ) : while ( have_posts() ) : the_post(); ?>
<div id="post-<?php the_ID(); ?>" class="<?php hybrid_entry_class(); ?>">
- <?php hybrid_before_entry(); // Before entry hook ?>
+ <?php do_atomic( 'before_entry' ); // Before entry hook ?>
<div class="entry-content">
<?php the_content(); ?>
<?php wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', 'hybrid' ), 'after' => '</p>' ) ); ?>
</div><!-- .entry-content -->
- <?php hybrid_after_entry(); // After entry hook ?>
+ <?php do_atomic( 'after_entry' ); // After entry hook ?>
</div><!-- .hentry -->
- <?php hybrid_after_singular(); // After singular hook ?>
+ <?php do_atomic( 'after_singular' ); // After singular hook ?>
<?php comments_template( '/comments.php', true ); ?>
@@ -43,7 +43,7 @@
<div id="post-0" class="<?php hybrid_entry_class(); ?>">
- <?php hybrid_before_entry(); // Before entry hook ?>
+ <?php do_atomic( 'before_entry' ); // Before entry hook ?>
<div class="entry-content">
@@ -55,11 +55,11 @@
</div><!-- .entry-content -->
- <?php hybrid_after_entry(); // After entry hook ?>
+ <?php do_atomic( 'after_entry' ); // After entry hook ?>
</div><!-- #post-0 .hentry -->
- <?php hybrid_after_singular(); // After singular hook ?>
+ <?php do_atomic( 'after_singular' ); // After singular hook ?>
<?php else: ?>
@@ -69,7 +69,7 @@
<?php endif; ?>
- <?php hybrid_after_content(); // After content hook ?>
+ <?php do_atomic( 'after_content' ); // After content hook ?>
</div><!-- .content .hfeed -->
View
10 page-monthly.php
@@ -13,13 +13,13 @@
<div id="content" class="hfeed content">
- <?php hybrid_before_content(); // Before content hook ?>
+ <?php do_atomic( 'before_content' ); // Before content hook ?>
<?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
<div id="post-<?php the_ID(); ?>" class="<?php hybrid_entry_class(); ?>">
- <?php hybrid_before_entry(); // Before entry hook ?>
+ <?php do_atomic( 'before_entry' ); // Before entry hook ?>
<div class="entry-content">
@@ -33,11 +33,11 @@
</div><!-- .entry-content -->
- <?php hybrid_after_entry(); // After entry hook ?>
+ <?php do_atomic( 'after_entry' ); // After entry hook ?>
</div><!-- .hentry -->
- <?php hybrid_after_singular(); // After singular hook ?>
+ <?php do_atomic( 'after_singular' ); // After singular hook ?>
<?php comments_template( '/comments.php', true ); ?>
@@ -51,7 +51,7 @@
<?php endif; ?>
- <?php hybrid_after_content(); // After content hook ?>
+ <?php do_atomic( 'after_content' ); // After content hook ?>
</div><!-- .content .hfeed -->
View
10 page-no-widgets.php
@@ -13,24 +13,24 @@
<div id="content" class="hfeed content">
- <?php hybrid_before_content(); // Before content hook ?>
+ <?php do_atomic( 'before_content' ); // Before content hook ?>
<?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
<div id="post-<?php the_ID(); ?>" class="<?php hybrid_entry_class(); ?>">
- <?php hybrid_before_entry(); // Before entry hook ?>
+ <?php do_atomic( 'before_entry' ); // Before entry hook ?>
<div class="entry-content">
<?php the_content(); ?>
<?php wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', 'hybrid' ), 'after' => '</p>' ) ); ?>
</div><!-- .entry-content -->
- <?php hybrid_after_entry(); // After entry hook ?>
+ <?php do_atomic( 'after_entry' ); // After entry hook ?>
</div><!-- .hentry -->
- <?php hybrid_after_singular(); // After singular hook ?>
+ <?php do_atomic( 'after_singular' ); // After singular hook ?>
<?php comments_template( '/comments.php', true ); ?>
@@ -44,7 +44,7 @@
<?php endif; ?>
- <?php hybrid_after_content(); // After content hook ?>
+ <?php do_atomic( 'after_content' ); // After content hook ?>
</div><!-- .content .hfeed -->
View
10 page-post_tag-cloud.php
@@ -14,13 +14,13 @@
<div id="content" class="hfeed content">
- <?php hybrid_before_content(); // Before content hook ?>
+ <?php do_atomic( 'before_content' ); // Before content hook ?>
<?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
<div id="post-<?php the_ID(); ?>" class="<?php hybrid_entry_class(); ?>">
- <?php hybrid_before_entry(); // Before entry hook ?>
+ <?php do_atomic( 'before_entry' ); // Before entry hook ?>
<div class="entry-content">
@@ -34,11 +34,11 @@
</div><!-- .entry-content -->
- <?php hybrid_after_entry(); // After entry hook ?>
+ <?php do_atomic( 'after_entry' ); // After entry hook ?>
</div><!-- .hentry -->
- <?php hybrid_after_singular(); // After singular hook ?>
+ <?php do_atomic( 'after_singular' ); // After singular hook ?>
<?php comments_template( '/comments.php', true ); ?>
@@ -52,7 +52,7 @@
<?php endif; ?>
- <?php hybrid_after_content(); // After content hook ?>
+ <?php do_atomic( 'after_content' ); // After content hook ?>
</div><!-- .content .hfeed -->
View
10 page-sitemap.php
@@ -14,13 +14,13 @@
<div id="content" class="hfeed content">
- <?php hybrid_before_content(); // Before content hook ?>
+ <?php do_atomic( 'before_content' ); // Before content hook ?>
<?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
<div id="post-<?php the_ID(); ?>" class="<?php hybrid_entry_class(); ?>">
- <?php hybrid_before_entry(); // Before entry hook ?>
+ <?php do_atomic( 'before_entry' ); // Before entry hook ?>
<div class="entry-content">
@@ -94,11 +94,11 @@
</div><!-- .entry-content -->
- <?php hybrid_after_entry(); // After entry hook ?>
+ <?php do_atomic( 'after_entry' ); // After entry hook ?>
</div><!-- .hentry -->
- <?php hybrid_after_singular(); // After singular hook ?>
+ <?php do_atomic( 'after_singular' ); // After singular hook ?>
<?php comments_template( '/comments.php', true ); ?>
@@ -112,7 +112,7 @@
<?php endif; ?>
- <?php hybrid_after_content(); // After content hook ?>
+ <?php do_atomic( 'after_content' ); // After content hook ?>
</div><!-- .content .hfeed -->
View
10 page-weekly.php
@@ -13,13 +13,13 @@
<div id="content" class="hfeed content">
- <?php hybrid_before_content(); // Before content hook ?>
+ <?php do_atomic( 'before_content' ); // Before content hook ?>
<?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
<div id="post-<?php the_ID(); ?>" class="<?php hybrid_entry_class(); ?>">
- <?php hybrid_before_entry(); // Before entry hook ?>
+ <?php do_atomic( 'before_entry' ); // Before entry hook ?>
<div class="entry-content">
@@ -33,11 +33,11 @@
</div><!-- .entry-content -->
- <?php hybrid_after_entry(); // After entry hook ?>
+ <?php do_atomic( 'after_entry' ); // After entry hook ?>
</div><!-- .hentry -->
- <?php hybrid_after_singular(); // After singular hook ?>
+ <?php do_atomic( 'after_singular' ); // After singular hook ?>
<?php comments_template( '/comments.php', true ); ?>
@@ -51,7 +51,7 @@
<?php endif; ?>
- <?php hybrid_after_content(); // After content hook ?>
+ <?php do_atomic( 'after_content' ); // After content hook ?>
</div><!-- .content .hfeed -->
View
6 page-widgets.php
@@ -14,7 +14,7 @@
<div id="content" class="hfeed content">
- <?php hybrid_before_content(); // Before content hook ?>
+ <?php do_atomic( 'before_content' ); // Before content hook ?>
<?php dynamic_sidebar( 'widgets-template' ); ?>
@@ -24,7 +24,7 @@
<?php edit_post_link( __( 'Edit', 'hybrid' ), '<p class="entry-meta"><span class="edit">', '</span></p>' ); ?>
- <?php hybrid_after_singular(); // After singular hook ?>
+ <?php do_atomic( 'after_singular' ); // After singular hook ?>
<?php comments_template( '/comments.php', true ); ?>
@@ -38,7 +38,7 @@
<?php endif; ?>
- <?php hybrid_after_content(); // After content hook ?>
+ <?php do_atomic( 'after_content' ); // After content hook ?>
</div><!-- .content .hfeed -->
View
10 page-yearly.php
@@ -13,13 +13,13 @@
<div id="content" class="hfeed content">
- <?php hybrid_before_content(); // Before content hook ?>
+ <?php do_atomic( 'before_content' ); // Before content hook ?>
<?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
<div id="post-<?php the_ID(); ?>" class="<?php hybrid_entry_class(); ?>">
- <?php hybrid_before_entry(); // Before entry hook ?>
+ <?php do_atomic( 'before_entry' ); // Before entry hook ?>
<div class="entry-content">
@@ -33,11 +33,11 @@
</div><!-- .entry-content -->
- <?php hybrid_after_entry(); // After entry hook ?>
+ <?php do_atomic( 'after_entry' ); // After entry hook ?>
</div><!-- .hentry -->
- <?php hybrid_after_singular(); // After singular hook ?>
+ <?php do_atomic( 'after_singular' ); // After singular hook ?>
<?php comments_template( '/comments.php', true ); ?>
@@ -51,7 +51,7 @@
<?php endif; ?>
- <?php hybrid_after_content(); // After content hook ?>
+ <?php do_atomic( 'after_content' ); // After content hook ?>
</div><!-- .content .hfeed -->
View
10 page.php
@@ -14,24 +14,24 @@
<div id="content" class="hfeed content">
- <?php hybrid_before_content(); // Before content hook ?>
+ <?php do_atomic( 'before_content' ); // Before content hook ?>
<?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
<div id="post-<?php the_ID(); ?>" class="<?php hybrid_entry_class(); ?>">
- <?php hybrid_before_entry(); // Before entry hook ?>
+ <?php do_atomic( 'before_entry' ); // Before entry hook ?>
<div class="entry-content">
<?php the_content(); ?>
<?php wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', 'hybrid' ), 'after' => '</p>' ) ); ?>
</div><!-- .entry-content -->
- <?php hybrid_after_entry(); // After entry hook ?>
+ <?php do_atomic( 'after_entry' ); // After entry hook ?>
</div><!-- .hentry -->
- <?php hybrid_after_singular(); // After singular hook ?>
+ <?php do_atomic( 'after_singular' ); // After singular hook ?>
<?php comments_template( '/comments.php', true ); ?>
@@ -45,7 +45,7 @@
<?php endif; ?>
- <?php hybrid_after_content(); // After content hook ?>
+ <?php do_atomic( 'after_content' ); // After content hook ?>
</div><!-- .content .hfeed -->
View
10 post-no-widgets.php
@@ -12,24 +12,24 @@
<div id="content" class="hfeed content">
- <?php hybrid_before_content(); // Before content hook ?>
+ <?php do_atomic( 'before_content' ); // Before content hook ?>
<?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
<div id="post-<?php the_ID(); ?>" class="<?php hybrid_entry_class(); ?>">
- <?php hybrid_before_entry(); // Before entry hook ?>
+ <?php do_atomic( 'before_entry' ); // Before entry hook ?>
<div class="entry-content">
<?php the_content(); ?>
<?php wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', 'hybrid' ), 'after' => '</p>' ) ); ?>
</div><!-- .entry-content -->
- <?php hybrid_after_entry(); // After entry hook ?>
+ <?php do_atomic( 'after_entry' ); // After entry hook ?>
</div><!-- .hentry -->
- <?php hybrid_after_singular(); // After singular hook ?>
+ <?php do_atomic( 'after_singular' ); // After singular hook ?>
<?php comments_template( '/comments.php', true ); ?>
@@ -43,7 +43,7 @@
<?php endif; ?>
- <?php hybrid_after_content(); // After content hook ?>
+ <?php do_atomic( 'after_content' ); // After content hook ?>
</div><!-- .content .hfeed -->
View
10 post.php
@@ -13,24 +13,24 @@
<div id="content" class="hfeed content">
- <?php hybrid_before_content(); // Before content hook ?>
+ <?php do_atomic( 'before_content' ); // Before content hook ?>
<?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
<div id="post-<?php the_ID(); ?>" class="<?php hybrid_entry_class(); ?>">
- <?php hybrid_before_entry(); // Before entry hook ?>
+ <?php do_atomic( 'before_entry' ); // Before entry hook ?>
<div class="entry-content">
<?php the_content(); ?>
<?php wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', 'hybrid' ), 'after' => '</p>' ) ); ?>
</div><!-- .entry-content -->
- <?php hybrid_after_entry(); // After entry hook ?>
+ <?php do_atomic( 'after_entry' ); // After entry hook ?>
</div><!-- .hentry -->
- <?php hybrid_after_singular(); // After singular hook ?>
+ <?php do_atomic( 'after_singular' ); // After singular hook ?>
<?php comments_template( '/comments.php', true ); ?>
@@ -44,7 +44,7 @@
<?php endif; ?>
- <?php hybrid_after_content(); // After content hook ?>
+ <?php do_atomic( 'after_content' ); // After content hook ?>
</div><!-- .content .hfeed -->
View
8 search.php
@@ -13,7 +13,7 @@
<div id="content" class="hfeed content">
- <?php hybrid_before_content(); // Before content hook ?>
+ <?php do_atomic( 'before_content' ); // Before content hook ?>
<div class="search-info">
@@ -31,13 +31,13 @@
<?php get_the_image( array(