Commit 169168b0 authored by shammash's avatar shammash Committed by lechuck
Browse files

updated hybrid to 1.0

parent 25122186
......@@ -7,40 +7,38 @@
* is active, its widgets will be displayed instead. This allows users to customize their error
* pages in any way they want.
*
* For more information on how WordPress handles 404 errors:
* @link http://codex.wordpress.org/Creating_an_Error_404_Page
*
* @package Hybrid
* @subpackage Template
* @link http://codex.wordpress.org/Creating_an_Error_404_Page
*/
@header( 'HTTP/1.1 404 Not found', true, 404 );
get_header(); ?>
get_header(); // Loads the header.php template. ?>
<div id="content" class="hfeed content">
<?php hybrid_before_content(); // Before content hook ?>
<?php do_atomic( 'before_content' ); // hybrid_before_content ?>
<?php if ( is_active_sidebar( 'utility-404' ) ) : ?>
<?php if ( is_active_sidebar( 'error-404-template' ) ) : ?>
<div id="utility-404" class="sidebar utility">
<?php dynamic_sidebar( 'utility-404' ); ?>
<?php dynamic_sidebar( 'error-404-template' ); ?>
</div><!-- #utility-404 .utility -->
<?php else: ?>
<div id="post-0" class="<?php hybrid_entry_class(); ?>">
<h1 class="error-404-title entry-title"><?php _e( 'Not Found', 'hybrid' ); ?></h1>
<h1 class="error-404-title entry-title"><?php _e( 'Not Found', hybrid_get_textdomain() ); ?></h1>
<div class="entry-content">
<p>
<?php printf( __( 'You tried going to %1$s, and it doesn\'t exist. All is not lost! You can search for what you\'re looking for.', 'hybrid' ), '<code>' . site_url( esc_url( $_SERVER['REQUEST_URI'] ) ) . '</code>' ); ?>
<?php printf( __( 'You tried going to %1$s, and it doesn\'t exist. All is not lost! You can search for what you\'re looking for.', hybrid_get_textdomain() ), '<code>' . home_url( esc_url( $_SERVER['REQUEST_URI'] ) ) . '</code>' ); ?>
</p>
<?php get_search_form(); ?>
<?php get_search_form(); // Loads the searchform.php template. ?>
</div><!-- .entry-content -->
......@@ -48,8 +46,8 @@ get_header(); ?>
<?php endif; ?>
<?php hybrid_after_content(); // After content hook ?>
<?php do_atomic( 'after_content' ); // hybrid_after_content ?>
</div><!-- .content .hfeed -->
<?php get_footer(); ?>
\ No newline at end of file
<?php get_footer(); // Loads the footer.php template. ?>
\ No newline at end of file
......@@ -10,37 +10,27 @@
* @subpackage Template
*/
get_header(); ?>
get_header(); // Loads the header.php template. ?>
<div id="content" class="hfeed content">
<?php hybrid_before_content(); // Before content hook ?>
<?php do_atomic( 'before_content' ); // hybrid_before_content ?>
<div class="archive-info">
<h1 class="archive-title"><?php _e( 'Archives', 'hybrid' ); ?></h1>
<div class="archive-description">
<p>
<?php _e( 'You are browsing the site archives.', 'hybrid' ); ?>
</p>
</div><!-- .archive-description -->
</div><!-- .archive-info -->
<?php get_template_part( 'loop-meta' ); // Loads the loop-meta.php template. ?>
<?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
<div id="post-<?php the_ID(); ?>" class="<?php hybrid_entry_class(); ?>">
<?php get_the_image( array( 'custom_key' => array( 'Thumbnail' ), 'size' => 'thumbnail' ) ); ?>
<?php get_the_image( array( 'meta_key' => 'Thumbnail', 'size' => 'thumbnail' ) ); ?>
<?php hybrid_before_entry(); // Before entry hook ?>
<?php do_atomic( 'before_entry' ); // hybrid_before_entry ?>
<div class="entry-summary">
<?php the_excerpt(); ?>
</div><!-- .entry-summary -->
<?php hybrid_after_entry(); // After entry hook ?>
<?php do_atomic( 'after_entry' ); // hybrid_after_entry ?>
</div><!-- .hentry -->
......@@ -48,14 +38,12 @@ get_header(); ?>
<?php else: ?>
<p class="no-data">
<?php _e( 'Apologies, but no results were found.', 'hybrid' ); ?>
</p><!-- .no-data -->
<?php get_template_part( 'loop-error' ); // Loads the loop-error.php template. ?>
<?php endif; ?>
<?php hybrid_after_content(); // After content hook ?>
<?php do_atomic( 'after_content' ); // hybrid_after_content ?>
</div><!-- .content .hfeed -->
<?php get_footer(); ?>
\ No newline at end of file
<?php get_footer(); // Loads the footer.php template. ?>
\ No newline at end of file
......@@ -5,59 +5,74 @@
* The attachment template is a general template that displays attachments if no other
* attachment-type template is found. Also see application.php, audio.php, image.php,
* text.php, and video.php.
* @link http://themehybrid.com/themes/hybrid/attachments
* @link http://codex.wordpress.org/Using_Image_and_File_Attachments
*
* @package Hybrid
* @subpackage Template
* @link http://themehybrid.com/themes/hybrid/attachments
* @link http://codex.wordpress.org/Using_Image_and_File_Attachments
*/
get_header(); ?>
get_header(); // Loads the header.php template. ?>
<div id="content" class="hfeed content">
<?php hybrid_before_content(); // Before content hook ?>
<?php do_atomic( 'before_content' ); // hybrid_before_content ?>
<?php if ( have_posts() ) : while ( have_posts() ) : the_post(); ?>
<div id="post-<?php the_ID(); ?>" class="<?php hybrid_entry_class(); ?>">
<?php hybrid_before_entry(); // Before entry hook ?>
<?php do_atomic( 'before_entry' ); // hybrid_before_entry ?>
<div class="entry-content">
<?php hybrid_attachment(); ?>
<?php if ( wp_attachment_is_image( get_the_ID() ) ) : ?>
<p class="attachment-image">
<?php echo wp_get_attachment_image( get_the_ID(), 'full', false, array( 'class' => 'aligncenter' ) ); ?>
</p><!-- .attachment-image -->
<?php the_content( sprintf( __( 'Continue reading %1$s', 'hybrid' ), the_title( ' "', '"', false ) ) ); ?>
<?php else : ?>
<p class="download">
<a href="<?php echo wp_get_attachment_url(); ?>" title="<?php the_title_attribute(); ?>" rel="enclosure" type="<?php echo get_post_mime_type(); ?>"><?php printf( __( 'Download &quot;%1$s&quot;', 'hybrid' ), the_title( '<span class="fn">', '</span>', false) ); ?></a>
</p><!-- .download -->
<?php hybrid_attachment(); // Function for handling non-image attachments. ?>
<?php wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', 'hybrid' ), 'after' => '</p>' ) ); ?>
<p class="download">
<a href="<?php echo wp_get_attachment_url(); ?>" title="<?php the_title_attribute(); ?>" rel="enclosure" type="<?php echo get_post_mime_type(); ?>"><?php printf( __( 'Download &quot;%1$s&quot;', hybrid_get_textdomain() ), the_title( '<span class="fn">', '</span>', false) ); ?></a>
</p><!-- .download -->
<?php endif; ?>
<?php the_content( sprintf( __( 'Continue reading %1$s', hybrid_get_textdomain() ), the_title( ' "', '"', false ) ) ); ?>
<?php wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '</p>' ) ); ?>
</div><!-- .entry-content -->
<?php hybrid_after_entry(); // After entry hook ?>
<?php if ( wp_attachment_is_image( get_the_ID() ) ) : ?>
<p class="navigation-attachment">
<span class="alignleft"><?php previous_image_link(); ?></span>
<span class="alignright"><?php next_image_link(); ?></span>
</p><!-- .navigation-attachment -->
<?php endif; ?>
<?php do_atomic( 'after_entry' ); // hybrid_after_entry ?>
</div><!-- .hentry -->
<?php hybrid_after_singular(); // After singular hook ?>
<?php do_atomic( 'after_singular' ); // hybrid_after_singular ?>
<?php comments_template( '/comments.php', true ); ?>
<?php comments_template( '/comments.php', true ); // Loads the comments.php template ?>
<?php endwhile; ?>
<?php else: ?>
<p class="no-data">
<?php _e( 'Apologies, but no results were found.', 'hybrid' ); ?>
</p><!-- .no-data -->
<?php get_template_part( 'loop-error' ); // Loads the loop-error.php template. ?>
<?php endif; ?>
<?php hybrid_after_content(); // After content hook ?>
<?php do_atomic( 'after_content' ); // hybrid_after_content ?>
</div><!-- .content .hfeed -->
<?php get_footer(); ?>
\ No newline at end of file
<?php get_footer(); // Loads the footer.php template. ?>
\ No newline at end of file
......@@ -15,16 +15,16 @@
<li id="comment-<?php comment_ID(); ?>" class="<?php hybrid_comment_class(); ?>">
<?php hybrid_before_comment(); // Before comment hook ?>
<?php do_atomic( 'before_comment' ); // hybrid_before_comment ?>
<div class="comment-text">
<?php if ( '0' == $comment->comment_approved ) : ?>
<p class="alert moderation"><?php _e( 'Your comment is awaiting moderation.', 'hybrid' ); ?></p>
<p class="alert moderation"><?php _e( 'Your comment is awaiting moderation.', hybrid_get_textdomain() ); ?></p>
<?php endif; ?>
<?php comment_text( $comment->comment_ID ); ?>
</div><!-- .comment-text -->
<?php hybrid_after_comment(); // After comment hook ?>
<?php do_atomic( 'after_comment' ); // hybrid_after_comment ?>
<?php /* No closing </li> is needed. WordPress will know where to add it. */ ?>
\ No newline at end of file
......@@ -8,21 +8,15 @@
* @package Hybrid
* @subpackage Template
*/
if ( 'comments.php' == basename( $_SERVER['SCRIPT_FILENAME'] ) )
die( __( 'Please do not load this page directly. Thanks!', 'hybrid' ) );
if ( !post_type_supports( get_post_type(), 'comments' ) || ( !have_comments() && !comments_open() && !pings_open() ) )
return;
/* Kill the page if trying to access this template directly. */
if ( 'comments.php' == basename( $_SERVER['SCRIPT_FILENAME'] ) )
die( __( 'Please do not load this page directly. Thanks!', hybrid_get_textdomain() ) );
if ( post_password_required() ) : ?>
<h3 class="comments-header"><?php _e( 'Password Protected', 'hybrid' ); ?></h3>
<p class="alert password-protected">
<?php _e( 'Enter the password to view comments.', 'hybrid' ); ?>
</p><!-- .alert .password-protected -->
<?php endif; ?>
/* If a post password is required or no comments are given and comments/pings are closed, return. */
if ( post_password_required() || ( !have_comments() && !comments_open() && !pings_open() ) )
return;
?>
<div id="comments-template">
......@@ -30,18 +24,18 @@
<div id="comments">
<h3 id="comments-number" class="comments-header"><?php comments_number( sprintf( __( 'No responses to %1$s', 'hybrid' ), the_title( '&#8220;', '&#8221;', false ) ), sprintf( __( 'One response to %1$s', 'hybrid' ), the_title( '&#8220;', '&#8221;', false ) ), sprintf( __( '%1$s responses to %2$s', 'hybrid' ), '%', the_title( '&#8220;', '&#8221;', false ) ) ); ?></h3>
<h3 id="comments-number" class="comments-header"><?php comments_number( sprintf( __( 'No responses to %1$s', hybrid_get_textdomain() ), the_title( '&#8220;', '&#8221;', false ) ), sprintf( __( 'One response to %1$s', hybrid_get_textdomain() ), the_title( '&#8220;', '&#8221;', false ) ), sprintf( __( '%1$s responses to %2$s', hybrid_get_textdomain() ), '%', the_title( '&#8220;', '&#8221;', false ) ) ); ?></h3>
<?php hybrid_before_comment_list(); // Before comment list hook ?>
<?php do_atomic( 'before_comment_list' ); // Before comment list hook ?>
<ol class="comment-list">
<?php wp_list_comments( hybrid_list_comments_args() ); ?>
</ol><!-- .comment-list -->
<?php hybrid_after_comment_list(); // After comment list hook ?>
<?php do_atomic( 'after_comment_list' ); // After comment list hook ?>
<?php if ( get_option( 'page_comments' ) ) : ?>
<div class="comment-navigation paged-navigation">
<div class="comment-navigation comment-pagination paged-navigation">
<?php paginate_comments_links(); ?>
</div><!-- .comment-navigation -->
<?php endif; ?>
......@@ -53,15 +47,9 @@
<?php if ( pings_open() && !comments_open() ) : ?>
<p class="comments-closed pings-open">
<?php printf( __( 'Comments are closed, but <a href="%1$s" title="Trackback URL for this post">trackbacks</a> and pingbacks are open.', 'hybrid' ), trackback_url( '0' ) ); ?>
<?php printf( __( 'Comments are closed, but <a href="%1$s" title="Trackback URL for this post">trackbacks</a> and pingbacks are open.', hybrid_get_textdomain() ), trackback_url( '0' ) ); ?>
</p><!-- .comments-closed .pings-open -->
<?php elseif ( !comments_open() ) : ?>
<p class="comments-closed">
<?php _e( 'Comments are closed.', 'hybrid' ); ?>
</p><!-- .comments-closed -->
<?php endif; ?>
<?php endif; ?>
......
#body-container{overflow:hidden;width:960px;margin:0 auto}#container{overflow:hidden;float:left;width:960px}.content{overflow:hidden;float:left;width:620px}.no-widgets .content,.no-default-widgets .content{width:960px}#primary{position:relative;float:right;width:300px}#secondary{position:relative;clear:right;float:right;width:300px}#subsidiary{overflow:hidden}#subsidiary .widget{overflow:hidden;float:left;width:300px;margin:0 20px 0 0}#footer-container{clear:both;overflow:hidden}#footer{clear:both;overflow:hidden}
\ No newline at end of file
/**
* Two columns with content floated left.
*
* @since 0.6
* @package Hybrid
* @subpackage CSS
*/
#body-container {
overflow: hidden;
width: 960px;
margin: 0 auto;
}
#container {
overflow: hidden;
float: left;
width: 960px;
}
.content {
overflow: hidden;
float: left;
width: 620px;
}
.no-widgets .content, .no-default-widgets .content {
width: 960px;
}
#primary {
position: relative;
float: right;
width: 300px;
}
#secondary {
position: relative;
clear: right;
float: right;
width: 300px;
}
#subsidiary {
overflow: hidden;
}
#subsidiary .widget {
overflow: hidden;
float: left;
width: 300px;
margin: 0 20px 0 0;
}
#footer-container {
clear: both;
overflow: hidden;
}
#footer {
clear: both;
overflow: hidden;
}
\ No newline at end of file
#body-container{overflow:hidden;width:960px;margin:0 auto}#container{overflow:hidden;float:left;width:960px}.content{overflow:hidden;float:right;width:620px}.no-widgets .content,.no-default-widgets .content{width:960px}#primary{float:left;width:300px}#secondary{clear:left;float:left;width:300px}#subsidiary{overflow:hidden}#subsidiary .widget{overflow:hidden;float:left;width:300px;margin:0 20px 0 0}#footer-container{clear:both;overflow:hidden}#footer{clear:both;overflow:hidden}
\ No newline at end of file
/**
* Two columns with content floated right.
*
* @since 0.6
* @package Hybrid
* @subpackage CSS
*/
#body-container {
overflow: hidden;
width: 960px;
margin: 0 auto;
}
#container {
overflow: hidden;
float: left;
width: 960px;
}
.content {
overflow: hidden;
float: right;
width: 620px;
}
.no-widgets .content, .no-default-widgets .content {
width: 960px;
}
#primary {
float: left;
width: 300px;
}
#secondary {
clear: left;
float: left;
width: 300px;
}
#subsidiary {
overflow: hidden;
}
#subsidiary .widget {
overflow: hidden;
float: left;
width: 300px;
margin: 0 20px 0 0;
}
#footer-container {
clear: both;
overflow: hidden;
}
#footer {
clear: both;
overflow: hidden;
}
\ No newline at end of file
body{min-width:600px}#body-container{overflow:hidden;width:960px;margin:0 auto}#primary-menu{position:relative;z-index:100}#container{position:relative;clear:both;overflow:hidden;padding-left:240px; padding-right:240px; z-index:1}.no-widgets #container,.no-default-widgets #container{width:960px;padding-left:0;padding-right:0}.content,#primary,#secondary{position:relative;float:left;z-index:1}.content{width:100%}.no-widgets .content,.no-default-widgets .content{width:960px}#primary{width:220px; right:240px; margin-left:-100%}#secondary{width:220px; margin-right:-240px; margin-left:20px}* html #secondary{left:240px}#subsidiary{overflow:hidden}#subsidiary .widget{overflow:hidden;float:left;width:300px;margin:0 20px 0 0}#footer-container{clear:both;overflow:hidden}#footer{clear:both}
\ No newline at end of file
/**
* Holy Grail Stylesheet.
* Creates the Holy Grail (fixed width) of three-column layouts.
* Primary / Content / Secondary
*
* @link http://www.alistapart.com/articles/holygrail
* @author Matthew Levine
*
* @since 0.6
* @package Hybrid
* @subpackage CSS
*/
body {
min-width: 600px; /* 2x LC width + RC width */
}
#body-container {
overflow: hidden;
width: 960px;
margin: 0 auto;
}
#primary-menu {
position: relative;
z-index: 100;
}
#container {
position: relative;
clear: both;
overflow: hidden;
padding-left: 240px; /* LC width */
padding-right: 240px; /* RC width */
z-index: 1;
}
.no-widgets #container, .no-default-widgets #container {
width: 960px;
padding-left: 0;
padding-right: 0;
}
.content, #primary, #secondary {
position: relative;
float: left;
z-index: 1;
}
.content {
width: 100%;
}
.no-widgets .content, .no-default-widgets .content {
width: 960px;
}
#primary {
width: 220px; /* LC width */
right: 240px; /* LC width */
margin-left: -100%;
}
#secondary {
width: 220px; /* RC width */
margin-right: -240px; /* RC width */
margin-left: 20px;
}
/*** IE6 Fix ***/
* html #secondary {
left: 240px; /* RC width */
}
#subsidiary {
overflow: hidden;
}
#subsidiary .widget {
overflow: hidden;
float: left;
width: 300px;
margin: 0 20px 0 0;
}
#footer-container {
clear: both;
overflow: hidden;
}
#footer {
clear: both;
}
\ No newline at end of file
#body-container{overflow:hidden;width:960px;margin:0 auto}#container{overflow:hidden;float:left;width:960px}.content{overflow:hidden;float:left;width:520px}.no-widgets .content,.no-default-widgets .content{width:960px}#primary{overflow:hidden;float:right;width:190px}#secondary{overflow:hidden;float:right;width:190px;margin-right:20px}#subsidiary{overflow:hidden}#subsidiary .widget{overflow:hidden;float:left;width:300px;margin:0 20px 0 0}#footer-container{clear:both;overflow:hidden}#footer{clear:both}
\ No newline at end of file
/**
* Three columns with content floated left.
*
* @since 0.6
* @package Hybrid
* @subpackage CSS
*/
#body-container {
overflow: hidden;
width: 960px;
margin: 0 auto;
}
#container {
overflow: hidden;
float: left;
width: 960px;
}
.content {
overflow: hidden;
float: left;
width: 520px;
}
.no-widgets .content, .no-default-widgets .content {
width: 960px;
}
#primary {
overflow: hidden;
float: right;
width: 190px;
}
#secondary {
overflow: hidden;
float: right;
width: 190px;
margin-right: 20px;
}
#subsidiary {
overflow: hidden;
}
#subsidiary .widget {
overflow: hidden;
float: left;
width: 300px;
margin: 0 20px 0 0;
}
#footer-container {
clear: both;
overflow: hidden;
}
#footer {
clear: both;
}
\ No newline at end of file
#body-container{overflow:hidden;width:960px;margin:0 auto}#container{overflow:hidden;float:left;width:960px}.content{overflow:hidden;float:right;width:520px}.no-widgets .content,.no-default-widgets .content{width:960px}#primary{overflow:hidden;float:left;width:190px}#secondary{overflow:hidden;float:left;width:190px;margin-left:20px}#subsidiary{overflow:hidden}#subsidiary .widget{overflow:hidden;float:left;width:300px;margin:0 20px 0 0}#footer-container{clear:both;overflow:hidden}#footer{clear:both}
\ No newline at end of file