windhamdavid 5 years ago
parent
commit
28d1493773
4 changed files with 19 additions and 16 deletions
  1. 1 0
      functions.php
  2. 3 12
      header.php
  3. 12 0
      inc/template.php
  4. 3 4
      style.css

+ 1 - 0
functions.php

@@ -39,6 +39,7 @@ add_filter( 'script_loader_src', 'dw_remove_wp_ver_css_js', 9999 );
 add_action( 'wp_enqueue_scripts', 'dw_scripts' );
 function dw_scripts() {
 	global $post;
+	wp_enqueue_script('jquery', true); 
 	wp_enqueue_style( 'style', get_stylesheet_uri() );
 	if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
 		wp_enqueue_script( 'comment-reply' );

+ 3 - 12
header.php

@@ -2,17 +2,8 @@
 <html lang="en-US">
 <head>
 <meta charset="<?php bloginfo( 'charset' ); ?>" />
-<title><?php global $page, $paged;
-	wp_title( '|', true, 'right' );
-	bloginfo( 'name' );
-	$site_description = get_bloginfo( 'description', 'display' );
-	if ( $site_description && ( is_home() || is_front_page() ) )
-		echo " | $site_description";
-	if ( $paged >= 2 || $page >= 2 )
-		echo ' | ' . sprintf( __( 'Page %s', 'daw' ), max( $paged, $page ) );
-	?></title>
-<link rel="stylesheet" type="text/css" media="all" href="<?php bloginfo( 'stylesheet_url' ); ?>" />
-<?php if ( is_page_template('single.php') && get_option( 'thread_comments' ) ) wp_enqueue_script( 'comment-reply' ); wp_enqueue_script("jquery"); wp_head(); ?>
+<title><?php dw_page_title();?></title>
+<?php wp_head(); ?>
 </head>
 <body>
 <div id="wrapper" class="hfeed">
@@ -24,7 +15,7 @@
 				</div> 
 			</div>
 			<div id="access" role="navigation">
-				 <!-- <?php wp_nav_menu( array( 'menu' => 'main','sort_column' => 'menu_order', 'container_class' => 'menu-header' ) ); ?> -->
+				 <?php wp_nav_menu( array( 'menu' => 'main','sort_column' => 'menu_order', 'container_class' => 'menu-header' ) ); ?>
 			</div>
 		</div>
 	</div>

+ 12 - 0
inc/template.php

@@ -1,5 +1,17 @@
 <?php
 
+if ( ! function_exists( 'dw_page_title') ) :
+function dw_page_title() {
+	global $page, $paged; 
+	wp_title( '|', true, 'right' ); 
+	bloginfo( 'name' ); $site_description = get_bloginfo( 'description', 'display' );
+		if ( $site_description && ( is_home() || is_front_page() ) )
+			echo " | $site_description";
+		if ( $paged >= 2 || $page >= 2 )
+			echo ' | ' . sprintf( __( 'Page %s', 'dw' ), max( $paged, $page ) );
+}
+endif;
+
 if ( ! function_exists( 'dw_paging_nav' ) ) :
 function dw_paging_nav() {
 	if ( $GLOBALS['wp_query']->max_num_pages < 2 ) {

+ 3 - 4
style.css

@@ -389,10 +389,9 @@ a:hover {
 	padding: 30px 0 0 0;
 }
 #site-title {
-	float: left;
+	float: right;
 	margin: 0 0 5px 0;
-	width: 700px;
-	font: 25px/27px "Courier New", Courier, mono;
+	font: 21px/27px "Courier New", Courier, mono;
 }
 #site-title a {
 	color: #000;
@@ -453,7 +452,7 @@ div.menu ul {
 }
 #access .menu-header li,
 div.menu li {
-	float: left;
+	float: right;
 	position: relative;
 }
 #access a {