Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/acf block options universal use #356

Merged
merged 5 commits into from
Mar 23, 2018
Merged

Feature/acf block options universal use #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e12b9da
uses subfield, else checks for get_field for non-flexible content use…
jomurgel Mar 23, 2018
06be327
lint
jomurgel Mar 23, 2018
a327079
lints
jomurgel Mar 23, 2018
c8e324a
changes `null : None` to `none : None` in Background Type field
jomurgel Mar 23, 2018
91c8a23
Merge branch 'master' into feature/acf-block-options-universal-use
jomurgel Mar 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions acf-json/group_58ebcc07bfbd7.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,12 +47,14 @@
"id": ""
},
"choices": {
"null": "None",
"none": "None",
"color": "Color",
"image": "Image",
"video": "Video"
},
"default_value": [],
"default_value": [
"none"
],
"allow_null": 0,
"multiple": 0,
"ui": 0,
Expand Down Expand Up @@ -162,5 +164,5 @@
"hide_on_screen": "",
"active": 0,
"description": "",
"modified": 1521823730
"modified": 1621823730
}
12 changes: 6 additions & 6 deletions inc/acf.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ function _s_display_content_blocks() {
function _s_display_block_options( $args = array() ) {

// Get block background options.
$background_options = get_sub_field( 'background_options' );
$background_options = get_sub_field( 'background_options' ) ? get_sub_field( 'background_options' ) : get_field( 'background_options' )['background_options'];

// Get block other options.
$other_options = get_sub_field( 'other_options' );
$other_options = get_sub_field( 'other_options' ) ? get_sub_field( 'other_options' ) : get_field( 'other_options' )['other_options'];

// Setup defaults.
$defaults = array(
Expand All @@ -58,17 +58,17 @@ function _s_display_block_options( $args = array() ) {
if ( $args['background_type'] ) {
if ( 'color' === $args['background_type'] ) {
$background_color = $background_options['background_color'];
$inline_style .= 'background-color: ' . $background_color . '; ';
$inline_style .= 'background-color: ' . $background_color . '; ';
}

if ( 'image' === $args['background_type'] ) {
$background_image = $background_options['background_image'];
$inline_style .= 'background-image: url(' . esc_url( $background_image['sizes']['full-width'] ) . ');';
$args['class'] .= ' image-as-background';
$inline_style .= 'background-image: url(' . esc_url( $background_image['sizes']['full-width'] ) . ');';
$args['class'] .= ' image-as-background';
}

if ( 'video' === $args['background_type'] ) {
$background_video = $background_options['background_video'];
$background_video = $background_options['background_video'];
$background_video_markup = '<video class="video-as-background" autoplay muted loop preload="auto"><source src="' . esc_url( $background_video['url'] ) . '" type="video/mp4"></video>';
}

Expand Down
10 changes: 5 additions & 5 deletions inc/extras.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@ function _s_get_placeholder_image( $args = array() ) {
$args = wp_parse_args( $args, $default_args );

// Extract the vars we want to work with.
$width = $args['width'];
$height = $args['height'];
$width = $args['width'];
$height = $args['height'];
$background_color = $args['background_color'];
$text_color = $args['text_color'];
$text_color = $args['text_color'];

// Perform some quick data validation.
if ( ! is_numeric( $width ) ) {
Expand Down Expand Up @@ -177,15 +177,15 @@ function _s_get_placeholder_unsplash( $args = array() ) {
// Apply a category if desired.
if ( ! empty( $args['category'] ) ) {
$category = rawurlencode( $args['category'] );
$url .= "category/$category/";
$url .= "category/$category/";
}

// Dimensions go after category but before search keywords.
$url .= "{$args['width']}x{$args['height']}";

if ( ! empty( $args['keywords'] ) ) {
$keywords = rawurlencode( $args['keywords'] );
$url .= "?$keywords";
$url .= "?$keywords";
}

// Text that will be utilized by screen readers.
Expand Down
4 changes: 2 additions & 2 deletions inc/hooks.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ function _s_category_transient_flusher() {
delete_transient( '_s_categories' );
}
add_action( 'delete_category', '_s_category_transient_flusher' );
add_action( 'save_post', '_s_category_transient_flusher' );
add_action( 'save_post', '_s_category_transient_flusher' );

/**
* Customize "Read More" string on <!-- more --> with the_content();
Expand Down Expand Up @@ -105,7 +105,7 @@ function _s_excerpt_more( $more ) {
* @return array Updated allowed mime types.
*/
function _s_custom_mime_types( $mimes ) {
$mimes['svg'] = 'image/svg+xml';
$mimes['svg'] = 'image/svg+xml';
$mimes['svgz'] = 'image/svg+xml';
return $mimes;
}
Expand Down
19 changes: 9 additions & 10 deletions inc/scaffolding.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ function _s_display_scaffolding_section( $args = array() ) {

// Set defaults.
$defaults = array(
'title' => '', // The scaffolding title.
'description' => '', // The scaffolding description.
'usage' => '', // The template tag or markup needed to display the scaffolding.
'parameters' => array(), // Does the scaffolding have params? Like $args?
'arguments' => array(), // If the scaffolding has params, what are the $args?
'output' => '', // Use the template tag or scaffolding HTML markup here. It will be sanitized displayed.
'title' => '', // The scaffolding title.
'description' => '', // The scaffolding description.
'usage' => '', // The template tag or markup needed to display the scaffolding.
'parameters' => array(), // Does the scaffolding have params? Like $args?
'arguments' => array(), // If the scaffolding has params, what are the $args?
'output' => '', // Use the template tag or scaffolding HTML markup here. It will be sanitized displayed.
);

// Parse arguments.
Expand Down Expand Up @@ -105,14 +105,14 @@ function _s_scaffolding_allowed_html() {

// Add additional HTML tags to the wp_kses() allowed html filter.
$allowed_tags = array_merge( wp_kses_allowed_html( 'post' ), array(
'svg' => array(
'svg' => array(
'aria-hidden' => true,
'class' => true,
'id' => true,
'role' => true,
'title' => true,
),
'use' => array(
'use' => array(
'xlink:href' => true,
),
'input' => array(
Expand Down Expand Up @@ -197,11 +197,10 @@ function _s_display_global_scaffolding_section( $args = array() ) {
<p><strong><?php echo esc_html( $font_var ); ?>:</strong> <span style="font-family: <?php echo esc_attr( $family ); ?>"><?php echo esc_html( $family ); ?></span></p>
<?php endforeach; ?>
</div>
<?php break; ?>
<?php break; ?>
<?php endswitch; ?>
</div>
</div>

<?php
}

Expand Down
17 changes: 9 additions & 8 deletions inc/template-tags.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,21 +117,22 @@ function _s_display_svg( $args = array() ) {

// Generate random IDs for the title and description.
$random_number = rand( 0, 99999 );
$title_id = 'title-' . sanitize_title( $title ) . '-' . $random_number;
$desc_id = 'desc-' . sanitize_title( $title ) . '-' . $random_number;
$title_id = 'title-' . sanitize_title( $title ) . '-' . $random_number;
$desc_id = 'desc-' . sanitize_title( $title ) . '-' . $random_number;

// Set ARIA.
$aria_hidden = ' aria-hidden="true"';
$aria_hidden = ' aria-hidden="true"';
$aria_labelledby = '';

if ( $args['title'] && $args['desc'] ) {
$aria_labelledby = ' aria-labelledby="' . $title_id . ' ' . $desc_id . '"';
$aria_hidden = '';
$aria_hidden = '';
}

// Set SVG parameters.
$fill = ( $args['fill'] ) ? ' fill="' . $args['fill'] . '"' : '';
$fill = ( $args['fill'] ) ? ' fill="' . $args['fill'] . '"' : '';
$height = ( $args['height'] ) ? ' height="' . $args['height'] . '"' : '';
$width = ( $args['width'] ) ? ' width="' . $args['width'] . '"' : '';
$width = ( $args['width'] ) ? ' width="' . $args['width'] . '"' : '';

// Start a buffer...
ob_start();
Expand Down Expand Up @@ -440,7 +441,7 @@ function _s_display_header_button() {
$button_setting = get_theme_mod( '_s_header_button' );

// If we have no button displayed, don't display the markup.
if ( 'none' == $button_setting ) {
if ( 'none' === $button_setting ) {
return '';
}

Expand All @@ -451,7 +452,7 @@ function _s_display_header_button() {
<div class="site-header-action">
<?php
// If we're doing a URL, just make this LOOK like a button but be a link.
if ( 'link' == $button_setting && $button_url ) :
if ( 'link' === $button_setting && $button_url ) :
?>
<a href="<?php echo esc_url( $button_url ); ?>" class="button button-link"><?php echo esc_html( $button_text ?: __( 'More Information', '_s' ) ); ?></a>
<?php else : ?>
Expand Down