Plugin Directory

Changeset 3234235


Ignore:
Timestamp:
02/03/2025 08:02:03 PM (13 months ago)
Author:
fetchdesigns
Message:

Released version 2.3.0.1

Location:
sign-up-sheets
Files:
356 added
6 deleted
63 edited

Legend:

Unmodified
Added
Removed
  • sign-up-sheets/trunk/controller/admin.php

    r3234219 r3234235  
    8787        $status = $migrate->getStatus();
    8888        if (!in_array($status['state'], array('running', 'rerun'))) return;
    89         Notice::add('info', esc_html__('Sign-up sheets database upgrade is processing.', 'fdsus'), false, Id::PREFIX . '-migrate-status');
     89        Notice::add('info', esc_html__('Sign-up sheets database upgrade is processing.', 'sign-up-sheets'), false, Id::PREFIX . '-migrate-status');
    9090    }
    9191
     
    100100        unset($columns['date']);
    101101        return array_merge($columns, array(
    102             'task_date' => esc_html__('Sheet Date', 'fdsus'),
    103             'total_tasks' => esc_html__('# of Tasks', 'fdsus'),
    104             'total_spots' => esc_html__('Total Spots', 'fdsus'),
    105             'filled_spots' => esc_html__('Filled Spots', 'fdsus'))
     102            'task_date' => esc_html__('Sheet Date', 'sign-up-sheets'),
     103            'total_tasks' => esc_html__('# of Tasks', 'sign-up-sheets'),
     104            'total_spots' => esc_html__('Total Spots', 'sign-up-sheets'),
     105            'filled_spots' => esc_html__('Filled Spots', 'sign-up-sheets'))
    106106        );
    107107    }
     
    158158
    159159        if (empty($_GET['sheet_id'])) {
    160             wp_die(esc_html__('No sheet ID found.', 'fdsus'));
     160            wp_die(esc_html__('No sheet ID found.', 'sign-up-sheets'));
    161161        }
    162162
    163163        if (!wp_verify_nonce($_GET['_fdsus-nonce'], 'fdsus-copysheet-' . $_GET['sheet_id'])) {
    164             wp_die(esc_html__('Copy action failed.  Please try again.', 'fdsus'));
     164            wp_die(esc_html__('Copy action failed.  Please try again.', 'sign-up-sheets'));
    165165        }
    166166
    167167        $sheetCaps = new Capabilities(SheetModel::POST_TYPE);
    168168        if (!current_user_can($sheetCaps->get('edit_post'))) {
    169             wp_die(esc_html__('You do not have sufficient permissions to access this page.', 'fdsus'));
     169            wp_die(esc_html__('You do not have sufficient permissions to access this page.', 'sign-up-sheets'));
    170170        }
    171171
     
    185185    public function head()
    186186    {
     187        // Pull pro or free
     188        $pluginPath = WP_PLUGIN_DIR . DIRECTORY_SEPARATOR . (Id::isPro() ? Id::PRO_PLUGIN_BASENAME
     189                : Id::FREE_PLUGIN_BASENAME);
     190
    187191        // Dequeue meta library scripts for now
    188192        if (wp_script_is('dlsmb-main', $list = 'enqueued')) {
     
    203207            wp_enqueue_style(
    204208                Id::PREFIX . '-admin',
    205                 plugins_url('css/admin.css', dirname(__FILE__)),
     209                plugins_url('css/admin.css', $pluginPath),
    206210                array(),
    207211                Id::version()
     
    292296
    293297            $id = array('fdsus-id' => sprintf(
    294                 '<span class="fdsus-id-value">' . esc_html__('ID', 'fdsus') . ': %s</span>',
     298                '<span class="fdsus-id-value">' . esc_html__('ID', 'sign-up-sheets') . ': %s</span>',
    295299                $post->ID
    296300            ));
     
    301305                    '<a href="%s" title="" rel="permalink">%s</a>',
    302306                    esc_url(Settings::getManageSignupsPageUrl($post->ID)),
    303                     esc_html__('Manage Sign-ups', 'fdsus')
     307                    esc_html__('Manage Sign-ups', 'sign-up-sheets')
    304308                );
    305309
     
    320324                            '_fdsus-nonce'
    321325                        )),
    322                         esc_html__('Copy', 'fdsus')
     326                        esc_html__('Copy', 'sign-up-sheets')
    323327                    );
    324328                }
     
    370374        <footer class="fdsus-footer" aria-label="Sign-up Sheet">
    371375            <p>
    372                 <?php esc_html_e('Made by', 'fdsus'); ?> Fetch Designs
     376                <?php esc_html_e('Made by', 'sign-up-sheets'); ?> Fetch Designs
    373377                <span class="fdsus-footer-getpro"></span>
    374378                <?php if (!Id::isPro()): ?>
    375                     <a href="https://www.fetchdesigns.com/sign-up-sheets-wordpress-plugin/"><?php esc_html_e('Get Pro', 'fdsus'); ?></a>
     379                    <a href="https://www.fetchdesigns.com/sign-up-sheets-wordpress-plugin/"><?php esc_html_e('Get Pro', 'sign-up-sheets'); ?></a>
    376380                    &nbsp;&nbsp;|&nbsp;&nbsp;
    377381                <?php endif; ?>
    378382                <a href="<?php echo esc_url($supportUrl); ?>">
    379                     <span><?php esc_html_e('Need help? Get Support &raquo;', 'fdsus'); ?></span>
     383                    <span><?php esc_html_e('Need help? Get Support &raquo;', 'sign-up-sheets'); ?></span>
    380384                </a>
    381385            </p>
     
    396400        $settingsLink = sprintf( '<a href="%s">%s</a>',
    397401            esc_url($this->data->getSettingsUrl()),
    398             esc_html__('Settings', 'fdsus')
     402            esc_html__('Settings', 'sign-up-sheets')
    399403        );
    400404        array_unshift($links, $settingsLink);
  • sign-up-sheets/trunk/controller/admin/edit-sheet.php

    r3234219 r3234235  
    6464
    6565        $actions['copy'] = array(
    66             'title' => esc_html__('Copy Row', 'fdsus'),
     66            'title' => esc_html__('Copy Row', 'sign-up-sheets'),
    6767            'icon'  => 'dashicons dashicons-admin-page',
    6868        );
     
    140140        if ($post->post_type == SheetModel::POST_TYPE && !empty($_GET['action']) && $_GET['action'] === 'edit') {
    141141            ?>
    142             <div class="fdsus-edit-quick-info" role="group" aria-label="<?php esc_attr_e('Sheet Quick Info', 'fdsus') ?>">
    143                 <span class="quick-info-item quick-info-id"><strong><?php esc_html_e('Sheet ID', 'fdsus') ?>: </strong> <code><?php echo $post->ID ?></code></span>
     142            <div class="fdsus-edit-quick-info" role="group" aria-label="<?php esc_attr_e('Sheet Quick Info', 'sign-up-sheets') ?>">
     143                <span class="quick-info-item quick-info-id"><strong><?php esc_html_e('Sheet ID', 'sign-up-sheets') ?>: </strong> <code><?php echo $post->ID ?></code></span>
    144144                <?php do_action('fdsus_edit_sheet_quick_info', $post); ?>
    145145            </div>
  • sign-up-sheets/trunk/controller/admin/edit-signup-page.php

    r3234219 r3234235  
    4646        add_submenu_page(
    4747            '',
    48             esc_html__('Edit Sign-up', 'fdsus'),
     48            esc_html__('Edit Sign-up', 'sign-up-sheets'),
    4949            '',
    5050            $sheetCaps->get('edit_posts'),
     
    6969            $signup = new SignupModel($_GET['signup']);
    7070            if (!$signup->isValid()) {
    71                 wp_die(__('Sign-up invalid', 'fdsus'));
     71                wp_die(__('Sign-up invalid', 'sign-up-sheets'));
    7272            }
    7373        }
     
    7575        $task = new TaskModel(!empty($_GET['task']) ? $_GET['task'] : $signup->post_parent);
    7676        if (!$task->isValid()) {
    77             wp_die(__('Task invalid', 'fdsus'));
     77            wp_die(__('Task invalid', 'sign-up-sheets'));
    7878        }
    7979
    8080        $sheet = new SheetModel($task->post_parent);
    8181        if (!$sheet->isValid()) {
    82             wp_die(__('Sheet invalid', 'fdsus'));
     82            wp_die(__('Sheet invalid', 'sign-up-sheets'));
    8383        }
    8484        ?>
     
    8787            <h1 class="wp-heading-inline">
    8888                <?php echo $_GET['action'] === 'add'
    89                     ? esc_html__('Add Sign-up', 'fdsus')
    90                     : esc_html__('Edit Sign-up', 'fdsus');
     89                    ? esc_html__('Add Sign-up', 'sign-up-sheets')
     90                    : esc_html__('Edit Sign-up', 'sign-up-sheets');
    9191                ?>
    9292            </h1>
     
    108108                'multi_tag'          => '',
    109109                'states'             => $states->get(),
    110                 'submit_button_text' => __('Submit', 'fdsus'),
     110                'submit_button_text' => __('Submit', 'sign-up-sheets'),
    111111                'go_back_url'        => '',
    112112                'signup_link_hash'   => ''
     
    119119            <div id="postbox-container-1" class="postbox-container">
    120120                <div class="fdsus-edit-quick-info" role="group"
    121                      aria-label="<?php esc_attr_e('Sheet Quick Info', 'fdsus') ?>">
     121                     aria-label="<?php esc_attr_e('Sheet Quick Info', 'sign-up-sheets') ?>">
    122122                    <span class="quick-info-item quick-info-id"><strong><?php esc_html_e(
    123                                 'Sheet ID', 'fdsus'
     123                                'Sheet ID', 'sign-up-sheets'
    124124                            ) ?>: </strong> <code><?php echo $sheet->ID ?></code></span>
    125125                    <?php do_action('fdsus_edit_sheet_quick_info', $sheet->getData()); ?>
     
    130130                    <div class="inside">
    131131                        <dl>
    132                             <dt><?php _e('Sheet', 'fdsus'); ?>:</dt>
     132                            <dt><?php _e('Sheet', 'sign-up-sheets'); ?>:</dt>
    133133                            <dd><?php echo wp_kses_post($sheet->post_title); ?></dd>
    134134
    135                             <dt><?php esc_html_e('Date', 'fdsus'); ?>:</dt>
     135                            <dt><?php esc_html_e('Date', 'sign-up-sheets'); ?>:</dt>
    136136                            <dd>
    137137                                <?php echo(empty($sheet->dlssus_date)
    138                                     ? esc_html__('N/A', 'fdsus')
     138                                    ? esc_html__('N/A', 'sign-up-sheets')
    139139                                    : date(get_option('date_format'), strtotime($sheet->dlssus_date))
    140140                                ); ?>
    141141                            </dd>
    142142
    143                             <dt><?php _e('Task', 'fdsus'); ?>:</dt>
     143                            <dt><?php _e('Task', 'sign-up-sheets'); ?>:</dt>
    144144                            <dd><?php esc_html_e($task->post_title); ?></dd>
    145145                        </dl>
     
    171171        switch($_GET['notice']) {
    172172            case 'edited':
    173                 Notice::add('success', esc_html__('Sign-up updated.', 'fdsus'));
     173                Notice::add('success', esc_html__('Sign-up updated.', 'sign-up-sheets'));
    174174                break;
    175175            case 'added':
    176                 Notice::add('success', esc_html__('Sign-up added.', 'fdsus'));
     176                Notice::add('success', esc_html__('Sign-up added.', 'sign-up-sheets'));
    177177                break;
    178178        }
     
    195195        $sheetCaps = new Capabilities(SheetModel::POST_TYPE);
    196196        if (!current_user_can($sheetCaps->get('edit_posts'))) {
    197             wp_die(esc_html__('You do not have sufficient permissions to access this page.', 'fdsus'));
     197            wp_die(esc_html__('You do not have sufficient permissions to access this page.', 'sign-up-sheets'));
    198198        }
    199199
    200200        if (empty($_GET['signup'])) {
    201             wp_die(esc_html__('Sign-up ID missing', 'fdsus'));
     201            wp_die(esc_html__('Sign-up ID missing', 'sign-up-sheets'));
    202202        }
    203203
     
    207207                || !wp_verify_nonce($_POST['signup_nonce'], 'fdsus_signup_submit')
    208208            ) {
    209                 wp_die(esc_html__('Sign-up nonce not valid.', 'fdsus'));
     209                wp_die(esc_html__('Sign-up nonce not valid.', 'sign-up-sheets'));
    210210            }
    211211
     
    216216
    217217            if (!$signup->isValid()) {
    218                 Notice::add('error', esc_html__('Sign-up not found.', 'fdsus'));
     218                Notice::add('error', esc_html__('Sign-up not found.', 'sign-up-sheets'));
    219219                return;
    220220            }
     
    231231                        sprintf(
    232232                        /* translators: %s is replaced with a comma separated list of all missing required fields */
    233                             esc_html__('Please complete the following required fields: %s', 'fdsus'),
     233                            esc_html__('Please complete the following required fields: %s', 'sign-up-sheets'),
    234234                            implode(', ', $missingFieldNames)
    235235                        )
     
    262262        $sheetCaps = new Capabilities(SheetModel::POST_TYPE);
    263263        if (!current_user_can($sheetCaps->get('edit_posts'))) {
    264             wp_die(esc_html__('You do not have sufficient permissions to access this page.', 'fdsus'));
     264            wp_die(esc_html__('You do not have sufficient permissions to access this page.', 'sign-up-sheets'));
    265265        }
    266266
     
    268268
    269269        if (empty($_GET['task'])) {
    270             wp_die(esc_html__('Task-up ID missing', 'fdsus'));
     270            wp_die(esc_html__('Task-up ID missing', 'sign-up-sheets'));
    271271        }
    272272
     
    276276                || !wp_verify_nonce($_POST['signup_nonce'], 'fdsus_signup_submit')
    277277            ) {
    278                 wp_die(esc_html__('Sign-up nonce not valid.', 'fdsus'));
     278                wp_die(esc_html__('Sign-up nonce not valid.', 'sign-up-sheets'));
    279279            }
    280280
     
    293293                        sprintf(
    294294                        /* translators: %s is replaced with a comma separated list of all missing required fields */
    295                             esc_html__('Please complete the following required fields: %s', 'fdsus'),
     295                            esc_html__('Please complete the following required fields: %s', 'sign-up-sheets'),
    296296                            implode(', ', $missingFieldNames)
    297297                        )
     
    328328        <p class="fdsus-user">
    329329            <label for="signup_user_id" class="signup_user_id">
    330                 <?php esc_html_e('Linked User', 'fdsus'); ?>
     330                <?php esc_html_e('Linked User', 'sign-up-sheets'); ?>
    331331            </label>
    332332            <select id="signup_user_id" class="signup_user_id" name="signup_user_id">
  • sign-up-sheets/trunk/controller/admin/export.php

    r3234219 r3234235  
    5656                )
    5757            )),
    58             esc_html__('Export All as CSV', 'fdsus')
     58            esc_html__('Export All as CSV', 'sign-up-sheets')
    5959        );
    6060        return $views;
     
    8181            '<a href="%s" id="dls-sus-export-sheet" class="quick-info-item">%s</a>',
    8282            esc_url($this->getExportUrl($post)),
    83             esc_html__('Export as CSV', 'fdsus')
     83            esc_html__('Export as CSV', 'sign-up-sheets')
    8484        );
    8585    }
     
    9595            '<a href="%s" class="add-new-h2 page-title-action"><span class="dashicons dashicons-download"></span> %s</a>',
    9696            esc_url($this->getExportUrl($sheet)),
    97             esc_html__('Export as CSV', 'fdsus')
     97            esc_html__('Export as CSV', 'sign-up-sheets')
    9898        );
    9999    }
     
    119119        $sheetCaps = new Capabilities(SheetModel::POST_TYPE);
    120120        if (!current_user_can('manage_options') && !current_user_can($sheetCaps->get('read_post'))) {
    121             wp_die(esc_html__('You do not have sufficient permissions to export.', 'fdsus'));
     121            wp_die(esc_html__('You do not have sufficient permissions to export.', 'sign-up-sheets'));
    122122        }
    123123
    124124        if (isset($_GET['sheet_id']) && !is_numeric($_GET['sheet_id'])) {
    125             wp_die(esc_html__('Invalid sheet ID.', 'fdsus'));
     125            wp_die(esc_html__('Invalid sheet ID.', 'sign-up-sheets'));
    126126        }
    127127
     
    266266
    267267        $headersArray = array();
    268         $headersArray[] = esc_html__('Sheet ID', 'fdsus');
    269         $headersArray[] = esc_html__('Sheet Title', 'fdsus');
    270         $headersArray[] = esc_html__('Sheet Date', 'fdsus');
     268        $headersArray[] = esc_html__('Sheet ID', 'sign-up-sheets');
     269        $headersArray[] = esc_html__('Sheet Title', 'sign-up-sheets');
     270        $headersArray[] = esc_html__('Sheet Date', 'sign-up-sheets');
    271271
    272272        /**
     
    281281        $headersArray = apply_filters('fdsus_export_headers_after_sheet', $headersArray, $sheets);
    282282
    283         $headersArray[] = esc_html__('Task ID', 'fdsus');
    284         $headersArray[] = esc_html__('Task Title', 'fdsus');
     283        $headersArray[] = esc_html__('Task ID', 'sign-up-sheets');
     284        $headersArray[] = esc_html__('Task Title', 'sign-up-sheets');
    285285
    286286        /**
     
    295295        $headersArray = apply_filters('fdsus_export_headers_after_task', $headersArray, $sheets);
    296296
    297         $headersArray[] = esc_html__('Sign-up ID', 'fdsus');
    298         $headersArray[] = esc_html__('Sign-up First Name', 'fdsus');
    299         $headersArray[] = esc_html__('Sign-up Last Name', 'fdsus');
    300         $headersArray[] = esc_html__('Sign-up Phone', 'fdsus');
    301         $headersArray[] = esc_html__('Sign-up Email', 'fdsus');
    302         $headersArray[] = esc_html__('Address', 'fdsus');
    303         $headersArray[] = esc_html__('City', 'fdsus');
    304         $headersArray[] = esc_html__('State', 'fdsus');
    305         $headersArray[] = esc_html__('Zip', 'fdsus');
    306         $headersArray[] = esc_html__('User ID', 'fdsus');
     297        $headersArray[] = esc_html__('Sign-up ID', 'sign-up-sheets');
     298        $headersArray[] = esc_html__('Sign-up First Name', 'sign-up-sheets');
     299        $headersArray[] = esc_html__('Sign-up Last Name', 'sign-up-sheets');
     300        $headersArray[] = esc_html__('Sign-up Phone', 'sign-up-sheets');
     301        $headersArray[] = esc_html__('Sign-up Email', 'sign-up-sheets');
     302        $headersArray[] = esc_html__('Address', 'sign-up-sheets');
     303        $headersArray[] = esc_html__('City', 'sign-up-sheets');
     304        $headersArray[] = esc_html__('State', 'sign-up-sheets');
     305        $headersArray[] = esc_html__('Zip', 'sign-up-sheets');
     306        $headersArray[] = esc_html__('User ID', 'sign-up-sheets');
    307307
    308308        /**
  • sign-up-sheets/trunk/controller/admin/help.php

    r3234219 r3234235  
    4040        add_submenu_page(
    4141            'edit.php?post_type=' . SheetModel::POST_TYPE,
    42             esc_html__('Sign-up Sheets Help', 'fdsus'),
    43             esc_html__('Help', 'fdsus'),
     42            esc_html__('Sign-up Sheets Help', 'sign-up-sheets'),
     43            esc_html__('Help', 'sign-up-sheets'),
    4444            $sheetCaps->get('read_post'),
    4545            Id::PREFIX . '-help',
     
    6262        echo '
    6363            <div class="wrap dls_sus">
    64                 <h1 class="wp-heading-inline">' . esc_html__('Sign-up Sheets', 'fdsus') . (Id::isPro() ? ' <sup class="dls-sus-pro">Pro</sup>' : '') . ' ' . esc_html__('Help', 'fdsus') . '</h1>
     64                <h1 class="wp-heading-inline">' . esc_html__('Sign-up Sheets', 'sign-up-sheets') . (Id::isPro() ? ' <sup class="dls-sus-pro">Pro</sup>' : '') . ' ' . esc_html__('Help', 'sign-up-sheets') . '</h1>
    6565        ';
    6666
     
    7070                . '</p></div>';
    7171        } elseif ($mail_result === true) {
    72             echo '<div class="updated"><p>' . esc_html__('Test email successfully sent by WordPress.', 'fdsus') . '</p></div>';
     72            echo '<div class="updated"><p>' . esc_html__('Test email successfully sent by WordPress.', 'sign-up-sheets') . '</p></div>';
    7373        }
    7474        ?>
     
    139139        ?>
    140140
    141         <h3><?php esc_html_e('System Information', 'fdsus') ?></h3>
     141        <h3><?php esc_html_e('System Information', 'sign-up-sheets') ?></h3>
    142142        <p><?php echo sprintf('%s <strong><a href="%s">%s</a></strong>',
    143143                esc_html__(
    144144                    'We may request this information to help us troubleshoot your support request. You can now find this under',
    145                     'fdsus'
     145                    'sign-up-sheets'
    146146                ),
    147147                esc_url(admin_url('site-health.php?tab=debug')),
    148                 esc_html__('Tools > Site Health > Info', 'fdsus')
     148                esc_html__('Tools > Site Health > Info', 'sign-up-sheets')
    149149            ) ?></p>
    150         <textarea readonly="readonly" class="dls-sus-system-info" rows="1" onclick="this.focus(); this.select();"><?php esc_html_e('System information has moved to Tools > Site Health > Info', 'fdsus') ?></textarea>
     150        <textarea readonly="readonly" class="dls-sus-system-info" rows="1" onclick="this.focus(); this.select();"><?php esc_html_e('System information has moved to Tools > Site Health > Info', 'sign-up-sheets') ?></textarea>
    151151
    152152        <?php
     
    156156        }
    157157        ?>
    158             <h3><?php esc_html_e('Email Test', 'fdsus') ?></h3>
    159             <p><?php esc_html_e('Having trouble with emails sending on your site? Use this quick for to test your site with sending emails to different recipients.', 'fdsus') ?></p>
    160             <p><?php esc_html_e('If the test email is successfully sent by WordPress, but still not being received...', 'fdsus') ?></p>
     158            <h3><?php esc_html_e('Email Test', 'sign-up-sheets') ?></h3>
     159            <p><?php esc_html_e('Having trouble with emails sending on your site? Use this quick for to test your site with sending emails to different recipients.', 'sign-up-sheets') ?></p>
     160            <p><?php esc_html_e('If the test email is successfully sent by WordPress, but still not being received...', 'sign-up-sheets') ?></p>
    161161            <ol>
    162                 <li><?php esc_html_e('Ask the recipient to check their SPAM mailbox or SPAM filters.  Your "From" address may need to be added to their list of safe senders.', 'fdsus') ?></li>
    163                 <li><?php esc_html_e('Check with your host to see if they can trace emails being sent from your site.  It is possible your emails are being delayed or blacklisted by your recipient\'s mail host.', 'fdsus') ?></li>
     162                <li><?php esc_html_e('Ask the recipient to check their SPAM mailbox or SPAM filters.  Your "From" address may need to be added to their list of safe senders.', 'sign-up-sheets') ?></li>
     163                <li><?php esc_html_e('Check with your host to see if they can trace emails being sent from your site.  It is possible your emails are being delayed or blacklisted by your recipient\'s mail host.', 'sign-up-sheets') ?></li>
    164164                <li><?php echo sprintf(
    165165                    /* translators: %s is replaced with a link to an SMTP plugin */
    166                         esc_html__('Try sending email via SMTP instead by using a plugin like %s.', 'fdsus'),
     166                        esc_html__('Try sending email via SMTP instead by using a plugin like %s.', 'sign-up-sheets'),
    167167                        '<a href="https://wordpress.org/plugins/easy-wp-smtp/">Easy WP SMTP</a>'
    168168                    ) ?></li>
    169169                <li><?php echo sprintf(
    170170                    /* translators: %1$s is replaced with a link to Mailgun and %2$s is replaced with a link to the Mailgun WordPress plugin */
    171                         esc_html__('Try sending email via a 3rd party service like %1$s with the %2$s', 'fdsus'),
     171                        esc_html__('Try sending email via a 3rd party service like %1$s with the %2$s', 'sign-up-sheets'),
    172172                        '<a href="https://www.mailgun.com/">Mailgun</a>',
    173173                        '<a href="https://wordpress.org/plugins/mailgun/">Mailgun for WordPress plugin</a>'
     
    177177                <fieldset>
    178178                    <p>
    179                         <label for="from"><?php esc_html_e('From', 'fdsus') ?></label><br />
     179                        <label for="from"><?php esc_html_e('From', 'sign-up-sheets') ?></label><br />
    180180                        <input type="email" name="from" id="from" value="<?php echo esc_attr($from) ?>" />
    181181                    </p>
    182182                    <p>
    183                         <label for="recipient"><?php esc_html_e('To', 'fdsus') ?></label><br />
     183                        <label for="recipient"><?php esc_html_e('To', 'sign-up-sheets') ?></label><br />
    184184                        <input type="email" name="recipient" id="recipient" value="" />
    185185                    </p>
    186186                    <p>
    187                         <label><?php esc_html_e('Message', 'fdsus') ?></label><br />
    188                         <textarea name="message" rows="3"><?php esc_html_e('This is a test email.', 'fdsus') ?></textarea>
     187                        <label><?php esc_html_e('Message', 'sign-up-sheets') ?></label><br />
     188                        <textarea name="message" rows="3"><?php esc_html_e('This is a test email.', 'sign-up-sheets') ?></textarea>
    189189                    </p>
    190190                    <p>
    191191                        <input type="checkbox" name="return_path" id="return_path" value="true" checked="checked" />
    192                         <label for="return_path"><?php esc_html_e('Send bounced messages to "From" address', 'fdsus') ?></label>
     192                        <label for="return_path"><?php esc_html_e('Send bounced messages to "From" address', 'sign-up-sheets') ?></label>
    193193                    </p>
    194194                    <input type="hidden" name="mode" value="submitted" />
    195                     <input type="submit" value="<?php esc_attr_e('Send', 'fdsus') ?>" class="button" />
     195                    <input type="submit" value="<?php esc_attr_e('Send', 'sign-up-sheets') ?>" class="button" />
    196196                </fieldset>
    197197            </form>
     
    231231            return new WP_Error(
    232232                Id::PREFIX . 'test_email_error',
    233                 esc_html__('Error sending email.', 'fdsus')
     233                esc_html__('Error sending email.', 'sign-up-sheets')
    234234                . '.. ' . implode(' --- ', $ts_mail_errors)
    235235            );
  • sign-up-sheets/trunk/controller/admin/manage-signups.php

    r3234219 r3234235  
    3636        add_submenu_page(
    3737            '',
    38             esc_html__('Manage Sign-ups', 'fdsus'),
    39             esc_html__('Manage Sign-ups', 'fdsus'),
     38            esc_html__('Manage Sign-ups', 'sign-up-sheets'),
     39            esc_html__('Manage Sign-ups', 'sign-up-sheets'),
    4040            $sheetCaps->get('read_post'),
    4141            $this->menuSlug,
     
    5151        $sheetCaps = new Capabilities(SheetModel::POST_TYPE);
    5252        if (!current_user_can($sheetCaps->get('read_post'))) {
    53             wp_die(esc_html__('You do not have sufficient permissions to access this page.', 'fdsus'));
     53            wp_die(esc_html__('You do not have sufficient permissions to access this page.', 'sign-up-sheets'));
    5454        }
    5555
    5656        if (empty($_GET['sheet_id']) || !is_numeric($_GET['sheet_id'])) {
    57             wp_die(esc_html__('Missing or invalid sheet ID.', 'fdsus'));
     57            wp_die(esc_html__('Missing or invalid sheet ID.', 'sign-up-sheets'));
    5858        }
    5959
    6060        $sheet = new SheetModel((int)$_GET['sheet_id']);
    6161        if (!is_object($sheet)) {
    62             wp_die(esc_html__('No sign-up sheet found.', 'fdsus'));
     62            wp_die(esc_html__('No sign-up sheet found.', 'sign-up-sheets'));
    6363        }
    6464        ?>
     
    6666        <div class="wrap dls_sus">
    6767            <h1>
    68                 <?php esc_html_e('Manage Sign-ups', 'fdsus'); ?>
     68                <?php esc_html_e('Manage Sign-ups', 'sign-up-sheets'); ?>
    6969                <span class="fdsus-manage-h1-suffix">
    70                     <a href="<?php echo esc_attr(get_permalink($sheet->getData())); ?>" class="add-new-h2 page-title-action"><?php esc_html_e('View Sheet', 'fdsus'); ?></a>
    71                     <a href="<?php echo esc_attr(get_edit_post_link($sheet->getData())); ?>" class="add-new-h2 page-title-action"><?php esc_html_e('Edit Sheet', 'fdsus'); ?></a>
     70                    <a href="<?php echo esc_attr(get_permalink($sheet->getData())); ?>" class="add-new-h2 page-title-action"><?php esc_html_e('View Sheet', 'sign-up-sheets'); ?></a>
     71                    <a href="<?php echo esc_attr(get_edit_post_link($sheet->getData())); ?>" class="add-new-h2 page-title-action"><?php esc_html_e('Edit Sheet', 'sign-up-sheets'); ?></a>
    7272                    <?php do_action('fdsus_manage_signup_h1_suffix', $sheet); ?>
    7373                </span>
     
    7676            <h3><?php echo wp_kses_post($sheet->post_title); ?></h3>
    7777            <p>
    78                 <?php esc_html_e('Date', 'fdsus'); ?>:
     78                <?php esc_html_e('Date', 'sign-up-sheets'); ?>:
    7979                <?php echo(empty($sheet->dlssus_date)
    80                     ? esc_html__('N/A', 'fdsus')
     80                    ? esc_html__('N/A', 'sign-up-sheets')
    8181                    : date(get_option('date_format'), strtotime($sheet->dlssus_date))
    8282                ); ?>
     
    8585            <div class="dls-sus-sheet-details"><?php echo nl2br(wp_kses_post($sheet->post_content)); ?></div>
    8686
    87             <h4><?php esc_html_e('Sign-ups', 'fdsus'); ?></h4>
     87            <h4><?php esc_html_e('Sign-ups', 'sign-up-sheets'); ?></h4>
    8888
    8989            <?php
     
    133133            ) {
    134134                Notice::add(
    135                     'error', esc_html__('Manage sign-up sheet nonce not valid', 'fdsus'), false,
     135                    'error', esc_html__('Manage sign-up sheet nonce not valid', 'sign-up-sheets'), false,
    136136                    Id::PREFIX . '-manage-signup-nonce-invalid'
    137137                );
     
    142142        $sheet = new SheetModel($sheetId);
    143143        if (!$sheet->isValid()) {
    144             Notice::add('error', esc_html__('Invalid Sheet', 'fdsus'), false, Id::PREFIX . '-sheet-invalid');
     144            Notice::add('error', esc_html__('Invalid Sheet', 'sign-up-sheets'), false, Id::PREFIX . '-sheet-invalid');
    145145            return;
    146146        }
     
    148148        $result = $sheet->deleteSignups($idsToClear);
    149149        if ($result) {
    150             Notice::add('success', esc_html__('Spot(s) cleared.', 'fdsus'), false, Id::PREFIX . '-clear-success');
     150            Notice::add('success', esc_html__('Spot(s) cleared.', 'sign-up-sheets'), false, Id::PREFIX . '-clear-success');
    151151        } else {
    152152            /* translators: %d is replaced with the sheet ID */
    153             Notice::add('success', sprintf(esc_html__('Error clearing a spot (Sheet ID #%d)', 'fdsus'), $_GET['sheet_id']), false, Id::PREFIX . '-clear-error');
     153            Notice::add('success', sprintf(esc_html__('Error clearing a spot (Sheet ID #%d)', 'sign-up-sheets'), $_GET['sheet_id']), false, Id::PREFIX . '-clear-error');
    154154        }
    155155    }
     
    173173                )
    174174            )),
    175             esc_html__('Manage Sign-ups', 'fdsus')
     175            esc_html__('Manage Sign-ups', 'sign-up-sheets')
    176176        );
    177177    }
  • sign-up-sheets/trunk/controller/admin/meta-box.php

    r3234219 r3234235  
    1414 * $metabox->add(array(
    1515 *      'id' => 'sheet',
    16  *      'title' => esc_html__('Sign-up Sheet', 'fdsus'),
     16 *      'title' => esc_html__('Sign-up Sheet', 'sign-up-sheets'),
    1717 *      'order' => 10,
    1818 *      'options' => array(
     
    2929 *      'aria-labelledby' => 'my-label-id', // Default is '<name>-label' so only need to set this to change it or set to `false` to unset the aria-labelledby
    3030 *      'aria-describedby' => 'my-description-id', // Default is not set
    31  *      'note'    => '<span id="my-description-id">' . esc_html__('Some description', 'fdsus') . '</span>',
     31 *      'note'    => '<span id="my-description-id">' . esc_html__('Some description', 'sign-up-sheets') . '</span>',
    3232 *      'pro'     => true
    3333 * ));
  • sign-up-sheets/trunk/controller/admin/settings.php

    r3234219 r3234235  
    4949        add_submenu_page(
    5050            'edit.php?post_type=' . SheetModel::POST_TYPE,
    51             esc_html__('Sign-up Sheets Settings', 'fdsus'),
    52             esc_html__('Settings', 'fdsus'),
     51            esc_html__('Sign-up Sheets Settings', 'sign-up-sheets'),
     52            esc_html__('Settings', 'sign-up-sheets'),
    5353            'manage_options',
    5454            SettingsModel::$menuSlug,
     
    6464        $sheetCaps = new Capabilities(SheetModel::POST_TYPE);
    6565        if (!current_user_can('manage_options') && !current_user_can($sheetCaps->get('read_post'))) {
    66             wp_die(esc_html__('You do not have sufficient permissions to access this page.', 'fdsus'));
     66            wp_die(esc_html__('You do not have sufficient permissions to access this page.', 'sign-up-sheets'));
    6767        }
    6868        ?>
    6969        <div class="wrap dls_sus metabox-holder">
    7070            <h1 class="wp-heading-inline">
    71                 <?php esc_html_e('Sign-up Sheets', 'fdsus'); ?>
     71                <?php esc_html_e('Sign-up Sheets', 'sign-up-sheets'); ?>
    7272                <?php if (Id::isPro()): ?><sup class="dls-sus-pro">Pro</sup><?php endif; ?>
    73                 <?php esc_html_e('Settings', 'fdsus'); ?>
     73                <?php esc_html_e('Settings', 'sign-up-sheets'); ?>
    7474            </h1>
    75             <p style="text-align: right;"><a href="#" class="dls-sus-expand-all-postbox"><?php esc_html_e('+ Expand All', 'fdsus'); ?></a></p>
     75            <p style="text-align: right;"><a href="#" class="dls-sus-expand-all-postbox"><?php esc_html_e('+ Expand All', 'sign-up-sheets'); ?></a></p>
    7676            <form name="dls-sus-form" class="dls-sus-settings" method="post" action="<?php echo esc_url($this->data->getSettingsUrl()) ?>">
    7777
     
    9393                    ?>
    9494                    <input type="hidden" name="<?php echo esc_attr($this->hiddenFieldName); ?>" value="<?php echo esc_attr($this->hiddenFieldValue) ?>">
    95                     <input type="submit" name="Submit" class="button-primary" value="<?php esc_attr_e('Save Changes', 'fdsus'); ?>" />
     95                    <input type="submit" name="Submit" class="button-primary" value="<?php esc_attr_e('Save Changes', 'sign-up-sheets'); ?>" />
    9696                </p>
    9797
     
    117117            if (FDSUS_DISABLE_MIGRATE_2_0_to_2_1) {
    118118                Notice::add(
    119                     'warning', esc_html__('Sorry, I cannot rerun migration.  The migration logic is currently disabled with the FDSUS_DISABLE_MIGRATE_2_0_to_2_1 configuration.', 'fdsus'), false,
     119                    'warning', esc_html__('Sorry, I cannot rerun migration.  The migration logic is currently disabled with the FDSUS_DISABLE_MIGRATE_2_0_to_2_1 configuration.', 'sign-up-sheets'), false,
    120120                    'dlssus-migrate-disabled'
    121121                );
     
    132132
    133133            Notice::add(
    134                 'info', esc_html__('Sign-up Sheets database upgrade has been triggered.', 'fdsus'), false,
     134                'info', esc_html__('Sign-up Sheets database upgrade has been triggered.', 'sign-up-sheets'), false,
    135135                'dlssus-migrate-status'
    136136            );
     
    150150
    151151        if (!isset($_GET['_fdsus-nonce']) || !wp_verify_nonce($_GET['_fdsus-nonce'], 'fdsus-settings-reset')) {
    152             wp_die(esc_html__('Invalid request.', 'fdsus'));
     152            wp_die(esc_html__('Invalid request.', 'sign-up-sheets'));
    153153        }
    154154
    155155        $sheetCaps = new Capabilities(SheetModel::POST_TYPE);
    156156        if (!current_user_can('manage_options') && !current_user_can($sheetCaps->get('read_post'))) {
    157             wp_die(esc_html__('You do not have sufficient permissions to access this page.', 'fdsus'));
     157            wp_die(esc_html__('You do not have sufficient permissions to access this page.', 'sign-up-sheets'));
    158158        }
    159159
     
    206206                    Notice::add(
    207207                        'success',
    208                         esc_html__('Sign-up Sheet settings have been successfully reset to default values.', 'fdsus')
     208                        esc_html__('Sign-up Sheet settings have been successfully reset to default values.', 'sign-up-sheets')
    209209                    );
    210210                }
     
    227227
    228228        if (!isset($_POST['_fdsus-nonce']) || !wp_verify_nonce($_POST['_fdsus-nonce'], 'fdsus-settings-update')) {
    229             wp_die(esc_html__('Invalid request.', 'fdsus'));
     229            wp_die(esc_html__('Invalid request.', 'sign-up-sheets'));
    230230        }
    231231
    232232        $sheetCaps = new Capabilities(SheetModel::POST_TYPE);
    233233        if (!current_user_can('manage_options') && !current_user_can($sheetCaps->get('read_post'))) {
    234             wp_die(esc_html__('You do not have sufficient permissions to access this page.', 'fdsus'));
     234            wp_die(esc_html__('You do not have sufficient permissions to access this page.', 'sign-up-sheets'));
    235235        }
    236236
     
    283283
    284284                if ($numberSaved === 1) {
    285                     Notice::add('success', esc_html__('Settings saved.', 'fdsus'));
     285                    Notice::add('success', esc_html__('Settings saved.', 'sign-up-sheets'));
    286286                }
    287287            }
  • sign-up-sheets/trunk/controller/admin/site-health.php

    r3234219 r3234235  
    2828    {
    2929        $info['wp-core']['fields']['fdsus_date_format'] = array(
    30             'label' => esc_html__('Date Format', 'fdsus'),
     30            'label' => esc_html__('Date Format', 'sign-up-sheets'),
    3131            'value' => esc_html(get_option('date_format')),
    3232        );
    3333        $info['wp-core']['fields']['fdsus_time_format'] = array(
    34             'label' => esc_html__('Time Format', 'fdsus'),
     34            'label' => esc_html__('Time Format', 'sign-up-sheets'),
    3535            'value' => esc_html(get_option('time_format')),
    3636        );
    3737        $info['wp-core']['fields']['fdsus_admin_email'] = array(
    38             'label' => esc_html__('Admin Email', 'fdsus'),
     38            'label' => esc_html__('Admin Email', 'sign-up-sheets'),
    3939            'value' => esc_html(get_option('admin_email')),
    4040        );
    4141        $info['wp-server']['fields']['fdsus_server_max_execution_time'] = array(
    42             'label' => esc_html__('Max Execution Time', 'fdsus'),
     42            'label' => esc_html__('Max Execution Time', 'sign-up-sheets'),
    4343            'value' => ini_get('max_execution_time') . ' seconds',
    4444        );
    4545        $info['wp-server']['fields']['fdsus_user_agent_string'] = array(
    46             'label' => esc_html__('User Agent String', 'fdsus'),
     46            'label' => esc_html__('User Agent String', 'sign-up-sheets'),
    4747            'value' => $_SERVER['HTTP_USER_AGENT'],
    4848        );
    4949        $info['sign-up-sheets'] = array(
    50             'label'  => esc_html__('Sign-up Sheets', 'fdsus'),
     50            'label'  => esc_html__('Sign-up Sheets', 'sign-up-sheets'),
    5151            'fields' => $this->getFields(),
    5252        );
     
    6767        $dataPrimary = array(
    6868            'version'            => array(
    69                 'label' => esc_html__('Version', 'fdsus'),
     69                'label' => esc_html__('Version', 'sign-up-sheets'),
    7070                'value' => Id::version(),
    7171            ),
    7272            'db_version_type'    => array(
    73                 'label' => esc_html__('Version Type', 'fdsus'),
     73                'label' => esc_html__('Version Type', 'sign-up-sheets'),
    7474                'value' => $allOptions['dls_sus_db_version_type'],
    7575            ),
    7676            'primary_db_version' => array(
    77                 'label' => esc_html__('DB Version', 'fdsus'),
     77                'label' => esc_html__('DB Version', 'sign-up-sheets'),
    7878                'value' => $allOptions['dls_sus_db_version'],
    7979            ),
  • sign-up-sheets/trunk/controller/ajax.php

    r3234219 r3234235  
    5252        $restartButton = sprintf(' <a href="%s" class="button">%s</a>',
    5353            esc_url(add_query_arg('migrate', 'rerun-2.1', $this->data->getSettingsUrl())),
    54             esc_html__('Restart Upgrade', 'fdsus')
     54            esc_html__('Restart Upgrade', 'sign-up-sheets')
    5555        );
    5656        if ($status['state'] == 'complete') {
  • sign-up-sheets/trunk/controller/base.php

    r3234219 r3234235  
    4747            $templateName = str_replace('/', DIRECTORY_SEPARATOR, $templateName);
    4848
    49             $stylesheetPathFile = STYLESHEETPATH . DIRECTORY_SEPARATOR . $templateName; // child
    50             $templatePathFile = TEMPLATEPATH . DIRECTORY_SEPARATOR . $templateName; // parent
    51             $pluginFile = Id::getPluginPath() . $this->themeFilesDir . DIRECTORY_SEPARATOR . $templateName; // plugin
     49            $stylesheetPathFile = get_stylesheet_directory() . DIRECTORY_SEPARATOR . $templateName; // child
     50            $templatePathFile = get_template_directory() . DIRECTORY_SEPARATOR . $templateName; // parent
     51            $proPluginFile = Id::isPro()
     52                ? FDSUS_PRO_PLUGIN_DIR_PATH . $this->themeFilesDir . DIRECTORY_SEPARATOR . $templateName
     53                : '';
     54            $freePluginFile = FDSUS_FREE_PLUGIN_DIR_PATH . $this->themeFilesDir . DIRECTORY_SEPARATOR . $templateName;
    5255
    5356            if (file_exists($stylesheetPathFile)) {
     
    5760                $located = $templatePathFile;
    5861                break;
    59             } elseif (file_exists($pluginFile)) {
    60                 $located = $pluginFile;
     62            } elseif (file_exists($proPluginFile)) {
     63                $located = $proPluginFile;
     64                break;
     65            } elseif (file_exists($freePluginFile)) {
     66                $located = $freePluginFile;
    6167                break;
    6268            }
    6369        }
    6470
    65         if ((true == $load) && !empty($located)) {
     71        if ((true === $load) && !empty($located)) {
    6672            load_template($located, $requireOnce, $args);
    6773        }
  • sign-up-sheets/trunk/controller/captcha.php

    r3234219 r3234235  
    99use FDSUS\Model\Settings;
    1010use FDSUS\Lib\ReCaptcha\ReCaptcha;
     11use FDSUS\Model\Sheet as SheetModel;
    1112use WP_Error;
    1213
     
    2122            add_action('fdsus_enqueue_scripts_styles_on_signup', array(&$this, 'enqueue'), 10, 0);
    2223            add_filter('fdsus_error_before_add_signup', array(&$this, 'signupValidation'), 10, 3);
     24            add_filter('fdsus_sign_up_form_errors_required_fields', array(&$this, 'updateRequiredFields'), 10, 3);
    2325        }
    2426
     
    4345            wp_enqueue_script('fdsus-recaptcha');
    4446        }
     47    }
     48
     49    /**
     50     * Adjust required fields
     51     *
     52     * @param array      $missingFieldNames
     53     * @param SheetModel $sheet
     54     * @param array      $fields
     55     *
     56     * @return array
     57     */
     58    public function updateRequiredFields($missingFieldNames, $sheet, $fields)
     59    {
     60        if (!is_admin()
     61            && !Settings::isAllCaptchaDisabled()
     62            && !Settings::isRecaptchaEnabled()
     63            && empty($fields['spam_check'])
     64        ) {
     65            $missingFieldNames['simple_captcha'] = esc_html__('Math Question', 'sign-up-sheets');
     66        }
     67
     68        return $missingFieldNames;
    4569    }
    4670
     
    7195                return new WP_Error(
    7296                    'fdsus-captcha-error',
    73                     __('Please check that the reCAPTCHA field is valid.', 'fdsus')
     97                    __('Please check that the reCAPTCHA field is valid.', 'sign-up-sheets')
    7498                );
    7599            }
     
    81105                'fdsus-captcha-error', sprintf(
    82106                /* translators: %s is replaced with the users response to the simple captcha */
    83                     esc_html__('Oh dear, 7 + 1 does not equal %s. Please try again.', 'fdsus'),
     107                    esc_html__('Oh dear, 7 + 1 does not equal %s. Please try again.', 'sign-up-sheets'),
    84108                    esc_attr($_POST['spam_check'])
    85109                )
  • sign-up-sheets/trunk/controller/mail.php

    r3234219 r3234235  
    128128            return new WP_Error(
    129129                'fdsus_mail_send',
    130                 esc_html__('Error sending email.', 'fdsus')
     130                esc_html__('Error sending email.', 'sign-up-sheets')
    131131                . (Settings::isDetailedErrors() ? '.. ' . implode(' --- ', $ts_mail_errors) : '')
    132132            );
     
    172172
    173173        // Build initial signup details
    174         $signupDetails = (!empty($signupDate) ? esc_html__('Date', 'fdsus') . ': ' . date(get_option('date_format'), strtotime($signupDate)) . PHP_EOL : null)
    175             . esc_html__('Event', 'fdsus') . ': ' . wp_kses_post($args['sheet']->post_title) . PHP_EOL
     174        $signupDetails = (!empty($signupDate) ? esc_html__('Date', 'sign-up-sheets') . ': ' . date(get_option('date_format'), strtotime($signupDate)) . PHP_EOL : null)
     175            . esc_html__('Event', 'sign-up-sheets') . ': ' . wp_kses_post($args['sheet']->post_title) . PHP_EOL
    176176            . esc_html(Settings::$text['task_title_label']['value'])
    177177            . ': ' . wp_kses_post($args['task']->post_title);
  • sign-up-sheets/trunk/controller/migrate.php

    r3234219 r3234235  
    2121
    2222if (Id::isPro()) {
    23     class MigrateParent extends Pro\Migrate {}
     23    class MigrateParent extends \FDSUSPRO\Controller\Pro\Migrate {}
    2424} else {
    2525    class MigrateParent extends Base {}
     
    7979            $output = sprintf(
    8080                /* translators: %1$s is replaced with the URL to retry */
    81                 esc_html__('Migration has already been completed. <a href="%1$s" class="button">Run Migration Again</a>', 'fdsus'),
     81                esc_html__('Migration has already been completed. <a href="%1$s" class="button">Run Migration Again</a>', 'sign-up-sheets'),
    8282                esc_url(add_query_arg('retry', 'true', $this->data->getCurrentUrl()))
    8383            );
     
    603603                'group' => 'settings',
    604604                'options' => null,
    605                 'note' => esc_html__('(comma-separated list of emails to be copied on sign-up confirmations/removals for this sheet)', 'fdsus'),
     605                'note' => esc_html__('(comma-separated list of emails to be copied on sign-up confirmations/removals for this sheet)', 'sign-up-sheets'),
    606606            ),
    607607            array(
     
    611611                'group' => 'settings',
    612612                'options' => $true_false,
    613                 'note' => esc_html__('(Global setting in Settings > Sign-up Sheets)', 'fdsus'),
     613                'note' => esc_html__('(Global setting in Settings > Sign-up Sheets)', 'sign-up-sheets'),
    614614            ),
    615615            array(
     
    619619                'group' => 'settings',
    620620                'options' => $true_false,
    621                 'note' => esc_html__('(Global setting in Settings > Sign-up Sheets)', 'fdsus'),
     621                'note' => esc_html__('(Global setting in Settings > Sign-up Sheets)', 'sign-up-sheets'),
    622622            ),
    623623            array(
     
    627627                'group' => 'settings',
    628628                'options' => $true_false,
    629                 'note' => esc_html__('(Global setting in Settings > Sign-up Sheets)', 'fdsus'),
     629                'note' => esc_html__('(Global setting in Settings > Sign-up Sheets)', 'sign-up-sheets'),
    630630            ),
    631631            array(
     
    635635                'group' => 'settings',
    636636                'options' => $true_false,
    637                 'note' => esc_html__('(Global setting in Settings > Sign-up Sheets)', 'fdsus'),
     637                'note' => esc_html__('(Global setting in Settings > Sign-up Sheets)', 'sign-up-sheets'),
    638638            ),
    639639            array(
     
    643643                'group' => 'settings',
    644644                'options' => array(
    645                     ''      => esc_html__('Global', 'fdsus'),
    646                     'false' => esc_html__('Disabled', 'fdsus'),
    647                     'true'  => esc_html__('Enabled', 'fdsus'),
    648                     'semi'  => esc_html__('Semi-Compact', 'fdsus'),
     645                    ''      => esc_html__('Global', 'sign-up-sheets'),
     646                    'false' => esc_html__('Disabled', 'sign-up-sheets'),
     647                    'true'  => esc_html__('Enabled', 'sign-up-sheets'),
     648                    'semi'  => esc_html__('Semi-Compact', 'sign-up-sheets'),
    649649                ),
    650                 'note' => esc_html__('Show sign-up spots on one line with just # of open spots and a link to sign-up if open. Semi-Compact will also include the names of those who already signed up (assuming "Front-end Display Names" is not set to "anonymous"', 'fdsus'),
     650                'note' => esc_html__('Show sign-up spots on one line with just # of open spots and a link to sign-up if open. Semi-Compact will also include the names of those who already signed up (assuming "Front-end Display Names" is not set to "anonymous"', 'sign-up-sheets'),
    651651            ),
    652652            array(
     
    664664                'group' => 'settings',
    665665                'options' => $true_false,
    666                 'note' => esc_html__('(Global setting in Settings > Sign-up Sheets)', 'fdsus'),
     666                'note' => esc_html__('(Global setting in Settings > Sign-up Sheets)', 'sign-up-sheets'),
    667667            ),
    668668            array(
     
    672672                'group' => 'settings',
    673673                'options' => $true_false,
    674                 'note' => esc_html__('(Global setting in Settings > Sign-up Sheets)', 'fdsus'),
     674                'note' => esc_html__('(Global setting in Settings > Sign-up Sheets)', 'sign-up-sheets'),
    675675            ),
    676676            array(
     
    680680                'group' => 'settings',
    681681                'options' => $true_false,
    682                 'note' => esc_html__('(Global setting in Settings > Sign-up Sheets)', 'fdsus'),
     682                'note' => esc_html__('(Global setting in Settings > Sign-up Sheets)', 'sign-up-sheets'),
    683683            ),
    684684            array(
     
    687687                'type' => 'text',
    688688                'group' => 'settings',
    689                 'note' => '<br><em>' . esc_html__('Number of days before the date on the sign-up sheet that the email should be sent.  Use whole numbers, for example, to remind one day before use...', 'fdsus') . ' <code>1</code> ' . esc_html__('(If this is blank Global setting is used. Global setting in Settings > Sign-up Sheets.)', 'fdsus') . '</em>',
     689                'note' => '<br><em>' . esc_html__('Number of days before the date on the sign-up sheet that the email should be sent.  Use whole numbers, for example, to remind one day before use...', 'sign-up-sheets') . ' <code>1</code> ' . esc_html__('(If this is blank Global setting is used. Global setting in Settings > Sign-up Sheets.)', 'sign-up-sheets') . '</em>',
    690690                'options' => null,
    691691            ),
     
    695695                'type' => 'textarea',
    696696                'group' => 'settings',
    697                 'note' => '<br><em>' . esc_html__('Global setting in Settings > Sign-up Sheets', 'fdsus') . '</em>',
     697                'note' => '<br><em>' . esc_html__('Global setting in Settings > Sign-up Sheets', 'sign-up-sheets') . '</em>',
    698698                'options' => null,
    699699            ),
     
    703703                'type' => 'textarea',
    704704                'group' => 'settings',
    705                 'note' => '<br><em>' . esc_html__('Global setting in Settings > Sign-up Sheets', 'fdsus') . '</em>',
     705                'note' => '<br><em>' . esc_html__('Global setting in Settings > Sign-up Sheets', 'sign-up-sheets') . '</em>',
    706706                'options' => null,
    707707            ),
     
    809809        }
    810810
    811         return new WP_Error(Id::PREFIX . '_migrate_timeout', esc_html__('Sign-up Sheets migration timed out.', 'fdsus'));
     811        return new WP_Error(Id::PREFIX . '_migrate_timeout', esc_html__('Sign-up Sheets migration timed out.', 'sign-up-sheets'));
    812812    }
    813813
  • sign-up-sheets/trunk/controller/post-type-base.php

    r3234219 r3234235  
    9090            'name'               => $plural,
    9191            'singular_name'      => $singular,
    92             'all_items'          => __('All', 'fdsus') . ' '  . $plural,
    93             'add_new'            => __('Add New', 'fdsus'),
    94             'add_new_item'       => __('Add New', 'fdsus') . ' ' . $singular,
    95             'edit_item'          => __('Edit', 'fdsus') . ' ' . $singular,
    96             'new_item'           => __('New', 'fdsus') . ' ' . $singular,
    97             'view_item'          => __('View', 'fdsus') . ' ' . $singular,
    98             'search_items'       => __('Search', 'fdsus') . ' ' . $plural,
     92            'all_items'          => __('All', 'sign-up-sheets') . ' '  . $plural,
     93            'add_new'            => __('Add New', 'sign-up-sheets'),
     94            'add_new_item'       => __('Add New', 'sign-up-sheets') . ' ' . $singular,
     95            'edit_item'          => __('Edit', 'sign-up-sheets') . ' ' . $singular,
     96            'new_item'           => __('New', 'sign-up-sheets') . ' ' . $singular,
     97            'view_item'          => __('View', 'sign-up-sheets') . ' ' . $singular,
     98            'search_items'       => __('Search', 'sign-up-sheets') . ' ' . $plural,
    9999            /* translators: %s is replaced with the plural post type name */
    100             'not_found'          => sprintf(__('No %s found', 'fdsus'), $plural),
     100            'not_found'          => sprintf(__('No %s found', 'sign-up-sheets'), $plural),
    101101            /* translators: %s is replaced with the plural post type name */
    102             'not_found_in_trash' => sprintf(__('No %s found in Trash', 'fdsus'), $plural),
     102            'not_found_in_trash' => sprintf(__('No %s found in Trash', 'sign-up-sheets'), $plural),
    103103            /* translators: %s is replaced with the singluar post type name */
    104             'parent_item_colon'  => sprintf(__('Parent %s Record:', 'fdsus'), $singular),
     104            'parent_item_colon'  => sprintf(__('Parent %s Record:', 'sign-up-sheets'), $singular),
    105105            'menu_name'          => $plural,
    106106        );
  • sign-up-sheets/trunk/controller/privacy.php

    r3234219 r3234235  
    1717    {
    1818        $this->fields = array(
    19             'dlssus_email'     => __('Email', 'fdsus'),
    20             'dlssus_firstname' => __('First Name', 'fdsus'),
    21             'dlssus_lastname'  => __('Last Name', 'fdsus'),
    22             'dlssus_phone'     => __('Phone', 'fdsus'),
    23             'dlssus_address'   => __('Address', 'fdsus'),
    24             'dlssus_city'      => __('City', 'fdsus'),
    25             'dlssus_state'     => __('State', 'fdsus'),
    26             'dlssus_zip'       => __('Zip', 'fdsus'),
     19            'dlssus_email'     => __('Email', 'sign-up-sheets'),
     20            'dlssus_firstname' => __('First Name', 'sign-up-sheets'),
     21            'dlssus_lastname'  => __('Last Name', 'sign-up-sheets'),
     22            'dlssus_phone'     => __('Phone', 'sign-up-sheets'),
     23            'dlssus_address'   => __('Address', 'sign-up-sheets'),
     24            'dlssus_city'      => __('City', 'sign-up-sheets'),
     25            'dlssus_state'     => __('State', 'sign-up-sheets'),
     26            'dlssus_zip'       => __('Zip', 'sign-up-sheets'),
    2727        );
    2828
     
    4242    {
    4343        $exporters['sign-up-sheets'] = array(
    44             'exporter_friendly_name' => __('Sign-up Sheets Plugin', 'fdsus'),
     44            'exporter_friendly_name' => __('Sign-up Sheets Plugin', 'sign-up-sheets'),
    4545            'callback'               => array(&$this, 'exportUserDataByEmail'),
    4646        );
     
    5858    {
    5959        $erasers['sign-up-sheets'] = array(
    60             'eraser_friendly_name' => __('Sign-up Sheets Plugin', 'fdsus'),
     60            'eraser_friendly_name' => __('Sign-up Sheets Plugin', 'sign-up-sheets'),
    6161            'callback'             => array(&$this, 'removeUserDataByEmail'),
    6262        );
     
    7979        $exportItems = array();
    8080
    81         $fields = array('ID' => __('Sign-up ID', 'fdsus')) + $this->fields;
     81        $fields = array('ID' => __('Sign-up ID', 'sign-up-sheets')) + $this->fields;
    8282
    8383        $signupCollection = new SignupCollection();
     
    9494            $itemId = SignupModel::POST_TYPE . '-' . $signup->ID;
    9595            $groupId = 'fdsus-signups';
    96             $groupLabel = __('Sign-ups', 'fdsus');
     96            $groupLabel = __('Sign-ups', 'sign-up-sheets');
    9797
    9898            foreach ($fields as $key => $name) {
  • sign-up-sheets/trunk/controller/scode/sign-up-form.php

    r3234219 r3234235  
    8282
    8383        if (empty($task_id)) {
    84             echo '<p>' . esc_html__('Task not found.', 'fdsus') . '</p>';
     84            echo '<p>' . esc_html__('Task not found.', 'sign-up-sheets') . '</p>';
    8585            return ob_get_clean();
    8686        }
     
    8888        $task = new TaskModel($task_id);
    8989        if (empty($task) || empty($task->post_parent)) {
    90             echo '<p>' . esc_html__('No Sign-up Form Found.', 'fdsus') . '</p>';
     90            echo '<p>' . esc_html__('No Sign-up Form Found.', 'sign-up-sheets') . '</p>';
    9191            return ob_get_clean();
    9292        }
     
    9494        $sheet = $task->getSheet();
    9595        if (empty($sheet)) {
    96             echo '<p>' . esc_html__('No Sign-up Sheet Found.', 'fdsus') . '</p>';
     96            echo '<p>' . esc_html__('No Sign-up Sheet Found.', 'sign-up-sheets') . '</p>';
    9797            return ob_get_clean();
    9898        }
     
    121121                    $date_display = null;
    122122                    if ($date = $task->getDate()) {
    123                         $date_display = ' ' . esc_html__('on', 'fdsus')
     123                        $date_display = ' ' . esc_html__('on', 'sign-up-sheets')
    124124                            . sprintf(' <em class="dls-sus-task-date">%s</em>',
    125125                                date(get_option('date_format'), strtotime($date))
     
    133133        } else { // no task checkbox
    134134            if ($date = $task->getDate()) {
    135                 $date_display = ' ' . esc_html__('on', 'fdsus')
     135                $date_display = ' ' . esc_html__('on', 'sign-up-sheets')
    136136                    . sprintf(
    137137                        ' <em class="dls-sus-task-date">%s</em>',
     
    178178        $states = new StatesModel;
    179179
    180         $submitButtonText = __('Sign me up!', 'fdsus');
     180        $submitButtonText = __('Sign me up!', 'sign-up-sheets');
    181181        /**
    182182         * Filter for submit button text on sign-up form
     
    235235            || !wp_verify_nonce($_POST['signup_nonce'], 'fdsus_signup_submit')
    236236        ) {
    237             Notice::add('error', esc_html__('Sign-up nonce not valid.', 'fdsus'), false, Id::PREFIX . '-signup-nonce-invalid');
     237            Notice::add('error', esc_html__('Sign-up nonce not valid.', 'sign-up-sheets'), false, Id::PREFIX . '-signup-nonce-invalid');
    238238            return false;
    239239        }
     
    248248            if (!$task->isValid()) {
    249249                Notice::add(
    250                     'error', esc_html__('Hmm... we could not find the task for this sign-up.', 'fdsus'),
     250                    'error', esc_html__('Hmm... we could not find the task for this sign-up.', 'sign-up-sheets'),
    251251                    true, 'fdsus-task-invalid'
    252252                );
     
    257257            if ($task->isExpired()) {
    258258                Notice::add(
    259                     'error', esc_html__('Sign-ups on this sheet can no longer be edited.', 'fdsus'),
     259                    'error', esc_html__('Sign-ups on this sheet can no longer be edited.', 'sign-up-sheets'),
    260260                    true, 'fdsus-sheet-expired'
    261261                );
     
    268268                if ($sheet->isExpired()) {
    269269                    Notice::add(
    270                         'error', esc_html__('Sign-ups on this task can no longer be edited.', 'fdsus'),
     270                        'error', esc_html__('Sign-ups on this task can no longer be edited.', 'sign-up-sheets'),
    271271                        true, 'fdsus-task-expired'
    272272                    );
     
    276276                if (!$sheet->dlssus_is_active) {
    277277                    Notice::add(
    278                         'error', esc_html__('Sign-ups are no longer being accepted for this sheet.', 'fdsus'),
     278                        'error', esc_html__('Sign-ups are no longer being accepted for this sheet.', 'sign-up-sheets'),
    279279                        true, 'fdsus-signup-sheet-inactive'
    280280                    );
     
    283283            } else if ($sheet->ID != $task->post_parent) {
    284284                Notice::add(
    285                     'error', esc_html__('Signing up for more than one sheet is not currently supported.', 'fdsus'),
     285                    'error', esc_html__('Signing up for more than one sheet is not currently supported.', 'sign-up-sheets'),
    286286                    true, 'fdsus-multiple-sheet-signups-not-support'
    287287                );
     
    291291            if (!$sheet->isValid()) {
    292292                Notice::add(
    293                     'error', esc_html__('Hmm... we could not find the sheet for this sign-up.', 'fdsus'),
     293                    'error', esc_html__('Hmm... we could not find the sheet for this sign-up.', 'sign-up-sheets'),
    294294                    true, 'fdsus-sheet-invalid'
    295295                );
     
    299299            if (!$task->dlssus_is_active) {
    300300                Notice::add(
    301                     'error', esc_html__('Sign-ups are no longer being accepted for this task.', 'fdsus'),
     301                    'error', esc_html__('Sign-ups are no longer being accepted for this task.', 'sign-up-sheets'),
    302302                    true, 'fdsus-signup-task-inactive'
    303303                );
     
    309309        if (empty($tasks)) {
    310310            Notice::add(
    311                 'error', esc_html__('No valid task was found for this sign-up.', 'fdsus'),
     311                'error', esc_html__('No valid task was found for this sign-up.', 'sign-up-sheets'),
    312312                true, 'fdsus-all-tasks-invalid'
    313313            );
     
    320320                'warn', sprintf(
    321321                    /* translators: %s is replaced with a comma separated list of all missing required fields */
    322                     esc_html__('Please complete the following required fields: %s', 'fdsus'),
     322                    esc_html__('Please complete the following required fields: %s', 'sign-up-sheets'),
    323323                    implode(', ', $missingFieldNames)
    324324                ), false, 'fdsus-missing-fields'
     
    327327        }
    328328
    329         if (Settings::isEmailValidationEnabled() && (!filter_var($_POST['signup_email'], FILTER_VALIDATE_EMAIL))) {
     329        if ($sheet->showEmail() && !empty($_POST['signup_email']) && Settings::isEmailValidationEnabled() && (!filter_var($_POST['signup_email'], FILTER_VALIDATE_EMAIL))) {
    330330            Notice::add(
    331                 'warn', esc_html__('Please check that your email address is properly formatted', 'fdsus'),
     331                'warn', esc_html__('Please check that your email address is properly formatted', 'sign-up-sheets'),
    332332                false, 'fdsus-invalid-email'
    333333            );
     
    335335        }
    336336
    337         if (Settings::isEmailValidationEnabled()
     337        if ($sheet->showEmail() && !empty($_POST['signup_email']) && Settings::isEmailValidationEnabled()
    338338            && !checkdnsrr(
    339339                substr($_POST['signup_email'], strpos($_POST['signup_email'], '@') + 1), 'MX'
     
    341341        ) {
    342342            Notice::add(
    343                 'warn', esc_html__('Whoops, it looks like your email domain may not be valid.', 'fdsus'),
     343                'warn', esc_html__('Whoops, it looks like your email domain may not be valid.', 'sign-up-sheets'),
    344344                false, 'fdsus-email-checkdnsrr'
    345345            );
     
    349349        if ($this->data->is_honeypot_enabled() && !empty($_POST['website'])) {
    350350            Notice::add(
    351                 'warn', esc_html__('Sorry, your submission has been blocked.', 'fdsus'),
     351                'warn', esc_html__('Sorry, your submission has been blocked.', 'sign-up-sheets'),
    352352                false, 'fdsus-signup-form-honeypot'
    353353            );
     
    446446                    );
    447447
    448                     if ($sendSignupConfirmationEmail) {
     448                    if (!empty($_POST['signup_email']) && $sendSignupConfirmationEmail) {
    449449                        $this->mail->send($_POST['signup_email'], $sheet, $task, $signupId, 'signup');
    450450                    }
  • sign-up-sheets/trunk/controller/scode/sign-up-sheet.php

    r3234219 r3234235  
    6868                array(
    6969                    'id'                     => false,
    70                     'list_title'             => esc_html__('Current Sign-up Sheets', 'fdsus'),
     70                    'list_title'             => esc_html__('Current Sign-up Sheets', 'sign-up-sheets'),
    7171                    'category_id'            => false, // Pro only - deprecated as of v2.1
    7272                    'category_slug'          => false, // Pro only - allows comma-separated string
     
    7979        $dbVersion = get_option('dls_sus_db_version');
    8080        if (strpos($dbVersion, '1.0') === 0 || strpos($dbVersion, '2.0') === 0) {
    81             Notice::add('info', esc_html__('No sheet found, please contact the webmaster.', 'fdsus'), true);
     81            Notice::add('info', esc_html__('No sheet found, please contact the webmaster.', 'sign-up-sheets'), true);
    8282        }
    8383
  • sign-up-sheets/trunk/controller/scode/user-sign-ups.php

    r3234219 r3234235  
    6969        $user = wp_get_current_user();
    7070        if (!$user->exists()) {
    71             Notice::add('info', esc_html__('You must be logged in to view your sign-ups.', 'fdsus'), true);
     71            Notice::add('info', esc_html__('You must be logged in to view your sign-ups.', 'sign-up-sheets'), true);
    7272            return apply_filters(Id::PREFIX . '_notices', null);
    7373        }
     
    127127            if ($sheet->showEmail()) {
    128128                $row['signup_additional']['email'] = array(
    129                     'label' => __('Email', 'fdsus'),
     129                    'label' => __('Email', 'sign-up-sheets'),
    130130                    'value' => $signup->dlssus_email,
    131131                );
     
    134134            if ($sheet->showPhone()) {
    135135                $row['signup_additional']['phone'] = array(
    136                     'label' => __('Phone', 'fdsus'),
     136                    'label' => __('Phone', 'sign-up-sheets'),
    137137                    'value' => $signup->dlssus_phone,
    138138                );
     
    141141            if ($sheet->showAddress()) {
    142142                $row['signup_additional']['phone'] = array(
    143                     'label' => __('Address', 'fdsus'),
     143                    'label' => __('Address', 'sign-up-sheets'),
    144144                    'value' => $signup->dlssus_address . ', ' . $signup->dlssus_city . ', ' . $signup->dlssus_state
    145145                        . ' ' . $signup->dlssus_zip,
  • sign-up-sheets/trunk/controller/sheet.php

    r3234219 r3234235  
    151151                                sprintf(
    152152                                    /* translators: %1$s is replaced with task name, %2$d is replaced with the current number of signups on that task, %3$s is replaced with "person" or "people" depending on the number of signups  */
    153                                     esc_html__('The number of spots for task "%1$s" cannot be set below %2$d because it currently has %2$d %3$s signed up. Please clear some spots first before updating this task.', 'fdsus'),
     153                                    esc_html__('The number of spots for task "%1$s" cannot be set below %2$d because it currently has %2$d %3$s signed up. Please clear some spots first before updating this task.', 'sign-up-sheets'),
    154154                                    esc_html($data['title']),
    155155                                    $signupCount,
     
    178178                                sprintf(
    179179                                    /* translators: %1$s is replaced with task name, %2$d is replaced with the current number of signups on that task, %3$s is replaced with "person" or "people" depending on the number of signups  */
    180                                     esc_html__('The task "%1$s" cannot be removed because it has %2$d %3$s signed up.  Please clear all spots first before removing this task.', 'fdsus'),
     180                                    esc_html__('The task "%1$s" cannot be removed because it has %2$d %3$s signed up.  Please clear all spots first before removing this task.', 'sign-up-sheets'),
    181181                                    $task->post_title,
    182182                                    $signupCount,
     
    330330    function modifyTheContent($content)
    331331    {
    332         $before = '';
    333         $after = '';
    334 
    335         if (is_singular() && is_main_query() && get_post_type() === SheetModel::POST_TYPE) {
    336             // Before
    337             ob_start();
    338             fdsus_the_signup_form_response();
    339             if (dlssus_has_sheet_date() && empty($_GET['task_id'])): ?>
    340                 <p class="dls-sus-sheet-date">
    341                     <?php esc_html_e('Date', 'fdsus'); ?>:
    342                     <?php echo dlssus_field('date'); ?>
    343                 </p>
    344             <?php endif;
    345             $before = ob_get_clean();
    346 
    347             // After
    348             ob_start();
    349             dlssus_get_template_part('content');
    350             $after = ob_get_clean();
    351 
    352             // Hide normal sheet page content if displaying signup
    353             if (!empty($_GET['task_id'])) {
    354                 $content = '';
    355             }
    356         }
     332        if (post_password_required(get_the_ID())
     333            || !is_singular()
     334            || !is_main_query()
     335            || get_post_type() !== SheetModel::POST_TYPE
     336        ) {
     337            return $content;
     338        }
     339
     340        // Before
     341        ob_start();
     342        fdsus_the_signup_form_response();
     343        if (dlssus_has_sheet_date() && empty($_GET['task_id'])): ?>
     344            <p class="dls-sus-sheet-date">
     345                <?php esc_html_e('Date', 'sign-up-sheets'); ?>:
     346                <?php echo dlssus_field('date'); ?>
     347            </p>
     348        <?php endif;
     349        $before = ob_get_clean();
     350
     351        // After
     352        ob_start();
     353        dlssus_get_template_part('content');
     354        $after = ob_get_clean();
     355
     356        // Hide normal sheet page content if displaying signup
     357        if (!empty($_GET['task_id'])) {
     358            $content = '';
     359        }
     360
    357361        return $before . $content . $after;
    358362    }
     
    418422                $successMsg = sprintf(
    419423                    /* translators: %s is replaced with the task title */
    420                     esc_html__('You have been signed up for %s!', 'fdsus'),
     424                    esc_html__('You have been signed up for %s!', 'sign-up-sheets'),
    421425                    '<em>' . wp_kses_post($task->post_title) . '</em>'
    422426                );
  • sign-up-sheets/trunk/controller/task-table.php

    r3234219 r3234235  
    5050        /**
    5151         * @var bool $showSignupLink
     52         * @var bool $emailSimplified
    5253         */
    5354        extract(shortcode_atts(array(
    5455            'showSignupLink' => false,
     56            'emailSimplified' => false,
    5557        ), $atts));
    5658        $this->config['showSignupLink'] = $showSignupLink;
     59        $this->config['emailSimplified'] = $emailSimplified;
    5760
    5861        $this->tasks = $this->sheet->getTasks();
    59         $this->table = new TaskTableModel($sheet);
     62        $this->table = new TaskTableModel($sheet, $this->config);
     63
     64        $this->setVariables($atts);
    6065
    6166        parent::__construct();
     
    6570     * Set variables
    6671     */
    67     private function setVariables()
     72    private function setVariables($excludedAtts = array())
    6873    {
    69         $this->config['isFullCompact'] = $this->sheet->isFullCompact() && !is_admin();
    70         $this->config['displayAll'] = Settings::isDisplayAllSignupDataEnabled() || is_admin();
     74        $this->config['isFullCompact'] = $this->sheet->isFullCompact() && !is_admin() && !$this->config['emailSimplified'];
     75        $this->config['displayAll'] = Settings::isDisplayAllSignupDataEnabled() || is_admin() || $this->config['emailSimplified'];
    7176
    7277        /**
     
    110115        $out = '';
    111116        foreach ($this->table->rows as $row) {
    112             $out .= sprintf('<tr class="%s">', $row->class ? $row->class : '');
     117            $out .= sprintf(
     118                '<tr class="%s" %s>',
     119                $row->class ? $row->class : '',
     120                $this->config['emailSimplified'] ? 'valign="top" align="left"' : ''
     121            );
    113122            foreach ($row->cells as $cell) {
    114123                $scope = '';
     
    141150        // Remaining empty spots
    142151        if ($this->config['displayAll'] && !$this->config['isFullCompact']) {
    143             $this->config['emptySignupColspan'] += 7;
     152            $this->config['emptySignupColspan'] += 6;
     153            if ($this->sheet->showEmail()) {
     154                $this->config['emptySignupColspan']++;
     155            }
    144156            if ($this->sheet->showPhone()) {
    145157                $this->config['emptySignupColspan']++;
     
    180192        $this->table = apply_filters('fdsus_tasktable-table-header_data_after_task_title', $this->table, $this->sheet, $this->config);
    181193
    182         $this->table->addHeaderCell('name', esc_html__('Name', 'fdsus'));
     194        $this->table->addHeaderCell('name', esc_html__('Name', 'sign-up-sheets'));
    183195
    184196        if ($this->config['displayAll']) {
    185             $this->table->addHeaderCell('email', esc_html__('E-mail', 'fdsus'));
     197            if ($this->sheet->showEmail()) {
     198                $this->table->addHeaderCell('email', esc_html__('E-mail', 'sign-up-sheets'));
     199            }
    186200            if ($this->sheet->showPhone()) {
    187                 $this->table->addHeaderCell('phone', esc_html__('Phone', 'fdsus'));
     201                $this->table->addHeaderCell('phone', esc_html__('Phone', 'sign-up-sheets'));
    188202            }
    189203            if ($this->sheet->showAddress()) {
    190                 $this->table->addHeaderCell('address', esc_html__('Address', 'fdsus'));
    191                 $this->table->addHeaderCell('city', esc_html__('City', 'fdsus'));
    192                 $this->table->addHeaderCell('state', esc_html__('State', 'fdsus'));
    193                 $this->table->addHeaderCell('zip', esc_html__('Zip', 'fdsus'));
     204                $this->table->addHeaderCell('address', esc_html__('Address', 'sign-up-sheets'));
     205                $this->table->addHeaderCell('city', esc_html__('City', 'sign-up-sheets'));
     206                $this->table->addHeaderCell('state', esc_html__('State', 'sign-up-sheets'));
     207                $this->table->addHeaderCell('zip', esc_html__('Zip', 'sign-up-sheets'));
    194208            }
    195209        }
     
    212226                    'clear-checkbox',
    213227                    '<label>
    214                         <span class="sr-only">' . __('Select all spots to Clear', 'fdsus') . '</span>
     228                        <span class="screen-reader-text">' . esc_html__('Select all spots to Clear', 'sign-up-sheets') . '</span>
    215229                        <input type="checkbox" value="" id="select-all-clear">
    216230                    </label>
    217                     <input name="multi_submit" type="submit" class="button" value="' . esc_html__('Clear Selected', 'fdsus') . '" onclick="return confirm(\'' . esc_html__('This will permanently remove all selected sign-ups for this sheet.', 'fdsus') . '\');">',
     231                    <input name="multi_submit" type="submit" class="button" value="' . esc_html__('Clear Selected', 'sign-up-sheets') . '" onclick="return confirm(\'' . esc_html__('This will permanently remove all selected sign-ups for this sheet.', 'sign-up-sheets') . '\');">',
    218232                    'fdsus-col-clear'
    219233                );
     
    284298
    285299            $signupIndex = 0;
    286             if (!$this->config['isFullCompact']) {
     300            if (!$this->config['isFullCompact'] || $this->config['emailSimplified']) {
    287301                if (!empty($signups) && is_array($signups)) {
    288302                    foreach ($signups AS $signup) {
     
    361375                            '<span class="dls-sus-spot-num">%s</span> <span>%s</span>',
    362376                            /* translators: %d is replaced with the spot number */
    363                             sprintf(esc_html__('#%d:', 'fdsus'), (int)$this->config['spotIndex']),
     377                            sprintf(esc_html__('#%d:', 'sign-up-sheets'), (int)$this->config['spotIndex']),
    364378                            $name
    365379                        );
     
    367381
    368382                        if ($this->config['displayAll']) {
    369                             $this->table->addRowCell('auto', 'email', esc_html($signup->dlssus_email));
     383                            if ($this->sheet->showEmail()) {
     384                                $this->table->addRowCell('auto', 'email', esc_html($signup->dlssus_email));
     385                            }
    370386                            if ($this->sheet->showPhone()) {
    371387                                $this->table->addRowCell('auto', 'phone', esc_html($signup->dlssus_phone));
     
    408424                                <span class="delete">
    409425                                    <label>
    410                                         <span class="sr-only">'
     426                                        <span class="screen-reader-text">'
    411427                                            .  /* translators: %s is replaced with the index of the spot within the current task */
    412                                             sprintf(__('Select spot #%s to clear', 'fdsus'), (int)$this->config['spotIndex']) . '</span>
     428                                            sprintf(__('Select spot #%s to clear', 'sign-up-sheets'), (int)$this->config['spotIndex']) . '</span>
    413429                                        <input type="checkbox" name="clear[]" value="' . (int)$signup->ID . '" class="clear-checkbox">
    414430                                    </label>
     
    418434                                </span>
    419435                                <a href="' . esc_url(Settings::getAdminEditSignupPageUrl($signup->ID, $_GET['sheet_id'])) . '">
    420                                     <span class="sr-only">' . __('Edit', 'fdsus') . '</span>
     436                                    <span class="screen-reader-text">' . esc_html__('Edit', 'sign-up-sheets') . '</span>
    421437                                    <i class="dashicons dashicons-edit" aria-hidden="true"></i>
    422438                                </a>
     
    425441                                        id="fdsus-signup-metadata-control-' . (int)$signup->ID . '"
    426442                                        aria-controls="fdsus-signup-metadata-detail-' . (int)$signup->ID . '">
    427                                         <span class="sr-only">' . __('Additional Details', 'fdsus') . '</span>
     443                                        <span class="screen-reader-text">' . esc_html__('Additional Details', 'sign-up-sheets') . '</span>
    428444                                        <i class="dashicons dashicons-info" aria-hidden="true"></i>
    429445                                    </a>
     
    432448                                        aria-labelledby="fdsus-signup-metadata-control-' . (int)$signup->ID . '">
    433449                                        <ul class="fdsus-signup-metadata">
    434                                             <li>' . __('Added', 'fdsus') . ': %3$s</li>
    435                                             <li>' . __('Updated', 'fdsus') . ': %4$s</li>
    436                                             <li>' . __('Linked user', 'fdsus') . ':  %5$s</li>
     450                                            <li>' . esc_html__('Added', 'sign-up-sheets') . ': %3$s</li>
     451                                            <li>' . esc_html__('Updated', 'sign-up-sheets') . ': %4$s</li>
     452                                            <li>' . esc_html__('Linked user', 'sign-up-sheets') . ':  %5$s</li>
    437453                                        </ul>
    438454                                    </div>
    439455                                </div>
    440456                                ',
    441                                 esc_html__('Clear Spot Now', 'fdsus'),
    442                                 'onclick="return confirm(\'' . esc_html__('This will permanently remove this sign-up.', 'fdsus') . '\');"',
     457                                esc_html__('Clear Spot Now', 'sign-up-sheets'),
     458                                'onclick="return confirm(\'' . esc_html__('This will permanently remove this sign-up.', 'sign-up-sheets') . '\');"',
    443459                                date('Y-m-d ' . get_option('time_format'), strtotime($signup->post_date)),
    444460                                date('Y-m-d ' . get_option('time_format'), strtotime($signup->post_modified)),
     
    510526                        $signupLink = $task->getSignupLink();
    511527                    } else {
    512                         $signupLink = esc_html__('(empty)', 'fdsus');
     528                        $signupLink = esc_html__('(empty)', 'sign-up-sheets');
    513529                        if (is_admin()) {
    514530                            $signupLink .= '
    515531                                <a href="' . esc_url(Settings::getAdminEditSignupPageUrl($task->ID, $_GET['sheet_id'], 'add')) . '">
    516                                     <span class="sr-only">' . __('Add Sign-up', 'fdsus') . '</span>
     532                                    <span class="screen-reader-text">' . esc_html__('Add Sign-up', 'sign-up-sheets') . '</span>
    517533                                    <i class="dashicons dashicons-plus" aria-hidden="true"></i>
    518534                                </a>';
     
    520536                    }
    521537                    if ($this->sheet->isExpired() || $task->isExpired()) {
    522                         $signupLink .= esc_html__(' - sign-ups closed', 'fdsus');
     538                        $signupLink .= esc_html__(' - sign-ups closed', 'sign-up-sheets');
    523539                    }
    524540
     
    548564    /**
    549565     * Get display code for tasks table (back and front-end)
     566     *
     567     * @param bool $echo
     568     * @param bool $emailSimplified
     569     *
     570     * @return string|void
    550571     */
    551     public function output()
     572    public function output($echo = true, $emailSimplified = false)
    552573    {
     574        ob_start();
     575
    553576        if (empty($this->tasks)) : ?>
    554             <p><?php esc_html_e('No tasks were found.', 'fdsus'); ?></p>
     577            <p><?php esc_html_e('No tasks were found.', 'sign-up-sheets'); ?></p>
    555578            <?php
    556             return;
     579            if ($echo) {
     580                echo ob_get_clean();
     581                return;
     582            }
     583            return ob_get_clean();
    557584        endif;
    558 
    559         $this->setVariables();
    560585
    561586        // Header
     
    575600        // Build Table
    576601        ?>
    577         <form action="<?php echo esc_url($formUrl); ?>" method="post" id="sus_form" class="fdsus-form">
    578             <table class="dls-sus-tasks <?php echo is_admin() ? 'wp-list-table widefat' : null; ?>">
     602        <?php if (!$emailSimplified) : ?><form action="<?php echo esc_url($formUrl); ?>" method="post" id="sus_form" class="fdsus-form"><?php endif; ?>
     603            <table class="dls-sus-tasks <?php echo is_admin() ? 'wp-list-table widefat' : null; ?>" <?php if ($emailSimplified) : ?>cellspacing="0" cellpadding="5" border="1"<?php endif; ?>>
    579604                <thead><?php echo $header; ?></thead>
    580                 <tfoot><?php echo $header; ?></tfoot>
     605                <?php if (!$emailSimplified) : ?><tfoot><?php echo $header; ?></tfoot><?php endif; ?>
    581606                <tbody><?php echo $body; ?></tbody>
    582607            </table>
     
    586611             *
    587612             * @param SheetModel $sheet
     613             * @param array      $config
    588614             *
    589615             * @since 2.2
    590616             */
    591             do_action('fdsus_tasktable_after_table', $this->sheet);
     617            do_action('fdsus_tasktable_after_table', $this->sheet, $this->config);
    592618
    593619            wp_nonce_field('clear-multiple-signups', 'manage_signup_nonce', true, false);
    594620            ?>
    595         </form>
     621        <?php if (!$emailSimplified) : ?></form><?php endif; ?>
    596622        <?php
     623
     624        if ($echo) {
     625            echo ob_get_clean();
     626            return;
     627        }
     628        return ob_get_clean();
    597629    }
    598630
  • sign-up-sheets/trunk/css/admin.css

    r3234219 r3234235  
    1 @font-face{font-family:"fdsus";src:url("font/fdsus/fonts/fdsus.ttf?jfroy1") format("truetype"),url("font/fdsus/fonts/fdsus.woff?jfroy1") format("woff"),url("font/fdsus/fonts/fdsus.svg?jfroy1#fdsus") format("svg");font-weight:normal;font-style:normal;font-display:block}[class^=fdsus-icon-],[class*=" fdsus-icon-"]{font-family:"fdsus" !important;speak:never;font-style:normal;font-weight:normal;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fdsus-icon-cursor-move:before{content:""}.fdsus-icon-arrow-horizontal:before{content:""}.fdsus-icon-arrow-vertical:before{content:""}.fdsus-icon-cursor-move-two:before{content:""}.fdsus-icon-plus:before{content:""}.fdsus-icon-remove:before{content:""}.fdsus-icon-star:before{content:""}.fdsus-icon-checkbox:before{content:""}.fdsus-icon-clipboard-notes:before{content:""}.fdsus-icon-clipboard:before{content:""}.fdsus-icon-sus:before{content:""}.wp-list-table .fdsus-id-value{color:#50575e}.post-type-dlssus_sheet .fdsus-edit-quick-info{margin-bottom:1em;text-align:center}.post-type-dlssus_sheet .fdsus-edit-quick-info .quick-info-item{display:inline-block;margin:0 .6em .6em}.post-type-dlssus_sheet .fdsus-edit-quick-info .quick-info-id{display:block}.post-type-dlssus_sheet #dlssus_sheet-settings-meta .dls-sus-pro{font-size:.8em}.post-type-dlssus_sheet #dlssus_sheet-settings-meta .fdsus-pro-setting{padding:1%}.post-type-dlssus_sheet .dlsmb-main-label{margin-bottom:2px}@media screen and (min-width: 601px){#dlssus_sheet-settings-meta .inside{display:flex;flex-wrap:wrap;gap:3%}#dlssus_sheet-settings-meta .dlsmb-field{width:31.33%}#dlssus_sheet-settings-meta .dlsmb-field.fdsus-pro-setting{width:29.33%}#dlssus_sheet-settings-meta .dlsmb-field-col-6{width:48.5%}#dlssus_sheet-settings-meta .dlsmb-field-col-6.fdsus-pro-setting{width:46.5%}#dlssus_sheet-settings-meta .dlsmb-field-col-12{width:100%}#dlssus_sheet-settings-meta .dlsmb-field-col-12.fdsus-pro-setting{width:100%}#dlssus_sheet-settings-meta .dlsmb-field-type-checkboxes{display:flex;flex-wrap:wrap;gap:.6em}#dlssus_sheet-settings-meta .dlsmb-field-type-checkboxes .dlsmb-main-label{width:100%}}@media screen and (max-width: 600px){#dlssus_sheet-settings-meta .dlsmb-field-type-checkboxes label:not(.dlsmb-main-label){line-height:2.4}}.dlssus_sheet_page_fdsus-manage .page-title-action .dashicons{vertical-align:middle}.dlssus_sheet_page_fdsus-manage .fdsus-toggletip{display:inline-block;position:relative}.dlssus_sheet_page_fdsus-manage .fdsus-toggletip>a::after{content:"";font-family:"dashicons";vertical-align:middle;margin-left:-4px}.dlssus_sheet_page_fdsus-manage .fdsus-toggletip>a[aria-expanded=true]::after{content:""}.dlssus_sheet_page_fdsus-manage .fdsus-toggletip>a[aria-expanded=true] .dashicons{background:#fff;border:1px solid #c3c4c7;border-radius:2em 2em 0 0;border-bottom-color:#fff;margin-top:-1px;margin-left:-1px;position:relative;z-index:20}.dlssus_sheet_page_fdsus-manage .fdsus-toggletip div[role=region]{background:#fff;border:1px solid #c3c4c7;margin-top:-1px;min-width:13em;padding:1em;position:absolute;right:0;z-index:10}.dlssus_sheet_page_fdsus-manage .fdsus-signup-metadata{font-size:.8em;list-style-type:none;margin:0;padding:0}.dlssus_sheet_page_fdsus-manage .fdsus-signup-metadata li{margin:0;padding:0}.dlssus_sheet_page_fdsus-manage #select-all-clear{margin-right:.6em}.dlssus_sheet_page_fdsus-manage .button{vertical-align:middle}.fdsus-pro-setting{background-color:#ebf9f6;background:-o-repeating-linear-gradient(left, #ebf9f6, #ebf9f6 10px, #e0f5f0 10px, #e0f5f0 12px);background:repeating-linear-gradient(90deg, #ebf9f6, #ebf9f6 10px, #e0f5f0 10px, #e0f5f0 12px)}.fdsus-pro-setting th{padding-left:10px}.fdsus-pro-setting .dls-sus-pro{font-size:.8em}.dls_sus .dls-sus-settings .dls-sus-pro{font-size:.8em}.dls-sus-signup-form label{display:block}.dls-sus-signup-form label.dls-sus-inline-label{display:inline}.dls-sus-signup-form input[type=text],.dls-sus-signup-form input[type=email]{width:100%}.dls_sus .sr-only:not(:focus):not(:active){clip:rect(0 0 0 0);clip-path:inset(50%);height:1px;overflow:hidden;position:absolute;white-space:nowrap;width:1px}.dls_sus .dashicons-trash:before{color:#e22f2e}.dls_sus a:hover .dashicons-trash:before,.dls_sus a:focus .dashicons-trash:before{color:#ff5348}.dls_sus .fixed .column-task_num,.dls_sus .fixed .column-spot_num,.dls_sus .fixed .column-filled_spot_num{width:10%}.dls_sus .fixed .column-id{width:5%}.dls_sus .tasks{margin-bottom:3em}.dls_sus .tasks LI{background:rgba(0,0,0,0) url("../images/icon-drag-y.png") no-repeat scroll left center;padding-left:16px;min-height:20px}.dls_sus .tasks LI:hover{cursor:move}.dls_sus .tasks LI.ui-sortable-helper{cursor:move}.dls_sus .tasks .add-task-after,.dls_sus .tasks .remove-task{display:inline-block;border:2px solid #fff;color:#fff;width:1.4em;height:1.4em;line-height:1.4em;text-align:center;text-decoration:none;-webkit-border-radius:999em;-moz-border-radius:999em;border-radius:999em}.dls_sus .tasks .add-task-after{background-color:#6f9f44}.dls_sus .tasks .remove-task{background-color:#bf212e}.dls_sus .dls-sus-tasks tfoot .fdsus-col-clear *{display:none}.dls_sus .dls-sus-tasks .fdsus-col-clear input[type=checkbox]{margin-left:0}.dls-sus-tasks tbody th{vertical-align:top}.dls-sus-pro{background-color:#47c9af;color:#fff;font-size:.4em;font-weight:bold;padding:.2em .6em;-webkit-border-radius:1em;border-radius:1em}.dls-sus-repeater td{vertical-align:top}.dls-sus-repeater textarea{height:60px}.js .dls_sus .postbox H3{cursor:pointer}.dls_sus .postbox H3.hndle{padding:8px 12px;margin:0}.dls_sus form.dls-sus-settings{margin-top:1em}.dls-sus-system-info,.dls-sus-system-info[readonly=readonly]{width:100%;overflow:auto;background:#222;color:#bbb;padding:1em;white-space:pre;font-family:Menlo,Monaco,monospace}#dlssus_sheet-general-meta .dlsmb-field-key-datepicker-dlssus_date,#dlssus_sheet-general-meta .dlsmb-field-key-checkbox-dlssus_use_task_dates{display:inline-block;margin-right:1em}.dlssus_sheet-settings-meta .dlsmb-field LABEL.dlsmb-main-label{display:inline-block;width:30%;max-width:300px}#dlssus_sheet-general-meta .dlsmb-field-key-datepicker-dlssus_date,#dlssus_sheet-general-meta .dlsmb-field-key-checkbox-dlssus_use_task_dates{display:inline-block;margin-right:1em}.dlssus_sheet-settings-meta .dlsmb-field LABEL.dlsmb-main-label{display:inline-block;width:30%;max-width:300px}.dlssus_tasks-row .add-task-after,.dlssus_tasks-row .remove-task{display:inline-block;border:2px solid #fff;color:#fff;width:1.4em;height:1.4em;line-height:1.4em;text-align:center;text-decoration:none;-webkit-border-radius:999em;-moz-border-radius:999em;border-radius:999em}.dlssus_tasks-row .add-task-after{background-color:#6f9f44}.dlssus_tasks-row .remove-task{background-color:#bf212e}.dlsmb-repeater-dlssus_tasks-row .dlsmb-field-key-textarea-filled_spots .dlsmb-field-element{line-height:2;margin:0;padding:0 8px;vertical-align:middle}.dlsmb-field-key-textarea-dlssus_sheet_email_conf_message textarea{height:11.5em}.dlsmb-field-key-textarea-dlssus_sheet_email_message textarea{height:11.5em}.dls-sus-task-header-row .dashicons{width:auto;height:auto;line-height:1.6em}.dlsmb-field-type-hidden{display:none}@media only screen and (max-width: 760px){#dlssus_sheet-tasks-meta table,#dlssus_sheet-tasks-meta thead,#dlssus_sheet-tasks-meta tbody,#dlssus_sheet-tasks-meta td,#dlssus_sheet-tasks-meta tr.dlsmb-repeater-dlssus_tasks-row,#dlssus_sheet-tasks-meta th{display:block}#dlssus_sheet-tasks-meta tr.dlsmb-blank-repeater,#dlssus_sheet-tasks-meta thead tr{display:none}#dlssus_sheet-tasks-meta tr{margin:0 0 1rem 0}#dlssus_sheet-tasks-meta td{border:none;border-bottom:1px solid #eee;position:relative;padding-left:5%}#dlssus_sheet-tasks-meta td{border:0}#dlssus_sheet-tasks-meta td:nth-of-type(1){min-height:30px}#dlssus_sheet-tasks-meta tr.dlsmb-repeater-dlssus_tasks-row td .dlsmb-main-label-mobile{display:block !important;margin-bottom:10px;font-weight:bold}.dlsmb-field-type-repeater LABEL.dlsmb-main-label{display:block;font-weight:bold;margin-bottom:.6em}}.dlssus-email-test fieldset{background-color:#e2e2e2;padding:2em;max-width:40em}.dlssus-email-test fieldset input[type=email],.dlssus-email-test fieldset textarea{width:100%}.dlssus-email-test fieldset p:first-child{margin-right:2%}.dlssus-email-test fieldset p:first-child,.dlssus-email-test fieldset p:nth-child(2){margin-top:0;width:49%;float:left}.dlssus-email-test fieldset p:nth-child(2){margin-top:0}.dlssus-email-test fieldset p:nth-child(3){clear:both}.dlssus-email-test fieldset p:last-child{margin-bottom:0}.fdsus-footer{text-align:center}.fdsus-footer hr{margin:2em 0 1em}.fdsus-footer-getpro{display:inline-block;text-decoration:none;vertical-align:middle}.fdsus-footer-getpro::before{font-family:"fdsus";content:"";vertical-align:middle;margin:0 .5em;font-size:1.4em}.fdsus-footer-getpro span{text-decoration:underline}.post-type-dlssus_sheet #wpbody-content,.post-type-dlssus_task #wpbody-content,.post-type-dlssus_signup #wpbody-content{padding-bottom:7rem}#dashboard_right_now li.dlssus_sheet-count a:before{content:"";font-family:"fdsus"}/*# sourceMappingURL=admin.css.map */
     1@font-face{font-family:"fdsus";src:url("font/fdsus/fonts/fdsus.ttf?jfroy1") format("truetype"),url("font/fdsus/fonts/fdsus.woff?jfroy1") format("woff"),url("font/fdsus/fonts/fdsus.svg?jfroy1#fdsus") format("svg");font-weight:normal;font-style:normal;font-display:block}[class^=fdsus-icon-],[class*=" fdsus-icon-"]{font-family:"fdsus" !important;speak:never;font-style:normal;font-weight:normal;font-variant:normal;text-transform:none;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fdsus-icon-cursor-move:before{content:""}.fdsus-icon-arrow-horizontal:before{content:""}.fdsus-icon-arrow-vertical:before{content:""}.fdsus-icon-cursor-move-two:before{content:""}.fdsus-icon-plus:before{content:""}.fdsus-icon-remove:before{content:""}.fdsus-icon-star:before{content:""}.fdsus-icon-checkbox:before{content:""}.fdsus-icon-clipboard-notes:before{content:""}.fdsus-icon-clipboard:before{content:""}.fdsus-icon-sus:before{content:""}.wp-list-table .fdsus-id-value{color:#50575e}.post-type-dlssus_sheet .fdsus-edit-quick-info{margin-bottom:1em;text-align:center}.post-type-dlssus_sheet .fdsus-edit-quick-info .quick-info-item{display:inline-block;margin:0 .6em .6em}.post-type-dlssus_sheet .fdsus-edit-quick-info .quick-info-id{display:block}.post-type-dlssus_sheet #dlssus_sheet-settings-meta .dls-sus-pro{font-size:.8em}.post-type-dlssus_sheet #dlssus_sheet-settings-meta .fdsus-pro-setting{padding:1%}.post-type-dlssus_sheet .dlsmb-main-label{margin-bottom:2px}@media screen and (min-width: 601px){#dlssus_sheet-settings-meta .inside{display:flex;flex-wrap:wrap;gap:3%}#dlssus_sheet-settings-meta .dlsmb-field{width:31.33%}#dlssus_sheet-settings-meta .dlsmb-field.fdsus-pro-setting{width:29.33%}#dlssus_sheet-settings-meta .dlsmb-field-col-6{width:48.5%}#dlssus_sheet-settings-meta .dlsmb-field-col-6.fdsus-pro-setting{width:46.5%}#dlssus_sheet-settings-meta .dlsmb-field-col-12{width:100%}#dlssus_sheet-settings-meta .dlsmb-field-col-12.fdsus-pro-setting{width:100%}#dlssus_sheet-settings-meta .dlsmb-field-type-checkboxes{display:flex;flex-wrap:wrap;gap:.6em}#dlssus_sheet-settings-meta .dlsmb-field-type-checkboxes .dlsmb-main-label{width:100%}}@media screen and (max-width: 600px){#dlssus_sheet-settings-meta .dlsmb-field-type-checkboxes label:not(.dlsmb-main-label){line-height:2.4}}.dlssus_sheet_page_fdsus-manage .page-title-action .dashicons{vertical-align:middle}.dlssus_sheet_page_fdsus-manage .fdsus-toggletip{display:inline-block;position:relative}.dlssus_sheet_page_fdsus-manage .fdsus-toggletip>a::after{content:"";font-family:"dashicons";vertical-align:middle;margin-left:-4px}.dlssus_sheet_page_fdsus-manage .fdsus-toggletip>a[aria-expanded=true]::after{content:""}.dlssus_sheet_page_fdsus-manage .fdsus-toggletip>a[aria-expanded=true] .dashicons{background:#fff;border:1px solid #c3c4c7;border-radius:2em 2em 0 0;border-bottom-color:#fff;margin-top:-1px;margin-left:-1px;position:relative;z-index:20}.dlssus_sheet_page_fdsus-manage .fdsus-toggletip div[role=region]{background:#fff;border:1px solid #c3c4c7;margin-top:-1px;min-width:13em;padding:1em;position:absolute;right:0;z-index:10}.dlssus_sheet_page_fdsus-manage .fdsus-signup-metadata{font-size:.8em;list-style-type:none;margin:0;padding:0}.dlssus_sheet_page_fdsus-manage .fdsus-signup-metadata li{margin:0;padding:0}.dlssus_sheet_page_fdsus-manage #select-all-clear{margin-right:.6em}.dlssus_sheet_page_fdsus-manage .button{vertical-align:middle}.fdsus-pro-setting{background-color:#ebf9f6;background:-o-repeating-linear-gradient(left, #ebf9f6, #ebf9f6 10px, #e0f5f0 10px, #e0f5f0 12px);background:repeating-linear-gradient(90deg, #ebf9f6, #ebf9f6 10px, #e0f5f0 10px, #e0f5f0 12px)}.fdsus-pro-setting th{padding-left:10px}.fdsus-pro-setting .dls-sus-pro{font-size:.8em}.dls_sus .dls-sus-settings .dls-sus-pro{font-size:.8em}.dls-sus-signup-form label{display:block}.dls-sus-signup-form label.dls-sus-inline-label{display:inline}.dls-sus-signup-form input[type=text],.dls-sus-signup-form input[type=email]{width:100%}.dls-sus-pro{background-color:#47c9af;color:#fff;font-size:.4em;font-weight:bold;padding:.2em .6em;-webkit-border-radius:1em;border-radius:1em}.dls-sus-repeater td{vertical-align:top}.dls-sus-repeater textarea{height:60px}.js .dls_sus .postbox H3{cursor:pointer}.dls_sus .postbox H3.hndle{padding:8px 12px;margin:0}.dls_sus form.dls-sus-settings{margin-top:1em}.dls-sus-system-info,.dls-sus-system-info[readonly=readonly]{width:100%;overflow:auto;background:#222;color:#bbb;padding:1em;white-space:pre;font-family:Menlo,Monaco,monospace}#dlssus_sheet-general-meta .dlsmb-field-key-datepicker-dlssus_date,#dlssus_sheet-general-meta .dlsmb-field-key-checkbox-dlssus_use_task_dates{display:inline-block;margin-right:1em}.dlssus_sheet-settings-meta .dlsmb-field LABEL.dlsmb-main-label{display:inline-block;width:30%;max-width:300px}#dlssus_sheet-general-meta .dlsmb-field-key-datepicker-dlssus_date,#dlssus_sheet-general-meta .dlsmb-field-key-checkbox-dlssus_use_task_dates{display:inline-block;margin-right:1em}.dlssus_sheet-settings-meta .dlsmb-field LABEL.dlsmb-main-label{display:inline-block;width:30%;max-width:300px}.dlssus_tasks-row .add-task-after,.dlssus_tasks-row .remove-task{display:inline-block;border:2px solid #fff;color:#fff;width:1.4em;height:1.4em;line-height:1.4em;text-align:center;text-decoration:none;-webkit-border-radius:999em;-moz-border-radius:999em;border-radius:999em}.dlssus_tasks-row .add-task-after{background-color:#6f9f44}.dlssus_tasks-row .remove-task{background-color:#bf212e}.dlsmb-repeater-dlssus_tasks-row .dlsmb-field-key-textarea-filled_spots .dlsmb-field-element{line-height:2;margin:0;padding:0 8px;vertical-align:middle}.dlsmb-field-key-textarea-dlssus_sheet_email_conf_message textarea{height:11.5em}.dlsmb-field-key-textarea-dlssus_sheet_email_message textarea{height:11.5em}.dls-sus-task-header-row .dashicons{width:auto;height:auto;line-height:1.6em}.dlsmb-field-type-hidden{display:none}@media only screen and (max-width: 760px){#dlssus_sheet-tasks-meta table,#dlssus_sheet-tasks-meta thead,#dlssus_sheet-tasks-meta tbody,#dlssus_sheet-tasks-meta td,#dlssus_sheet-tasks-meta tr.dlsmb-repeater-dlssus_tasks-row,#dlssus_sheet-tasks-meta th{display:block}#dlssus_sheet-tasks-meta tr.dlsmb-blank-repeater,#dlssus_sheet-tasks-meta thead tr{display:none}#dlssus_sheet-tasks-meta tr{margin:0 0 1rem 0}#dlssus_sheet-tasks-meta td{border:none;border-bottom:1px solid #eee;position:relative;padding-left:5%}#dlssus_sheet-tasks-meta td{border:0}#dlssus_sheet-tasks-meta td:nth-of-type(1){min-height:30px}#dlssus_sheet-tasks-meta tr.dlsmb-repeater-dlssus_tasks-row td .dlsmb-main-label-mobile{display:block !important;margin-bottom:10px;font-weight:bold}.dlsmb-field-type-repeater LABEL.dlsmb-main-label{display:block;font-weight:bold;margin-bottom:.6em}}.dlssus-email-test fieldset{background-color:#e2e2e2;padding:2em;max-width:40em}.dlssus-email-test fieldset input[type=email],.dlssus-email-test fieldset textarea{width:100%}.dlssus-email-test fieldset p:first-child{margin-right:2%}.dlssus-email-test fieldset p:first-child,.dlssus-email-test fieldset p:nth-child(2){margin-top:0;width:49%;float:left}.dlssus-email-test fieldset p:nth-child(2){margin-top:0}.dlssus-email-test fieldset p:nth-child(3){clear:both}.dlssus-email-test fieldset p:last-child{margin-bottom:0}.fdsus-footer{text-align:center}.fdsus-footer hr{margin:2em 0 1em}.fdsus-footer-getpro{display:inline-block;text-decoration:none;vertical-align:middle}.fdsus-footer-getpro::before{font-family:"fdsus";content:"";vertical-align:middle;margin:0 .5em;font-size:1.4em}.fdsus-footer-getpro span{text-decoration:underline}.post-type-dlssus_sheet #wpbody-content,.post-type-dlssus_task #wpbody-content,.post-type-dlssus_signup #wpbody-content{padding-bottom:7rem}#dashboard_right_now li.dlssus_sheet-count a:before{content:"";font-family:"fdsus"}/*# sourceMappingURL=admin.css.map */
  • sign-up-sheets/trunk/css/sass/admin.scss

    r3234219 r3234235  
    55@import "admin/settings-page";
    66@import "admin/signup-edit";
    7 
    8 .dls_sus {
    9     .sr-only:not(:focus):not(:active) {
    10         clip: rect(0 0 0 0);
    11         clip-path: inset(50%);
    12         height: 1px;
    13         overflow: hidden;
    14         position: absolute;
    15         white-space: nowrap;
    16         width: 1px;
    17     }
    18 
    19     .dashicons-trash:before {
    20         color: #e22f2e;
    21     }
    22 
    23     a:hover,
    24     a:focus {
    25         .dashicons-trash:before {
    26             color: #ff5348;
    27         }
    28     }
    29 }
    30 
    31 .dls_sus .fixed .column-task_num,
    32 .dls_sus .fixed .column-spot_num,
    33 .dls_sus .fixed .column-filled_spot_num {
    34     width: 10%;
    35 }
    36 .dls_sus .fixed .column-id {
    37     width: 5%;
    38 }
    39 .dls_sus .tasks {
    40     margin-bottom: 3em;
    41 }
    42 .dls_sus .tasks LI {
    43     background: transparent url("../images/icon-drag-y.png") no-repeat scroll left center;
    44     padding-left: 16px;
    45     min-height: 20px;
    46 }
    47 .dls_sus .tasks LI:hover {
    48     cursor: move;
    49 }
    50 .dls_sus .tasks LI.ui-sortable-helper{
    51     cursor: move;
    52 }
    53 .dls_sus .tasks .add-task-after,
    54 .dls_sus .tasks .remove-task {
    55     display: inline-block;
    56     border: 2px solid #fff;
    57     color: #fff;
    58     width: 1.4em;
    59     height: 1.4em;
    60     line-height: 1.4em;
    61     text-align: center;
    62     text-decoration: none;
    63     -webkit-border-radius: 999em;
    64     -moz-border-radius: 999em;
    65     border-radius: 999em;
    66 }
    67 .dls_sus .tasks .add-task-after {
    68     background-color: #6f9f44;
    69 }
    70 .dls_sus .tasks .remove-task {
    71     background-color: #bf212e;
    72 }
    73 
    74 .dls_sus .dls-sus-tasks tfoot .fdsus-col-clear * {
    75     display: none;
    76 }
    77 
    78 .dls_sus .dls-sus-tasks .fdsus-col-clear input[type=checkbox] {
    79    margin-left: 0;
    80 }
    81 
    82 .dls-sus-tasks {
    83     tbody th {
    84         vertical-align: top;
    85     }
    86 }
    877
    888.dls-sus-pro {
  • sign-up-sheets/trunk/css/sass/style/_common.scss

    r3234219 r3234235  
    11.dls-sus-sheets,
    22.dls-sus-sheet {
    3     .sr-only:not(:focus):not(:active) {
     3    .screen-reader-text:not(:focus):not(:active) {
    44        clip: rect(0 0 0 0);
    55        clip-path: inset(50%);
  • sign-up-sheets/trunk/css/style.css

    r3234219 r3234235  
    1 :root{--fdsus-filled--background: #eee;--fdsus-filled--color: #4f4f4f;--fdsus-expired--background: var(--fdsus-filled--background);--fdsus-expired--color: var(--fdsus-filled--color)}.dls-sus-sheets .sr-only:not(:focus):not(:active),.dls-sus-sheet .sr-only:not(:focus):not(:active){clip:rect(0 0 0 0);clip-path:inset(50%);height:1px;overflow:hidden;position:absolute;white-space:nowrap;width:1px}.dls-sus-sheet .fdsus-form{overflow-x:auto}table.dls-sus-tasks,table.dls-sus-sheets,.fdsus-user-sign-ups-table{border-collapse:collapse}table.dls-sus-tasks td,table.dls-sus-tasks th,table.dls-sus-sheets td,table.dls-sus-sheets th,.fdsus-user-sign-ups-table td,.fdsus-user-sign-ups-table th{border-bottom:1px solid #ccc;padding:.2em .6em;text-align:left;vertical-align:top}table.dls-sus-sheets{width:100%}table.dls-sus-sheets tr.filled{background:var(--fdsus-filled--background);color:var(--fdsus-filled--color)}table.dls-sus-sheets .column-open_spots{text-align:center}table.dls-sus-sheets .column-open_spots{text-align:center}table.dls-sus-sheets .column-view_link a::after{display:inline-block;margin-left:.2em}@supports(content: "x"/"y"){table.dls-sus-sheets .column-view_link a::after{content:"»"/""}}@supports not (content: "x"/"y"){table.dls-sus-sheets .column-view_link a::after{content:"»";alt:""}}@media(min-width: 400px){table.dls-sus-sheets .column-view_link{white-space:nowrap}}table.dls-sus-tasks{border-bottom:1px solid #ccc}table.dls-sus-tasks td,table.dls-sus-tasks th{border-bottom:0}table.dls-sus-tasks tbody th{font-weight:normal}table.dls-sus-tasks .fdsus-task-first-row th,table.dls-sus-tasks .fdsus-task-first-row td{border-top:1px solid #ccc}table.dls-sus-tasks tfoot{display:none}table.dls-sus-tasks .dls-sus-task-expired th,table.dls-sus-tasks .dls-sus-task-expired td{background:#f2f2f2;color:#000}table.dls-sus-tasks .fdsus-name{font-style:italic}.fdsus-signup-availability{font-size:.8em}.fdsus-user-sign-ups-table dl{font-size:.8em}.fdsus-user-sign-ups-table dd{margin:0;display:inline}.fdsus-user-sign-ups-table dt{display:inline-block;margin:0 .4em 0 0}.fdsus-user-sign-ups-table dd:after{content:"\a";white-space:pre}.fdsus-user-sign-ups-table .dls-sus-task-expired th,.fdsus-user-sign-ups-table .dls-sus-task-expired td{background:var(--fdsus-expired--background);color:var(--fdsus-expired--color)}.fdsus-user-sign-ups-table .fdsus-task-date,.fdsus-user-sign-ups-table .fdsus-signups-closed{font-size:.8em}.fdsus-user-sign-ups-table .fdsus-actions{float:right}tr.dls-sus-row-header td{font-size:larger;font-weight:bolder}.dlsntc-notice{display:block;padding:0;background-color:#f2f2f2;color:#000;margin:1em auto}.dlsntc-notice svg{display:inline-block;vertical-align:middle;margin-right:.4em}.dlsntc-notice svg path{fill:#000}.dlsntc-notice p,.dlsntc-notice .dlsntc-message{border-bottom:1px solid #fff;margin:0;padding:.4em .8em}.dlsntc-notice .fdsus-receipt{border:1px dashed;padding:1em;margin:.4em 0}.dlsntc-notice .fdsus-receipt .fdsus-receipt-title{margin-top:0}.dlsntc-notice .fdsus-receipt .fdsus-receipt-signed-up-date{text-align:center;display:block;margin-top:1em;font-size:.9em}.dlsntc-notice .fdsus-receipt dl{margin:0}.dlsntc-notice .fdsus-receipt dd+dt,.dlsntc-notice .fdsus-receipt dt+dd{margin-top:0;margin-left:0}.dlsntc-notice .fdsus-receipt dt{float:left;clear:left;margin-right:.6em}.dlsntc-notice .fdsus-receipt dt:after{content:":"}.dlsntc-error{background-color:#ffbaba;color:#470004}.dlsntc-error svg path{fill:#470004}.dlsntc-warn{background-color:#feefb3;color:#523100}.dlsntc-warn svg path{fill:#523100}.dlsntc-info{background-color:#bde5f8;color:#002e57}.dlsntc-info svg path{fill:#223b07}.dlsntc-success{background-color:#dff2c0;color:#223b07}.dlsntc-success svg path{fill:#223b07}.dls-sus-signup-form p{margin:0 0 1em 0}.dls-sus-signup-form label{display:block}.dls-sus-signup-form input[type=text],.dls-sus-signup-form input[type=email],.dls-sus-signup-form input[type=date],.dls-sus-signup-form select{width:98%}.dls-sus-signup-form .dls-sus-city,.dls-sus-signup-form .dls-sus-state,.dls-sus-signup-form .dls-sus-zip{display:inline-block;vertical-align:top;margin-right:2%}.dls-sus-signup-form .dls-sus-city label,.dls-sus-signup-form .dls-sus-state label,.dls-sus-signup-form .dls-sus-zip label{white-space:nowrap}.dls-sus-signup-form .dls-sus-city{width:50%}.dls-sus-signup-form .dls-sus-state{width:20%}.dls-sus-signup-form .dls-sus-zip{width:22%;margin-right:0}.dls-sus-signup-form .dls-sus-remember label{display:inline}.dls-sus-signup-form label.dls-sus-inline-label{display:inline}.dls-sus-signup-form .dls-sus-note{font-style:italic;font-size:.8em;display:block}.dls-sus-signup-form #dls-sus-website{display:none}@media(max-width: 400px){.dls-sus-signup-form .dls-sus-state,.dls-sus-signup-form .dls-sus-zip{display:block;width:50%}}#dls-sus-mailcheck-suggestion{margin:0;padding:0}#dls-sus-mailcheck-suggestion::before{display:none}.fdsus-removal-link a,.fdsus-edit-link a{margin-left:.4em}.fdsus-removal-link a svg,.fdsus-edit-link a svg{display:inline-block;fill:currentColor;margin-bottom:-0.15em}tr.dls-sus-header-row td{border-top:1px solid #ccc;font-size:larger;font-weight:bolder}.single-dlssus_sheet .pagination-single,.single-dlssus_sheet .post-meta-wrapper,.single-dlssus_sheet .post-meta{display:none}
     1:root{--fdsus-filled--background: #eee;--fdsus-filled--color: #4f4f4f;--fdsus-expired--background: var(--fdsus-filled--background);--fdsus-expired--color: var(--fdsus-filled--color)}.dls-sus-sheets .screen-reader-text:not(:focus):not(:active),.dls-sus-sheet .screen-reader-text:not(:focus):not(:active){clip:rect(0 0 0 0);clip-path:inset(50%);height:1px;overflow:hidden;position:absolute;white-space:nowrap;width:1px}.dls-sus-sheet .fdsus-form{overflow-x:auto}table.dls-sus-tasks,table.dls-sus-sheets,.fdsus-user-sign-ups-table{border-collapse:collapse}table.dls-sus-tasks td,table.dls-sus-tasks th,table.dls-sus-sheets td,table.dls-sus-sheets th,.fdsus-user-sign-ups-table td,.fdsus-user-sign-ups-table th{border-bottom:1px solid #ccc;padding:.2em .6em;text-align:left;vertical-align:top}table.dls-sus-sheets{width:100%}table.dls-sus-sheets tr.filled{background:var(--fdsus-filled--background);color:var(--fdsus-filled--color)}table.dls-sus-sheets .column-open_spots{text-align:center}table.dls-sus-sheets .column-open_spots{text-align:center}table.dls-sus-sheets .column-view_link a::after{display:inline-block;margin-left:.2em}@supports(content: "x"/"y"){table.dls-sus-sheets .column-view_link a::after{content:"»"/""}}@supports not (content: "x"/"y"){table.dls-sus-sheets .column-view_link a::after{content:"»";alt:""}}@media(min-width: 400px){table.dls-sus-sheets .column-view_link{white-space:nowrap}}table.dls-sus-tasks{border-bottom:1px solid #ccc}table.dls-sus-tasks td,table.dls-sus-tasks th{border-bottom:0}table.dls-sus-tasks tbody th{font-weight:normal}table.dls-sus-tasks .fdsus-task-first-row th,table.dls-sus-tasks .fdsus-task-first-row td{border-top:1px solid #ccc}table.dls-sus-tasks tfoot{display:none}table.dls-sus-tasks .dls-sus-task-expired th,table.dls-sus-tasks .dls-sus-task-expired td{background:#f2f2f2;color:#000}table.dls-sus-tasks .fdsus-name{font-style:italic}.fdsus-signup-availability{font-size:.8em}.fdsus-user-sign-ups-table dl{font-size:.8em}.fdsus-user-sign-ups-table dd{margin:0;display:inline}.fdsus-user-sign-ups-table dt{display:inline-block;margin:0 .4em 0 0}.fdsus-user-sign-ups-table dd:after{content:"\a";white-space:pre}.fdsus-user-sign-ups-table .dls-sus-task-expired th,.fdsus-user-sign-ups-table .dls-sus-task-expired td{background:var(--fdsus-expired--background);color:var(--fdsus-expired--color)}.fdsus-user-sign-ups-table .fdsus-task-date,.fdsus-user-sign-ups-table .fdsus-signups-closed{font-size:.8em}.fdsus-user-sign-ups-table .fdsus-actions{float:right}tr.dls-sus-row-header td{font-size:larger;font-weight:bolder}.dlsntc-notice{display:block;padding:0;background-color:#f2f2f2;color:#000;margin:1em auto}.dlsntc-notice svg{display:inline-block;vertical-align:middle;margin-right:.4em}.dlsntc-notice svg path{fill:#000}.dlsntc-notice p,.dlsntc-notice .dlsntc-message{border-bottom:1px solid #fff;margin:0;padding:.4em .8em}.dlsntc-notice .fdsus-receipt{border:1px dashed;padding:1em;margin:.4em 0}.dlsntc-notice .fdsus-receipt .fdsus-receipt-title{margin-top:0}.dlsntc-notice .fdsus-receipt .fdsus-receipt-signed-up-date{text-align:center;display:block;margin-top:1em;font-size:.9em}.dlsntc-notice .fdsus-receipt dl{margin:0}.dlsntc-notice .fdsus-receipt dd+dt,.dlsntc-notice .fdsus-receipt dt+dd{margin-top:0;margin-left:0}.dlsntc-notice .fdsus-receipt dt{float:left;clear:left;margin-right:.6em}.dlsntc-notice .fdsus-receipt dt:after{content:":"}.dlsntc-error{background-color:#ffbaba;color:#470004}.dlsntc-error svg path{fill:#470004}.dlsntc-warn{background-color:#feefb3;color:#523100}.dlsntc-warn svg path{fill:#523100}.dlsntc-info{background-color:#bde5f8;color:#002e57}.dlsntc-info svg path{fill:#223b07}.dlsntc-success{background-color:#dff2c0;color:#223b07}.dlsntc-success svg path{fill:#223b07}.dls-sus-signup-form p{margin:0 0 1em 0}.dls-sus-signup-form label{display:block}.dls-sus-signup-form input[type=text],.dls-sus-signup-form input[type=email],.dls-sus-signup-form input[type=date],.dls-sus-signup-form select{width:98%}.dls-sus-signup-form .dls-sus-city,.dls-sus-signup-form .dls-sus-state,.dls-sus-signup-form .dls-sus-zip{display:inline-block;vertical-align:top;margin-right:2%}.dls-sus-signup-form .dls-sus-city label,.dls-sus-signup-form .dls-sus-state label,.dls-sus-signup-form .dls-sus-zip label{white-space:nowrap}.dls-sus-signup-form .dls-sus-city{width:50%}.dls-sus-signup-form .dls-sus-state{width:20%}.dls-sus-signup-form .dls-sus-zip{width:22%;margin-right:0}.dls-sus-signup-form .dls-sus-remember label{display:inline}.dls-sus-signup-form label.dls-sus-inline-label{display:inline}.dls-sus-signup-form .dls-sus-note{font-style:italic;font-size:.8em;display:block}.dls-sus-signup-form #dls-sus-website{display:none}@media(max-width: 400px){.dls-sus-signup-form .dls-sus-state,.dls-sus-signup-form .dls-sus-zip{display:block;width:50%}}#dls-sus-mailcheck-suggestion{margin:0;padding:0}#dls-sus-mailcheck-suggestion::before{display:none}tr.dls-sus-header-row td{border-top:1px solid #ccc;font-size:larger;font-weight:bolder}.single-dlssus_sheet .pagination-single,.single-dlssus_sheet .post-meta-wrapper,.single-dlssus_sheet .post-meta{display:none}
  • sign-up-sheets/trunk/id.php

    r3234219 r3234235  
    22
    33namespace FDSUS;
     4
     5use function is_plugin_active;
     6
     7if (!function_exists('is_plugin_active')) {
     8    require_once(ABSPATH . 'wp-admin/includes/plugin.php');
     9}
    410
    511if (!class_exists('\\' . __NAMESPACE__ . '\Id')):
     
    713    class Id
    814    {
    9 
    1015        const PREFIX = 'dlssus';
    1116        const NAME = 'Sign-up Sheets - WordPress Plugin';
     
    2631         * Get version from main PHP file `Version:` comment header
    2732         *
     33         * @param string $type 'pro', 'free' (not fallback) or '' for the current type
     34         *
    2835         * @return string version number
    2936         */
    30         public static function version()
     37        public static function version($type = '')
    3138        {
    3239            if (!function_exists('get_plugin_data')) {
    33                 require_once(ABSPATH . 'wp-admin' . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR
    34                     . 'plugin.php');
    35             }
    36 
    37             $baseName = self::isPro() ? self::PRO_PLUGIN_BASENAME : self::FREE_PLUGIN_BASENAME;
    38             $pluginData = get_plugin_data(WP_PLUGIN_DIR . DIRECTORY_SEPARATOR . $baseName, false);
     40                require_once(ABSPATH . 'wp-admin' . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR . 'plugin.php');
     41            }
     42
     43            switch ($type) {
     44                case 'pro':
     45                    $pluginBasename = self::PRO_PLUGIN_BASENAME;
     46                    break;
     47                case 'free':
     48                    $pluginBasename = self::FREE_PLUGIN_BASENAME;
     49                    break;
     50                default:
     51                    $pluginBasename = self::isPro() ? self::PRO_PLUGIN_BASENAME : self::FREE_PLUGIN_BASENAME;
     52            }
     53
     54            if (!file_exists(WP_PLUGIN_DIR . DIRECTORY_SEPARATOR . $pluginBasename)) {
     55                return '';
     56            }
     57
     58            $pluginData = get_plugin_data(WP_PLUGIN_DIR . DIRECTORY_SEPARATOR . $pluginBasename, false, false);
    3959
    4060            return $pluginData && $pluginData['Version'] ? $pluginData['Version'] : '';
     
    4464         * Log
    4565         *
    46          * @param string $msg
     66         * @param string      $msg
    4767         * @param string|null $filename
    48          * @param string $emailSubject Leave blank to prevent email from sending
     68         * @param string      $emailSubject Leave blank to prevent email from sending
    4969         */
    5070        public static function log($msg, $filename = null, $emailSubject = '')
     
    147167        public static function getPluginPath()
    148168        {
    149             return dirname(__FILE__) . '/';
     169            return dirname(__FILE__) . DIRECTORY_SEPARATOR;
    150170        }
    151171
     
    155175        public static function isPro()
    156176        {
    157             return is_file(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'pro.php');
    158         }
    159 
     177            if (self::isProActivating()) {
     178                return true;
     179            }
     180
     181            return is_plugin_active(self::PRO_PLUGIN_BASENAME);
     182        }
     183
     184        /**
     185         * Is the pro version currently activating?
     186         *
     187         * @return bool
     188         */
     189        public static function isProActivating()
     190        {
     191            if (!empty($_GET['action']) && $_GET['action'] === 'activate'
     192                && !empty($_GET['plugin'])
     193                && $_GET['plugin'] === Id::PRO_PLUGIN_BASENAME
     194            ) {
     195                return true;
     196            }
     197
     198            return false;
     199        }
    160200    }
    161201
  • sign-up-sheets/trunk/js/dist/main.js

    r3234219 r3234235  
    3737                    // Standard general format check
    3838                    function fdsusValidateEmail(email) {
     39                        if (email === '') return true;
    3940                        const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
    4041                        return re.test(String(email).toLowerCase());
  • sign-up-sheets/trunk/js/dist/main.min.js

    r3234219 r3234235  
    11/*! main.min.js file */
    2 function fdsusExistsInQueryString(e,t){return new RegExp("[?&]"+e).test(t)}function fdsusRemoveUrlParam(t,e){let s=e.split("?")[0],i=[],n=-1!==e.indexOf("?")?e.split("?")[1]:"";if(""!==n){for(let e=(i=n.split("&")).length-1;0<=e;--e)i[e].split("=")[0]===t&&i.splice(e,1);i.length&&(s=s+"?"+i.join("&"))}return s}function fdsusIsValidDate(e){var t,s;return!(!e.match(/^\d{4}-\d{2}-\d{2}$/)||!(s=(t=new Date(e)).getTime())&&0!==s||t.toISOString().slice(0,10)!==e)}function fdsusSignupFormSubmit(e){document.getElementById("fdsus-signup-form").submit()}jQuery(document).ready(function(t){t.extend({getUrlVars:function(){for(var e,t=[],s=window.location.href.split("#")[0].slice(window.location.href.indexOf("?")+1).split("&"),i=0;i<s.length;i++)e=s[i].split("="),t.push(e[0]),t[e[0]]=e[1];return t},getUrlVar:function(e){return t.getUrlVars()[e]}}),FDSUS.dlssus_validate_email.disable||t(".dls-sus-signup-form #signup_email").on("blur",function(e){let s='<div role="alertdialog" class="dlsntc-notice dlsntc-warn"><p class="dlsntc-message"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" focusable="false" width="1em" height="1em" style="-ms-transform: rotate(360deg); -webkit-transform: rotate(360deg); transform: rotate(360deg);" preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24"><title>Warning</title><path d="M22.56 16.3L14.89 3.58a3.43 3.43 0 0 0-5.78 0L1.44 16.3a3 3 0 0 0-.05 3A3.37 3.37 0 0 0 4.33 21h15.34a3.37 3.37 0 0 0 2.94-1.66a3 3 0 0 0-.05-3.04zM12 17a1 1 0 1 1 1-1a1 1 0 0 1-1 1zm1-4a1 1 0 0 1-2 0V9a1 1 0 0 1 2 0z"/></svg> ',i="</p></div>",n=t(".dls-sus-signup-form #dls-sus-mailcheck-suggestion");t(this).mailcheck({suggested:function(e,t){n.html(s+"Did you mean <b><i>"+t.full+"</b></i>?"+i)},empty:function(e){var t;n.html(""),t=document.getElementById("signup_email").value,/^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/.test(String(t).toLowerCase())?n.html(""):n.html(s+"Please make sure your email is valid"+i)}})}),t(".dls-sus-signup-form input[type=date]").on("blur",function(e){t(".fdsus-date-check").remove(),t(this).val()&&!fdsusIsValidDate(t(this).val())&&t(this).after('<div role="alertdialog" class="dlsntc-notice dlsntc-warn fdsus-date-check"><p class="dlsntc-message"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" focusable="false" width="1em" height="1em" style="-ms-transform: rotate(360deg); -webkit-transform: rotate(360deg); transform: rotate(360deg);" preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24"><title>Warning</title><path d="M22.56 16.3L14.89 3.58a3.43 3.43 0 0 0-5.78 0L1.44 16.3a3 3 0 0 0-.05 3A3.37 3.37 0 0 0 4.33 21h15.34a3.37 3.37 0 0 0 2.94-1.66a3 3 0 0 0-.05-3.04zM12 17a1 1 0 1 1 1-1a1 1 0 0 1-1 1zm1-4a1 1 0 0 1-2 0V9a1 1 0 0 1 2 0z"/></svg> Please make sure date is in <strong>YYYY-MM-DD</strong> format</p></div>')})}),document.addEventListener("DOMContentLoaded",function(){let n=document.getElementById("fdsus-signup-form");if(null!==n){let i=!1;n.addEventListener("submit",e=>{let t=n.querySelector("[type=submit]");var s;i||(i=!0,t.disabled=!0,setTimeout(()=>{i=!1,t.disabled=!1},3e3)),"v2-checkbox"===FDSUS.dls_sus_recaptcha_version&&null!==(s=document.querySelector("#fdsus-signup-form #g-recaptcha-response"))&&""===s.value&&(e.preventDefault(),alert("Please check the reCAPTCHA to submit the form."))})}var t=window.location.toString();if(0<t.indexOf("?")){let e=t;(fdsusExistsInQueryString("action=removed",e)||fdsusExistsInQueryString("action=signup",e)||fdsusExistsInQueryString("action=updated",e))&&fdsusExistsInQueryString("status=success",e)&&(e=fdsusRemoveUrlParam("action",e),e=fdsusRemoveUrlParam("status",e)),e!==t&&window.history.replaceState({},document.title,e)}},!1);
     2function fdsusExistsInQueryString(e,t){return new RegExp("[?&]"+e).test(t)}function fdsusRemoveUrlParam(t,e){let s=e.split("?")[0],i=[],n=-1!==e.indexOf("?")?e.split("?")[1]:"";if(""!==n){for(let e=(i=n.split("&")).length-1;0<=e;--e)i[e].split("=")[0]===t&&i.splice(e,1);i.length&&(s=s+"?"+i.join("&"))}return s}function fdsusIsValidDate(e){var t,s;return!(!e.match(/^\d{4}-\d{2}-\d{2}$/)||!(s=(t=new Date(e)).getTime())&&0!==s||t.toISOString().slice(0,10)!==e)}function fdsusSignupFormSubmit(e){document.getElementById("fdsus-signup-form").submit()}jQuery(document).ready(function(t){t.extend({getUrlVars:function(){for(var e,t=[],s=window.location.href.split("#")[0].slice(window.location.href.indexOf("?")+1).split("&"),i=0;i<s.length;i++)e=s[i].split("="),t.push(e[0]),t[e[0]]=e[1];return t},getUrlVar:function(e){return t.getUrlVars()[e]}}),FDSUS.dlssus_validate_email.disable||t(".dls-sus-signup-form #signup_email").on("blur",function(e){let s='<div role="alertdialog" class="dlsntc-notice dlsntc-warn"><p class="dlsntc-message"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" focusable="false" width="1em" height="1em" style="-ms-transform: rotate(360deg); -webkit-transform: rotate(360deg); transform: rotate(360deg);" preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24"><title>Warning</title><path d="M22.56 16.3L14.89 3.58a3.43 3.43 0 0 0-5.78 0L1.44 16.3a3 3 0 0 0-.05 3A3.37 3.37 0 0 0 4.33 21h15.34a3.37 3.37 0 0 0 2.94-1.66a3 3 0 0 0-.05-3.04zM12 17a1 1 0 1 1 1-1a1 1 0 0 1-1 1zm1-4a1 1 0 0 1-2 0V9a1 1 0 0 1 2 0z"/></svg> ',i="</p></div>",n=t(".dls-sus-signup-form #dls-sus-mailcheck-suggestion");t(this).mailcheck({suggested:function(e,t){n.html(s+"Did you mean <b><i>"+t.full+"</b></i>?"+i)},empty:function(e){var t;n.html(""),""===(t=document.getElementById("signup_email").value)||/^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/.test(String(t).toLowerCase())?n.html(""):n.html(s+"Please make sure your email is valid"+i)}})}),t(".dls-sus-signup-form input[type=date]").on("blur",function(e){t(".fdsus-date-check").remove(),t(this).val()&&!fdsusIsValidDate(t(this).val())&&t(this).after('<div role="alertdialog" class="dlsntc-notice dlsntc-warn fdsus-date-check"><p class="dlsntc-message"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" focusable="false" width="1em" height="1em" style="-ms-transform: rotate(360deg); -webkit-transform: rotate(360deg); transform: rotate(360deg);" preserveAspectRatio="xMidYMid meet" viewBox="0 0 24 24"><title>Warning</title><path d="M22.56 16.3L14.89 3.58a3.43 3.43 0 0 0-5.78 0L1.44 16.3a3 3 0 0 0-.05 3A3.37 3.37 0 0 0 4.33 21h15.34a3.37 3.37 0 0 0 2.94-1.66a3 3 0 0 0-.05-3.04zM12 17a1 1 0 1 1 1-1a1 1 0 0 1-1 1zm1-4a1 1 0 0 1-2 0V9a1 1 0 0 1 2 0z"/></svg> Please make sure date is in <strong>YYYY-MM-DD</strong> format</p></div>')})}),document.addEventListener("DOMContentLoaded",function(){let n=document.getElementById("fdsus-signup-form");if(null!==n){let i=!1;n.addEventListener("submit",e=>{let t=n.querySelector("[type=submit]");var s;i||(i=!0,t.disabled=!0,setTimeout(()=>{i=!1,t.disabled=!1},3e3)),"v2-checkbox"===FDSUS.dls_sus_recaptcha_version&&null!==(s=document.querySelector("#fdsus-signup-form #g-recaptcha-response"))&&""===s.value&&(e.preventDefault(),alert("Please check the reCAPTCHA to submit the form."))})}var t=window.location.toString();if(0<t.indexOf("?")){let e=t;(fdsusExistsInQueryString("action=removed",e)||fdsusExistsInQueryString("action=signup",e)||fdsusExistsInQueryString("action=updated",e))&&fdsusExistsInQueryString("status=success",e)&&(e=fdsusRemoveUrlParam("action",e),e=fdsusRemoveUrlParam("status",e)),e!==t&&window.history.replaceState({},document.title,e)}},!1);
  • sign-up-sheets/trunk/js/src/main.js

    r3234219 r3234235  
    3737                    // Standard general format check
    3838                    function fdsusValidateEmail(email) {
     39                        if (email === '') return true;
    3940                        const re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
    4041                        return re.test(String(email).toLowerCase());
  • sign-up-sheets/trunk/languages/sign-up-sheets.pot

    r3234219 r3234235  
    1 # Copyright (C) 2024 Fetch Designs
     1# Copyright (C) 2025 Fetch Designs
    22# This file is distributed under the GPL2.
    33msgid ""
    44msgstr ""
    5 "Project-Id-Version: Sign-up Sheets 2.2.14\n"
     5"Project-Id-Version: Sign-up Sheets 2.3.0.1\n"
    66"Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/sign-up-sheets\n"
    77"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
     
    1010"Content-Type: text/plain; charset=UTF-8\n"
    1111"Content-Transfer-Encoding: 8bit\n"
    12 "POT-Creation-Date: 2024-10-08T02:01:29+00:00\n"
     12"POT-Creation-Date: 2025-02-03T19:47:12+00:00\n"
    1313"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
    14 "X-Generator: WP-CLI 2.6.0\n"
    15 "X-Domain: fdsus\n"
     14"X-Generator: WP-CLI 2.11.0\n"
     15"X-Domain: sign-up-sheets\n"
    1616
    1717#. Plugin Name of the plugin
     18#: sign-up-sheets.php
    1819#: controller/admin/help.php:64
    1920#: controller/admin/settings.php:71
    2021#: controller/admin/site-health.php:50
    21 #: model/sheet-base.php:210
     22#: model/sheet-base.php:211
    2223msgid "Sign-up Sheets"
    2324msgstr ""
    2425
    2526#. Plugin URI of the plugin
     27#: sign-up-sheets.php
    2628msgid "https://www.fetchdesigns.com/sign-up-sheets-wordpress-plugin/"
    2729msgstr ""
    2830
    2931#. Description of the plugin
     32#: sign-up-sheets.php
    3033msgid "An online sign-up sheet manager where your users/volunteers can sign up for tasks"
    3134msgstr ""
    3235
    3336#. Author of the plugin
     37#: sign-up-sheets.php
    3438msgid "Fetch Designs"
    3539msgstr ""
    3640
    3741#. Author URI of the plugin
     42#: sign-up-sheets.php
    3843msgid "https://www.fetchdesigns.com/"
    3944msgstr ""
     
    7883msgstr ""
    7984
    80 #: controller/admin.php:294
     85#: controller/admin.php:298
    8186msgid "ID"
    8287msgstr ""
    8388
    84 #: controller/admin.php:303
     89#: controller/admin.php:307
    8590#: controller/admin/manage-signups.php:38
    8691#: controller/admin/manage-signups.php:39
     
    9095msgstr ""
    9196
    92 #: controller/admin.php:322
     97#: controller/admin.php:326
    9398msgid "Copy"
    9499msgstr ""
    95100
    96 #: controller/admin.php:372
     101#: controller/admin.php:376
    97102msgid "Made by"
    98103msgstr ""
    99104
    100 #: controller/admin.php:375
     105#: controller/admin.php:379
    101106msgid "Get Pro"
    102107msgstr ""
    103108
    104 #: controller/admin.php:379
     109#: controller/admin.php:383
    105110msgid "Need help? Get Support &raquo;"
    106111msgstr ""
    107112
    108 #: controller/admin.php:398
     113#: controller/admin.php:402
    109114#: controller/admin/settings.php:52
    110115#: controller/admin/settings.php:73
     
    145150
    146151#: controller/admin/edit-signup-page.php:89
    147 #: controller/task-table.php:516
     152#: controller/task-table.php:532
    148153msgid "Add Sign-up"
    149154msgstr ""
     
    160165#: controller/admin/manage-signups.php:78
    161166#: controller/mail.php:174
    162 #: controller/sheet.php:341
     167#: controller/sheet.php:345
    163168#: model/meta-boxes.php:42
    164169#: theme-files/fdsus/sheet-list.php:35
     
    174179
    175180#: controller/admin/edit-signup-page.php:143
    176 #: model/task-base.php:94
     181#: model/task-base.php:92
    177182msgid "Task"
    178183msgstr ""
     
    268273#: controller/privacy.php:23
    269274#: controller/scode/user-sign-ups.php:143
    270 #: controller/task-table.php:190
    271 #: model/signup.php:530
    272 #: theme-files/fdsus/sign-up-form.php:85
     275#: controller/task-table.php:204
     276#: model/signup.php:529
     277#: theme-files/fdsus/sign-up-form.php:87
    273278msgid "Address"
    274279msgstr ""
     
    276281#: controller/admin/export.php:303
    277282#: controller/privacy.php:24
    278 #: controller/task-table.php:191
    279 #: theme-files/fdsus/sign-up-form.php:97
     283#: controller/task-table.php:205
     284#: theme-files/fdsus/sign-up-form.php:99
    280285msgid "City"
    281286msgstr ""
     
    283288#: controller/admin/export.php:304
    284289#: controller/privacy.php:25
    285 #: controller/task-table.php:192
    286 #: theme-files/fdsus/sign-up-form.php:109
     290#: controller/task-table.php:206
     291#: theme-files/fdsus/sign-up-form.php:111
    287292msgid "State"
    288293msgstr ""
     
    290295#: controller/admin/export.php:305
    291296#: controller/privacy.php:26
    292 #: controller/task-table.php:193
    293 #: theme-files/fdsus/sign-up-form.php:126
     297#: controller/task-table.php:207
     298#: theme-files/fdsus/sign-up-form.php:128
    294299msgid "Zip"
    295300msgstr ""
     
    367372
    368373#: controller/admin/help.php:187
    369 #: model/settings-meta-boxes.php:390
    370 #: model/settings-meta-boxes.php:431
    371 #: model/settings-meta-boxes.php:509
     374#: model/settings-meta-boxes.php:396
     375#: model/settings-meta-boxes.php:437
     376#: model/settings-meta-boxes.php:515
    372377msgid "Message"
    373378msgstr ""
     
    408413#: controller/admin/manage-signups.php:87
    409414#: controller/privacy.php:96
    410 #: model/signup.php:105
     415#: model/signup.php:103
    411416msgid "Sign-ups"
    412417msgstr ""
     
    498503msgstr ""
    499504
    500 #: controller/captcha.php:73
     505#: controller/captcha.php:65
     506msgid "Math Question"
     507msgstr ""
     508
     509#: controller/captcha.php:97
    501510msgid "Please check that the reCAPTCHA field is valid."
    502511msgstr ""
    503512
    504513#. translators: %s is replaced with the users response to the simple captcha
    505 #: controller/captcha.php:83
     514#: controller/captcha.php:107
    506515msgid "Oh dear, 7 + 1 does not equal %s. Please try again."
    507516msgstr ""
     
    532541#: controller/migrate.php:645
    533542#: model/meta-boxes.php:26
    534 #: model/meta-boxes.php:162
     543#: model/meta-boxes.php:169
    535544msgid "Global"
    536545msgstr ""
    537546
    538547#: controller/migrate.php:646
    539 #: model/meta-boxes.php:163
     548#: model/meta-boxes.php:170
    540549#: model/settings-meta-boxes.php:138
    541550msgid "Disabled"
     
    543552
    544553#: controller/migrate.php:647
    545 #: model/meta-boxes.php:164
     554#: model/meta-boxes.php:171
    546555#: model/settings-meta-boxes.php:139
    547556msgid "Enabled"
     
    549558
    550559#: controller/migrate.php:648
    551 #: model/meta-boxes.php:165
     560#: model/meta-boxes.php:172
    552561#: model/settings-meta-boxes.php:140
    553562msgid "Semi-Compact"
     
    555564
    556565#: controller/migrate.php:650
    557 #: model/meta-boxes.php:167
     566#: model/meta-boxes.php:174
    558567#: model/settings-meta-boxes.php:136
    559568msgid "Show sign-up spots on one line with just # of open spots and a link to sign-up if open. Semi-Compact will also include the names of those who already signed up (assuming \"Front-end Display Names\" is not set to \"anonymous\""
     
    561570
    562571#: controller/migrate.php:689
    563 #: model/meta-boxes.php:149
    564 #: model/settings-meta-boxes.php:483
     572#: model/meta-boxes.php:156
     573#: model/settings-meta-boxes.php:489
    565574msgid "Number of days before the date on the sign-up sheet that the email should be sent.  Use whole numbers, for example, to remind one day before use..."
    566575msgstr ""
    567576
    568577#: controller/migrate.php:689
    569 #: model/meta-boxes.php:151
     578#: model/meta-boxes.php:158
    570579msgid "(If this is blank Global setting is used. Global setting in Settings > Sign-up Sheets.)"
    571580msgstr ""
     
    573582#: controller/migrate.php:697
    574583#: controller/migrate.php:705
    575 #: model/meta-boxes.php:212
    576 #: model/meta-boxes.php:221
     584#: model/meta-boxes.php:219
     585#: model/meta-boxes.php:228
    577586msgid "Global setting in Settings > Sign-up Sheets"
    578587msgstr ""
     
    593602
    594603#: controller/post-type-base.php:95
    595 #: controller/task-table.php:420
     604#: controller/task-table.php:436
    596605#: lib/dls/meta-boxes/meta-boxes.php:775
    597606msgid "Edit"
     
    631640
    632641#: controller/privacy.php:20
    633 #: model/signup.php:513
     642#: model/signup.php:512
    634643#: theme-files/fdsus/sign-up-form.php:33
    635644msgid "First Name"
     
    637646
    638647#: controller/privacy.php:21
    639 #: model/signup.php:516
     648#: model/signup.php:515
    640649#: theme-files/fdsus/sign-up-form.php:43
    641650msgid "Last Name"
     
    644653#: controller/privacy.php:22
    645654#: controller/scode/user-sign-ups.php:136
    646 #: controller/task-table.php:187
    647 #: model/signup.php:522
    648 #: theme-files/fdsus/sign-up-form.php:70
     655#: controller/task-table.php:201
     656#: model/signup.php:521
     657#: theme-files/fdsus/sign-up-form.php:72
    649658msgid "Phone"
    650659msgstr ""
     
    743752
    744753#. translators: %s is replaced with the task title
    745 #: controller/sheet.php:420
     754#: controller/sheet.php:424
    746755msgid "You have been signed up for %s!"
    747756msgstr ""
    748757
    749 #: controller/task-table.php:182
     758#: controller/task-table.php:194
    750759msgid "Name"
    751760msgstr ""
    752761
    753 #: controller/task-table.php:185
    754 #: model/signup.php:519
     762#: controller/task-table.php:198
     763#: model/signup.php:518
    755764#: theme-files/fdsus/sign-up-form.php:54
    756765msgid "E-mail"
    757766msgstr ""
    758767
    759 #: controller/task-table.php:214
     768#: controller/task-table.php:228
    760769msgid "Select all spots to Clear"
    761770msgstr ""
    762771
    763 #: controller/task-table.php:217
     772#: controller/task-table.php:231
    764773msgid "Clear Selected"
    765774msgstr ""
    766775
    767 #: controller/task-table.php:217
     776#: controller/task-table.php:231
    768777msgid "This will permanently remove all selected sign-ups for this sheet."
    769778msgstr ""
    770779
    771780#. translators: %d is replaced with the spot number
    772 #: controller/task-table.php:363
     781#: controller/task-table.php:377
    773782msgid "#%d:"
    774783msgstr ""
    775784
    776785#. translators: %s is replaced with the index of the spot within the current task
    777 #: controller/task-table.php:412
     786#: controller/task-table.php:428
    778787msgid "Select spot #%s to clear"
    779788msgstr ""
    780789
    781 #: controller/task-table.php:427
     790#: controller/task-table.php:443
    782791msgid "Additional Details"
    783792msgstr ""
    784793
    785 #: controller/task-table.php:434
     794#: controller/task-table.php:450
    786795msgid "Added"
    787796msgstr ""
    788797
    789 #: controller/task-table.php:435
     798#: controller/task-table.php:451
    790799msgid "Updated"
    791800msgstr ""
    792801
    793 #: controller/task-table.php:436
     802#: controller/task-table.php:452
    794803msgid "Linked user"
    795804msgstr ""
    796805
    797 #: controller/task-table.php:441
     806#: controller/task-table.php:457
    798807msgid "Clear Spot Now"
    799808msgstr ""
    800809
    801 #: controller/task-table.php:442
     810#: controller/task-table.php:458
    802811msgid "This will permanently remove this sign-up."
    803812msgstr ""
    804813
    805 #: controller/task-table.php:512
     814#: controller/task-table.php:528
    806815msgid "(empty)"
    807816msgstr ""
    808817
    809 #: controller/task-table.php:522
     818#: controller/task-table.php:538
    810819msgid " - sign-ups closed"
    811820msgstr ""
    812821
    813 #: controller/task-table.php:554
     822#: controller/task-table.php:577
    814823msgid "No tasks were found."
    815824msgstr ""
     
    840849msgstr ""
    841850
    842 #. translators: %1$s is replaced with the pro plugin version number, %2$s is replaced with the free plugin version number
    843 #: main.php:272
    844 msgid "The <strong>Sign-up Sheets Pro</strong> plugin version (%1$s) does not match the version number of the main <strong>Sign-up Sheets</strong> plugin (%2$s).  Please update so both version numbers match to prevent possible conflicts."
    845 msgstr ""
    846 
    847851#: model/base.php:305
    848852msgid "Sunday"
     
    882886
    883887#: model/meta-boxes.php:53
    884 #: model/task-base.php:94
     888#: model/task-base.php:92
    885889msgid "Tasks"
    886890msgstr ""
     
    906910
    907911#: model/meta-boxes.php:115
     912#: model/settings-meta-boxes.php:265
     913msgid "Set Email as Optional"
     914msgstr ""
     915
     916#: model/meta-boxes.php:122
    908917#: model/settings-meta-boxes.php:271
    909918msgid "Hide Phone Field"
    910919msgstr ""
    911920
    912 #: model/meta-boxes.php:122
     921#: model/meta-boxes.php:129
    913922#: model/settings-meta-boxes.php:277
    914923msgid "Hide Address Fields"
    915924msgstr ""
    916925
    917 #: model/meta-boxes.php:129
    918 #: model/settings-meta-boxes.php:265
     926#: model/meta-boxes.php:136
     927#: model/settings-meta-boxes.php:283
    919928msgid "Hide Email Field"
    920929msgstr ""
    921930
    922 #: model/meta-boxes.php:136
     931#: model/meta-boxes.php:143
    923932msgid "Sheet Specific BCC"
    924933msgstr ""
    925934
    926 #: model/meta-boxes.php:139
     935#: model/meta-boxes.php:146
    927936msgid "Comma-separated list of emails to be copied on confirmations/removals"
    928937msgstr ""
    929938
    930 #: model/meta-boxes.php:145
    931 #: model/settings-meta-boxes.php:480
     939#: model/meta-boxes.php:152
     940#: model/settings-meta-boxes.php:486
    932941msgid "Reminder Schedule"
    933942msgstr ""
    934943
    935 #: model/meta-boxes.php:158
     944#: model/meta-boxes.php:165
    936945#: model/settings-meta-boxes.php:133
    937946msgid "Compact Sign-up Mode"
    938947msgstr ""
    939948
    940 #: model/meta-boxes.php:173
     949#: model/meta-boxes.php:180
    941950#: model/settings-meta-boxes.php:162
    942951msgid "Enable Task Checkboxes"
    943952msgstr ""
    944953
    945 #: model/meta-boxes.php:181
     954#: model/meta-boxes.php:188
    946955#: model/settings-meta-boxes.php:146
    947956msgid "Enable task sign-up limit"
    948957msgstr ""
    949958
    950 #: model/meta-boxes.php:189
     959#: model/meta-boxes.php:196
    951960#: model/settings-meta-boxes.php:154
    952961msgid "Enable contiguous task sign-up limit"
    953962msgstr ""
    954963
    955 #: model/meta-boxes.php:197
     964#: model/meta-boxes.php:204
    956965msgid "Auto-clear Schedule"
    957966msgstr ""
    958967
    959 #: model/meta-boxes.php:202
     968#: model/meta-boxes.php:209
    960969msgid "Auto-clear is not currently allowed globally under \"Sign-up Sheets > Settings\". Enable it for this setting to take effect."
    961970msgstr ""
    962971
    963 #: model/meta-boxes.php:209
     972#: model/meta-boxes.php:216
    964973msgid "Confirmation Email Message"
    965974msgstr ""
    966975
    967 #: model/meta-boxes.php:218
     976#: model/meta-boxes.php:225
    968977msgid "Reminder Email Message"
    969978msgstr ""
    970979
    971980#: model/settings-meta-boxes.php:84
    972 #: model/sheet-base.php:210
     981#: model/sheet-base.php:211
    973982msgid "Sign-up Sheet"
    974983msgstr ""
     
    10721081#. translators: %s is replaced with the timestamp of the next cron scheduled
    10731082#: model/settings-meta-boxes.php:207
    1074 #: model/settings-meta-boxes.php:467
     1083#: model/settings-meta-boxes.php:473
    10751084msgid "Next scheduled check: %s"
    10761085msgstr ""
     
    10851094
    10861095#: model/settings-meta-boxes.php:214
    1087 #: model/settings-meta-boxes.php:472
     1096#: model/settings-meta-boxes.php:478
    10881097msgid "WordPress Cron"
    10891098msgstr ""
    10901099
    10911100#: model/settings-meta-boxes.php:216
    1092 #: model/settings-meta-boxes.php:474
     1101#: model/settings-meta-boxes.php:480
    10931102msgid "If you just enabled/disabled this, you may need to refresh this page to see the updated \"Next scheduled check\""
    10941103msgstr ""
     
    11061115msgstr ""
    11071116
    1108 #: model/settings-meta-boxes.php:283
     1117#: model/settings-meta-boxes.php:289
    11091118msgid "Disable User Auto-populate"
    11101119msgstr ""
    11111120
    1112 #: model/settings-meta-boxes.php:286
     1121#: model/settings-meta-boxes.php:292
    11131122msgid "By default, for users that are logged in, their name and email auto-populates on sign-up form when available. This option disables that behavior."
    11141123msgstr ""
    11151124
    1116 #: model/settings-meta-boxes.php:290
     1125#: model/settings-meta-boxes.php:296
    11171126msgid "Disable Mail Check Validation"
    11181127msgstr ""
    11191128
    1120 #: model/settings-meta-boxes.php:293
     1129#: model/settings-meta-boxes.php:299
    11211130msgid "Validation includes a JS check for standard email formatting, possible incorrect domains with suggestions as well as an MX record check on the domain to confirm it is setup to receive emails"
    11221131msgstr ""
    11231132
    1124 #: model/settings-meta-boxes.php:297
     1133#: model/settings-meta-boxes.php:303
    11251134msgid "Disable sign-up link auto-scroll to sheet (hash in sign-up link)"
    11261135msgstr ""
    11271136
    1128 #: model/settings-meta-boxes.php:300
     1137#: model/settings-meta-boxes.php:306
    11291138msgid "The hash on the sign-up link is useful especially on longer pages where sheets are embedded further down the page or where the sheet description is longer.  When the feature is enabled and the user clicks the sign-up link, it includes a `#` hash to and ID pointing to that same location where the sign-up form will appear on the next page."
    11301139msgstr ""
    11311140
    1132 #: model/settings-meta-boxes.php:304
     1141#: model/settings-meta-boxes.php:310
    11331142msgid "Sign-up Success Message Receipt"
    11341143msgstr ""
    11351144
    1136 #: model/settings-meta-boxes.php:307
     1145#: model/settings-meta-boxes.php:313
    11371146msgid "Displays a receipt below the sign-up success message which includes a copy of all the task details and all fields they entered in the sign-up form. Default: `unchecked`"
    11381147msgstr ""
    11391148
    1140 #: model/settings-meta-boxes.php:312
     1149#: model/settings-meta-boxes.php:318
    11411150msgid "Custom Sign-up Fields"
    11421151msgstr ""
    11431152
    1144 #: model/settings-meta-boxes.php:333
     1153#: model/settings-meta-boxes.php:339
    11451154msgid "Captcha and Spam Prevention"
    11461155msgstr ""
    11471156
    1148 #: model/settings-meta-boxes.php:337
     1157#: model/settings-meta-boxes.php:343
    11491158msgid "Disable honeypot"
    11501159msgstr ""
    11511160
    1152 #: model/settings-meta-boxes.php:340
     1161#: model/settings-meta-boxes.php:346
    11531162msgid "A honeypot is a less-invasive technique to reduce SPAM submission using a hidden field on the sign-up form.  It can be used in place of or alongside the captcha."
    11541163msgstr ""
    11551164
    1156 #: model/settings-meta-boxes.php:343
     1165#: model/settings-meta-boxes.php:349
    11571166msgid "Disable all Captcha"
    11581167msgstr ""
    11591168
    1160 #: model/settings-meta-boxes.php:345
     1169#: model/settings-meta-boxes.php:351
    11611170msgid "Will disable all captcha even if you have reCAPTCHA enabled below"
    11621171msgstr ""
    11631172
    1164 #: model/settings-meta-boxes.php:346
     1173#: model/settings-meta-boxes.php:352
    11651174msgid "Will replace the default simple captcha validation"
    11661175msgstr ""
    11671176
    1168 #: model/settings-meta-boxes.php:347
    1169 #: model/settings-meta-boxes.php:348
     1177#: model/settings-meta-boxes.php:353
     1178#: model/settings-meta-boxes.php:354
    11701179msgid "From your account at https://www.google.com/recaptcha/"
    11711180msgstr ""
    11721181
    1173 #: model/settings-meta-boxes.php:355
     1182#: model/settings-meta-boxes.php:361
    11741183msgid "Confirmation E-mail"
    11751184msgstr ""
    11761185
    1177 #: model/settings-meta-boxes.php:359
    1178 #: model/settings-meta-boxes.php:423
     1186#: model/settings-meta-boxes.php:365
     1187#: model/settings-meta-boxes.php:429
    11791188msgid "Enable"
    11801189msgstr ""
    11811190
    1182 #: model/settings-meta-boxes.php:367
    1183 #: model/settings-meta-boxes.php:487
    1184 #: model/settings-meta-boxes.php:546
     1191#: model/settings-meta-boxes.php:373
     1192#: model/settings-meta-boxes.php:493
     1193#: model/settings-meta-boxes.php:552
    11851194msgid "Subject"
    11861195msgstr ""
    11871196
    11881197#. translators: %s is replaced with the default subject
    1189 #: model/settings-meta-boxes.php:371
    1190 #: model/settings-meta-boxes.php:491
    1191 #: model/settings-meta-boxes.php:550
     1198#: model/settings-meta-boxes.php:377
     1199#: model/settings-meta-boxes.php:497
     1200#: model/settings-meta-boxes.php:556
    11921201msgid "If blank, defaults to... \"%s\""
    11931202msgstr ""
    11941203
    1195 #: model/settings-meta-boxes.php:375
    1196 #: model/settings-meta-boxes.php:495
    1197 #: model/settings-meta-boxes.php:554
     1204#: model/settings-meta-boxes.php:381
     1205#: model/settings-meta-boxes.php:501
     1206#: model/settings-meta-boxes.php:560
    11981207msgid "From E-mail Address"
    11991208msgstr ""
    12001209
    1201 #: model/settings-meta-boxes.php:378
    1202 #: model/settings-meta-boxes.php:498
    1203 #: model/settings-meta-boxes.php:557
     1210#: model/settings-meta-boxes.php:384
     1211#: model/settings-meta-boxes.php:504
     1212#: model/settings-meta-boxes.php:563
    12041213msgid "If blank, defaults to WordPress email on file under Settings > General"
    12051214msgstr ""
    12061215
    1207 #: model/settings-meta-boxes.php:382
    1208 #: model/settings-meta-boxes.php:502
     1216#: model/settings-meta-boxes.php:388
     1217#: model/settings-meta-boxes.php:508
    12091218msgid "BCC"
    12101219msgstr ""
    12111220
    1212 #: model/settings-meta-boxes.php:385
    1213 #: model/settings-meta-boxes.php:505
     1221#: model/settings-meta-boxes.php:391
     1222#: model/settings-meta-boxes.php:511
    12141223msgid "Comma separate for multiple email addresses"
    1215 msgstr ""
    1216 
    1217 #: model/settings-meta-boxes.php:402
    1218 #: model/settings-meta-boxes.php:442
    1219 #: model/settings-meta-boxes.php:520
    1220 msgid "Variables that can be used in template..."
    1221 msgstr ""
    1222 
    1223 #: model/settings-meta-boxes.php:403
    1224 #: model/settings-meta-boxes.php:443
    1225 #: model/settings-meta-boxes.php:521
    1226 msgid "Multi-line list of sign-up details such as date, sheet title, task title"
    1227 msgstr ""
    1228 
    1229 #: model/settings-meta-boxes.php:404
    1230 #: model/settings-meta-boxes.php:444
    1231 #: model/settings-meta-boxes.php:522
    1232 msgid "First name of user that signed up"
    1233 msgstr ""
    1234 
    1235 #: model/settings-meta-boxes.php:405
    1236 #: model/settings-meta-boxes.php:445
    1237 #: model/settings-meta-boxes.php:523
    1238 msgid "Last name of user that signed up"
    1239 msgstr ""
    1240 
    1241 #: model/settings-meta-boxes.php:406
    1242 #: model/settings-meta-boxes.php:446
    1243 #: model/settings-meta-boxes.php:524
    1244 msgid "Email of user that signed up"
    1245 msgstr ""
    1246 
    1247 #: model/settings-meta-boxes.php:407
    1248 #: model/settings-meta-boxes.php:447
    1249 #: model/settings-meta-boxes.php:525
    1250 msgid "Name of site as defined in Settings > General > Site Title"
    12511224msgstr ""
    12521225
     
    12541227#: model/settings-meta-boxes.php:448
    12551228#: model/settings-meta-boxes.php:526
     1229msgid "Variables that can be used in template..."
     1230msgstr ""
     1231
     1232#: model/settings-meta-boxes.php:409
     1233#: model/settings-meta-boxes.php:449
     1234#: model/settings-meta-boxes.php:527
     1235msgid "Multi-line list of sign-up details such as date, sheet title, task title"
     1236msgstr ""
     1237
     1238#: model/settings-meta-boxes.php:410
     1239#: model/settings-meta-boxes.php:450
     1240#: model/settings-meta-boxes.php:528
     1241msgid "First name of user that signed up"
     1242msgstr ""
     1243
     1244#: model/settings-meta-boxes.php:411
     1245#: model/settings-meta-boxes.php:451
     1246#: model/settings-meta-boxes.php:529
     1247msgid "Last name of user that signed up"
     1248msgstr ""
     1249
     1250#: model/settings-meta-boxes.php:412
     1251#: model/settings-meta-boxes.php:452
     1252#: model/settings-meta-boxes.php:530
     1253msgid "Email of user that signed up"
     1254msgstr ""
     1255
     1256#: model/settings-meta-boxes.php:413
     1257#: model/settings-meta-boxes.php:453
     1258#: model/settings-meta-boxes.php:531
     1259msgid "Name of site as defined in Settings > General > Site Title"
     1260msgstr ""
     1261
     1262#: model/settings-meta-boxes.php:414
     1263#: model/settings-meta-boxes.php:454
     1264#: model/settings-meta-boxes.php:532
    12561265msgid "URL of site"
    12571266msgstr ""
    12581267
    1259 #: model/settings-meta-boxes.php:409
     1268#: model/settings-meta-boxes.php:415
    12601269msgid "Link to remove sign-up"
    12611270msgstr ""
    12621271
    1263 #: model/settings-meta-boxes.php:419
     1272#: model/settings-meta-boxes.php:425
    12641273msgid "Removal Confirmation E-mail"
    12651274msgstr ""
    12661275
    1267 #: model/settings-meta-boxes.php:458
     1276#: model/settings-meta-boxes.php:464
    12681277msgid "Reminder E-mail"
    12691278msgstr ""
    12701279
    1271 #: model/settings-meta-boxes.php:458
     1280#: model/settings-meta-boxes.php:464
    12721281msgid "Pro Feature"
    12731282msgstr ""
    12741283
    1275 #: model/settings-meta-boxes.php:458
     1284#: model/settings-meta-boxes.php:464
    12761285msgid "Pro"
    12771286msgstr ""
    12781287
    1279 #: model/settings-meta-boxes.php:462
     1288#: model/settings-meta-boxes.php:468
    12801289msgid "Enable Reminders"
    12811290msgstr ""
    12821291
    1283 #: model/settings-meta-boxes.php:471
     1292#: model/settings-meta-boxes.php:477
    12841293msgid "Your site will check hourly to see if there are reminders that need to be sent using the"
    12851294msgstr ""
    12861295
    1287 #: model/settings-meta-boxes.php:483
     1296#: model/settings-meta-boxes.php:489
    12881297msgid "This field is required."
    12891298msgstr ""
    12901299
    1291 #: model/settings-meta-boxes.php:535
     1300#: model/settings-meta-boxes.php:541
    12921301msgid "Status E-mail"
    12931302msgstr ""
    12941303
    1295 #: model/settings-meta-boxes.php:539
     1304#: model/settings-meta-boxes.php:545
    12961305msgid "Enable Status E-mail"
    12971306msgstr ""
    12981307
    1299 #: model/settings-meta-boxes.php:542
     1308#: model/settings-meta-boxes.php:548
    13001309msgid "Shows all signups for a sheet.  Sent when a user adds or removes a signup from the frontend."
    13011310msgstr ""
    13021311
    1303 #: model/settings-meta-boxes.php:561
     1312#: model/settings-meta-boxes.php:567
    13041313msgid "Send to main admin emails"
    13051314msgstr ""
    13061315
    1307 #: model/settings-meta-boxes.php:564
     1316#: model/settings-meta-boxes.php:570
    13081317msgid "E-mail address specified under Settings > General"
    13091318msgstr ""
    13101319
    1311 #: model/settings-meta-boxes.php:568
     1320#: model/settings-meta-boxes.php:574
    13121321msgid "Send to \"Sheet BCC\" recipients"
    13131322msgstr ""
    13141323
    1315 #: model/settings-meta-boxes.php:571
     1324#: model/settings-meta-boxes.php:577
    13161325msgid "These addresses will be added as a recipient only for sheets on which they are assigned."
    13171326msgstr ""
    13181327
    1319 #: model/settings-meta-boxes.php:579
     1328#: model/settings-meta-boxes.php:585
    13201329msgid "Advanced"
    13211330msgstr ""
    13221331
    1323 #: model/settings-meta-boxes.php:588
     1332#: model/settings-meta-boxes.php:594
    13241333msgid "Reset All Settings"
    13251334msgstr ""
    13261335
    1327 #: model/settings-meta-boxes.php:591
    13281336#: model/settings-meta-boxes.php:597
     1337#: model/settings-meta-boxes.php:603
    13291338msgid "This will erase any custom configurations you have made on this page and reset them back to the defaults. This action cannot be undone."
    13301339msgstr ""
    13311340
    1332 #: model/settings-meta-boxes.php:596
     1341#: model/settings-meta-boxes.php:602
    13331342msgid "Are you sure?"
    13341343msgstr ""
    13351344
    1336 #: model/settings-meta-boxes.php:606
     1345#: model/settings-meta-boxes.php:612
    13371346msgid "Text Overrides"
    13381347msgstr ""
     
    13781387msgstr ""
    13791388
    1380 #: model/sheet-base.php:280
     1389#: model/sheet-base.php:281
    13811390msgid " (Copy)"
    13821391msgstr ""
    13831392
    1384 #: model/signup.php:105
     1393#: model/signup.php:103
    13851394msgid "Sign-up"
    13861395msgstr ""
    13871396
    13881397#. translators: %1$s is replaced with task title and %2$s is replaced with optional detailed errors if enabled
    1389 #: model/signup.php:150
     1398#: model/signup.php:148
    13901399msgid "Error adding signup for %1$s.  All spots are filled. %2$s"
    13911400msgstr ""
    13921401
    1393 #: model/signup.php:184
     1402#: model/signup.php:183
    13941403msgid "You have already signed up for this task.  Do you want to sign up again?"
    13951404msgstr ""
    13961405
     1406#: model/signup.php:208
     1407msgid "Yes, sign me up"
     1408msgstr ""
     1409
    13971410#: model/signup.php:209
    1398 msgid "Yes, sign me up"
    1399 msgstr ""
    1400 
    1401 #: model/signup.php:210
    14021411msgid "No, thanks"
    14031412msgstr ""
    14041413
    14051414#. translators: %s is replaced with the sign-up email
    1406 #: model/signup.php:237
    1407 #: model/signup.php:344
     1415#: model/signup.php:236
     1416#: model/signup.php:343
    14081417msgid "Error adding the sign-up for \"%s\""
    14091418msgstr ""
    14101419
    1411 #: model/signup.php:546
    1412 msgid "Math Question"
    1413 msgstr ""
    1414 
    14151420#. translators: %s is replaced with the task title
    1416 #: model/task-base.php:157
     1421#: model/task-base.php:155
    14171422msgid "Error adding the task \"%s\""
    14181423msgstr ""
    14191424
    1420 #: model/task-base.php:192
     1425#: model/task-base.php:190
    14211426msgid "Error adding additional fields to task."
    14221427msgstr ""
    14231428
    14241429#. translators: %s is replaced with the task title
    1425 #: model/task-base.php:241
     1430#: model/task-base.php:239
    14261431msgid "Error updating the task \"%s\""
    14271432msgstr ""
    14281433
    1429 #: model/task-base.php:285
     1434#: model/task-base.php:283
    14301435msgid "Error deleting task."
    14311436msgstr ""
    14321437
    1433 #: model/task-base.php:497
     1438#: model/task-base.php:495
    14341439msgid "Sign up &raquo;"
    14351440msgstr ""
     
    14881493msgstr ""
    14891494
    1490 #: theme-files/fdsus/sign-up-form.php:145
     1495#: theme-files/fdsus/sign-up-form.php:147
    14911496msgid "required"
    14921497msgstr ""
    14931498
    1494 #: theme-files/fdsus/sign-up-form.php:161
     1499#: theme-files/fdsus/sign-up-form.php:163
    14951500msgid "or"
    14961501msgstr ""
    14971502
    1498 #: theme-files/fdsus/sign-up-form.php:163
     1503#: theme-files/fdsus/sign-up-form.php:165
    14991504msgid "&laquo; go back to the Sign-Up Sheet"
    15001505msgstr ""
     
    15121517msgstr ""
    15131518
    1514 #: build/block.json
    15151519#: src/block.json
    15161520msgctxt "block title"
     
    15181522msgstr ""
    15191523
    1520 #: build/block.json
    15211524#: src/block.json
    15221525msgctxt "block description"
  • sign-up-sheets/trunk/lib/dls/meta-boxes/assets/admin.js

    r3234219 r3234235  
    155155        });
    156156
    157         $('.dlsmb-field-type-repeater TABLE').sortable({
     157        $('.dlsmb-field-type-repeater TBODY').sortable({
    158158            distance: 5,
    159159            opacity: 0.6,
    160160            cursor: 'move',
    161             toleranceElement: '.dlsmb-sort',
    162             items: 'tbody > tr'
     161            handle: '.dlsmb-sort',
     162            items: 'tr'
    163163        });
    164164
  • sign-up-sheets/trunk/lib/dls/meta-boxes/assets/style.css

    r3234219 r3234235  
    183183}
    184184
    185 .dlsmb-field-type-repeater TBODY TR:hover {
     185.dlsmb-field-type-repeater TBODY .dlsmb-sort:hover {
    186186    cursor: move;
    187187}
  • sign-up-sheets/trunk/lib/dls/meta-boxes/meta-boxes.php

    r3234219 r3234235  
    259259                </li>
    260260                <li class="hide-if-no-js">
    261                     <a href="#<?php echo esc_url($taxonomy); ?>-pop" tabindex="3"><?php esc_html_e('Most Used', 'fdsus'); ?></a>
     261                    <a href="#<?php echo esc_url($taxonomy); ?>-pop" tabindex="3"><?php esc_html_e('Most Used', 'sign-up-sheets'); ?></a>
    262262                </li>
    263263            </ul>
     
    722722            case 'checkbox':
    723723                $checked = ($value === 'true') ? ' checked="checked"' : null;
    724                 $boxLabel = empty($field['box_label_override']) ? esc_html__('True', 'fdsus') : $field['box_label_override'];
     724                $boxLabel = empty($field['box_label_override']) ? esc_html__('True', 'sign-up-sheets') : $field['box_label_override'];
    725725                echo '<input type="checkbox" name="' . $field_name . '" value="true" class="dlsmb-field-element" id="' . $id . '"' . $checked . '> <label for="' . $id . '" class="dlsmb-checkbox">' . $boxLabel . '</label><br />';
    726726                break;
     
    773773                            <div class="dlsmb-image-hover">
    774774                                <ul>
    775                                     <li class="dlsmb-image-hover-icon dlsmb-image-hover-edit"><a href="#" title="' . esc_html__('Edit', 'fdsus') . '"></a></li>
    776                                     <li class="dlsmb-image-hover-icon dlsmb-image-hover-remove"><a href="#" title="' . esc_html__('Remove', 'fdsus') . '"></a></li>
     775                                    <li class="dlsmb-image-hover-icon dlsmb-image-hover-edit"><a href="#" title="' . esc_html__('Edit', 'sign-up-sheets') . '"></a></li>
     776                                    <li class="dlsmb-image-hover-icon dlsmb-image-hover-remove"><a href="#" title="' . esc_html__('Remove', 'sign-up-sheets') . '"></a></li>
    777777                                </ul>
    778778                            </div>
     
    924924                if (empty($field['map_api_key'])) {
    925925                    $error_class = 'map-not-loaded';
    926                     $msg = '<p>' .esc_html__('Map not loaded. Check your api key.', 'fdsus') . '</p>';
     926                    $msg = '<p>' .esc_html__('Map not loaded. Check your api key.', 'sign-up-sheets') . '</p>';
    927927                } else {
    928928                    $error_class = '';
     
    961961        $actions = array(
    962962            'add' => array(
    963                 'title' => esc_html__('Add Row', 'fdsus'),
     963                'title' => esc_html__('Add Row', 'sign-up-sheets'),
    964964                'icon' => 'dashicons dashicons-plus-alt',
    965965            ),
    966966            'remove' => array(
    967                 'title' => esc_html__('Delete Row', 'fdsus'),
     967                'title' => esc_html__('Delete Row', 'sign-up-sheets'),
    968968                'icon' => 'dashicons dashicons-trash',
    969969            ),
  • sign-up-sheets/trunk/main.php

    r3234219 r3234235  
    2222    function fdsusAutoloader($className)
    2323    {
    24         if (false !== strpos($className, __NAMESPACE__) && !in_array($className, array(__NAMESPACE__ . '\Main'))) {
     24        $classesDir = '';
     25        $classFile = '';
     26
     27        if (0 === strpos($className, __NAMESPACE__ . '\\') && !in_array($className, array(__NAMESPACE__ . '\Main'))) {
    2528            $classesDir = realpath(plugin_dir_path(__FILE__)) . DIRECTORY_SEPARATOR;
    2629            $classFile = str_replace(__NAMESPACE__ . '/', '', str_replace('\\', '/', $className)) . '.php';
    2730            $classFile = strtolower(preg_replace('/\B([A-Z])/', '-$1', $classFile)); // add hyphen before uppercase classes then convert to all lowercase
     31        } elseif (0 === strpos($className,  'FDSUSPRO\\') && Id::isProActivating()) {
     32            // Autoload Pro if it's in the process of activating
     33            $classesDir = dirname(realpath(plugin_dir_path(__FILE__))) . DIRECTORY_SEPARATOR . dirname(Id::PRO_PLUGIN_BASENAME) . DIRECTORY_SEPARATOR;
     34            $classFile = str_replace('FDSUSPRO/', '', str_replace('\\', '/', $className)) . '.php';
     35            $classFile = strtolower(preg_replace('/\B([A-Z])/', '-$1', $classFile)); // add hyphen before uppercase classes then convert to all lowercase
     36        }
     37
     38        if ($classesDir && $classFile) {
     39            if (!file_exists($classesDir . $classFile)) {
     40                error_log('Autoloader tried to load a file that did not exist... ' . $classesDir . $classFile);
     41                return;
     42            }
    2843            require_once $classesDir . $classFile;
    2944        }
     
    3348endif;
    3449
    35 if (!class_exists('\FDSUS\Main')):
     50if (!function_exists('\FDSUS\fdsusIsFallbackPlugin')):
     51    function fdsusIsFallbackPlugin()
     52    {
     53        return dirname(__FILE__) !== dirname(WP_PLUGIN_DIR . DIRECTORY_SEPARATOR . Id::FREE_PLUGIN_BASENAME);
     54    }
     55endif;
     56
     57Notice::instance(array('frontendFilter' => Id::PREFIX . '_notices'));
     58Settings::instance();
     59
     60if (
     61    (
     62        empty(Id::version('pro'))
     63        || fdsusIsFallbackPlugin()
     64        || (!empty(Id::version('free')) && !empty(Id::version('pro'))
     65            && version_compare(Id::version('free'), Id::version('pro'), '==')
     66            && !class_exists('\FDSUS\Main')
     67        )
     68    )
     69    && !class_exists('\FDSUS\Main')
     70):
    3671
    3772    class Main {
     
    6499
    65100            global $wpdb;
    66             Notice::instance(array('frontendFilter' => Id::PREFIX . '_notices'));
    67             Settings::instance();
    68101            $this->wpdb = $wpdb;
    69102            $this->data = new Data();
     
    101134            }
    102135
    103             register_activation_hook(Settings::getCurrentPluginBasename(), array(&$this, 'activate'));
    104             register_deactivation_hook(Settings::getCurrentPluginBasename(), array(&$this, 'deactivate'));
     136            register_activation_hook(FDSUS_FREE_PLUGIN_BASENAME, array(&$this, 'activate'));
     137            register_deactivation_hook(FDSUS_FREE_PLUGIN_BASENAME, array(&$this, 'deactivate'));
    105138
    106139            add_action('wp_enqueue_scripts', array(&$this, 'add_css_and_js_to_frontend'));
    107140            add_action('init', array(&$this, 'setDefaultOptions'), 0);
    108141            add_action('init', array(&$this, 'flushIfNeeded'), 0);
    109             add_action('admin_init', array(&$this, 'dupPluginVersionCheck'));
    110142
    111143            add_filter('rewrite_rules_array', array(&$this, 'add_rewrite_rules'));
     
    146178        function add_css_and_js_to_frontend()
    147179        {
     180            // Pull pro or free
     181            $pluginPath = WP_PLUGIN_DIR . DIRECTORY_SEPARATOR . (Id::isPro() ? Id::PRO_PLUGIN_BASENAME
     182                    : Id::FREE_PLUGIN_BASENAME);
     183
    148184            wp_enqueue_script('jquery');
    149185
     
    151187                wp_register_script(
    152188                    Id::PREFIX . '-mailcheck',
    153                     esc_url(plugins_url('js/mailcheck.min.js', __FILE__)),
     189                    plugins_url('js/mailcheck.min.js', __FILE__),
    154190                    array(),
    155191                    '1.1.2'
     
    159195            wp_register_style(
    160196                Id::PREFIX . '-style',
    161                 plugins_url('css/style.css', __FILE__),
     197                plugins_url('css/style.css', $pluginPath),
    162198                array(),
    163199                Id::version()
     
    172208            wp_register_script(
    173209                'dlssus-js',
    174                 plugins_url('js/dist/main.min.js', __FILE__),
     210                plugins_url('js/dist/main.min.js', $pluginPath),
    175211                $mainSusDeps,
    176212                Id::version()
     
    238274
    239275        /**
    240          * Duplicate plugin version check
    241          */
    242         public function dupPluginVersionCheck()
    243         {
    244             if ((Id::isPro() && is_plugin_active(Id::FREE_PLUGIN_BASENAME))
    245                 || (!Id::isPro() && is_plugin_active(Id::PRO_PLUGIN_BASENAME))
    246             ) {
    247                 $pluginFileRequire = ABSPATH . 'wp-admin' . DIRECTORY_SEPARATOR . 'includes' . DIRECTORY_SEPARATOR
    248                     . 'plugin.php';
    249                 if (!function_exists('get_plugins')) {
    250                     require_once($pluginFileRequire);
    251                 }
    252 
    253                 $plugins = get_plugins();
    254 
    255                 if ($plugins[Id::FREE_PLUGIN_BASENAME]['Version']
    256                     <> $plugins[Id::PRO_PLUGIN_BASENAME]['Version']
    257                 ) {
    258                     if (!function_exists('get_plugins')) {
    259                         require_once($pluginFileRequire);
    260                     }
    261                     $plugins = get_plugins();
    262                     $versionFree = $plugins[Id::FREE_PLUGIN_BASENAME]['Version'];
    263                     $versionPro = $plugins[Id::PRO_PLUGIN_BASENAME]['Version'];
    264                     $allowedHtml = array(
    265                         'strong' => array(),
    266                     );
    267 
    268                     Notice::add(
    269                         'error', sprintf(
    270                             wp_kses(
    271                             /* translators: %1$s is replaced with the pro plugin version number, %2$s is replaced with the free plugin version number */
    272                                 __(
    273                                     'The <strong>Sign-up Sheets Pro</strong> plugin version (%1$s) does not match the version number of the main <strong>Sign-up Sheets</strong> plugin (%2$s).  Please update so both version numbers match to prevent possible conflicts.',
    274                                     'fdsus'
    275                                 ),
    276                                 $allowedHtml
    277                             ),
    278                             esc_html($versionPro), esc_html($versionFree)
    279                         )
    280                     );
    281                 }
    282             }
    283         }
    284 
    285         /**
    286276         * Check if we need to flush rewrites (like if slug was changed in Settings)
    287277         */
     
    329319
    330320            // Crons
    331             wp_clear_scheduled_hook(Id::PREFIX . '_dbupdate_action');
     321            wp_clear_scheduled_hook('fdsus_dbupdate_action');
    332322
    333323            /**
     
    341331    $fdsus = new Main();
    342332    require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . 'template-tags.php';
    343     is_file(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'pro.php') and include 'pro.php';
    344333
    345334endif;
  • sign-up-sheets/trunk/model/base.php

    r3234219 r3234235  
    303303    {
    304304        return array(
    305             '0' => __('Sunday', 'fdsus'),
    306             '1' => __('Monday', 'fdsus'),
    307             '2' => __('Tuesday', 'fdsus'),
    308             '3' => __('Wednesday', 'fdsus'),
    309             '4' => __('Thursday', 'fdsus'),
    310             '5' => __('Friday', 'fdsus'),
    311             '6' => __('Saturday', 'fdsus'),
     305            '0' => __('Sunday', 'sign-up-sheets'),
     306            '1' => __('Monday', 'sign-up-sheets'),
     307            '2' => __('Tuesday', 'sign-up-sheets'),
     308            '3' => __('Wednesday', 'sign-up-sheets'),
     309            '4' => __('Thursday', 'sign-up-sheets'),
     310            '5' => __('Friday', 'sign-up-sheets'),
     311            '6' => __('Saturday', 'sign-up-sheets'),
    312312        );
    313313    }
  • sign-up-sheets/trunk/model/db-update.php

    r3234219 r3234235  
    2828        $this->data = new Data();
    2929
    30         add_action('init', array(&$this, 'check'));
    31         add_action(Id::PREFIX . '_dbupdate_action', array(&$this, 'asyncUpdate'));
     30        add_action('wp_loaded', array(&$this, 'check'));
     31        add_action('fdsus_dbupdate_action', array(&$this, 'asyncUpdate'));
    3232    }
    3333
     
    4949    public function scheduleAsyncUpdate()
    5050    {
    51         wp_schedule_single_event(time(), Id::PREFIX . '_dbupdate_action');
     51        wp_schedule_single_event(time(), 'fdsus_dbupdate_action');
    5252    }
    5353
  • sign-up-sheets/trunk/model/meta-boxes.php

    r3234219 r3234235  
    2424    {
    2525        $trueFalse = array(
    26             ''      => esc_html__('Global', 'fdsus'),
    27             'true'  => esc_html__('True', 'fdsus'),
    28             'false' => esc_html__('False', 'fdsus'),
     26            ''      => esc_html__('Global', 'sign-up-sheets'),
     27            'true'  => esc_html__('True', 'sign-up-sheets'),
     28            'false' => esc_html__('False', 'sign-up-sheets'),
    2929        );
    3030
     
    3434            'general' => array(
    3535                'id'        => SheetModel::POST_TYPE . '-general-meta',
    36                 'title'     => esc_html__('General', 'fdsus'),
     36                'title'     => esc_html__('General', 'sign-up-sheets'),
    3737                'post_type' => SheetModel::POST_TYPE,
    3838                'context'   => 'normal',
     
    4040                'fields'    => array(
    4141                    array(
    42                         'label' => esc_html__('Date', 'fdsus'),
     42                        'label' => esc_html__('Date', 'sign-up-sheets'),
    4343                        'key'   => 'dlssus_date',
    4444                        'type'  => 'datepicker',
     
    5151            'tasks' => array(
    5252                'id'        => SheetModel::POST_TYPE . '-tasks-meta',
    53                 'title'     => esc_html__('Tasks', 'fdsus'),
     53                'title'     => esc_html__('Tasks', 'sign-up-sheets'),
    5454                'post_type' => SheetModel::POST_TYPE,
    5555                'context'   => 'normal',
     
    6262                        'fields' => array(
    6363                            array(
    64                                 'label' => esc_html__('What', 'fdsus'),
     64                                'label' => esc_html__('What', 'sign-up-sheets'),
    6565                                'key'   => 'title',
    6666                                'type'  => 'text',
     
    6868                            ),
    6969                            array(
    70                                 'label' => esc_html__('# of Spots', 'fdsus'),
     70                                'label' => esc_html__('# of Spots', 'sign-up-sheets'),
    7171                                'key'   => 'qty',
    7272                                'type'  => 'text',
     
    9999                'fields'    => array(
    100100                    array(
    101                         'label'   => esc_html__('Set Phone as Optional', 'fdsus'),
     101                        'label'   => esc_html__('Set Phone as Optional', 'sign-up-sheets'),
    102102                        'key'     => Id::PREFIX . '_optional_phone',
    103103                        'type'    => 'select',
     
    106106                    ),
    107107                    array(
    108                         'label'   => esc_html__('Set Address as Optional', 'fdsus'),
     108                        'label'   => esc_html__('Set Address as Optional', 'sign-up-sheets'),
    109109                        'key'     => Id::PREFIX . '_optional_address',
    110110                        'type'    => 'select',
     
    113113                    ),
    114114                    array(
    115                         'label'   => esc_html__('Hide Phone Field', 'fdsus'),
     115                        'label'   => esc_html__('Set Email as Optional', 'sign-up-sheets'),
     116                        'key'     => 'fdsus_optional_email',
     117                        'type'    => 'select',
     118                        'options' => $trueFalse,
     119                        'order'   => 22,
     120                    ),
     121                    array(
     122                        'label'   => esc_html__('Hide Phone Field', 'sign-up-sheets'),
    116123                        'key'     => Id::PREFIX . '_hide_phone',
    117124                        'type'    => 'select',
     
    120127                    ),
    121128                    array(
    122                         'label'   => esc_html__('Hide Address Fields', 'fdsus'),
     129                        'label'   => esc_html__('Hide Address Fields', 'sign-up-sheets'),
    123130                        'key'     => Id::PREFIX . '_hide_address',
    124131                        'type'    => 'select',
     
    127134                    ),
    128135                    array(
    129                         'label'   => esc_html__('Hide Email Field', 'fdsus'),
     136                        'label'   => esc_html__('Hide Email Field', 'sign-up-sheets'),
    130137                        'key'     => Id::PREFIX . '_hide_email',
    131138                        'type'    => 'select',
     
    134141                    ),
    135142                    array(
    136                         'label'  => esc_html__('Sheet Specific BCC', 'fdsus'),
     143                        'label'  => esc_html__('Sheet Specific BCC', 'sign-up-sheets'),
    137144                        'key'    => Id::PREFIX . '_sheet_bcc',
    138145                        'type'   => 'text',
    139                         'append' => ' <em>' . esc_html__('Comma-separated list of emails to be copied on confirmations/removals', 'fdsus') . '</em>',
     146                        'append' => ' <em>' . esc_html__('Comma-separated list of emails to be copied on confirmations/removals', 'sign-up-sheets') . '</em>',
    140147                        'order'  => 50,
    141148                        'wrap_class' => 'dlsmb-field-col-12',
     
    143150                    ),
    144151                    array(
    145                         'label'  => esc_html__('Reminder Schedule', 'fdsus'),
     152                        'label'  => esc_html__('Reminder Schedule', 'sign-up-sheets'),
    146153                        'key'    => Id::PREFIX . '_sheet_reminder_days',
    147154                        'type'   => 'text',
    148155                        'append' => ' <br><em>'
    149                             . esc_html__('Number of days before the date on the sign-up sheet that the email should be sent.  Use whole numbers, for example, to remind one day before use...', 'fdsus')
     156                            . esc_html__('Number of days before the date on the sign-up sheet that the email should be sent.  Use whole numbers, for example, to remind one day before use...', 'sign-up-sheets')
    150157                            . ' <code>1</code> '
    151                             . esc_html__('(If this is blank Global setting is used. Global setting in Settings > Sign-up Sheets.)', 'fdsus')
     158                            . esc_html__('(If this is blank Global setting is used. Global setting in Settings > Sign-up Sheets.)', 'sign-up-sheets')
    152159                            . '</em>',
    153160                        'order'  => 60,
     
    156163                    ),
    157164                    array(
    158                         'label'   => esc_html__('Compact Sign-up Mode', 'fdsus'),
     165                        'label'   => esc_html__('Compact Sign-up Mode', 'sign-up-sheets'),
    159166                        'key'     => Id::PREFIX . '_compact_signups',
    160167                        'type'    => 'select',
    161168                        'options' => array(
    162                             ''      => esc_html__('Global', 'fdsus'),
    163                             'false' => esc_html__('Disabled', 'fdsus'),
    164                             'true'  => esc_html__('Enabled', 'fdsus'),
    165                             'semi'  => esc_html__('Semi-Compact', 'fdsus'),
     169                            ''      => esc_html__('Global', 'sign-up-sheets'),
     170                            'false' => esc_html__('Disabled', 'sign-up-sheets'),
     171                            'true'  => esc_html__('Enabled', 'sign-up-sheets'),
     172                            'semi'  => esc_html__('Semi-Compact', 'sign-up-sheets'),
    166173                        ),
    167                         'append'  => ' <em>' . esc_html__('Show sign-up spots on one line with just # of open spots and a link to sign-up if open. Semi-Compact will also include the names of those who already signed up (assuming "Front-end Display Names" is not set to "anonymous"', 'fdsus') . '</em>',
     174                        'append'  => ' <em>' . esc_html__('Show sign-up spots on one line with just # of open spots and a link to sign-up if open. Semi-Compact will also include the names of those who already signed up (assuming "Front-end Display Names" is not set to "anonymous"', 'sign-up-sheets') . '</em>',
    168175                        'order'   => 70,
    169176                        'wrap_class' => 'dlsmb-field-col-12',
     
    171178                    ),
    172179                    array(
    173                         'label'   => esc_html__('Enable Task Checkboxes', 'fdsus'),
     180                        'label'   => esc_html__('Enable Task Checkboxes', 'sign-up-sheets'),
    174181                        'key'     => Id::PREFIX . '_use_task_checkboxes',
    175182                        'type'    => 'select',
     
    179186                    ),
    180187                    array(
    181                         'label'   => esc_html__('Enable task sign-up limit', 'fdsus'),
     188                        'label'   => esc_html__('Enable task sign-up limit', 'sign-up-sheets'),
    182189                        'key'     => Id::PREFIX . '_task_signup_limit',
    183190                        'type'    => 'select',
     
    187194                    ),
    188195                    array(
    189                         'label'   => esc_html__('Enable contiguous task sign-up limit', 'fdsus'),
     196                        'label'   => esc_html__('Enable contiguous task sign-up limit', 'sign-up-sheets'),
    190197                        'key'     => Id::PREFIX . '_contiguous_task_signup_limit',
    191198                        'type'    => 'select',
     
    195202                    ),
    196203                    array(
    197                         'label'   => esc_html__('Auto-clear Schedule', 'fdsus'),
     204                        'label'   => esc_html__('Auto-clear Schedule', 'sign-up-sheets'),
    198205                        'key'     => 'fdsus_autoclear',
    199206                        'type'    => 'checkboxes',
    200207                        'options' => $this->getDaysOfWeekArray(),
    201208                        'append' => Id::isPro() && !Settings::isAutoclearSignupsAllowed()
    202                             ? ' <em>' . esc_html__('Auto-clear is not currently allowed globally under "Sign-up Sheets > Settings". Enable it for this setting to take effect.', 'fdsus') . '</em>'
     209                            ? ' <em>' . esc_html__('Auto-clear is not currently allowed globally under "Sign-up Sheets > Settings". Enable it for this setting to take effect.', 'sign-up-sheets') . '</em>'
    203210                            : '',
    204211                        'order'   => 110,
     
    207214                    ),
    208215                    array(
    209                         'label'      => esc_html__('Confirmation Email Message', 'fdsus'),
     216                        'label'      => esc_html__('Confirmation Email Message', 'sign-up-sheets'),
    210217                        'key'        => Id::PREFIX . '_sheet_email_conf_message',
    211218                        'type'       => 'textarea',
    212                         'append'     => ' <br><em>' . esc_html__('Global setting in Settings > Sign-up Sheets', 'fdsus') . '</em>',
     219                        'append'     => ' <br><em>' . esc_html__('Global setting in Settings > Sign-up Sheets', 'sign-up-sheets') . '</em>',
    213220                        'order'      => 130,
    214221                        'wrap_class' => 'dlsmb-field-col-6',
     
    216223                    ),
    217224                    array(
    218                         'label'      => esc_html__('Reminder Email Message', 'fdsus'),
     225                        'label'      => esc_html__('Reminder Email Message', 'sign-up-sheets'),
    219226                        'key'        => Id::PREFIX . '_sheet_email_message',
    220227                        'type'       => 'textarea',
    221                         'append'     => ' <br><em>' . esc_html__('Global setting in Settings > Sign-up Sheets', 'fdsus') . '</em>',
     228                        'append'     => ' <br><em>' . esc_html__('Global setting in Settings > Sign-up Sheets', 'sign-up-sheets') . '</em>',
    222229                        'order'      => 140,
    223230                        'wrap_class' => 'dlsmb-field-col-6',
  • sign-up-sheets/trunk/model/settings-meta-boxes.php

    r3234219 r3234235  
    2828     * $options = array(
    2929     *     'id'      => 'sheet',
    30      *     'title'   => esc_html__('Sign-up Sheet', 'fdsus'),
     30     *     'title'   => esc_html__('Sign-up Sheet', 'sign-up-sheets'),
    3131     *     'order'   => 10,
    3232     *     'options' => array(
     
    5555
    5656        // Sheets Listing
    57         $sheetSelection = array('' => esc_html__('All', 'fdsus'));
     57        $sheetSelection = array('' => esc_html__('All', 'sign-up-sheets'));
    5858        if (Id::isPro()) {
    5959            $sheetCollection = new SheetCollectionModel();
     
    8282        $options['sheet'] = array(
    8383            'id'      => 'sheet',
    84             'title'   => esc_html__('Sign-up Sheet', 'fdsus'),
     84            'title'   => esc_html__('Sign-up Sheet', 'sign-up-sheets'),
    8585            'order'   => 10,
    8686            'options' => array(
    8787                array(
    88                     'label'   => esc_html__('Sheet order on Front-end', 'fdsus'),
     88                    'label'   => esc_html__('Sheet order on Front-end', 'sign-up-sheets'),
    8989                    'name'    => 'dls_sus_sheet_order',
    9090                    'type'    => 'dropdown',
     
    9393                ),
    9494                array(
    95                     'label' => esc_html__('Show All Sign-up Data Fields on Front-end', 'fdsus'),
     95                    'label' => esc_html__('Show All Sign-up Data Fields on Front-end', 'sign-up-sheets'),
    9696                    'name'  => 'dls_sus_display_all',
    9797                    'type'  => 'checkbox',
    98                     'note'  => esc_html__('WARNING: Sign-up sheet table will appear much like the table when sign-ups are viewed via the admin. This option will potentially display personal user information on the frontend like email address and phone.  This option is best used if you are using the [sign_up_sheet] short code within a password protected area. (This also overrides the "Front-end Display Names" option and displays all as full names.)', 'fdsus'),
     98                    'note'  => esc_html__('WARNING: Sign-up sheet table will appear much like the table when sign-ups are viewed via the admin. This option will potentially display personal user information on the frontend like email address and phone.  This option is best used if you are using the [sign_up_sheet] short code within a password protected area. (This also overrides the "Front-end Display Names" option and displays all as full names.)', 'sign-up-sheets'),
    9999                    'order' => 20
    100100                ),
    101101                array(
    102                     'label'   => esc_html__('Front-end Display Names', 'fdsus'),
     102                    'label'   => esc_html__('Front-end Display Names', 'sign-up-sheets'),
    103103                    'name'    => 'dls_sus_display_name',
    104104                    'type'    => 'dropdown',
    105                     'note'    => esc_html__('How the user\'s name should be displayed on the front-end after they sign-up', 'fdsus'),
     105                    'note'    => esc_html__('How the user\'s name should be displayed on the front-end after they sign-up', 'sign-up-sheets'),
    106106                    'options' => array(
    107107                        'default'   => '"John S." - first name plus first letter of last name',
    108108                        'full'      => '"John Smith" - full name',
    109                         'anonymous' => '"' . esc_html__('Filled', 'fdsus') . '" - ' . esc_html__('anonymous', 'fdsus'),
     109                        'anonymous' => '"' . esc_html__('Filled', 'sign-up-sheets') . '" - ' . esc_html__('anonymous', 'sign-up-sheets'),
    110110                    ),
    111111                    'th-rowspan' => 2,
     
    118118                    'type'    => 'dropdown',
    119119                    'note'    => '<span id="fdsus_display_name_username_override-label">' . esc_html__(
    120                         'For logged in users, override the Front-end Display Name with their WP username on their sign-ups.', 'fdsus'
     120                        'For logged in users, override the Front-end Display Name with their WP username on their sign-ups.', 'sign-up-sheets'
    121121                    ) . '</span>',
    122122                    'options' => array(
    123                         ''             => esc_html__('Not Enabled', 'fdsus'),
    124                         'display_name' => esc_html__('Public Display Name', 'fdsus'),
    125                         'nickname'     => esc_html__('Nickname', 'fdsus'),
    126                         'user_login'   => esc_html__('Username', 'fdsus'),
     123                        ''             => esc_html__('Not Enabled', 'sign-up-sheets'),
     124                        'display_name' => esc_html__('Public Display Name', 'sign-up-sheets'),
     125                        'nickname'     => esc_html__('Nickname', 'sign-up-sheets'),
     126                        'user_login'   => esc_html__('Username', 'sign-up-sheets'),
    127127                    ),
    128128                    'aria-labelledby' => 'fdsus_display_name_username_override-label',
     
    131131                ),
    132132                array(
    133                     'label' => esc_html__('Compact Sign-up Mode', 'fdsus'),
     133                    'label' => esc_html__('Compact Sign-up Mode', 'sign-up-sheets'),
    134134                    'name'  => 'dls_sus_compact_signups',
    135135                    'type'  => 'dropdown',
    136                     'note'  => esc_html__('Show sign-up spots on one line with just # of open spots and a link to sign-up if open. Semi-Compact will also include the names of those who already signed up (assuming "Front-end Display Names" is not set to "anonymous"', 'fdsus'),
     136                    'note'  => esc_html__('Show sign-up spots on one line with just # of open spots and a link to sign-up if open. Semi-Compact will also include the names of those who already signed up (assuming "Front-end Display Names" is not set to "anonymous"', 'sign-up-sheets'),
    137137                    'options' => array(
    138                         'false' => esc_html__('Disabled', 'fdsus'),
    139                         'true'  => esc_html__('Enabled', 'fdsus'),
    140                         'semi'  => esc_html__('Semi-Compact', 'fdsus'),
     138                        'false' => esc_html__('Disabled', 'sign-up-sheets'),
     139                        'true'  => esc_html__('Enabled', 'sign-up-sheets'),
     140                        'semi'  => esc_html__('Semi-Compact', 'sign-up-sheets'),
    141141                    ),
    142142                    'order' => 40,
     
    144144                ),
    145145                array(
    146                     'label' => esc_html__('Enable task sign-up limit', 'fdsus'),
     146                    'label' => esc_html__('Enable task sign-up limit', 'sign-up-sheets'),
    147147                    'name'  => 'dls_sus_task_signup_limit',
    148148                    'type'  => 'checkbox',
    149                     'note'  => esc_html__('Prevent users from being able to sign-up for a task more than once.  This is checked by email address.', 'fdsus'),
     149                    'note'  => esc_html__('Prevent users from being able to sign-up for a task more than once.  This is checked by email address.', 'sign-up-sheets'),
    150150                    'order' => 50,
    151151                    'pro'   => true
    152152                ),
    153153                array(
    154                     'label' => esc_html__('Enable contiguous task sign-up limit', 'fdsus'),
     154                    'label' => esc_html__('Enable contiguous task sign-up limit', 'sign-up-sheets'),
    155155                    'name'  => 'dls_sus_contiguous_task_signup_limit',
    156156                    'type'  => 'checkbox',
    157                     'note'  => esc_html__('Prevent users from being able to sign-up for a task directly before or after a task for which they have already signed up.  This is checked by email address.', 'fdsus'),
     157                    'note'  => esc_html__('Prevent users from being able to sign-up for a task directly before or after a task for which they have already signed up.  This is checked by email address.', 'sign-up-sheets'),
    158158                    'order' => 60,
    159159                    'pro'   => true
    160160                ),
    161161                array(
    162                     'label' => esc_html__('Enable Task Checkboxes', 'fdsus'),
     162                    'label' => esc_html__('Enable Task Checkboxes', 'sign-up-sheets'),
    163163                    'name'  => 'dls_sus_enable_task_checkbox',
    164164                    'type'  => 'checkbox',
    165                     'note'  => esc_html__('Allow check boxes on signup line items that allow user to sign up for multiple tasks.', 'fdsus'),
     165                    'note'  => esc_html__('Allow check boxes on signup line items that allow user to sign up for multiple tasks.', 'sign-up-sheets'),
    166166                    'order' => 70,
    167167                    'pro'   => true
    168168                ),
    169169                array(
    170                     'label' => esc_html__('Enable Spot Lock', 'fdsus'),
     170                    'label' => esc_html__('Enable Spot Lock', 'sign-up-sheets'),
    171171                    'name'  => 'dls_sus_spot_lock',
    172172                    'type'  => 'checkbox',
    173                     'note'  => esc_html__('Spot will be locked and held for current user for 3 minutes when they access the sign-up form page.  Spot Lock is available when signing up for a single task at a time.', 'fdsus'),
     173                    'note'  => esc_html__('Spot will be locked and held for current user for 3 minutes when they access the sign-up form page.  Spot Lock is available when signing up for a single task at a time.', 'sign-up-sheets'),
    174174                    'order' => 80,
    175175                    'pro'   => true
    176176                ),
    177177                array(
    178                     'label' => esc_html__('Hide self-removal from Sign-up Sheet', 'fdsus'),
     178                    'label' => esc_html__('Hide self-removal from Sign-up Sheet', 'sign-up-sheets'),
    179179                    'name'  => 'dls_sus_hide_removal',
    180180                    'type'  => 'checkbox',
    181                     'note' => esc_html__('Hides the "Remove" link from the sign-up form if users were logged in when they signed up. This is always hidden if "Front-end Display Names" is set to "anonymous".', 'fdsus'),
     181                    'note' => esc_html__('Hides the "Remove" link from the sign-up form if users were logged in when they signed up. This is always hidden if "Front-end Display Names" is set to "anonymous".', 'sign-up-sheets'),
    182182                    'order' => 85,
    183183                    'pro'   => true
    184184                ),
    185185                array(
    186                     'label' => esc_html__('Number of days before sheet/task date to allow users to edit their own sign-ups', 'fdsus'),
     186                    'label' => esc_html__('Number of days before sheet/task date to allow users to edit their own sign-ups', 'sign-up-sheets'),
    187187                    'name'  => 'fdsus_user_editable_signups',
    188188                    'type'  => 'number',
    189                     'note'  => esc_html__('Leave blank to disable the user edit feature. Number entered will calculate based on the task date, if set, otherwise it will use the sheet date.  If no sheet and task date is set, editing will be allowed indefinitely.  Use negative numbers to allow editing after the date has passed', 'fdsus'),
     189                    'note'  => esc_html__('Leave blank to disable the user edit feature. Number entered will calculate based on the task date, if set, otherwise it will use the sheet date.  If no sheet and task date is set, editing will be allowed indefinitely.  Use negative numbers to allow editing after the date has passed', 'sign-up-sheets'),
    190190                    'order' => 88,
    191191                    'pro'   => true
    192192                ),
    193193                array(
    194                     'label' => esc_html__('Show Filled Spots in Admin Edit Sheet', 'fdsus'),
     194                    'label' => esc_html__('Show Filled Spots in Admin Edit Sheet', 'sign-up-sheets'),
    195195                    'name'  => 'dls_sus_show_filled_spots_admin_edit',
    196196                    'type'  => 'checkbox',
    197                     'note'  => esc_html__('Show names and count of filled spots in the admin Edit Sheet screen.', 'fdsus'),
     197                    'note'  => esc_html__('Show names and count of filled spots in the admin Edit Sheet screen.', 'sign-up-sheets'),
    198198                    'order' => 90,
    199199                    'pro'   => true
    200200                ),
    201201                array(
    202                     'label' => esc_html__('Allow Auto-Clearing Sign-ups Per Sheet', 'fdsus'),
     202                    'label' => esc_html__('Allow Auto-Clearing Sign-ups Per Sheet', 'sign-up-sheets'),
    203203                    'name'  => 'fdsus_allow_autoclear_signups',
    204204                    'type'  => 'checkbox',
    205205                    'note'  =>
    206206                        /* translators: %s is replaced with the timestamp of the next cron scheduled */
    207                         sprintf(esc_html__('Next scheduled check: %s', 'fdsus'),
     207                        sprintf(esc_html__('Next scheduled check: %s', 'sign-up-sheets'),
    208208                            Settings::getNextScheduledCronCheck('fdsus_autoclear'))
    209209                        . '<ul>'
    210210                            . '<li>'
    211                                 . esc_html__('Enabling this activates the optional setting on each Sheet under "Additional Settings" which provides the ability auto-clear all sign-ups for that sheet on a schedule.', 'fdsus')
     211                                . esc_html__('Enabling this activates the optional setting on each Sheet under "Additional Settings" which provides the ability auto-clear all sign-ups for that sheet on a schedule.', 'sign-up-sheets')
    212212                            . '</li><li>'
    213                                 . esc_html__('Your site will check if there are sheets that need to be cleared that need to be sent using the', 'fdsus')
    214                                 . ' <a href="https://developer.wordpress.org/plugins/cron/">' . esc_html__('WordPress Cron', 'fdsus') . '</a>'
     213                                . esc_html__('Your site will check if there are sheets that need to be cleared that need to be sent using the', 'sign-up-sheets')
     214                                . ' <a href="https://developer.wordpress.org/plugins/cron/">' . esc_html__('WordPress Cron', 'sign-up-sheets') . '</a>'
    215215                            . '</li><li>'
    216                                 . esc_html__('If you just enabled/disabled this, you may need to refresh this page to see the updated "Next scheduled check"', 'fdsus')
     216                                . esc_html__('If you just enabled/disabled this, you may need to refresh this page to see the updated "Next scheduled check"', 'sign-up-sheets')
    217217                            . '</li>'
    218218                        . '</ul>',
     
    221221                ),
    222222                array(
    223                     'label'   => esc_html__('Custom Task Fields', 'fdsus'),
     223                    'label'   => esc_html__('Custom Task Fields', 'sign-up-sheets'),
    224224                    'name'    => 'dls_sus_custom_task_fields',
    225225                    'type'    => 'repeater',
     
    240240        $options['form'] = array(
    241241            'id'      => 'form',
    242             'title'   => esc_html__('Sign-up Form', 'fdsus'),
     242            'title'   => esc_html__('Sign-up Form', 'sign-up-sheets'),
    243243            'order'   => 20,
    244244            'options' => array(
    245245                array(
    246                     'label' => esc_html__('Show "Remember Me" checkbox', 'fdsus'),
     246                    'label' => esc_html__('Show "Remember Me" checkbox', 'sign-up-sheets'),
    247247                    'name'  => 'dls_sus_remember',
    248248                    'type'  => 'checkbox',
     
    251251                ),
    252252                array(
    253                     'label' => esc_html__('Set Phone as Optional', 'fdsus'),
     253                    'label' => esc_html__('Set Phone as Optional', 'sign-up-sheets'),
    254254                    'name'  => 'dls_sus_optional_phone',
    255255                    'type'  => 'checkbox',
     
    257257                ),
    258258                array(
    259                     'label' => esc_html__('Set Address as Optional', 'fdsus'),
     259                    'label' => esc_html__('Set Address as Optional', 'sign-up-sheets'),
    260260                    'name' => 'dls_sus_optional_address',
    261261                    'type' => 'checkbox',
     
    263263                ),
    264264                array(
    265                     'label' => esc_html__('Hide Email Field', 'fdsus'),
     265                    'label' => esc_html__('Set Email as Optional', 'sign-up-sheets'),
     266                    'name' => 'fdsus_optional_email',
     267                    'type' => 'checkbox',
     268                    'order' => 22
     269                ),
     270                array(
     271                    'label' => esc_html__('Hide Phone Field', 'sign-up-sheets'),
     272                    'name'  => 'dls_sus_hide_phone',
     273                    'type'  => 'checkbox',
     274                    'order' => 30
     275                ),
     276                array(
     277                    'label' => esc_html__('Hide Address Fields', 'sign-up-sheets'),
     278                    'name'  => 'dls_sus_hide_address',
     279                    'type'  => 'checkbox',
     280                    'order' => 40
     281                ),
     282                array(
     283                    'label' => esc_html__('Hide Email Field', 'sign-up-sheets'),
    266284                    'name'  => 'dls_sus_hide_email',
    267285                    'type'  => 'checkbox',
    268                     'order' => 30
    269                 ),
    270                 array(
    271                     'label' => esc_html__('Hide Phone Field', 'fdsus'),
    272                     'name'  => 'dls_sus_hide_phone',
    273                     'type'  => 'checkbox',
    274                     'order' => 30
    275                 ),
    276                 array(
    277                     'label' => esc_html__('Hide Address Fields', 'fdsus'),
    278                     'name'  => 'dls_sus_hide_address',
    279                     'type'  => 'checkbox',
    280                     'order' => 40
    281                 ),
    282                 array(
    283                     'label' => esc_html__('Disable User Auto-populate', 'fdsus'),
     286                    'order' => 42
     287                ),
     288                array(
     289                    'label' => esc_html__('Disable User Auto-populate', 'sign-up-sheets'),
    284290                    'name'  => 'dls_sus_disable_user_autopopulate',
    285291                    'type'  => 'checkbox',
    286                     'note'  => esc_html__('By default, for users that are logged in, their name and email auto-populates on sign-up form when available. This option disables that behavior.', 'fdsus'),
     292                    'note'  => esc_html__('By default, for users that are logged in, their name and email auto-populates on sign-up form when available. This option disables that behavior.', 'sign-up-sheets'),
    287293                    'order' => 45
    288294                ),
    289295                array(
    290                     'label' => esc_html__('Disable Mail Check Validation', 'fdsus'),
     296                    'label' => esc_html__('Disable Mail Check Validation', 'sign-up-sheets'),
    291297                    'name'  => 'dls_sus_deactivate_email_validation',
    292298                    'type'  => 'checkbox',
    293                     'note'  => esc_html__('Validation includes a JS check for standard email formatting, possible incorrect domains with suggestions as well as an MX record check on the domain to confirm it is setup to receive emails', 'fdsus'),
     299                    'note'  => esc_html__('Validation includes a JS check for standard email formatting, possible incorrect domains with suggestions as well as an MX record check on the domain to confirm it is setup to receive emails', 'sign-up-sheets'),
    294300                    'order' => 50
    295301                ),
    296302                array(
    297                     'label' => esc_html__('Disable sign-up link auto-scroll to sheet (hash in sign-up link)', 'fdsus'),
     303                    'label' => esc_html__('Disable sign-up link auto-scroll to sheet (hash in sign-up link)', 'sign-up-sheets'),
    298304                    'name'  => 'fdsus_disable_signup_link_hash',
    299305                    'type'  => 'checkbox',
    300                     'note'  => esc_html__('The hash on the sign-up link is useful especially on longer pages where sheets are embedded further down the page or where the sheet description is longer.  When the feature is enabled and the user clicks the sign-up link, it includes a `#` hash to and ID pointing to that same location where the sign-up form will appear on the next page.', 'fdsus'),
     306                    'note'  => esc_html__('The hash on the sign-up link is useful especially on longer pages where sheets are embedded further down the page or where the sheet description is longer.  When the feature is enabled and the user clicks the sign-up link, it includes a `#` hash to and ID pointing to that same location where the sign-up form will appear on the next page.', 'sign-up-sheets'),
    301307                    'order' => 55
    302308                ),
    303309                array(
    304                     'label' => esc_html__('Sign-up Success Message Receipt', 'fdsus'),
     310                    'label' => esc_html__('Sign-up Success Message Receipt', 'sign-up-sheets'),
    305311                    'name'  => 'dls_sus_signup_receipt',
    306312                    'type'  => 'checkbox',
    307                     'note'  => esc_html__('Displays a receipt below the sign-up success message which includes a copy of all the task details and all fields they entered in the sign-up form. Default: `unchecked`', 'fdsus'),
     313                    'note'  => esc_html__('Displays a receipt below the sign-up success message which includes a copy of all the task details and all fields they entered in the sign-up form. Default: `unchecked`', 'sign-up-sheets'),
    308314                    'order' => 60,
    309315                    'pro'   => true
    310316                ),
    311317                array(
    312                     'label'   => esc_html__('Custom Sign-up Fields', 'fdsus'),
     318                    'label'   => esc_html__('Custom Sign-up Fields', 'sign-up-sheets'),
    313319                    'name'    => 'dls_sus_custom_fields',
    314320                    'type'    => 'repeater',
     
    331337        $options['spam'] = array(
    332338            'id'      => 'spam',
    333             'title'   => esc_html__('Captcha and Spam Prevention', 'fdsus'),
     339            'title'   => esc_html__('Captcha and Spam Prevention', 'sign-up-sheets'),
    334340            'order'   => 30,
    335341            'options' => array(
    336342                array(
    337                     'label' => esc_html__('Disable honeypot', 'fdsus'),
     343                    'label' => esc_html__('Disable honeypot', 'sign-up-sheets'),
    338344                    'name'  => 'dls_sus_disable_honeypot',
    339345                    'type'  => 'checkbox',
    340                     'note'  => esc_html__('A honeypot is a less-invasive technique to reduce SPAM submission using a hidden field on the sign-up form.  It can be used in place of or alongside the captcha.', 'fdsus')
    341                 ),
    342                 array(
    343                     'label' => esc_html__('Disable all Captcha', 'fdsus'),
     346                    'note'  => esc_html__('A honeypot is a less-invasive technique to reduce SPAM submission using a hidden field on the sign-up form.  It can be used in place of or alongside the captcha.', 'sign-up-sheets')
     347                ),
     348                array(
     349                    'label' => esc_html__('Disable all Captcha', 'sign-up-sheets'),
    344350                    'name'  => 'dls_sus_disable_captcha',
    345                     'type' => 'checkbox', esc_html__('Will disable all captcha even if you have reCAPTCHA enabled below', 'fdsus')),
    346                 array('Use reCAPTCHA', 'dls_sus_recaptcha', 'checkbox', esc_html__('Will replace the default simple captcha validation', 'fdsus')),
    347                 array('reCAPTCHA Public Key', 'dls_sus_recaptcha_public_key', 'text', esc_html__('From your account at https://www.google.com/recaptcha/', 'fdsus')),
    348                 array('reCAPTCHA Private Key', 'dls_sus_recaptcha_private_key', 'text', esc_html__('From your account at https://www.google.com/recaptcha/', 'fdsus')),
     351                    'type' => 'checkbox', esc_html__('Will disable all captcha even if you have reCAPTCHA enabled below', 'sign-up-sheets')),
     352                array('Use reCAPTCHA', 'dls_sus_recaptcha', 'checkbox', esc_html__('Will replace the default simple captcha validation', 'sign-up-sheets')),
     353                array('reCAPTCHA Public Key', 'dls_sus_recaptcha_public_key', 'text', esc_html__('From your account at https://www.google.com/recaptcha/', 'sign-up-sheets')),
     354                array('reCAPTCHA Private Key', 'dls_sus_recaptcha_private_key', 'text', esc_html__('From your account at https://www.google.com/recaptcha/', 'sign-up-sheets')),
    349355                array('reCAPTCHA Version', 'dls_sus_recaptcha_version', 'dropdown', '', array('v3' => 'v3', 'v2-checkbox' => 'v2 Checkbox', 'v2-invisible' => 'v2 Invisible')),
    350356            )
     
    353359        $options['confirmation_email'] = array(
    354360            'id'      => 'confirmation_email',
    355             'title'   => esc_html__('Confirmation E-mail', 'fdsus'),
     361            'title'   => esc_html__('Confirmation E-mail', 'sign-up-sheets'),
    356362            'order'   => 40,
    357363            'options' => array(
    358364                array(
    359                     'label' => esc_html__('Enable', 'fdsus'),
     365                    'label' => esc_html__('Enable', 'sign-up-sheets'),
    360366                    'name'  => 'fdsus_enable_confirmation_email',
    361367                    'type'  => 'checkbox',
     
    365371                ),
    366372                array(
    367                     'label' => esc_html__('Subject', 'fdsus'),
     373                    'label' => esc_html__('Subject', 'sign-up-sheets'),
    368374                    'name'  => 'dls_sus_email_subject',
    369375                    'type'  => 'text',
    370376                    /* translators: %s is replaced with the default subject */
    371                     'note'  => esc_html(sprintf(__('If blank, defaults to... "%s"', 'fdsus'), Settings::$defaultMailSubjects['signup'])),
     377                    'note'  => esc_html(sprintf(__('If blank, defaults to... "%s"', 'sign-up-sheets'), Settings::$defaultMailSubjects['signup'])),
    372378                    'order' => 20
    373379                ),
    374380                array(
    375                     'label' => esc_html__('From E-mail Address', 'fdsus'),
     381                    'label' => esc_html__('From E-mail Address', 'sign-up-sheets'),
    376382                    'name'  => 'dls_sus_email_from',
    377383                    'type'  => 'text',
    378                     'note'  => esc_html__('If blank, defaults to WordPress email on file under Settings > General', 'fdsus'),
     384                    'note'  => esc_html__('If blank, defaults to WordPress email on file under Settings > General', 'sign-up-sheets'),
    379385                    'order' => 30
    380386                ),
    381387                array(
    382                     'label'    => esc_html__('BCC', 'fdsus'),
     388                    'label'    => esc_html__('BCC', 'sign-up-sheets'),
    383389                    'name'     => 'dls_sus_email_bcc',
    384390                    'type'     => 'text',
    385                     'note'     => esc_html__('Comma separate for multiple email addresses', 'fdsus'),
     391                    'note'     => esc_html__('Comma separate for multiple email addresses', 'sign-up-sheets'),
    386392                    'order'    => 40,
    387393                    'pro'      => true
    388394                ),
    389395                array(
    390                     'label'    => esc_html__('Message', 'fdsus'),
     396                    'label'    => esc_html__('Message', 'sign-up-sheets'),
    391397                    'name'     => 'dls_sus_email_message',
    392398                    'type'     => 'textarea',
     
    400406                            <code>{site_url}</code> - %s<br>
    401407                            <code>{removal_link}</code> - %s',
    402                         esc_html__('Variables that can be used in template...', 'fdsus'),
    403                         esc_html__('Multi-line list of sign-up details such as date, sheet title, task title', 'fdsus'),
    404                         esc_html__('First name of user that signed up', 'fdsus'),
    405                         esc_html__('Last name of user that signed up', 'fdsus'),
    406                         esc_html__('Email of user that signed up', 'fdsus'),
    407                         esc_html__('Name of site as defined in Settings > General > Site Title', 'fdsus'),
    408                         esc_html__('URL of site', 'fdsus'),
    409                         esc_html__('Link to remove sign-up', 'fdsus')
     408                        esc_html__('Variables that can be used in template...', 'sign-up-sheets'),
     409                        esc_html__('Multi-line list of sign-up details such as date, sheet title, task title', 'sign-up-sheets'),
     410                        esc_html__('First name of user that signed up', 'sign-up-sheets'),
     411                        esc_html__('Last name of user that signed up', 'sign-up-sheets'),
     412                        esc_html__('Email of user that signed up', 'sign-up-sheets'),
     413                        esc_html__('Name of site as defined in Settings > General > Site Title', 'sign-up-sheets'),
     414                        esc_html__('URL of site', 'sign-up-sheets'),
     415                        esc_html__('Link to remove sign-up', 'sign-up-sheets')
    410416                    ),
    411417                    'order'    => 50,
     
    417423        $options['removal_confirmation_email'] = array(
    418424            'id'      => 'removal_confirmation_email',
    419             'title'   => esc_html__('Removal Confirmation E-mail', 'fdsus') . (!Id::isPro() ? ' <span class="dls-sus-pro" title="Pro Feature">Pro</span>' : ''),
     425            'title'   => esc_html__('Removal Confirmation E-mail', 'sign-up-sheets') . (!Id::isPro() ? ' <span class="dls-sus-pro" title="Pro Feature">Pro</span>' : ''),
    420426            'order'   => 50,
    421427            'options' => array(
    422428                array(
    423                     'label' => esc_html__('Enable', 'fdsus'),
     429                    'label' => esc_html__('Enable', 'sign-up-sheets'),
    424430                    'name'  => 'fdsus_enable_removal_confirmation_email',
    425431                    'type'  => 'checkbox',
     
    429435                ),
    430436                array(
    431                     'label' => esc_html__('Message', 'fdsus'),
     437                    'label' => esc_html__('Message', 'sign-up-sheets'),
    432438                    'name'  => 'dls_sus_removed_email_message',
    433439                    'type'  => 'textarea',
     
    440446                            <code>{site_name}</code> - %s<br>
    441447                            <code>{site_url}</code> - %s',
    442                         esc_html__('Variables that can be used in template...', 'fdsus'),
    443                         esc_html__('Multi-line list of sign-up details such as date, sheet title, task title', 'fdsus'),
    444                         esc_html__('First name of user that signed up', 'fdsus'),
    445                         esc_html__('Last name of user that signed up', 'fdsus'),
    446                         esc_html__('Email of user that signed up', 'fdsus'),
    447                         esc_html__('Name of site as defined in Settings > General > Site Title', 'fdsus'),
    448                         esc_html__('URL of site', 'fdsus')
     448                        esc_html__('Variables that can be used in template...', 'sign-up-sheets'),
     449                        esc_html__('Multi-line list of sign-up details such as date, sheet title, task title', 'sign-up-sheets'),
     450                        esc_html__('First name of user that signed up', 'sign-up-sheets'),
     451                        esc_html__('Last name of user that signed up', 'sign-up-sheets'),
     452                        esc_html__('Email of user that signed up', 'sign-up-sheets'),
     453                        esc_html__('Name of site as defined in Settings > General > Site Title', 'sign-up-sheets'),
     454                        esc_html__('URL of site', 'sign-up-sheets')
    449455                    ),
    450456                    'order' => 20,
     
    456462        $options['reminder_email'] = array(
    457463            'id'      => 'reminder_email',
    458             'title'   => esc_html__('Reminder E-mail', 'fdsus') . (!Id::isPro() ? ' <span class="dls-sus-pro" title="' . esc_html__('Pro Feature', 'fdsus') . '">' . esc_html__('Pro', 'fdsus') . '</span>' : ''),
     464            'title'   => esc_html__('Reminder E-mail', 'sign-up-sheets') . (!Id::isPro() ? ' <span class="dls-sus-pro" title="' . esc_html__('Pro Feature', 'sign-up-sheets') . '">' . esc_html__('Pro', 'sign-up-sheets') . '</span>' : ''),
    459465            'order'   => 60,
    460466            'options' => array(
    461467                array(
    462                     'label' => esc_html__('Enable Reminders', 'fdsus'),
     468                    'label' => esc_html__('Enable Reminders', 'sign-up-sheets'),
    463469                    'name'  => 'dls_sus_reminder_email',
    464470                    'type'  => 'checkbox',
    465471                    'note'  =>
    466472                        /* translators: %s is replaced with the timestamp of the next cron scheduled */
    467                         sprintf(esc_html__('Next scheduled check: %s', 'fdsus'),
     473                        sprintf(esc_html__('Next scheduled check: %s', 'sign-up-sheets'),
    468474                            Settings::getNextScheduledCronCheck('dls_sus_send_reminders'))
    469475                        . '<ul>'
    470476                            . '<li>'
    471                                 . esc_html__('Your site will check hourly to see if there are reminders that need to be sent using the', 'fdsus')
    472                                 . ' <a href="https://developer.wordpress.org/plugins/cron/">' . esc_html__('WordPress Cron', 'fdsus') . '</a>'
     477                                . esc_html__('Your site will check hourly to see if there are reminders that need to be sent using the', 'sign-up-sheets')
     478                                . ' <a href="https://developer.wordpress.org/plugins/cron/">' . esc_html__('WordPress Cron', 'sign-up-sheets') . '</a>'
    473479                            . '</li><li>'
    474                                 . esc_html__('If you just enabled/disabled this, you may need to refresh this page to see the updated "Next scheduled check"', 'fdsus')
     480                                . esc_html__('If you just enabled/disabled this, you may need to refresh this page to see the updated "Next scheduled check"', 'sign-up-sheets')
    475481                            . '</li>'
    476482                        . '</ul>',
     
    478484                ),
    479485                array(
    480                     'label' => esc_html__('Reminder Schedule', 'fdsus'),
     486                    'label' => esc_html__('Reminder Schedule', 'sign-up-sheets'),
    481487                    'name'  => 'dls_sus_reminder_email_days_before',
    482488                    'type'  => 'text',
    483                     'note'  => esc_html__('Number of days before the date on the sign-up sheet that the email should be sent.  Use whole numbers, for example, to remind one day before use...', 'fdsus') . ' <code>1</code> ' . esc_html__('This field is required.', 'fdsus'),
     489                    'note'  => esc_html__('Number of days before the date on the sign-up sheet that the email should be sent.  Use whole numbers, for example, to remind one day before use...', 'sign-up-sheets') . ' <code>1</code> ' . esc_html__('This field is required.', 'sign-up-sheets'),
    484490                    'pro' => true
    485491                ),
    486492                array(
    487                     'label' => esc_html__('Subject', 'fdsus'),
     493                    'label' => esc_html__('Subject', 'sign-up-sheets'),
    488494                    'name'  => 'dls_sus_reminder_email_subject',
    489495                    'type'  => 'text',
    490496                    /* translators: %s is replaced with the default subject */
    491                     'note' => esc_html(sprintf(__('If blank, defaults to... "%s"', 'fdsus'), Settings::$defaultMailSubjects['reminder'])),
     497                    'note' => esc_html(sprintf(__('If blank, defaults to... "%s"', 'sign-up-sheets'), Settings::$defaultMailSubjects['reminder'])),
    492498                    'pro' => true
    493499                ),
    494500                array(
    495                     'label' => esc_html__('From E-mail Address', 'fdsus'),
     501                    'label' => esc_html__('From E-mail Address', 'sign-up-sheets'),
    496502                    'name'  => 'dls_sus_reminder_email_from',
    497503                    'type'  => 'text',
    498                     'note'  => esc_html__('If blank, defaults to WordPress email on file under Settings > General', 'fdsus'),
     504                    'note'  => esc_html__('If blank, defaults to WordPress email on file under Settings > General', 'sign-up-sheets'),
    499505                    'pro' => true
    500506                ),
    501507                array(
    502                     'label' => esc_html__('BCC', 'fdsus'),
     508                    'label' => esc_html__('BCC', 'sign-up-sheets'),
    503509                    'name'  => 'dls_sus_reminder_email_bcc',
    504510                    'type'  => 'text',
    505                     'note'  => esc_html__('Comma separate for multiple email addresses', 'fdsus'),
     511                    'note'  => esc_html__('Comma separate for multiple email addresses', 'sign-up-sheets'),
    506512                    'pro' => true
    507513                ),
    508514                array(
    509                     'label' => esc_html__('Message', 'fdsus'),
     515                    'label' => esc_html__('Message', 'sign-up-sheets'),
    510516                    'name'  => 'dls_sus_reminder_email_message',
    511517                    'type'  => 'textarea',
     
    518524                            <code>{site_name}</code> - %s<br>
    519525                            <code>{site_url}</code> - %s',
    520                         esc_html__('Variables that can be used in template...', 'fdsus'),
    521                         esc_html__('Multi-line list of sign-up details such as date, sheet title, task title', 'fdsus'),
    522                         esc_html__('First name of user that signed up', 'fdsus'),
    523                         esc_html__('Last name of user that signed up', 'fdsus'),
    524                         esc_html__('Email of user that signed up', 'fdsus'),
    525                         esc_html__('Name of site as defined in Settings > General > Site Title', 'fdsus'),
    526                         esc_html__('URL of site', 'fdsus')
     526                        esc_html__('Variables that can be used in template...', 'sign-up-sheets'),
     527                        esc_html__('Multi-line list of sign-up details such as date, sheet title, task title', 'sign-up-sheets'),
     528                        esc_html__('First name of user that signed up', 'sign-up-sheets'),
     529                        esc_html__('Last name of user that signed up', 'sign-up-sheets'),
     530                        esc_html__('Email of user that signed up', 'sign-up-sheets'),
     531                        esc_html__('Name of site as defined in Settings > General > Site Title', 'sign-up-sheets'),
     532                        esc_html__('URL of site', 'sign-up-sheets')
    527533                    ),
    528534                    'pro' => true
     
    533539        $options['status_email'] = array(
    534540            'id'      => 'status_email',
    535             'title'   => esc_html__('Status E-mail', 'fdsus') . (!Id::isPro() ? ' <span class="dls-sus-pro" title="Pro Feature">Pro</span>' : ''),
     541            'title'   => esc_html__('Status E-mail', 'sign-up-sheets') . (!Id::isPro() ? ' <span class="dls-sus-pro" title="Pro Feature">Pro</span>' : ''),
    536542            'order'   => 70,
    537543            'options' => array(
    538544                array(
    539                     'label' => esc_html__('Enable Status E-mail', 'fdsus'),
     545                    'label' => esc_html__('Enable Status E-mail', 'sign-up-sheets'),
    540546                    'name'  => 'dls_sus_status_email',
    541547                    'type'  => 'checkbox',
    542                     'note'  => esc_html__('Shows all signups for a sheet.  Sent when a user adds or removes a signup from the frontend.', 'fdsus'),
    543                     'pro'   => true
    544                 ),
    545                 array(
    546                     'label' => esc_html__('Subject', 'fdsus'),
     548                    'note'  => esc_html__('Shows all signups for a sheet.  Sent when a user adds or removes a signup from the frontend.', 'sign-up-sheets'),
     549                    'pro'   => true
     550                ),
     551                array(
     552                    'label' => esc_html__('Subject', 'sign-up-sheets'),
    547553                    'name'  => 'dls_sus_status_email_subject',
    548554                    'type'  => 'text',
    549555                    /* translators: %s is replaced with the default subject */
    550                     'note'  => esc_html(sprintf(__('If blank, defaults to... "%s"', 'fdsus'), Settings::$defaultMailSubjects['status'])),
    551                     'pro'   => true
    552                 ),
    553                 array(
    554                     'label' => esc_html__('From E-mail Address', 'fdsus'),
     556                    'note'  => esc_html(sprintf(__('If blank, defaults to... "%s"', 'sign-up-sheets'), Settings::$defaultMailSubjects['status'])),
     557                    'pro'   => true
     558                ),
     559                array(
     560                    'label' => esc_html__('From E-mail Address', 'sign-up-sheets'),
    555561                    'name'  => 'dls_sus_status_email_from',
    556562                    'type'  => 'text',
    557                     'note'  => esc_html__('If blank, defaults to WordPress email on file under Settings > General', 'fdsus'),
    558                     'pro'   => true
    559                 ),
    560                 array(
    561                     'label' => esc_html__('Send to main admin emails', 'fdsus'),
     563                    'note'  => esc_html__('If blank, defaults to WordPress email on file under Settings > General', 'sign-up-sheets'),
     564                    'pro'   => true
     565                ),
     566                array(
     567                    'label' => esc_html__('Send to main admin emails', 'sign-up-sheets'),
    562568                    'name'  => 'dls_sus_status_to_admin',
    563569                    'type'  => 'checkbox',
    564                     'note'  => esc_html__('E-mail address specified under Settings > General', 'fdsus'),
    565                     'pro'   => true
    566                 ),
    567                 array(
    568                     'label' => esc_html__('Send to "Sheet BCC" recipients', 'fdsus'),
     570                    'note'  => esc_html__('E-mail address specified under Settings > General', 'sign-up-sheets'),
     571                    'pro'   => true
     572                ),
     573                array(
     574                    'label' => esc_html__('Send to "Sheet BCC" recipients', 'sign-up-sheets'),
    569575                    'name'  => 'dls_sus_status_to_sheet_bcc',
    570576                    'type'  => 'checkbox',
    571                     'note'  => esc_html__('These addresses will be added as a recipient only for sheets on which they are assigned.', 'fdsus'),
     577                    'note'  => esc_html__('These addresses will be added as a recipient only for sheets on which they are assigned.', 'sign-up-sheets'),
    572578                    'pro'   => true
    573579                ),
     
    577583        $options['advanced'] = array(
    578584            'id'      => 'advanced',
    579             'title'   => esc_html__('Advanced', 'fdsus'),
     585            'title'   => esc_html__('Advanced', 'sign-up-sheets'),
    580586            'order'   => 80,
    581587            'options' => array(
     
    586592                array('Display Detailed Errors', 'dls_sus_detailed_errors', 'checkbox', '(Not recommended for production sites)'),
    587593                array(
    588                     'label' => esc_html__('Reset All Settings', 'fdsus'),
     594                    'label' => esc_html__('Reset All Settings', 'sign-up-sheets'),
    589595                    'name' => 'fdsus_reset',
    590596                    'type' => 'button',
    591                     'note' => '<span id="fdsus-reset"></span><p>' . esc_html__('This will erase any custom configurations you have made on this page and reset them back to the defaults. This action cannot be undone.', 'fdsus') . '</p>',
     597                    'note' => '<span id="fdsus-reset"></span><p>' . esc_html__('This will erase any custom configurations you have made on this page and reset them back to the defaults. This action cannot be undone.', 'sign-up-sheets') . '</p>',
    592598                    'options' => array(
    593599                        'href' => add_query_arg('fdsus-reset', 'all',
    594600                            wp_nonce_url($this->data->getSettingsUrl(), 'fdsus-settings-reset', '_fdsus-nonce')),
    595601                        'onclick' => sprintf('return confirm(`%s %s`)',
    596                             esc_html__('Are you sure?', 'fdsus'),
    597                             esc_html__('This will erase any custom configurations you have made on this page and reset them back to the defaults. This action cannot be undone.', 'fdsus')
     602                            esc_html__('Are you sure?', 'sign-up-sheets'),
     603                            esc_html__('This will erase any custom configurations you have made on this page and reset them back to the defaults. This action cannot be undone.', 'sign-up-sheets')
    598604                        ),
    599605                    )
     
    604610        $options['text_overrides'] = array(
    605611            'id'      => 'text_overrides',
    606             'title'   => esc_html__('Text Overrides', 'fdsus'),
     612            'title'   => esc_html__('Text Overrides', 'sign-up-sheets'),
    607613            'order'   => 90,
    608614            'options' => array()
  • sign-up-sheets/trunk/model/settings.php

    r3234219 r3234235  
    1313
    1414if (Id::isPro()) {
    15     class SettingsParent extends Pro\Settings {}
     15    class SettingsParent extends \FDSUSPRO\Model\Pro\Settings {}
    1616} else {
    1717    class SettingsParent {}
     
    4141    {
    4242        self::$defaultMailSubjects = array(
    43             'signup'   => esc_html__('Thank you for signing up!', 'fdsus'),
    44             'remove'   => esc_html__('Sign-up has been removed', 'fdsus'),
    45             'reminder' => esc_html__('Sign-up Reminder', 'fdsus'),
    46             'status'   => esc_html__('Sign-up Status Report', 'fdsus'),
     43            'signup'   => esc_html__('Thank you for signing up!', 'sign-up-sheets'),
     44            'remove'   => esc_html__('Sign-up has been removed', 'sign-up-sheets'),
     45            'reminder' => esc_html__('Sign-up Reminder', 'sign-up-sheets'),
     46            'status'   => esc_html__('Sign-up Status Report', 'sign-up-sheets'),
    4747        );
    4848
     
    8080        self::$text = array(
    8181            'task_title_label' => array(
    82                 'label'   => esc_html__('Task Title Label', 'fdsus'),
    83                 'default' => esc_html__('What', 'fdsus'),
     82                'label'   => esc_html__('Task Title Label', 'sign-up-sheets'),
     83                'default' => esc_html__('What', 'sign-up-sheets'),
    8484            ),
    8585        );
     
    211211
    212212    /**
    213      * Get current plugin basename depending on if we are in the pro or free version
     213     * Get current plugin basename depending on if we are running the pro or free version
    214214     *
    215215     * @return string
     
    300300        $checkUtcTimestamp = wp_next_scheduled($cronHook);
    301301        if (is_null($defaultText)) {
    302             $defaultText = esc_html__('Not Scheduled', 'fdsus');
     302            $defaultText = esc_html__('Not Scheduled', 'sign-up-sheets');
    303303        }
    304304        $displayCheckTime = $defaultText;
  • sign-up-sheets/trunk/model/settings/sheet-order.php

    r3234219 r3234235  
    2121        $this->options = array(
    2222            'date_asc'  => array(
    23                 'label'            => esc_html__('Date (ASC)', 'fdsus'),
     23                'label'            => esc_html__('Date (ASC)', 'sign-up-sheets'),
    2424                'direction'        => 'ASC',
    2525                'sort_by'          => 'dlssus_end_date',
     
    2727            ),
    2828            'date_desc' => array(
    29                 'label'            => esc_html__('Date (DESC)', 'fdsus'),
     29                'label'            => esc_html__('Date (DESC)', 'sign-up-sheets'),
    3030                'direction'        => 'DESC',
    3131                'sort_by'          => 'dlssus_end_date',
     
    3333            ),
    3434            'id_asc'    => array(
    35                 'label'            => esc_html__('Sheet ID (ASC)', 'fdsus'),
     35                'label'            => esc_html__('Sheet ID (ASC)', 'sign-up-sheets'),
    3636                'direction'        => 'ASC',
    3737                'sort_by'          => false,
     
    3939            ),
    4040            'id_desc'   => array(
    41                 'label'            => esc_html__('Sheet ID (DESC)', 'fdsus'),
     41                'label'            => esc_html__('Sheet ID (DESC)', 'sign-up-sheets'),
    4242                'direction'        => 'DESC',
    4343                'sort_by'          => false,
  • sign-up-sheets/trunk/model/sheet-base.php

    r3234219 r3234235  
    2525 * @property string dlssus_start_date
    2626 * @property string dlssus_end_date
    27  * @property string dlssus_hide_email
     27 * @property string dlssus_optional_phone
     28 * @property string dlssus_optional_address
     29 * @property string fdsus_optional_email
    2830 * @property string dlssus_hide_phone
    2931 * @property string dlssus_hide_address
     32 * @property string dlssus_hide_email
    3033 * @property string dlssus_use_task_checkboxes
    3134 * @property bool   dlssus_is_active
     
    3841 * @property array  fdsus_autoclear
    3942 * @property string fdsus_last_autoclear
    40  *
    41  * @package FDSUS\Model
    4243 */
    4344class SheetBase extends Base
     
    208209    public static function getName($singular = false)
    209210    {
    210         return $singular ? __('Sign-up Sheet', 'fdsus') : __('Sign-up Sheets', 'fdsus');
     211        return $singular ? __('Sign-up Sheet', 'sign-up-sheets') : __('Sign-up Sheets', 'sign-up-sheets');
    211212    }
    212213
     
    278279        $sheetArray = $this->objectToArray($this->getData());
    279280        $this->cleanBeforeCopy($sheetArray);
    280         $sheetArray['post_title'] .= esc_html__(' (Copy)', 'fdsus');
     281        $sheetArray['post_title'] .= esc_html__(' (Copy)', 'sign-up-sheets');
    281282
    282283        // Copy sheet
     
    507508
    508509    /**
    509      * Should the phone be displayed on the sheet?
     510     * Should the phone be required on the sheet?
    510511     *
    511512     * @return bool
     
    513514    public function isPhoneRequired()
    514515    {
     516        if (!$this->showPhone()) {
     517            return false;
     518        }
    515519        return (isset($this->dlssus_optional_phone) && $this->dlssus_optional_phone === 'false')
    516520            || (empty($this->dlssus_optional_phone) && get_option('dls_sus_optional_phone') !== 'true');
     
    518522
    519523    /**
    520      * Should the address be displayed on the sheet?
     524     * Should the address be required on the sheet?
    521525     *
    522526     * @return bool
     
    524528    public function isAddressRequired()
    525529    {
     530        if (!$this->showAddress()) {
     531            return false;
     532        }
    526533        return (isset($this->dlssus_optional_address) && $this->dlssus_optional_address === 'false')
    527534            || (empty($this->dlssus_optional_address) && get_option('dls_sus_optional_address') !== 'true');
     535    }
     536
     537    /**
     538     * Should the email be displayed on the sheet?
     539     *
     540     * @return bool
     541     */
     542    public function isEmailRequired()
     543    {
     544        if (!$this->showEmail()) {
     545            return false;
     546        }
     547        return (isset($this->fdsus_optional_email) && $this->fdsus_optional_email === 'false')
     548            || (empty($this->fdsus_optional_email) && get_option('fdsus_optional_email') !== 'true');
    528549    }
    529550
  • sign-up-sheets/trunk/model/sheet-collection.php

    r3234219 r3234235  
    1313
    1414if (Id::isPro()) {
    15     class SheetCollectionParent extends Pro\SheetCollection {}
     15    class SheetCollectionParent extends \FDSUSPRO\Model\Pro\SheetCollection {}
    1616} else {
    1717    class SheetCollectionParent extends Base {}
  • sign-up-sheets/trunk/model/sheet.php

    r3234219 r3234235  
    1010
    1111if (Id::isPro()) {
    12     class SheetParent extends Pro\Sheet {}
     12    class SheetParent extends \FDSUSPRO\Model\Pro\Sheet {}
    1313} else {
    1414    class SheetParent extends SheetBase {}
  • sign-up-sheets/trunk/model/signup-collection.php

    r3234219 r3234235  
    1313
    1414if (Id::isPro()) {
    15     class SignupCollectionParent extends Pro\SignupCollection {}
     15    class SignupCollectionParent extends \FDSUSPRO\Model\Pro\SignupCollection {}
    1616} else {
    1717    class SignupCollectionParent extends Base {}
  • sign-up-sheets/trunk/model/signup-form-initial-values.php

    r3234219 r3234235  
    1515/**
    1616 * Class SignupFormInitialValues
    17  *
    18  * @package FDSUS\Model
    1917 */
    2018class SignupFormInitialValues
     
    9189
    9290        // If not set, but logged in, pull from user
    93         if (!is_admin() && !Settings::isUserAutopopulateDisabled()) {
     91        if (!$this->signup && !is_admin() && !Settings::isUserAutopopulateDisabled()) {
    9492            $currentUser = wp_get_current_user();
    9593            if (($currentUser instanceof WP_User)) {
  • sign-up-sheets/trunk/model/signup.php

    r3234219 r3234235  
    1515
    1616if (Id::isPro()) {
    17     class SignupParent extends Pro\Signup {}
     17    class SignupParent extends \FDSUSPRO\Model\Pro\Signup {}
    1818} else {
    1919    class SignupParent extends SignupBase {}
     
    3838 * @property string dlssus_removal_token
    3939 * @property string dlssus_reminded
    40  *
    41  * @package FDSUS\Model
    4240 */
    4341class Signup extends SignupParent
     
    103101    public static function getName($singular = false)
    104102    {
    105         return $singular ? __('Sign-up', 'fdsus') : __('Sign-ups', 'fdsus');
     103        return $singular ? __('Sign-up', 'sign-up-sheets') : __('Sign-ups', 'sign-up-sheets');
    106104    }
    107105
     
    148146                sprintf(
    149147                    /* translators: %1$s is replaced with task title and %2$s is replaced with optional detailed errors if enabled */
    150                     esc_html__('Error adding signup for %1$s.  All spots are filled. %2$s', 'fdsus'),
     148                    esc_html__('Error adding signup for %1$s.  All spots are filled. %2$s', 'sign-up-sheets'),
    151149                    '<em>' . wp_kses_post($task->post_title) . '</em>',
    152150                    Settings::isDetailedErrors()
     
    180178            && empty($fields['double_signup'])
    181179            && $sheet->showEmail()
     180            && !empty($fields['signup_email'])
    182181            && $task->isEmailOnTask($fields['signup_email'])
    183182        ) {
    184             $msg = esc_html__('You have already signed up for this task.  Do you want to sign up again?', 'fdsus') . '
     183            $msg = esc_html__('You have already signed up for this task.  Do you want to sign up again?', 'sign-up-sheets') . '
    185184                <form method="post" action="' . esc_url($this->getCurrentUrl(true) . Settings::maybeGetSignUpLinkHash($sheet->ID)) . '">';
    186185
     
    207206                    <input type="hidden" name="double_signup" value="1" />
    208207                    <input type="hidden" name="action" value="signup-confirmed" />
    209                     <input type="submit" name="Submit" class="button-primary wp-block-button__link wp-element-button dls-sus-double-signup-confirm-button" value="' . esc_html__('Yes, sign me up', 'fdsus') . '" />
    210                     <a href="' . esc_url(fdsus_back_to_sheet_url($task->ID)) . '">' . esc_html__('No, thanks', 'fdsus') . '</a>
     208                    <input type="submit" name="Submit" class="button-primary wp-block-button__link wp-element-button dls-sus-double-signup-confirm-button" value="' . esc_html__('Yes, sign me up', 'sign-up-sheets') . '" />
     209                    <a href="' . esc_url(fdsus_back_to_sheet_url($task->ID)) . '">' . esc_html__('No, thanks', 'sign-up-sheets') . '</a>
    211210                </form>
    212211            ';
     
    235234                sprintf(
    236235                    /* translators: %s is replaced with the sign-up email */
    237                     esc_html__('Error adding the sign-up for "%s"', 'fdsus'), esc_attr($cleanFields['email']))
     236                    esc_html__('Error adding the sign-up for "%s"', 'sign-up-sheets'), esc_attr($cleanFields['email']))
    238237                . (($this->detailed_errors === true) ? '.. ' . print_r($signupId->get_error_message(), true) : '')
    239238            );
     
    342341                sprintf(
    343342                /* translators: %s is replaced with the sign-up email */
    344                     esc_html__('Error adding the sign-up for "%s"', 'fdsus'), esc_attr($cleanFields['email'])
     343                    esc_html__('Error adding the sign-up for "%s"', 'sign-up-sheets'), esc_attr($cleanFields['email'])
    345344                )
    346345                . (($this->detailed_errors === true && is_wp_error($signupId)) ? '.. ' . print_r($signupId->get_error_message(), true) : '')
     
    511510        $missingFieldNames = array();
    512511        if (empty($fields['signup_firstname'])) {
    513             $missingFieldNames[] = esc_html__('First Name', 'fdsus');
     512            $missingFieldNames['firstname'] = esc_html__('First Name', 'sign-up-sheets');
    514513        }
    515514        if (empty($fields['signup_lastname'])) {
    516             $missingFieldNames[] = esc_html__('Last Name', 'fdsus');
    517         }
    518         if ($sheet->showEmail() && empty($fields['signup_email'])) {
    519             $missingFieldNames[] = esc_html__('E-mail', 'fdsus');
    520         }
    521         if ($sheet->isPhoneRequired() && $sheet->showPhone() && empty($fields['signup_phone'])) {
    522             $missingFieldNames[] = esc_html__('Phone', 'fdsus');
    523         }
    524         if ($sheet->isAddressRequired() && $sheet->showAddress()
     515            $missingFieldNames['lastname'] = esc_html__('Last Name', 'sign-up-sheets');
     516        }
     517        if ($sheet->isEmailRequired() && empty($fields['signup_email'])) {
     518            $missingFieldNames['email'] = esc_html__('E-mail', 'sign-up-sheets');
     519        }
     520        if ($sheet->isPhoneRequired() && empty($fields['signup_phone'])) {
     521            $missingFieldNames['phone'] = esc_html__('Phone', 'sign-up-sheets');
     522        }
     523        if ($sheet->isAddressRequired()
    525524            && (empty($fields['signup_address'])
    526525                || empty($fields['signup_city'])
     
    528527                || empty($fields['signup_zip']))
    529528        ) {
    530             $missingFieldNames[] = esc_html__('Address', 'fdsus');
     529            $missingFieldNames[] = esc_html__('Address', 'sign-up-sheets');
    531530        }
    532531
     
    536535         * @param array      $missingFieldNames
    537536         * @param SheetModel $sheet
     537         * @param array      $fields
    538538         *
    539539         * @return array
    540540         * @since 2.2
    541541         */
    542         $missingFieldNames = apply_filters('fdsus_sign_up_form_errors_required_fields', $missingFieldNames, $sheet);
    543 
    544         // TODO CAPTCHA - move to Captcha class
    545         if (!is_admin() && !Settings::isAllCaptchaDisabled() && !Settings::isRecaptchaEnabled() && empty($fields['spam_check'])) {
    546             $missingFieldNames[] = esc_html__('Math Question', 'fdsus');
    547         }
     542        $missingFieldNames = apply_filters('fdsus_sign_up_form_errors_required_fields', $missingFieldNames, $sheet, $fields);
    548543
    549544        return $missingFieldNames ? $missingFieldNames : true;
  • sign-up-sheets/trunk/model/task-base.php

    r3234219 r3234235  
    2424 * @property string dlssus_task_row_type
    2525 * @property bool   dlssus_is_active
    26  *
    27  * @package FDSUS\Model
    2826 */
    2927class TaskBase extends Base
     
    9290    public static function getName($singular = false)
    9391    {
    94         return $singular ? __('Task', 'fdsus') : __('Tasks', 'fdsus');
     92        return $singular ? __('Task', 'sign-up-sheets') : __('Tasks', 'sign-up-sheets');
    9593    }
    9694
     
    155153                sprintf(
    156154                    /* translators: %s is replaced with the task title */
    157                     esc_html__('Error adding the task "%s"', 'fdsus'),
     155                    esc_html__('Error adding the task "%s"', 'sign-up-sheets'),
    158156                    $cleanFields['title']
    159157                )
     
    190188        foreach ($meta as $k => $v) {
    191189            if (update_post_meta($taskId, $k, maybe_unserialize($v)) === false) {
    192                 return new WP_Error('add_task_additional_err', esc_html__('Error adding additional fields to task.', 'fdsus'));
     190                return new WP_Error('add_task_additional_err', esc_html__('Error adding additional fields to task.', 'sign-up-sheets'));
    193191            }
    194192            $i++;
     
    239237                sprintf(
    240238                    /* translators: %s is replaced with the task title */
    241                     esc_html__('Error updating the task "%s"', 'fdsus'),
     239                    esc_html__('Error updating the task "%s"', 'sign-up-sheets'),
    242240                    $cleanFields['title']
    243241                ) . (Settings::isDetailedErrors() ? '.. ' . print_r($task_id->get_error_message(), true) : '')
     
    283281        $result = wp_delete_post($id, true);
    284282        if ($result === false) {
    285             return new WP_Error('task_delete_err', esc_html__('Error deleting task.', 'fdsus'));
     283            return new WP_Error('task_delete_err', esc_html__('Error deleting task.', 'sign-up-sheets'));
    286284        }
    287285
     
    495493    public function getSignupLink($linkText = '') {
    496494        if (empty($linkText)) {
    497             $linkText = esc_html__('Sign up &raquo;', 'fdsus');
     495            $linkText = esc_html__('Sign up &raquo;', 'sign-up-sheets');
    498496        }
    499497
  • sign-up-sheets/trunk/model/task-table.php

    r3234219 r3234235  
    2020    protected $sheet;
    2121
     22    /** @var array */
     23    public $config;
     24
    2225    /**
    2326     * Constructor
     
    2528     * @param SheetModel $sheet
    2629     */
    27     public function __construct($sheet)
     30    public function __construct($sheet, $config)
    2831    {
    2932        $this->sheet = $sheet;
     33        $this->config = $config;
    3034
    3135        return $this;
     
    7377         * @param SheetModel $sheet
    7478         * @param string     $class
     79         * @param array      $config
    7580         *
    7681         * @return string
    7782         * @since 2.2
    7883         */
    79         $slug = apply_filters('fdsus_tasktable_task_cell_slug', $slug, $value, $this->sheet, $class);
     84        $slug = apply_filters('fdsus_tasktable_task_cell_slug', $slug, $value, $this->sheet, $class, $this->config);
    8085
    8186        /**
     
    113118         * @param SheetModel $sheet
    114119         * @param string     $class
     120         * @param array      $config
    115121         *
    116122         * @return string
    117123         * @since 2.2
    118124         */
    119         $slug = apply_filters('fdsus_tasktable_header_cell_slug', $slug, $value, $this->sheet, $class);
     125        $slug = apply_filters('fdsus_tasktable_header_cell_slug', $slug, $value, $this->sheet, $class, $this->config);
    120126
    121127        if ($slug !== false) {
  • sign-up-sheets/trunk/model/task.php

    r3234219 r3234235  
    1111
    1212if (Id::isPro()) {
    13     class TaskParent extends Pro\Task {}
     13    class TaskParent extends \FDSUSPRO\Model\Pro\Task {}
    1414} else {
    1515    class TaskParent extends TaskBase {}
  • sign-up-sheets/trunk/package.json

    r3234219 r3234235  
    11{
    22    "name": "sign-up-sheets",
    3     "version": "2.2.1",
     3    "version": "2.3.0",
    44    "description": "An online sign-up sheet manager where your users/volunteers can sign up for tasks.",
    55    "author": "fetchdesigns",
  • sign-up-sheets/trunk/readme.txt

    r3234219 r3234235  
    33Tags: sign up, volunteer, non-profit, signup, sign-up
    44Tested up to: 6.7
    5 Stable tag: 2.2.14
     5Stable tag: 2.3.0.1
    66License: GPLv2 or later
    77
     
    115115== Upgrade Notice ==
    116116
     117= 2.3.0.1 | 2025-02-02 =
     118* Fixed issue where base version wouldn't load on its own.
     119
     120= 2.3.0 | 2025-02-02 =
     121* Added ability to mark email field as optional.
     122* Updated translation textdomain to better match WordPress standard of 'sign-up-sheets'. [⚠️Breaking Change]
     123* Updated .sr-only class to use .screen-reader-text to be more consistent with WP core.
     124* Fixed missing escaping around translations on tasks table.
     125* Fixed sheets with the hidden email set so that the column doesn't show up in the admin and status email task tables.
     126* Fixed password-protected sheets to prevent displaying sheet content prior to password being entered.
     127* Fixed WP 6.7 notice being thrown of "Function _load_textdomain_just_in_time was called incorrectly."
     128* Fixed bug preventing editing of new tasks on mobile devices.
     129
    117130= 2.2.14 | 2024-10-07 =
    118131* Added setting to clear cache on specific post IDs when a sign-up occurs.
     
    179192
    180193== Changelog ==
     194
     195= 2.3.0.1 | 2025-02-02 =
     196* Fixed issue where base version wouldn't load on its own.
     197
     198= 2.3.0 | 2025-02-02 =
     199* Added ability to mark email field as optional.
     200* Updated translation textdomain to better match WordPress standard of 'sign-up-sheets'. [⚠️Breaking Change]
     201* Updated .sr-only class to use .screen-reader-text to be more consistent with WP core.
     202* Fixed missing escaping around translations on tasks table.
     203* Fixed sheets with the hidden email set so that the column doesn't show up in the admin and status email task tables.
     204* Fixed password-protected sheets to prevent displaying sheet content prior to password being entered.
     205* Fixed WP 6.7 notice being thrown of "Function _load_textdomain_just_in_time was called incorrectly."
     206* Fixed bug preventing editing of new tasks on mobile devices.
    181207
    182208= 2.2.14 | 2024-10-07 =
  • sign-up-sheets/trunk/sign-up-sheets.php

    r3234219 r3234235  
    44Plugin URI: https://www.fetchdesigns.com/sign-up-sheets-wordpress-plugin/
    55Description: An online sign-up sheet manager where your users/volunteers can sign up for tasks
    6 Version: 2.2.14
     6Version: 2.3.0.1
    77Requires PHP: 5.5
    88Requires at least: 5.5
    99Author: Fetch Designs
    1010Author URI: https://www.fetchdesigns.com/
    11 Text Domain: fdsus
    12 Domain Path: /languages/
     11Text Domain: sign-up-sheets
     12Domain Path: /languages
    1313License: GPL2
    1414*/
     
    3030*/
    3131
     32if (!defined('FDSUS_FREE_PLUGIN_DIR_PATH')) {
     33    define('FDSUS_FREE_PLUGIN_DIR_PATH', plugin_dir_path(__FILE__));
     34}
     35
     36if (!defined('FDSUS_FREE_PLUGIN_BASENAME')) {
     37    define('FDSUS_FREE_PLUGIN_BASENAME', plugin_basename(__FILE__));
     38}
     39
    3240require_once dirname(__FILE__) . DIRECTORY_SEPARATOR . 'main.php';
  • sign-up-sheets/trunk/src/block.json

    r3234219 r3234235  
    33    "apiVersion": 2,
    44    "name": "sign-up-sheets/sheet",
    5     "version": "2.2.11",
     5    "version": "2.3.0",
    66    "title": "Sign-up Sheets",
    77    "category": "widgets",
     
    1111        "html": false
    1212    },
    13     "textdomain": "fdsus",
     13    "textdomain": "sign-up-sheets",
    1414    "editorScript": "file:./index.js",
    1515    "editorStyle": "file:./index.css",
  • sign-up-sheets/trunk/template-tags.php

    r3234219 r3234235  
    522522    }
    523523}
     524
     525if (!function_exists('fdsus_scode_user_sign_ups_actions')) {
     526    /**
     527     * Call do_action for customizing the user sign-ups after the additional fields output
     528     *
     529     * @param array $row
     530     *
     531     * @return void
     532     */
     533    function fdsus_scode_user_sign_ups_actions($row)
     534    {
     535        /**
     536         * [user_sign_ups] shortcode - after signup name is output
     537         *
     538         * @param SheetModel  $sheet
     539         * @param TaskModel   $task
     540         * @param SignupModel $signup
     541         *
     542         * @since todo user-signups
     543         */
     544        do_action('fdsus_scode_user_sign_ups_actions', $row['sheet'], $row['task'], $row['signup']);
     545    }
     546}
  • sign-up-sheets/trunk/theme-files/archive-dlssus_sheet.php

    r3234219 r3234235  
    3232                <?php echo do_shortcode('[sign_up_sheet]'); ?>
    3333            <?php else: ?>
    34                 <p><?php esc_attr_e('No sign-up sheets found.', 'fdsus'); ?></p>
     34                <p><?php esc_attr_e('No sign-up sheets found.', 'sign-up-sheets'); ?></p>
    3535            <?php endif; ?>
    3636
  • sign-up-sheets/trunk/theme-files/content-dlssus_sheet.php

    r3234219 r3234235  
    1717<div class="<?php echo esc_attr(fdsus_template_classes_sign_up_sheet()) ?>" id="<?php echo get_the_ID() ? 'dls-sus-sheet-' . get_the_ID() : '' ?>">
    1818
    19     <h3><?php esc_attr_e('Sign up below...', 'fdsus'); ?></h3>
     19    <h3><?php esc_attr_e('Sign up below...', 'sign-up-sheets'); ?></h3>
    2020
    2121    <?php dlssus_the_tasks_table(); ?>
  • sign-up-sheets/trunk/theme-files/fdsus/parts/captcha-simple.php

    r3234219 r3234235  
    1414<p>
    1515    <label for="spam_check" class="spam_check">
    16         <?php esc_html_e('Answer the following: 7 + 1 = __', 'fdsus'); ?>
     16        <?php esc_html_e('Answer the following: 7 + 1 = __', 'sign-up-sheets'); ?>
    1717        <span class="dls-sus-required-icon">*</span>
    1818    </label>
  • sign-up-sheets/trunk/theme-files/fdsus/sheet-list.php

    r3234219 r3234235  
    2323<?php if (empty($args['sheets'])) : ?>
    2424
    25     <p><?php esc_html_e('No sheets available at this time.', 'fdsus'); ?></p>
     25    <p><?php esc_html_e('No sheets available at this time.', 'sign-up-sheets'); ?></p>
    2626
    2727<?php else: ?>
     
    3232        <thead>
    3333            <tr>
    34                 <th class="column-title"><?php esc_html_e('Title', 'fdsus'); ?></th>
    35                 <th class="column-date"><?php esc_html_e('Date', 'fdsus'); ?></th>
    36                 <th class="column-open_spots"><?php esc_html_e('Open Spots', 'fdsus'); ?></th>
     34                <th class="column-title"><?php esc_html_e('Title', 'sign-up-sheets'); ?></th>
     35                <th class="column-date"><?php esc_html_e('Date', 'sign-up-sheets'); ?></th>
     36                <th class="column-open_spots"><?php esc_html_e('Open Spots', 'sign-up-sheets'); ?></th>
    3737                <th class="column-view_link">&nbsp;</th>
    3838            </tr>
     
    4545                $endDate = null;
    4646                if (empty($sheet->dlssus_end_date)) {
    47                     $displayDate = esc_html__('N/A', 'fdsus');
     47                    $displayDate = esc_html__('N/A', 'sign-up-sheets');
    4848                } else {
    4949                    $displayDate = (($sheet->dlssus_start_date == $sheet->dlssus_end_date) ? null : date(get_option('date_format'), strtotime($sheet->dlssus_start_date)) . ' - ');
     
    6161                    <td class="column-view_link">
    6262                        <?php if ($openSpots > 0): ?>
    63                             <a href="<?php echo esc_url(get_the_permalink($sheet->ID)); ?>" class="fdsus-signup-cta"><?php esc_html_e('View &amp; sign-up', 'fdsus'); ?><span class="sr-only"> <?php
     63                            <a href="<?php echo esc_url(get_the_permalink($sheet->ID)); ?>" class="fdsus-signup-cta"><?php esc_html_e('View &amp; sign-up', 'sign-up-sheets'); ?><span class="screen-reader-text"> <?php
    6464                                /* translators: %s is replaced with the sheet title */
    65                                 echo esc_html(sprintf(__('for %s', 'fdsus'), $sheet->post_title)); ?></span></a>
     65                                echo esc_html(sprintf(__('for %s', 'sign-up-sheets'), $sheet->post_title)); ?></span></a>
    6666                        <?php else: ?>
    67                             <?php esc_html_e('&#10004; Filled', 'fdsus'); ?>
     67                            <?php esc_html_e('&#10004; Filled', 'sign-up-sheets'); ?>
    6868                        <?php endif; ?>
    6969                    </td>
  • sign-up-sheets/trunk/theme-files/fdsus/sheet-none.php

    r3234219 r3234235  
    1313?>
    1414
    15 <p><?php esc_attr_e('Sign-up sheet not found.', 'fdsus'); ?></p>
     15<p><?php esc_attr_e('Sign-up sheet not found.', 'sign-up-sheets'); ?></p>
  • sign-up-sheets/trunk/theme-files/fdsus/sheet.php

    r3234219 r3234235  
    2020    <p class="dls-sus-backlink">
    2121        <a href="<?php echo esc_url(remove_query_arg(array('sheet_id', 'task_id'), $_SERVER['REQUEST_URI'])); ?>">
    22             <?php esc_attr_e('&laquo; View all', 'fdsus'); ?>
     22            <?php esc_attr_e('&laquo; View all', 'sign-up-sheets'); ?>
    2323        </a>
    2424    </p>
  • sign-up-sheets/trunk/theme-files/fdsus/sign-up-form-header.php

    r3234219 r3234235  
    1818
    1919if (!is_admin()): ?>
    20     <h3><?php esc_html_e('Sign-up below', 'fdsus'); ?></h3>
     20    <h3><?php esc_html_e('Sign-up below', 'sign-up-sheets'); ?></h3>
    2121    <p>
    22         <?php esc_html_e('You are signing up for...', 'fdsus'); ?>
     22        <?php esc_html_e('You are signing up for...', 'sign-up-sheets'); ?>
    2323        <em class="dls-sus-task-title"><?php echo wp_kses_post($signup_titles_str); ?></em>
    2424    </p>
  • sign-up-sheets/trunk/theme-files/fdsus/sign-up-form.php

    r3234219 r3234235  
    99 * @see         https://www.fetchdesigns.com/sign-up-sheets-pro-overriding-templates-in-your-theme/
    1010 * @since       2.2 (plugin version)
    11  * @version     1.2.0 (template file version)
     11 * @version     1.3.0 (template file version)
    1212 */
    1313
     
    3131    <p>
    3232        <label for="signup_firstname" class="signup_firstname">
    33             <?php esc_html_e('First Name', 'fdsus'); ?>
     33            <?php esc_html_e('First Name', 'sign-up-sheets'); ?>
    3434            <span class="dls-sus-required-icon">*</span>
    3535        </label>
     
    4141    <p>
    4242        <label for="signup_lastname" class="signup_lastname">
    43             <?php esc_html_e('Last Name', 'fdsus'); ?>
     43            <?php esc_html_e('Last Name', 'sign-up-sheets'); ?>
    4444            <span class="dls-sus-required-icon">*</span>
    4545        </label>
     
    5252        <p>
    5353            <label for="signup_email" class="signup_email">
    54                 <?php esc_html_e('E-mail', 'fdsus'); ?>
    55                 <span class="dls-sus-required-icon">*</span>
     54                <?php esc_html_e('E-mail', 'sign-up-sheets'); ?>
     55                <?php if ($sheet->isEmailRequired()): ?>
     56                    <span class="dls-sus-required-icon">*</span>
     57                <?php endif; ?>
    5658            </label>
    5759            <input type="email" id="signup_email" class="signup_email" name="signup_email"
    58                    maxlength="100" required aria-required="true" autocomplete="email"
     60                   maxlength="100" <?php if ($sheet->isEmailRequired()) echo 'required aria-required="true"'; ?> autocomplete="email"
    5961                   value="<?php echo esc_attr($initial['email']); ?>"/>
    6062        </p>
     
    6870        <p>
    6971            <label for="signup_phone" class="signup_phone">
    70                 <?php esc_html_e('Phone', 'fdsus'); ?>
     72                <?php esc_html_e('Phone', 'sign-up-sheets'); ?>
    7173                <?php if ($sheet->isPhoneRequired()): ?>
    7274                    <span class="dls-sus-required-icon">*</span>
     
    8385        <p>
    8486            <label for="signup_address" class="signup_address">
    85                 <?php esc_html_e('Address', 'fdsus'); ?>
     87                <?php esc_html_e('Address', 'sign-up-sheets'); ?>
    8688                <?php if ($sheet->isAddressRequired()): ?>
    8789                    <span class="dls-sus-required-icon">*</span>
     
    9597        <p class="dls-sus-city">
    9698            <label for="signup_city" class="signup_city">
    97                 <?php esc_html_e('City', 'fdsus'); ?>
     99                <?php esc_html_e('City', 'sign-up-sheets'); ?>
    98100                <?php if ($sheet->isAddressRequired()): ?>
    99101                    <span class="dls-sus-required-icon">*</span>
     
    107109        <p class="dls-sus-state">
    108110            <label for="signup_state" class="signup_state">
    109                 <?php esc_html_e('State', 'fdsus'); ?>
     111                <?php esc_html_e('State', 'sign-up-sheets'); ?>
    110112                <?php if ($sheet->isAddressRequired()): ?>
    111113                    <span class="dls-sus-required-icon">*</span>
     
    124126        <p class="dls-sus-zip">
    125127            <label for="signup_zip" class="signup_zip">
    126                 <?php esc_html_e('Zip', 'fdsus'); ?>
     128                <?php esc_html_e('Zip', 'sign-up-sheets'); ?>
    127129                <?php if ($sheet->isAddressRequired()): ?>
    128130                    <span class="dls-sus-required-icon">*</span>
     
    143145    ?>
    144146
    145     <p><span class="dls-sus-required-icon">*</span> = <?php esc_html_e('required', 'fdsus'); ?></p>
     147    <p><span class="dls-sus-required-icon">*</span> = <?php esc_html_e('required', 'sign-up-sheets'); ?></p>
    146148
    147149    <p class="submit">
     
    159161               value="<?php echo esc_html($submit_button_text); ?>"/>
    160162        <?php if (!is_admin() && !empty($go_back_url)): ?>
    161             <?php esc_html_e('or', 'fdsus'); ?>
     163            <?php esc_html_e('or', 'sign-up-sheets'); ?>
    162164            <a href="<?php echo esc_url($go_back_url); ?>" class="dls-sus-backlink-from-task">
    163                 <?php esc_html_e('&laquo; go back to the Sign-Up Sheet', 'fdsus'); ?>
     165                <?php esc_html_e('&laquo; go back to the Sign-Up Sheet', 'sign-up-sheets'); ?>
    164166            </a>
    165167        <?php endif; ?>
  • sign-up-sheets/trunk/theme-files/fdsus/user_sign_ups.php

    r3234219 r3234235  
    2525    <thead>
    2626    <tr>
    27         <th class="fdssus-column-date"><?php echo __('Date Added', 'fdsus') ?></th>
     27        <th class="fdssus-column-date"><?php esc_html_e('Date Added', 'sign-up-sheets') ?></th>
    2828        <th class="fdssus-column-sheet-task">
    2929            <?php echo esc_html($taskTitleLabel) ?>
    3030        </th>
    31         <th class="fdssus-column-signup"><?php echo __('Sign-up Details', 'fdsus') ?></th>
     31        <th class="fdssus-column-signup"><?php esc_html_e('Sign-up Details', 'sign-up-sheets') ?></th>
    3232    </tr>
    3333    </thead>
     
    3838                <?php echo $row['date_added']
    3939                    ? date(get_option('date_format'), strtotime($row['date_added']))
    40                     : __('N/A', 'fdsus') ?>
     40                    : esc_html__('N/A', 'sign-up-sheets') ?>
    4141            </td>
    4242            <td class="fdsus-col-sheet">
     
    8888
    8989                <?php if ($row['sheet']->isExpired() || $row['task']->isExpired()): ?>
    90                     <span class="fdsus-signups-closed"><?php _e('Sign-ups Closed', 'fdsus') ?></span>
     90                    <span class="fdsus-signups-closed"><?php _e('Sign-ups Closed', 'sign-up-sheets') ?></span>
    9191                <?php endif; ?>
    9292            </td>
Note: See TracChangeset for help on using the changeset viewer.