Skip to content

Commit

Permalink
Updates galore. Still bringing this thing up to Hybrid Core standards.
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.locallylost.com/themes/hybrid/trunk@546 dba0f204-706d-4bc1-bc29-8b92e0485636
  • Loading branch information
greenshady committed Dec 28, 2010
1 parent 779262b commit d9b6688
Show file tree
Hide file tree
Showing 55 changed files with 1,725 additions and 508 deletions.
4 changes: 2 additions & 2 deletions 404.php
Expand Up @@ -32,12 +32,12 @@

<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>' . site_url( esc_url( $_SERVER['REQUEST_URI'] ) ) . '</code>' ); ?>
</p>

<?php get_search_form(); ?>
Expand Down
6 changes: 3 additions & 3 deletions archive.php
Expand Up @@ -18,11 +18,11 @@

<div class="archive-info">

<h1 class="archive-title"><?php _e( 'Archives', 'hybrid' ); ?></h1>
<h1 class="archive-title"><?php _e( 'Archives', hybrid_get_textdomain() ); ?></h1>

<div class="archive-description">
<p>
<?php _e( 'You are browsing the site archives.', 'hybrid' ); ?>
<?php _e( 'You are browsing the site archives.', hybrid_get_textdomain() ); ?>
</p>
</div><!-- .archive-description -->

Expand All @@ -49,7 +49,7 @@
<?php else: ?>

<p class="no-data">
<?php _e( 'Apologies, but no results were found.', 'hybrid' ); ?>
<?php _e( 'Apologies, but no results were found.', hybrid_get_textdomain() ); ?>
</p><!-- .no-data -->

<?php endif; ?>
Expand Down
8 changes: 4 additions & 4 deletions attachment-application.php
Expand Up @@ -26,13 +26,13 @@

<?php hybrid_attachment(); ?>

<?php the_content( sprintf( __( 'Continue reading %1$s', 'hybrid' ), the_title( ' "', '"', false ) ) ); ?>
<?php the_content( sprintf( __( 'Continue reading %1$s', hybrid_get_textdomain() ), the_title( ' "', '"', false ) ) ); ?>

<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>
<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 wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', 'hybrid' ), 'after' => '</p>' ) ); ?>
<?php wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '</p>' ) ); ?>

</div><!-- .entry-content -->

Expand All @@ -49,7 +49,7 @@
<?php else: ?>

<p class="no-data">
<?php _e( 'Apologies, but no results were found.', 'hybrid' ); ?>
<?php _e( 'Apologies, but no results were found.', hybrid_get_textdomain() ); ?>
</p><!-- .no-data -->

<?php endif; ?>
Expand Down
8 changes: 4 additions & 4 deletions attachment-audio.php
Expand Up @@ -27,14 +27,14 @@
<?php hybrid_attachment(); ?>

<div class="description">
<?php the_content( sprintf( __( 'Continue reading %1$s', 'hybrid' ), the_title( ' "', '"', false ) ) ); ?>
<?php the_content( sprintf( __( 'Continue reading %1$s', hybrid_get_textdomain() ), the_title( ' "', '"', false ) ) ); ?>
</div><!-- .description -->

<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>
<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 wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', 'hybrid' ), 'after' => '</p>' ) ); ?>
<?php wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '</p>' ) ); ?>

</div><!-- .entry-content -->

Expand All @@ -51,7 +51,7 @@
<?php else: ?>

<p class="no-data">
<?php _e( 'Apologies, but no results were found.', 'hybrid' ); ?>
<?php _e( 'Apologies, but no results were found.', hybrid_get_textdomain() ); ?>
</p><!-- .no-data -->

<?php endif; ?>
Expand Down
6 changes: 3 additions & 3 deletions attachment-image.php
Expand Up @@ -30,9 +30,9 @@
<img class="aligncenter" src="<?php echo wp_get_attachment_url(); ?>" alt="<?php the_title_attribute(); ?>" title="<?php the_title_attribute(); ?>" />
</p><!-- .attachment-image -->

<?php the_content( sprintf( __( 'Continue reading %1$s', 'hybrid' ), the_title( ' "', '"', false ) ) ); ?>
<?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' ), 'after' => '</p>' ) ); ?>
<?php wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '</p>' ) ); ?>

</div><!-- .entry-content -->

Expand All @@ -54,7 +54,7 @@
<?php else: ?>

<p class="no-data">
<?php _e( 'Apologies, but no results were found.', 'hybrid' ); ?>
<?php _e( 'Apologies, but no results were found.', hybrid_get_textdomain() ); ?>
</p><!-- .no-data -->

<?php endif; ?>
Expand Down
8 changes: 4 additions & 4 deletions attachment-text.php
Expand Up @@ -26,13 +26,13 @@

<?php hybrid_attachment(); ?>

<?php the_content( sprintf( __( 'Continue reading %1$s', 'hybrid' ), the_title( ' "', '"', false ) ) ); ?>
<?php the_content( sprintf( __( 'Continue reading %1$s', hybrid_get_textdomain() ), the_title( ' "', '"', false ) ) ); ?>

<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>
<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 wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', 'hybrid' ), 'after' => '</p>' ) ); ?>
<?php wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '</p>' ) ); ?>

</div><!-- .entry-content -->

Expand All @@ -49,7 +49,7 @@
<?php else: ?>

<p class="no-data">
<?php _e( 'Apologies, but no results were found.', 'hybrid' ); ?>
<?php _e( 'Apologies, but no results were found.', hybrid_get_textdomain() ); ?>
</p><!-- .no-data -->

<?php endif; ?>
Expand Down
8 changes: 4 additions & 4 deletions attachment-video.php
Expand Up @@ -26,13 +26,13 @@

<?php hybrid_attachment(); ?>

<?php the_content( sprintf( __( 'Continue reading %1$s', 'hybrid' ), the_title( ' "', '"', false ) ) ); ?>
<?php the_content( sprintf( __( 'Continue reading %1$s', hybrid_get_textdomain() ), the_title( ' "', '"', false ) ) ); ?>

<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>
<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 wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', 'hybrid' ), 'after' => '</p>' ) ); ?>
<?php wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '</p>' ) ); ?>

</div><!-- .entry-content -->

Expand All @@ -49,7 +49,7 @@
<?php else: ?>

<p class="no-data">
<?php _e( 'Apologies, but no results were found.', 'hybrid' ); ?>
<?php _e( 'Apologies, but no results were found.', hybrid_get_textdomain() ); ?>
</p><!-- .no-data -->

<?php endif; ?>
Expand Down
8 changes: 4 additions & 4 deletions attachment.php
Expand Up @@ -28,13 +28,13 @@

<?php hybrid_attachment(); ?>

<?php the_content( sprintf( __( 'Continue reading %1$s', 'hybrid' ), the_title( ' "', '"', false ) ) ); ?>
<?php the_content( sprintf( __( 'Continue reading %1$s', hybrid_get_textdomain() ), the_title( ' "', '"', false ) ) ); ?>

<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>
<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 wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', 'hybrid' ), 'after' => '</p>' ) ); ?>
<?php wp_link_pages( array( 'before' => '<p class="page-links pages">' . __( 'Pages:', hybrid_get_textdomain() ), 'after' => '</p>' ) ); ?>

</div><!-- .entry-content -->

Expand All @@ -51,7 +51,7 @@
<?php else: ?>

<p class="no-data">
<?php _e( 'Apologies, but no results were found.', 'hybrid' ); ?>
<?php _e( 'Apologies, but no results were found.', hybrid_get_textdomain() ); ?>
</p><!-- .no-data -->

<?php endif; ?>
Expand Down
2 changes: 1 addition & 1 deletion comment.php
Expand Up @@ -19,7 +19,7 @@

<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 ); ?>
Expand Down
12 changes: 6 additions & 6 deletions comments.php
Expand Up @@ -9,17 +9,17 @@
* @subpackage Template
*/
if ( 'comments.php' == basename( $_SERVER['SCRIPT_FILENAME'] ) )
die( __( 'Please do not load this page directly. Thanks!', 'hybrid' ) );
die( __( 'Please do not load this page directly. Thanks!', hybrid_get_textdomain() ) );

if ( !post_type_supports( get_post_type(), 'comments' ) || ( !have_comments() && !comments_open() && !pings_open() ) )
return;

if ( post_password_required() ) : ?>

<h3 class="comments-header"><?php _e( 'Password Protected', 'hybrid' ); ?></h3>
<h3 class="comments-header"><?php _e( 'Password Protected', hybrid_get_textdomain() ); ?></h3>

<p class="alert password-protected">
<?php _e( 'Enter the password to view comments.', 'hybrid' ); ?>
<?php _e( 'Enter the password to view comments.', hybrid_get_textdomain() ); ?>
</p><!-- .alert .password-protected -->

<?php endif; ?>
Expand All @@ -30,7 +30,7 @@

<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 do_atomic( 'before_comment_list' ); // Before comment list hook ?>

Expand All @@ -53,13 +53,13 @@
<?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' ); ?>
<?php _e( 'Comments are closed.', hybrid_get_textdomain() ); ?>
</p><!-- .comments-closed -->

<?php endif; ?>
Expand Down
65 changes: 65 additions & 0 deletions css/2c-l-fixed.css
@@ -0,0 +1,65 @@
/**
* Two columns with content floated left.
*
* @deprecated 0.9.1 - This file is for backwards compatibility with the Hybrid parent theme. It will
* be removed in a future version.
*
* @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;
}
63 changes: 63 additions & 0 deletions css/2c-r-fixed.css
@@ -0,0 +1,63 @@
/**
* Two columns with content floated right.
*
* @deprecated 0.9.1 - This file is for backwards compatibility with the Hybrid parent theme. It will
* be removed in a future version.
*
* @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;
}

0 comments on commit d9b6688

Please sign in to comment.