Replace Tarski navbar with WordPress core menu functionality.

CHANGELOG

@@ -2,8 +2,14 @@
 
 ### Edge
 
+#### Features
+
+  * Replaced Tarski navbar with WordPress core menu functionality.
+
 #### Tweaks
 
+  * Deprecated defunct Tarski navbar functions
+  * Removed all functions deprecated before version 2.7
   * Merged `app/launcher.php` file with `functions.php` file
   * Deprecated `tarski_javascript` function in favour of core functions
   * Renamed `README.md` to `readme.txt` to follow theme guidelines

app/api/deprecated.php

@@ -11,6 +11,198 @@
  * @link http://tarskitheme.com/forum/
  */
 
+/**
+ * home_link_name() - Returns the name for the navbar 'Home' link.
+ *
+ * The option 'home_link_name' can be set in the Tarski Options page;
+ * if it's not set, it defaults to 'Home'.
+ * @since 1.7
+ * @return string
+ */
+function home_link_name() {
+    _deprecated_function(__FUNCTION__, '2.8');
+
+    $default = __('Home','tarski');
+    $option = get_tarski_option('home_link_name');
+    $name = (strlen($option)) ? $option : $default;
+    return $name;
+}
+
+/**
+ * Adds a 'Home' link to the navbar.
+ *
+ * @see tarski_navbar
+ * @uses home_link_name
+ *
+ * @param array $navbar
+ * @return array $navbar
+ */
+function _tarski_navbar_home_link($navbar) {
+    _deprecated_function(__FUNCTION__, '2.8');
+
+    if (!is_array($navbar)) $navbar = array();
+
+    if (get_option('show_on_front') != 'page')
+        $navbar['home'] = sprintf(
+            '<li><a id="nav-home"%1$s href="%2$s" rel="home">%3$s</a></li>',
+            is_home() ? ' class="nav-current"' : '',
+            user_trailingslashit(home_url()),
+            home_link_name());
+
+    return $navbar;
+}
+
+/**
+ * Adds page links to the navbar.
+ *
+ * @see tarski_navbar
+ * @uses get_permalink
+ *
+ * @global object $wpdb
+ * @param array $navbar
+ * @return array $navbar
+ */
+function _tarski_navbar_page_links($navbar) {
+    _deprecated_function(__FUNCTION__, '2.8');
+
+    global $wpdb;
+
+    if (!is_array($navbar)) $navbar = array();
+
+    $pages     = &get_pages('sort_column=post_parent,menu_order');
+    $nav_pages = explode(',', get_tarski_option('nav_pages'));
+
+    if (empty($nav_pages) || empty($pages)) return $navbar;
+
+    foreach ($pages as $page) {
+        if (!in_array($page->ID, $nav_pages)) continue;
+
+        $page_status = _tarski_on_page($page->ID)
+                     ? ' class="nav-current"'
+                     : '';
+
+        $navbar['page-' . $page->ID] = sprintf(
+            '<li><a id="nav-%1$s"%2$s href="%3$s">%4$s</a></li>',
+            $page->ID . '-' . $page->post_name,
+            $page_status,
+            get_permalink($page->ID),
+            htmlspecialchars($page->post_title));
+    }
+
+    return $navbar;
+}
+
+/**
+ * Utility function to determine whether the user is viewing a particular page.
+ *
+ * @see _tarski_navbar_page_links
+ * @uses is_page
+ * @uses is_home
+ *
+ * @param integer
+ * @return boolean
+ */
+function _tarski_on_page($id) {
+    _deprecated_function(__FUNCTION__, '2.8');
+
+    return is_page($id) ||
+           ((get_option('show_on_front') == 'page') &&
+            (get_option('page_for_posts') == $id) &&
+            is_home());
+}
+
+/**
+ * Adds external links to the navbar.
+ *
+ * @since 2.0
+ *
+ * @see tarski_navbar
+ * @uses get_bookmarks
+ *
+ * @param array $navbar
+ * @return array $navbar
+ */
+function add_external_links($navbar) {
+    _deprecated_function(__FUNCTION__, '2.8');
+
+    if (!is_array($navbar)) $navbar = array();
+
+    if (!get_tarski_option('nav_extlinkcat')) return $navbar;
+
+    $extlinks_cat = get_tarski_option('nav_extlinkcat');
+    $extlinks = get_bookmarks("category=$extlinks_cat&orderby=rating");
+    $target = $rel = '';
+    $title  = '';
+    foreach ($extlinks as $link) {
+        if ($link->link_rel)
+            $rel = 'rel="' . $link->link_rel . '" ';
+
+        if ($link->link_target)
+            $target = 'target="' . $link->link_target . '" ';
+
+        if ($link->link_description)
+            $title = 'title="'. $link->link_description . '" ';
+
+        $navbar['link-' . $link->link_id] = sprintf(
+            '<li><a id="nav-link-%1$s" %2$s href="%3$s">%4$s</a></li>',
+            $link->link_id,
+            $rel . $target . $title,
+            $link->link_url,
+            $link->link_name);
+    }
+
+    return $navbar;
+}
+
+/**
+ * Adds a WordPress dashboard link to the Tarski navbar.
+ *
+ * @since 2.0
+ *
+ * @see tarski_navbar
+ * @uses is_user_logged_in
+ * @uses admin_url
+ *
+ * @param array $navbar
+ * @return array $navbar
+ */
+function add_admin_link($navbar) {
+    _deprecated_function(__FUNCTION__, '2.8');
+
+    if (is_user_logged_in())
+        $navbar['admin'] = sprintf(
+            '<li><a id="nav-admin" href="%1$s" title="%3$s">%2$s</a></li>',
+            admin_url(), __('Dashboard &rarr;', 'tarski'),
+            __('View your dashboard', 'tarski'));
+
+    return $navbar;
+}
+
+/**
+ * Wraps the Tarski navbar in an unordered list element.
+ *
+ * Unlike other navbar filters, wrap_navlist doesn't make $navbar an array
+ * if it isn't one, since that would result in it outputting an empty
+ * unordered list. Instead, it simply returns false.
+ *
+ * @since 2.0
+ * @see tarski_navbar
+ * @param string $navbar
+ * @return string $navbar
+ */
+function wrap_navlist($navbar) {
+    _deprecated_function(__FUNCTION__, '2.8');
+
+    if (is_array($navbar)) {
+        array_unshift($navbar, '<ul class="primary xoxo">');
+        array_push($navbar, '</ul>');
+    } else {
+        $navbar = '';
+    }
+
+    return $navbar;
+}
+
 /**
  * Generate script elements linking to Tarski's JavaScript.
  *
@@ -25,9 +217,6 @@
  * @see tarski_stylesheets
  *
  * @return void
- *
- * @hook filter tarski_javascript
- * Filter script elements before they're printed to the document.
  */
 function tarski_javascript() {
     _deprecated_function(__FUNCTION__, '2.8');
@@ -99,9 +288,6 @@ function detectWPMU() {
  *
  * @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) {
     _deprecated_function(__FUNCTION__, '2.8');
@@ -465,8 +651,6 @@ function tarski_admin_style() {
  * 
  * @since 2.1
  * @deprecated 2.4
- * @hook filter tarski_messages
- * Filter the messages Tarski prints to the WordPress admin panel.
  */
 function tarski_messages() {
 	_deprecated_function(__FUNCTION__, '2.4');

functions.php

@@ -162,6 +162,9 @@
 // Automatic feed links
 add_theme_support('automatic-feed-links');
 
+// Register navbar location
+register_nav_menu('tarski_navbar', __('Tarski navbar', 'tarski'));
+
 // Custom background support
 add_custom_background();
 
@@ -202,12 +205,6 @@
 
 add_filter('body_class', 'tarski_body_class');
 
-add_filter('tarski_navbar', '_tarski_navbar_home_link');
-add_filter('tarski_navbar', '_tarski_navbar_page_links');
-add_filter('tarski_navbar', 'add_external_links');
-add_filter('tarski_navbar', 'add_admin_link', 20);
-add_filter('tarski_navbar', 'wrap_navlist', 21);
-
 add_action('th_navbar', 'tarski_navbar');
 add_action('th_navbar', 'tarski_feedlink');
 

header.php

@@ -11,5 +11,5 @@
     <div id="header">
         <?php th_header(); ?>
     </div>
-
+    
     <div id="content" class="clearfix">