WordPress.org
Get WordPress

Plugin Directory

Changeset 755191


Ignore:
Timestamp:
08/12/2013 05:23:35 PM (13 years ago)
Author:
shockware
Message:

Merge branch 'master' into HEAD

Conflicts:

admin.php
contact-form-7-datepicker.php
readme.txt

Location:
contact-form-7-datepicker/trunk
Files:
49 added
3 edited

Legend:

Unmodified
Added
Removed

  • contact-form-7-datepicker/trunk/admin.php

    r755145 r755191  
    4848
    4949        <?php
    50         $dp = new CF7_DatePicker('#preview');
     50        $dp = new CF7_DateTimePicker('datetime', '#preview');
    5151        echo '<script>jQuery(function($){ ' . $dp->generate_code(true) . ' });</script>';
    5252    }

  • contact-form-7-datepicker/trunk/contact-form-7-datepicker.php

    r695340 r755191  
    55Description: Easily add a date field using jQuery UI's datepicker to your CF7 forms. This plugin depends on Contact Form 7.
    66Author: Aurel Canciu
    7 Version: 2.3.2
     7Version: 2.4
    88Author URI: https://github.com/relu/
    99*/
    … …  
    4545
    4646    function load_date_module() {
    47         require_once dirname(__FILE__) . '/date-module.php';
    48         ContactForm7Datepicker_Date::register();
     47        require_once dirname(__FILE__) . '/datetimepicker.php';
     48        require_once dirname(__FILE__) . '/modules/datetime.php';
     49        require_once dirname(__FILE__) . '/modules/date.php';
     50        require_once dirname(__FILE__) . '/modules/time.php';
    4951    }
    5052
    … …  
    5557
    5658    function enqueue_js() {
    57         $regional = CF7_DatePicker::get_regional_match();
     59        $regional = CF7_DateTimePicker::get_regional_match();
    5860        $proto = is_ssl() ? 'https' : 'http';
    5961
    … …  
    6668                true
    6769            );
     70
     71            wp_enqueue_script(
     72                'jquery-ui-timepicker-' . $regional,
     73                plugins_url('js/jquery-ui-timepicker/i18n/jquery-ui-timepicker-' . $regional . '.js', __FILE__),
     74                array('jquery-ui-timepicker'),
     75                '',
     76                true
     77            );
    6878        }
    6979
    7080        wp_enqueue_script('jquery-ui-datepicker');
     81
     82        wp_enqueue_script(
     83            'jquery-ui-timepicker',
     84            plugins_url('js/jquery-ui-timepicker/jquery-ui-timepicker-addon.js', __FILE__),
     85            array('jquery-ui-datepicker'),
     86            '',
     87            true
     88        );
     89
     90        wp_enqueue_script('jquery-ui-slider');
    7191
    7292        wp_register_script(
    … …  
    7898        );
    7999
    80         foreach (CF7_DatePicker::$effects as $effect) {
     100        foreach (CF7_DateTimePicker::$effects as $effect) {
    81101            wp_register_script(
    82102                'jquery-ui-effect-' . $effect,
    … …  
    104124            'all'
    105125        );
     126
     127        wp_enqueue_style(
     128            'jquery-ui-timepicker',
     129            plugins_url('js/jquery-ui-timepicker/jquery-ui-timepicker-addon.css', __FILE__)
     130        );
    106131    }
    107132}

  • contact-form-7-datepicker/trunk/readme.txt

    r695340 r755191  
    11=== Plugin Name ===
    2 Contributors: shockware
    3 Tags: wordpress, datepicker, calendar, contact form 7, forms, jqueryui
    4 Requires at least: 2.9
    5 Tested up to: 3.5.1
    6 Stable tag: 2.3.2
     2Contributors: shockware, baden03
     3Tags: wordpress, datepicker, timepicker, date, time, calendar, contact form 7, forms, jqueryui
     4Requires at least: 3.5
     5Tested up to: 3.6
     6Stable tag: 2.4
    77License: GPLv2 or later
    88License URI: http://www.gnu.org/licenses/gpl-2.0.html
    … …  
    2222== Frequently Asked Questions ==
    2323
    24 
    2524= Where do I submit a bug? =
    2625
    … …  
    3433
    3534== Changelog ==
     35
     36= 2.4 =
     37* Fixed minDate and maxDate attributes for date and datetime fields
     38* Added noWeekend to date and datetime fields
     39* Added stepHour, stepMinutes and stepSeconds attributes to time and datetime fields
     40* Make use of CF7's new Shortcode Tag API
    3641
    3742= 2.3.2 =
    … …  
    7984
    8085= 0.7 =
    81 * New: 
     86* New:
    8287    - Added new [datepicker] tag to use outside of CF7
    8388    - Added CF7 specific attributes for the shortcodes
    … …  
    122127
    123128= 0.4 =
    124 * Added new configuration options: 
     129* Added new configuration options:
    125130    - limit selectable dates according to current date (before or or after)
    126131    - available years range option
    … …  
    149154== Upgrade Notice ==
    150155
     156= 2.4 =
     157Added time support via datetimepicker
     158You can now use the [date], [time] and [datetime] shortcodes into your contact
     159forms.
     160
    151161= 2.0 =
    152162
Note: See TracChangeset for help on using the changeset viewer.