Changeset 1693585
- Timestamp:
- 07/10/2017 09:09:45 AM (9 years ago)
- Location:
- directory-builder
- Files:
-
- 2 deleted
- 8 edited
- 1 copied
-
tags/1.5 (copied) (copied from directory-builder/trunk)
-
tags/1.5/README.txt (modified) (2 diffs)
-
tags/1.5/directory-builder.php (modified) (5 diffs)
-
tags/1.5/public/class-db-functionality-public.php (modified) (1 diff)
-
tags/1.5/public/js/db-functionality-public.js (modified) (4 diffs)
-
tags/1.5/public/js/recaptcha-script.js (deleted)
-
trunk/README.txt (modified) (2 diffs)
-
trunk/directory-builder.php (modified) (5 diffs)
-
trunk/public/class-db-functionality-public.php (modified) (1 diff)
-
trunk/public/js/db-functionality-public.js (modified) (4 diffs)
-
trunk/public/js/recaptcha-script.js (deleted)
Legend:
- Unmodified
- Added
- Removed
-
directory-builder/tags/1.5/README.txt
r1661890 r1693585 3 3 Tags: 4 4 Requires at least: 4.5.3 5 Tested up to: 4. 7.36 Stable tag: 1. 4.95 Tested up to: 4.8 6 Stable tag: 1.5 7 7 License: GPLv2 or later 8 8 License URI: http://www.gnu.org/licenses/gpl-2.0.html … … 25 25 26 26 == Changelog == 27 28 = 1.5 = 29 * Can't disable address fields as they're mandatory for listings 30 * Fixed radio buttons at add listing page 31 * Contact form FROM email changed to WordPress admin email 32 * Translatable "No listing found" text 33 * Added address autocomplete 27 34 28 35 = 1.4.9 = -
directory-builder/tags/1.5/directory-builder.php
r1661890 r1693585 17 17 * Plugin URI: https://cohhe.com/ 18 18 * Description: Directory builder provides listing functionality for your theme. 19 * Version: 1. 4.919 * Version: 1.5 20 20 * Author: Cohhe 21 21 * Author URI: https://cohhe.com/ … … 26 26 */ 27 27 28 define( 'DB_CURRENT_VERSION', '1. 4.9');28 define( 'DB_CURRENT_VERSION', '1.5'); 29 29 30 30 if ( ! defined( 'ABSPATH' ) ) exit; // If this file is called directly, abort. … … 612 612 </div> 613 613 </div> 614 <div class="db-field-row focused active clearfix"> 615 <label class="field-label">Active?</label> 616 <div class="db-field-input"> 617 <select class="db-create-field-active" <?php echo(in_array('field_active', $disabled_settings)?'disabled':''); ?>> 618 <option value="yes" <?php echo(isset($field_settings['field_active'])&&$field_settings['field_active']=='yes'?'selected':''); ?>>Yes</option> 619 <option value="no" <?php echo(isset($field_settings['field_active'])&&$field_settings['field_active']=='no'?'selected':''); ?>>No</option> 620 </select> 621 <span class="field-description">Do you want to show this field to users?</span> 622 </div> 623 </div> 624 <div class="db-field-row focused active clearfix"> 625 <label class="field-label">For admins?</label> 626 <div class="db-field-input"> 627 <select class="db-create-for-admins"> 628 <option value="no" <?php echo(isset($field_settings['for_admins'])&&$field_settings['for_admins']=='no'?'selected':''); ?>>No</option> 629 <option value="yes" <?php echo(isset($field_settings['for_admins'])&&$field_settings['for_admins']=='yes'?'selected':''); ?>>Yes</option> 630 </select> 631 <span class="field-description">Only admins will be able to edit it</span> 632 </div> 633 </div> 614 <?php if ( !in_array('delete', $disabled_settings) ) { ?> 615 <div class="db-field-row focused active clearfix"> 616 <label class="field-label">Active?</label> 617 <div class="db-field-input"> 618 <select class="db-create-field-active" <?php echo(in_array('field_active', $disabled_settings)?'disabled':''); ?>> 619 <option value="yes" <?php echo(isset($field_settings['field_active'])&&$field_settings['field_active']=='yes'?'selected':''); ?>>Yes</option> 620 <option value="no" <?php echo(isset($field_settings['field_active'])&&$field_settings['field_active']=='no'?'selected':''); ?>>No</option> 621 </select> 622 <span class="field-description">Do you want to show this field to users?</span> 623 </div> 624 </div> 625 <div class="db-field-row focused active clearfix"> 626 <label class="field-label">For admins?</label> 627 <div class="db-field-input"> 628 <select class="db-create-for-admins"> 629 <option value="no" <?php echo(isset($field_settings['for_admins'])&&$field_settings['for_admins']=='no'?'selected':''); ?>>No</option> 630 <option value="yes" <?php echo(isset($field_settings['for_admins'])&&$field_settings['for_admins']=='yes'?'selected':''); ?>>Yes</option> 631 </select> 632 <span class="field-description">Only admins will be able to edit it</span> 633 </div> 634 </div> 635 <?php } else { ?> 636 <input type="hidden" class="db-create-field-active" value="yes"> 637 <input type="hidden" class="db-create-for-admins" value="no"> 638 <?php } ?> 634 639 <div class="db-field-row focused active clearfix"> 635 640 <label class="field-label">Required?</label> … … 2443 2448 } 2444 2449 if ( !empty($radio_values) ) { 2450 $loops = 1; 2445 2451 foreach ($radio_values as $radio_value) { 2446 2452 $is_checked = (isset($field_default['0'])&&$field_default['0']==$radio_value?' checked':''); 2447 $output .= '<label class="db-radio-label"><input type="radio" name="'.$field_name.'[]" class="'.$custom_class.'" value="'.$radio_value.'"'.$is_checked.'>'.$radio_value.'</label>'; 2453 $output .= '<label class="db-radio-label" for="'.$field_name.'-'.$loops.'"><input type="radio" name="'.$field_name.'[]" id="'.$field_name.'-'.$loops.'" class="'.$custom_class.'" value="'.$radio_value.'"'.$is_checked.'>'.$radio_value.'</label>'; 2454 $loops++; 2448 2455 } 2449 2456 } … … 5347 5354 add_filter( 'wp_mail_content_type','db_set_content_type' ); 5348 5355 add_filter( 'wp_mail_from_name', 'db_custom_wp_mail_from_name' ); 5356 add_filter( 'wp_mail_from', 'db_custom_wp_mail_from' ); 5349 5357 $maintenance_email = wp_mail( $db_author_email, $subject, $message ); 5350 5358 remove_filter( 'wp_mail_content_type','db_set_content_type' ); 5351 5359 remove_filter( 'wp_mail_from_name', 'db_custom_wp_mail_from_name' ); 5360 remove_filter( 'wp_mail_from', 'db_custom_wp_mail_from' ); 5352 5361 5353 5362 if ( $maintenance_email ) { -
directory-builder/tags/1.5/public/class-db-functionality-public.php
r1642460 r1693585 132 132 'custom_sorting' => db_get_custom_sorting(), 133 133 'custom_sorting_dir' => db_get_custom_sorting_dir(), 134 'search_of' => esc_attr__( 'of', 'directory-builder' ) 134 'search_of' => esc_attr__( 'of', 'directory-builder' ), 135 'no_listings' => esc_html__('No listings found!', 'directory-builder') 135 136 )); 136 137 } -
directory-builder/tags/1.5/public/js/db-functionality-public.js
r1654392 r1693585 303 303 304 304 jQuery('.db-main-search-listings').addClass('db-no-listings'); 305 jQuery('.db-main-search-listings').append('<div class="db-main-search-item full-listing" style="text-align: center;"> No listings found!</div>');305 jQuery('.db-main-search-listings').append('<div class="db-main-search-item full-listing" style="text-align: center;">'+db_main.no_listings+'</div>'); 306 306 db_clear_markers(); 307 307 … … 1095 1095 1096 1096 var $idle_timer2; 1097 jQuery(document).on('input', '.dt-header-search-inner #dt-search-listing_address', function() {1097 jQuery(document).on('input', '.dt-header-search-inner .dt-search-listing_address, #db-add-listing-form #listing_address, .db-search-listing_address', function() { 1098 1098 clearTimeout($idle_timer2); 1099 1099 var address_value = jQuery(this).val(); … … 1111 1111 success: function( data ) { 1112 1112 if ( !address_row.find('.db-row-autocomplete').length ) { 1113 address_row.append('<div class="db-row-autocomplete" data-active="listing_ city"><div class="db-autocomplete-inner"><div class="db-autocomplete-items"></div><div class="db-autocomplete-scrollbar-wrapper"><span class="db-autocomplete-scrollbar"></span></div></div></div>');1113 address_row.append('<div class="db-row-autocomplete" data-active="listing_address"><div class="db-autocomplete-inner"><div class="db-autocomplete-items"></div><div class="db-autocomplete-scrollbar-wrapper"><span class="db-autocomplete-scrollbar"></span></div></div></div>'); 1114 1114 } 1115 1115 … … 1152 1152 jQuery('[name="'+jQuery(this).parent().parent().parent().attr('data-active')+'"]').val( jQuery(this).text() ); 1153 1153 } else { 1154 jQuery(' #dt-search-listing_address').val( jQuery(this).text() );1154 jQuery('.dt-search-listing_address').val( jQuery(this).text() ); 1155 1155 } 1156 1156 jQuery(this).parent().parent().parent().removeClass('active'); 1157 }); 1158 1159 jQuery(document).on('click', '*', function(e) { 1160 if ( jQuery(e.target).is('input') && jQuery(e.target).parent().find('.db-row-autocomplete').length ) { 1161 return; 1162 } 1163 1164 if ( jQuery('.db-row-autocomplete.active').length && !jQuery(e.target).hasClass('db-autocomplete-item') ) { 1165 jQuery('.db-row-autocomplete').removeClass('active'); 1166 } 1157 1167 }); 1158 1168 -
directory-builder/trunk/README.txt
r1661890 r1693585 3 3 Tags: 4 4 Requires at least: 4.5.3 5 Tested up to: 4. 7.36 Stable tag: 1. 4.95 Tested up to: 4.8 6 Stable tag: 1.5 7 7 License: GPLv2 or later 8 8 License URI: http://www.gnu.org/licenses/gpl-2.0.html … … 25 25 26 26 == Changelog == 27 28 = 1.5 = 29 * Can't disable address fields as they're mandatory for listings 30 * Fixed radio buttons at add listing page 31 * Contact form FROM email changed to WordPress admin email 32 * Translatable "No listing found" text 33 * Added address autocomplete 27 34 28 35 = 1.4.9 = -
directory-builder/trunk/directory-builder.php
r1661890 r1693585 17 17 * Plugin URI: https://cohhe.com/ 18 18 * Description: Directory builder provides listing functionality for your theme. 19 * Version: 1. 4.919 * Version: 1.5 20 20 * Author: Cohhe 21 21 * Author URI: https://cohhe.com/ … … 26 26 */ 27 27 28 define( 'DB_CURRENT_VERSION', '1. 4.9');28 define( 'DB_CURRENT_VERSION', '1.5'); 29 29 30 30 if ( ! defined( 'ABSPATH' ) ) exit; // If this file is called directly, abort. … … 612 612 </div> 613 613 </div> 614 <div class="db-field-row focused active clearfix"> 615 <label class="field-label">Active?</label> 616 <div class="db-field-input"> 617 <select class="db-create-field-active" <?php echo(in_array('field_active', $disabled_settings)?'disabled':''); ?>> 618 <option value="yes" <?php echo(isset($field_settings['field_active'])&&$field_settings['field_active']=='yes'?'selected':''); ?>>Yes</option> 619 <option value="no" <?php echo(isset($field_settings['field_active'])&&$field_settings['field_active']=='no'?'selected':''); ?>>No</option> 620 </select> 621 <span class="field-description">Do you want to show this field to users?</span> 622 </div> 623 </div> 624 <div class="db-field-row focused active clearfix"> 625 <label class="field-label">For admins?</label> 626 <div class="db-field-input"> 627 <select class="db-create-for-admins"> 628 <option value="no" <?php echo(isset($field_settings['for_admins'])&&$field_settings['for_admins']=='no'?'selected':''); ?>>No</option> 629 <option value="yes" <?php echo(isset($field_settings['for_admins'])&&$field_settings['for_admins']=='yes'?'selected':''); ?>>Yes</option> 630 </select> 631 <span class="field-description">Only admins will be able to edit it</span> 632 </div> 633 </div> 614 <?php if ( !in_array('delete', $disabled_settings) ) { ?> 615 <div class="db-field-row focused active clearfix"> 616 <label class="field-label">Active?</label> 617 <div class="db-field-input"> 618 <select class="db-create-field-active" <?php echo(in_array('field_active', $disabled_settings)?'disabled':''); ?>> 619 <option value="yes" <?php echo(isset($field_settings['field_active'])&&$field_settings['field_active']=='yes'?'selected':''); ?>>Yes</option> 620 <option value="no" <?php echo(isset($field_settings['field_active'])&&$field_settings['field_active']=='no'?'selected':''); ?>>No</option> 621 </select> 622 <span class="field-description">Do you want to show this field to users?</span> 623 </div> 624 </div> 625 <div class="db-field-row focused active clearfix"> 626 <label class="field-label">For admins?</label> 627 <div class="db-field-input"> 628 <select class="db-create-for-admins"> 629 <option value="no" <?php echo(isset($field_settings['for_admins'])&&$field_settings['for_admins']=='no'?'selected':''); ?>>No</option> 630 <option value="yes" <?php echo(isset($field_settings['for_admins'])&&$field_settings['for_admins']=='yes'?'selected':''); ?>>Yes</option> 631 </select> 632 <span class="field-description">Only admins will be able to edit it</span> 633 </div> 634 </div> 635 <?php } else { ?> 636 <input type="hidden" class="db-create-field-active" value="yes"> 637 <input type="hidden" class="db-create-for-admins" value="no"> 638 <?php } ?> 634 639 <div class="db-field-row focused active clearfix"> 635 640 <label class="field-label">Required?</label> … … 2443 2448 } 2444 2449 if ( !empty($radio_values) ) { 2450 $loops = 1; 2445 2451 foreach ($radio_values as $radio_value) { 2446 2452 $is_checked = (isset($field_default['0'])&&$field_default['0']==$radio_value?' checked':''); 2447 $output .= '<label class="db-radio-label"><input type="radio" name="'.$field_name.'[]" class="'.$custom_class.'" value="'.$radio_value.'"'.$is_checked.'>'.$radio_value.'</label>'; 2453 $output .= '<label class="db-radio-label" for="'.$field_name.'-'.$loops.'"><input type="radio" name="'.$field_name.'[]" id="'.$field_name.'-'.$loops.'" class="'.$custom_class.'" value="'.$radio_value.'"'.$is_checked.'>'.$radio_value.'</label>'; 2454 $loops++; 2448 2455 } 2449 2456 } … … 5347 5354 add_filter( 'wp_mail_content_type','db_set_content_type' ); 5348 5355 add_filter( 'wp_mail_from_name', 'db_custom_wp_mail_from_name' ); 5356 add_filter( 'wp_mail_from', 'db_custom_wp_mail_from' ); 5349 5357 $maintenance_email = wp_mail( $db_author_email, $subject, $message ); 5350 5358 remove_filter( 'wp_mail_content_type','db_set_content_type' ); 5351 5359 remove_filter( 'wp_mail_from_name', 'db_custom_wp_mail_from_name' ); 5360 remove_filter( 'wp_mail_from', 'db_custom_wp_mail_from' ); 5352 5361 5353 5362 if ( $maintenance_email ) { -
directory-builder/trunk/public/class-db-functionality-public.php
r1642460 r1693585 132 132 'custom_sorting' => db_get_custom_sorting(), 133 133 'custom_sorting_dir' => db_get_custom_sorting_dir(), 134 'search_of' => esc_attr__( 'of', 'directory-builder' ) 134 'search_of' => esc_attr__( 'of', 'directory-builder' ), 135 'no_listings' => esc_html__('No listings found!', 'directory-builder') 135 136 )); 136 137 } -
directory-builder/trunk/public/js/db-functionality-public.js
r1654392 r1693585 303 303 304 304 jQuery('.db-main-search-listings').addClass('db-no-listings'); 305 jQuery('.db-main-search-listings').append('<div class="db-main-search-item full-listing" style="text-align: center;"> No listings found!</div>');305 jQuery('.db-main-search-listings').append('<div class="db-main-search-item full-listing" style="text-align: center;">'+db_main.no_listings+'</div>'); 306 306 db_clear_markers(); 307 307 … … 1095 1095 1096 1096 var $idle_timer2; 1097 jQuery(document).on('input', '.dt-header-search-inner #dt-search-listing_address', function() {1097 jQuery(document).on('input', '.dt-header-search-inner .dt-search-listing_address, #db-add-listing-form #listing_address, .db-search-listing_address', function() { 1098 1098 clearTimeout($idle_timer2); 1099 1099 var address_value = jQuery(this).val(); … … 1111 1111 success: function( data ) { 1112 1112 if ( !address_row.find('.db-row-autocomplete').length ) { 1113 address_row.append('<div class="db-row-autocomplete" data-active="listing_ city"><div class="db-autocomplete-inner"><div class="db-autocomplete-items"></div><div class="db-autocomplete-scrollbar-wrapper"><span class="db-autocomplete-scrollbar"></span></div></div></div>');1113 address_row.append('<div class="db-row-autocomplete" data-active="listing_address"><div class="db-autocomplete-inner"><div class="db-autocomplete-items"></div><div class="db-autocomplete-scrollbar-wrapper"><span class="db-autocomplete-scrollbar"></span></div></div></div>'); 1114 1114 } 1115 1115 … … 1152 1152 jQuery('[name="'+jQuery(this).parent().parent().parent().attr('data-active')+'"]').val( jQuery(this).text() ); 1153 1153 } else { 1154 jQuery(' #dt-search-listing_address').val( jQuery(this).text() );1154 jQuery('.dt-search-listing_address').val( jQuery(this).text() ); 1155 1155 } 1156 1156 jQuery(this).parent().parent().parent().removeClass('active'); 1157 }); 1158 1159 jQuery(document).on('click', '*', function(e) { 1160 if ( jQuery(e.target).is('input') && jQuery(e.target).parent().find('.db-row-autocomplete').length ) { 1161 return; 1162 } 1163 1164 if ( jQuery('.db-row-autocomplete.active').length && !jQuery(e.target).hasClass('db-autocomplete-item') ) { 1165 jQuery('.db-row-autocomplete').removeClass('active'); 1166 } 1157 1167 }); 1158 1168
Note: See TracChangeset
for help on using the changeset viewer.