Merge branch 'master' of github.com:ThemeBoy/SportsPress

# Conflicts:
#	includes/admin/post-types/meta-boxes/class-sp-meta-box-column-details.php
#	includes/admin/post-types/meta-boxes/class-sp-meta-box-event-performance.php
#	includes/admin/post-types/meta-boxes/class-sp-meta-box-list-shortcode.php
#	includes/admin/post-types/meta-boxes/class-sp-meta-box-performance-details.php
This commit is contained in:
Brian Miyaji
2021-11-13 20:46:28 +09:00
4 changed files with 23 additions and 23 deletions

View File

@@ -36,16 +36,16 @@ class SP_Meta_Box_Column_Details extends SP_Meta_Box_Config {
$precision = 0;
}
?>
<p><strong><?php esc_attr_e( 'Key', 'sportspress' ); ?></strong></p>
<p><strong><?php esc_html_e( 'Key', 'sportspress' ); ?></strong></p>
<p>
<input name="sp_default_key" type="hidden" id="sp_default_key" value="<?php echo esc_attr( $post->post_name ); ?>">
<input name="sp_key" type="text" id="sp_key" value="<?php echo esc_attr( $post->post_name ); ?>">
</p>
<p><strong><?php esc_attr_e( 'Decimal Places', 'sportspress' ); ?></strong></p>
<p><strong><?php esc_html_e( 'Decimal Places', 'sportspress' ); ?></strong></p>
<p class="sp-precision-selector">
<input name="sp_precision" type="text" size="4" id="sp_precision" value="<?php echo esc_attr( $precision ); ?>" placeholder="0">
</p>
<p><strong><?php esc_attr_e( 'Sort Order', 'sportspress' ); ?></strong></p>
<p><strong><?php esc_html_e( 'Sort Order', 'sportspress' ); ?></strong></p>
<p class="sp-order-selector">
<select name="sp_priority">
<?php
@@ -55,7 +55,7 @@ class SP_Meta_Box_Column_Details extends SP_Meta_Box_Config {
$options[ $i ] = $i;
endfor;
foreach ( $options as $key => $value ) :
printf( '<option value="%s" %s>%s</option>', esc_attr( $key ), selected( true, $key == $priority, false ), esc_attr( $value ) );
printf( '<option value="%s" %s>%s</option>', esc_attr( $key ), selected( true, $key == $priority, false ), esc_html( $value ) );
endforeach;
?>
</select>
@@ -66,7 +66,7 @@ class SP_Meta_Box_Column_Details extends SP_Meta_Box_Config {
'ASC' => esc_attr__( 'Ascending', 'sportspress' ),
);
foreach ( $options as $key => $value ) :
printf( '<option value="%s" %s>%s</option>', esc_attr( $key ), selected( true, $key == $order, false ), esc_attr( $value ) );
printf( '<option value="%s" %s>%s</option>', esc_attr( $key ), selected( true, $key == $order, false ), esc_html( $value ) );
endforeach;
?>
</select>

View File

@@ -567,7 +567,7 @@ endforeach;
<?php echo wp_kses( self::sub_select( $team_id, $player_id, sp_array_value( $player_performance, 'sub', null ), $data ), array( 'select' => array( 'class' => array(), 'name' => array() ), 'option' => array( 'value' => array() ) ) ); ?><br>
<?php if ( is_array( $times ) ) { ?>
<input class="sp-sync-input small-text" type="text" name="sp_timeline[<?php echo esc_attr( $team_id ); ?>][<?php echo esc_attr( $player_id ); ?>][sub][]" value="<?php echo esc_attr( sp_array_value( $times, 0, '' ) ); ?>" placeholder="-" />
<span class="description"><?php esc_attr_e( 'mins', 'sportspress' ); ?></span>
<span class="description"><?php esc_html_e( 'mins', 'sportspress' ); ?></span>
<?php } ?>
</td>
<?php } ?>

View File

@@ -27,7 +27,7 @@ class SP_Meta_Box_List_Shortcode {
}
?>
<p class="howto">
<?php esc_attr_e( 'Copy this code and paste it into your post, page or text widget content.', 'sportspress' ); ?>
<?php esc_html_e( 'Copy this code and paste it into your post, page or text widget content.', 'sportspress' ); ?>
</p>
<p><input type="text" value="<?php sp_shortcode_template( 'player_' . $the_format, $post->ID ); ?>" readonly="readonly" class="code widefat"></p>
<?php

View File

@@ -56,7 +56,7 @@ class SP_Meta_Box_Performance_Details extends SP_Meta_Box_Config {
$sendoff = false;
}
?>
<p><strong><?php esc_attr_e( 'Variable', 'sportspress' ); ?></strong></p>
<p><strong><?php esc_html_e( 'Variable', 'sportspress' ); ?></strong></p>
<p>
<input name="sp_default_key" type="hidden" id="sp_default_key" value="<?php echo esc_attr( $post->post_name ); ?>">
<input name="sp_key" type="text" id="sp_key" value="<?php echo esc_attr( $post->post_name ); ?>"
@@ -65,11 +65,11 @@ class SP_Meta_Box_Performance_Details extends SP_Meta_Box_Config {
?>
readonly="readonly"<?php } ?>>
</p>
<p><strong><?php esc_attr_e( 'Singular', 'sportspress' ); ?></strong></p>
<p><strong><?php esc_html_e( 'Singular', 'sportspress' ); ?></strong></p>
<p>
<input name="sp_singular" type="text" id="sp_singular" placeholder="<?php echo esc_attr( $post->post_title ); ?>" value="<?php echo esc_attr( $singular ); ?>">
</p>
<p><strong><?php esc_attr_e( 'Category', 'sportspress' ); ?></strong></p>
<p><strong><?php esc_html_e( 'Category', 'sportspress' ); ?></strong></p>
<p class="sp-section-selector">
<select name="sp_section">
<?php
@@ -85,12 +85,12 @@ class SP_Meta_Box_Performance_Details extends SP_Meta_Box_Config {
)
);
foreach ( $options as $key => $value ) :
printf( '<option value="%s" %s>%s</option>', esc_attr( $key ), selected( $key == $section, true, false ), esc_attr( $value ) );
printf( '<option value="%s" %s>%s</option>', esc_attr( $key ), selected( $key == $section, true, false ), esc_html( $value ) );
endforeach;
?>
</select>
</p>
<p><strong><?php esc_attr_e( 'Format', 'sportspress' ); ?></strong></p>
<p><strong><?php esc_html_e( 'Format', 'sportspress' ); ?></strong></p>
<p class="sp-format-selector">
<select name="sp_format">
<?php
@@ -108,53 +108,53 @@ class SP_Meta_Box_Performance_Details extends SP_Meta_Box_Config {
)
);
foreach ( $options as $key => $value ) :
printf( '<option value="%s" %s>%s</option>', esc_attr( $key ), selected( $key == $format, true, false ), esc_attr( $value ) );
printf( '<option value="%s" %s>%s</option>', esc_attr( $key ), selected( $key == $format, true, false ), esc_html( $value ) );
endforeach;
?>
</select>
</p>
<div id="sp_precisiondiv">
<p><strong><?php esc_attr_e( 'Decimal Places', 'sportspress' ); ?></strong></p>
<p><strong><?php esc_html_e( 'Decimal Places', 'sportspress' ); ?></strong></p>
<p>
<input name="sp_precision" type="text" size="4" id="sp_precision" value="<?php echo esc_attr( $precision ); ?>" placeholder="0">
</p>
</div>
<div id="sp_timeddiv">
<p>
<strong><?php esc_attr_e( 'Timed', 'sportspress' ); ?></strong>
<strong><?php esc_html_e( 'Timed', 'sportspress' ); ?></strong>
<i class="dashicons dashicons-editor-help sp-desc-tip" title="<?php esc_attr_e( 'Record minutes?', 'sportspress' ); ?>"></i>
</p>
<ul class="sp-timed-selector">
<li>
<label class="selectit">
<input name="sp_timed" id="sp_timed_yes" type="radio" value="1" <?php checked( $timed ); ?>>
<?php esc_attr_e( 'Yes', 'sportspress' ); ?>
<?php esc_html_e( 'Yes', 'sportspress' ); ?>
</label>
</li>
<li>
<label class="selectit">
<input name="sp_timed" id="sp_timed_no" type="radio" value="0" <?php checked( ! $timed ); ?>>
<?php esc_attr_e( 'No', 'sportspress' ); ?>
<?php esc_html_e( 'No', 'sportspress' ); ?>
</label>
</li>
</ul>
</div>
<div id="sp_sendoffdiv">
<p>
<strong><?php esc_attr_e( 'Send Off', 'sportspress' ); ?></strong>
<strong><?php esc_html_e( 'Send Off', 'sportspress' ); ?></strong>
<i class="dashicons dashicons-editor-help sp-desc-tip" title="<?php esc_attr_e( "Don't count minutes after?", 'sportspress' ); ?>"></i>
</p>
<ul class="sp-sendoff-selector">
<li>
<label class="selectit">
<input name="sp_sendoff" id="sp_sendoff_yes" type="radio" value="1" <?php checked( $sendoff ); ?>>
<?php esc_attr_e( 'Yes', 'sportspress' ); ?>
<?php esc_html_e( 'Yes', 'sportspress' ); ?>
</label>
</li>
<li>
<label class="selectit">
<input name="sp_sendoff" id="sp_sendoff_no" type="radio" value="0" <?php checked( ! $sendoff ); ?>>
<?php esc_attr_e( 'No', 'sportspress' ); ?>
<?php esc_html_e( 'No', 'sportspress' ); ?>
</label>
</li>
</ul>
@@ -167,20 +167,20 @@ class SP_Meta_Box_Performance_Details extends SP_Meta_Box_Config {
}
?>
<p>
<strong><?php esc_attr_e( 'Visible', 'sportspress' ); ?></strong>
<strong><?php esc_html_e( 'Visible', 'sportspress' ); ?></strong>
<i class="dashicons dashicons-editor-help sp-desc-tip" title="<?php esc_attr_e( 'Display in player profile?', 'sportspress' ); ?>"></i>
</p>
<ul class="sp-visible-selector">
<li>
<label class="selectit">
<input name="sp_visible" id="sp_visible_yes" type="radio" value="1" <?php checked( $visible ); ?>>
<?php esc_attr_e( 'Yes', 'sportspress' ); ?>
<?php esc_html_e( 'Yes', 'sportspress' ); ?>
</label>
</li>
<li>
<label class="selectit">
<input name="sp_visible" id="sp_visible_no" type="radio" value="0" <?php checked( ! $visible ); ?>>
<?php esc_attr_e( 'No', 'sportspress' ); ?>
<?php esc_html_e( 'No', 'sportspress' ); ?>
</label>
</li>
</ul>