Subversion Repositories pub

Compare Revisions

Ignore whitespace Rev 230 → Rev 231

/wp-theme-cazuela-remixed/trunk/images/favicon.ico
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/wp-theme-cazuela-remixed/trunk/images/favicon.ico
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: trunk/style.css
===================================================================
--- trunk/style.css (revision 230)
+++ trunk/style.css (revision 231)
@@ -15,6 +15,14 @@
/* =Theme customization starts here
-------------------------------------------------------------- */
+/* Special class: Avoid hyphenation */
+.nohyphens {
+ -webkit-hyphens: none;
+ -moz-hyphens: none;
+ -ms-hyphens: none;
+ hyphens: none;
+}
+
/* Layout: Content - Primary Sidebar */
.layout-cp .content-area {
float: left;
/wp-theme-cazuela-remixed/trunk/comments.php
0,0 → 1,80
<?php
/**
* The template for displaying Comments.
*
* The area of the page that contains both current comments
* and the comment form. The actual display of comments is
* handled by a callback to thsp_comment() which is
* located in the functions.php file.
*
* @package Cazuela
* @since Cazuela 1.0
*/
?>
 
<?php
/*
* If the current post is protected by a password and
* the visitor has not yet entered the password we will
* return early without loading the comments.
*/
if ( post_password_required() )
return;
?>
 
<div id="comments" class="comments-area">
 
<?php if ( have_comments() ) : ?>
<h2 class="comments-title">
<?php
printf(
_n( 'One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'cazuela' ),
number_format_i18n( get_comments_number() ),
'<span>' . get_the_title() . '</span>'
);
?>
</h2>
 
<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
<nav role="navigation" id="comment-nav-above" class="site-navigation comment-navigation">
<h1 class="assistive-text"><?php _e( 'Comment navigation', 'cazuela' ); ?></h1>
<div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'cazuela' ) ); ?></div>
<div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'cazuela' ) ); ?></div>
</nav><!-- #comment-nav-before .site-navigation .comment-navigation -->
<?php endif; // check for comment navigation ?>
 
<ol class="commentlist">
<?php
/* Loop through and list the comments. Tell wp_list_comments()
* to use thsp_comment_cb() to format the comments.
* If you want to overload this in a child theme then you can
* define thsp_comment() and that will be used instead.
* See thsp_comment_cb() in inc/template-tags.php for more.
*/
wp_list_comments( array( 'callback' => 'thsp_comment_cb' ) );
?>
</ol><!-- .commentlist -->
 
<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
<nav role="navigation" id="comment-nav-below" class="site-navigation comment-navigation">
<h1 class="assistive-text"><?php _e( 'Comment navigation', 'cazuela' ); ?></h1>
<div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'cazuela' ) ); ?></div>
<div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'cazuela' ) ); ?></div>
</nav><!-- #comment-nav-below .site-navigation .comment-navigation -->
<?php endif; // check for comment navigation ?>
 
<?php endif; // have_comments() ?>
 
<?php
// If comments are closed and there are comments, let's leave a little note, shall we?
if ( ! comments_open() && '0' != get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) :
?>
<p class="nocomments"><?php _e( 'Comments are closed.', 'cazuela' ); ?></p>
<?php endif; ?>
 
<hr />
<p style="font-size:small;">Please note: New comments won't appear immediately, they have to be manually approved (usually done quickly).</p>
 
<?php comment_form(); ?>
 
</div><!-- #comments .comments-area -->
/wp-theme-cazuela-remixed/trunk/upstream-templates/comments.php
0,0 → 1,77
<?php
/**
* The template for displaying Comments.
*
* The area of the page that contains both current comments
* and the comment form. The actual display of comments is
* handled by a callback to thsp_comment() which is
* located in the functions.php file.
*
* @package Cazuela
* @since Cazuela 1.0
*/
?>
 
<?php
/*
* If the current post is protected by a password and
* the visitor has not yet entered the password we will
* return early without loading the comments.
*/
if ( post_password_required() )
return;
?>
 
<div id="comments" class="comments-area">
 
<?php if ( have_comments() ) : ?>
<h2 class="comments-title">
<?php
printf(
_n( 'One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'cazuela' ),
number_format_i18n( get_comments_number() ),
'<span>' . get_the_title() . '</span>'
);
?>
</h2>
 
<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
<nav role="navigation" id="comment-nav-above" class="site-navigation comment-navigation">
<h1 class="assistive-text"><?php _e( 'Comment navigation', 'cazuela' ); ?></h1>
<div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'cazuela' ) ); ?></div>
<div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'cazuela' ) ); ?></div>
</nav><!-- #comment-nav-before .site-navigation .comment-navigation -->
<?php endif; // check for comment navigation ?>
 
<ol class="commentlist">
<?php
/* Loop through and list the comments. Tell wp_list_comments()
* to use thsp_comment_cb() to format the comments.
* If you want to overload this in a child theme then you can
* define thsp_comment() and that will be used instead.
* See thsp_comment_cb() in inc/template-tags.php for more.
*/
wp_list_comments( array( 'callback' => 'thsp_comment_cb' ) );
?>
</ol><!-- .commentlist -->
 
<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
<nav role="navigation" id="comment-nav-below" class="site-navigation comment-navigation">
<h1 class="assistive-text"><?php _e( 'Comment navigation', 'cazuela' ); ?></h1>
<div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'cazuela' ) ); ?></div>
<div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'cazuela' ) ); ?></div>
</nav><!-- #comment-nav-below .site-navigation .comment-navigation -->
<?php endif; // check for comment navigation ?>
 
<?php endif; // have_comments() ?>
 
<?php
// If comments are closed and there are comments, let's leave a little note, shall we?
if ( ! comments_open() && '0' != get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) :
?>
<p class="nocomments"><?php _e( 'Comments are closed.', 'cazuela' ); ?></p>
<?php endif; ?>
 
<?php comment_form(); ?>
 
</div><!-- #comments .comments-area -->
/wp-theme-cazuela-remixed/trunk/upstream-templates/header.php
0,0 → 1,82
<?php
/**
* The Header for our theme.
*
* Displays all of the <head> section and everything up till <div id="main">
*
* @package Cazuela
* @since Cazuela 1.0
*/
?><!DOCTYPE html>
<html <?php language_attributes(); ?>>
<head>
<meta charset="<?php bloginfo( 'charset' ); ?>" />
<meta name="viewport" content="width=device-width" />
<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]>
<script src="<?php echo get_template_directory_uri(); ?>/js/html5.js" type="text/javascript"></script>
<![endif]-->
 
<?php wp_head(); ?>
</head>
 
<body <?php body_class(); ?>>
<div id="page" class="hfeed site">
 
<header id="masthead" class="site-header" role="banner">
<?php
// Before Header theme hook callback
thsp_hook_before_header();
?>
 
<div class="inner clearfix">
<hgroup>
<?php
// Get current theme options values
$thsp_theme_options = thsp_cbp_get_options_values();
if ( '' != $thsp_theme_options['logo_image'] ) {
$logo_image = thsp_get_logo_image( $thsp_theme_options['logo_image'] ); ?>
<a class="header-image" href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home">
<img src="<?php echo $logo_image[0]; ?>" width="<?php echo $logo_image[1]; ?>" height="<?php echo $logo_image[2]; ?>" alt="<?php bloginfo( 'name' ); ?>" />
</a>
<?php } else { // if ( ! isset( $thsp_theme_options['logo_image'] ) ?>
<h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
<?php } ?>
<?php if ( '' != get_bloginfo( 'description' ) ) { ?>
<h2 class="site-description"><?php bloginfo( 'description' ); ?></h2>
<?php } ?>
</hgroup>
 
<?php
// Header image
$header_image = get_header_image();
if ( ! empty( $header_image ) ) : ?>
<a href="<?php echo esc_url( home_url( '/' ) ); ?>"><img src="<?php echo esc_url( $header_image ); ?>" class="header-image" width="<?php echo get_custom_header()->width; ?>" height="<?php echo get_custom_header()->height; ?>" alt="" /></a>
<?php endif; ?>
<nav role="navigation" class="site-navigation main-navigation">
<h1 class="assistive-text"><?php _e( '<span>&#9776;</span> Menu', 'cazuela' ); ?></h1>
<div class="assistive-text skip-link"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'cazuela' ); ?>"><?php _e( 'Skip to content', 'cazuela' ); ?></a></div>
<?php
wp_nav_menu( array(
'theme_location' => 'main',
'container' => '',
'fallback_cb' => 'wp_page_menu'
) );
?>
</nav><!-- .site-navigation .main-navigation -->
</div><!-- .inner -->
</header><!-- #masthead .site-header -->
 
<?php
// After Header theme hook callback
thsp_hook_after_header();
?>
 
<div id="main" class="site-main">
<div class="inner clearfix">
/wp-theme-cazuela-remixed/trunk/header.php
0,0 → 1,94
<?php
/**
* The Header for our theme.
*
* Displays all of the <head> section and everything up till <div id="main">
*
* @package Cazuela
* @since Cazuela 1.0
*/
?><!DOCTYPE html>
<html <?php language_attributes(); ?>>
<head>
<meta charset="<?php bloginfo( 'charset' ); ?>" />
<meta name="viewport" content="width=device-width" />
<title><?php wp_title( '|', true, 'right' ); ?></title>
<link rel="profile" href="http://gmpg.org/xfn/11" />
<link rel="pingback" href="<?php bloginfo( 'pingback_url' ); ?>" />
<?php
/*
 
This is a child theme =>
- get_template_directory_uri() -> cazuela
- get_stylesheet_directory_uri() -> cazuela-remixed
 
<!--[if !IE]>--><link rel="icon" href="<?php echo get_stylesheet_directory_uri(); ?>/images/favicon.png" /><!--<![endif]-->
<!--[if IE]><link rel="shortcut icon" href="<?php echo get_stylesheet_directory_uri(); ?>/images/favicon.ico" type="image/vnd.microsoft.icon" /><![endif]-->
*/
?>
<link rel="shortcut icon" href="<?php echo get_stylesheet_directory_uri(); ?>/images/favicon.ico" type="image/vnd.microsoft.icon" />
<!--[if lt IE 9]>
<script src="<?php echo get_template_directory_uri(); ?>/js/html5.js" type="text/javascript"></script>
<![endif]-->
 
<?php wp_head(); ?>
</head>
 
<body <?php body_class(); ?>>
<div id="page" class="hfeed site">
 
<header id="masthead" class="site-header" role="banner">
<?php
// Before Header theme hook callback
thsp_hook_before_header();
?>
 
<div class="inner clearfix">
<hgroup>
<?php
// Get current theme options values
$thsp_theme_options = thsp_cbp_get_options_values();
if ( '' != $thsp_theme_options['logo_image'] ) {
$logo_image = thsp_get_logo_image( $thsp_theme_options['logo_image'] ); ?>
<a class="header-image" href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home">
<img src="<?php echo $logo_image[0]; ?>" width="<?php echo $logo_image[1]; ?>" height="<?php echo $logo_image[2]; ?>" alt="<?php bloginfo( 'name' ); ?>" />
</a>
<?php } else { // if ( ! isset( $thsp_theme_options['logo_image'] ) ?>
<h1 class="site-title"><a href="<?php echo esc_url( home_url( '/' ) ); ?>" title="<?php echo esc_attr( get_bloginfo( 'name', 'display' ) ); ?>" rel="home"><?php bloginfo( 'name' ); ?></a></h1>
<?php } ?>
<?php if ( '' != get_bloginfo( 'description' ) ) { ?>
<h2 class="site-description"><?php bloginfo( 'description' ); ?></h2>
<?php } ?>
</hgroup>
 
<?php
// Header image
$header_image = get_header_image();
if ( ! empty( $header_image ) ) : ?>
<a href="<?php echo esc_url( home_url( '/' ) ); ?>"><img src="<?php echo esc_url( $header_image ); ?>" class="header-image" width="<?php echo get_custom_header()->width; ?>" height="<?php echo get_custom_header()->height; ?>" alt="" /></a>
<?php endif; ?>
<nav role="navigation" class="site-navigation main-navigation">
<h1 class="assistive-text"><?php _e( '<span>&#9776;</span> Menu', 'cazuela' ); ?></h1>
<div class="assistive-text skip-link"><a href="#content" title="<?php esc_attr_e( 'Skip to content', 'cazuela' ); ?>"><?php _e( 'Skip to content', 'cazuela' ); ?></a></div>
<?php
wp_nav_menu( array(
'theme_location' => 'main',
'container' => '',
'fallback_cb' => 'wp_page_menu'
) );
?>
</nav><!-- .site-navigation .main-navigation -->
</div><!-- .inner -->
</header><!-- #masthead .site-header -->
 
<?php
// After Header theme hook callback
thsp_hook_after_header();
?>
 
<div id="main" class="site-main">
<div class="inner clearfix">
/wp-theme-cazuela-remixed/trunk
Property changes:
Added: svn:mergeinfo
## -0,0 +0,1 ##
Merged /wp-theme-cazuela-remixed/branches/02:r77-230