Skip to content

Commit

Permalink
Wrap Theme Setup functionality in Infinity Features
Browse files Browse the repository at this point in the history 
It is now possible to easily control what theme setup functions will be loaded. A developer can easily disable parts of the setup by turning Features off. Example:

;WordPress Setup Features
infinity-sidebar-setup = on

Signed-off-by: Bowe Frankema <bowe@bp-tricks.com>
  • Loading branch information
Bowe Frankema committed Jan 9, 2012
1 parent 9523c19 commit 0d35197
Show file tree
Hide file tree
Showing 16 changed files with 207 additions and 183 deletions.
2 changes: 1 addition & 1 deletion 404.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<div id="search-categories-widget" class="grid_12 alpha">

<h2 class="widgettitle">
<?php _e( 'Most Used Categories', 'twentyeleven' ); ?>
<?php _e( 'Most Used Categories', infinity_text_domain ); ?>
</h2>
<ul>
<?php wp_list_categories( array( 'orderby' => 'count', 'order' => 'DESC', 'show_count' => 1, 'title_li' => '', 'number' => 10 ) ); ?>
Expand Down
2 changes: 2 additions & 0 deletions author.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
?>
<div class="page" id="blog-author">
<?php
if ( current_theme_supports( 'infinity-introduction-boxes' ) ) :
infinity_get_template_part( 'templates/parts/introduction-boxes' );
endif;
infinity_get_template_part( 'templates/loops/loop', 'author' );
?>
</div>
Expand Down
20 changes: 1 addition & 19 deletions base/comments.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,10 @@ function custom_comment( $comment, $args, $depth )
<a name="comment-<?php comment_ID() ?>"></a>
<div id="li-comment-<?php comment_ID() ?>" class="comment-container">
<?php if( get_comment_type() == "comment" ): ?>
<div class="avatar"><?php the_commenter_avatar($arg) ?></div>
<div class="avatar"><?php echo get_avatar( $comment, 35 ); ?></div>
<?php endif; ?>
<div class="comment-head">
<span class="name"><?php the_commenter_link() ?></span>
<?php if( $isByAuthor ): ?>
<span class="author-tag"><?php _e('(Author)',infinity_text_domain) ?></span>
<?php endif; ?>
<span class="date"><?php echo get_comment_date(get_option( 'date_format' )) ?> <?php _e('at', infinity_text_domain); ?> <?php echo get_comment_time(get_option( 'time_format' )); ?></span>
<span class="perma"><a href="<?php echo get_comment_link(); ?>" title="<?php _e('Direct link to this comment', infinity_text_domain); ?>">#</a></span>
<span class="edit"><?php edit_comment_link(__('Edit', infinity_text_domain), '', ''); ?></span>
Expand Down Expand Up @@ -98,19 +95,4 @@ function the_commenter_link()
print $commenter ;
}
}

if (!function_exists("the_commenter_avatar"))
{
/**
* @package Infinity
* @subpackage misc
*/
function the_commenter_avatar($args)
{
$email = get_comment_author_email();
$avatar = str_replace( "class='avatar", "class='photo avatar", get_avatar( "$email", $args['avatar_size']) );
echo $avatar;
}
}

?>
134 changes: 68 additions & 66 deletions base/options.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,80 +30,82 @@ function infinity_custom_favicon() { { ?>
// Hook into action
add_action('wp_head','infinity_custom_favicon');

// ==========================
// ! // Apply Content Class based on Theme Options
// ==========================
function infinity_content_class() { { ?>
<?php if ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_17" ): ?>
class="grid_17"
<?php elseif ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_20" ): ?>
class="grid_20"
<?php elseif ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_19" ): ?>
class="grid_19"
<?php elseif ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_18" ): ?>
class="grid_18"
<?php elseif ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_16" ): ?>
class="grid_16"
<?php elseif ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_15" ): ?>
class="grid_15"
<?php elseif ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_14" ): ?>
class="grid_14"
<?php elseif ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_12" ): ?>
class="grid_12"
<?php endif; ?>
<?php }}
// Hook into action
add_action('content_class','infinity_content_class');

//do the same for the sidebar
function infinity_sidebar_class() { { ?>
<?php if ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_17" ): ?>
class="grid_7"
<?php elseif ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_20" ): ?>
class="grid_4"
<?php elseif ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_19" ): ?>
class="grid_5"
<?php elseif ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_18" ): ?>
class="grid_6"
<?php elseif ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_16" ): ?>
class="grid_8"
<?php elseif ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_15" ): ?>
class="grid_9"
<?php elseif ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_14" ): ?>
class="grid_10"
<?php elseif ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_12" ): ?>
class="grid_12"
<?php endif; ?>
<?php }}
// Hook into action
add_action('sidebar_class','infinity_sidebar_class');

// ! // Use a jQuery powered fallback for 3rd Party BuddyPress Plugins.
function infinity_custom_sidebar() { { ?>
<script>
jQuery(document).ready(function() {
if ( current_theme_supports( 'infinity-grid-style' ) ) {
// ==========================
// ! // Apply Content Class based on Theme Options
// ==========================
function infinity_content_class() { { ?>
<?php if ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_17" ): ?>
jQuery('#content').addClass('grid_17');
class="grid_17"
<?php elseif ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_20" ): ?>
jQuery('#content').addClass('grid_20');
class="grid_20"
<?php elseif ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_19" ): ?>
jQuery('#content').addClass('grid_19');
class="grid_19"
<?php elseif ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_18" ): ?>
jQuery('#content').addClass('grid_18');
class="grid_18"
<?php elseif ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_16" ): ?>
jQuery('#content').addClass('grid_16');
class="grid_16"
<?php elseif ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_15" ): ?>
jQuery('#content').addClass('grid_15');
class="grid_15"
<?php elseif ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_14" ): ?>
jQuery('#content').addClass('grid_14');
class="grid_14"
<?php elseif ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_12" ): ?>
jQuery('#content').addClass('grid_12');
class="grid_12"
<?php endif; ?>
});
</script>
<?php }}
// Hook into action
add_action('open_body','infinity_custom_sidebar');
<?php }}
// Hook into action
add_action('content_class','infinity_content_class');

//do the same for the sidebar
function infinity_sidebar_class() { { ?>
<?php if ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_17" ): ?>
class="grid_7"
<?php elseif ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_20" ): ?>
class="grid_4"
<?php elseif ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_19" ): ?>
class="grid_5"
<?php elseif ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_18" ): ?>
class="grid_6"
<?php elseif ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_16" ): ?>
class="grid_8"
<?php elseif ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_15" ): ?>
class="grid_9"
<?php elseif ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_14" ): ?>
class="grid_10"
<?php elseif ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_12" ): ?>
class="grid_12"
<?php endif; ?>
<?php }}
// Hook into action
add_action('sidebar_class','infinity_sidebar_class');

// ! // Use a jQuery powered fallback for 3rd Party BuddyPress Plugins.
function infinity_custom_sidebar() { { ?>
<script>
jQuery(document).ready(function() {
<?php if ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_17" ): ?>
jQuery('div#content').addClass('grid_17');
<?php elseif ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_20" ): ?>
jQuery('div#content').addClass('grid_20');
<?php elseif ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_19" ): ?>
jQuery('div#content').addClass('grid_19');
<?php elseif ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_18" ): ?>
jQuery('div#content').addClass('grid_18');
<?php elseif ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_16" ): ?>
jQuery('div#content').addClass('grid_16');
<?php elseif ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_15" ): ?>
jQuery('div#content').addClass('grid_15');
<?php elseif ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_14" ): ?>
jQuery('div#content').addClass('grid_14');
<?php elseif ( infinity_option_get( 'infinity-core-options-sidebar_size' ) == "grid_12" ): ?>
jQuery('div#content').addClass('grid_12');
<?php endif; ?>
});
</script>
<?php }}
// Hook into action
add_action('open_body','infinity_custom_sidebar');
}

// Custom CSS
add_action( 'wp_head', 'infinity_custom_css' );
Expand All @@ -112,7 +114,7 @@ function infinity_custom_css( ) {
?>
<style type='text/css'>
<?php if ( infinity_option_get( 'infinity-core-options-sidebar_position' ) == "left" ): ?>
#content{float:right;}#inner-sidebar{margin-left:-25px;margin-right:10px;padding-right:25px;}
#content{float:right;}#inner-sidebar{margin-left:-23px;margin-right:10px;padding-right:25px;}
<?php endif; ?>
</style>
<?php
Expand Down
2 changes: 2 additions & 0 deletions category.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
?>
<div class="page" id="blog-category">
<?php
if ( current_theme_supports( 'infinity-introduction-boxes' ) ) :
infinity_get_template_part( 'templates/parts/introduction-boxes' );
endif;
infinity_get_template_part( 'templates/loops/loop', 'category' );
?>
</div>
Expand Down
Loading

0 comments on commit 0d35197

Please sign in to comment.