Skip to content

Commit

Permalink
Merge branch 'release/1.19.14'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Misplon
Misplon committed Mar 1, 2023
2 parents 03ffd58 + d9a9761 commit cfc60aa
Show file tree
Hide file tree
Showing 52 changed files with 1,664 additions and 1,574 deletions.
18 changes: 8 additions & 10 deletions 404.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,18 @@
/**
* The template for displaying 404 pages (not found).
*
* @package siteorigin-north
* @license GPL 2.0
* @license GPL 2.0
*/

get_header(); ?>

<div id="primary" class="content-area">
<main id="main" class="site-main">

<section class="error-404 not-found">
<header class="page-header">
<?php if( siteorigin_page_setting( 'page_title' ) ) : ?>
<?php if ( siteorigin_page_setting( 'page_title' ) ) { ?>
<h1 class="page-title"><?php esc_html_e( 'Oops! That page can&rsquo;t be found.', 'siteorigin-north' ); ?></h1>
<?php endif; ?>
<?php } ?>
<?php siteorigin_north_breadcrumbs(); ?>
</header><!-- .page-header -->

Expand All @@ -24,7 +22,7 @@

<?php the_widget( 'WP_Widget_Recent_Posts' ); ?>

<?php if ( siteorigin_north_categorized_blog() ) : // Only show the widget if site has multiple categories. ?>
<?php if ( siteorigin_north_categorized_blog() ) { // Only show the widget if site has multiple categories. ?>
<div class="widget widget_categories">
<h2 class="widget-title"><?php esc_html_e( 'Most Used Categories', 'siteorigin-north' ); ?></h2>
<ul>
Expand All @@ -39,12 +37,12 @@
?>
</ul>
</div><!-- .widget -->
<?php endif; ?>
<?php } ?>

<?php
/* translators: %1$s: smiley */
$archive_content = '<p>' . sprintf( esc_html__( 'Try looking in the monthly archives. %1$s', 'siteorigin-north' ), convert_smilies( ':)' ) ) . '</p>';
the_widget( 'WP_Widget_Archives', 'dropdown=1', "after_title=</h2>$archive_content" );
/* translators: %1$s: smiley */
$archive_content = '<p>' . sprintf( esc_html__( 'Try looking in the monthly archives. %1$s', 'siteorigin-north' ), convert_smilies( ':)' ) ) . '</p>';
the_widget( 'WP_Widget_Archives', 'dropdown=1', "after_title=</h2>$archive_content" );
?>

<?php the_widget( 'WP_Widget_Tag_Cloud' ); ?>
Expand Down
6 changes: 3 additions & 3 deletions admin/about/page-customize.php
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<h3><?php _e( 'Unlimited Customization', 'siteorigin-north' ) ?></h3>
<h3><?php _e( 'Unlimited Customization', 'siteorigin-north' ); ?></h3>
<p>
<?php printf( __( "North is easy to customize, right inside the %sWordPress Customizer%s.", 'siteorigin-north' ), '<a href="' . admin_url( 'customize.php' ) . '">', '</a>' ) ?>
<?php printf( __( "If there's something else you need to customize, then try out our free %sSiteOrigin CSS%s plugin.", 'siteorigin-north' ), '<a href="https://wordpress.org/plugins/so-css/">', '</a>' ) ?>
<?php printf( __( 'North is easy to customize, right inside the %sWordPress Customizer%s.', 'siteorigin-north' ), '<a href="' . admin_url( 'customize.php' ) . '">', '</a>' ); ?>
<?php printf( __( "If there's something else you need to customize, then try out our free %sSiteOrigin CSS%s plugin.", 'siteorigin-north' ), '<a href="https://wordpress.org/plugins/so-css/">', '</a>' ); ?>
</p>
6 changes: 3 additions & 3 deletions admin/about/page-free.php
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<h3><?php _e( 'Forever Free', 'siteorigin-north' ) ?></h3>
<h3><?php _e( 'Forever Free', 'siteorigin-north' ); ?></h3>
<p>
<?php _e( "North is a completely free WordPress theme.", 'siteorigin-north' ) ?>
<?php _e( "We'll continue developing and enhancing it for years to come.", 'siteorigin-north' ) ?>
<?php _e( 'North is a completely free WordPress theme.', 'siteorigin-north' ); ?>
<?php _e( "We'll continue developing and enhancing it for years to come.", 'siteorigin-north' ); ?>
</p>
6 changes: 3 additions & 3 deletions admin/about/page-github.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<h3><?php _e( 'Developed on Github', 'siteorigin-north' ) ?></h3>
<h3><?php _e( 'Developed on Github', 'siteorigin-north' ); ?></h3>
<img src="<?php echo esc_url( get_template_directory_uri() ); ?>/admin/about/github.png" class="about-image-right about-image-no-text-below" />
<p>
<?php printf( __( "North is actively %sdeveloped on Github%s.", 'siteorigin-north' ), '<a href="https://github.com/siteorigin/siteorigin-north">', '</a>' ) ?>
<?php _e( "You can watch what's happening with its development and even make contributions yourself.", 'siteorigin-north' ) ?>
<?php printf( __( 'North is actively %sdeveloped on Github%s.', 'siteorigin-north' ), '<a href="https://github.com/siteorigin/siteorigin-north">', '</a>' ); ?>
<?php _e( "You can watch what's happening with its development and even make contributions yourself.", 'siteorigin-north' ); ?>
</p>
6 changes: 3 additions & 3 deletions admin/about/page-page-builder.php
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<h3><?php _e( 'Enhanced by Page Builder', 'siteorigin-north' ) ?></h3>
<h3><?php _e( 'Enhanced by Page Builder', 'siteorigin-north' ); ?></h3>
<p>
<?php printf( __( "North integrates, beautifully, with our %sfree Page Builder%s plugin.", 'siteorigin-north' ), '<a href="https://siteorigin.com/page-builder/">', '</a>' ) ?>
<?php _e( 'This powerful plugin gives you full drag and drop capabilities right inside North.', 'siteorigin-north' ) ?>
<?php printf( __( 'North integrates, beautifully, with our %sfree Page Builder%s plugin.', 'siteorigin-north' ), '<a href="https://siteorigin.com/page-builder/">', '</a>' ); ?>
<?php _e( 'This powerful plugin gives you full drag and drop capabilities right inside North.', 'siteorigin-north' ); ?>
</p>
4 changes: 2 additions & 2 deletions admin/about/page-support.php
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<h3><?php _e( 'Support and Documentation', 'siteorigin-north' ) ?></h3>
<h3><?php _e( 'Support and Documentation', 'siteorigin-north' ); ?></h3>
<p>
<?php printf( __( "Our dedicated support team is ready to help you over on our %sfree support forums%s.", 'siteorigin-north' ), '<a href="https://siteorigin.com/thread/">', '</a>' ) ?>
<?php printf( __( 'Our dedicated support team is ready to help you over on our %sfree support forums%s.', 'siteorigin-north' ), '<a href="https://siteorigin.com/thread/">', '</a>' ); ?>
</p>
35 changes: 17 additions & 18 deletions archive.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,46 +4,45 @@
*
* Learn more: http://codex.wordpress.org/Template_Hierarchy
*
* @package siteorigin-north
* @license GPL 2.0
* @license GPL 2.0
*/

get_header(); ?>

<div id="primary" class="content-area">
<main id="main" class="site-main">

<?php if ( have_posts() ) : ?>
<?php if ( have_posts() ) { ?>
<header class="page-header">
<?php
if( siteorigin_page_setting( 'page_title' ) ) the_archive_title( '<h1 class="page-title">', '</h1>' );
if ( siteorigin_page_setting( 'page_title' ) ) {
the_archive_title( '<h1 class="page-title">', '</h1>' );
}
the_archive_description( '<div class="taxonomy-description">', '</div>' );
?>
<?php siteorigin_north_breadcrumbs(); ?>
</header><!-- .page-header -->

<?php /* Start the Loop */ ?>
<?php while ( have_posts() ) : the_post(); ?>

<?php
<?php 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.
*/
get_template_part( 'template-parts/content', get_post_format() );
?>
/*
* 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.
*/
get_template_part( 'template-parts/content', get_post_format() );
?>

<?php endwhile; ?>
<?php } ?>

<?php siteorigin_north_posts_pagination(); ?>

<?php else : ?>
<?php } else { ?>

<?php get_template_part( 'template-parts/content', 'none' ); ?>

<?php endif; ?>
<?php } ?>

</main><!-- #main -->
</div><!-- #primary -->
Expand Down
25 changes: 12 additions & 13 deletions comments.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
* The area of the page that contains both current comments
* and the comment form.
*
* @package siteorigin-north
* @license GPL 2.0
* @license GPL 2.0
*/

/*
Expand All @@ -22,10 +21,11 @@
<div id="comments" class="comments-area">

<?php
if ( have_comments() ) : ?>
if ( have_comments() ) { ?>
<h2 class="comments-title">
<?php
$comment_count = get_comments_number();

if ( 1 === $comment_count ) {
printf(
/* translators: 1: title. */
Expand All @@ -47,24 +47,23 @@

<ol class="comment-list">
<?php
wp_list_comments( array(
'style' => 'ol',
'callback' => 'siteorigin_north_comment',
'short_ping' => true,
) );
wp_list_comments( array(
'style' => 'ol',
'callback' => 'siteorigin_north_comment',
'short_ping' => true,
) );
?>
</ol><!-- .comment-list -->

<?php the_comments_navigation();

endif; // Check for have_comments().
<?php the_comments_navigation();
} // Check for have_comments().

// If comments are closed and there are comments, let's leave a little note, shall we?
if ( ! comments_open() && get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) : ?>
if ( ! comments_open() && get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) { ?>

<p class="no-comments"><?php esc_html_e( 'Comments are closed.', 'siteorigin-north' ); ?></p>
<?php
endif;
}

comment_form();
?>
Expand Down
62 changes: 39 additions & 23 deletions footer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,58 +4,74 @@
*
* Contains the closing of the #content div and all content after.
*
* @link https://developer.wordpress.org/themes/basics/template-files/#template-partials
* @see https://developer.wordpress.org/themes/basics/template-files/#template-partials
*
* @package siteorigin-north
* @license GPL 2.0
* @license GPL 2.0
*/

$footer_class = '';
if ( ! siteorigin_setting( 'footer_constrained' ) ) {
$footer_class .= ' unconstrained-footer';
}

if ( is_active_sidebar( 'footer-sidebar' ) ) {
$footer_class .= ' footer-active-sidebar';
}
?>

</div><!-- .container -->
</div><!-- #content -->

<?php do_action( 'siteorigin_north_footer_before' ); ?>

<footer id="colophon" class="site-footer <?php if ( ! siteorigin_setting( 'footer_constrained' ) ) echo 'unconstrained-footer'; if ( is_active_sidebar( 'footer-sidebar' ) ) echo ' footer-active-sidebar'; ?>">
<footer id="colophon" class="site-footer<?php echo $footer_class; ?>">

<?php do_action( 'siteorigin_north_footer_top' ); ?>

<?php if ( ! siteorigin_page_setting( 'hide_footer_widgets', false ) && ! in_array( siteorigin_page_setting( 'layout' ), array( 'stripped' ), true ) ) : ?>
<?php
if (
! siteorigin_page_setting( 'hide_footer_widgets', false ) &&
! in_array( siteorigin_page_setting( 'layout' ), array( 'stripped' ), true )
) {
?>
<div class="container">

<?php
if ( is_active_sidebar( 'footer-sidebar' ) ) {
$siteorigin_north_sidebars = wp_get_sidebars_widgets();
?>
<div class="widgets widget-area widgets-<?php echo count( $siteorigin_north_sidebars['footer-sidebar'] ) ?>" aria-label="<?php esc_attr_e( 'Footer Sidebar', 'siteorigin-north' ); ?>">
<div class="widgets widget-area widgets-<?php echo count( $siteorigin_north_sidebars['footer-sidebar'] ); ?>" aria-label="<?php esc_attr_e( 'Footer Sidebar', 'siteorigin-north' ); ?>">
<?php dynamic_sidebar( 'footer-sidebar' ); ?>
</div>
<?php
}
?>

</div><!-- .container -->
<?php endif; ?>
<?php } ?>

<div class="site-info">
<div class="container">
<?php
siteorigin_north_footer_text();

if ( function_exists( 'the_privacy_policy_link' ) && siteorigin_setting( 'footer_privacy_policy_link' ) ) {
the_privacy_policy_link( '<span>', '</span>' );
}
siteorigin_north_footer_text();

$credit_text = apply_filters(
'siteorigin_north_footer_credits',
'<span>' . sprintf( esc_html__( 'Theme by %s', 'siteorigin-north' ), '<a href="https://siteorigin.com/">SiteOrigin</a>' ) . '</span>'
);
if ( function_exists( 'the_privacy_policy_link' ) && siteorigin_setting( 'footer_privacy_policy_link' ) ) {
the_privacy_policy_link( '<span>', '</span>' );
}

if ( ! empty( $credit_text ) ) {
echo wp_kses_post( $credit_text );
}
?>
$credit_text = apply_filters(
'siteorigin_north_footer_credits',
'<span>' .
sprintf(
esc_html__( 'Theme by %s', 'siteorigin-north' ),
'<a href="https://siteorigin.com/">SiteOrigin</a>'
)
. '</span>'
);

if ( ! empty( $credit_text ) ) {
echo wp_kses_post( $credit_text );
}
?>
</div>
</div><!-- .site-info -->

Expand All @@ -64,12 +80,12 @@
</footer><!-- #colophon -->
</div><!-- #page -->

<?php if ( siteorigin_setting( 'navigation_scroll_to_top' ) && siteorigin_page_setting( 'layout' ) !== 'stripped' ) : ?>
<?php if ( siteorigin_setting( 'navigation_scroll_to_top' ) && siteorigin_page_setting( 'layout' ) !== 'stripped' ) { ?>
<div id="scroll-to-top">
<span class="screen-reader-text"><?php esc_html_e( 'Scroll to top', 'siteorigin-north' ); ?></span>
<?php siteorigin_north_display_icon( 'up-arrow' ); ?>
</div>
<?php endif; ?>
<?php } ?>

<?php wp_footer(); ?>

Expand Down
Loading

0 comments on commit cfc60aa

Please sign in to comment.