From 82cd4c32f6710fa5673eb6c6ce3386decfd255a2 Mon Sep 17 00:00:00 2001 From: Ben Word Date: Sun, 13 Mar 2016 18:06:55 -0400 Subject: [PATCH] Missed during rebase. https://github.com/roots/sage/commit/3f9b112ffa17a62b079b095d82b1ed3a8a5546d8#commitcomment-16669985 --- app/admin.php | 15 --- app/filters.php | 55 ---------- app/helpers.php | 77 -------------- app/lib/Sage/Asset.php | 35 ------- app/lib/Sage/Assets/IManifest.php | 26 ----- app/lib/Sage/Assets/JsonManifest.php | 29 ----- app/lib/Sage/Template.php | 151 --------------------------- app/lib/Sage/Template/IWrapper.php | 27 ----- app/lib/Sage/Template/Wrapper.php | 48 --------- app/setup.php | 96 ----------------- 10 files changed, 559 deletions(-) delete mode 100644 app/admin.php delete mode 100644 app/filters.php delete mode 100644 app/helpers.php delete mode 100644 app/lib/Sage/Asset.php delete mode 100644 app/lib/Sage/Assets/IManifest.php delete mode 100644 app/lib/Sage/Assets/JsonManifest.php delete mode 100644 app/lib/Sage/Template.php delete mode 100644 app/lib/Sage/Template/IWrapper.php delete mode 100644 app/lib/Sage/Template/Wrapper.php delete mode 100644 app/setup.php diff --git a/app/admin.php b/app/admin.php deleted file mode 100644 index 74fa2c480f..0000000000 --- a/app/admin.php +++ /dev/null @@ -1,15 +0,0 @@ -get_setting('blogname')->transport = 'postMessage'; -}); - -/** - * Customizer JS - */ -add_action('customize_preview_init', function () { - wp_enqueue_script('sage/customizer', asset_path('scripts/customizer.js'), ['customize-preview'], null, true); -}); diff --git a/app/filters.php b/app/filters.php deleted file mode 100644 index a631da64db..0000000000 --- a/app/filters.php +++ /dev/null @@ -1,55 +0,0 @@ - classes - */ -add_filter('body_class', function (array $classes) { - // Add page slug if it doesn't exist - if (is_single() || is_page() && !is_front_page()) { - if (!in_array(basename(get_permalink()), $classes)) { - $classes[] = basename(get_permalink()); - } - } - - // Add class if sidebar is active - if (display_sidebar()) { - $classes[] = 'sidebar-primary'; - } - - return $classes; -}); - -/** - * Clean up the_excerpt() - */ -add_filter('excerpt_more', function () { - return ' … ' . __('Continued', 'sage') . ''; -}); - - -/** - * Use Wrapper by default - */ -add_filter('template_include', function ($main) { - if (!is_string($main) || !(string) $main) { - return $main; - } - $main = basename($main, '.php'); - return Template::wrap(new Wrapper($main, 'layouts/base.php'))->locate(); -}, 109); diff --git a/app/helpers.php b/app/helpers.php deleted file mode 100644 index 395744a9b6..0000000000 --- a/app/helpers.php +++ /dev/null @@ -1,77 +0,0 @@ -locate()) { - /** @noinspection PhpIncludeInspection */ - include $file; - } -} - -/** - * @param array $context - */ -function template_sidebar($context = []) { - template_part('sidebar', $context); -} - -/** - * @param $template - * @param array $context - */ -function template_part($template, $context = []) { - if ($file = (new Template($template, $context))->locate()) { - /** @noinspection PhpIncludeInspection */ - include $file; - } -} - -/** - * @param $filename - * @return string - */ -function asset_path($filename) { - static $manifest; - isset($manifest) || $manifest = new JsonManifest(get_template_directory() . '/' . Asset::$dist . '/assets.json'); - return (string) new Asset($filename, $manifest); -} - -/** - * Determine whether to show the sidebar - * @return bool - */ -function display_sidebar() { - static $display; - isset($display) || $display = apply_filters('sage/display_sidebar', true); - return $display; -} - -/** - * Page titles - * @return string - */ -function title() { - if (is_home()) { - if ($home = get_option('page_for_posts', true)) { - return get_the_title($home); - } - return __('Latest Posts', 'sage'); - } - if (is_archive()) { - return get_the_archive_title(); - } - if (is_search()) { - return sprintf(__('Search Results for %s', 'sage'), get_search_query()); - } - if (is_404()) { - return __('Not Found', 'sage'); - } - return get_the_title(); -} diff --git a/app/lib/Sage/Asset.php b/app/lib/Sage/Asset.php deleted file mode 100644 index fd47a7bfa1..0000000000 --- a/app/lib/Sage/Asset.php +++ /dev/null @@ -1,35 +0,0 @@ -manifest = $manifest; - $this->asset = basename($file); - $this->dir = dirname($file) != '.' ? dirname($file) : ''; - } - - public function __toString() { - return $this->getUri(); - } - - public function getUri() { - $file = self::$dist . '/' . $this->dir . '/' . ($this->manifest ? $this->manifest->get($this->asset) : $this->asset); - return get_template_directory_uri() . $file; - } -} diff --git a/app/lib/Sage/Assets/IManifest.php b/app/lib/Sage/Assets/IManifest.php deleted file mode 100644 index 62b5134261..0000000000 --- a/app/lib/Sage/Assets/IManifest.php +++ /dev/null @@ -1,26 +0,0 @@ -manifest = file_exists($manifestPath) ? json_decode(file_get_contents($manifestPath), true) : []; - } - - /** @inheritdoc */ - public function get($file) { - return isset($this->manifest[$file]) ? $this->manifest[$file] : $file; - } - - /** @inheritdoc */ - public function getAll() { - return $this->manifest; - } -} diff --git a/app/lib/Sage/Template.php b/app/lib/Sage/Template.php deleted file mode 100644 index 3655e76e44..0000000000 --- a/app/lib/Sage/Template.php +++ /dev/null @@ -1,151 +0,0 @@ -getSlug()] = $wrapper; - return new static($wrapper->getWrappers(), $context); - } - - /** - * @param string $slug - * @param array $context - * @return static - */ - public static function unwrap($slug = '', $context = []) { - if (!$slug) { - // If no slug is specified, we grab the most recently wrapped item - end(self::$wrappers); - $slug = key(self::$wrappers); - } - return new static(self::$wrappers[$slug]->getTemplate(), $context); - } - - /** - * Converts a delimeted template file into an array of parts - * - * Example: - * Template::getConvertedTemplateParts('content-single-audio.php'); - * => ['content-single-audio.php', 'content-single.php', 'content.php'] - * - * The returned value can then be passed to WordPress's locate_template. - * - * @param string $template - * @param string $delimeter - * @return array - */ - public static function convertParts($template, $delimeter = '-') { - $templateParts = explode($delimeter, str_replace('.php', '', (string) $template)); - $templates[] = array_shift($templateParts); - foreach ($templateParts as $i => $templatePart) { - $templates[] = $templates[$i] . $delimeter . $templatePart; - } - return array_reverse($templates); - } - - /** - * Template constructor - * @param string|string[] $template - * @param array $context - */ - public function __construct($template, array $context = []) { - $this->set($template); - $this->context = $context; - } - - /** - * @return string HTML - * @see get - */ - public function __toString() { - return $this->get(); - } - - /** - * Echoes the output HTML - * @see get - */ - public function render() { - echo $this->get(); - } - - /** - * @return string HTML - * @SuppressWarnings(PHPMD.UnusedLocalVariable) - */ - public function get() { - /** @noinspection PhpUnusedLocalVariableInspection $context is passed to the included template */ - $context = $this->context; - extract($this->context); - ob_start(); - if ($template = $this->locate()) { - /** @noinspection PhpIncludeInspection */ - include $template; - } - $this->html = ob_get_clean() ?: ''; - return $this->html; - } - - /** - * @param string[]|string $template - */ - public function set($template) { - if (is_array($template)) { - $this->templates = self::format($template); - return; - } - if (!is_string($template) || !(string) $template) { - return; - } - // At this point, we assume it's something like `content-single.php` or `content-single-audio.php` - $this->templates = self::format(self::convertParts($template)); - } - - /** - * Ensures that each template in $this->templates is appended with `.php` - * @param $templates - * @return array - */ - protected static function format($templates) { - return array_map(function ($template) { - if (substr($template, -4, 4) === '.php') { - return $template; - } - return $template . '.php'; - }, $templates); - } - - /** - * @param string $templateDir Specify a template directory relative to your theme directory; e.g., `templates/`, `templates/partials/`, `woocommerce/` - * @return string Filename - */ - public function locate($templateDir = '') { - $templates = array_map(function ($template) use ($templateDir) { - return ($templateDir ?: self::$root) . $template; - }, $this->templates); - $template = locate_template($templates); - return apply_filters('sage/locate_template', $template, $templates) ?: $template; - } -} diff --git a/app/lib/Sage/Template/IWrapper.php b/app/lib/Sage/Template/IWrapper.php deleted file mode 100644 index d785988788..0000000000 --- a/app/lib/Sage/Template/IWrapper.php +++ /dev/null @@ -1,27 +0,0 @@ -slug = sanitize_title(basename($base, '.php')); - $this->wrappers = [$base]; - $this->template = $templateSlug; - $str = substr($base, 0, -4); - array_unshift($this->wrappers, sprintf($str . '-%s.php', $templateSlug)); - } - - /** {@inheritdoc} */ - public function getWrappers() { - $this->wrappers = apply_filters('sage/wrap_' . $this->slug, $this->wrappers) ?: $this->wrappers; - return $this->wrappers; - } - - /** {@inheritdoc} */ - public function getSlug() { - return $this->slug; - } - - /** {@inheritdoc} */ - public function getTemplate() - { - return $this->template; - } -} diff --git a/app/setup.php b/app/setup.php deleted file mode 100644 index 1127939e41..0000000000 --- a/app/setup.php +++ /dev/null @@ -1,96 +0,0 @@ - __('Primary Navigation', 'sage') - ]); - - /** - * Enable post thumbnails - * @link http://codex.wordpress.org/Post_Thumbnails - * @link http://codex.wordpress.org/Function_Reference/set_post_thumbnail_size - * @link http://codex.wordpress.org/Function_Reference/add_image_size - */ - add_theme_support('post-thumbnails'); - - /** - * Enable post formats - * @link http://codex.wordpress.org/Post_Formats - */ - add_theme_support('post-formats', ['aside', 'gallery', 'link', 'image', 'quote', 'video', 'audio']); - - /** - * Enable HTML5 markup support - * @link http://codex.wordpress.org/Function_Reference/add_theme_support#HTML5 - */ - add_theme_support('html5', ['caption', 'comment-form', 'comment-list', 'gallery', 'search-form']); - - /** - * Use main stylesheet for visual editor - * @see /assets/styles/layouts/_tinymce.scss - */ - add_editor_style(asset_path('styles/main.css')); -}); - -/** - * Register sidebars - */ -add_action('widgets_init', function () { - $config = function ($name, $id = '') { - return [ - 'name' => __($name, 'sage'), - 'id' => 'sidebar-' . $id ?: sanitize_title($name), - 'before_widget' => '
', - 'after_widget' => '
', - 'before_title' => '

', - 'after_title' => '

' - ]; - }; - - register_sidebar($config('Primary')); - register_sidebar($config('Footer')); -}); - -/** - * Theme assets - */ -add_action('wp_enqueue_scripts', function () { - wp_enqueue_style('sage/css', asset_path('styles/main.css'), false, null); - - if (is_single() && comments_open() && get_option('thread_comments')) { - wp_enqueue_script('comment-reply'); - } - - wp_enqueue_script('sage/js', asset_path('scripts/main.js'), ['jquery'], null, true); -}, 100);