asc/sportspress
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tweak-relative-date-in-shortcodes'

Browse Source
This commit is contained in:
Brian Miyaji
2018-04-29 09:52:06 +10:00
parent baaa735ef2 ecac8f7d75
commit ef37c3f314
2 changed files with 132 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

150
includes/class-sp-ajax.php
View File

@@ -387,17 +387,42 @@ class SP_AJAX {
?>
</label>
</p>
<p>
<label>
<?php _e( 'Date:', 'sportspress' ); ?>
<select id="date" name="date">
<option value="default"><?php _e( 'Default', 'sportspress' ); ?></option>
<option value=""><?php _e( 'All', 'sportspress' ); ?></option>
<option value="w"><?php _e( 'This week', 'sportspress' ); ?></option>
<option value="day"><?php _e( 'Today', 'sportspress' ); ?></option>
</select>
</label>
</p>
<div class="sp-date-selector">
<p><?php _e( 'Date:', 'sportspress' ); ?>
<?php
$args = array(
'name' => 'date',
'id' => 'date',
'selected' => $date,
);
sp_dropdown_dates( $args );
?>
</p>
<div class="sp-date-range">
<p class="sp-date-range-absolute">
<input type="text" class="sp-datepicker-from" name="sp_date_from" value="default" size="10">
:
<input type="text" class="sp-datepicker-to" name="sp_date_to" value="default" size="10">
</p>
<p class="sp-date-range-relative">
<?php _e( 'Past', 'sportspress' ); ?>
<input type="number" min="0" step="1" class="tiny-text" name="sp_date_past" value="default">
<?php _e( 'days', 'sportspress' ); ?>
&rarr;
<?php _e( 'Next', 'sportspress' ); ?>
<input type="number" min="0" step="1" class="tiny-text" name="sp_date_future" value="default">
<?php _e( 'days', 'sportspress' ); ?>
</p>
<p class="sp-date-relative">
<label>
<input type="checkbox" name="sp_date_relative" value="0" id="sp_date_relative">
<?php _e( 'Relative', 'sportspress' ); ?>
</label>
</p>
</div>
</div>
<p>
<label>
<?php _e( 'Match Day:', 'sportspress' ); ?>
@@ -556,17 +581,42 @@ class SP_AJAX {
?>
</label>
</p>
<p>
<label>
<?php _e( 'Date:', 'sportspress' ); ?>
<select id="date" name="date">
<option value="default"><?php _e( 'Default', 'sportspress' ); ?></option>
<option value=""><?php _e( 'All', 'sportspress' ); ?></option>
<option value="w"><?php _e( 'This week', 'sportspress' ); ?></option>
<option value="day"><?php _e( 'Today', 'sportspress' ); ?></option>
</select>
</label>
</p>
<div class="sp-date-selector">
<p><?php _e( 'Date:', 'sportspress' ); ?>
<?php
$args = array(
'name' => 'date',
'id' => 'date',
'selected' => $date,
);
sp_dropdown_dates( $args );
?>
</p>
<div class="sp-date-range">
<p class="sp-date-range-absolute">
<input type="text" class="sp-datepicker-from" name="sp_date_from" value="default" size="10">
:
<input type="text" class="sp-datepicker-to" name="sp_date_to" value="default" size="10">
</p>
<p class="sp-date-range-relative">
<?php _e( 'Past', 'sportspress' ); ?>
<input type="number" min="0" step="1" class="tiny-text" name="sp_date_past" value="default">
<?php _e( 'days', 'sportspress' ); ?>
&rarr;
<?php _e( 'Next', 'sportspress' ); ?>
<input type="number" min="0" step="1" class="tiny-text" name="sp_date_future" value="default">
<?php _e( 'days', 'sportspress' ); ?>
</p>
<p class="sp-date-relative">
<label>
<input type="checkbox" name="sp_date_relative" value="0" id="sp_date_relative">
<?php _e( 'Relative', 'sportspress' ); ?>
</label>
</p>
</div>
</div>
<p>
<label>
<?php _e( 'Match Day:', 'sportspress' ); ?>
@@ -1030,6 +1080,11 @@ class SP_AJAX {
args.venue = $div.find('[name=venue]').val();
args.status = $div.find('[name=status]').val();
args.date = $div.find('[name=date]').val();
args.date_from = $div.find('[name=sp_date_from]').val();
args.date_to = $div.find('[name=sp_date_to]').val();
args.date_past = $div.find('[name=sp_date_past]').val();
args.date_future = $div.find('[name=sp_date_future]').val();
args.date_relative = $div.find('[name=sp_date_relative]:checked').length;
args.day = $div.find('[name=day]').val();
args.number = $div.find('[name=number]').val();
args.order = $div.find('[name=order]').val();
@@ -1044,6 +1099,11 @@ class SP_AJAX {
args.venue = $div.find('[name=venue]').val();
args.status = $div.find('[name=status]').val();
args.date = $div.find('[name=date]').val();
args.date_from = $div.find('[name=sp_date_from]').val();
args.date_to = $div.find('[name=sp_date_to]').val();
args.date_past = $div.find('[name=sp_date_past]').val();
args.date_future = $div.find('[name=sp_date_future]').val();
args.date_relative = $div.find('[name=sp_date_relative]:checked').length;
args.day = $div.find('[name=day]').val();
args.number = $div.find('[name=number]').val();
args.orderby = $div.find('[name=orderby]').val();
@@ -1092,9 +1152,53 @@ class SP_AJAX {
window.send_to_editor( shortcode );
}
</script>
<script type="text/javascript">
jQuery(document).ready(function($){
// Datepicker
$(".sp-datepicker").datepicker({
dateFormat : "yy-mm-dd"
});
$(".sp-datepicker-from").datepicker({
dateFormat : "yy-mm-dd",
onClose: function( selectedDate ) {
$(this).closest(".sp-date-selector").find(".sp-datepicker-to").datepicker("option", "minDate", selectedDate);
}
});
$(".sp-datepicker-to").datepicker({
dateFormat : "yy-mm-dd",
onClose: function( selectedDate ) {
$(this).closest(".sp-date-selector").find(".sp-datepicker-from").datepicker("option", "maxDate", selectedDate);
}
});
// Show or hide datepicker
$(".sp-date-selector select").change(function() {
if ( $(this).val() == "range" ) {
$(this).closest(".sp-date-selector").find(".sp-date-range").show();
} else {
$(this).closest(".sp-date-selector").find(".sp-date-range").hide();
}
});
$(".sp-date-selector select").trigger("change");
// Toggle date range selectors
$(".sp-date-relative input").change(function() {
$relative = $(this).closest(".sp-date-relative").siblings(".sp-date-range-relative").toggle(0, $(this).attr("checked"));
$absolute = $(this).closest(".sp-date-relative").siblings(".sp-date-range-absolute").toggle(0, $(this).attr("checked"));
if ($(this).attr("checked")) {
$relative.show();
$absolute.hide();
} else {
$absolute.show();
$relative.hide();
}
});
$(".sp-date-selector input").trigger("change");
});
</script>
<?php
}
}
new SP_AJAX();