Permalink
Browse files

Improve code quality

  • Loading branch information...
1 parent 84db058 commit 95403f31dd0b30273dd595fa586290390479d15e @Cais committed Apr 13, 2012
Showing with 72 additions and 62 deletions.
  1. +13 −13 footer.php
  2. +59 −49 header.php
View
@@ -1,17 +1,17 @@
<?php
- /**
- * Footer Template
- *
- * @package GroundFloor
- * @since 1.0
- *
- * @link http://buynowshop.com/themes/ground-floor/
- * @link https://github.com/Cais/ground-floor/
- * @link http://wordpress.org/extend/themes/ground-floor/
- *
- * @author Edward Caissie <edward.caissie@gmail.com>
- * @copyright Copyright (c) 2009-2012, Edward Caissie
- */
+/**
+ * Footer Template
+ *
+ * @package GroundFloor
+ * @since 1.0
+ *
+ * @link http://buynowshop.com/themes/ground-floor/
+ * @link https://github.com/Cais/ground-floor/
+ * @link http://wordpress.org/extend/themes/ground-floor/
+ *
+ * @author Edward Caissie <edward.caissie@gmail.com>
+ * @copyright Copyright (c) 2009-2012, Edward Caissie
+ */
?>
</div><!-- #head2toe -->
<div id="footer">
View
@@ -1,49 +1,59 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
-
-<head profile="http://gmpg.org/xfn/11">
- <meta http-equiv="content-type" content="<?php bloginfo( 'html_type' ); ?>; charset=<?php bloginfo( 'charset' ); ?>" />
-
- <title><?php /* ... as influenced by Twenty Ten and Twenty Eleven */
- global $page, $paged;
- wp_title( '|', true, 'right' ); bloginfo( 'name' );
-
- // Add the blog description (tagline) for the home/front page.
- $site_tagline = get_bloginfo( 'description', 'display' );
- if ( $site_tagline && ( is_home() || is_front_page() ) )
- echo " | $site_tagline";
-
- // Add a page number if necessary:
- if ( $paged >= 2 || $page >= 2 )
- echo ' | ' . sprintf( __( 'Page %s', 'ground-floor' ), max( $paged, $page ) ); ?>
- </title>
-
- <link rel="stylesheet" type="text/css" href="<?php bloginfo( 'stylesheet_url' ); ?>" />
- <!--[if lte IE 6]>
- <link rel="stylesheet" href="<?php get_template_directory_uri(); ?>/ie.css" type="text/css" media="screen" />
- <![endif]-->
- <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
-
- <?php if ( is_singular() ) wp_enqueue_script( 'comment-reply' ); ?>
-
- <?php wp_head(); ?>
-</head>
-
-<body <?php body_class(); ?>>
- <div id="outside">
- <div id="header">
- <div id="header-top"></div>
- <div id="header-middle">
- <div id="header-title">
- <div id="blog-title"><span><a href="<?php echo home_url( '/' ); ?>" title="<?php bloginfo( 'name' ) ?>" rel="home"><?php bloginfo( 'name' ) ?></a></span></div>
- <div id="blog-description"><?php bloginfo( 'description' ) ?></div>
- </div> <!-- #header-title -->
- <div id="top-navigation-menu">
- <?php gf_nav_menu(); ?>
- </div><!-- #top-navigation-menu -->
- <div class="clear"></div>
- </div> <!-- #header-middle -->
- <div id="header-bottom"></div>
- </div> <!-- #header -->
- <div id="head2toe">
-<?php /* Last Revised September 3, 2011 v1.8 */ ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes(); ?>>
+<?php
+/**
+ * Header
+ *
+ * The document type, etc.; as well as the top graphics and top navigation menu
+ *
+ * @package GroundFloor
+ * @since 1.0
+ *
+ * @link http://buynowshop.com/themes/ground-floor/
+ * @link https://github.com/Cais/ground-floor/
+ * @link http://wordpress.org/extend/themes/ground-floor/
+ *
+ * @author Edward Caissie <edward.caissie@gmail.com>
+ * @copyright Copyright (c) 2009-2012, Edward Caissie
+ */
+?>
+<head profile="http://gmpg.org/xfn/11">
+ <meta http-equiv="content-type" content="<?php bloginfo( 'html_type' ); ?>; charset=<?php bloginfo( 'charset' ); ?>" />
+ <title><?php /** ... as influenced by Twenty Ten and Twenty Eleven */
+ global $page, $paged;
+ wp_title( '|', true, 'right' ); bloginfo( 'name' );
+
+ /** Add the blog description (tagline) for the home/front page. */
+ $site_tagline = get_bloginfo( 'description', 'display' );
+ if ( $site_tagline && ( is_home() || is_front_page() ) )
+ echo " | $site_tagline";
+
+ /** Add a page number if necessary: */
+ if ( $paged >= 2 || $page >= 2 )
+ echo ' | ' . sprintf( __( 'Page %s', 'ground-floor' ), max( $paged, $page ) ); ?>
+ </title>
+
+ <link rel="stylesheet" type="text/css" href="<?php bloginfo( 'stylesheet_url' ); ?>" />
+ <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
+
+ <?php if ( is_singular() ) wp_enqueue_script( 'comment-reply' );
+ wp_head(); ?>
+</head>
+
+<body <?php body_class(); ?>>
+<div id="outside">
+ <div id="header">
+ <div id="header-top"></div>
+ <div id="header-middle">
+ <div id="header-title">
+ <div id="blog-title"><span><a href="<?php echo home_url( '/' ); ?>" title="<?php bloginfo( 'name' ) ?>" rel="home"><?php bloginfo( 'name' ) ?></a></span></div>
+ <div id="blog-description"><?php bloginfo( 'description' ) ?></div>
+ </div><!-- #header-title -->
+ <div id="top-navigation-menu">
+ <?php gf_nav_menu(); ?>
+ </div><!-- #top-navigation-menu -->
+ <div class="clear"></div>
+ </div><!-- #header-middle -->
+ <div id="header-bottom"></div>
+ </div><!-- #header -->
+ <div id="head2toe">

0 comments on commit 95403f3

Please sign in to comment.