Permalink
Browse files

Updated 'header.php' to work with Desk Mess Mirrored correctly

  • Loading branch information...
1 parent 76e6c65 commit 0a62bbb7cfb1a770c1d8fa429b85de9e90a9a6d3 @Cais committed Dec 2, 2011
Showing with 44 additions and 36 deletions.
  1. +1 −0 .idea/dictionaries/Cais.xml
  2. +22 −0 .idea/webResources.xml
  3. +21 −36 header.php
@@ -2,6 +2,7 @@
<dictionary name="Cais">
<words>
<w>cetera</w>
+ <w>headerleft</w>
</words>
</dictionary>
</component>
View
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="WebResourcesPaths">
+ <contentEntries>
+ <entry url="file://$PROJECT_DIR$/../desk-mess-mirrored">
+ <entryData>
+ <resourceRoots>
+ <path value="file://$PROJECT_DIR$/../desk-mess-mirrored" />
+ </resourceRoots>
+ </entryData>
+ </entry>
+ <entry url="file://$PROJECT_DIR$/../../../wp-includes">
+ <entryData>
+ <resourceRoots>
+ <path value="file://$PROJECT_DIR$/../../../wp-includes" />
+ </resourceRoots>
+ </entryData>
+ </entry>
+ </contentEntries>
+ </component>
+</project>
+
View
@@ -1,41 +1,26 @@
<!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
- if ( is_single() ) { single_post_title(); _e( ' | ', 'desk-mess-mirrored' ); bloginfo( 'name' ); }
- elseif ( is_home() || is_front_page() ) { bloginfo( 'name' ); _e( ' | ', 'desk-mess-mirrored' ); bloginfo( 'description' ); dmm_get_page_number(); }
- elseif ( is_page() ) { single_post_title( '' ); _e( ' | ', 'desk-mess-mirrored' ); bloginfo( 'name' ); }
- elseif ( is_search() ) { bloginfo( 'name' ); print __( ' | Search results for ', 'desk-mess-mirrored' ) . esc_html( $s ); dmm_get_page_number(); }
- elseif ( is_404() ) { bloginfo( 'name' ); _e( ' | Not Found', 'desk-mess-mirrored' ); }
- else { bloginfo( 'name' ); wp_title( __( ' | ', 'desk-mess-mirrored' )); dmm_get_page_number(); }
- ?></title>
-
- <link rel="stylesheet" href="<?php bloginfo( 'stylesheet_url' ); ?>" type="text/css" media="screen" />
- <!--[if lte IE 6]>
- <link rel="stylesheet" href="<?php get_template_directory_uri(); ?>/ie60-2.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(); ?>
+ <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
+ <title><?php dmm_wp_title(); ?></title>
+ <link rel="stylesheet" href="<?php bloginfo( 'stylesheet_url' ); ?>" type="text/css" media="screen" />
+ <link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
+ <?php wp_head(); ?>
</head>
-
<body <?php body_class(); ?>>
- <div id="mainwrap">
- <div id="header-container">
- <div id="header"> <!-- header -->
- <div id="headerleft"></div>
- <div id="logo">
- <h2><a href="<?php echo home_url( '/' ); ?>" title="<?php bloginfo( 'name' ); ?>"><?php bloginfo( 'name' ); ?></a></h2>
- <p><?php bloginfo( 'description' ); ?></p>
- </div> <!-- #logo -->
- <div id="cup">
- <a href="<?php echo get_feed_link( 'rss2' ); ?>" title="<?php _e('Add this blog to any reader','desk-mess-mirrored'); ?>"><img alt="" src="<?php echo get_stylesheet_directory_uri(); ?>/images/rsscup.png" border="0" /></a>
- </div><!-- #cup -->
- <div id="top-navigation-menu">
- <?php dmm_nav_menu(); ?>
- </div>
- </div> <!-- #header -->
- </div> <!-- #header-container -->
-<?php /* Last Revised July 13, 2011, v1.8.7 to match Desk Mess Mirrored v1.8.7 */ ?>
+ <div id="mainwrap">
+ <div id="header-container">
+ <div id="header"> <!-- header -->
+ <div id="headerleft"></div>
+ <div id="logo">
+ <h2><a href="<?php echo home_url( '/' ); ?>" title="<?php bloginfo( 'name' ); ?>"><?php bloginfo( 'name' ); ?></a></h2>
+ <p><?php bloginfo( 'description' ); ?></p>
+ </div> <!-- #logo -->
+ <div id="cup">
+ <a href="<?php echo get_feed_link( 'rss2' ); ?>" title="<?php _e('Add this blog to any reader','desk-mess-mirrored'); ?>"><img alt="" src="<?php echo get_stylesheet_directory_uri(); ?>/images/rsscup.png" border="0" /></a>
+ </div><!-- #cup -->
+ <div id="top-navigation-menu">
+ <?php dmm_nav_menu(); ?>
+ </div>
+ </div> <!-- #header -->
+ </div> <!-- #header-container -->

0 comments on commit 0a62bbb

Please sign in to comment.