Skip to content

Commit

Permalink
Merge branch 'release/1.9.8'
Browse files Browse the repository at this point in the history
  • Loading branch information
@Misplon
Misplon committed Mar 2, 2023
2 parents 863047a + 78cbba7 commit a5ad3bd
Show file tree
Hide file tree
Showing 67 changed files with 2,023 additions and 1,923 deletions.
44 changes: 21 additions & 23 deletions 404.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,60 +2,58 @@
/**
* The template for displaying 404 pages (not found).
*
* @link https://codex.wordpress.org/Creating_an_Error_404_Page
*
* @package siteorigin-unwind
* @see https://codex.wordpress.org/Creating_an_Error_404_Page
* @since siteorigin-unwind 0.1
*
* @license GPL 2.0
*/

get_header(); ?>

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

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

<div class="page-content">
<p><?php esc_html_e( 'It looks like nothing was found at this location. Maybe try one of the links below or a search?', 'siteorigin-unwind' ); ?></p>

<?php
get_search_form();
get_search_form();

the_widget( 'WP_Widget_Recent_Posts' );
the_widget( 'WP_Widget_Recent_Posts' );

// Only show the widget if site has multiple categories.
if ( siteorigin_unwind_categorized_blog() ) :
?>
// Only show the widget if site has multiple categories.
if ( siteorigin_unwind_categorized_blog() ) {
?>

<div class="widget widget_categories">
<h2 class="widget-title"><?php esc_html_e( 'Most Used Categories', 'siteorigin-unwind' ); ?></h2>
<ul>
<?php
<div class="widget widget_categories">
<h2 class="widget-title"><?php esc_html_e( 'Most Used Categories', 'siteorigin-unwind' ); ?></h2>
<ul>
<?php
wp_list_categories( array(
'orderby' => 'count',
'order' => 'DESC',
'show_count' => 1,
'title_li' => '',
'number' => 10,
) );
?>
</ul>
</div><!-- .widget -->
?>
</ul>
</div><!-- .widget -->

<?php
endif;
}

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

the_widget( 'WP_Widget_Tag_Cloud' );
the_widget( 'WP_Widget_Tag_Cloud' );
?>

</div><!-- .page-content -->
Expand Down
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-unwind' ) ?></h3>
<h3><?php _e( 'Forever Free', 'siteorigin-unwind' ); ?></h3>
<p>
<?php _e( "Unwind is a completely free WordPress theme.", 'siteorigin-unwind' ) ?>
<?php _e( "We'll continue developing and enhancing it for years to come.", 'siteorigin-unwind' ) ?>
<?php _e( 'Unwind is a completely free WordPress theme.', 'siteorigin-unwind' ); ?>
<?php _e( "We'll continue developing and enhancing it for years to come.", 'siteorigin-unwind' ); ?>
</p>
8 changes: 4 additions & 4 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-unwind' ) ?></h3>
<img src="<?php echo esc_url( get_template_directory_uri() ) ?>/admin/about/github.png" class="about-image-right about-image-no-text-below" />
<h3><?php _e( 'Developed on Github', 'siteorigin-unwind' ); ?></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( __( "Unwind is actively %sdeveloped on Github%s.", 'siteorigin-unwind' ), '<a href="https://github.com/siteorigin/siteorigin-unwind">', '</a>' ) ?>
<?php _e( "You can watch what's happening with its development and even make contributions yourself.", 'siteorigin-unwind' ) ?>
<?php printf( __( 'Unwind is actively %sdeveloped on Github%s.', 'siteorigin-unwind' ), '<a href="https://github.com/siteorigin/siteorigin-unwind">', '</a>' ); ?>
<?php _e( "You can watch what's happening with its development and even make contributions yourself.", 'siteorigin-unwind' ); ?>
</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-unwind' ) ?></h3>
<h3><?php _e( 'Enhanced by Page Builder', 'siteorigin-unwind' ); ?></h3>
<p>
<?php printf( __( "Unwind integrates, beautifully, with our %sfree Page Builder%s plugin.", 'siteorigin-unwind' ), '<a href="https://siteorigin.com/page-builder/">', '</a>' ) ?>
<?php _e( 'This powerful plugin gives you full drag and drop capabilities right inside Unwind.', 'siteorigin-unwind' ) ?>
<?php printf( __( 'Unwind integrates, beautifully, with our %sfree Page Builder%s plugin.', 'siteorigin-unwind' ), '<a href="https://siteorigin.com/page-builder/">', '</a>' ); ?>
<?php _e( 'This powerful plugin gives you full drag and drop capabilities right inside Unwind.', 'siteorigin-unwind' ); ?>
</p>
6 changes: 3 additions & 3 deletions admin/about/page-support.php
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<h3><?php _e( 'Lightning Fast Support', 'siteorigin-unwind' ) ?></h3>
<h3><?php _e( 'Lightning Fast Support', 'siteorigin-unwind' ); ?></h3>
<p>
<?php printf( __( "As an Unwind user, you'll get fast, friendly support on our own %ssupport forums%s.", 'siteorigin-unwind' ), '<a href="https://siteorigin.com/thread/">', '</a>' ) ?>
<?php printf( __( "You can also read through the %sUnwind documentation%s to get to know it even faster.", 'siteorigin-unwind' ), '<a href="https://siteorigin.com/unwind-documentation/">', '</a>' ) ?>
<?php printf( __( "As an Unwind user, you'll get fast, friendly support on our own %ssupport forums%s.", 'siteorigin-unwind' ), '<a href="https://siteorigin.com/thread/">', '</a>' ); ?>
<?php printf( __( 'You can also read through the %sUnwind documentation%s to get to know it even faster.', 'siteorigin-unwind' ), '<a href="https://siteorigin.com/unwind-documentation/">', '</a>' ); ?>
</p>
8 changes: 4 additions & 4 deletions admin/about/page-woocommerce.php
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<h3><?php _e( 'WooCommerce Integration', 'siteorigin-unwind' ) ?></h3>
<img src="<?php echo esc_url( get_template_directory_uri() ) ?>/admin/about/woocommerce.png" class="about-image-right about-image-no-text-below" />
<h3><?php _e( 'WooCommerce Integration', 'siteorigin-unwind' ); ?></h3>
<img src="<?php echo esc_url( get_template_directory_uri() ); ?>/admin/about/woocommerce.png" class="about-image-right about-image-no-text-below" />
<p>
<?php _e( "Unwind is a full-featured WooCommerce theme.", 'siteorigin-unwind' ) ?>
<?php _e( "Use it to build your full online store with a stunning design and features like quick-view.", 'siteorigin-unwind' ) ?>
<?php _e( 'Unwind is a full-featured WooCommerce theme.', 'siteorigin-unwind' ); ?>
<?php _e( 'Use it to build your full online store with a stunning design and features like quick-view.', 'siteorigin-unwind' ); ?>
</p>
6 changes: 2 additions & 4 deletions archive-jetpack-portfolio.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
/**
* The template for displaying Jetpack Portfolio archive pages.
*
* @link https://codex.wordpress.org/Template_Hierarchy
*
* @package siteorigin-unwind
* @see https://codex.wordpress.org/Template_Hierarchy
* @since siteorigin-unwind 1.2.15
*
* @license GPL 2.0
*/

get_header(); ?>

<?php siteorigin_unwind_archive_title(); ?>
Expand Down
35 changes: 13 additions & 22 deletions archive.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@
/**
* The template for displaying archive pages.
*
* @link https://codex.wordpress.org/Template_Hierarchy
*
* @package siteorigin-unwind
* @see https://codex.wordpress.org/Template_Hierarchy
* @since siteorigin-unwind 0.1
*
* @license GPL 2.0
*/

get_header(); ?>

<?php siteorigin_unwind_archive_title(); ?>
Expand All @@ -19,35 +17,28 @@

<main id="main" class="site-main">

<?php
if ( is_tax( 'jetpack-portfolio-type' ) || is_tax( 'jetpack-portfolio-tag' ) ) :

if ( have_posts() ) : ?>
<?php
if ( is_tax( 'jetpack-portfolio-type' ) || is_tax( 'jetpack-portfolio-tag' ) ) {
if ( have_posts() ) { ?>

<div class="portfolio-archive-layout">
<?php
/* Start the Loop */
while ( have_posts() ) : the_post();
while ( have_posts() ) {
the_post();

get_template_part( 'template-parts/content', 'portfolio' );

endwhile;
?>
}
?>
</div><?php

siteorigin_unwind_posts_navigation();

else :

} else {
get_template_part( 'template-parts/content', 'none' );

endif;

else :

}
} else {
get_template_part( 'loops/loop', 'blog-' . siteorigin_setting( 'blog_archive_layout' ) );

endif;
}
?>

</main><!-- #main -->
Expand Down
72 changes: 35 additions & 37 deletions comments.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@
* This is the template that displays the area of the page that contains both the current comments
* and the comment form.
*
* @link https://codex.wordpress.org/Template_Hierarchy
*
* @package siteorigin-unwind
* @see https://codex.wordpress.org/Template_Hierarchy
* @since siteorigin-unwind 0.1
*
* @license GPL 2.0
*/

Expand All @@ -25,33 +24,34 @@
<div id="comments" class="comments-area">

<?php
if ( have_comments() ) : ?>
if ( have_comments() ) { ?>
<h2 class="comments-title heading-strike">
<?php
$comment_count = get_comments_number();
if ( 1 === $comment_count ) {
printf(
/* Translators: 1: title. */
esc_html_e( '1 Comment', 'siteorigin-unwind' ),
'<span>' . get_the_title() . '</span>'
);
} else {
printf( // WPCS: XSS OK.
/* Translators: 1: comment count number, 2: title. */
esc_html( _nx( '%1$s Comment', '%1$s Comments', $comment_count, 'comments title', 'siteorigin-unwind' ) ),
number_format_i18n( $comment_count ),
'<span>' . get_the_title() . '</span>'
);
}
?>
</h2><!--. comments-title -->

<?php
$args = array(
'prev_text' => '<span>&larr;</span>' . esc_html__( 'Older comments', 'siteorigin-unwind' ),
'next_text' => esc_html__( 'Newer comments', 'siteorigin-unwind' ) . '<span>&rarr;</span>',
if ( 1 === $comment_count ) {
printf(
/* Translators: 1: title. */
esc_html_e( '1 Comment', 'siteorigin-unwind' ),
'<span>' . get_the_title() . '</span>'
);
the_comments_navigation( $args );
} else {
printf( // WPCS: XSS OK.
/* Translators: 1: comment count number, 2: title. */
esc_html( _nx( '%1$s Comment', '%1$s Comments', $comment_count, 'comments title', 'siteorigin-unwind' ) ),
number_format_i18n( $comment_count ),
'<span>' . get_the_title() . '</span>'
);
}
?>
</h2><!--. comments-title -->

<?php
$args = array(
'prev_text' => '<span>&larr;</span>' . esc_html__( 'Older comments', 'siteorigin-unwind' ),
'next_text' => esc_html__( 'Newer comments', 'siteorigin-unwind' ) . '<span>&rarr;</span>',
);
the_comments_navigation( $args );
?>

<ol class="comment-list">
Expand All @@ -61,25 +61,23 @@
'callback' => 'siteorigin_unwind_comment',
'short_ping' => true,
) );
?>
?>
</ol><!-- .comment-list -->

<?php
$args = array(
'prev_text' => '<span>&larr;</span>' . esc_html__( 'Older comments', 'siteorigin-unwind' ),
'next_text' => esc_html__( 'Newer comments', 'siteorigin-unwind' ) . '<span>&rarr;</span>',
);
the_comments_navigation( $args );

endif; // Check for have_comments().

<?php
$args = array(
'prev_text' => '<span>&larr;</span>' . esc_html__( 'Older comments', 'siteorigin-unwind' ),
'next_text' => esc_html__( 'Newer comments', 'siteorigin-unwind' ) . '<span>&rarr;</span>',
);
the_comments_navigation( $args );
} // 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-unwind' ); ?></p>
<?php
endif;
}

comment_form();
?>
Expand Down
26 changes: 16 additions & 10 deletions footer.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,33 +4,39 @@
*
* Contains the closing of the #content div and all content after.
*
* @link https://developer.wordpress.org/themes/basics/template-files/#template-partials
*
* @package siteorigin-unwind
* @see https://developer.wordpress.org/themes/basics/template-files/#template-partials
* @since siteorigin-unwind 0.1
*
* @license GPL 2.0
*/
$footer_classes = '';
if ( ! siteorigin_setting( 'footer_constrained' ) ) {
$footer_classes .= ' unconstrained-footer';
}

if ( is_active_sidebar( 'footer-sidebar' ) ) {
$footer_classes .= ' footer-active-sidebar';
}
?>
</div><!-- .container -->
</div><!-- #content -->

<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_classes; ?>">

<?php if ( siteorigin_page_setting( 'display_footer_widgets', true ) ) : ?>
<?php if ( siteorigin_page_setting( 'display_footer_widgets', true ) ) { ?>
<div class="container">
<?php
if ( is_active_sidebar( 'footer-sidebar' ) ) {
$siteorigin_unwind_sidebars = wp_get_sidebars_widgets();
?>
<div class="widgets widgets-<?php echo count( $siteorigin_unwind_sidebars['footer-sidebar'] ) ?>" aria-label="<?php esc_attr_e( 'Footer Sidebar', 'siteorigin-unwind' ); ?>">
<div class="widgets widgets-<?php echo count( $siteorigin_unwind_sidebars['footer-sidebar'] ); ?>" aria-label="<?php esc_attr_e( 'Footer Sidebar', 'siteorigin-unwind' ); ?>">
<?php dynamic_sidebar( 'footer-sidebar' ); ?>
</div>
<?php
}
?>
?>
</div>
<?php endif; ?>
<?php } ?>

<div class="site-info">
<div class="container">
Expand All @@ -55,12 +61,12 @@
</footer><!-- #colophon -->
</div><!-- #page -->

<?php if ( siteorigin_setting( 'navigation_scroll_to_top' ) ) : ?>
<?php if ( siteorigin_setting( 'navigation_scroll_to_top' ) ) { ?>
<div id="scroll-to-top">
<span class="screen-reader-text"><?php esc_html_e( 'Scroll to top', 'siteorigin-unwind' ); ?></span>
<?php siteorigin_unwind_display_icon( 'up-arrow' ); ?>
</div>
<?php endif; ?>
<?php } ?>

<?php wp_footer(); ?>

Expand Down
Loading

0 comments on commit a5ad3bd

Please sign in to comment.