Merge branch 'master' into patch-8

This commit is contained in:
Holger 2018-09-11 09:16:31 +02:00 committed by GitHub
commit 6e9f4022c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
53 changed files with 227 additions and 26 deletions

View File

@ -5,6 +5,10 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
get_header();
$container = get_theme_mod( 'understrap_container_type' );

View File

@ -7,6 +7,10 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
get_header();
?>

View File

@ -7,6 +7,10 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
get_header();
$container = get_theme_mod( 'understrap_container_type' );
?>

View File

@ -8,6 +8,10 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
/*
* If the current post is protected by a password and
* the visitor has not yet entered the password we will

View File

@ -7,6 +7,10 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
$container = get_theme_mod( 'understrap_container_type' );
?>

View File

@ -5,6 +5,10 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
/**
* Initialize theme default settings
*/

View File

@ -5,6 +5,9 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
?>
<?php if ( is_active_sidebar( 'hero' ) || is_active_sidebar( 'statichero' ) || is_active_sidebar( 'herocanvas' ) ) : ?>

View File

@ -5,6 +5,9 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
?>
<?php

View File

@ -4,6 +4,10 @@
*
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
?>
</div><!-- #closing the primary container from /global-templates/left-sidebar-check.php -->

View File

@ -12,7 +12,7 @@
"js": "./js",
"css": "./css",
"img": "./img",
"imgsrc": "./src/img",
"imgsrc": "./src/img",
"sass": "./sass",
"node": "./node_modules/",
"bower": "./bower_components/",

View File

@ -7,6 +7,10 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
$container = get_theme_mod( 'understrap_container_type' );
?>
<!DOCTYPE html>
@ -29,7 +33,7 @@ $container = get_theme_mod( 'understrap_container_type' );
<!-- ******************* The Navbar Area ******************* -->
<div id="wrapper-navbar" itemscope itemtype="http://schema.org/WebSite">
<a class="skip-link screen-reader-text sr-only" href="#content"><?php esc_html_e( 'Skip to content', 'understrap' ); ?></a>
<a class="skip-link sr-only sr-only-focusable" href="#content"><?php esc_html_e( 'Skip to content', 'understrap' ); ?></a>
<nav class="navbar navbar-expand-md navbar-dark bg-primary">

View File

@ -5,6 +5,10 @@
* @package WP-Bootstrap-Navwalker
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
/*
* Class Name: WP_Bootstrap_Navwalker
* Plugin Name: WP Bootstrap Navwalker

View File

@ -5,6 +5,10 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
// Comments form.
add_filter( 'comment_form_default_fields', 'understrap_bootstrap_comment_form_fields' );

View File

@ -5,6 +5,10 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
add_action( 'after_setup_theme', 'understrap_custom_header_setup' );
if ( ! function_exists ( 'understrap_custom_header_setup' ) ) {

View File

@ -5,6 +5,10 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
/**
* Add postMessage support for site title and description for the Theme Customizer.
*
@ -40,19 +44,25 @@ if ( ! function_exists( 'understrap_theme_customize_register' ) ) {
'priority' => 160,
) );
//select sanitization function
function understrap_theme_slug_sanitize_select( $input, $setting ){
/**
* Select sanitization function
*
* @param string $input Slug to sanitize.
* @param WP_Customize_Setting $setting Setting instance.
* @return string Sanitized slug if it is a valid choice; otherwise, the setting default.
*/
function understrap_theme_slug_sanitize_select( $input, $setting ){
//input must be a slug: lowercase alphanumeric characters, dashes and underscores are allowed only
$input = sanitize_key($input);
// Ensure input is a slug (lowercase alphanumeric characters, dashes and underscores are allowed only).
$input = sanitize_key( $input );
//get the list of possible select options
$choices = $setting->manager->get_control( $setting->id )->choices;
// Get the list of possible select options.
$choices = $setting->manager->get_control( $setting->id )->choices;
//return input if valid or return default option
return ( array_key_exists( $input, $choices ) ? $input : $setting->default );
// If the input is a valid key, return it; otherwise, return the default.
return ( array_key_exists( $input, $choices ) ? $input : $setting->default );
}
}
$wp_customize->add_setting( 'understrap_container_type', array(
'default' => 'container',
@ -66,7 +76,7 @@ if ( ! function_exists( 'understrap_theme_customize_register' ) ) {
$wp_customize,
'understrap_container_type', array(
'label' => __( 'Container Width', 'understrap' ),
'description' => __( "Choose between Bootstrap's container and container-fluid", 'understrap' ),
'description' => __( 'Choose between Bootstrap\'s container and container-fluid', 'understrap' ),
'section' => 'understrap_theme_layout_options',
'settings' => 'understrap_container_type',
'type' => 'select',
@ -90,7 +100,7 @@ if ( ! function_exists( 'understrap_theme_customize_register' ) ) {
$wp_customize,
'understrap_sidebar_position', array(
'label' => __( 'Sidebar Positioning', 'understrap' ),
'description' => __( "Set sidebar's default position. Can either be: right, left, both or none. Note: this can be overridden on individual pages.",
'description' => __( 'Set sidebar\'s default position. Can either be: right, left, both or none. Note: this can be overridden on individual pages.',
'understrap' ),
'section' => 'understrap_theme_layout_options',
'settings' => 'understrap_sidebar_position',
@ -118,7 +128,8 @@ if ( ! function_exists( 'understrap_customize_preview_js' ) ) {
*/
function understrap_customize_preview_js() {
wp_enqueue_script( 'understrap_customizer', get_template_directory_uri() . '/js/customizer.js',
array( 'customize-preview' ), '20130508', true );
array( 'customize-preview' ), '20130508', true
);
}
}
add_action( 'customize_preview_init', 'understrap_customize_preview_js' );

View File

@ -5,6 +5,10 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
/**
* Registers an editor stylesheet for the theme.
*/

View File

@ -5,6 +5,10 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
if ( ! function_exists( 'understrap_scripts' ) ) {
/**
* Load theme's JavaScript and CSS sources.

View File

@ -7,6 +7,10 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
add_filter( 'body_class', 'understrap_body_classes' );
if ( ! function_exists( 'understrap_body_classes' ) ) {

View File

@ -5,6 +5,10 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
if ( ! function_exists( 'understrap_site_info' ) ) {
/**
* Add site info hook to WP hook library.

View File

@ -7,6 +7,10 @@
* @package UnderStrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
/**
* Jetpack setup function.
*

View File

@ -5,6 +5,10 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
if ( ! function_exists ( 'understrap_pagination' ) ) {
function understrap_pagination( $args = array(), $class = 'pagination' ) {

View File

@ -5,6 +5,9 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
// Set the content width based on the theme's design and stylesheet.
if ( ! isset( $content_width ) ) {

View File

@ -7,6 +7,9 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
/**
* Prints HTML with meta information for the current post-date/time and author.

View File

@ -6,6 +6,10 @@
*
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
if ( ! function_exists ( 'understrap_setup_theme_default_settings' ) ) {
function understrap_setup_theme_default_settings() {

View File

@ -5,6 +5,10 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
/**
* Count number of widgets in a sidebar
* Used to add classes to widget areas so widgets can be displayed one, two, three or four per row
@ -54,7 +58,7 @@ if ( ! function_exists( 'understrap_widgets_init' ) ) {
register_sidebar( array(
'name' => __( 'Right Sidebar', 'understrap' ),
'id' => 'right-sidebar',
'description' => 'Right sidebar widget area',
'description' => __( 'Right sidebar widget area', 'understrap' ),
'before_widget' => '<aside id="%1$s" class="widget %2$s">',
'after_widget' => '</aside>',
'before_title' => '<h3 class="widget-title">',
@ -64,7 +68,7 @@ if ( ! function_exists( 'understrap_widgets_init' ) ) {
register_sidebar( array(
'name' => __( 'Left Sidebar', 'understrap' ),
'id' => 'left-sidebar',
'description' => 'Left sidebar widget area',
'description' => __( 'Left sidebar widget area', 'understrap' ),
'before_widget' => '<aside id="%1$s" class="widget %2$s">',
'after_widget' => '</aside>',
'before_title' => '<h3 class="widget-title">',
@ -74,7 +78,7 @@ if ( ! function_exists( 'understrap_widgets_init' ) ) {
register_sidebar( array(
'name' => __( 'Hero Slider', 'understrap' ),
'id' => 'hero',
'description' => 'Hero slider area. Place two or more widgets here and they will slide!',
'description' => __( 'Hero slider area. Place two or more widgets here and they will slide!', 'understrap' ),
'before_widget' => '<div class="carousel-item">',
'after_widget' => '</div>',
'before_title' => '',
@ -84,7 +88,7 @@ if ( ! function_exists( 'understrap_widgets_init' ) ) {
register_sidebar( array(
'name' => __( 'Hero Canvas', 'understrap' ),
'id' => 'herocanvas',
'description' => 'Full size canvas hero area for Bootstrap and other custom HTML markup',
'description' => __( 'Full size canvas hero area for Bootstrap and other custom HTML markup', 'understrap' ),
'before_widget' => '',
'after_widget' => '',
'before_title' => '',
@ -94,7 +98,7 @@ if ( ! function_exists( 'understrap_widgets_init' ) ) {
register_sidebar( array(
'name' => __( 'Top Full', 'understrap' ),
'id' => 'statichero',
'description' => 'Full top widget with dynamic grid',
'description' => __( 'Full top widget with dynamic grid', 'understrap' ),
'before_widget' => '<div id="%1$s" class="static-hero-widget %2$s '. understrap_slbd_count_widgets( 'statichero' ) .'">',
'after_widget' => '</div><!-- .static-hero-widget -->',
'before_title' => '<h3 class="widget-title">',
@ -104,7 +108,7 @@ if ( ! function_exists( 'understrap_widgets_init' ) ) {
register_sidebar( array(
'name' => __( 'Footer Full', 'understrap' ),
'id' => 'footerfull',
'description' => 'Full sized footer widget with dynamic grid',
'description' => __( 'Full sized footer widget with dynamic grid', 'understrap' ),
'before_widget' => '<div id="%1$s" class="footer-widget %2$s '. understrap_slbd_count_widgets( 'footerfull' ) .'">',
'after_widget' => '</div><!-- .footer-widget -->',
'before_title' => '<h3 class="widget-title">',

View File

@ -5,6 +5,10 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
add_action( 'after_setup_theme', 'understrap_woocommerce_support' );
if ( ! function_exists( 'understrap_woocommerce_support' ) ) {
/**

View File

@ -7,6 +7,10 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
/**
* Adds support for wp.com-specific theme functions.
*

View File

@ -11,6 +11,10 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
get_header();
$container = get_theme_mod( 'understrap_container_type' );

View File

@ -5,4 +5,8 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
the_content();

View File

@ -5,4 +5,8 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
the_content();

View File

@ -7,6 +7,9 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
?>
<section class="no-results not-found">

View File

@ -5,7 +5,11 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
?>
<article <?php post_class(); ?> id="post-<?php the_ID(); ?>">
<header class="entry-header">

View File

@ -5,7 +5,11 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
?>
<article <?php post_class(); ?> id="post-<?php the_ID(); ?>">
<header class="entry-header">

View File

@ -5,7 +5,11 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
?>
<article <?php post_class(); ?> id="post-<?php the_ID(); ?>">
<header class="entry-header">

View File

@ -5,6 +5,9 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
?>
<article <?php post_class(); ?> id="post-<?php the_ID(); ?>">

View File

@ -7,6 +7,9 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
?>
<!DOCTYPE html>
<html <?php language_attributes(); ?>>

View File

@ -7,6 +7,10 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
get_header();
$container = get_theme_mod( 'understrap_container_type' );
?>

View File

@ -8,6 +8,10 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
get_header();
while ( have_posts() ) : the_post();

View File

@ -7,6 +7,10 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
get_header();
$container = get_theme_mod( 'understrap_container_type' );
?>

View File

@ -7,6 +7,10 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
get_header();
$container = get_theme_mod( 'understrap_container_type' );
?>

View File

@ -7,6 +7,10 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
get_header();
$container = get_theme_mod( 'understrap_container_type' );
?>

View File

@ -10,6 +10,10 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
get_header();
$container = get_theme_mod( 'understrap_container_type' );

View File

@ -24,7 +24,7 @@
.wp-caption-text { font-size: inherit; }
.screen-reader-text { font-size: inherit; }
.screen-reader-text { @extend .sr-only; }
.alignleft {
display: inline;

View File

@ -5,6 +5,10 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
get_header();
$container = get_theme_mod( 'understrap_container_type' );

View File

@ -5,7 +5,11 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
?>
<form method="get" id="searchform" action="<?php echo esc_url( home_url( '/' ) ); ?>" role="search">
<label class="sr-only" for="s"><?php esc_html_e( 'Search', 'understrap' ); ?></label>
<div class="input-group">

View File

@ -5,7 +5,11 @@
* @package understrap
*/
$container = get_theme_mod( 'understrap_container_type' );
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
$container = get_theme_mod( 'understrap_container_type' );
?>

View File

@ -5,6 +5,9 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
?>
<?php if ( is_active_sidebar( 'hero' ) ) : ?>

View File

@ -5,6 +5,9 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
?>
<?php if ( is_active_sidebar( 'herocanvas' ) ) : ?>

View File

@ -5,6 +5,10 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
if ( ! is_active_sidebar( 'left-sidebar' ) ) {
return;
}

View File

@ -5,6 +5,10 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
if ( ! is_active_sidebar( 'right-sidebar' ) ) {
return;
}

View File

@ -6,6 +6,9 @@
*/
$container = get_theme_mod( 'understrap_container_type' );
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
?>

View File

@ -5,6 +5,10 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
if ( ! is_active_sidebar( 'sidebar-1' ) ) {
return;
}

View File

@ -5,6 +5,10 @@
* @package understrap
*/
if ( ! defined( 'ABSPATH' ) ) {
exit; // Exit if accessed directly.
}
get_header();
$container = get_theme_mod( 'understrap_container_type' );
?>