wp-content/themes/tarski/app/api/constants_helper.php
wp-content/themes/tarski/app/api/deprecated.php
wp-content/themes/tarski/app/api/hooks.php
wp-content/themes/tarski/app/display/credits.php
wp-content/themes/tarski/app/display/debug.php
wp-content/themes/tarski/app/display/feed_link.php
wp-content/themes/tarski/app/display/no_posts.php
wp-content/themes/tarski/app/display/options_page.php
wp-content/themes/tarski/app/js/crir.js
wp-content/themes/tarski/app/js/page_select.js
wp-content/themes/tarski/app/js/tarski.js
wp-content/themes/tarski/app/launcher.php
wp-content/themes/tarski/images/page_select.png
wp-content/themes/tarski/library/classes/page_select.php
wp-content/themes/tarski/library/core.php
@@ -1,39 +1,105 @@
# Changelog
-### Version 2.1.4 [§](http://tarskitheme.com/2008/07/13/214-release/)
+### Version 2.3 [§](http://tarskitheme.com/)
+
+#### New features
+
+ * Options page now compatible with <abbr title="Secure Sockets Layer">SSL</abbr> admin (r731)
+
+#### Tweaks
+
+ * Don't serialise the data passed to `update_option` (r763)
+ * Show version cache notice when _file_, not directory, isn't writable (r760)
+ * Clean up `cache_is_writable` function (r759, r761)
+ * Add `js.css` to the list of disallowed custom styles (r755)
+ * Hide the search form label faster (r754)
+ * `multiple_tag_titles` function refactored (r751)
+ * Upgrade functionality refactored (r746)
+ * Author count check only runs when posts are saved or deleted (r745, r748)
+ * Author count checks how many authors have published posts (r744)
+ * `wpdb->prepare()` method used for author count query (r742)
+ * Deprecated `version_to_integer` and `version_newer_than` functions (r739)
+ * Switched to native <abbr title="PHP: Hypertext Preprocessor">PHP</abbr> `version_compare` function (r737)
+ * Options page access granted only to users with `edit_themes` capability (r736)
+ * Stylesheets for the admin section enqueued, not printed (r734)
+
#### Bug fixes
+
+ * Added more checks to upgrade functionality (r746)
+ * Made navbar selector work better in Internet Explorer (r735)
+ * Excluded navbar links category from the links page (r733)
+
+
+### Version 2.2.2 [§](http://tarskitheme.com/2008/07/19/22-release/)
+
+#### Bug fixes
+
+ * Replace defunct function reference in Links template (r724)
+
+
+### Version 2.2.1 [§](http://tarskitheme.com/2008/07/19/22-release/)
+
+#### Bug fixes
+
+ * Always show authors if Tarski options haven't been saved (r715)
+
+
+### Version 2.2 [§](http://tarskitheme.com/2008/07/19/22-release/)
+
+#### New features
+
+ * Navbar selector: sub-page lists are collapsible (r606)
+ * Navbar selector: sub-pages are listed as such (r599)
+#### Tweaks
+
+ * Better handling of attachments (r697, r698)
+ * Tweaked gallery styling to better fit Tarski (r695)
+ * Add <abbr title="WordPress">WP</abbr> standard alignment classes (r694)
+ * Added inline hooks documentation (r657, r658, r661, r665, r666, r667)
+ * Deprecated `tarski_excerpt` function (r664)
+ * Deprecated `tarski_date` function in favour of a <abbr title="WordPress">WP</abbr> core function (r662)
+ * Removed filter from `implode_proper` function (r660)
+ * Removed functions deprecated two major releases ago (r659)
+ * Removed defunct Tarski search widget (r656)
+ * Paginate index pages by default (r652)
+ * Remove pagination from index pages more elegantly and efficiently (r651)
+ * Replaced Tarski links widget with a filter (r642)
+
+
+### Version 2.1.4 [§](http://tarskitheme.com/2008/07/13/214-release/)
+
+#### Bug fixes
+
* Correct overzealous calendar widget <abbr title="Cascading Stylesheets">CSS</abbr> (r687)
* Sidebar upgrade routine only runs for older versions (r684)
* Smarter unserialisation for Tarski options (r645)
- * Fix Archives template layout for Janus style (r643)
+ * Fix Archives template layout for Janus style (r644)
-### Version 2.1.3 [§][39]
- [38]: http://tarskitheme.com/2008/05/20/21-release/
+### Version 2.1.3 [§](http://tarskitheme.com/2008/05/20/21-release/)
#### Bug fixes
- * Revert to using `curl_setopt()` for <abbr title="PHP: Hypertext Preprocessor">PHP</abbr> 4 compatibility (r630)
+ * Revert to using `curl_setopt()` for <abbr title="PHP: Hypertext Preprocessor">PHP</abbr> 4 compatibility (r629)
-### Version 2.1.2 [§][38]
- [38]: http://tarskitheme.com/2008/05/20/21-release/
+### Version 2.1.2 [§](http://tarskitheme.com/2008/05/20/21-release/)
#### Bug fixes
-
- * Fix version check timeout issues (r620, r625)
- * Add missing textdomain to forum link (r615)
-### Version 2.1.1 [§][37]
+ * Fix version check timeout issues (r620)
+ * Add missing textdomain to forum link (r614)
+
- [37]: http://tarskitheme.com/2008/05/20/21-release/
+### Version 2.1.1 [§](http://tarskitheme.com/2008/05/20/21-release/)
#### Bug fixes
- * Fixed navbar character encoding problem (r597)
- * Corrected Janus feed icon position (r593)
+ * Fixed navbar character encoding problem (r595)
+ * Corrected Janus feed icon position (r592)
+
### Version 2.1 [§][36]
wp-content/themes/tarski/CHANGELOG
@@ -24,7 +24,7 @@
<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') ); ?></p>
+ <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 ?>
@@ -43,10 +43,10 @@
<?php } elseif(is_day()) { // Daily archive header ?>
<div class="meta">
- <h1 class="title"><?php echo tarski_date(); ?></h1>
+ <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>' . tarski_date() . '</strong>' ); ?></p>
+ <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 ?>
wp-content/themes/tarski/archive.php
@@ -96,7 +96,7 @@ if($comments || comments_open()) { ?>
<?php if($user_ID) { // if user is logged in ?>
<div id="info-input" class="secondary content">
- <p class="userinfo"><?php _e('You are logged in as ','tarski'); ?><a href="<?php echo get_option('siteurl'); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>.</p>
+ <p class="userinfo"><?php _e('You are logged in as ','tarski'); ?><a href="<?php echo admin_url('profile.php'); ?>"><?php echo $user_identity; ?></a>.</p>
<p><a href="<?php bloginfo('wpurl'); ?>/wp-login.php?action=logout" title="<?php _e('Log out of this account','tarski') ?>"><?php _e('Logout »','tarski'); ?></a></p>
</div> <!-- /info fields -->
wp-content/themes/tarski/comments.php
@@ -1,35 +1,37 @@
<?php
// Path constants
-define('TARSKILIB', TEMPLATEPATH . '/library');
-define('TARSKICLASSES', TARSKILIB . '/classes');
-define('TARSKIHELPERS', TARSKILIB . '/helpers');
-define('TARSKIDISPLAY', TARSKILIB . '/display');
-define('TARSKIWIDGETS', TARSKILIB . '/widgets');
-define('TARSKICACHE', TARSKILIB . '/cache');
+define('TARSKICLASSES', TEMPLATEPATH . '/library/classes');
+define('TARSKIHELPERS', TEMPLATEPATH . '/library/helpers');
+define('TARSKIDISPLAY', TEMPLATEPATH . '/app/display');
+define('TARSKICACHE', TEMPLATEPATH . '/app/cache');
define('TARSKIVERSIONFILE', 'http://tarskitheme.com/version.atom');
-// Classes
+// Core library files
+require_once(TEMPLATEPATH . '/library/core.php');
require_once(TARSKICLASSES . '/options.php');
-require_once(TARSKICLASSES . '/version.php');
require_once(TARSKICLASSES . '/asset.php');
-// Helpers
-require_once(TARSKIHELPERS . '/hooks.php');
-require_once(TARSKIHELPERS . '/admin_helper.php');
+// Admin library files
+if (is_admin()) {
+ require_once(TARSKICLASSES . '/version.php');
+ require_once(TARSKICLASSES . '/page_select.php');
+ require_once(TARSKIHELPERS . '/admin_helper.php');
+}
+
+// Various helper libraries
require_once(TARSKIHELPERS . '/template_helper.php');
require_once(TARSKIHELPERS . '/content_helper.php');
require_once(TARSKIHELPERS . '/author_helper.php');
require_once(TARSKIHELPERS . '/tag_helper.php');
-
-// Widgets
require_once(TARSKIHELPERS . '/widgets.php');
-// Deprecated
-require_once(TARSKIHELPERS . '/constants_helper.php');
-include_once(TARSKIHELPERS . '/deprecated.php');
+// API files
+require_once(TEMPLATEPATH . '/app/api/hooks.php');
+require_once(TEMPLATEPATH . '/app/api/constants_helper.php');
+include_once(TEMPLATEPATH . '/app/api/deprecated.php');
// Launch
-require_once(TARSKILIB . '/launcher.php');
+require_once(TEMPLATEPATH . '/app/launcher.php');
?>
\ No newline at end of file
wp-content/themes/tarski/functions.php
@@ -13,12 +13,19 @@
<div class="meta">
<h1 class="title entry-title"><?php the_title(); ?></h1>
- <?php if(is_single()) { ?>
- <p class="metadata"><?php echo '<span class="date updated">' . tarski_date() . '</span>';
- tarski_post_categories_link();
- tarski_author_posts_link();
- tarski_comments_link();
- edit_post_link(__('edit','tarski'),' <span class="edit">(',')</span>'); ?></p>
+ <?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 } ?>
@@ -65,7 +72,7 @@
-<?php if(is_single() || is_page()) { comments_template(); } ?>
+<?php if(!is_attachment() && (is_single() || is_page())) { comments_template(); } ?>
wp-content/themes/tarski/index.php
@@ -7,6 +7,9 @@
*/
class Asset {
+ /**
+ * Initialisation method which calls all other methods in turn.
+ */
function init() {
$assets = new Asset;
@@ -18,12 +21,16 @@ class Asset {
$assets->output();
}
+ /**
+ * Generate meta elements pertaining to Tarski and the site.
+ *
+ * @hook filter tarski_asset_meta
+ * Filters the metadata generated by the Asset wrapper.
+ */
function meta() {
- // Theme name and version
$themeversion = theme_version();
$meta = array("<meta name=\"wp_theme\" content=\"Tarski $themeversion\" />");
- // Description
global $wp_query;
$excerpt = trim(strip_tags(wp_specialchars($wp_query->post->post_excerpt)));
@@ -35,15 +42,24 @@ class Asset {
if ( strlen($description) )
$meta[] = "<meta name=\"description\" content=\"$description\" />";
- // Robots
if(get_option('blog_public') != '0')
$meta[] = '<meta name="robots" content="all" />';
$this->meta = apply_filters('tarski_asset_meta', $meta);
}
+ /**
+ * Generate links to the various Tarski stylesheets.
+ *
+ * @hook filter tarski_style_array
+ * Filter the array of stylesheet attributes from which the stylesheet
+ * links are generated.
+ *
+ * @hook filter tarski_stylesheets
+ * Filter the raw stylesheet link elements before they're printed to
+ * the document.
+ */
function stylesheets() {
- // Default stylesheets
$style_array = array(
'main' => array(
'url' => get_bloginfo('stylesheet_url'),
@@ -58,20 +74,16 @@ class Asset {
)
);
- // Adds the alternate style, if one is selected
if(get_tarski_option('style')) {
$style_array['alternate'] = array(
'url' => get_bloginfo('template_directory') . '/styles/' . get_tarski_option('style')
);
}
- // The more complex array can be filtered if desired
$style_array = apply_filters('tarski_style_array', $style_array);
- // The business end of the function
if(is_array($style_array)) {
foreach($style_array as $type => $values) {
- // URL is required
if(is_array($values) && $values['url']) {
if(empty($values['media'])) {
$values['media'] = 'all';
@@ -88,9 +100,15 @@ class Asset {
$this->stylesheets = apply_filters('tarski_stylesheets', $stylesheets);
}
+ /**
+ * Generate script elements linking to Tarski's JavaScript.
+ *
+ * @hook filter tarski_javascript
+ * Filter script elements before they're printed to the document.
+ */
function javascript() {
$scripts = array(
- 'tarski-js' => get_bloginfo('template_directory') . '/library/js/tarski.js'
+ 'tarski-js' => get_bloginfo('template_directory') . '/app/js/tarski.js'
);
foreach($scripts as $name => $url) {
@@ -100,6 +118,13 @@ class Asset {
$this->javascript = apply_filters('tarski_javascript', $javascript);
}
+ /**
+ * Generate RSS or Atom feed link elements appropriate to the context.
+ *
+ * @hook filter tarski_feeds
+ * Filter the RSS or Atam feed link elements before they're printed to the
+ * document.
+ */
function feeds() {
global $comments;
if(is_single() || (is_page() && ($comments || comments_open()))) {
@@ -122,7 +147,7 @@ class Asset {
$source = 'author';
} elseif(is_date()) {
if(is_day()) {
- $title = sprintf( __('Daily archive feed for %s','tarski'), tarski_date());
+ $title = sprintf( __('Daily archive feed for %s','tarski'), get_the_time(get_option('date_format')));
$link = get_day_link(get_the_time('Y'), get_the_time('m'), get_the_time('d'));
$source = 'day';
} elseif(is_month()) {
@@ -158,10 +183,16 @@ class Asset {
$this->feeds = apply_filters('tarski_feeds', $feeds);
}
+ /**
+ * Print generated HTML to the document.
+ *
+ * @hook filter tarski_assets
+ * A more generalised filter for all assets generated by this class and
+ * printed by this method.
+ */
function output() {
$assets_collapsed = array();
- // Implode each array with carriage returns, two between asset groups
foreach ( $this as $asset ) {
$assets_collapsed[] = implode("\n", $asset);
}
wp-content/themes/tarski/library/classes/asset.php
@@ -22,6 +22,7 @@ class Options {
var $display_title;
var $display_tagline;
var $nav_pages;
+ var $collapsed_pages;
var $home_link_name;
var $nav_extlinkcat;
var $style;
@@ -46,6 +47,7 @@ class Options {
$this->display_title = true;
$this->display_tagline = true;
$this->nav_pages = false;
+ $this->collapsed_pages = '';
$this->home_link_name = __('Home','tarski');
$this->nav_extlinkcat = 0;
$this->style = false;
@@ -55,8 +57,8 @@ class Options {
$this->swap_title_order = false;
$this->tags_everywhere = false;
$this->show_categories = true;
- $this->show_authors = tarski_should_show_authors();
- $this->use_pages = false;
+ $this->show_authors = true;
+ $this->use_pages = true;
}
/**
@@ -107,6 +109,13 @@ class Options {
$this->nav_pages = false;
}
+ $collapsed_pages = $_POST['collapsed_pages'];
+ if(isset($collapsed_pages)) {
+ $this->collapsed_pages = $collapsed_pages;
+ } else {
+ $this->collapsed_pages = '';
+ }
+
$stylefile = $_POST['alternate_style'];
if(is_valid_tarski_style($stylefile))
$this->style = $stylefile;
@@ -124,7 +133,6 @@ class Options {
$this->asidescategory = $_POST['asides_category'];
$this->nav_extlinkcat = $_POST['nav_extlinkcat'];
$this->home_link_name = $_POST['home_link_name'];
- $this->sidebar_type = $_POST['sidebar_type'];
$this->sidebar_pp_type = $_POST['sidebar_pp_type'];
$this->show_authors = tarski_should_show_authors();
unset($this->deleted);
@@ -160,7 +168,7 @@ function save_tarski_options() {
if(isset($_POST['submit'])) {
$tarski_options->tarski_options_update();
- update_option('tarski_options', serialize($tarski_options));
+ update_option('tarski_options', $tarski_options);
}
flush_tarski_options();
@@ -210,7 +218,7 @@ function update_tarski_option($option, $value) {
else
$tarski_options->$option = $value;
- update_option('tarski_options', serialize($tarski_options));
+ update_option('tarski_options', $tarski_options);
flush_tarski_options();
}
@@ -230,4 +238,4 @@ function get_tarski_option($name) {
return $tarski_options->$name;
}
-?>
+?>
\ No newline at end of file
wp-content/themes/tarski/library/classes/options.php
@@ -76,8 +76,8 @@ class Version {
} else {
if(function_exists('curl_init')) { // If libcurl is installed, use that
$ch = curl_init(TARSKIVERSIONFILE);
- curl_setopt($ch, CURLOPT_FAILONERROR, 1);
- curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+ curl_setopt($ch, CURLOPT_FAILONERROR, 1);
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_HEADER, 0);
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 1);
curl_setopt($ch, CURLOPT_TIMEOUT, 1);
@@ -144,115 +144,23 @@ class Version {
$this->current_version_number();
$this->latest_version_number();
- $current_version = version_to_integer($this->current);
- $latest_version = version_to_integer($this->latest);
+ $status = version_compare($this->latest, $this->current);
- if($latest_version) {
- if($current_version === $latest_version)
- $version_status = 'current';
- elseif($current_version < $latest_version)
- $version_status = 'older';
- elseif($current_version > $latest_version)
- $version_status = 'newer';
- } else {
- $version_status = 'no_connection';
- }
-
- $this->status = $version_status;
- }
-
-}
-
-/**
- * theme_version() - Returns either the current or the latest theme version.
- *
- * Creates a new Version object, if {@param string $version} is
- * set to "current" then it will return the current version, if
- * set to "latest" it will return the latest version.
- * @since 2.0
- * @param string $version
- * @return string
- */
-function theme_version($version = 'current') {
- $tarski_version = new Version;
- if($version == 'latest') {
- $tarski_version->latest_version_number();
- return $tarski_version->latest;
- } else {
- $tarski_version->current_version_number();
- return $tarski_version->current;
- }
-}
-
-/**
- * tarski_update_notifier() - Performs version checks and outputs the update notifier.
- *
- * Creates a new Version object, checks the latest and current
- * versions, and lets the user know whether or not their version
- * of Tarski needs updating. The way it displays varies slightly
- * between the WordPress Dashboard and the Tarski Options page.
- * @since 2.0
- * @param string $location
- * @return string
- */
-function tarski_update_notifier($messages) {
- global $plugin_page;
-
- if ( !is_array($messages) )
- $messages = array();
-
- $version = new Version;
- $version->current_version_number();
- $svn_link = 'http://tarskitheme.com/help/updates/svn/';
-
- // Update checking only performed when remote files can be accessed
- if ( can_get_remote() ) {
-
- // Only performs the update check when notification is enabled
- if ( get_tarski_option('update_notification') ) {
- $version->latest_version_number();
- $version->latest_version_link();
- $version->version_status();
-
- if ( $version->status == 'older' ) {
- $messages[] = sprintf(
- __('A new version of the Tarski theme, version %1$s %2$s. Your installed version is %3$s.','tarski'),
- "<strong>$version->latest</strong>",
- '<a href="' . $version->latest_link . '">' . __('is now available','tarski') . '</a>',
- "<strong>$version->current</strong>"
- );
- } elseif ( $plugin_page == 'tarski-options' ) {
- switch($version->status) {
- case 'current':
- $messages[] = sprintf(
- __('Your version of Tarski (%s) is up to date.','tarski'),
- "<strong>$version->current</strong>"
- );
- break;
- case 'newer':
- $messages[] = sprintf(
- __('You appear to be running a development version of Tarski (%1$s). Please ensure you %2$s.','tarski'),
- "<strong>$version->current</strong>",
- "<a href=\"$svn_link\">" . __('stay updated','tarski') . '</a>'
- );
- break;
- case 'no_connection':
- $messages[] = sprintf(
- __('No connection to update server. Your installed version is %s.','tarski'),
- "<strong>$version->current</strong>"
- );
- break;
- }
+ if ($this->latest) {
+ if ($status === 0) {
+ $this->status = 'current';
+ } elseif ($status === 1) {
+ $this->status = 'older';
+ } elseif ($status === -1) {
+ $this->status = 'newer';
+ } else {
+ $this->status = 'error';
}
- } elseif ( $plugin_page == 'tarski-options' ) {
- $messages[] = sprintf(
- __('Update notification for Tarski is disabled. Your installed version is %s.','tarski'),
- "<strong>$version->current</strong>"
- );
+ } else {
+ $this->status = 'no_connection';
}
}
- return $messages;
}
?>
\ No newline at end of file
wp-content/themes/tarski/library/classes/version.php
@@ -13,8 +13,8 @@
* background grey, puts the page title in its place, and sorts out other
* header and footer elements.
*/
-#tarski-options { overflow: auto; }
-#tarski-options-header { clear: both; overflow: auto; margin: 0.4em 0 0.8em 0; border-bottom: 1px solid #dadada; padding: 0.4em; }
+#tarski-options {}
+#tarski-options-header { clear: both; margin: 0.4em 0 0.8em 0; border-bottom: 1px solid #dadada; padding: 0.4em; }
#tarski-options-header h2 { float: left; margin: 0 0.8em 0 0; border: none; padding: 0; }
#tarski-save-options, #tarski-info { display: block; padding: 0; }
#tarski-save-options { float: left; margin: 0; }
@@ -30,6 +30,7 @@
* allowing for fairly flexible layouts.
*/
.span { clear: both; }
+.clearer { display: block; clear: both; height: 0; visibility: hidden; }
.primary, .secondary { width: 49.5%; }
.primary, .rtl .secondary { float: left; clear: left; }
.secondary, .rtl .primary { float: right; clear: right; }
@@ -41,7 +42,7 @@
* precisely than the WordPress defaults do how things should appear.
*/
.section label, .section select, #opt-nav-homename { display: block; margin: 0.8em 0; }
-.section { margin: 0 0 0.8em 0; padding: 0.8em 0.8em 0.4em 0.8em; background: #eaf3fa; }
+.section { margin: 0 0 0.8em 0; padding: 0.8em 0.8em 0.4em 0.8em; background: #eaf3fa; position: relative; *zoom: 1; }
.section h3, .section p { margin: 0 0 0.8em 0; }
.tip { margin: 0.8em 0; border: 1px solid #c6d9e9; border-left-width: 3px; padding: 0.4em; background: #f7fafd; }
#tarski-options .highlight { background: none; color: #d54e21; }
@@ -50,6 +51,28 @@
#tarski-headers label img { background: #fff; margin: 5px; font-weight: bold; }
/**
+ * Navbar selection node tree
+ *
+ * The navbar selection tool is an ordered list of pages, whose list elements
+ * may also contain child lists of sub-pages.
+ */
+#navbar-select { clear: both; margin: 0 0 1em 0; padding: 0; }
+#navbar-select ol { margin: 0; padding: 0; }
+#navbar-select li { margin: 0; padding: 0; list-style-type: none; }
+#navbar-select li ol li { padding-left: 1.5em; }
+#navbar-select .nav-page { position: relative; margin: 0 0 0.5em 0; padding: 4px 20px 3px 5px; background-color: #cedeeb; background-repeat:no-repeat; background-position: 5px 6px; -webkit-border-radius: 5px; -moz-border-radius: 5px; border-radius: 5px; }
+#navbar-select .nav-page a { text-decoration: none; }
+#navbar-select.js .nav-page { padding-left: 28px; background-image: url('../../images/page_select.png'); }
+#navbar-select .nav-page label { display: inline; margin: 0 0 0.7em 0; }
+#navbar-select .nav-page input { display: block; position: absolute; top: 4px; right: 5px; width: 1em; height: 1em; }
+#navbar-select .nav-page .toggle { display: block; position: absolute; top: 0; left: 0; width: 23px; height: 23px; background: url('../../images/page_select.png') no-repeat 5px -194px; text-indent: -9999em; cursor: pointer; }
+#navbar-select.js .collapsed .nav-page .collapsed-toggle { background-position: 5px -94px; }
+#navbar-select.js li.collapsed ol { display: none; }
+/* Some hacks to work around Internet Explorer bugs */
+#navbar-select, #navbar-select ol, #navbar-select li, #navbar-select .nav-page, #navbar-select .nav-page input { *zoom: 1; }
+#navbar-select .nav-page input { _top: 5px; }
+
+/**
* Checkboxes and radio buttons
*
* The Tarski options page uses JavaScript to allow the styling of input
wp-content/themes/tarski/library/css/options.css
@@ -1,40 +1,6 @@
<?php
/**
- * check_input() - Checks input is of correct type
- *
- * Always returns true when WP_DEBUG is true, to allow for easier debugging
- * in the development environment while handling erroneous input more
- * robustly in the production environment.
- * @see http://uk3.php.net/manual/en/function.gettype.php
- * @since 2.1
- * @param mixed $input
- * @param string $type
- * @param string $name
- * @return boolean
- *
- */
-function check_input($input, $type, $name = '') {
- if ( WP_DEBUG === true )
- return true;
-
- if ( $type == 'object' && strlen($name) > 0 )
- return is_a($input, $name);
- else
- return call_user_func("is_$type", $input);
-}
-
-/**
- * detectWPMU() - Detects whether WordPress Multi-User is in use.
- *
- * @since 1.4
- * @return boolean
- */
-function detectWPMU() {
- return function_exists('is_site_admin');
-}
-
-/**
* detectWPMUadmin() - Detect whether the current user is a WPMU site administrator.
*
* @since 2.0
@@ -69,72 +35,13 @@ function can_get_remote() {
* @return boolean
*/
function cache_is_writable($file = false) {
- if($file)
+ if ( $file )
$cachefile = TARSKICACHE . '/' . $file;
- if(is_writable($cachefile) || (is_writable(TARSKICACHE) && !file_exists($cachefile)))
- return true;
-}
-
-/**
- * version_to_integer() - Turns Tarski version numbers into integers.
- *
- * @since 2.0.3
- * @param string $version
- * @return integer
- */
-function version_to_integer($version) {
- // Remove all non-numeric characters
- $version = preg_replace('/\D/', '', $version);
-
- if($version && strlen($version) >= 1) {
- // Make the string exactly three characters (numerals) long
- if(strlen($version) < 2) {
- $version_int = $version . '00';
- } elseif(strlen($version) < 3) {
- $version_int = $version . '0';
- } elseif(strlen($version) == 3) {
- $version_int = $version;
- } elseif(strlen($version) > 3) {
- $version_int = substr($version, 0, 3);
- }
-
- // Return an integer
- return (int) $version_int;
- }
-}
-
-/**
- * version_newer_than() - Returns true if current version is greater than given version.
- *
- * @since 2.0.3
- * @param mixed $version
- * @return boolean
- */
-function version_newer_than($version) {
- $version = version_to_integer($version);
- $current = version_to_integer(theme_version('current'));
-
- if($version && $current) {
- return (bool) ($current > $version);
- }
-}
-
-/**
- * is_valid_tarski_style() - Checks whether a given file name is a valid Tarski stylesheet name.
- *
- * It must be a valid CSS identifier, followed by the .css file extension,
- * and it cannot have a name that is already taken by Tarski's CSS namepsace.
- * @since 2.0
- * @param string $file
- * @return boolean
- */
-function is_valid_tarski_style($file) {
- return (bool) (
- !preg_match('/^\.+$/', $file)
- && preg_match('/^[A-Za-z][A-Za-z0-9\-]*.css$/', $file)
- && !preg_match('/^janus.css$|^centre.css$|^rtl.css$/', $file)
- );
+ if ( file_exists($cachefile) )
+ return is_writable($cachefile);
+ else
+ return is_writable(TARSKICACHE);
}
/**
@@ -166,9 +73,8 @@ function ready_to_delete_options($del_time) {
*/
function tarski_upgrade_needed() {
if ( get_option('tarski_options') ) {
- $version = get_tarski_option('installed');
- $current = theme_version('current');
- return (bool) empty($version) || (version_to_integer($version) < version_to_integer($current));
+ $installed = get_tarski_option('installed');
+ return empty($installed) || version_compare($installed, theme_version('current')) === -1;
}
}
@@ -188,6 +94,86 @@ function tarski_upgrade_and_flush_options() {
}
/**
+ * tarski_upgrade_special() - Upgrades Tarski options special cases.
+ *
+ * @since 2.3
+ * @see tarski_upgrade()
+ * @param object $options
+ * @param object $defaults
+ */
+function tarski_upgrade_special($options, $defaults) {
+ if ( tarski_should_show_authors() )
+ $options->show_authors = true;
+
+ if ( empty($options->centred_theme) && isset($options->centered_theme) )
+ $options->centred_theme = true;
+
+ if ( empty($options->show_categories) && isset($options->hide_categories) && ($options->hide_categories == 1) )
+ $options->show_categories = false;
+
+}
+
+/**
+ * tarski_upgrade_widgets() - Upgrades old Tarski sidebar options to use widgets.
+ *
+ * @since 2.3
+ * @see tarski_upgrade()
+ * @param object $options
+ * @param object $defaults
+ */
+function tarski_upgrade_widgets($options, $defaults) {
+ $widgets = wp_get_sidebars_widgets(false);
+ $widget_text = get_option('widget_text');
+
+ // Change sidebar names and initialise new sidebars
+ if ( empty($widgets['sidebar-main']) && !empty($widgets['sidebar-1']) )
+ $widgets['sidebar-main'] = $widgets['sidebar-1'];
+
+ if ( empty($widgets['footer-sidebar']) && !empty($widgets['sidebar-2']) )
+ $widgets['footer-sidebar'] = $widgets['sidebar-2'];
+
+ // Main footer widgets
+ if ( empty($widgets['footer-main']) ) {
+ $widgets['footer-main'] = array();
+
+ // Footer blurb
+ if ( strlen(trim($options->blurb)) ) {
+ $widget_text[] = array( 'title' => '', 'text' => $options->blurb );
+ $wt_num = (int) end(array_keys($widget_text));
+ $widgets['footer-main'][] = "text-$wt_num";
+ }
+
+ // Recent articles
+ if ( $options->footer_recent )
+ $widgets['footer-main'][] = 'recent-articles';
+ }
+
+ // Main sidebar
+ if ( empty($widgets['sidebar-main']) && $options->sidebar_type == 'tarski' ) {
+ $widgets['sidebar-main'] = array();
+
+ // Custom text -> text widget
+ if( strlen(trim($options->sidebar_custom)) ) {
+ $widget_text[] = array( 'title' => '', 'text' => $options->sidebar_custom );
+ $wt_num = (int) end(array_keys($widget_text));
+ $widgets['sidebar-main'][] = "text-$wt_num";
+ }
+
+ // Pages list -> pages widget
+ if($options->sidebar_pages)
+ $widgets['sidebar-main'][] = 'pages';
+
+ // Links list -> links widget
+ if($options->sidebar_links)
+ $widgets['sidebar-main'][] = 'links';
+ }
+
+ // Update options
+ update_option('widget_text', $widget_text);
+ wp_set_sidebars_widgets($widgets);
+}
+
+/**
* function tarski_upgrade() - Upgrades Tarski's options where appropriate.
*
* Tarski preferences sometimes change between versions, and need to
@@ -205,95 +191,14 @@ function tarski_upgrade() {
$defaults = new Options;
$defaults->tarski_options_defaults();
- // Handle special cases first
-
// Update the options version so we don't run this code more than once
- $old_version = $options->installed;
$options->installed = theme_version('current');
- if (version_to_integer($old_version) < 210) {
- // If they had hidden the sidebar previously for non-index pages, preserve that setting
- if (
- empty($options->sidebar_pp_type)
- && isset($options->sidebar_onlyhome)
- && $options->sidebar_onlyhome == 1
- ) {
- $options->sidebar_pp_type = 'none';
- }
-
- // If there's more than one author, show authors
- if(tarski_should_show_authors()) {
- $options->show_authors = true;
- }
-
- // If categories are hidden, respect that option
- if (
- empty($options->show_categories)
- && isset($options->hide_categories)
- && ($options->hide_categories == 1)
- ) {
- $options->show_categories = false;
- }
-
- // Change American English to British English, sorry Chris
- if(empty($options->centred_theme) && isset($options->centered_theme)) {
- $options->centred_theme = true;
- }
-
- // Upgrade old display options to use widgets instead
-
- // Get current widgets settings
- $widgets = wp_get_sidebars_widgets();
- $widget_text = get_option('widget_text');
-
- // Change sidebar names and initialise new sidebars
- $widgets['sidebar-main'] = $widgets['sidebar-1'];
- $widgets['footer-sidebar'] = $widgets['sidebar-2'];
- $widgets['footer-main'] = array();
-
- // Footer blurb
- if ( strlen(trim($options->blurb)) ) {
- $widget_text[] = array( 'title' => '', 'text' => $options->blurb );
- $wt_num = (int) end(array_keys($widget_text));
- $widgets['footer-main'][] = "text-$wt_num";
- }
-
- // Recent articles
- if ( $options->footer_recent ) {
- $widgets['footer-main'][] = 'recent-articles';
- }
-
- // Footer sidebar default
- if ( empty($widgets['footer-sidebar']) ) {
- $widgets['footer-sidebar'] = array('search');
- }
-
- // Main sidebar
- if ( $options->sidebar_type == 'tarski' ) {
- if ( empty($widgets['sidebar-main']) )
- $widgets['sidebar-main'] = array();
-
- // Custom text -> text widget
- if( strlen(trim($options->sidebar_custom)) ) {
- $widget_text[] = array( 'title' => '', 'text' => $options->sidebar_custom );
- $wt_num = (int) end(array_keys($widget_text));
- $widgets['sidebar-main'][] = "text-$wt_num";
- }
-
- // Pages list -> pages widget
- if($options->sidebar_pages) {
- $widgets['sidebar-main'][] = 'pages';
- }
-
- // Links list -> links widget
- if($options->sidebar_links) {
- $widgets['sidebar-main'][] = 'links';
- }
- }
+ // Handle special cases first
+ tarski_upgrade_special($options, $defaults);
- // Unset defunct values
- unset($widgets['sidebar-1'], $widgets['sidebar-2']);
- }
+ // Upgrade old display options to use widgets instead
+ tarski_upgrade_widgets($options, $defaults);
// Conform our options to the expected values, types, and defaults
foreach($options as $name => $value) {
@@ -311,20 +216,17 @@ function tarski_upgrade() {
$options->$name = array($options->$name);
}
}
-
- // Save our upgraded options
- if (version_to_integer($old_version) < 210) {
- update_option('widget_text', $widget_text);
- wp_set_sidebars_widgets($widgets);
- }
- update_option('tarski_options', serialize($options));
+ // Save our upgraded options
+ update_option('tarski_options', $options);
}
/**
* tarski_messages() - Adds messages about Tarski to the WordPress admin panel.
*
* @since 2.1
+ * @hook filter tarski_messages
+ * Filter the messages Tarski prints to the WordPress admin panel.
*/
function tarski_messages() {
$messages = apply_filters('tarski_messages', array());
@@ -349,11 +251,13 @@ function tarski_addmenu() {
* @since 1.0
*/
function tarski_admin() {
- save_tarski_options();
- tarski_update_notifier('options_page');
- $widgets_link = get_bloginfo('wpurl') . '/wp-admin/widgets.php';
- $tarski_options_link = get_bloginfo('wpurl') . '/wp-admin/themes.php?page=tarski-options';
- include(TARSKIDISPLAY . '/options_page.php');
+ if (current_user_can('edit_themes')) {
+ save_tarski_options();
+ tarski_update_notifier('options_page');
+ $widgets_link = admin_url('widgets.php');
+ $tarski_options_link = admin_url('themes.php?page=tarski-options');
+ include(TARSKIDISPLAY . '/options_page.php');
+ }
}
/**
@@ -379,7 +283,11 @@ function tarski_admin_header_style() { ?>
* @since 2.1
*/
function tarski_admin_style() {
- echo '<link rel="stylesheet" href="' . get_bloginfo('template_directory'). '/library/css/admin.css" type="text/css" media="all" />';
+ wp_enqueue_style(
+ 'tarski_admin',
+ get_bloginfo('template_directory') . '/library/css/admin.css',
+ array(), false, 'screen'
+ );
}
/**
@@ -388,7 +296,11 @@ function tarski_admin_style() {
* @since 2.1
*/
function tarski_inject_styles() {
- echo '<link rel="stylesheet" href="' . get_bloginfo('template_directory'). '/library/css/options.css" type="text/css" media="screen" />';
+ wp_enqueue_style(
+ 'tarski_options',
+ get_bloginfo('template_directory') . '/library/css/options.css',
+ array(), false, 'screen'
+ );
}
/**
@@ -397,23 +309,24 @@ function tarski_inject_styles() {
* @since 1.4
*/
function tarski_inject_scripts() {
- $js_dir = get_bloginfo('template_directory') . '/library/js';
- wp_enqueue_script('crir', $js_dir . '/crir.js');
+ $js_dir = get_bloginfo('template_directory') . '/app/js';
+ wp_enqueue_script('page_select', "$js_dir/page_select.js");
+ wp_enqueue_script('crir', "$js_dir/crir.js");
}
/**
- * tarski_count_authors() - Returns the number of authors on a site.
+ * tarski_count_authors() - Returns the number of authors who have published posts.
*
- * This function returns the number of users on a site with a user
- * level of greater than 1, i.e. Authors, Editors and Administrators.
+ * This function returns the number of author ids associated with published posts.
* @since 2.0.3
* @global object $wpdb
* @return integer
*/
function tarski_count_authors() {
global $wpdb;
- $count_users = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->usermeta WHERE `meta_key` = '" . $wpdb->prefix . "user_level' AND `meta_value` > 1");
- return (int) $count_users;
+ return count($wpdb->get_col($wpdb->prepare(
+ "SELECT post_author, COUNT(DISTINCT post_author) FROM $wpdb->posts WHERE post_status = 'publish' GROUP BY post_author"
+ ), 1));
}
/**
@@ -423,6 +336,8 @@ function tarski_count_authors() {
* @see tarski_count_authors()
* @global object $wpdb
* @return boolean
+ * @hook filter tarski_show_authors
+ * Allows other components to decide whether or not Tarski should show authors.
*/
function tarski_should_show_authors() {
$show_authors = tarski_count_authors() > 1;
@@ -443,4 +358,98 @@ function tarski_resave_show_authors() {
}
}
+/**
+ * tarski_navbar_select() - Generates a list of checkboxes for the site's pages.
+ *
+ * Walks the tree of pages and generates nested ordered lists of pages, with
+ * corresponding checkboxes to allow the selection of pages for the navbar.
+ * @since 2.2
+ * @param array $pages
+ * @param array $selected
+ */
+function tarski_navbar_select($pages) {
+ $nav_pages = explode(',', get_tarski_option('nav_pages'));
+ $collapsed_pages = explode(',', get_tarski_option('collapsed_pages'));
+ $walker = new WalkerPageSelect($nav_pages, $collapsed_pages);
+ $return = '';
+
+ if ( !empty($pages) ) {
+ $return = "<ol id=\"navbar-select\">\n" . $walker->walk($pages, 0, 0, array()) . "\n</ol>\n\n";
+ }
+
+ return $return;
+}
+
+/**
+ * tarski_update_notifier() - Performs version checks and outputs the update notifier.
+ *
+ * Creates a new Version object, checks the latest and current
+ * versions, and lets the user know whether or not their version
+ * of Tarski needs updating. The way it displays varies slightly
+ * between the WordPress Dashboard and the Tarski Options page.
+ * @since 2.0
+ * @param string $location
+ * @return string
+ */
+function tarski_update_notifier($messages) {
+ global $plugin_page;
+
+ if ( !is_array($messages) )
+ $messages = array();
+
+ $version = new Version;
+ $version->current_version_number();
+ $svn_link = 'http://tarskitheme.com/help/updates/svn/';
+
+ // Update checking only performed when remote files can be accessed
+ if ( can_get_remote() ) {
+
+ // Only performs the update check when notification is enabled
+ if ( get_tarski_option('update_notification') ) {
+ $version->latest_version_number();
+ $version->latest_version_link();
+ $version->version_status();
+
+ if ( $version->status == 'older' ) {
+ $messages[] = sprintf(
+ __('A new version of the Tarski theme, version %1$s %2$s. Your installed version is %3$s.','tarski'),
+ "<strong>$version->latest</strong>",
+ '<a href="' . $version->latest_link . '">' . __('is now available','tarski') . '</a>',
+ "<strong>$version->current</strong>"
+ );
+ } elseif ( $plugin_page == 'tarski-options' ) {
+ switch($version->status) {
+ case 'current':
+ $messages[] = sprintf(
+ __('Your version of Tarski (%s) is up to date.','tarski'),
+ "<strong>$version->current</strong>"
+ );
+ break;
+ case 'newer':
+ $messages[] = sprintf(
+ __('You appear to be running a development version of Tarski (%1$s). Please ensure you %2$s.','tarski'),
+ "<strong>$version->current</strong>",
+ "<a href=\"$svn_link\">" . __('stay updated','tarski') . '</a>'
+ );
+ break;
+ case 'no_connection':
+ case 'error':
+ $messages[] = sprintf(
+ __('No connection to update server. Your installed version is %s.','tarski'),
+ "<strong>$version->current</strong>"
+ );
+ break;
+ }
+ }
+ } elseif ( $plugin_page == 'tarski-options' ) {
+ $messages[] = sprintf(
+ __('Update notification for Tarski is disabled. Your installed version is %s.','tarski'),
+ "<strong>$version->current</strong>"
+ );
+ }
+ }
+
+ return $messages;
+}
+
?>
\ No newline at end of file
wp-content/themes/tarski/library/helpers/admin_helper.php
@@ -98,22 +98,6 @@ function tarski_posts_nav_link() {
}
/**
- * tarski_date() - Tweaked WordPress date function that shows up on every post.
- *
- * The WP function the_date only shows up on the first post
- * of that day. This one displays on every post, regardless
- * of how many posts are made that day.
- * @since 1.2.2
- * @global object $post
- * @return string
- */
-function tarski_date() {
- global $post;
- $date = mysql2date(get_option('date_format'), $post->post_date);
- return apply_filters('tarski_date', $date);
-}
-
-/**
* tarski_post_categories_link() - Outputs post categories
*
* Categories list is nicely wrapped for potential DOM interactions
@@ -171,6 +155,8 @@ function tarski_asides_permalink_text() {
* Makes the comment date and time output more translateable.
* @since 2.0
* @return string
+ * @hook filter tarski_comment_datetime
+ * Filters the date and time printed with a comment.
*/
function tarski_comment_datetime() {
$datetime = sprintf(
@@ -215,7 +201,10 @@ function tidy_avatars($avatar, $id_or_email, $size, $default) {
$url = get_comment_author_url();
$author_alt = sprintf( __('%s’s avatar'), get_comment_author() );
$avatar = preg_replace("/height='[\d]+' width='[\d]+'/", '', $avatar);
- $avatar = preg_replace("/'/", '"', $avatar);
+
+ if ( !is_admin() )
+ $avatar = preg_replace("/'/", '"', $avatar);
+
$avatar = preg_replace('/alt=""/', "alt=\"$author_alt\"", $avatar);
return $avatar;
@@ -229,7 +218,12 @@ function tidy_avatars($avatar, $id_or_email, $size, $default) {
* @return string
*/
function tarski_avatar() {
- $avatar = get_avatar(get_comment_author_email(), '50', apply_filters('tarski_avatar', get_bloginfo('template_directory') . '/images/avatar.png'));
+ if ( get_option('avatar_default') == '' )
+ $default = get_bloginfo('template_directory') . '/images/avatar.png';
+ else
+ $default = '';
+
+ $avatar = get_avatar(get_comment_author_email(), '50', $default);
$url = get_comment_author_url();
if ( empty($url) || preg_match('/^\s*http:\/\/\s*$/', $url) ) {
@@ -240,6 +234,19 @@ function tarski_avatar() {
}
/**
+ * tarski_default_avatar() - Make Tarski avatar selectable.
+ *
+ * Adds the Tarski avatar to the Discussion options page, allowing it to be selected
+ * but also allowing users to choose other avatars.
+ * @return string
+ */
+function tarski_default_avatar($avatar_defaults) {
+ $tarski_avatar = get_bloginfo('template_directory') . '/images/avatar.png';
+ $avatar_defaults[$tarski_avatar] = 'Tarski';
+ return $avatar_defaults;
+}
+
+/**
* tarski_comment_author_link() - Returns a comment author's name, wrapped in a link if present.
*
* It also includes hCard microformat markup.
@@ -247,6 +254,10 @@ function tarski_avatar() {
* @since 2.0
* @global object $comment
* @return string
+ * @hook filter get_comment_author_link
+ * Native WordPress filter on comment author links.
+ * @hook filter tarski_comment_author_link
+ * Tarski-specific filter on comment author links.
*/
function tarski_comment_author_link() {
global $comment;
@@ -272,67 +283,12 @@ function tarski_comment_author_link() {
}
/**
- * tarski_excerpt() - Excerpts a la Tarski.
- *
- * Code shamelessly borrowed from Kaf Oseo's 'the_excerpt Reloaded' plugin.
- * @link http://guff.szub.net/2005/02/26/the-excerpt-reloaded/
- * @since 1.2.1
- * @param $return boolean
- * @param string $excerpt_length
- * @return string
- */
-function tarski_excerpt($return = false, $excerpt_length = 35) {
- global $post;
-
- if(!empty($post->post_password)) { // if there's a password
- if ($_COOKIE['wp-postpass_' . COOKIEHASH] != $post->post_password) { // and it doesn't match cookie
- $output = get_the_password_form();
- }
- if($return) {
- return $output;
- } else {
- echo $output;
- return;
- }
- }
-
- if(!($text = $post->post_excerpt))
- $text = $post->post_content;
-
- if($excerpt_length < 0) {
- $output = $text;
- } else {
- str_replace('<!--more-->', '', $text);
- $text = explode(' ', $text);
- if(count($text) > $excerpt_length) {
- $l = $excerpt_length;
- $ellipsis = '…';
- } else {
- $l = count($text);
- $ellipsis = false;
- }
- for ($i = 0; $i < $l; $i++)
- $output .= $text[$i] . ' ';
- }
-
- $output = rtrim($output, " \n\t\r\0\x0B");
- $output = strip_tags($output);
- $output .= $ellipsis;
- $output = apply_filters('get_the_excerpt', $output);
- $output = apply_filters('the_excerpt', $output);
- $output = apply_filters('tarski_excerpt', $output);
-
- if($return)
- return $output;
- else
- echo $output;
-}
-
-/**
* tarski_404_content() - Outputs default text for 404 error pages.
*
* @since 1.5
* @return string
+ * @hook filter th_404_content
+ * Allows users to change their 404 page messages via a plugin.
*/
function tarski_404_content() {
$content = sprintf(
wp-content/themes/tarski/library/helpers/content_helper.php
@@ -22,7 +22,7 @@ function wrap_values_in_element($array, $element) {
}
/**
- * implode_proper() - Implodes an array and provides a proper final connective
+ * implode_proper() - Implodes an array and adds a final conjuction.
*
* Given the array <code>array('John', 'Paul', 'George', 'Ringo')</code> it will
* return the string <code>'John, Paul, George and Ringo'</code>.
@@ -32,18 +32,23 @@ function wrap_values_in_element($array, $element) {
* @param $last_connective string
* @return string
*/
-function implode_proper($array, $glue = ', ', $last_connective = 'and') {
- if( !check_input($array, 'array') || count($array) == 0 )
+function implode_proper($array, $glue = NULL, $last_connective = NULL) {
+ if ( !check_input($array, 'array') || count($array) == 0 )
return;
+ if ($glue == NULL)
+ $glue = __(', ', 'tarski');
+
+ if ($last_connective == NULL)
+ $last_connective = __('and', 'tarski');
+
$last_value = array_pop($array);
- if( count($array) )
+ if ( count($array) )
$output = implode($glue, $array) . " $last_connective $last_value";
else
$output = $last_value;
- $output = apply_filters('implode_proper', $output);
return $output;
}
@@ -52,69 +57,58 @@ function implode_proper($array, $glue = ', ', $last_connective = 'and') {
*
* Tag intersections and unions currently don't have a simple, single template
* function. This provides one.
+ *
+ * @example multiple_tag_titles('<em>%s</em>') will wrap every printed tag in
+ * an HTML emphasis element.
* @since 2.0
* @global $wpdb object
- * @param $tag_wrapper string
+ * @param $format string
* @return string
+ * @hook filter multiple_tag_titles
+ * Filter the value returned when generating the title of multiple (union or
+ * intersection) tag archive page.
*/
-function multiple_tag_titles($tag_wrapper = '') {
+if ( !function_exists('multiple_tag_titles') ) {
+function multiple_tag_titles($format = '') {
global $wpdb;
if ( !is_tag() )
return;
+ if ( $tag_slugs = get_query_var('tag_slug__and') )
+ $connective = __('and');
+ elseif ( $tag_slugs = get_query_var('tag_slug__in') )
+ $connective = __('or');
+ else
+ $single_tag = intval( get_query_var('tag_id') );
- // Start horrible hack
- $tag_slugs = array();
- if( $tag_slugs = get_query_var('tag_slug__and') ) {
- $connective = __('and','tarski');
- } elseif( $tag_slugs = get_query_var('tag_slug__in') ) {
- $connective = __('or','tarski');
- } elseif( $single_tag = get_query_var('tag_id') ) {
- $tag_ids = array($single_tag);
- } else {
- return;
- }
-
- if($tag_slugs) {
- foreach ($tag_slugs as $tag_slug) {
- $tag_ids[] = $wpdb->get_var("SELECT term_id FROM $wpdb->terms WHERE slug = \"$tag_slug\"");
+ $tags = array();
+ if ( $tag_slugs ) {
+ foreach ( $tag_slugs as $tag_slug ) {
+ $tag = get_term_by('slug', $tag_slug, 'post_tag', OBJECT, 'display');
+ if ( !is_wp_error($tag) && !empty($tag->name) )
+ $tags[] = $tag->name;
}
- }
- // End horrible hack
-
-
- /*
- // This doesn't work; tag__and and tag__in are empty for tag intersections and unions
- $tag_ids = array();
-
- if( $tag_ids = get_query_var('tag__and') ) {
- $connective = __('and','tarski');
- } elseif( $tag_ids = get_query_var('tag__in') ) {
- $connective = __('or','tarski');
- } elseif( $single_tag = get_query_var('tag_id') ) {
- $tag_ids = array($single_tag);
- } else {
- return;
- }
- */
-
- foreach ( $tag_ids as $tag_id ) {
- $tag = &get_term($tag_id, 'post_tag', OBJECT, 'display');
- if ( empty($tag) || is_wp_error($tag) )
- continue;
+ } elseif ( $single_tag ) {
+ $tag = &get_term($single_tag, 'post_tag', OBJECT, 'display');
+ if ( is_wp_error($tag) || empty($tag->name) )
+ return false;
else
$tags[] = $tag->name;
+ } else {
+ return;
}
- if ( $tag_wrapper )
- $tags = wrap_values_in_element($tags, $tag_wrapper);
-
- $tags = implode_proper($tags, ', ', $connective);
+ if ( strlen($format) > 0 ) {
+ foreach ( $tags as $index => $tag )
+ $tags[$index] = sprintf($format, $tag);
+ }
+
+ $tags = implode_proper($tags, __(', ', 'tarski'), $connective);
$tags = apply_filters('multiple_tag_titles', $tags);
-
return $tags;
}
+}
/**
* add_post_tags() - Appends tags to posts.
@@ -123,7 +117,7 @@ function multiple_tag_titles($tag_wrapper = '') {
* @return string
*/
function add_post_tags() {
- if(is_single() || (get_tarski_option('tags_everywhere')) && !in_category(get_tarski_option('asidescategory'))) {
+ if (is_single() || (get_tarski_option('tags_everywhere') && !in_category(get_tarski_option('asidescategory')))) {
the_tags('<p class="tagdata"><strong>'. __('Tags','tarski'). ':</strong> ', ', ', '</p>'."\n");
}
}
wp-content/themes/tarski/library/helpers/tag_helper.php
@@ -16,6 +16,20 @@ function is_wp_front_page() {
}
/**
+ * only_paginate_home() - Turns off paging for everything except feeds and the home page.
+ *
+ * @since 2.2
+ * @param object $query
+ */
+function only_paginate_home($query) {
+ if ( !get_tarski_option('use_pages') && !is_admin() ) {
+ if ( !is_home() && !is_feed() && '' === $query->get('nopaging') ) {
+ $query->set('nopaging', 1);
+ }
+ }
+}
+
+/**
* tarski_doctitle() - Returns the document title.
*
* The order (site name first or last) can be set on the Tarski Options page.
@@ -25,6 +39,8 @@ function is_wp_front_page() {
* @since 1.5
* @param string $sep
* @return string $doctitle
+ * @hook filter tarski_doctitle
+ * Filter document titles.
*/
function tarski_doctitle($sep = '·') {
$site_name = get_bloginfo('name');
@@ -173,6 +189,8 @@ function tarski_headerimage() {
* wrapped in a p (paragraph) element.
* @since 1.5
* @return string
+ * @hook filter tarski_sitetitle
+ * Filter site title.
*/
function tarski_sitetitle() {
if(get_tarski_option('display_title')) {
@@ -203,6 +221,8 @@ function tarski_sitetitle() {
*
* @since 1.5
* @return string
+ * @hook filter tarski_tagline
+ * Filter site tagline.
*/
function tarski_tagline() {
if((get_tarski_option('display_tagline') && get_bloginfo('description')))
@@ -262,6 +282,8 @@ function home_link_name() {
* @param boolean $return
* @global object $wpdb
* @return string $navbar
+ * @hook filter tarski_navbar
+ * Filter the HTML generated for the navbar.
*/
function tarski_navbar($return = false) {
global $wpdb;
@@ -374,7 +396,7 @@ function add_admin_link($navbar) {
if(is_user_logged_in())
$navbar['admin'] = sprintf(
'<li><a id="nav-admin" href="%1$s">%2$s</a></li>',
- get_option('siteurl') . '/wp-admin/',
+ admin_url(),
__('Site Admin','tarski')
);
@@ -419,6 +441,8 @@ function tarski_feedlink() {
* @since 1.2
* @param boolean $return
* @return string $classes
+ * @hook filter tarski_bodyclass
+ * Filter the classes applied to the document body by Tarski.
*/
function tarski_bodyclass($return = false) {
if(get_tarski_option('centred_theme')) { // Centred or not
@@ -459,6 +483,8 @@ function tarski_bodyclass($return = false) {
* @global object $post
* @global object $wp_query
* @return string $body_id
+ * @hook filter tarski_bodyid
+ * Filter the document id value.
*/
function tarski_bodyid($return = false) {
global $post, $wp_query;
wp-content/themes/tarski/library/helpers/template_helper.php
@@ -58,78 +58,15 @@ function tarski_widget_text_wrapper($text) {
}
/**
- * tarski_sidebar_links() - Returns an array for use with wp_list_bookmarks().
+ * tarski_widget_links_args() - Removes navbar links from the links widget.
*
- * If a link category has been selected as external links in the navbar,
- * it will be excluded from this array. Because wp_list_bookmarks() has no way
- * to exclude categories, this function is inefficient. This core patch
- * {@link http://trac.wordpress.org/ticket/6808} would allow a substantially
- * simpler function with one less database call.
- * @link http://trac.wordpress.org/ticket/6808
- * @since 2.0
- * @return array $options
- */
-function tarski_sidebar_links() {
- $link_cat_args = array(
- 'orderby' => 'term_id',
- 'exclude' => get_tarski_option('nav_extlinkcat'),
- 'hierarchical'=> 0
- );
-
- $link_categories = &get_terms('link_category', $link_cat_args);
-
- foreach($link_categories as $link_cat)
- $link_cats[] = $link_cat->term_id;
-
- $link_cats = implode(',', $link_cats);
-
- $options = array(
- 'category' => $link_cats,
- 'category_before' => '',
- 'category_after' => '',
- 'title_before' => '<h3>',
- 'title_after' => '</h3>',
- 'show_images' => 0,
- 'show_description' => 0,
- );
-
- $options = apply_filters('tarski_sidebar_links', $options);
- return $options;
-}
-
-/**
- * tarski_widget_links() - Tarski links widget.
- *
- * Doesn't display links from the category being used in the navbar,
- * if one is set.
- * @since 2.1
- * @see wp_widget_links()
+ * @since 2.2
* @param array $args
- * @return string
- */
-function tarski_widget_links($args) {
- extract($args, EXTR_SKIP);
- wp_list_bookmarks(array_merge(tarski_sidebar_links(), array('category_before' => $before_widget, 'category_after' => $after_widget)));
-}
-
-/**
- * tarski_widget_search() - Replaces the default search widget.
- *
- * Hopefully temporary, a patch has been proposed for WP 2.6
- * which does the same thing.
- * @since 2.1
- * @link http://trac.wordpress.org/ticket/5567
+ * @return array
*/
-function tarski_widget_search($args) {
- extract($args, EXTR_SKIP);
- $searchform_template = get_template_directory() . '/searchform.php';
-
- if ( !file_exists($searchform_template) )
- $searchform_template = get_theme_root() . '/default/searchform.php';
-
- echo $before_widget;
- include_once($searchform_template);
- echo $after_widget;
+function tarski_widget_links_args($args) {
+ $args['exclude_category'] = get_tarski_option('nav_extlinkcat');
+ return $args;
}
/**
@@ -176,11 +113,11 @@ function tarski_recent_entries($args) {
<li>
<h4 class="recent-title"><a title="<?php _e('View this post', 'tarski'); ?>" href="<?php the_permalink(); ?>"><?php the_title() ?></a></h4>
<p class="recent-metadata"><?php
- echo tarski_date();
+ echo the_time(get_option('date_format'));
if(!get_tarski_option('hide_categories')) {
_e(' in ', 'tarski'); the_category(', ');
} ?></p>
- <div class="recent-excerpt content"><?php tarski_excerpt(); ?></div>
+ <div class="recent-excerpt content"><?php the_excerpt(); ?></div>
</li>
<?php endwhile; ?>
</ul>
wp-content/themes/tarski/library/helpers/widgets.php
@@ -21,7 +21,15 @@ get_header(); ?>
</div> <!-- /content -->
<?php } ?>
<div class="bookmarks">
- <?php wp_list_bookmarks(tarski_sidebar_links()); ?>
+ <?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> <!-- /bookmarks -->
<?php th_postend(); ?>
wp-content/themes/tarski/links.php
@@ -1,5 +1,3 @@
-<?php if(!is_home() && !get_tarski_option('use_pages')) { $posts = query_posts($query_string . '&nopaging=1'); } ?>
-
<?php while(have_posts()) { the_post(); ?>
<?php if(get_tarski_option('asidescategory') && in_category(get_tarski_option('asidescategory'))) { // Aside loop ?>
@@ -8,7 +6,7 @@
<div class="content entry-content"><?php the_content(__('Read the rest of this entry »','tarski')); ?></div>
- <p class="meta"><span class="date updated"><?php echo tarski_date(); ?></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>
+ <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(); ?>
@@ -22,7 +20,7 @@
<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">'. tarski_date(). '</span>';
+ <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();
wp-content/themes/tarski/loop.php
wp-content/themes/tarski/screenshot.png
@@ -3,9 +3,9 @@ Theme Name: Tarski
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/
+Author URI: http://tarskitheme.com/about/
Tags: white, custom header, fixed width, two columns, widgets, API, options page, update notifier
-Version: 2.1.4
+Version: 2.3
.
Released under the <a href="http://www.opensource.org/licenses/gpl-license.php">GPL</a>.
.
@@ -89,7 +89,7 @@ body.rtl #navigation ul.primary { direction: ltr; }
sub { vertical-align: sub; }
hr { width: 100%; height: 1px; background: #ccc; color: #ccc; margin: 1em 0; border: none; padding: 0; }
pre, code { font-family: Courier, "Courier New", monospace; font-size: 1em; }
- pre { overflow: scroll; margin: 0 0 1em 0; padding: 0 0 0.5em 0; }
+ pre { overflow: scroll; margin: 0 0 1em 0; padding: 0 0 0.5em 0; white-space: pre-wrap; }
body .primary pre { width: 500px; }
body .secondary pre { width: 200px; }
code { color: #7ca653; }
@@ -151,10 +151,18 @@ body.rtl #navigation ul.primary { direction: ltr; }
a img { border: 1px solid #006a80; }
a:hover img, body .comment a:hover .avatar { border: 1px solid #a8001c; }
#wrapper .gallery a:link, #wrapper .gallery-item a:visited, #wrapper .gallery-item a:hover, #wrapper .gallery-item a:active, #wrapper a.imagelink2 img, #wrapper a.imagelink2:hover img, #wrapper a.imagelink:link, #wrapper a.imagelink:visited, #wrapper a.imagelink:hover, #wrapper a.imagelink:active, #wrapper a.imagelink2:link, #wrapper a.imagelink2:visited, #wrapper a.imagelink2:hover, #wrapper a.imagelink2:active { border: none; }
- body .imageleft { float: left; margin: 0 10px 10px 0; }
- body .imageright { float: right; margin: 0 0 10px 10px; }
+ body .imageleft, body .alignleft { float: left; margin: 0 10px 10px 0; }
+ body .imageright, body .alignright { float: right; margin: 0 0 10px 10px; }
body .imageblock { display: block; margin: 0 0 1em 0; }
- body .imagecentre, body .imagecenter { display: block; text-align: center; margin: 0 auto 1em auto; }
+ body .imagecentre, body .imagecenter, body .centered, body .aligncenter { display: block; text-align: center; margin: 0 auto 1em auto; }
+
+ body .gallery { margin: 0 auto 1em 0; }
+ body .gallery-item { float: left; margin-top: 10px; text-align: center; }
+ body #wrapper .content .gallery-item a, body #wrapper .content .attachment a { border-bottom:none; }
+ body .gallery-caption { margin-left: 0; }
+
+
+
/* Tags & Tags page
--------------------------------------- */
@@ -233,6 +241,7 @@ input, select, textarea { font-family: Verdana, Helvetica, Arial, sans-serif; fo
body .searchbox { width: 200px; margin: 0 0 1em 0; }
#s { display: block; width: 194px; margin: 0 0 0.6em 0; border: 1px solid #ccc; padding: 2px; background: #fafafa; color: #404040; }
#s:focus { background: #fff; }
+ body.js #searchlabel { display: none; }
/* Comment form
--------------------------------------- */
@@ -287,30 +296,3 @@ body .widget { margin: 0 0 2em 0; }
body .widget_calendar tfoot td { font-family: 'Times New Roman', Times, Georgia, serif; font-size: 1.5em; }
body .widget_calendar #prev { text-align: left; }
body .widget_calendar #next { text-align: right; }
-
-/*Add default wordpress align*/
- img.centered {
- display: block;
- margin-left: auto;
- margin-right: auto;
- }
-
- img.alignright {
- padding: 4px;
- margin: 0 0 2px 7px;
- display: inline;
- }
-
- img.alignleft {
- padding: 4px;
- margin: 0 7px 2px 0;
- display: inline;
- }
-
- .alignright {
- float: right;
- }
-
- .alignleft {
- float: left
- }
\ No newline at end of file
wp-content/themes/tarski/style.css
@@ -1,53 +1,54 @@
-/*
-polar.css
-'Polar' style for the Tarski theme - http://tarskitheme.com/
-Designed by Benedict Eastaugh, http://extralogical.net/
-*/
-
-
-/* Navigation
------------------------------------------------ */
-body.polar #wrapper .nav-current:link, body.polar #wrapper .nav-current:visited, body.polar #wrapper .nav-current:active { color: #a8a8a8; }
-body.polar #wrapper .nav-current:hover { color: #000; }
-
-/* Content
------------------------------------------------ */
-body.polar code { color: #8fafbf; }
-body.polar abbr, body.polar acronym { border-bottom: 1px solid #5c8499; }
-
- /* Headers
- --------------------------------------- */
- body.polar h3 { color: #a8a8a8; }
-
- /* Post content
- --------------------------------------- */
- body.polar .articlenav { background: #fff; }
-
- /* Inserts
- --------------------------------------- */
- body.polar .insert { background: #fff; margin: 0 0 1em 0; border: 1px solid #cfdee5; padding: 9px; }
- body.polar .insert h3 { border-bottom: 1px solid #cfdee5; }
-
- /* Downloads
- --------------------------------------- */
- body.polar .content a.download:link, body.polar .content a.download:visited, body.polar .content a.download:active { background-color: #fafcfc; border: 1px solid #cfdee5; }
-
- /* Images
- --------------------------------------- */
- body.polar img { border: 0px; }
-
-/* Links
------------------------------------------------ */
-body.polar a:link, body.polar a:active, body.polar a:visited { color: #4c8099; }
-body.polar a:hover { color: #000; }
-
-body.polar .content a:link, body.polar .content a:active, body.polar .content a:visited, body.polar .link-pages a:link, body .link-pages a:active, body .link-pages a:visited, body .tagdata a:link, body.polar .tagdata a:active, body.polar .tagdata a:visited, body.polar .widget_tag_cloud a:link, body.polar .widget_tag_cloud a:active, body.polar .widget_tag_cloud a:visited { border-bottom: 1px solid #ccc; }
-body.polar .content a:hover, body.polar .link-pages a:hover, body.polar .tagdata a:hover, body.polar .widget_tag_cloud a:hover { border-bottom: 1px solid #000; }
-
-/* Widgets
------------------------------------------------ */
-
- /* Calendar widget
- ------------------------------------------- */
- body.polar .widget_calendar tbody td a { color: #fff; background: #8bb6cc; }
- body.polar .widget_calendar tbody td a:hover { color: #fff; background: #404040; }
+/*
+polar.css
+'Polar' style for the Tarski theme - http://tarskitheme.com/
+Designed by Benedict Eastaugh, http://extralogical.net/
+*/
+
+
+/* Navigation
+----------------------------------------------- */
+body.polar #wrapper .nav-current:link, body.polar #wrapper .nav-current:visited, body.polar #wrapper .nav-current:active { color: #a8a8a8; }
+body.polar #wrapper .nav-current:hover { color: #000; }
+
+/* Content
+----------------------------------------------- */
+body.polar code { color: #8fafbf; }
+body.polar abbr, body.polar acronym { border-bottom: 1px solid #5c8499; }
+
+ /* Headers
+ --------------------------------------- */
+ body.polar h3 { color: #a8a8a8; }
+
+ /* Post content
+ --------------------------------------- */
+ body.polar .articlenav { background: #fff; }
+
+ /* Inserts
+ --------------------------------------- */
+ body.polar .insert { background: #fff; margin: 0 0 1em 0; border: 1px solid #cfdee5; padding: 9px; }
+ body.polar .insert h3 { border-bottom: 1px solid #cfdee5; }
+
+ /* Downloads
+ --------------------------------------- */
+ body.polar .content a.download:link, body.polar .content a.download:visited, body.polar .content a.download:active { background-color: #fafcfc; border: 1px solid #cfdee5; }
+
+ /* Images
+ --------------------------------------- */
+ body.polar a img { border: 1px solid #4c8099; }
+ body.polar a:hover img, body.polar .comment a:hover .avatar { border: 1px solid #000; }
+
+/* Links
+----------------------------------------------- */
+body.polar a:link, body.polar a:active, body.polar a:visited { color: #4c8099; }
+body.polar a:hover { color: #000; }
+
+body.polar .content a:link, body.polar .content a:active, body.polar .content a:visited, body.polar .link-pages a:link, body .link-pages a:active, body .link-pages a:visited, body .tagdata a:link, body.polar .tagdata a:active, body.polar .tagdata a:visited, body.polar .widget_tag_cloud a:link, body.polar .widget_tag_cloud a:active, body.polar .widget_tag_cloud a:visited { border-bottom: 1px solid #ccc; }
+body.polar .content a:hover, body.polar .link-pages a:hover, body.polar .tagdata a:hover, body.polar .widget_tag_cloud a:hover { border-bottom: 1px solid #000; }
+
+/* Widgets
+----------------------------------------------- */
+
+ /* Calendar widget
+ ------------------------------------------- */
+ body.polar .widget_calendar tbody td a { color: #fff; background: #8bb6cc; }
+ body.polar .widget_calendar tbody td a:hover { color: #fff; background: #404040; }
wp-content/themes/tarski/styles/polar.css
53016768969f4ecad1fec54b790f93c794595071
Alexandre Girard
alx.girard@gmail.com
http://github.com/alx/alexgirard.com-blog/commit/be9c8d14be7cc9c366b23be0c9ecc94fe52f016e
be9c8d14be7cc9c366b23be0c9ecc94fe52f016e
2008-08-14T09:51:33-07:00
2008-08-14T09:51:33-07:00
Update tarski to 2.3
e1347d5d496cb557632ce6a21a1718d350f3af55
Alexandre Girard
alx.girard@gmail.com