Subversion Repositories pub

Compare Revisions

Ignore whitespace Rev 231 → Rev 232

/wp-theme-cazuela-remixed/branches/02/footer.php
File deleted
/wp-theme-cazuela-remixed/branches/02/images/favicon.ico
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/wp-theme-cazuela-remixed/branches/02/images/favicon.ico
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: branches/02/style.css
===================================================================
--- branches/02/style.css (revision 231)
+++ branches/02/style.css (nonexistent)
@@ -1,55 +0,0 @@
-/*
- Theme Name: Cazuela Remixed
- Theme URI: http://outlyer.net/
- Description: Modified version of Cazuela for use at outlyer.net
- Author: Toni Corvera
- Author URI: http://corvera.eu
- Template: cazuela
- Version: 1
-*/
-
-/* =Imports styles from the parent theme
--------------------------------------------------------------- */
-@import url('../cazuela/style.css');
-
-/* =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;
- margin: 0 -30% 0 0;
- width: 100%;
-}
-.layout-cp #content {
- margin: 0 30% 0 0;
-}
-.layout-cp #secondary {
- float: right;
- width: 26%;
-}
-
-img.wp-smiley {
- display: inline;
-}
-
-pre {
- font-size: 13px;
- font-size: 1.3rem;
- line-height: 1.3;
- margin-bottom: 1.3em;
- padding: 1.3em;
- border: 1px solid #ddd;
-}
-
-#footer-credits {
- font-size: 0.8em;
-}
Index: branches/02/comments.php
===================================================================
--- branches/02/comments.php (revision 231)
+++ branches/02/comments.php (nonexistent)
@@ -1,80 +0,0 @@
-<?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 -->
Index: branches/02/upstream-templates/footer.php
===================================================================
--- branches/02/upstream-templates/footer.php (revision 231)
+++ branches/02/upstream-templates/footer.php (nonexistent)
@@ -1,56 +0,0 @@
-<?php
-/**
- * The template for displaying the footer.
- *
- * Contains the closing of the id=main div and all content after
- *
- * @package Cazuela
- * @since Cazuela 1.0
- */
-?>
-
- </div><!-- .inner -->
- </div><!-- #main .site-main -->
-
- <?php
- // Before Footer theme hook callback
- thsp_hook_before_footer();
- ?>
-
- <footer id="colophon" class="site-footer" role="contentinfo">
- <?php if ( is_active_sidebar( 'footer-widget-area' ) ) : ?>
- <div class="inner clearfix">
- <section id="footer-widget-area" class="<?php echo thsp_count_widgets( 'footer-widget-area' ); ?>">
- <?php dynamic_sidebar( 'footer-widget-area' ); ?>
- </section><!-- #footer-widgets -->
- </div><!-- .inner -->
- <?php endif; ?>
-
- <div id="footer-nav" class="inner clearfix">
- <?php
- // Footer menu
- wp_nav_menu( array(
- 'theme_location' => 'footer',
- 'container' => 'nav',
- 'container_class' => 'footer-navigation',
- 'fallback_cb' => ''
- ) );
- ?>
-
- <div id="footer-credits">
- <a href="<?php echo esc_url( __( 'http://thematosoup.com/themes/cazuela/', 'cazuela' ) ); ?>" title="<?php esc_attr_e( 'Cazuela &mdash; free, responsive WordPress theme', 'cazuela' ); ?>"><?php echo __( 'Cazuela theme', 'cazuela' ); ?></a> powered by <a href="<?php echo esc_url( __( 'http://wordpress.org/', 'cazuela' ) ); ?>" title="<?php esc_attr_e( 'Semantic Personal Publishing Platform', 'cazuela' ); ?>"><?php _e( 'WordPress', 'cazuela' ); ?></a>
- </div><!-- #footer-credits -->
- </div><!-- #footer-nav -->
-
- <?php
- // Before Footer theme hook callback
- thsp_hook_after_footer();
- ?>
- </footer><!-- #colophon .site-footer -->
-
-</div><!-- #page .hfeed .site -->
-
-<?php wp_footer(); ?>
-
-</body>
-</html>
\ No newline at end of file
Index: branches/02/upstream-templates/.htaccess
===================================================================
--- branches/02/upstream-templates/.htaccess (revision 231)
+++ branches/02/upstream-templates/.htaccess (nonexistent)
@@ -1,3 +0,0 @@
-Order Deny,Allow
-Deny From All
-
Index: branches/02/upstream-templates/comments.php
===================================================================
--- branches/02/upstream-templates/comments.php (revision 231)
+++ branches/02/upstream-templates/comments.php (nonexistent)
@@ -1,77 +0,0 @@
-<?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 -->
Index: branches/02/upstream-templates/header.php
===================================================================
--- branches/02/upstream-templates/header.php (revision 231)
+++ branches/02/upstream-templates/header.php (nonexistent)
@@ -1,82 +0,0 @@
-<?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">
\ No newline at end of file
Index: branches/02/header.php
===================================================================
--- branches/02/header.php (revision 231)
+++ branches/02/header.php (nonexistent)
@@ -1,94 +0,0 @@
-<?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">
Index: branches/02/screenshot.png
===================================================================
--- branches/02/screenshot.png (revision 231)
+++ branches/02/screenshot.png (nonexistent)
@@ -1 +0,0 @@
-link ../cazuela/screenshot.png
\ No newline at end of file
/branches/02/screenshot.png
Property changes:
Deleted: svn:special
## -1 +0,0 ##
-*
\ No newline at end of property