Commits

Doug Stewart committed 9317615

Misplaced div == royal pain.

  • Participants
  • Parent commits abef94b

Comments (0)

Files changed (20)

File activity/index.php

 				<?php do_action( 'bp_after_directory_activity_content' ) ?>
 
 <?php get_template_part( 'bp-wrapper-footer' ); ?>
-
-<?php get_sidebar( 'buddypress' ) ?>
-
+ 
 <?php get_footer( 'buddypress' ) ?>

File blogs/create.php

 
 			<?php do_action( 'bp_after_create_blog_content' ); ?>
 
+	<?php do_action( 'bp_after_directory_blogs_content' ); ?>
+
 <?php get_template_part( 'bp-wrapper-footer' ); ?>
 
-	<?php do_action( 'bp_after_directory_blogs_content' ); ?>
-
-<?php get_sidebar( 'buddypress' ); ?>
 <?php get_footer( 'buddypress' ); ?>
 

File blogs/index.php

 
 			</form><!-- #blogs-directory-form -->
 
+	<?php do_action( 'bp_after_directory_blogs_content' ); ?>
+	
 <?php get_template_part( 'bp-wrapper-footer' ); ?>
-	<?php do_action( 'bp_after_directory_blogs_content' ); ?>
 
-<?php get_sidebar( 'buddypress' ); ?>
 <?php get_footer( 'buddypress' ); ?>

File bp-wrapper-footer.php

 			</div><!-- .padder -->
 		</div><!-- #lb-content -->
 	</div><!-- #wrapper -->
+	
+	<?php get_sidebar( 'buddypress' ) ?>
+	
 </div><!-- #allwrapper -->

File forums/index.php

 
 					<?php endif; ?>
 				</div><!-- #new-topic-post -->
+	<?php do_action( 'bp_after_directory_forums_content' ); ?>
 <?php get_template_part( 'bp-wrapper-footer' ); ?>
-	<?php do_action( 'bp_after_directory_forums_content' ); ?>
 
-<?php get_sidebar( 'buddypress' ); ?>
 <?php get_footer( 'buddypress' ); ?>

File groups/create.php

 			</form>
 
 <?php get_template_part( 'bp-wrapper-footer' ); ?>
-<?php get_sidebar( 'buddypress' ); ?>
 <?php get_footer( 'buddypress' ); ?>

File groups/index.php

 				<?php wp_nonce_field( 'directory_groups', '_wpnonce-groups-filter' ); ?>
 
 			</form><!-- #groups-directory-form -->
+	<?php do_action( 'bp_after_directory_groups_content' ); ?>
+<?php get_template_part( 'bp-wrapper-footer' ); ?>
 
-<?php get_template_part( 'bp-wrapper-footer' ); ?>
-	<?php do_action( 'bp_after_directory_groups_content' ); ?>
-
-<?php get_sidebar( 'buddypress' ); ?>
 <?php get_footer( 'buddypress' ); ?>
 

File groups/single/home.php

 				<?php endwhile; endif; ?>
 
 <?php get_template_part( 'bp-wrapper-footer' ); ?>
-<?php get_sidebar( 'buddypress' ); ?>
+
 <?php get_footer( 'buddypress' ); ?>

File groups/single/plugins.php

 				<?php do_action( 'bp_after_group_plugin_template' ) ?>
 
 <?php get_template_part( 'bp-wrapper-footer' ); ?>
-	<?php get_sidebar( 'buddypress' ) ?>
 
 <?php get_footer( 'buddypress' ) ?>

File includes/functions/admin.php

 ?>
 <div class="wrap">
 <form method="post" action="options.php">
-<div id="icon-themes" class="icon32"><br /></div>
+<?php screen_icon( 'themes' ); ?>
 <h2 class="updatehook"><?php echo $themename; ?> settings 
 	<input name="<?php echo $lblg_shortname; ?>_lblg_options[save]" type="submit" class="button-primary" value="Save changes" />
 	<input name="<?php echo $lblg_shortname; ?>_lblg_options[reset]" type="submit" class="button-secondary" value="Reset to defaults" />
 	if ( isset( $_REQUEST['settings-updated'] ) ) echo '<div id="message" class="updated under-h2"><p><strong>'.$themename.' settings updated.</strong></p></div>';
 
 	settings_fields( $lblg_shortname . '_lblg_options' ); 
-	//do_settings_sections( 'lblg_options_group' );
 ?>
 <table class="form-table">
 <tbody>

File includes/functions/buddypress.php

 		}
 		
 	} 
-}
+}
+
+/*
+*  BuddyPress support code, taken from the BuddyPress Template Pack
+*
+*/
+function lblg_bp_init(){
+	global $lblg_shortname, $lblg_options;
+	
+	/* Load the default BuddyPress AJAX functions */
+	if ( 'false' == $lblg_options['disable_bp_js'] ) {
+		require_once( BP_PLUGIN_DIR . '/bp-themes/bp-default/_inc/ajax.php' );
+
+		/* Load the default BuddyPress javascript */
+		wp_enqueue_script( 'lblg-bp-js', BP_PLUGIN_URL . '/bp-themes/bp-default/_inc/global.js', array( 'jquery' ) );
+	}
+	
+	/* Add the wireframe BP page styles */
+	if ( 'false' == $lblg_options['disable_bp_css'] )
+		wp_enqueue_style( 'lblg-bp-css', get_template_directory_uri() . '/includes/css/bp.css' );
+}
+

File includes/functions/hooks.php

 }
 
 /*
-*  BuddyPress support code, taken from the BuddyPress Template Pack
-*
-*/
-function lblg_bp_init(){
-	global $lblg_shortname, $lblg_options;
-	
-	/* Load the default BuddyPress AJAX functions */
-	if ( 'false' == $lblg_options['disable_bp_js'] ) {
-		require_once( BP_PLUGIN_DIR . '/bp-themes/bp-default/_inc/ajax.php' );
-
-		/* Load the default BuddyPress javascript */
-		wp_enqueue_script( 'lblg-bp-js', BP_PLUGIN_URL . '/bp-themes/bp-default/_inc/global.js', array( 'jquery' ) );
-	}
-	
-	/* Add the wireframe BP page styles */
-	if ( 'false' == $lblg_options['disable_bp_css'] )
-		wp_enqueue_style( 'lblg-bp-css', get_template_directory_uri() . '/includes/css/bp.css' );
-}
-
-
-/*
 *  Utility hooks for use inside <head> and admin <head>,
 *  via wp_head() and admin_head(). Just in case.
 */

File members/index.php

 				<?php wp_nonce_field( 'directory_members', '_wpnonce-member-filter' ); ?>
 
 			</form><!-- #members-directory-form -->
+	<?php do_action( 'bp_after_directory_members_content' ); ?>
+<?php get_template_part( 'bp-wrapper-footer' ); ?>
 
-<?php get_template_part( 'bp-wrapper-footer' ); ?>
-	<?php do_action( 'bp_after_directory_members_content' ); ?>
-
-<?php get_sidebar( 'buddypress' ); ?>
 <?php get_footer( 'buddypress' ); ?>

File members/single/home.php

 				<?php do_action( 'bp_after_member_home_content' ); ?>
 
 <?php get_template_part( 'bp-wrapper-footer' ); ?>
-<?php get_sidebar( 'buddypress' ); ?>
+
 <?php get_footer( 'buddypress' ); ?>

File members/single/plugins.php

 				<?php do_action( 'bp_after_member_plugin_template' ); ?>
 
 <?php get_template_part( 'bp-wrapper-footer' ); ?>
-<?php get_sidebar( 'buddypress' ); ?>
 <?php get_footer( 'buddypress' ); ?>

File members/single/settings/delete-account.php

 				<?php do_action( 'bp_after_member_settings_template' ); ?>
 
 <?php get_template_part( 'bp-wrapper-footer' ); ?>
-<?php get_sidebar( 'buddypress' ) ?>
 
 <?php get_footer( 'buddypress' ) ?>

File members/single/settings/general.php

 				<?php do_action( 'bp_after_member_settings_template' ); ?>
 
 <?php get_template_part( 'bp-wrapper-footer' ); ?>
-<?php get_sidebar( 'buddypress' ) ?>
 
 <?php get_footer( 'buddypress' ) ?>

File members/single/settings/notifications.php

 				<?php do_action( 'bp_after_member_settings_template' ); ?>
 
 <?php get_template_part( 'bp-wrapper-footer' ); ?>
-<?php get_sidebar( 'buddypress' ) ?>
 
 <?php get_footer( 'buddypress' ) ?>

File registration/activate.php

 
 <?php get_template_part( 'bp-wrapper-footer' ); ?>
 
-	<?php get_sidebar( 'buddypress' ) ?>
-
 <?php get_footer( 'buddypress' ); ?>

File registration/register.php

 			<?php do_action( 'bp_after_register_page' ) ?>
 
 <?php get_template_part( 'bp-wrapper-footer' ); ?>
-	<?php get_sidebar( 'buddypress' ) ?>
 
 	<?php do_action( 'bp_after_directory_activity_content' ) ?>