Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Version 1.1.1

  • Loading branch information...
commit c2246e53125e99e7f23150b1b77741a0f261c598 1 parent b423ce0
@collegeman authored
Showing with 50 additions and 3 deletions.
  1. +5 −0 README.mkd
  2. +42 −0 frame.php
  3. +2 −2 functions.php
  4. +1 −1  style.css
View
5 README.mkd
@@ -11,6 +11,11 @@ This is the latest collaboration between [collegeman](http://fatpandadev.com) an
## Changelog
+### 1.1.1
+
+* Fixed: There were some instances in which the paging convention wasn't completely implemented
+* Changed: Made it possible to override FRAME and FRAME_URI constants outside of Frame
+
### 1.1
* Added: Lazyload any template part, e.g., `do_action('layout', array('path' => '<path>', 'lazy' => true))`
View
42 frame.php
@@ -200,30 +200,72 @@ function layout($args = '') {
} else if (is_category()) {
$category = get_queried_object();
+ if ($paged) {
+ $names[] = "{$part}-category-{$category->slug}-p{$paged}.php";
+ }
$names[] = "{$part}-category-{$category->slug}.php";
+ if ($paged) {
+ $names[] = "{$part}-category-{$category->term_id}-p{$paged}.php";
+ }
$names[] = "{$part}-category-{$category->term_id}.php";
+ if ($paged) {
+ $names[] = "{$part}-category-p{$paged}.php";
+ }
$names[] = "{$part}-category.php";
+ if ($paged) {
+ $names[] = "{$part}-archive-p{$paged}.php";
+ }
$names[] = "{$part}-archive.php";
} else if (is_tag()) {
$tag = get_queried_object();
+ if ($paged) {
+ $names[] = "{$part}-tag-{$tag->slug}-p{$paged}.php";
+ }
$names[] = "{$part}-tag-{$tag->slug}.php";
+ if ($paged) {
+ $names[] = "{$part}-tag-{$tag->term_id}-p{$paged}.php";
+ }
$names[] = "{$part}-tag-{$tag->term_id}.php";
+ if ($paged) {
+ $names[] = "{$part}-tag-p{$paged}.php";
+ }
$names[] = "{$part}-tag.php";
+ if ($paged) {
+ $names[] = "{$part}-archive-{$paged}.php";
+ }
$names[] = "{$part}-archive.php";
} else if (is_author()) {
$author = get_queried_object();
+ if ($paged) {
+ $names[] = "{$part}-author-{$author->user_nicename}-p{$paged}.php";
+ }
$names[] = "{$part}-author-{$author->user_nicename}.php";
+ if ($paged) {
+ $names[] = "{$part}-author-{$author->ID}-p{$paged}.php";
+ }
$names[] = "{$part}-author-{$author->ID}.php";
+ if ($paged) {
+ $names[] = "{$part}-author-p{$paged}.php";
+ }
$names[] = "{$part}-author.php";
+ if ($paged) {
+ $names[] = "{$part}-archive-p{$paged}.php";
+ }
$names[] = "{$part}-archive.php";
} else if (is_archive()) {
$post_type = get_query_var( 'post_type' );
if ($post_type) {
+ if ($paged) {
+ $names[] = "{$part}-archive-{$post_type}-p{$paged}.php";
+ }
$names[] = "{$part}-archive-{$post_type}.php";
}
+ if ($paged) {
+ $names[] = "{$part}-archive-p{$paged}.php";
+ }
$names[] = "{$part}-archive.php";
} else if (is_comments_popup()) {
View
4 functions.php
@@ -7,8 +7,8 @@
# Thanks!
#
-define('FRAME', dirname(__FILE__));
-define('FRAME_URI', get_template_directory_uri());
+@define('FRAME', dirname(__FILE__));
+@define('FRAME_URI', get_template_directory_uri());
// Sets the post excerpt length to 40 words.
function frame_excerpt_length( $length ) {
View
2  style.css
@@ -4,7 +4,7 @@ Theme URI: http://aaroncollegeman.com/frame
Author: Aaron Collegeman and Corey Brown
Author URI: http://aaroncollegeman.com
Description: A theme framework for WordPress: responsive with Twitter Bootstrap, emphasizing fewer template files, better code reuse, and easier maintenance.
-Version: 1.1
+Version: 1.1.1
Tags: microformats, responsive, Twitter Bootstrap
*/
Please sign in to comment.
Something went wrong with that request. Please try again.