Completed
Branch BUG/fix-template-pack-switchin... (597ab8)
by
unknown
08:41 queued 33s
created
admin_pages/events/Events_Admin_Page_Init.core.php 2 patches
Indentation   +36 added lines, -36 removed lines patch added patch discarded remove patch
@@ -14,42 +14,42 @@
 block discarded – undo
14 14
 class Events_Admin_Page_Init extends EE_Admin_Page_CPT_Init
15 15
 {
16 16
 
17
-    public function __construct()
18
-    {
19
-        /**
20
-         * define some events related constants but only if not defined (need to check because unit tests
21
-         *  may load)
22
-         */
23
-        if (! defined('EVENTS_PG_SLUG')) {
24
-            define('EVENTS_PG_SLUG', 'espresso_events');
25
-            define('EVENTS_LABEL', __('Events', 'event_espresso'));
26
-            define('EVENTS_ADMIN', EE_ADMIN_PAGES . 'events' . DS);
27
-            define('EVENTS_ADMIN_URL', admin_url('admin.php?page=' . EVENTS_PG_SLUG));
28
-            define('EVENTS_TEMPLATE_PATH', EVENTS_ADMIN . 'templates' . DS);
29
-            define('EVENTS_ASSETS_URL', EE_ADMIN_PAGES_URL . 'events/assets/');
30
-        }
31
-        parent::__construct();
32
-    }
17
+	public function __construct()
18
+	{
19
+		/**
20
+		 * define some events related constants but only if not defined (need to check because unit tests
21
+		 *  may load)
22
+		 */
23
+		if (! defined('EVENTS_PG_SLUG')) {
24
+			define('EVENTS_PG_SLUG', 'espresso_events');
25
+			define('EVENTS_LABEL', __('Events', 'event_espresso'));
26
+			define('EVENTS_ADMIN', EE_ADMIN_PAGES . 'events' . DS);
27
+			define('EVENTS_ADMIN_URL', admin_url('admin.php?page=' . EVENTS_PG_SLUG));
28
+			define('EVENTS_TEMPLATE_PATH', EVENTS_ADMIN . 'templates' . DS);
29
+			define('EVENTS_ASSETS_URL', EE_ADMIN_PAGES_URL . 'events/assets/');
30
+		}
31
+		parent::__construct();
32
+	}
33 33
 
34
-    protected function _set_init_properties()
35
-    {
36
-        $this->label = __('Event Espresso - Event Details', 'event_espresso');
37
-    }
34
+	protected function _set_init_properties()
35
+	{
36
+		$this->label = __('Event Espresso - Event Details', 'event_espresso');
37
+	}
38 38
 
39
-    protected function _set_menu_map()
40
-    {
41
-        $this->_menu_map = new EE_Admin_Page_Main_Menu(
42
-            array(
43
-                'menu_group'      => 'main',
44
-                'menu_order'      => 10,
45
-                'subtitle'        => __('Events', 'event_espresso'),
46
-                'show_on_menu'    => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
47
-                'parent_slug'     => 'espresso_events',
48
-                'menu_slug'       => 'espresso_events',
49
-                'menu_label'      => __('Event Espresso', 'event_espresso'),
50
-                'capability'      => 'ee_read_events',
51
-                'admin_init_page' => $this,
52
-            )
53
-        );
54
-    }
39
+	protected function _set_menu_map()
40
+	{
41
+		$this->_menu_map = new EE_Admin_Page_Main_Menu(
42
+			array(
43
+				'menu_group'      => 'main',
44
+				'menu_order'      => 10,
45
+				'subtitle'        => __('Events', 'event_espresso'),
46
+				'show_on_menu'    => EE_Admin_Page_Menu_Map::BLOG_ADMIN_ONLY,
47
+				'parent_slug'     => 'espresso_events',
48
+				'menu_slug'       => 'espresso_events',
49
+				'menu_label'      => __('Event Espresso', 'event_espresso'),
50
+				'capability'      => 'ee_read_events',
51
+				'admin_init_page' => $this,
52
+			)
53
+		);
54
+	}
55 55
 }
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -20,13 +20,13 @@
 block discarded – undo
20 20
          * define some events related constants but only if not defined (need to check because unit tests
21 21
          *  may load)
22 22
          */
23
-        if (! defined('EVENTS_PG_SLUG')) {
23
+        if ( ! defined('EVENTS_PG_SLUG')) {
24 24
             define('EVENTS_PG_SLUG', 'espresso_events');
25 25
             define('EVENTS_LABEL', __('Events', 'event_espresso'));
26
-            define('EVENTS_ADMIN', EE_ADMIN_PAGES . 'events' . DS);
27
-            define('EVENTS_ADMIN_URL', admin_url('admin.php?page=' . EVENTS_PG_SLUG));
28
-            define('EVENTS_TEMPLATE_PATH', EVENTS_ADMIN . 'templates' . DS);
29
-            define('EVENTS_ASSETS_URL', EE_ADMIN_PAGES_URL . 'events/assets/');
26
+            define('EVENTS_ADMIN', EE_ADMIN_PAGES.'events'.DS);
27
+            define('EVENTS_ADMIN_URL', admin_url('admin.php?page='.EVENTS_PG_SLUG));
28
+            define('EVENTS_TEMPLATE_PATH', EVENTS_ADMIN.'templates'.DS);
29
+            define('EVENTS_ASSETS_URL', EE_ADMIN_PAGES_URL.'events/assets/');
30 30
         }
31 31
         parent::__construct();
32 32
     }
Please login to merge, or discard this patch.
admin_pages/events/templates/event_publish_box_extras.template.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -2,9 +2,9 @@  discard block
 block discarded – undo
2 2
     <span class="dashicons dashicons-groups ee-icon-color-ee-green ee-icon-size-20"></span>
3 3
     <a href="<?php echo $view_approved_reg_url; ?>">
4 4
         <?php printf(
5
-            __('%s Registrations', 'event_espresso'),
6
-            EEH_Template::pretty_status(EEM_Registration::status_id_approved, false, 'sentence')
7
-        ); ?>
5
+			__('%s Registrations', 'event_espresso'),
6
+			EEH_Template::pretty_status(EEM_Registration::status_id_approved, false, 'sentence')
7
+		); ?>
8 8
     </a>:
9 9
     <?php echo $approved_regs; ?>
10 10
 </div>
@@ -12,9 +12,9 @@  discard block
 block discarded – undo
12 12
     <span class="dashicons dashicons-groups ee-icon-color-ee-blue ee-icon-size-20"></span>
13 13
     <a href="<?php echo $view_pending_payment_reg_url; ?>">
14 14
         <?php printf(
15
-            __('%s Registrations', 'event_espresso'),
16
-            EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, false, 'sentence')
17
-        ); ?>
15
+			__('%s Registrations', 'event_espresso'),
16
+			EEH_Template::pretty_status(EEM_Registration::status_id_pending_payment, false, 'sentence')
17
+		); ?>
18 18
     </a>:
19 19
     <?php echo $pending_payment_regs; ?>
20 20
 </div>
@@ -22,9 +22,9 @@  discard block
 block discarded – undo
22 22
     <span class="dashicons dashicons-groups ee-icon-color-ee-orange ee-icon-size-20"></span>
23 23
     <a href="<?php echo $view_not_approved_reg_url; ?>">
24 24
         <?php printf(
25
-            __('%s Registrations', 'event_espresso'),
26
-            EEH_Template::pretty_status(EEM_Registration::status_id_not_approved, false, 'sentence')
27
-        ); ?>
25
+			__('%s Registrations', 'event_espresso'),
26
+			EEH_Template::pretty_status(EEM_Registration::status_id_not_approved, false, 'sentence')
27
+		); ?>
28 28
     </a>:
29 29
     <?php echo $not_approved_regs; ?>
30 30
 </div>
Please login to merge, or discard this patch.
admin_pages/events/templates/event_settings.template.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -12,15 +12,15 @@
 block discarded – undo
12 12
             <td>
13 13
                 <p>
14 14
                     <?php echo EEH_Form_Fields::select_input(
15
-                        'default_reg_status',
16
-                        $reg_status_array,
17
-                        $default_reg_status
18
-                    ) ?></p>
15
+						'default_reg_status',
16
+						$reg_status_array,
17
+						$default_reg_status
18
+					) ?></p>
19 19
                 <p class="description">
20 20
                     <?php _e(
21
-                        'This setting allows you to preselect what the default registration status setting is when creating an event.  Note that changing this setting does NOT retroactively apply it to existing events.',
22
-                        'event_espresso'
23
-                    ); ?>
21
+						'This setting allows you to preselect what the default registration status setting is when creating an event.  Note that changing this setting does NOT retroactively apply it to existing events.',
22
+						'event_espresso'
23
+					); ?>
24 24
                 </p>
25 25
             </td>
26 26
         </tr>
Please login to merge, or discard this patch.
admin_pages/events/templates/event_tickets_metabox_ticket_row.template.php 1 patch
Braces   +10 added lines, -4 removed lines patch added patch discarded remove patch
@@ -32,9 +32,12 @@  discard block
 block discarded – undo
32 32
         <?php if (empty($disabled)) : ?>
33 33
             <input type="text" size="1" class="edit-price-PRC_amount ee-small-text-inp ee-inp-right"
34 34
                    name="edit_prices[<?php echo $ticketrow; ?>][1][PRC_amount]" value="<?php echo $PRC_amount; ?>">
35
-        <?php else : ?>
35
+        <?php else {
36
+	: ?>
36 37
             <input type="text" size="1" class="edit-price-PRC_amount ee-small-text-inp ee-inp-right"
37
-                   name="disabled_price_amount" value="<?php echo $PRC_amount; ?>"<?php echo $disabled; ?>>
38
+                   name="disabled_price_amount" value="<?php echo $PRC_amount;
39
+}
40
+?>"<?php echo $disabled; ?>>
38 41
             <input type="hidden" size="1" class="edit-price-PRC_amount ee-small-text-inp ee-inp-right"
39 42
                    name="edit_prices[<?php echo $ticketrow; ?>][1][PRC_amount]" value="<?php echo $PRC_amount; ?>">
40 43
         <?php endif; ?>
@@ -51,9 +54,12 @@  discard block
 block discarded – undo
51 54
             <input type="text" class="edit-ticket-TKT_qty ee-small-text-inp ee-inp-right"
52 55
                    name="<?php echo $edit_ticketrow_name; ?>[<?php echo $ticketrow; ?>][TKT_qty]"
53 56
                    value="<?php echo $TKT_qty; ?>">
54
-        <?php else : ?>
57
+        <?php else {
58
+	: ?>
55 59
             <input type="text" class="edit-ticket-TKT_qty ee-small-text-inp ee-inp-right" name="disabled_tkt_qty"
56
-                   value="<?php echo $TKT_qty; ?>"<?php echo $disabled; ?>>
60
+                   value="<?php echo $TKT_qty;
61
+}
62
+?>"<?php echo $disabled; ?>>
57 63
             <input type="hidden" class="edit-ticket-TKT_qty ee-small-text-inp ee-inp-right"
58 64
                    name="<?php echo $edit_ticketrow_name; ?>[<?php echo $ticketrow; ?>][TKT_qty]"
59 65
                    value="<?php echo $TKT_qty; ?>">
Please login to merge, or discard this patch.
admin_pages/events/templates/event_category_details.template.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -19,9 +19,9 @@  discard block
 block discarded – undo
19 19
                 <br/>
20 20
                 <p class="small-text">
21 21
                     <?php _e(
22
-                        'This is a default category so you can edit the label and the description but not the slug',
23
-                        'event_espresso'
24
-                    ); ?></p>
22
+						'This is a default category so you can edit the label and the description but not the slug',
23
+						'event_espresso'
24
+					); ?></p>
25 25
             <?php endif; ?>
26 26
         </td>
27 27
     </tr>
@@ -33,9 +33,9 @@  discard block
 block discarded – undo
33 33
             <br/>
34 34
             <p class="description">
35 35
                 <?php _e(
36
-                    'Categories are hierarchical.  You can change the parent for this category here.',
37
-                    'event_espresso'
38
-                ); ?></p>
36
+					'Categories are hierarchical.  You can change the parent for this category here.',
37
+					'event_espresso'
38
+				); ?></p>
39 39
         </td>
40 40
     </tr>
41 41
     <tr>
Please login to merge, or discard this patch.
admin_pages/events/templates/event_tickets_metabox_main.template.php 1 patch
Indentation   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -2,9 +2,9 @@  discard block
 block discarded – undo
2 2
     <div id="event-and-ticket-form-content">
3 3
         <h4 class="event-tickets-datetimes-title">
4 4
             <?php _e(
5
-                'Event Datetime',
6
-                'event_espresso'
7
-            ); ?></h4><?php echo $event_datetime_help_link; ?>
5
+				'Event Datetime',
6
+				'event_espresso'
7
+			); ?></h4><?php echo $event_datetime_help_link; ?>
8 8
         <div class="event-datetimes-container">
9 9
             <!-- these are the ids for the current displayed datetimes (on create new this is blank -->
10 10
             <input type="hidden" name="datetime_IDs" id="datetime-IDs" value="<?php echo $existing_datetime_ids; ?>">
@@ -46,8 +46,8 @@  discard block
 block discarded – undo
46 46
                         </td>
47 47
                         <td class="event-datetime-column reg-limit-column">
48 48
                             <?php
49
-                            $reg_limit = $time->get_pretty('DTT_reg_limit', 'input');
50
-                            ?>
49
+							$reg_limit = $time->get_pretty('DTT_reg_limit', 'input');
50
+							?>
51 51
                             <input type="text" name="edit_event_datetimes[1][DTT_reg_limit]"
52 52
                                    id="event-datetime-DTT_reg_limit-1"
53 53
                                    class="ee-small-text-inp ee-inp-right event-datetime-DTT_reg_limit"
@@ -55,9 +55,9 @@  discard block
 block discarded – undo
55 55
                         </td>
56 56
                         <td class="datetime-tickets-sold">
57 57
                             <?php printf(
58
-                                __('Tickets Sold: %s', 'event_espresso'),
59
-                                $time->get('DTT_sold')
60
-                            ); ?></td>
58
+								__('Tickets Sold: %s', 'event_espresso'),
59
+								$time->get('DTT_sold')
60
+							); ?></td>
61 61
                     </tr>
62 62
                     </tbody>
63 63
                 </table>
@@ -69,9 +69,9 @@  discard block
 block discarded – undo
69 69
         <div class="event-tickets-container">
70 70
             <h4 class="event-tickets-datetimes-title">
71 71
                 <?php _e(
72
-                    'Ticket Options',
73
-                    'event_espresso'
74
-                ); ?></h4><?php echo $ticket_options_help_link; ?><br/>
72
+					'Ticket Options',
73
+					'event_espresso'
74
+				); ?></h4><?php echo $ticket_options_help_link; ?><br/>
75 75
             <table class="add-new-ticket-table">
76 76
                 <thead>
77 77
                 <tr valign="top">
@@ -97,9 +97,9 @@  discard block
 block discarded – undo
97 97
             <div class="save-cancel-button-container">
98 98
                 <button class="button-secondary ee-create-button" data-context="ticket">
99 99
                     <?php _e(
100
-                        'Create New Ticket',
101
-                        'event_espresso'
102
-                    ); ?></button>
100
+						'Create New Ticket',
101
+						'event_espresso'
102
+					); ?></button>
103 103
             </div>
104 104
         </div> <!-- end .event-tickets-container -->
105 105
         <div style="clear:both"></div>
Please login to merge, or discard this patch.
admin_pages/events/templates/event_registration_options.template.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -6,9 +6,9 @@
 block discarded – undo
6 6
 <p>
7 7
     <label for="max-registrants">
8 8
         <?php _e(
9
-            'Maximum number of tickets allowed per order for this event: ',
10
-            'event_espresso'
11
-        ); ?></label>
9
+			'Maximum number of tickets allowed per order for this event: ',
10
+			'event_espresso'
11
+		); ?></label>
12 12
     <input class="ee-numeric" type="text" id="max-registrants" name="additional_limit"
13 13
            value="<?php echo $additional_limit; ?>" size="4"/>
14 14
 </p>
Please login to merge, or discard this patch.
admin_pages/registration_form/qtips/EE_Registration_Form_Tips.lib.php 1 patch
Indentation   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -15,39 +15,39 @@
 block discarded – undo
15 15
 {
16 16
 
17 17
 
18
-    protected function _set_tips_array()
19
-    {
20
-        $this->_qtipsa = array(
21
-            0 => array(
22
-                'content_id' => 'about-system-lock-icon',
23
-                'target'     => '.questions .ee-system-lock',
24
-                'content'    => __('This question is a system question and cannot be trashed', 'event_espresso'),
25
-                'options'    => array(), // defaults
26
-            ),
27
-            1 => array(
28
-                'content_id' => 'about-non-system-lock-icon',
29
-                'target'     => '.questions .ee-alternate-color',
30
-                'content'    => __(
31
-                    'This question has answers attached to it from registrations that have the question.  It cannot be permanently deleted.',
32
-                    'event_espresso'
33
-                ),
34
-                'options'    => array(),
35
-            ),
36
-            2 => array(
37
-                'content_id' => 'about-question-group-lock-icon',
38
-                'target'     => '.questiongroups .ee-system-lock',
39
-                'content'    => __('This question group is a system group and cannot be trashed', 'event_espresso'),
40
-                'options'    => array(),
41
-            ),
42
-            3 => array(
43
-                'content_id' => 'about-non-system-qg-lock-icon',
44
-                'target'     => '.questiongroups .ee-alternate-color',
45
-                'content'    => __(
46
-                    'This question group has questions that have answers attached to it from registrations that have the question. It cannot be permanently deleted.',
47
-                    'event_espresso'
48
-                ),
49
-                'options'    => array(),
50
-            ),
51
-        );
52
-    }
18
+	protected function _set_tips_array()
19
+	{
20
+		$this->_qtipsa = array(
21
+			0 => array(
22
+				'content_id' => 'about-system-lock-icon',
23
+				'target'     => '.questions .ee-system-lock',
24
+				'content'    => __('This question is a system question and cannot be trashed', 'event_espresso'),
25
+				'options'    => array(), // defaults
26
+			),
27
+			1 => array(
28
+				'content_id' => 'about-non-system-lock-icon',
29
+				'target'     => '.questions .ee-alternate-color',
30
+				'content'    => __(
31
+					'This question has answers attached to it from registrations that have the question.  It cannot be permanently deleted.',
32
+					'event_espresso'
33
+				),
34
+				'options'    => array(),
35
+			),
36
+			2 => array(
37
+				'content_id' => 'about-question-group-lock-icon',
38
+				'target'     => '.questiongroups .ee-system-lock',
39
+				'content'    => __('This question group is a system group and cannot be trashed', 'event_espresso'),
40
+				'options'    => array(),
41
+			),
42
+			3 => array(
43
+				'content_id' => 'about-non-system-qg-lock-icon',
44
+				'target'     => '.questiongroups .ee-alternate-color',
45
+				'content'    => __(
46
+					'This question group has questions that have answers attached to it from registrations that have the question. It cannot be permanently deleted.',
47
+					'event_espresso'
48
+				),
49
+				'options'    => array(),
50
+			),
51
+		);
52
+	}
53 53
 }
Please login to merge, or discard this patch.
help_tabs/registration_form_reg_form_settings.help_tab.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3,10 +3,10 @@
 block discarded – undo
3 3
 <?php _e('This page shows options for Email Validation, the EE "Bot Trap" and reCAPTCHA which can help prevent SPAM registrations on your site.', 'event_espresso'); ?>
4 4
 </p>
5 5
 <div id="email_validation_info">
6
-<p><strong><?php _e('Email Validation', 'event_espresso');?></strong></p>
6
+<p><strong><?php _e('Email Validation', 'event_espresso'); ?></strong></p>
7 7
 <p><?php _e("Validating an email address is extremely difficult to do correctly. Your server's configuration, as well as your own tolerances and needs, can affect the type of validation needed. We offer different types of validation so that you can control how strict your registration form responds to entered email addresses. If you are receiving too many bogus email addresses, then you can try the WordPress Default validation setting. If you find that the form validation is blocking a valid email address you can try the Basic setting, or if available, the International validation settings.", 'event_espresso'); ?>
8 8
 </p>
9
-<p><strong><?php _e('Validation Options:', 'event_espresso');?></strong></p>
9
+<p><strong><?php _e('Validation Options:', 'event_espresso'); ?></strong></p>
10 10
 <ul>
11 11
 <li>
12 12
     <?php _e('"Basic" - only checks that an email address follows the most basic structure guidelines ( ie: [email protected] ). Will work with the widest range of email addresses but will also allow the most garbage through.', 'event_espresso'); ?></li>
Please login to merge, or discard this patch.