forked from mirror/_s
Merge pull request #79 from kovshenin/patch-11
* Introduces a filter for wp_title instead of hard-coding things in header.php * Renames inc/tweaks.php to inc/extras.php * Includes inc/extras.php by default in functions.php See #12, #13, #33
This commit is contained in:
commit
ba4af1262a
|
@ -34,7 +34,7 @@ function _s_setup() {
|
|||
/**
|
||||
* Custom functions that act independently of the theme templates
|
||||
*/
|
||||
//require( get_template_directory() . '/inc/tweaks.php' );
|
||||
require( get_template_directory() . '/inc/extras.php' );
|
||||
|
||||
/**
|
||||
* Custom Theme Options
|
||||
|
|
22
header.php
22
header.php
|
@ -12,27 +12,7 @@
|
|||
<head>
|
||||
<meta charset="<?php bloginfo( 'charset' ); ?>" />
|
||||
<meta name="viewport" content="width=device-width" />
|
||||
<title><?php
|
||||
/*
|
||||
* Print the <title> tag based on what is being viewed.
|
||||
*/
|
||||
global $page, $paged;
|
||||
|
||||
wp_title( '|', true, 'right' );
|
||||
|
||||
// Add the blog name.
|
||||
bloginfo( 'name' );
|
||||
|
||||
// Add the blog description for the home/front page.
|
||||
$site_description = get_bloginfo( 'description', 'display' );
|
||||
if ( $site_description && ( is_home() || is_front_page() ) )
|
||||
echo " | $site_description";
|
||||
|
||||
// Add a page number if necessary:
|
||||
if ( $paged >= 2 || $page >= 2 )
|
||||
echo ' | ' . sprintf( __( 'Page %s', '_s' ), max( $paged, $page ) );
|
||||
|
||||
?></title>
|
||||
<title><?php wp_title( '|', true, 'right' ); ?></title>
|
||||
<link rel="profile" href="http://gmpg.org/xfn/11" />
|
||||
<link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
|
||||
<!--[if lt IE 9]>
|
||||
|
|
|
@ -50,3 +50,30 @@ function _s_enhanced_image_navigation( $url, $id ) {
|
|||
return $url;
|
||||
}
|
||||
add_filter( 'attachment_link', '_s_enhanced_image_navigation', 10, 2 );
|
||||
|
||||
/**
|
||||
* Filters wp_title to print a neat <title> tag based on what is being viewed.
|
||||
*
|
||||
* @since _s 1.1
|
||||
*/
|
||||
function _s_wp_title( $title, $sep ) {
|
||||
global $page, $paged;
|
||||
|
||||
if ( is_feed() )
|
||||
return $title;
|
||||
|
||||
// Add the blog name
|
||||
$title .= get_bloginfo( 'name' );
|
||||
|
||||
// Add the blog description for the home/front page.
|
||||
$site_description = get_bloginfo( 'description', 'display' );
|
||||
if ( $site_description && ( is_home() || is_front_page() ) )
|
||||
$title .= " $sep $site_description";
|
||||
|
||||
// Add a page number if necessary:
|
||||
if ( $paged >= 2 || $page >= 2 )
|
||||
$title .= " $sep " . sprintf( __( 'Page %s', '_s' ), max( $paged, $page ) );
|
||||
|
||||
return $title;
|
||||
}
|
||||
add_filter( 'wp_title', '_s_wp_title', 10, 2 );
|
Reference in New Issue