Skip to content

Commit eed15d8

Browse files
holgerkoenemannholgerkoenemann
committed
Update to final release 0.3.9.7
1 parent fe7e97e commit eed15d8

35 files changed

+184
-209
lines changed

‎404.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
33
* The template for displaying 404 pages (not found).
4-
* @package understrap-bs3
4+
* @package understrap
55
*/
66

77
get_header(); ?>
@@ -19,22 +19,22 @@
1919

2020
<header class="page-header">
2121

22-
<h1 class="page-title"><?php _e( 'Oops! That page can&rsquo;t be found.', 'understrap-bs3' ); ?></h1>
22+
<h1 class="page-title"><?php _e( 'Oops! That page can&rsquo;t be found.', 'understrap' ); ?></h1>
2323
</header><!-- .page-header -->
2424

2525
<div class="page-content">
2626

27-
<p><?php _e( 'It looks like nothing was found at this location. Maybe try one of the links below or a search?', 'understrap-bs3' ); ?></p>
27+
<p><?php _e( 'It looks like nothing was found at this location. Maybe try one of the links below or a search?', 'understrap' ); ?></p>
2828

2929
<?php get_search_form(); ?>
3030

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

33-
<?php if ( understrap_bs3_categorized_blog() ) : // Only show the widget if site has multiple categories. ?>
33+
<?php if ( understrap_categorized_blog() ) : // Only show the widget if site has multiple categories. ?>
3434

3535
<div class="widget widget_categories">
3636

37-
<h2 class="widget-title"><?php _e( 'Most Used Categories', 'understrap-bs3' ); ?></h2>
37+
<h2 class="widget-title"><?php _e( 'Most Used Categories', 'understrap' ); ?></h2>
3838

3939
<ul>
4040
<?php
@@ -54,7 +54,7 @@
5454

5555
<?php
5656
/* translators: %1$s: smiley */
57-
$archive_content = '<p>' . sprintf( __( 'Try looking in the monthly archives. %1$s', 'understrap-bs3' ), convert_smilies( ':)' ) ) . '</p>';
57+
$archive_content = '<p>' . sprintf( __( 'Try looking in the monthly archives. %1$s', 'understrap' ), convert_smilies( ':)' ) ) . '</p>';
5858
the_widget( 'WP_Widget_Archives', 'dropdown=1', "after_title=</h2>$archive_content" );
5959
?>
6060

‎archive.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* Learn more: http://codex.wordpress.org/Template_Hierarchy
66
*
7-
* @package understrap-bs3
7+
* @package understrap
88
*/
99

1010
get_header(); ?>

‎bower.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "understrap",
3-
"version": "0.3.9",
3+
"version": "0.3.9.5",
44
"homepage": "http://understrap.com",
55
"authors": [
66
"Holger Koenemann <[email protected]>"
@@ -31,6 +31,6 @@
3131
"bootstrap": "v4.0.0-alpha.2"
3232
},
3333
"_source": "https://github.com/holger1411/understrap.git",
34-
"_target": "~0.3.9",
34+
"_target": "~0.3.9.5",
3535
"_originalSource": "understrap"
3636
}

‎comments.php

+9-9
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* The area of the page that contains both current comments
66
* and the comment form.
77
*
8-
* @package understrap-bs3
8+
* @package understrap
99
*/
1010

1111
/*
@@ -25,19 +25,19 @@
2525
<?php if ( have_comments() ) : ?>
2626
<h2 class="comments-title">
2727
<?php
28-
printf( _nx( 'One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'comments title', 'understrap-bs3' ),
28+
printf( _nx( 'One thought on &ldquo;%2$s&rdquo;', '%1$s thoughts on &ldquo;%2$s&rdquo;', get_comments_number(), 'comments title', 'understrap' ),
2929
number_format_i18n( get_comments_number() ), '<span>' . get_the_title() . '</span>' );
3030
?>
3131
</h2>
3232

3333
<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
3434
<nav id="comment-nav-above" class="comment-navigation" role="navigation">
35-
<h1 class="screen-reader-text"><?php _e( 'Comment navigation', 'understrap-bs3' ); ?></h1>
35+
<h1 class="screen-reader-text"><?php _e( 'Comment navigation', 'understrap' ); ?></h1>
3636
<?php if ( get_previous_comments_link() ) { ?>
37-
<div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'understrap-bs3' ) ); ?></div>
37+
<div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'understrap' ) ); ?></div>
3838
<?php }
3939
if ( get_next_comments_link() ) { ?>
40-
<div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'understrap-bs3' ) ); ?></div>
40+
<div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'understrap' ) ); ?></div>
4141
<?php } ?>
4242
</nav><!-- #comment-nav-above -->
4343
<?php endif; // check for comment navigation ?>
@@ -53,12 +53,12 @@
5353

5454
<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // are there comments to navigate through ?>
5555
<nav id="comment-nav-below" class="comment-navigation" role="navigation">
56-
<h1 class="screen-reader-text"><?php _e( 'Comment navigation', 'understrap-bs3' ); ?></h1>
56+
<h1 class="screen-reader-text"><?php _e( 'Comment navigation', 'understrap' ); ?></h1>
5757
<?php if ( get_previous_comments_link() ) { ?>
58-
<div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'understrap-bs3' ) ); ?></div>
58+
<div class="nav-previous"><?php previous_comments_link( __( '&larr; Older Comments', 'understrap' ) ); ?></div>
5959
<?php }
6060
if ( get_next_comments_link() ) { ?>
61-
<div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'understrap-bs3' ) ); ?></div>
61+
<div class="nav-next"><?php next_comments_link( __( 'Newer Comments &rarr;', 'understrap' ) ); ?></div>
6262
<?php } ?>
6363
</nav><!-- #comment-nav-below -->
6464
<?php endif; // check for comment navigation ?>
@@ -69,7 +69,7 @@
6969
// If comments are closed and there are comments, let's leave a little note, shall we?
7070
if ( ! comments_open() && '0' != get_comments_number() && post_type_supports( get_post_type(), 'comments' ) ) :
7171
?>
72-
<p class="no-comments"><?php _e( 'Comments are closed.', 'understrap-bs3' ); ?></p>
72+
<p class="no-comments"><?php _e( 'Comments are closed.', 'understrap' ); ?></p>
7373
<?php endif; ?>
7474

7575
<?php

‎footer.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* Contains the closing of the #content div and all content after
66
*
7-
* @package understrap-bs3
7+
* @package understrap
88
*/
99
?>
1010

@@ -21,9 +21,9 @@
2121
<footer id="colophon" class="site-footer" role="contentinfo">
2222

2323
<div class="site-info">
24-
<a href="<?php echo esc_url( __( 'http://wordpress.org/', 'understrap-bs3' ) ); ?>"><?php printf( __( 'Proudly powered by %s', 'understrap-bs3' ), 'WordPress' ); ?></a>
24+
<a href="<?php echo esc_url( __( 'http://wordpress.org/', 'understrap' ) ); ?>"><?php printf( __( 'Proudly powered by %s', 'understrap' ), 'WordPress' ); ?></a>
2525
<span class="sep"> | </span>
26-
<?php printf( __( 'Theme: %1$s by %2$s.', 'understrap-bs3' ), 'understrap-bs3', '<a href="http://understrap.com/" rel="designer">understrap.com</a>' ); ?>
26+
<?php printf( __( 'Theme: %1$s by %2$s.', 'understrap' ), 'understrap', '<a href="http://understrap.com/" rel="designer">understrap.com</a>' ); ?>
2727
</div><!-- .site-info -->
2828

2929
</footer><!-- #colophon -->

‎functions.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
/**
33
* understrap functions and definitions
44
*
5-
* @package understrap-bs3
5+
* @package understrap
66
*/
77

88
/**

‎header.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
*
55
* Displays all of the <head> section and everything up till <div id="content">
66
*
7-
* @package understrap-bs3
7+
* @package understrap
88
*/
99
?><!DOCTYPE html>
1010
<html <?php language_attributes(); ?>>
@@ -27,7 +27,7 @@
2727
<!-- ******************* The Navbar Area ******************* -->
2828
<div class="wrapper-fluid wrapper-navbar" id="wrapper-navbar">
2929

30-
<a class="skip-link screen-reader-text" href="#content"><?php _e( 'Skip to content', 'understrap-bs3' ); ?></a>
30+
<a class="skip-link screen-reader-text" href="#content"><?php _e( 'Skip to content', 'understrap' ); ?></a>
3131

3232
<nav class="site-navigation" itemscope="itemscope" itemtype="http://schema.org/SiteNavigationElement">
3333

‎inc/bootstrap-wp-navwalker.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* Author: Edward McIntyre - @twittem
1414
* License: GPL-2.0+
1515
* License URI: http://www.gnu.org/licenses/gpl-2.0.txt
16-
* @package understrap-bs3
16+
* @package understrap
1717
*/
1818
//exit if accessed directly
1919
if(!defined('ABSPATH')) exit;

‎inc/custom-comments.php

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ function bootstrap3_comment_form_fields( $fields ) {
99
$aria_req = ( $req ? " aria-required='true'" : '' );
1010
$html5 = current_theme_supports( 'html5', 'comment-form' ) ? 1 : 0;
1111
$fields = array(
12-
'author' => '<div class="form-group comment-form-author">' . '<label for="author">' . __( 'Name', 'understrap-bs3' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
12+
'author' => '<div class="form-group comment-form-author">' . '<label for="author">' . __( 'Name', 'understrap' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
1313
'<input class="form-control" id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30"' . $aria_req . ' /></div>',
14-
'email' => '<div class="form-group comment-form-email"><label for="email">' . __( 'Email', 'understrap-bs3' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
14+
'email' => '<div class="form-group comment-form-email"><label for="email">' . __( 'Email', 'understrap' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
1515
'<input class="form-control" id="email" name="email" ' . ( $html5 ? 'type="email"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_email'] ) . '" size="30"' . $aria_req . ' /></div>',
16-
'url' => '<div class="form-group comment-form-url"><label for="url">' . __( 'Website', 'understrap-bs3' ) . '</label> ' .
16+
'url' => '<div class="form-group comment-form-url"><label for="url">' . __( 'Website', 'understrap' ) . '</label> ' .
1717
'<input class="form-control" id="url" name="url" ' . ( $html5 ? 'type="url"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" /></div>',
1818
);
1919
return $fields;
@@ -22,7 +22,7 @@ function bootstrap3_comment_form_fields( $fields ) {
2222
add_filter( 'comment_form_defaults', 'bootstrap3_comment_form' );
2323
function bootstrap3_comment_form( $args ) {
2424
$args['comment_field'] = '<div class="form-group comment-form-comment">
25-
<label for="comment">' . _x( 'Comment', 'noun', 'understrap-bs3' ) . ( ' <span class="required">*</span>' ) . '</label>
25+
<label for="comment">' . _x( 'Comment', 'noun', 'understrap' ) . ( ' <span class="required">*</span>' ) . '</label>
2626
<textarea class="form-control" id="comment" name="comment" cols="45" rows="8" aria-required="true"></textarea>
2727
</div>';
2828
$args['class_submit'] = 'btn btn-default'; // since WP 4.1

‎inc/customizer.php

+21-21
Original file line numberDiff line numberDiff line change
@@ -2,62 +2,62 @@
22
/**
33
* understrap Theme Customizer
44
*
5-
* @package understrap-bs3
5+
* @package understrap
66
*/
77

88
/**
99
* Add postMessage support for site title and description for the Theme Customizer.
1010
*
1111
* @param WP_Customize_Manager $wp_customize Theme Customizer object.
1212
*/
13-
function understrap_bs3_customize_register( $wp_customize ) {
13+
function understrap_customize_register( $wp_customize ) {
1414
$wp_customize->get_setting( 'blogname' )->transport = 'postMessage';
1515
$wp_customize->get_setting( 'blogdescription' )->transport = 'postMessage';
1616
$wp_customize->get_setting( 'header_textcolor' )->transport = 'postMessage';
1717

1818
}
19-
add_action( 'customize_register', 'understrap_bs3_customize_register' );
19+
add_action( 'customize_register', 'understrap_customize_register' );
2020

21-
function understrap_bs3_theme_customize_register( $wp_customize ) {
21+
function understrap_theme_customize_register( $wp_customize ) {
2222

23-
$wp_customize->add_section( 'understrap_bs3_theme_slider_options', array(
24-
'title' => __( 'Slider Settings', 'understrap-bs3' )
23+
$wp_customize->add_section( 'understrap_theme_slider_options', array(
24+
'title' => __( 'Slider Settings', 'understrap' )
2525
) );
2626

27-
$wp_customize->add_setting( 'understrap_bs3_theme_slider_count_setting', array(
27+
$wp_customize->add_setting( 'understrap_theme_slider_count_setting', array(
2828
'default' => '1',
2929
'sanitize_callback' => 'absint'
3030
) );
3131

32-
$wp_customize->add_control( 'understrap_bs3_theme_slider_count', array(
33-
'label' => __( 'Number of slides displaying at once', 'understrap-bs3' ),
34-
'section' => 'understrap_bs3_theme_slider_options',
32+
$wp_customize->add_control( 'understrap_theme_slider_count', array(
33+
'label' => __( 'Number of slides displaying at once', 'understrap' ),
34+
'section' => 'understrap_theme_slider_options',
3535
'type' => 'text',
36-
'settings' => 'understrap_bs3_theme_slider_count_setting'
36+
'settings' => 'understrap_theme_slider_count_setting'
3737
) );
3838

39-
$wp_customize->add_setting( 'understrap_bs3_theme_slider_time_setting', array(
39+
$wp_customize->add_setting( 'understrap_theme_slider_time_setting', array(
4040
'default' => '5000',
41-
'sanitize_callback' => 'esc_textarea'
41+
'sanitize_callback' => 'absint'
4242
) );
4343

44-
$wp_customize->add_control( 'understrap_bs3_theme_slider_time', array(
45-
'label' => __( 'Slider Time (in ms)', 'understrap-bs3' ),
46-
'section' => 'understrap_bs3_theme_slider_options',
44+
$wp_customize->add_control( 'understrap_theme_slider_time', array(
45+
'label' => __( 'Slider Time (in ms)', 'understrap' ),
46+
'section' => 'understrap_theme_slider_options',
4747
'type' => 'text',
48-
'settings' => 'understrap_bs3_theme_slider_time_setting'
48+
'settings' => 'understrap_theme_slider_time_setting'
4949
) );
5050

5151

5252
}
53-
add_action( 'customize_register', 'understrap_bs3_theme_customize_register' );
53+
add_action( 'customize_register', 'understrap_theme_customize_register' );
5454

5555

5656

5757
/**
5858
* Binds JS handlers to make Theme Customizer preview reload changes asynchronously.
5959
*/
60-
function understrap_bs3_customize_preview_js() {
61-
wp_enqueue_script( 'understrap_bs3_customizer', get_template_directory_uri() . '/js/customizer.js', array( 'customize-preview' ), '20130508', true );
60+
function understrap_customize_preview_js() {
61+
wp_enqueue_script( 'understrap_customizer', get_template_directory_uri() . '/js/customizer.js', array( 'customize-preview' ), '20130508', true );
6262
}
63-
add_action( 'customize_preview_init', 'understrap_bs3_customize_preview_js' );
63+
add_action( 'customize_preview_init', 'understrap_customize_preview_js' );

‎inc/enqueue.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*/
77

88

9-
function understrap_bs3_scripts() {
9+
function understrap_scripts() {
1010
wp_enqueue_style( 'understrap-styles', get_stylesheet_directory_uri() . '/css/theme.min.css', array(), '0.3.9');
1111
wp_enqueue_script('jquery');
1212
wp_enqueue_script( 'understrap-scripts', get_template_directory_uri() . '/js/theme.min.js', array(), '0.3.9', true );
@@ -16,25 +16,25 @@ function understrap_bs3_scripts() {
1616
}
1717
}
1818

19-
add_action( 'wp_enqueue_scripts', 'understrap_bs3_scripts' );
19+
add_action( 'wp_enqueue_scripts', 'understrap_scripts' );
2020

2121
/**
2222
*Loading slider script conditionally
2323
**/
2424

2525
if ( is_active_sidebar( 'hero' ) ):
26-
add_action("wp_enqueue_scripts","understrap_bs3_slider");
26+
add_action("wp_enqueue_scripts","understrap_slider");
2727

28-
function understrap_bs3_slider(){
28+
function understrap_slider(){
2929
if ( is_front_page() ) {
3030
$data = array(
31-
"timeout"=> esc_attr( get_theme_mod( 'understrap_bs3_theme_slider_time_setting', 5000 )),
32-
"items"=> esc_attr( get_theme_mod( 'understrap_bs3_theme_slider_count_setting', 1 ))
31+
"timeout"=> intval( get_theme_mod( 'understrap_theme_slider_time_setting', 5000 )),
32+
"items"=> intval( get_theme_mod( 'understrap_theme_slider_count_setting', 1 ))
3333
);
3434

3535

3636
wp_enqueue_script("understrap-slider-script", get_stylesheet_directory_uri() . '/js/slider_settings.js', array(), '0.3.9');
37-
wp_localize_script( "understrap-slider-script", "understrap_bs3_slider_variables", $data );
37+
wp_localize_script( "understrap-slider-script", "understrap_slider_variables", $data );
3838
}
3939
}
4040
endif;

0 commit comments

Comments
 (0)