@@ -1,27 +1,27 @@ -<?php get_header(); ?> - - - -<div class="primary entry"> - - <div class="meta"> - <h1 class="title"><?php _e('Error 404','tarski'); ?></h1> - </div> - - <div class="content"> - <?php tarski_404_content(); ?> - </div> - - <?php th_postend(); ?> - -</div>  - - - -<div class="secondary"> - <?php tarski_searchform(); ?> -</div> - - - +<?php get_header(); ?> + + + +<div class="primary entry"> + + <div class="meta"> + <h1 class="title"><?php _e('Error 404','tarski'); ?></h1> + </div> + + <div class="content"> + <?php tarski_404_content(); ?> + </div> + + <?php th_postend(); ?> + +</div>  + + + +<div class="secondary"> + <?php tarski_searchform(); ?> +</div> + + + <?php get_footer(); ?> \ No newline at end of file 404.php @@ -1,90 +1,90 @@ -<?php get_header(); ?> - - - -<div class="primary posts"> - <?php if(have_posts()) { // Gets it all going ?> - - <div class="archive"> - <?php if(is_category()) { // Category header ?> - <div class="meta"> - <h1><?php echo single_cat_title(); ?></h1> - </div> - <div class="content"> - <?php if(trim(strip_tags(category_description()))) { ?> - <?php echo category_description(); ?> - <?php } else { ?> - <p><?php printf( __('You are currently browsing the archive for the %s category.','tarski'), '<strong>' . single_cat_title('', false) . '</strong>' ); ?></p> - <?php } ?> - </div> - - <?php } elseif(is_tag()) { // Tag archive header ?> - - <div class="meta"> - <h1 class="title"><?php echo multiple_tag_titles(); ?></h1> - </div> - <div class="content"> - <p><?php printf( __('You are currently browsing articles tagged %s.','tarski'), multiple_tag_titles('<strong>%s</strong>') ); ?></p> - </div> - - <?php } elseif(is_author()) { // Author header ?> - - <div class="meta"> - <h1 class="title"><?php printf( __('Articles by %s','tarski'), the_archive_author_displayname() ); ?></h1> - </div> - <div class="content"> - <?php if(the_archive_author_description()) { ?> - <?php echo wpautop(wptexturize(stripslashes(the_archive_author_description()))); ?> - <?php } else { ?> - <p><?php printf( __('You are currently browsing %s’s articles.','tarski'), '<strong>'. the_archive_author_displayname(). '</strong>' ); ?></p> - <?php } ?> - </div> - - <?php } elseif(is_day()) { // Daily archive header ?> - - <div class="meta"> - <h1 class="title"><?php the_time(get_option('date_format')); ?></h1> - </div> - <div class="content"> - <p><?php printf( __('You are currently browsing the daily archive for %s.','tarski'), '<strong>' . get_the_time(get_option('date_format')) . '</strong>' ); ?></p> - </div> - - <?php } elseif(is_month()) { // Monthly archive header ?> - - <div class="meta"> - <h1 class="title"><?php the_time('F Y'); ?></h1> - </div> - <div class="content"> - <p><?php printf( __('You are currently browsing the monthly archive for %s.','tarski'), '<strong>' . get_the_time('F Y') . '</strong>' ); ?></p> - </div> - - <?php } elseif(is_year()) { // Yearly archive header ?> - - <div class="meta"> - <h1 class="title"><?php the_time('Y'); ?></h1> - </div> - <div class="content"> - <p><?php printf( __('You are currently browsing the yearly archive for %s.','tarski'), '<strong>' . get_the_time('Y') . '</strong>' ); ?></p> - </div> - - <?php } ?> - </div>  - - - <?php include(TEMPLATEPATH.'/loop.php'); ?> - - - <?php } else { ?> - - <?php include(TARSKIDISPLAY . "/no_posts.php"); ?> - - <?php } // End if posts ?> -</div>  - - - -<?php get_sidebar(); ?> - - - +<?php get_header(); ?> + + + +<div class="primary posts"> + <?php if(have_posts()) { // Gets it all going ?> + + <div class="archive"> + <?php if(is_category()) { // Category header ?> + <div class="meta"> + <h1><?php echo single_cat_title(); ?></h1> + </div> + <div class="content"> + <?php if(trim(strip_tags(category_description()))) { ?> + <?php echo category_description(); ?> + <?php } else { ?> + <p><?php printf( __('You are currently browsing the archive for the %s category.','tarski'), '<strong>' . single_cat_title('', false) . '</strong>' ); ?></p> + <?php } ?> + </div> + + <?php } elseif(is_tag()) { // Tag archive header ?> + + <div class="meta"> + <h1 class="title"><?php echo multiple_tag_titles(); ?></h1> + </div> + <div class="content"> + <p><?php printf( __('You are currently browsing articles tagged %s.','tarski'), multiple_tag_titles('<strong>%s</strong>') ); ?></p> + </div> + + <?php } elseif(is_author()) { // Author header ?> + + <div class="meta"> + <h1 class="title"><?php printf( __('Articles by %s','tarski'), the_archive_author_displayname() ); ?></h1> + </div> + <div class="content"> + <?php if(the_archive_author_description()) { ?> + <?php echo wpautop(wptexturize(stripslashes(the_archive_author_description()))); ?> + <?php } else { ?> + <p><?php printf( __('You are currently browsing %s’s articles.','tarski'), '<strong>'. the_archive_author_displayname(). '</strong>' ); ?></p> + <?php } ?> + </div> + + <?php } elseif(is_day()) { // Daily archive header ?> + + <div class="meta"> + <h1 class="title"><?php the_time(get_option('date_format')); ?></h1> + </div> + <div class="content"> + <p><?php printf( __('You are currently browsing the daily archive for %s.','tarski'), '<strong>' . get_the_time(get_option('date_format')) . '</strong>' ); ?></p> + </div> + + <?php } elseif(is_month()) { // Monthly archive header ?> + + <div class="meta"> + <h1 class="title"><?php the_time('F Y'); ?></h1> + </div> + <div class="content"> + <p><?php printf( __('You are currently browsing the monthly archive for %s.','tarski'), '<strong>' . get_the_time('F Y') . '</strong>' ); ?></p> + </div> + + <?php } elseif(is_year()) { // Yearly archive header ?> + + <div class="meta"> + <h1 class="title"><?php the_time('Y'); ?></h1> + </div> + <div class="content"> + <p><?php printf( __('You are currently browsing the yearly archive for %s.','tarski'), '<strong>' . get_the_time('Y') . '</strong>' ); ?></p> + </div> + + <?php } ?> + </div>  + + + <?php include(TEMPLATEPATH.'/loop.php'); ?> + + + <?php } else { ?> + + <?php include(TARSKIDISPLAY . "/no_posts.php"); ?> + + <?php } // End if posts ?> +</div>  + + + +<?php get_sidebar(); ?> + + + <?php get_footer(); ?> \ No newline at end of file archive.php @@ -1,46 +1,46 @@ -<?php -/* -Template Name: Archives -*/ - -get_header(); ?> - - - -<?php if (have_posts()) { while (have_posts()) { the_post(); ?> - <div class="primary-span entry"> - <div class="meta"> - <h1 class="title"><?php the_title(); ?></h1> - <?php edit_post_link(__('edit page','tarski'), '<p class="metadata">(', ')</p>'); ?> - </div>  - - <?php if(get_the_content() != "") { ?> - <div class="content"> - <?php the_content(); ?> - </div>  - <?php } ?> - </div>  - - <div class="primary"> - <h3><?php _e('Monthly Archives', 'tarski'); ?></h3> - - <ul class="archivelist xoxo"> - <?php wp_get_archives(array('type' => 'monthly', 'show_post_count' => true)); ?> - </ul> - <?php th_postend(); ?> - </div>  -<?php } } ?> - - <div class="secondary"> - <?php if(get_tarski_option('show_categories')) { ?> - <h3><?php _e('Category Archives', 'tarski'); ?></h3> - <ul class="archivelist xoxo"> - <?php wp_list_categories(array('order' => 'DESC', 'title_li' => false)); ?> - </ul> - <?php } ?> - <?php th_sidebar(); ?> - </div>  - - - +<?php +/* +Template Name: Archives +*/ + +get_header(); ?> + + + +<?php if (have_posts()) { while (have_posts()) { the_post(); ?> + <div class="primary-span entry"> + <div class="meta"> + <h1 class="title"><?php the_title(); ?></h1> + <?php edit_post_link(__('edit page','tarski'), '<p class="metadata">(', ')</p>'); ?> + </div>  + + <?php if(get_the_content() != "") { ?> + <div class="content"> + <?php the_content(); ?> + </div>  + <?php } ?> + </div>  + + <div class="primary"> + <h3><?php _e('Monthly Archives', 'tarski'); ?></h3> + + <ul class="archivelist xoxo"> + <?php wp_get_archives(array('type' => 'monthly', 'show_post_count' => true)); ?> + </ul> + <?php th_postend(); ?> + </div>  +<?php } } ?> + + <div class="secondary"> + <?php if(get_tarski_option('show_categories')) { ?> + <h3><?php _e('Category Archives', 'tarski'); ?></h3> + <ul class="archivelist xoxo"> + <?php wp_list_categories(array('order' => 'DESC', 'title_li' => false)); ?> + </ul> + <?php } ?> + <?php th_sidebar(); ?> + </div>  + + + <?php get_footer(); ?> \ No newline at end of file archives.php @@ -1,27 +1,27 @@ -</div>  - - - -<div id="footer" class="clearfix"> - - <div class="secondary"> - - <?php th_fsidebar(); ?> - - </div>  - - <div class="primary"> - - <?php th_fmain(); ?> - - </div>  - - <div id="theme-info" class="clearfix"> - - <?php th_footer(); ?> - - </div>  - -</div>  - +</div>  + + + +<div id="footer" class="clearfix"> + + <div class="secondary"> + + <?php th_fsidebar(); ?> + + </div>  + + <div class="primary"> + + <?php th_fmain(); ?> + + </div>  + + <div id="theme-info" class="clearfix"> + + <?php th_footer(); ?> + + </div>  + +</div>  + </div><?php wp_footer(); ?></body></html> \ No newline at end of file footer.php @@ -1,96 +1,96 @@ -<?php -/** - * @package WordPress - * @subpackage Tarski - */ - -/** - * Tarski's constants. - * - * These mostly provide convenient aliases for filesystem paths. Tarski's many - * files live in a number of directories (the main ones being /app and - * /library), so keeping includes simple is greatly helped by a sane set of - * path constants. The one exception is TARSKIVERSIONFILE, which defines the - * URL of the update notifier. - * - * @see TarskiVersion - * @link http://tarskitheme.com/help/updates/notifier/ - */ -define('TARSKICLASSES', TEMPLATEPATH . '/library/classes'); -define('TARSKIHELPERS', TEMPLATEPATH . '/library/helpers'); -define('TARSKIDISPLAY', TEMPLATEPATH . '/app/templates'); -define('TARSKICACHE', WP_CONTENT_DIR . '/tarski'); -define('TARSKIVERSIONFILE', 'http://tarskitheme.com/version.atom'); - -/** - * Core library files. - * - * These files will be loaded whenever WordPress is. They include a few key - * functions, and the core classes that Tarski requires to load its options, - * add dependencies to document heads, and output comments. - * - * @see Options - * @see Asset - * @see TarskiCommentWalker - */ -require_once(TEMPLATEPATH . '/library/core.php'); -require_once(TARSKICLASSES . '/options.php'); -require_once(TARSKICLASSES . '/asset.php'); -require_once(TARSKICLASSES . '/comment_walker.php'); - -/** - * Admin library files. - * - * These library files are required for Tarski's administrative functions: - * notifying the user about updates, selecting pages to add to the navbar, - * defining the options page parameters, and so on. They are loaded only on - * when a WordPress admin page is accessed, so as to reduce the load on the - * server. - * - * @see TarskiVersion - * @see WalkerPageSelect - */ -if (is_admin()) { - require_once(TARSKICLASSES . '/version.php'); - require_once(TARSKICLASSES . '/page_select.php'); - require_once(TARSKIHELPERS . '/admin_helper.php'); -} - -/** - * Templating libraries. - * - * As a theme, particularly given its complexity and multiplicity of options, - * Tarski needs a lot of templating functions. There is an ongoing effort to - * split functions up into logical groups spread across more and smaller files, - * so that each grouping remains comprehensible and each function easy to find. - */ -require_once(TARSKIHELPERS . '/template_helper.php'); -require_once(TARSKIHELPERS . '/content_helper.php'); -require_once(TARSKIHELPERS . '/comments_helper.php'); -require_once(TARSKIHELPERS . '/author_helper.php'); -require_once(TARSKIHELPERS . '/tag_helper.php'); -require_once(TARSKIHELPERS . '/widgets.php'); - -/** - * API files. - * - * Tarski's API is actually spread across much of the library files required - * above, but certain pieces of functionality such as generic template hooks, - * legacy API handlers, and deprecated functions, all live in specialised API - * files where they can be easily found and documented. - */ -require_once(TEMPLATEPATH . '/app/api/hooks.php'); -require_once(TEMPLATEPATH . '/app/api/constants_helper.php'); -include_once(TEMPLATEPATH . '/app/api/deprecated.php'); - -/** - * Launcher. - * - * The launcher file makes an inital round of function calls, loading any - * available localisation files, defining several constants which WordPress - * requires, registering widget sidebars, and adding numerous actions and - * filters. - */ -require_once(TEMPLATEPATH . '/app/launcher.php'); - +<?php +/** + * @package WordPress + * @subpackage Tarski + */ + +/** + * Tarski's constants. + * + * These mostly provide convenient aliases for filesystem paths. Tarski's many + * files live in a number of directories (the main ones being /app and + * /library), so keeping includes simple is greatly helped by a sane set of + * path constants. The one exception is TARSKIVERSIONFILE, which defines the + * URL of the update notifier. + * + * @see TarskiVersion + * @link http://tarskitheme.com/help/updates/notifier/ + */ +define('TARSKICLASSES', TEMPLATEPATH . '/library/classes'); +define('TARSKIHELPERS', TEMPLATEPATH . '/library/helpers'); +define('TARSKIDISPLAY', TEMPLATEPATH . '/app/templates'); +define('TARSKICACHE', WP_CONTENT_DIR . '/tarski'); +define('TARSKIVERSIONFILE', 'http://tarskitheme.com/version.atom'); + +/** + * Core library files. + * + * These files will be loaded whenever WordPress is. They include a few key + * functions, and the core classes that Tarski requires to load its options, + * add dependencies to document heads, and output comments. + * + * @see Options + * @see Asset + * @see TarskiCommentWalker + */ +require_once(TEMPLATEPATH . '/library/core.php'); +require_once(TARSKICLASSES . '/options.php'); +require_once(TARSKICLASSES . '/asset.php'); +require_once(TARSKICLASSES . '/comment_walker.php'); + +/** + * Admin library files. + * + * These library files are required for Tarski's administrative functions: + * notifying the user about updates, selecting pages to add to the navbar, + * defining the options page parameters, and so on. They are loaded only on + * when a WordPress admin page is accessed, so as to reduce the load on the + * server. + * + * @see TarskiVersion + * @see WalkerPageSelect + */ +if (is_admin()) { + require_once(TARSKICLASSES . '/version.php'); + require_once(TARSKICLASSES . '/page_select.php'); + require_once(TARSKIHELPERS . '/admin_helper.php'); +} + +/** + * Templating libraries. + * + * As a theme, particularly given its complexity and multiplicity of options, + * Tarski needs a lot of templating functions. There is an ongoing effort to + * split functions up into logical groups spread across more and smaller files, + * so that each grouping remains comprehensible and each function easy to find. + */ +require_once(TARSKIHELPERS . '/template_helper.php'); +require_once(TARSKIHELPERS . '/content_helper.php'); +require_once(TARSKIHELPERS . '/comments_helper.php'); +require_once(TARSKIHELPERS . '/author_helper.php'); +require_once(TARSKIHELPERS . '/tag_helper.php'); +require_once(TARSKIHELPERS . '/widgets.php'); + +/** + * API files. + * + * Tarski's API is actually spread across much of the library files required + * above, but certain pieces of functionality such as generic template hooks, + * legacy API handlers, and deprecated functions, all live in specialised API + * files where they can be easily found and documented. + */ +require_once(TEMPLATEPATH . '/app/api/hooks.php'); +require_once(TEMPLATEPATH . '/app/api/constants_helper.php'); +include_once(TEMPLATEPATH . '/app/api/deprecated.php'); + +/** + * Launcher. + * + * The launcher file makes an inital round of function calls, loading any + * available localisation files, defining several constants which WordPress + * requires, registering widget sidebars, and adding numerous actions and + * filters. + */ +require_once(TEMPLATEPATH . '/app/launcher.php'); + ?> \ No newline at end of file functions.php @@ -1,19 +1,19 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes('xhtml'); ?>> - -<head profile="http://gmpg.org/xfn/11"><title><?php echo tarski_doctitle(); ?></title> - - <meta http-equiv="Content-Type" content="<?php echo get_bloginfo('html_type') .'; charset=' . get_bloginfo('charset'); ?>" /> - <?php wp_head(); ?> - -</head> - -<body id="<?php tarski_bodyid(); ?>" class="<?php tarski_bodyclass(); ?>"><div id="wrapper"> - -<div id="header"> - - <?php th_header(); ?> - -</div> - +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" <?php language_attributes('xhtml'); ?>> + +<head profile="http://gmpg.org/xfn/11"><title><?php echo tarski_doctitle(); ?></title> + + <meta http-equiv="Content-Type" content="<?php echo get_bloginfo('html_type') .'; charset=' . get_bloginfo('charset'); ?>" /> + <?php wp_head(); ?> + +</head> + +<body id="<?php tarski_bodyid(); ?>" class="<?php tarski_bodyclass(); ?>"><div id="wrapper"> + +<div id="header"> + + <?php th_header(); ?> + +</div> + <div id="content" class="clearfix"> \ No newline at end of file header.php @@ -1,62 +1,62 @@ -<?php get_header(); ?> - -<div class="primary<?php if (!(is_single() || is_page())) echo ' posts'; ?>"> - - <?php if (have_posts()) { ?> - - <?php if (is_single() || is_page()) { // Single entries and pages ?> - - <?php while (have_posts()) { the_post(); ?> - - <div <?php post_class('entry'); ?>> - - <div class="meta"> - <h1 class="title entry-title"><?php the_title(); ?></h1> - <?php if (is_attachment()) { ?> - <p class="metadata"><?php - echo '<span class="date updated">' . get_the_time(get_option('date_format')) . '</span>'; - edit_post_link(__('edit','tarski'),' <span class="edit">(',')</span>'); - ?></p> - <?php } elseif (is_single()) { ?> - <p class="metadata"><?php - echo '<span class="date updated">' . get_the_time(get_option('date_format')) . '</span>'; - tarski_post_categories_link(); - tarski_author_posts_link(); - tarski_comments_link(); - edit_post_link(__('edit','tarski'),' <span class="edit">(',')</span>'); - ?></p> - <?php } else { ?> - <?php edit_post_link(__('edit page','tarski'), '<p class="metadata"><span class="edit">(', ')</span></p>'); ?> - <?php } ?> - </div> - - <div class="content"> - <?php the_content(); ?> - </div> - - <?php th_postend(); ?> - - </div>  - - <?php } // End entry loop ?> - - <?php } else { ?> - - <?php include(TEMPLATEPATH . '/loop.php'); ?> - - <?php } // End loop types ?> - - <?php } else { // If no posts ?> - - <?php include(TARSKIDISPLAY . "/no_posts.php"); ?> - - <?php } // End loop ?> - - - <?php if (!is_attachment() && (is_single() || is_page())) comments_template(); ?> - -</div> - -<?php get_sidebar(); ?> - +<?php get_header(); ?> + +<div class="primary<?php if (!(is_single() || is_page())) echo ' posts'; ?>"> + + <?php if (have_posts()) { ?> + + <?php if (is_single() || is_page()) { // Single entries and pages ?> + + <?php while (have_posts()) { the_post(); ?> + + <div <?php post_class('entry'); ?>> + + <div class="meta"> + <h1 class="title entry-title"><?php the_title(); ?></h1> + <?php if (is_attachment()) { ?> + <p class="metadata"><?php + echo '<span class="date updated">' . get_the_time(get_option('date_format')) . '</span>'; + edit_post_link(__('edit','tarski'),' <span class="edit">(',')</span>'); + ?></p> + <?php } elseif (is_single()) { ?> + <p class="metadata"><?php + echo '<span class="date updated">' . get_the_time(get_option('date_format')) . '</span>'; + tarski_post_categories_link(); + tarski_author_posts_link(); + tarski_comments_link(); + edit_post_link(__('edit','tarski'),' <span class="edit">(',')</span>'); + ?></p> + <?php } else { ?> + <?php edit_post_link(__('edit page','tarski'), '<p class="metadata"><span class="edit">(', ')</span></p>'); ?> + <?php } ?> + </div> + + <div class="content"> + <?php the_content(); ?> + </div> + + <?php th_postend(); ?> + + </div>  + + <?php } // End entry loop ?> + + <?php } else { ?> + + <?php include(TEMPLATEPATH . '/loop.php'); ?> + + <?php } // End loop types ?> + + <?php } else { // If no posts ?> + + <?php include(TARSKIDISPLAY . "/no_posts.php"); ?> + + <?php } // End loop ?> + + + <?php if (!is_attachment() && (is_single() || is_page())) comments_template(); ?> + +</div> + +<?php get_sidebar(); ?> + <?php get_footer(); ?> \ No newline at end of file index.php @@ -1,46 +1,46 @@ -<?php -/* -Template Name: Links -*/ - -get_header(); ?> - - - -<?php if (have_posts()) { while(have_posts()) { the_post(); ?> - - <div class="primary entry"> - <div class="meta"> - <h1 class="title"><?php the_title(); ?></h1> - <?php edit_post_link(__('edit page','tarski'), '<p class="metadata">(', ')</p>'); ?> - </div>  - - <?php if(get_the_content() != "") { ?> - <div class="content"> - <?php the_content(); ?> - </div>  - <?php } ?> - <div class="bookmarks"> - <?php wp_list_bookmarks(array( - 'exclude_category' => get_tarski_option('nav_extlinkcat'), - 'category_before' => '', - 'category_after' => '', - 'title_before' => '<h3>', - 'title_after' => '</h3>', - 'show_images' => 0, - 'show_description' => 0 - )); ?> - </div>  - - <?php th_postend(); ?> - </div>  - -<?php } } ?> - - - -<?php get_sidebar(); ?> - - - +<?php +/* +Template Name: Links +*/ + +get_header(); ?> + + + +<?php if (have_posts()) { while(have_posts()) { the_post(); ?> + + <div class="primary entry"> + <div class="meta"> + <h1 class="title"><?php the_title(); ?></h1> + <?php edit_post_link(__('edit page','tarski'), '<p class="metadata">(', ')</p>'); ?> + </div>  + + <?php if(get_the_content() != "") { ?> + <div class="content"> + <?php the_content(); ?> + </div>  + <?php } ?> + <div class="bookmarks"> + <?php wp_list_bookmarks(array( + 'exclude_category' => get_tarski_option('nav_extlinkcat'), + 'category_before' => '', + 'category_after' => '', + 'title_before' => '<h3>', + 'title_after' => '</h3>', + 'show_images' => 0, + 'show_description' => 0 + )); ?> + </div>  + + <?php th_postend(); ?> + </div>  + +<?php } } ?> + + + +<?php get_sidebar(); ?> + + + <?php get_footer(); ?> \ No newline at end of file links.php @@ -1,43 +1,43 @@ -<?php while(have_posts()) { the_post(); ?> - - <?php if(get_tarski_option('asidescategory') && in_category(get_tarski_option('asidescategory'))) { // Aside loop ?> - - <div <?php post_class('aside'); ?> id="p-<?php the_ID(); ?>"> - - <div class="content entry-content"><?php the_content(__('Read the rest of this entry »','tarski')); ?></div> - - <p class="meta"><span class="date updated"><?php the_time(get_option('date_format')); ?></span><?php tarski_author_posts_link(); ?> | <a class="comments-link" rel="bookmark" href="<?php the_permalink(); ?>"><?php tarski_asides_permalink_text(); ?></a><?php edit_post_link(__('edit','tarski'), ' (', ')'); ?></p> - - <?php th_postend(); ?> - - </div> - - - <?php } else { // Non-Aside loop ?> - - - <div <?php post_class('entry'); ?>> - - <div class="meta"> - <h2 class="title entry-title" id="post-<?php the_ID(); ?>"><a href="<?php the_permalink(); ?>" rel="bookmark" title="<?php _e('Permanent link to ','tarski'); the_title(); ?>"><?php the_title(); ?></a></h2> - <p class="metadata"><?php echo '<span class="date updated">'. get_the_time(get_option('date_format')) . '</span>'; - tarski_post_categories_link(); - tarski_author_posts_link(); - tarski_comments_link(); - edit_post_link(__('edit', 'tarski'),' <span class="edit">(',')</span>'); ?></p> - </div> - - <div class="content entry-content"> - <?php the_content(__('Read the rest of this entry »','tarski')); ?> - </div> - - <?php th_postend(); ?> - - </div> - - - <?php } ?> - -<?php } // End entry loop ?> - +<?php while(have_posts()) { the_post(); ?> + + <?php if(get_tarski_option('asidescategory') && in_category(get_tarski_option('asidescategory'))) { // Aside loop ?> + + <div <?php post_class('aside'); ?> id="p-<?php the_ID(); ?>"> + + <div class="content entry-content"><?php the_content(__('Read the rest of this entry »','tarski')); ?></div> + + <p class="meta"><span class="date updated"><?php the_time(get_option('date_format')); ?></span><?php tarski_author_posts_link(); ?> | <a class="comments-link" rel="bookmark" href="<?php the_permalink(); ?>"><?php tarski_asides_permalink_text(); ?></a><?php edit_post_link(__('edit','tarski'), ' (', ')'); ?></p> + + <?php th_postend(); ?> + + </div> + + + <?php } else { // Non-Aside loop ?> + + + <div <?php post_class('entry'); ?>> + + <div class="meta"> + <h2 class="title entry-title" id="post-<?php the_ID(); ?>"><a href="<?php the_permalink(); ?>" rel="bookmark" title="<?php _e('Permanent link to ','tarski'); the_title(); ?>"><?php the_title(); ?></a></h2> + <p class="metadata"><?php echo '<span class="date updated">'. get_the_time(get_option('date_format')) . '</span>'; + tarski_post_categories_link(); + tarski_author_posts_link(); + tarski_comments_link(); + edit_post_link(__('edit', 'tarski'),' <span class="edit">(',')</span>'); ?></p> + </div> + + <div class="content entry-content"> + <?php the_content(__('Read the rest of this entry »','tarski')); ?> + </div> + + <?php th_postend(); ?> + + </div> + + + <?php } ?> + +<?php } // End entry loop ?> + <?php th_posts_nav(); ?> \ No newline at end of file loop.php @@ -1,45 +1,45 @@ -<?php get_header(); ?> - - - -<div class="primary posts"> - <?php if(have_posts()) { // Gets it all going ?> - - - <div class="archive"> - <div class="meta"> - <h1 class="title"><?php _e('Search Results','tarski'); ?></h1> - </div> - <div class="content"> - <p><?php printf( __('Your search for %s returned the following results.','tarski'), '<strong>' . attribute_escape(get_search_query()) . '</strong>' ); ?></p> - </div> - </div>  - - <?php include(TEMPLATEPATH.'/loop.php'); ?> - - - <?php } else { ?> - - - <div class="entry"> - <div class="meta"> - <h1 class="title"><?php _e('No results','tarski'); ?></h1> - </div> - <div class="content"> - <p><?php printf( __('Your search for %1$s returned no results. Try returning to the %2$s.','tarski'), '<strong>' . attribute_escape(get_search_query()) . '</strong>', '<a href="' . get_bloginfo('url') . '">' . __('front page','tarski') . '</a>' ); ?></p> - </div> - </div>  - - - <?php } ?> -</div>  - - - -<div class="secondary"> - <?php tarski_searchform(); ?> -</div> - - - +<?php get_header(); ?> + + + +<div class="primary posts"> + <?php if(have_posts()) { // Gets it all going ?> + + + <div class="archive"> + <div class="meta"> + <h1 class="title"><?php _e('Search Results','tarski'); ?></h1> + </div> + <div class="content"> + <p><?php printf( __('Your search for %s returned the following results.','tarski'), '<strong>' . attribute_escape(get_search_query()) . '</strong>' ); ?></p> + </div> + </div>  + + <?php include(TEMPLATEPATH.'/loop.php'); ?> + + + <?php } else { ?> + + + <div class="entry"> + <div class="meta"> + <h1 class="title"><?php _e('No results','tarski'); ?></h1> + </div> + <div class="content"> + <p><?php printf( __('Your search for %1$s returned no results. Try returning to the %2$s.','tarski'), '<strong>' . attribute_escape(get_search_query()) . '</strong>', '<a href="' . get_bloginfo('url') . '">' . __('front page','tarski') . '</a>' ); ?></p> + </div> + </div>  + + + <?php } ?> +</div>  + + + +<div class="secondary"> + <?php tarski_searchform(); ?> +</div> + + + <?php get_footer(); ?> \ No newline at end of file search.php @@ -1,7 +1,7 @@ -<div class="searchbox"> - <form method="get" id="searchform" action="<?php bloginfo('url'); ?>"><fieldset> - <label for="s" id="searchlabel"><?php _e('Search this site', 'tarski'); ?></label> - <input type="text" value="<?php the_search_query(); ?>" name="s" id="s" /> - <input type="submit" id="searchsubmit" value="<?php _e('Search','tarski'); ?>" /> - </fieldset></form> +<div class="searchbox"> + <form method="get" id="searchform" action="<?php bloginfo('url'); ?>"><fieldset> + <label for="s" id="searchlabel"><?php _e('Search this site', 'tarski'); ?></label> + <input type="text" value="<?php the_search_query(); ?>" name="s" id="s" /> + <input type="submit" id="searchsubmit" value="<?php _e('Search','tarski'); ?>" /> + </fieldset></form> </div> \ No newline at end of file searchform.php @@ -1,6 +1,6 @@ -<div id="sidebar" class="secondary"> - - <?php th_sidebar(); // The magical sidebar hook ?> - <?php $wp_the_query->current_post--; setup_postdata($wp_query->next_post()); // Reset post data for comments ?> - +<div id="sidebar" class="secondary"> + + <?php th_sidebar(); // The magical sidebar hook ?> + <?php $wp_the_query->current_post--; setup_postdata($wp_query->next_post()); // Reset post data for comments ?> + </div> \ No newline at end of file sidebar.php 29b64f499ca12a3ca6d540c8dc97fde6703c7409 unknown Jonathan@.(none) http://github.com/ionfish/tarski/commit/a55f2356550a0197144d12c90aab62cb17440aa5 a55f2356550a0197144d12c90aab62cb17440aa5

2009-02-11T05:25:08-08:00

2009-02-10T22:48:32-08:00

cleanup remaining windows line endings from root Signed-off-by: Benedict Eastaugh <ionfish@gmail.com> 89c29f1f885526095412072a3b7cedab9ffad67e Benedict Eastaugh benedict@eastaugh.net