Commits

Doug Stewart committed 6b6c62f
  • Participants
  • Parent commits 06f3fa7

Comments (0)

Files changed (15)

File comments.php

-<ol id="comments" class="commentlist">
+<?php 
+if( have_comments() ) { ?>
+	<h2 id="comments"><?php comments_number(); ?></h2>
 
-<?php wp_list_comments(); ?>
+		<ol class="commentlist">
+			<?php wp_list_comments(); ?>
+		</ol>
+<?php 
+	paginate_comments_links();
+}
+?>
 
-</ol>
+<?php 
+if( comments_open() ){
+	comment_form(); 
+}
+?>
 
-<?php paginate_comments_links(); ?>
-
-<?php comment_form(); ?>

File functions.php

 	echo $credits_text;
 }
 
+function lblg_styles(){
+	global $shortname;
+	$layout_handle = $shortname . '_layout_stylesheet';
+	$alt_style_handle = $shortname . '_alt_stylesheet';
+	$print_handle = $shortname . '_print_stylesheet';
+	
+	$layout_style_option = get_option($shortname.'_layout_stylesheet');
+	$alt_style_option = get_option($shortname.'_alt_stylesheet');
+	
+	switch($layout_style_option){
+		case '':
+		case 'Select a layout:':
+			$layout = get_template_directory_uri() . '/layouts/2-columns-fixed-sb-right.css';
+		break;
+		case '*none*':
+			unset($layout);
+		break;
+		default:
+			$layout = get_template_directory_uri() . '/layouts/' . $layout_style_option;
+		break;
+	}
+	
+	switch($alt_style_option){
+		case '':
+		case 'Select a stylesheet:':
+			$alt_style = get_template_directory_uri() .'/styles/ng.css';
+		break;
+		case '*none*':
+			unset($alt_style);
+		break;
+		default:
+			$alt_style = get_template_directory_uri() .'/styles/'. $alt_style_option;
+		break;
+	}
+	
+	if( isset($layout) ){
+		wp_enqueue_style( $layout_handle , $layout, '', '', 'screen' );
+	}
+	
+	if( isset($alt_style) ){
+		wp_enqueue_style( $alt_style_handle, $alt_style, '', '', 'screen' );
+	}
+	
+	wp_enqueue_style($print_handle,  get_template_directory_uri() . '/print.css', '', '', 'print' );
+}
+
+
 /*
 * Theme Hooks
 */
 	do_action( 'lblg_print_credits' );
 }
 
+function lblg_enqueue_styles(){
+	do_action( 'lblg_enqueue_styles' );
+}
+
 function lblg_bpmenu_widget( $args ){
 	extract( $args );
 	
 
 register_nav_menus( array( 'primary' => __( 'Primary Menu' ), 'secondary' => __( 'Sub-Menu' ) ) );
 
+// Elbee Elgee action hooks
 add_action( 'lblg_set_themename', 'lblg_themename' );
 add_action( 'lblg_print_title', 'lblg_title' );
 add_action( 'lblg_print_menu', 'lblg_menu' );
 add_action( 'lblg_print_copyright', 'lblg_echo_copyright' );
 add_action( 'lblg_print_credits', 'lblg_credits' );
+add_action( 'lblg_enqueue_styles', 'lblg_styles' );
+
+// WordPress core hooks
 add_action( 'wp_head', 'lblg_wp_head' );
 add_action( 'admin_head','lblg_admin_head' );
 add_action( 'admin_menu', 'lblg_add_admin' ); 
-// Register sidebars
+add_action( 'wp_print_styles', 'lblg_enqueue_styles', 11 );
 add_action( 'widgets_init', 'lblg_register_sidebars' );
-// Register BuddyPress menu output
 add_action( 'widgets_init', 'lblg_widgets_init' );
 
 ?>
 ?>
 <!DOCTYPE html>
 <html <?php language_attributes(); ?>>
-
-<head profile="http://gmpg.org/xfn/11">
+<head>
+	<meta charset="<?php bloginfo( 'charset' ); ?>" />
 <?php
 // Head that nasty "duplicate content" Google "feature" off at the pass.
 if((is_single() || is_category() || is_page() || is_home()) && (!is_paged())){ 
 }
 ?>
 	<title><?php if(is_search()) { echo "Search Results &raquo; "; } else { wp_title('&raquo;', true, 'right'); } ?> <?php bloginfo('name');?></title>
-	<meta http-equiv="Content-Type" content="text/html; charset=<?php bloginfo('charset'); ?>" />
-	<meta name="generator" content="WordPress <?php bloginfo('version'); ?>" />
+
 	<meta name="description" content="<?php bloginfo('description'); ?>" />
-
-	<?php if (is_single() or is_page()) {
+	<?php 
+	// Support for Ozh's YOURLs short-link plugin.
+	// Highly-recommended.
+	if (is_single() or is_page()) {
 		if(function_exists('wp_ozh_yourls_head_linkrel')){
 			wp_ozh_yourls_head_linkrel();
 		}
 	?>
+	<?php } ?>
+	<link rel="stylesheet" type="text/css" media="screen" href="<?php bloginfo('stylesheet_url'); ?>" />
+	<link rel="profile" href="http://gmpg.org/xfn/11" />
 	<link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
-	<?php } ?>
-
-	<link rel="stylesheet" type="text/css" media="screen" href="<?php bloginfo('stylesheet_url'); ?>" />
-	<?php
-		$layout_style = get_option($shortname.'_layout_stylesheet');
-		$alt_style = get_option($shortname.'_alt_stylesheet');
-		switch($layout_style){
-			case '':
-			case 'Select a layout:':
-				echo '<link rel="stylesheet" type="text/css" media="screen" href="' . get_template_directory_uri() . '/layouts/2-columns-fixed-sb-right.css" />';
-			break;
-			case '*none*':
-			break;
-			default:
-				echo '<link rel="stylesheet" type="text/css" media="screen" href="' . get_template_directory_uri() . '/layouts/' . $layout_style . '" />';
-			break;
-
-		}
-
-		echo "\n\t";
-		
-		switch($alt_style){
-			case '':
-			case 'Select a stylesheet:':
-				echo '<link rel="stylesheet" type="text/css" media="screen" href="'. get_template_directory_uri() .'/styles/ng.css" />';
-			break;
-			case '*none*':
-			break;
-			default:
-				echo '<link rel="stylesheet" type="text/css" media="screen" href="'. get_template_directory_uri() .'/styles/'. $alt_style .'" />';
-			break;
-		}
-		
-		echo "\n";
-	?>
-	<link rel="stylesheet" type="text/css" href="<?php echo get_template_directory_uri(); ?>/print.css" media="print">
 	
 	<?php if ( is_singular() ) wp_enqueue_script( 'comment-reply' ); ?>
 	

File images/headers/fireworks.jpg

Added
New image

File images/headers/ivy_in_winter.jpg

Added
New image

File images/headers/lakeshore.jpg

Added
New image

File images/headers/philly_sunset.jpg

Added
New image

File images/headers/snowy_day.jpg

Added
New image

File images/headers/summer_dock.jpg

Added
New image

File images/headers/sunlight_streaming.jpg

Added
New image
 <div id="allwrapper">
 <div id="wrapper">
 	<div id="lb-content">
-	<?php if (have_posts()) : while (have_posts()) : the_post();?>
-	<div id="post-<?php the_ID(); ?>" class="wppost">
-		<h3><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php echo strip_tags(get_the_title()) ?>"><?php the_title(); ?></a></h3>        
-<?php /*                <span class="post_header_img"><img src="<?php bloginfo('template_directory'); ?>/includes/timthumb.php?src=<?php lblg_the_postimage(); ?>&h=120&w=480" /></span> */ ?>
-	        <?php the_content('<p class="serif">Read the rest of this page &raquo;</p>'); ?>
+		<?php get_template_part( 'theloop' ); ?>
+		<?php comments_template(); ?>
 	</div>
-		    <?php endwhile; endif; ?>
-		    <?php edit_post_link('Edit this entry.', '<p>', '</p>'); ?>
-	</div>
-</div>
 
 <?php get_sidebar(); ?>
 

File registration/register.php

 
 			</div><!-- #wrapper -->
 		</div><!--#allwrapper-->
-
+s
 <?php get_footer() ?>
 <div id="allwrapper">
 <div id="wrapper">
 	<div id="lb-content">
-		<?php get_template_part('theloop' ); ?>
+		<?php get_template_part( 'theloop' ); ?>
 		<?php comments_template(); ?>
 	</div>
 </div>

File styles/ng.css

 #lb-content{
 }
 
-#lb-content h2{
+body.home-page #lb-content h2 a, body.single #lb-content h1, body.page #lb-content h1{
 	font-size: 2em;
-	font-style: bold;
+	font-weight: bold;
+	padding-top: 1em;
 }
 
+#lb-content p, span.postmeta  {
+	padding-bottom: 0.7em
+}
 /* @end */
 
 /* @group Sidebar Elements */
 	/* Start The Loop */ if (have_posts()) { while (have_posts()) { the_post(); ?>
 		<?php /* Permalink navigation has to be inside the loop */ if (is_single()) get_template_part('navigation'); ?>
 		<div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-			<?php if(!is_single()) { ?><h2><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php echo strip_tags(get_the_title()) ?>"><?php the_title(); ?></a></h2>
+			<?php if( is_home() ) { ?><h2><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link to <?php echo strip_tags(get_the_title()) ?>"><?php the_title(); ?></a></h2>
 			<?php } else { ?><h1><?php the_title(); ?></h1><?php } ?>
 			<span class="postmeta">Posted by <?php the_author(); ?> on <?php the_time('F jS, Y'); ?> <?php if (!is_single()){ ?>| <span class="commentlink"><?php comments_popup_link('No Comments', '1 Comment', '% Comments'); ?></span><?php } edit_post_link(' Edit this entry.', '', ''); ?></span>
 			<div class="itemtext">
-				<?php if ( is_archive() or is_search() or (function_exists('is_tag') and is_tag()) ) {
+				<?php if ( is_archive() or is_search() or is_tag() ) {
 					the_excerpt();
 				} else {
 					the_content('Continue reading'. " '" . the_title('', '', false) . "'");
 				} ?>
 				<div class="postinfo">
+					<?php if( !is_page() ) { ?>
 					<span class="postcats">Posted in <?php the_category(', '); ?></span>
-					<?php if(function_exists('the_tags') && is_single()){?>
+					<?php } ?>
+					<?php if( is_single() ){?>
 					<br />
 					<span class="posttags"><?php the_tags('Tagged as: ',','); ?></span>
 				<?php }?>