From 428552848fbd39ed4be023170f72e4f2bbfb207d Mon Sep 17 00:00:00 2001 From: Rumperuu Date: Fri, 22 Jan 2021 16:19:51 +0000 Subject: [PATCH] Add post meta, styling tweaks, massive linting --- search.php => .search.php | 5 +- searchform.php => .searchform.php | 0 404.php | 18 +- archive.php | 47 +- centred-page.php | 26 +- comments.php | 17 +- footer.php | 15 +- functions.php | 220 ++- header.php | 22 +- home.php | 46 +- inc/back-compat.php | 75 - inc/customizer.php | 1231 ----------------- inc/template-tags.php | 273 ---- index.php | 4 +- page-experience-by-companies.php | 11 +- page-experience-timeline.php | 240 ++-- page.php | 4 +- sidebar.php | 18 +- single.php | 4 +- style.css | 30 +- taxonomy-company.php | 126 +- ...content-search.php => .content-search.php} | 0 template-parts/.content-single.php.swp | Bin 12278 -> 0 bytes template-parts/content-none.php | 43 +- template-parts/content-page.php | 52 +- template-parts/content-single.php | 267 ++-- template-parts/content.php | 49 +- 27 files changed, 666 insertions(+), 2177 deletions(-) rename search.php => .search.php (86%) rename searchform.php => .searchform.php (100%) delete mode 100644 inc/back-compat.php delete mode 100644 inc/customizer.php delete mode 100644 inc/template-tags.php rename template-parts/{content-search.php => .content-search.php} (100%) delete mode 100644 template-parts/.content-single.php.swp diff --git a/search.php b/.search.php similarity index 86% rename from search.php rename to .search.php index 0f89363..f6b1bd7 100644 --- a/search.php +++ b/.search.php @@ -2,8 +2,7 @@ /** * The template for displaying search results pages * - * @package WordPress - * @subpackage Twenty_Sixteen + * @package Twenty_Sixteen * @since Twenty Sixteen 1.0 */ @@ -15,7 +14,7 @@ get_header(); ?>
-

' . esc_html( get_search_query() ) . '' ); ?>

+
+/** + * The template for displaying 404 (not found) errors. + * + * @package Omphaloskepsis + * @since Omphaloskepsis 1.0 + */ - +get_header(); ?>

404.

-

That's ‘computer’ for Oops! Something went wrong!

+

That's computer for Oops! Something went wrong!

diff --git a/archive.php b/archive.php index 9b87f07..8ae7761 100644 --- a/archive.php +++ b/archive.php @@ -1,25 +1,25 @@ +/** + * The template for displaying portfolio archives. + * + * @package Omphaloskepsis + * @since Omphaloskepsis 1.0 + */ - +get_header(); ?>
-

.

+

.

' ', - 'mid_size' => 20, - 'prev_text' => '', - 'next_text' => '', + echo wp_kses_post( + get_the_posts_pagination( + array( + 'screen_reader_text' => ' ', + 'mid_size' => 20, + 'prev_text' => '', + 'next_text' => '', + ) ) ); ?> @@ -31,6 +31,7 @@ // Start the loop. while ( have_posts() ) : the_post(); + /* * Include the Post-Format-specific template for the content. * If you want to override this in a child theme, then include a file @@ -48,12 +49,14 @@
' ', - 'mid_size' => 20, - 'prev_text' => '', - 'next_text' => '', + echo wp_kses_post( + get_the_posts_pagination( + array( + 'screen_reader_text' => ' ', + 'mid_size' => 20, + 'prev_text' => '', + 'next_text' => '', + ) ) ); ?> diff --git a/centred-page.php b/centred-page.php index 7249b9d..9c08a79 100644 --- a/centred-page.php +++ b/centred-page.php @@ -1,27 +1,21 @@ - - +get_header(); ?>
-

+

diff --git a/comments.php b/comments.php index 8d72050..14689ea 100644 --- a/comments.php +++ b/comments.php @@ -1,13 +1,12 @@ No comments yet.

-

+

diff --git a/footer.php b/footer.php index 5c66eb4..7866c9c 100644 --- a/footer.php +++ b/footer.php @@ -1,13 +1,14 @@ + + + + id="site-wrapper"> diff --git a/home.php b/home.php index 2489dbc..717ca5d 100644 --- a/home.php +++ b/home.php @@ -1,11 +1,11 @@ @@ -15,12 +15,14 @@

Blog.

All / Thoughts / Reports / Reviews / Projects

' ', - 'mid_size' => 20, - 'prev_text' => '', - 'next_text' => '', + echo wp_kses_post( + get_the_posts_pagination( + array( + 'screen_reader_text' => ' ', + 'mid_size' => 20, + 'prev_text' => '', + 'next_text' => '', + ) ) ); ?> @@ -32,7 +34,7 @@ // Start the loop. while ( have_posts() ) : the_post(); - /* + /** * Include the Post-Format-specific template for the content. * If you want to override this in a child theme, then include a file * called content-___.php (where ___ is the Post Format name) and that will be used instead. @@ -49,18 +51,18 @@
' ', - 'mid_size' => 20, - 'prev_text' => '', - 'next_text' => '', + echo wp_kses_post( + get_the_posts_pagination( + array( + 'screen_reader_text' => ' ', + 'mid_size' => 20, + 'prev_text' => '', + 'next_text' => '', + ) ) ); ?>
- - diff --git a/inc/back-compat.php b/inc/back-compat.php deleted file mode 100644 index c97940e..0000000 --- a/inc/back-compat.php +++ /dev/null @@ -1,75 +0,0 @@ -

%s

', $message ); -} - -/** - * Prevents the Customizer from being loaded on WordPress versions prior to 4.4. - * - * @since Twenty Sixteen 1.0 - * - * @global string $wp_version WordPress version. - */ -function twentysixteen_customize() { - wp_die( - sprintf( __( 'Twenty Sixteen requires at least WordPress version 4.4. You are running version %s. Please upgrade and try again.', 'twentysixteen' ), $GLOBALS['wp_version'] ), - '', - array( - 'back_link' => true, - ) - ); -} -add_action( 'load-customize.php', 'twentysixteen_customize' ); - -/** - * Prevents the Theme Preview from being loaded on WordPress versions prior to 4.4. - * - * @since Twenty Sixteen 1.0 - * - * @global string $wp_version WordPress version. - */ -function twentysixteen_preview() { - if ( isset( $_GET['preview'] ) ) { - wp_die( sprintf( __( 'Twenty Sixteen requires at least WordPress version 4.4. You are running version %s. Please upgrade and try again.', 'twentysixteen' ), $GLOBALS['wp_version'] ) ); - } -} -add_action( 'template_redirect', 'twentysixteen_preview' ); diff --git a/inc/customizer.php b/inc/customizer.php deleted file mode 100644 index e46ac05..0000000 --- a/inc/customizer.php +++ /dev/null @@ -1,1231 +0,0 @@ - $default_background_color, - ) - ) - ); - - /** - * Filter the arguments used when adding 'custom-header' support in Twenty Sixteen. - * - * @since Twenty Sixteen 1.0 - * - * @param array $args { - * An array of custom-header support arguments. - * - * @type string $default-text-color Default color of the header text. - * @type int $width Width in pixels of the custom header image. Default 1200. - * @type int $height Height in pixels of the custom header image. Default 280. - * @type bool $flex-height Whether to allow flexible-height header images. Default true. - * @type callable $wp-head-callback Callback function used to style the header image and text - * displayed on the blog. - * } - */ - add_theme_support( - 'custom-header', - apply_filters( - 'twentysixteen_custom_header_args', - array( - 'default-text-color' => $default_text_color, - 'width' => 1200, - 'height' => 280, - 'flex-height' => true, - 'wp-head-callback' => 'twentysixteen_header_style', - ) - ) - ); -} -add_action( 'after_setup_theme', 'twentysixteen_custom_header_and_background' ); - -if ( ! function_exists( 'twentysixteen_header_style' ) ) : - /** - * Styles the header text displayed on the site. - * - * Create your own twentysixteen_header_style() function to override in a child theme. - * - * @since Twenty Sixteen 1.0 - * - * @see twentysixteen_custom_header_and_background(). - */ - function twentysixteen_header_style() { - // If the header text option is untouched, let's bail. - if ( display_header_text() ) { - return; - } - - // If the header text has been hidden. - ?> - - get_setting( 'blogname' )->transport = 'postMessage'; - $wp_customize->get_setting( 'blogdescription' )->transport = 'postMessage'; - - if ( isset( $wp_customize->selective_refresh ) ) { - $wp_customize->selective_refresh->add_partial( - 'blogname', - array( - 'selector' => '.site-title a', - 'container_inclusive' => false, - 'render_callback' => 'twentysixteen_customize_partial_blogname', - ) - ); - $wp_customize->selective_refresh->add_partial( - 'blogdescription', - array( - 'selector' => '.site-description', - 'container_inclusive' => false, - 'render_callback' => 'twentysixteen_customize_partial_blogdescription', - ) - ); - } - - // Add color scheme setting and control. - $wp_customize->add_setting( - 'color_scheme', - array( - 'default' => 'default', - 'sanitize_callback' => 'twentysixteen_sanitize_color_scheme', - 'transport' => 'postMessage', - ) - ); - - $wp_customize->add_control( - 'color_scheme', - array( - 'label' => __( 'Base Color Scheme', 'twentysixteen' ), - 'section' => 'colors', - 'type' => 'select', - 'choices' => twentysixteen_get_color_scheme_choices(), - 'priority' => 1, - ) - ); - - // Add page background color setting and control. - $wp_customize->add_setting( - 'page_background_color', - array( - 'default' => $color_scheme[1], - 'sanitize_callback' => 'sanitize_hex_color', - 'transport' => 'postMessage', - ) - ); - - $wp_customize->add_control( - new WP_Customize_Color_Control( - $wp_customize, - 'page_background_color', - array( - 'label' => __( 'Page Background Color', 'twentysixteen' ), - 'section' => 'colors', - ) - ) - ); - - // Remove the core header textcolor control, as it shares the main text color. - $wp_customize->remove_control( 'header_textcolor' ); - - // Add link color setting and control. - $wp_customize->add_setting( - 'link_color', - array( - 'default' => $color_scheme[2], - 'sanitize_callback' => 'sanitize_hex_color', - 'transport' => 'postMessage', - ) - ); - - $wp_customize->add_control( - new WP_Customize_Color_Control( - $wp_customize, - 'link_color', - array( - 'label' => __( 'Link Color', 'twentysixteen' ), - 'section' => 'colors', - ) - ) - ); - - // Add main text color setting and control. - $wp_customize->add_setting( - 'main_text_color', - array( - 'default' => $color_scheme[3], - 'sanitize_callback' => 'sanitize_hex_color', - 'transport' => 'postMessage', - ) - ); - - $wp_customize->add_control( - new WP_Customize_Color_Control( - $wp_customize, - 'main_text_color', - array( - 'label' => __( 'Main Text Color', 'twentysixteen' ), - 'section' => 'colors', - ) - ) - ); - - // Add secondary text color setting and control. - $wp_customize->add_setting( - 'secondary_text_color', - array( - 'default' => $color_scheme[4], - 'sanitize_callback' => 'sanitize_hex_color', - 'transport' => 'postMessage', - ) - ); - - $wp_customize->add_control( - new WP_Customize_Color_Control( - $wp_customize, - 'secondary_text_color', - array( - 'label' => __( 'Secondary Text Color', 'twentysixteen' ), - 'section' => 'colors', - ) - ) - ); -} -add_action( 'customize_register', 'twentysixteen_customize_register', 11 ); - -/** - * Render the site title for the selective refresh partial. - * - * @since Twenty Sixteen 1.2 - * @see twentysixteen_customize_register() - * - * @return void - */ -function twentysixteen_customize_partial_blogname() { - bloginfo( 'name' ); -} - -/** - * Render the site tagline for the selective refresh partial. - * - * @since Twenty Sixteen 1.2 - * @see twentysixteen_customize_register() - * - * @return void - */ -function twentysixteen_customize_partial_blogdescription() { - bloginfo( 'description' ); -} - -/** - * Registers color schemes for Twenty Sixteen. - * - * Can be filtered with {@see 'twentysixteen_color_schemes'}. - * - * The order of colors in a colors array: - * 1. Main Background Color. - * 2. Page Background Color. - * 3. Link Color. - * 4. Main Text Color. - * 5. Secondary Text Color. - * - * @since Twenty Sixteen 1.0 - * - * @return array An associative array of color scheme options. - */ -function twentysixteen_get_color_schemes() { - /** - * Filter the color schemes registered for use with Twenty Sixteen. - * - * The default schemes include 'default', 'dark', 'gray', 'red', and 'yellow'. - * - * @since Twenty Sixteen 1.0 - * - * @param array $schemes { - * Associative array of color schemes data. - * - * @type array $slug { - * Associative array of information for setting up the color scheme. - * - * @type string $label Color scheme label. - * @type array $colors HEX codes for default colors prepended with a hash symbol ('#'). - * Colors are defined in the following order: Main background, page - * background, link, main text, secondary text. - * } - * } - */ - return apply_filters( - 'twentysixteen_color_schemes', - array( - 'default' => array( - 'label' => __( 'Default', 'twentysixteen' ), - 'colors' => array( - '#1a1a1a', - '#ffffff', - '#007acc', - '#1a1a1a', - '#686868', - ), - ), - 'dark' => array( - 'label' => __( 'Dark', 'twentysixteen' ), - 'colors' => array( - '#262626', - '#1a1a1a', - '#9adffd', - '#e5e5e5', - '#c1c1c1', - ), - ), - 'gray' => array( - 'label' => __( 'Gray', 'twentysixteen' ), - 'colors' => array( - '#616a73', - '#4d545c', - '#c7c7c7', - '#f2f2f2', - '#f2f2f2', - ), - ), - 'red' => array( - 'label' => __( 'Red', 'twentysixteen' ), - 'colors' => array( - '#ffffff', - '#ff675f', - '#640c1f', - '#402b30', - '#402b30', - ), - ), - 'yellow' => array( - 'label' => __( 'Yellow', 'twentysixteen' ), - 'colors' => array( - '#3b3721', - '#ffef8e', - '#774e24', - '#3b3721', - '#5b4d3e', - ), - ), - ) - ); -} - -if ( ! function_exists( 'twentysixteen_get_color_scheme' ) ) : - /** - * Retrieves the current Twenty Sixteen color scheme. - * - * Create your own twentysixteen_get_color_scheme() function to override in a child theme. - * - * @since Twenty Sixteen 1.0 - * - * @return array An associative array of either the current or default color scheme HEX values. - */ - function twentysixteen_get_color_scheme() { - $color_scheme_option = get_theme_mod( 'color_scheme', 'default' ); - $color_schemes = twentysixteen_get_color_schemes(); - - if ( array_key_exists( $color_scheme_option, $color_schemes ) ) { - return $color_schemes[ $color_scheme_option ]['colors']; - } - - return $color_schemes['default']['colors']; - } -endif; // twentysixteen_get_color_scheme - -if ( ! function_exists( 'twentysixteen_get_color_scheme_choices' ) ) : - /** - * Retrieves an array of color scheme choices registered for Twenty Sixteen. - * - * Create your own twentysixteen_get_color_scheme_choices() function to override - * in a child theme. - * - * @since Twenty Sixteen 1.0 - * - * @return array Array of color schemes. - */ - function twentysixteen_get_color_scheme_choices() { - $color_schemes = twentysixteen_get_color_schemes(); - $color_scheme_control_options = array(); - - foreach ( $color_schemes as $color_scheme => $value ) { - $color_scheme_control_options[ $color_scheme ] = $value['label']; - } - - return $color_scheme_control_options; - } -endif; // twentysixteen_get_color_scheme_choices - - -if ( ! function_exists( 'twentysixteen_sanitize_color_scheme' ) ) : - /** - * Handles sanitization for Twenty Sixteen color schemes. - * - * Create your own twentysixteen_sanitize_color_scheme() function to override - * in a child theme. - * - * @since Twenty Sixteen 1.0 - * - * @param string $value Color scheme name value. - * @return string Color scheme name. - */ - function twentysixteen_sanitize_color_scheme( $value ) { - $color_schemes = twentysixteen_get_color_scheme_choices(); - - if ( ! array_key_exists( $value, $color_schemes ) ) { - return 'default'; - } - - return $value; - } -endif; // twentysixteen_sanitize_color_scheme - -/** - * Enqueues front-end CSS for color scheme. - * - * @since Twenty Sixteen 1.0 - * - * @see wp_add_inline_style() - */ -function twentysixteen_color_scheme_css() { - $color_scheme_option = get_theme_mod( 'color_scheme', 'default' ); - - // Don't do anything if the default color scheme is selected. - if ( 'default' === $color_scheme_option ) { - return; - } - - $color_scheme = twentysixteen_get_color_scheme(); - - // Convert main text hex color to rgba. - $color_textcolor_rgb = twentysixteen_hex2rgb( $color_scheme[3] ); - - // If the rgba values are empty return early. - if ( empty( $color_textcolor_rgb ) ) { - return; - } - - // If we get this far, we have a custom color scheme. - $colors = array( - 'background_color' => $color_scheme[0], - 'page_background_color' => $color_scheme[1], - 'link_color' => $color_scheme[2], - 'main_text_color' => $color_scheme[3], - 'secondary_text_color' => $color_scheme[4], - 'border_color' => vsprintf( 'rgba( %1$s, %2$s, %3$s, 0.2)', $color_textcolor_rgb ), - - ); - - $color_scheme_css = twentysixteen_get_color_scheme_css( $colors ); - - wp_add_inline_style( 'twentysixteen-style', $color_scheme_css ); -} -add_action( 'wp_enqueue_scripts', 'twentysixteen_color_scheme_css' ); - -/** - * Binds the JS listener to make Customizer color_scheme control. - * - * Passes color scheme data as colorScheme global. - * - * @since Twenty Sixteen 1.0 - */ -function twentysixteen_customize_control_js() { - wp_enqueue_script( 'color-scheme-control', get_template_directory_uri() . '/js/color-scheme-control.js', array( 'customize-controls', 'iris', 'underscore', 'wp-util' ), '20160412', true ); - wp_localize_script( 'color-scheme-control', 'colorScheme', twentysixteen_get_color_schemes() ); -} -add_action( 'customize_controls_enqueue_scripts', 'twentysixteen_customize_control_js' ); - -/** - * Binds JS handlers to make the Customizer preview reload changes asynchronously. - * - * @since Twenty Sixteen 1.0 - */ -function twentysixteen_customize_preview_js() { - wp_enqueue_script( 'twentysixteen-customize-preview', get_template_directory_uri() . '/js/customize-preview.js', array( 'customize-preview' ), '20160412', true ); -} -add_action( 'customize_preview_init', 'twentysixteen_customize_preview_js' ); - -/** - * Returns CSS for the color schemes. - * - * @since Twenty Sixteen 1.0 - * - * @param array $colors Color scheme colors. - * @return string Color scheme CSS. - */ -function twentysixteen_get_color_scheme_css( $colors ) { - $colors = wp_parse_args( - $colors, - array( - 'background_color' => '', - 'page_background_color' => '', - 'link_color' => '', - 'main_text_color' => '', - 'secondary_text_color' => '', - 'border_color' => '', - ) - ); - - return << .page-links-title, - .comment-author, - .comment-reply-title small a:hover, - .comment-reply-title small a:focus { - color: {$colors['main_text_color']}; - } - - blockquote, - .menu-toggle.toggled-on, - .menu-toggle.toggled-on:hover, - .menu-toggle.toggled-on:focus, - .post-navigation, - .post-navigation div + div, - .pagination, - .widget, - .page-header, - .page-links a, - .comments-title, - .comment-reply-title { - border-color: {$colors['main_text_color']}; - } - - button, - button[disabled]:hover, - button[disabled]:focus, - input[type="button"], - input[type="button"][disabled]:hover, - input[type="button"][disabled]:focus, - input[type="reset"], - input[type="reset"][disabled]:hover, - input[type="reset"][disabled]:focus, - input[type="submit"], - input[type="submit"][disabled]:hover, - input[type="submit"][disabled]:focus, - .menu-toggle.toggled-on, - .menu-toggle.toggled-on:hover, - .menu-toggle.toggled-on:focus, - .pagination:before, - .pagination:after, - .pagination .prev, - .pagination .next, - .page-links a { - background-color: {$colors['main_text_color']}; - } - - /* Secondary Text Color */ - - /** - * IE8 and earlier will drop any block with CSS3 selectors. - * Do not combine these styles with the next block. - */ - body:not(.search-results) .entry-summary { - color: {$colors['secondary_text_color']}; - } - - blockquote, - .post-password-form label, - a:hover, - a:focus, - a:active, - .post-navigation .meta-nav, - .image-navigation, - .comment-navigation, - .widget_recent_entries .post-date, - .widget_rss .rss-date, - .widget_rss cite, - .site-description, - .author-bio, - .entry-footer, - .entry-footer a, - .sticky-post, - .taxonomy-description, - .entry-caption, - .comment-metadata, - .pingback .edit-link, - .comment-metadata a, - .pingback .comment-edit-link, - .comment-form label, - .comment-notes, - .comment-awaiting-moderation, - .logged-in-as, - .form-allowed-tags, - .site-info, - .site-info a, - .wp-caption .wp-caption-text, - .gallery-caption, - .widecolumn label, - .widecolumn .mu_register label { - color: {$colors['secondary_text_color']}; - } - - .widget_calendar tbody a:hover, - .widget_calendar tbody a:focus { - background-color: {$colors['secondary_text_color']}; - } - - /* Border Color */ - fieldset, - pre, - abbr, - acronym, - table, - th, - td, - input[type="text"], - input[type="email"], - input[type="url"], - input[type="password"], - input[type="search"], - textarea, - .main-navigation li, - .main-navigation .primary-menu, - .menu-toggle, - .dropdown-toggle:after, - .social-navigation a, - .image-navigation, - .comment-navigation, - .tagcloud a, - .entry-content, - .entry-summary, - .page-links a, - .page-links > span, - .comment-list article, - .comment-list .pingback, - .comment-list .trackback, - .comment-reply-link, - .no-comments, - .widecolumn .mu_register .mu_alert { - border-color: {$colors['main_text_color']}; /* Fallback for IE7 and IE8 */ - border-color: {$colors['border_color']}; - } - - hr, - code { - background-color: {$colors['main_text_color']}; /* Fallback for IE7 and IE8 */ - background-color: {$colors['border_color']}; - } - - @media screen and (min-width: 56.875em) { - .main-navigation li:hover > a, - .main-navigation li.focus > a { - color: {$colors['link_color']}; - } - - .main-navigation ul ul, - .main-navigation ul ul li { - border-color: {$colors['border_color']}; - } - - .main-navigation ul ul:before { - border-top-color: {$colors['border_color']}; - border-bottom-color: {$colors['border_color']}; - } - - .main-navigation ul ul li { - background-color: {$colors['page_background_color']}; - } - - .main-navigation ul ul:after { - border-top-color: {$colors['page_background_color']}; - border-bottom-color: {$colors['page_background_color']}; - } - } - -CSS; -} - - -/** - * Outputs an Underscore template for generating CSS for the color scheme. - * - * The template generates the css dynamically for instant display in the - * Customizer preview. - * - * @since Twenty Sixteen 1.0 - */ -function twentysixteen_color_scheme_css_template() { - $colors = array( - 'background_color' => '{{ data.background_color }}', - 'page_background_color' => '{{ data.page_background_color }}', - 'link_color' => '{{ data.link_color }}', - 'main_text_color' => '{{ data.main_text_color }}', - 'secondary_text_color' => '{{ data.secondary_text_color }}', - 'border_color' => '{{ data.border_color }}', - ); - ?> - - a, - .main-navigation li.focus > a { - color: %1$s; - } - } - '; - - wp_add_inline_style( 'twentysixteen-style', sprintf( $css, $link_color ) ); -} -add_action( 'wp_enqueue_scripts', 'twentysixteen_link_color_css', 11 ); - -/** - * Enqueues front-end CSS for the main text color. - * - * @since Twenty Sixteen 1.0 - * - * @see wp_add_inline_style() - */ -function twentysixteen_main_text_color_css() { - $color_scheme = twentysixteen_get_color_scheme(); - $default_color = $color_scheme[3]; - $main_text_color = get_theme_mod( 'main_text_color', $default_color ); - - // Don't do anything if the current color is the default. - if ( $main_text_color === $default_color ) { - return; - } - - // Convert main text hex color to rgba. - $main_text_color_rgb = twentysixteen_hex2rgb( $main_text_color ); - - // If the rgba values are empty return early. - if ( empty( $main_text_color_rgb ) ) { - return; - } - - // If we get this far, we have a custom color scheme. - $border_color = vsprintf( 'rgba( %1$s, %2$s, %3$s, 0.2)', $main_text_color_rgb ); - - $css = ' - /* Custom Main Text Color */ - body, - blockquote cite, - blockquote small, - .main-navigation a, - .menu-toggle, - .dropdown-toggle, - .social-navigation a, - .post-navigation a, - .pagination a:hover, - .pagination a:focus, - .widget-title a, - .site-branding .site-title a, - .entry-title a, - .page-links > .page-links-title, - .comment-author, - .comment-reply-title small a:hover, - .comment-reply-title small a:focus { - color: %1$s - } - - blockquote, - .menu-toggle.toggled-on, - .menu-toggle.toggled-on:hover, - .menu-toggle.toggled-on:focus, - .post-navigation, - .post-navigation div + div, - .pagination, - .widget, - .page-header, - .page-links a, - .comments-title, - .comment-reply-title { - border-color: %1$s; - } - - button, - button[disabled]:hover, - button[disabled]:focus, - input[type="button"], - input[type="button"][disabled]:hover, - input[type="button"][disabled]:focus, - input[type="reset"], - input[type="reset"][disabled]:hover, - input[type="reset"][disabled]:focus, - input[type="submit"], - input[type="submit"][disabled]:hover, - input[type="submit"][disabled]:focus, - .menu-toggle.toggled-on, - .menu-toggle.toggled-on:hover, - .menu-toggle.toggled-on:focus, - .pagination:before, - .pagination:after, - .pagination .prev, - .pagination .next, - .page-links a { - background-color: %1$s; - } - - /* Border Color */ - fieldset, - pre, - abbr, - acronym, - table, - th, - td, - input[type="text"], - input[type="email"], - input[type="url"], - input[type="password"], - input[type="search"], - textarea, - .main-navigation li, - .main-navigation .primary-menu, - .menu-toggle, - .dropdown-toggle:after, - .social-navigation a, - .image-navigation, - .comment-navigation, - .tagcloud a, - .entry-content, - .entry-summary, - .page-links a, - .page-links > span, - .comment-list article, - .comment-list .pingback, - .comment-list .trackback, - .comment-reply-link, - .no-comments, - .widecolumn .mu_register .mu_alert { - border-color: %1$s; /* Fallback for IE7 and IE8 */ - border-color: %2$s; - } - - hr, - code { - background-color: %1$s; /* Fallback for IE7 and IE8 */ - background-color: %2$s; - } - - @media screen and (min-width: 56.875em) { - .main-navigation ul ul, - .main-navigation ul ul li { - border-color: %2$s; - } - - .main-navigation ul ul:before { - border-top-color: %2$s; - border-bottom-color: %2$s; - } - } - '; - - wp_add_inline_style( 'twentysixteen-style', sprintf( $css, $main_text_color, $border_color ) ); -} -add_action( 'wp_enqueue_scripts', 'twentysixteen_main_text_color_css', 11 ); - -/** - * Enqueues front-end CSS for the secondary text color. - * - * @since Twenty Sixteen 1.0 - * - * @see wp_add_inline_style() - */ -function twentysixteen_secondary_text_color_css() { - $color_scheme = twentysixteen_get_color_scheme(); - $default_color = $color_scheme[4]; - $secondary_text_color = get_theme_mod( 'secondary_text_color', $default_color ); - - // Don't do anything if the current color is the default. - if ( $secondary_text_color === $default_color ) { - return; - } - - $css = ' - /* Custom Secondary Text Color */ - - /** - * IE8 and earlier will drop any block with CSS3 selectors. - * Do not combine these styles with the next block. - */ - body:not(.search-results) .entry-summary { - color: %1$s; - } - - blockquote, - .post-password-form label, - a:hover, - a:focus, - a:active, - .post-navigation .meta-nav, - .image-navigation, - .comment-navigation, - .widget_recent_entries .post-date, - .widget_rss .rss-date, - .widget_rss cite, - .site-description, - .author-bio, - .entry-footer, - .entry-footer a, - .sticky-post, - .taxonomy-description, - .entry-caption, - .comment-metadata, - .pingback .edit-link, - .comment-metadata a, - .pingback .comment-edit-link, - .comment-form label, - .comment-notes, - .comment-awaiting-moderation, - .logged-in-as, - .form-allowed-tags, - .site-info, - .site-info a, - .wp-caption .wp-caption-text, - .gallery-caption, - .widecolumn label, - .widecolumn .mu_register label { - color: %1$s; - } - - .widget_calendar tbody a:hover, - .widget_calendar tbody a:focus { - background-color: %1$s; - } - '; - - wp_add_inline_style( 'twentysixteen-style', sprintf( $css, $secondary_text_color ) ); -} -add_action( 'wp_enqueue_scripts', 'twentysixteen_secondary_text_color_css', 11 ); diff --git a/inc/template-tags.php b/inc/template-tags.php deleted file mode 100644 index 6f1a0d3..0000000 --- a/inc/template-tags.php +++ /dev/null @@ -1,273 +0,0 @@ -%1$s%4$s', - get_avatar( get_the_author_meta( 'user_email' ), $author_avatar_size ), - _x( 'Author', 'Used before post author name.', 'twentysixteen' ), - esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ), - get_the_author() - ); - } - - if ( in_array( get_post_type(), array( 'post', 'attachment' ) ) ) { - twentysixteen_entry_date(); - } - - $format = get_post_format(); - if ( current_theme_supports( 'post-formats', $format ) ) { - printf( - '%1$s%3$s', - sprintf( '%s ', _x( 'Format', 'Used before post format.', 'twentysixteen' ) ), - esc_url( get_post_format_link( $format ) ), - get_post_format_string( $format ) - ); - } - - edit_post_link( - sprintf( - /* translators: %s: Name of current post */ - __( 'Edit', 'twentysixteen' ), - get_the_title() - ), - '', - '' - ); - - } -endif; - -if ( ! function_exists( 'twentysixteen_entry_date' ) ) : - /** - * Prints HTML with date information for current post. - * - * Create your own twentysixteen_entry_date() function to override in a child theme. - * - * @since Twenty Sixteen 1.0 - */ - function twentysixteen_entry_date() { - $time_string = ''; - - if ( get_the_time( 'U' ) !== get_the_modified_time( 'U' ) ) { - $time_string = ''; - } - - $time_string = sprintf( - $time_string, - esc_attr( get_the_date( 'c' ) ), - get_the_date(), - esc_attr( get_the_modified_date( 'c' ) ), - get_the_modified_date() - ); - - printf( - '%3$s', - _x( 'Posted on', 'Used before publish date.', 'bengoldsworthy' ), - esc_url( get_permalink() ), - $time_string - ); - } -endif; - -if ( ! function_exists( 'twentysixteen_entry_taxonomies' ) ) : - /** - * Prints HTML with category and tags for current post. - * - * Create your own twentysixteen_entry_taxonomies() function to override in a child theme. - * - * @since Twenty Sixteen 1.0 - */ - function twentysixteen_entry_taxonomies() { - $categories_list = get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentysixteen' ) ); - if ( $categories_list && twentysixteen_categorized_blog() ) { - printf( - '%1$s %2$s', - _x( 'Categories', 'Used before category names.', 'twentysixteen' ), - $categories_list - ); - } - - $tags_list = get_the_tag_list( '', _x( ', ', 'Used between list items, there is a space after the comma.', 'twentysixteen' ) ); - if ( $tags_list ) { - printf( - '%1$s %2$s', - _x( 'Tags', 'Used before tag names.', 'twentysixteen' ), - $tags_list - ); - } - } -endif; - -if ( ! function_exists( 'twentysixteen_post_thumbnail' ) ) : - /** - * Displays an optional post thumbnail. - * - * Wraps the post thumbnail in an anchor element on index views, or a div - * element when on single views. - * - * Create your own twentysixteen_post_thumbnail() function to override in a child theme. - * - * @since Twenty Sixteen 1.0 - */ - function twentysixteen_post_thumbnail() { - if ( post_password_required() || is_attachment() || ! has_post_thumbnail() ) { - return; - } - - if ( is_singular() ) : - ?> - -
-
', '' ); ?>
- -
- - - - - - - -
- -
- %2$s', - esc_url( get_permalink( get_the_ID() ) ), - /* translators: %s: Name of current post */ - sprintf( __( 'Continue reading "%s"', 'twentysixteen' ), get_the_title( get_the_ID() ) ) - ); - return ' … ' . $link; - } - add_filter( 'excerpt_more', 'twentysixteen_excerpt_more' ); -endif; - -/** - * Determines whether blog/site has more than one category. - * - * Create your own twentysixteen_categorized_blog() function to override in a child theme. - * - * @since Twenty Sixteen 1.0 - * - * @return bool True if there is more than one category, false otherwise. - */ -function twentysixteen_categorized_blog() { - if ( false === ( $all_the_cool_cats = get_transient( 'twentysixteen_categories' ) ) ) { - // Create an array of all the categories that are attached to posts. - $all_the_cool_cats = get_categories( - array( - 'fields' => 'ids', - // We only need to know if there is more than one category. - 'number' => 2, - ) - ); - - // Count the number of categories that are attached to the posts. - $all_the_cool_cats = count( $all_the_cool_cats ); - - set_transient( 'twentysixteen_categories', $all_the_cool_cats ); - } - - if ( $all_the_cool_cats > 1 ) { - // This blog has more than 1 category so twentysixteen_categorized_blog should return true. - return true; - } else { - // This blog has only 1 category so twentysixteen_categorized_blog should return false. - return false; - } -} - -/** - * Flushes out the transients used in twentysixteen_categorized_blog(). - * - * @since Twenty Sixteen 1.0 - */ -function twentysixteen_category_transient_flusher() { - if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) { - return; - } - // Like, beat it. Dig? - delete_transient( 'twentysixteen_categories' ); -} -add_action( 'edit_category', 'twentysixteen_category_transient_flusher' ); -add_action( 'save_post', 'twentysixteen_category_transient_flusher' ); - -if ( ! function_exists( 'twentysixteen_the_custom_logo' ) ) : - /** - * Displays the optional custom logo. - * - * Does nothing if the custom logo is not available. - * - * @since Twenty Sixteen 1.2 - */ - function twentysixteen_the_custom_logo() { - if ( function_exists( 'the_custom_logo' ) ) { - the_custom_logo(); - } - } -endif; diff --git a/index.php b/index.php index 8709c48..999f6c6 100644 --- a/index.php +++ b/index.php @@ -2,10 +2,10 @@ /** * The template file for when no more specific template is found. * - * @package WordPress - * @subpackage Omphaloskepsis + * @package Omphaloskepsis * @since Omphaloskepsis 1.0 */ + ?> diff --git a/page-experience-by-companies.php b/page-experience-by-companies.php index 3da2c8d..e92699a 100644 --- a/page-experience-by-companies.php +++ b/page-experience-by-companies.php @@ -1,14 +1,15 @@
@@ -26,6 +27,7 @@ get_header(); ?>

Settings

+
@@ -66,7 +68,7 @@ get_header(); ?>
- + + +
diff --git a/page-experience-timeline.php b/page-experience-timeline.php index 7e8a196..676aee1 100644 --- a/page-experience-timeline.php +++ b/page-experience-timeline.php @@ -1,146 +1,158 @@ $endDate ) ? $endDate : $jEDate ); - return ( ( ( strtotime( $jSDate ) < strtotime( $endDate ) ) && ( strtotime( $jSDate ) > strtotime( $startDate ) ) ) && ( strtotime( $jEDate ) > strtotime( $startDate ) ) ); - } + /** + * Calculates wether a role is within the max. and min. dates + * for the timeline. + * + * @param string $role_start_date The role's start date. + * @param string $role_end_date The role's end date. + * @return bool + */ +function within_dates( $role_start_date, $role_end_date ) { + $end_year = gmdate( 'Y' ); + $end_date = $end_year . '-12-31'; + $start_date = ( $end_year - 2 ) . '-01-01'; + $role_end_date = ( ! $role_end_date ) ? gmdate( 'Y-m-d' ) : ( ( $role_end_date > $end_date ) ? $end_date : $role_end_date ); + return ( ( ( strtotime( $role_start_date ) < strtotime( $end_date ) ) && ( strtotime( $role_start_date ) > strtotime( $start_date ) ) ) && ( strtotime( $role_end_date ) > strtotime( $start_date ) ) ); +} + $args = array( - 'post_type' => array( + 'post_type' => array( 'job', ), 'posts_per_page' => -1, ); $loop = new WP_Query( $args ); -?> + ?>
-

Experience

-

or, a brief history of Ben

+

Experience

+

or, a brief history of Ben

-
- -
- -
-

Settings

- - - - - + while ( have_posts() ) : + the_post(); + ?> +
+ +
+ +
+

Settings

+
+ + + +
-
- - - - + + - -
-
-
-
- -
-
-
-
+ + function drawChart() { + var container = document.getElementById('timeline'); + var chart = new google.visualization.Timeline(container); + var dataTable = new google.visualization.DataTable(); + + dataTable.addColumn({ type: 'string', id: 'Type' }); + dataTable.addColumn({ type: 'string', id: 'Role' }); + dataTable.addColumn({ type: 'string', role: 'tooltip', 'p': {'html': true} }); + dataTable.addColumn({ type: 'date', id: 'Start' }); + dataTable.addColumn({ type: 'date', id: 'End' }); + dataTable.addRows([ + have_posts() ) : + $loop->the_post(); + ?> + gmdate( 'Y-m-d' ) ) ) ? true : false; + $company = wp_get_object_terms( + get_the_ID(), + 'company', + array( + 'fields' => 'names', + ) + ); + + $role_title = htmlspecialchars_decode( strip_tags( get_the_title() ) ); + $start = get_the_date(); + $end = ( ! $end_date || ( $end_date && $end_date > gmdate( 'Y-m-d' ) ) ) ? gmdate( 'Y-m-d' ) : $end_date; + ?> + [ + '', + '', + '

  • —
', + new Date(''), + new Date('') + ], + + ]); + + var rowHeight = 15; + var chartHeight = dataTable.getNumberOfRows() * rowHeight + 50; + var options = { + tooltip: {isHtml: true}, + timeline: { + showRowLabels: true, + }, + height: chartHeight, + width: window.innerWidth - 200, + }; + + chart.draw(dataTable, options); + } + + + +
+
+
+
+ +
+
+
+
diff --git a/page.php b/page.php index 8f5fdfd..bd61683 100644 --- a/page.php +++ b/page.php @@ -2,10 +2,10 @@ /** * The template for displaying pages. * - * @package WordPress - * @subpackage Omphaloskepsis + * @package Omphaloskepsis * @since Omphaloskepsis 1.0 */ + ?> diff --git a/sidebar.php b/sidebar.php index 1137e72..7e760f3 100644 --- a/sidebar.php +++ b/sidebar.php @@ -2,25 +2,25 @@ /** * The template for the sidebar. * - * @package WordPress - * @subpackage Omphaloskepsis + * @package Omphaloskepsis * @since Omphaloskepsis 1.0 */ + ?> diff --git a/single.php b/single.php index 0251c37..0dc67c4 100644 --- a/single.php +++ b/single.php @@ -2,10 +2,10 @@ /** * The template for displaying all single Pages. * - * @package WordPress - * @subpackage Omphaloskepsis + * @package Omphaloskepsis * @since Omphaloskepsis 1.0 */ + ?> diff --git a/style.css b/style.css index e1ea86c..28deb08 100644 --- a/style.css +++ b/style.css @@ -606,6 +606,7 @@ html { body > footer { grid-area: footer; + margin-top: 1em; } } @@ -1134,6 +1135,24 @@ article.tile > header > h2 { font-size: 0.8em; } +a[href*="//"]:not([href*="bengoldsworthy.net"]):after { + content: url('https://upload.wikimedia.org/wikipedia/commons/6/64/Icon_External_Link.png'); + margin: 0 0 0 4px; + filter: invert(0%) sepia(0%) saturate(15%) hue-rotate(246deg) brightness(104%) contrast(98%); +} + +a[href*="//"].item:not([href*="bengoldsworthy.net"]):after { + position: relative; + top: -1em; + float: right; +} + +a[href="#"], +a[href=""] { + color: red; +} + + a { opacity: 0.8; text-decoration: underline !important; @@ -1429,14 +1448,3 @@ summary { font-size: 1.1em; font-weight: bold; } - -/* shorter version! -a[href*="//"]:not([href*="bengoldsworthy.net"]):after { - content: url('./icons/extlink.svg'); - margin: 0 0 0 5px; -} - -a[href="#"] { - color: red; -} - */ diff --git a/taxonomy-company.php b/taxonomy-company.php index 4246a28..ebcee3f 100644 --- a/taxonomy-company.php +++ b/taxonomy-company.php @@ -5,6 +5,7 @@ * @package Omphaloskepsis * @since Omphaloskepsis 1.0 */ + ?> @@ -12,10 +13,10 @@ name . '-->'; + echo ''; $args = array( - 'post_type' => array( 'job' ), - 'tax_query' => array( + 'post_type' => array( 'job' ), + 'tax_query' => array( array( 'taxonomy' => 'company', 'field' => 'slug', @@ -27,7 +28,7 @@ $loop = new WP_Query( $args ); ?> - + +
'full' ) ); - $companyName = get_queried_object()->name; + $company_logo = apply_filters( 'taxonomy-images-queried-term-image-url', '', array( 'image_size' => 'full' ) ); + $company_name = get_queried_object()->name; ?>
-
+
70 ) { + if ( strlen( $company_name ) > 70 ) { $small = '2em'; - } elseif ( strlen( $companyName ) > 35 ) { + } elseif ( strlen( $company_name ) > 35 ) { $small = '3em'; - } elseif ( strlen( $companyName ) > 12 ) { + } elseif ( strlen( $company_name ) > 12 ) { $small = '4em'; } else { $small = '5em'; } ?> -

+

@@ -120,7 +122,7 @@ have_posts() ) : ?>
- +
@@ -133,8 +135,8 @@ '', array( 'having_images' => false, - 'taxonomy' => 'company', - 'term_args' => array( + 'taxonomy' => 'company', + 'term_args' => array( 'include' => get_term_by( 'id', get_queried_object()->parent, 'company' )->term_id, ), ) @@ -147,12 +149,12 @@
    image_id )[0]; - $colour = get_term_meta( $parent->term_id, 'color', true ); - $colour = ( $colour != '' ) ? $colour : 'transparent'; + $img_url = wp_get_attachment_image_src( $parent->image_id )[0]; + $colour = get_term_meta( $parent->term_id, 'color', true ); + $colour = ( '' !== $colour ) ? $colour : 'transparent'; ?> -
  • term_id, 'company' )->name; ?>
    • +
  • term_id, 'company' )->name ); ?>
@@ -165,8 +167,8 @@ '', array( 'having_images' => false, - 'taxonomy' => 'company', - 'term_args' => array( 'parent' => get_queried_object()->term_id ), + 'taxonomy' => 'company', + 'term_args' => array( 'parent' => get_queried_object()->term_id ), ) ); if ( count( $children ) > 0 ) : @@ -175,12 +177,12 @@
    image_id, 'detail' )[0]; - $colour = get_term_meta( $child->term_id, 'color', true ); - $colour = ( $colour != '' ) ? $colour : 'transparent'; + $img_url = wp_get_attachment_image_src( $child->image_id, 'detail' )[0]; + $colour = get_term_meta( $child->term_id, 'color', true ); + $colour = ( '' !== $colour ) ? $colour : 'transparent'; ?> -
  • term_id, 'company' )->name; ?>
    • +
  • term_id, 'company' )->name ); ?>
@@ -189,15 +191,15 @@
have_posts() ) : - echo '
'; - echo '

' . ucwords( $currSec ) . 's View all ' . $loop->post_count . '

'; + echo '
'; + echo '

' . wp_kses_post( ucwords( $current_section ) ) . 's View all ' . esc_html( $loop->post_count ) . '

'; echo '
'; while ( ( $loop->have_posts() ) && ( $i++ < 4 ) ) : $loop->the_post(); @@ -210,14 +212,14 @@ echo '
'; echo '
'; $args['post_type'] = 'qualification'; - $loop = new WP_Query( $args ); + $loop = new WP_Query( $args ); echo '

Qualifications

'; if ( $loop->have_posts() ) : echo ''; else : @@ -227,14 +229,14 @@ echo '
'; $args['post_type'] = 'award'; - $loop = new WP_Query( $args ); + $loop = new WP_Query( $args ); echo '

Awards

'; if ( $loop->have_posts() ) : echo ''; else : @@ -244,10 +246,10 @@ echo '
'; $args['post_type'] = 'appearance'; - $loop = new WP_Query( $args ); + $loop = new WP_Query( $args ); if ( $loop->have_posts() ) : echo '
'; - echo '

Appearances View all ' . $loop->post_count . '

'; + echo '

Appearances View all ' . esc_html( $loop->post_count ) . '

'; echo '
'; while ( ( $loop->have_posts() ) ) : $loop->the_post(); @@ -258,10 +260,10 @@ endif; $args['post_type'] = 'correspondence'; - $loop = new WP_Query( $args ); + $loop = new WP_Query( $args ); if ( $loop->have_posts() ) : echo '
'; - echo '

Correspondence View all ' . $loop->post_count . '

'; + echo '

Correspondence View all ' . esc_html( $loop->post_count ) . '

'; echo '
'; while ( ( $loop->have_posts() ) ) : $loop->the_post(); diff --git a/template-parts/content-search.php b/template-parts/.content-search.php similarity index 100% rename from template-parts/content-search.php rename to template-parts/.content-search.php diff --git a/template-parts/.content-single.php.swp b/template-parts/.content-single.php.swp deleted file mode 100644 index 7a2cdca14f3d38e1f9e00f8938b61219fd1ed5ef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12278 zcmeHNzmMZY6n=MT5x)coDnv8u)ymmr9cORR9okKD6o7OEa1wW%L}NMeB=MbNduJw> z3kaw{H1G#Nfkc5oKtn@A0}_7#Akpv-P*9=+(ZDxjdt-;)gBI<~>Wl4}=lA2A_a=(= z4LUDhdY)ZqKS>x56aDtitJhv!`)KX(uQd|0Y0kxLrkCzC(!D$x=4sOD>~`9@$f9;Q zm3wW;hcm$?7dN?Rr(Dq+l|nzC4U%{mOw=^-2T3;e=eak`QpHo{s|lZS=?{21&XP#Z zGodC6U-4<4go=B4D3tU|VNb^CIN|MllHbWeyJi_U?F`J+$b0JQ-nre5W@5uxXOBK| z^|X^>UFsSOzQumI2FvWxz6E8TcPE5Jp7qJw%V+3+M6g|LXVupAQk;2EGHn1wIGf0}g>H za2<$&Cjb|?8~ETsqUV6SfZIer68%8*J<*p$ALDJJcZpJ>UmhU(26!J3z**p{`-wgU zJ^`)+9^e3v0e{>_^gHkq@EPzS@HTJ=oCkh}>t6$30B->qFa%x!E&w{TUjaKT1C{~H zfMvikU>UFsoWMZWM}uKJOnAS$?s;q@&!qA;Hkjx2i80poM_H!0C|28OSQHDdn5sk| zbPa?CLMeL=k7DH|aeBk)yE_fJt>z!XKLuWAnmxAdH@uR$h*LFcEhlxnfffyP(A7fsqHgO% z3>fB~HCze|_ra8_u(fqiQr<1Mq9U@kJx-rUYx1M`W@GotUeXh`?{)ps(J*Y6t*C)+ zMFqPnt*L`J8;dZXEWlZ9>*EoFtjpGWy`wz~XKIp(A_V3}9NQA-D$X?B_n6@E>i0lB~xr_fLxc7_R5JNpK|2n9CLmg$Ng|+9vBdF0&CSO~%n8_4R$X=5BHBl(IUr zjetKf1>MN*Vyc$hMFD8}V${{@1HsEuP*Af4H?z4HWph1WRFC*JfDm?qpFz4 zzUXfPeg18;r_rlEqD j;jB7-m_CjeYK29yM6dh;t?{hrk2lA#B!7FGjPvw25Pnut diff --git a/template-parts/content-none.php b/template-parts/content-none.php index f67990f..98135a8 100644 --- a/template-parts/content-none.php +++ b/template-parts/content-none.php @@ -1,33 +1,30 @@
-
-

-
+
+

Nothing Found

+
-
- +
+ -

Get started here.', 'twentysixteen' ), esc_url( admin_url( 'post-new.php' ) ) ); ?>

+

+ - + -

- +

+ - - -

- - - -
+ +
diff --git a/template-parts/content-page.php b/template-parts/content-page.php index 18606b8..8294aec 100644 --- a/template-parts/content-page.php +++ b/template-parts/content-page.php @@ -1,30 +1,34 @@
> -
-
-

- -

- -
-
+
+
+

+ +

+ +
+
-
- -
+
+ +
diff --git a/template-parts/content-single.php b/template-parts/content-single.php index fb2f840..65543fd 100644 --- a/template-parts/content-single.php +++ b/template-parts/content-single.php @@ -1,114 +1,201 @@
> -
-
-

- -

- - S\<\/\s\u\p\>, 1,Y \H\.\E\.', '

', '

'); ?> -
-
+
+
+

+ +

-
- - - -
-
    - +

    + +

    + +
+
+ +
+ + + + +
+
    + + term_id, 'category' ); + $category_text = 'is a part of the following series'; + $series = array(); + $series_item = get_category_by_slug( 'series' ); + $series_ids = get_term_children( $series_item->term_id, 'category' ); - foreach ( $seriesIDs as $thisSeriesID ) { - if ( has_category( $thisSeriesID ) ) { - array_push( $series, get_category( $thisSeriesID ) ); + foreach ( $series_ids as $this_series_id ) { + if ( has_category( $this_series_id ) ) { + array_push( $series, get_category( $this_series_id ) ); } } if ( count( $series ) > 1 ) { - $catag .= '’'; + $category_text .= '’'; } $punct = ':'; - foreach ( $series as $thisSeries ) { - $catag .= $punct . ' '; - if ( $punct == ':' ) { + foreach ( $series as $this_series ) { + $category_text .= $punct . ' '; + if ( ':' === $punct ) { $punct = ';'; } - $catag .= '' . $thisSeries->name . ''; + $category_text .= '' . $this_series->name . ''; } - $catag .= '.'; - - echo "
  • This {$type} {$catag}
    • "; + $category_text .= '.'; + echo '
  • '; + echo wp_kses_post( "This $post_category $category_text" ); + echo '
    • '; } ?> - - -
  • This piece was written over a year ago. It may no longer accurately reflect my views now, or may be factually outdated.
    • - - -
  • This piece was originally written for my old site, Oh What? Oh Jeez! As such, it may not have transferred over properly and some images and links might be broken (and, to a lesser extent, my writing from years ago is about 80% run-on sentences).
    • - - -
    • - - -
  • This work is licensed under . Sorry about that.
    • - -
-
- - - +
  • This piece was written over a year ago. It may no longer accurately reflect my views now, or may be factually outdated.
    • + + + +
  • This piece was originally written for my old site, Oh What? Oh Jeez! As such, it may not have transferred over properly and some images and links might be broken (and, to a lesser extent, my writing from years ago is about 80% run-on sentences).
    • + + + +
    • + + + +
  • This work is licensed under . Sorry about that.
    • + + + +
    + + + + +
    + +
    + +

    Post Meta

    + + S\, 1Y \<\a\b\b\r \t\i\t\l\e\=\"\H\o\l\o\c\e\n\e \E\r\a\"\>\H\.\E\.\'; + $date_format_gregorian = 'F jS, Y \C\.\E\. \(\G\r\e\g\o\r\i\a\n\)'; + + $date_holocene = get_the_date( $date_format_holocene ); + $date_gregorian = get_the_date( $date_format_gregorian ); ?> - - -
    -

    Post Meta

    - -
    -

    Contents

    -
      - - -
      2. - -
    -
    - - -
    -

    Tags

    - - - name; ?> - - -
    - -
    +
    +

    Published:  + + + +

    + +

    Last Modified:  + + + +

    + +
    + + +
    +

    External Link 1 ) ? 's' : ''; ?>

    + + 1 ) ? wp_kses_post( $split_link[0] ) : 'Link'; + $link_href = ( count( $split_link ) > 1 ) ? $split_link[1] : $split_link[0]; + ?> + + + + +
    + + + +
    +

    Contents

    +
      + +
    1. + + + +
      2. + +
    +
    + + + +
    +

    Tags

    + + + name ); ?> + + +
    + + +
    + diff --git a/template-parts/content.php b/template-parts/content.php index de6c387..473b419 100644 --- a/template-parts/content.php +++ b/template-parts/content.php @@ -1,16 +1,24 @@ -> -