library/helpers/page_template_helper.php @@ -2,8 +2,8 @@ /* Template Name: Archives */ -?> -<?php get_header(); ?> + +get_header(); ?> @@ -32,7 +32,7 @@ Template Name: Archives <?php } } ?> <div class="secondary"> - <?php if(!get_tarski_option('hide_categories')) { ?> + <?php if(get_tarski_option('show_categories')) { ?> <h3><?php _e('Category Archives', 'tarski'); ?></h3> <ul class="archivelist xoxo"> <?php wp_list_cats('sort_column=name&sort_order=desc'); ?> archives.php @@ -17,6 +17,7 @@ include_once(TARSKIHELPERS . '/hooks.php'); include_once(TARSKIHELPERS . '/admin_helper.php'); include_once(TARSKIHELPERS . '/template_helper.php'); include_once(TARSKIHELPERS . '/content_helper.php'); +include_once(TARSKIHELPERS . '/page_template_helper.php'); include_once(TARSKIHELPERS . '/author_helper.php'); include_once(TARSKIHELPERS . '/tag_helper.php'); include_once(TARSKIHELPERS . '/constants_helper.php'); functions.php @@ -46,20 +46,20 @@ class Options { * @since 2.0 */ function tarski_options_defaults() { - $this->installed = theme_version("current"); + $this->installed = theme_version('current'); $this->update_notification = true; - $this->blurb = __("This is the about text.","tarski"); + $this->blurb = __('This is the default Tarski blurb: you can edit or remove it on the Tarski Options page.','tarski'); $this->footer_recent = true; - $this->sidebar_type = "tarski"; - $this->sidebar_pp_type = "main"; + $this->sidebar_type = 'tarski'; + $this->sidebar_pp_type = 'main'; $this->sidebar_pages = true; $this->sidebar_links = true; $this->sidebar_custom = false; - $this->header = "greytree.jpg"; + $this->header = 'greytree.jpg'; $this->display_title = true; $this->display_tagline = true; $this->nav_pages = false; - $this->home_link_name = __("Home","tarski"); + $this->home_link_name = __('Home','tarski'); $this->nav_extlinkcat = 0; $this->style = false; $this->asidescategory = 0; @@ -69,7 +69,7 @@ class Options { $this->tags_everywhere = false; $this->show_categories = true; $this->use_pages = false; - $this->feed_type = "rss2"; + $this->feed_type = 'rss2'; } /** @@ -78,13 +78,13 @@ class Options { * @since 2.0 */ function tarski_options_get() { - $array = unserialize(get_option("tarski_options")); + $array = unserialize(get_option('tarski_options')); if(!empty($array)) { foreach($array as $name => $value) { $this->$name = $value; } - if(empty($this->installed) || ($this->installed != theme_version("current"))) { + if(empty($this->installed) || ($this->installed != theme_version('current'))) { // We had some Tarski preferences, but the preferences were from a different version, so we need to update them // Get our defaults, so we can merge them in @@ -98,7 +98,7 @@ class Options { // If they had hidden the sidebar previously for non-index pages, preserve that setting if(empty($this->sidebar_pp_type) && isset($this->sidebar_onlyhome) && $this->sidebar_onlyhome == 1) { - $this->sidebar_pp_type = "none"; + $this->sidebar_pp_type = 'none'; } // If update notification was off, leave it off, otherwise turn it on library/classes/options.php @@ -32,7 +32,7 @@ function tarski_output_headinclude() { } /** - * tarski_output_navbarinclude() - Outputs $navbarInclude variable from constants.php. + * tarski_output_navbarinclude() - Adds $navbarInclude variable from constants.php to navbar. * * @since 1.5 * @global string $navbarInclude @@ -108,11 +108,10 @@ function tarski_output_commentsforminclude() { * * @since 1.5 * @global string $sidebarTopInclude - * @global object $post * @return string $sidebarTopInclude */ function tarski_output_sidebartopinclude() { - global $sidebarTopInclude, $post; + global $sidebarTopInclude; if(get_tarski_option('sidebar_onlyhome')) { // Sidebar only on index pages if(!(is_page() || is_single())) { tarski_output_constant($sidebarTopInclude); @@ -120,7 +119,7 @@ function tarski_output_sidebartopinclude() { } else { // Sidebar everywhere if(!(is_page() || is_single())) { tarski_output_constant($sidebarTopInclude); - } elseif(get_post_meta($post->ID, '_wp_page_template', true) != 'archives.php') { + } elseif(is_archives_template()) { tarski_output_constant($sidebarTopInclude); } } @@ -131,11 +130,10 @@ function tarski_output_sidebartopinclude() { * * @since 2.0 * @global string $sidebarBottomInclude - * @global object $post * @return string $sidebarBottomInclude */ function tarski_output_sidebarbottominclude() { - global $sidebarBottomInclude, $post; + global $sidebarBottomInclude; if(get_tarski_option('sidebar_onlyhome')) { // Sidebar only on index pages if(!(is_page() || is_single())) { tarski_output_constant($sidebarBottomInclude); @@ -143,7 +141,7 @@ function tarski_output_sidebarbottominclude() { } else { // Sidebar everywhere if(!(is_page() || is_single())) { tarski_output_constant($sidebarBottomInclude); - } elseif(get_post_meta($post->ID, '_wp_page_template', true) != 'archives.php') { + } elseif(is_archives_template()) { tarski_output_constant($sidebarBottomInclude); } } @@ -154,13 +152,12 @@ function tarski_output_sidebarbottominclude() { * * @since 1.5 * @global string $noSidebarInclude - * @global object $post * @return string $noSidebarInclude */ function tarski_output_nosidebarinclude() { - global $noSidebarInclude, $post; + global $noSidebarInclude; if(get_tarski_option('sidebar_onlyhome') && (is_single() || is_page())) { - if(get_post_meta($post->ID, '_wp_page_template', true) != 'archives.php') { + if(is_archives_template()) { tarski_output_constant($noSidebarInclude); } } @@ -171,12 +168,11 @@ function tarski_output_nosidebarinclude() { * * @since 1.5 * @global string $archivesPageInclude - * @global object $post * @return string $archivesPageInclude */ function tarski_output_archivesinclude() { - global $archivesPageInclude, $post; - if(get_post_meta($post->ID, '_wp_page_template', true) == 'archives.php') { + global $archivesPageInclude; + if(is_archives_template()) { tarski_output_constant($archivesPageInclude); } } library/helpers/constants_helper.php @@ -23,9 +23,11 @@ if(!function_exists('is_active_sidebar')) { * tarski_sidebar() - Outputs Tarski's sidebar. * * @since 2.0 + * @global object $post * @return mixed */ function tarski_sidebar() { + global $post; // Default Tarski sidebar $sidebar_file = TARSKIDISPLAY . '/sidebar/tarski_sidebar.php'; @@ -51,7 +53,9 @@ function tarski_sidebar() { } $sidebar_file = apply_filters('tarski_sidebar', $sidebar_file); - include($sidebar_file); + + if(is_string($sidebar_file)) + include($sidebar_file); } /** library/helpers/content_helper.php @@ -62,6 +62,8 @@ add_action('th_postend', 'add_post_tags', 10); add_action('th_postend', 'tarski_link_pages', 11); // Sidebar +add_filter('tarski_sidebar', 'hide_sidebar_for_archives'); + add_action('th_sidebar', 'tarski_sidebar', 10); // Comments library/launcher.php @@ -2,8 +2,8 @@ /* Template Name: Links */ -?> -<?php get_header(); ?> + +get_header(); ?> links.php screenshot.gif @@ -14,7 +14,7 @@ Theme URI: http://tarskitheme.com/ Description: An elegant, flexible theme developed by <a href="http://extralogical.net/">Ben Eastaugh</a> and <a href="http://ceejayoz.com/">Chris Sternal-Johnson</a>. Author: Benedict Eastaugh and Chris Sternal-Johnson Author URI: http://tarskitheme.com/ -Version: 2.0 RC +Version: 2.0 . Released under the <a href="http://www.opensource.org/licenses/gpl-license.php">GPL</a>. . style.css @@ -2,8 +2,8 @@ /* Template Name: Tags */ -?> -<?php get_header(); ?> + +get_header(); ?> tags.php d7aea4ee4278dc24d31319ed2345ea192db1dcee Benedict Eastaugh benedict@eastaugh.net http://github.com/ionfish/tarski/commit/cec9441f5baa56eae768adaea9c018df26e0e127 cec9441f5baa56eae768adaea9c018df26e0e127 2007-11-05T08:49:25-08:00 2007-11-05T08:49:25-08:00 More tweaks, new screenshot, moved archives template check to a function, probably 2.0 release git-svn-id: https://tarski.googlecode.com/svn/trunk@326 8ec1c81d-c82d-0410-ab24-9d07384f4a97 5f1f6ded2f6d8f166740e905e58bb4e40802365a Benedict Eastaugh benedict@eastaugh.net