eventespresso / event-espresso-core

admin_pages/registration_form/Registration_Form_Questions_Admin_List_Table.class.php

Indentation +158 added lines, -158 removed lines

@@ -18,162 +18,162 @@
 {
 
 
-    public function __construct($admin_page)
-    {
-        parent::__construct($admin_page);
-    }
-
-
-    protected function _setup_data()
-    {
-        if (isset($this->_req_data['status']) && $this->_req_data['status'] == 'trash') {
-            $this->_data = $this->_admin_page->get_trashed_questions($this->_per_page, $this->_current_page, false);
-        } else {
-            $this->_data = $this->_admin_page->get_questions($this->_per_page, $this->_current_page, false);
-        }
-        $this->_all_data_count = $this->_admin_page->get_questions($this->_per_page, $this->_current_page, true);
-    }
-
-
-    protected function _set_properties()
-    {
-        $this->_wp_list_args = array(
-            'singular' => __('question', 'event_espresso'),
-            'plural'   => __('questions', 'event_espresso'),
-            'ajax'     => true, // for now,
-            'screen'   => $this->_admin_page->get_current_screen()->id,
-        );
-
-        $this->_columns = array(
-            'cb'           => '<input type="checkbox" />',
-            'id'           => __('ID', 'event_espresso'),
-            'display_text' => __('Question', 'event_espresso'),
-            'admin_label'  => __('Admin Label', 'event_espresso'),
-            'type'         => __('Type', 'event_espresso'),
-            'values'       => __('Values', 'event_espresso'),
-            'required'     => __('Req', 'event_espresso'),
-        );
-
-        $this->_sortable_columns = array(
-            'id'           => array('QST_ID' => false),
-            'display_text' => array('QST_display_text' => false),
-        );
-
-        $this->_hidden_columns = array();
-    }
-
-
-    // not needed
-    protected function _get_table_filters()
-    {
-        return array();
-    }
-
-
-    protected function _add_view_counts()
-    {
-        $this->_views['all']['count'] = $this->_admin_page->get_questions($this->_per_page, $this->_current_page, true);
-        if (EE_Registry::instance()->CAP->current_user_can(
-            'ee_delete_questions',
-            'espresso_registration_form_trash_question'
-        )) {
-            $this->_views['trash']['count'] = $this->_admin_page->get_trashed_questions(-1, $this->_current_page, true);
-        }
-    }
-
-
-    public function column_cb($item)
-    {
-        $system_question = $item->is_system_question();
-        $related_answer_count = $item->count_related('Answer');
-        $lock_icon = (! $system_question && $related_answer_count > 0 && $this->_view == 'trash')
-            ? 'ee-lock-icon ee-alternate-color' : 'ee-lock-icon ee-system-lock';
-        return $system_question || (! $system_question && $related_answer_count > 0 && $this->_view == 'trash')
-            ? '<span class="' . $lock_icon . '"></span>' . sprintf(
-                '<input type="hidden" name="hdnchk[%1$d]" value="%1$d" />',
-                $item->ID()
-            ) : sprintf('<input type="checkbox" class="QST_ID" name="checkbox[%1$d]" value="%1$d" />', $item->ID());
-    }
-
-
-    public function column_id(EE_Question $item)
-    {
-        $content = $item->ID();
-        $content .= '  <span class="show-on-mobile-view-only">' . $item->display_text() . '</span>';
-        return $content;
-    }
-
-
-    public function column_display_text(EE_Question $item)
-    {
-        $system_question = $item->is_system_question();
-
-        if (! defined('REG_ADMIN_URL')) {
-            define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
-        }
-
-        $edit_query_args = array(
-            'action' => 'edit_question',
-            'QST_ID' => $item->ID(),
-        );
-
-        if (EE_Registry::instance()->CAP->current_user_can(
-            'ee_edit_question',
-            'espresso_registration_form_edit_question',
-            $item->ID()
-        )) {
-            $edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EE_FORMS_ADMIN_URL);
-
-            $actions = array(
-                'edit' => '<a href="' . $edit_link . '" title="' . esc_attr__(
-                    'Edit Event',
-                    'event_espresso'
-                ) . '">' . __('Edit', 'event_espresso') . '</a>',
-            );
-        }
-
-
-        $content = EE_Registry::instance()->CAP->current_user_can(
-            'ee_edit_question',
-            'espresso_registration_form_edit_question',
-            $item->ID()
-        ) ? '<strong><a class="row-title" href="' . $edit_link . '">' . $item->display_text() . '</a></strong>'
-            : $item->display_text();
-        $content .= $this->row_actions($actions);
-        return $content;
-    }
-
-
-    public function column_admin_label(EE_Question $item)
-    {
-        return $item->admin_label();
-    }
-
-
-    public function column_values(EE_Question $item)
-    {
-        $optionNames = array();
-        $options = $item->options();
-        if (empty($options)) {
-            return "N/A";
-        } else {
-            foreach ($options as $optionID => $option) {
-                /* @var $option EE_Question_Option */
-                $optionNames[] = $option->value();
-            }
-            return implode(', ', $optionNames);
-        }
-    }
-
-
-    public function column_type(EE_Question $item)
-    {
-        return $item->type();
-    }
-
-
-    public function column_required(EE_Question $item)
-    {
-        return $item->required() ? 'Yes' : '';
-    }
+	public function __construct($admin_page)
+	{
+		parent::__construct($admin_page);
+	}
+
+
+	protected function _setup_data()
+	{
+		if (isset($this->_req_data['status']) && $this->_req_data['status'] == 'trash') {
+			$this->_data = $this->_admin_page->get_trashed_questions($this->_per_page, $this->_current_page, false);
+		} else {
+			$this->_data = $this->_admin_page->get_questions($this->_per_page, $this->_current_page, false);
+		}
+		$this->_all_data_count = $this->_admin_page->get_questions($this->_per_page, $this->_current_page, true);
+	}
+
+
+	protected function _set_properties()
+	{
+		$this->_wp_list_args = array(
+			'singular' => __('question', 'event_espresso'),
+			'plural'   => __('questions', 'event_espresso'),
+			'ajax'     => true, // for now,
+			'screen'   => $this->_admin_page->get_current_screen()->id,
+		);
+
+		$this->_columns = array(
+			'cb'           => '<input type="checkbox" />',
+			'id'           => __('ID', 'event_espresso'),
+			'display_text' => __('Question', 'event_espresso'),
+			'admin_label'  => __('Admin Label', 'event_espresso'),
+			'type'         => __('Type', 'event_espresso'),
+			'values'       => __('Values', 'event_espresso'),
+			'required'     => __('Req', 'event_espresso'),
+		);
+
+		$this->_sortable_columns = array(
+			'id'           => array('QST_ID' => false),
+			'display_text' => array('QST_display_text' => false),
+		);
+
+		$this->_hidden_columns = array();
+	}
+
+
+	// not needed
+	protected function _get_table_filters()
+	{
+		return array();
+	}
+
+
+	protected function _add_view_counts()
+	{
+		$this->_views['all']['count'] = $this->_admin_page->get_questions($this->_per_page, $this->_current_page, true);
+		if (EE_Registry::instance()->CAP->current_user_can(
+			'ee_delete_questions',
+			'espresso_registration_form_trash_question'
+		)) {
+			$this->_views['trash']['count'] = $this->_admin_page->get_trashed_questions(-1, $this->_current_page, true);
+		}
+	}
+
+
+	public function column_cb($item)
+	{
+		$system_question = $item->is_system_question();
+		$related_answer_count = $item->count_related('Answer');
+		$lock_icon = (! $system_question && $related_answer_count > 0 && $this->_view == 'trash')
+			? 'ee-lock-icon ee-alternate-color' : 'ee-lock-icon ee-system-lock';
+		return $system_question || (! $system_question && $related_answer_count > 0 && $this->_view == 'trash')
+			? '<span class="' . $lock_icon . '"></span>' . sprintf(
+				'<input type="hidden" name="hdnchk[%1$d]" value="%1$d" />',
+				$item->ID()
+			) : sprintf('<input type="checkbox" class="QST_ID" name="checkbox[%1$d]" value="%1$d" />', $item->ID());
+	}
+
+
+	public function column_id(EE_Question $item)
+	{
+		$content = $item->ID();
+		$content .= '  <span class="show-on-mobile-view-only">' . $item->display_text() . '</span>';
+		return $content;
+	}
+
+
+	public function column_display_text(EE_Question $item)
+	{
+		$system_question = $item->is_system_question();
+
+		if (! defined('REG_ADMIN_URL')) {
+			define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
+		}
+
+		$edit_query_args = array(
+			'action' => 'edit_question',
+			'QST_ID' => $item->ID(),
+		);
+
+		if (EE_Registry::instance()->CAP->current_user_can(
+			'ee_edit_question',
+			'espresso_registration_form_edit_question',
+			$item->ID()
+		)) {
+			$edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EE_FORMS_ADMIN_URL);
+
+			$actions = array(
+				'edit' => '<a href="' . $edit_link . '" title="' . esc_attr__(
+					'Edit Event',
+					'event_espresso'
+				) . '">' . __('Edit', 'event_espresso') . '</a>',
+			);
+		}
+
+
+		$content = EE_Registry::instance()->CAP->current_user_can(
+			'ee_edit_question',
+			'espresso_registration_form_edit_question',
+			$item->ID()
+		) ? '<strong><a class="row-title" href="' . $edit_link . '">' . $item->display_text() . '</a></strong>'
+			: $item->display_text();
+		$content .= $this->row_actions($actions);
+		return $content;
+	}
+
+
+	public function column_admin_label(EE_Question $item)
+	{
+		return $item->admin_label();
+	}
+
+
+	public function column_values(EE_Question $item)
+	{
+		$optionNames = array();
+		$options = $item->options();
+		if (empty($options)) {
+			return "N/A";
+		} else {
+			foreach ($options as $optionID => $option) {
+				/* @var $option EE_Question_Option */
+				$optionNames[] = $option->value();
+			}
+			return implode(', ', $optionNames);
+		}
+	}
+
+
+	public function column_type(EE_Question $item)
+	{
+		return $item->type();
+	}
+
+
+	public function column_required(EE_Question $item)
+	{
+		return $item->required() ? 'Yes' : '';
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -86,10 +86,10 @@ 
     {
         $system_question = $item->is_system_question();
         $related_answer_count = $item->count_related('Answer');
-        $lock_icon = (! $system_question && $related_answer_count > 0 && $this->_view == 'trash')
+        $lock_icon = ( ! $system_question && $related_answer_count > 0 && $this->_view == 'trash')
             ? 'ee-lock-icon ee-alternate-color' : 'ee-lock-icon ee-system-lock';
-        return $system_question || (! $system_question && $related_answer_count > 0 && $this->_view == 'trash')
-            ? '<span class="' . $lock_icon . '"></span>' . sprintf(
+        return $system_question || ( ! $system_question && $related_answer_count > 0 && $this->_view == 'trash')
+            ? '<span class="'.$lock_icon.'"></span>'.sprintf(
                 '<input type="hidden" name="hdnchk[%1$d]" value="%1$d" />',
                 $item->ID()
             ) : sprintf('<input type="checkbox" class="QST_ID" name="checkbox[%1$d]" value="%1$d" />', $item->ID());
@@ -99,7 +99,7 @@ 
     public function column_id(EE_Question $item)
     {
         $content = $item->ID();
-        $content .= '  <span class="show-on-mobile-view-only">' . $item->display_text() . '</span>';
+        $content .= '  <span class="show-on-mobile-view-only">'.$item->display_text().'</span>';
         return $content;
     }
 
@@ -108,7 +108,7 @@ 
     {
         $system_question = $item->is_system_question();
 
-        if (! defined('REG_ADMIN_URL')) {
+        if ( ! defined('REG_ADMIN_URL')) {
             define('REG_ADMIN_URL', EVENTS_ADMIN_URL);
         }
 
@@ -125,10 +125,10 @@ 
             $edit_link = EE_Admin_Page::add_query_args_and_nonce($edit_query_args, EE_FORMS_ADMIN_URL);
 
             $actions = array(
-                'edit' => '<a href="' . $edit_link . '" title="' . esc_attr__(
+                'edit' => '<a href="'.$edit_link.'" title="'.esc_attr__(
                     'Edit Event',
                     'event_espresso'
-                ) . '">' . __('Edit', 'event_espresso') . '</a>',
+                ).'">'.__('Edit', 'event_espresso').'</a>',
             );
         }
 
@@ -137,7 +137,7 @@ 
             'ee_edit_question',
             'espresso_registration_form_edit_question',
             $item->ID()
-        ) ? '<strong><a class="row-title" href="' . $edit_link . '">' . $item->display_text() . '</a></strong>'
+        ) ? '<strong><a class="row-title" href="'.$edit_link.'">'.$item->display_text().'</a></strong>'
             : $item->display_text();
         $content .= $this->row_actions($actions);
         return $content;

admin_pages/general_settings/help_tours/Countries_Help_Tour.class.php

Indentation +70 added lines, -70 removed lines

@@ -15,80 +15,80 @@
 class Countries_Help_Tour extends EE_Help_Tour
 {
 
-    protected function _set_tour_properties()
-    {
-        $this->_label = __('Countries Tour', 'event_espresso');
-        $this->_slug = 'countries-joyride';
-    }
+	protected function _set_tour_properties()
+	{
+		$this->_label = __('Countries Tour', 'event_espresso');
+		$this->_slug = 'countries-joyride';
+	}
 
-    protected function _set_tour_stops()
-    {
-        $this->_stops = array(
-            10 => array(
-                'content' => $this->_start(),
-            ),
-            20 => array(
-                'id'      => 'country',
-                'content' => $this->_country_selector_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15,
-                ),
-            ),
-            30 => array(
-                'id'      => 'country-details-dv',
-                'content' => $this->_country_details_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentY' => -80,
-                    'tipAdjustmentX' => 0,
-                ),
-            ),
-            40 => array(
-                'id'      => 'country-states-settings-dv',
-                'content' => $this->_country_states_settings_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentY' => -20,
-                    'tipAdjustmentX' => 50,
-                ),
-            ),
-        );
-    }
+	protected function _set_tour_stops()
+	{
+		$this->_stops = array(
+			10 => array(
+				'content' => $this->_start(),
+			),
+			20 => array(
+				'id'      => 'country',
+				'content' => $this->_country_selector_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15,
+				),
+			),
+			30 => array(
+				'id'      => 'country-details-dv',
+				'content' => $this->_country_details_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentY' => -80,
+					'tipAdjustmentX' => 0,
+				),
+			),
+			40 => array(
+				'id'      => 'country-states-settings-dv',
+				'content' => $this->_country_states_settings_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentY' => -20,
+					'tipAdjustmentX' => 50,
+				),
+			),
+		);
+	}
 
 
-    protected function _start()
-    {
-        $content = '<h3>' . __('Countries Settings', 'event_espresso') . '</h3>';
-        $content .= '<p>'
-                    . __(
-                        'This tour of the Countries Page will go over different areas of the screen to help you understand what they are used for.',
-                        'event_espresso'
-                    ) . '</p>';
-        return $content;
-    }
+	protected function _start()
+	{
+		$content = '<h3>' . __('Countries Settings', 'event_espresso') . '</h3>';
+		$content .= '<p>'
+					. __(
+						'This tour of the Countries Page will go over different areas of the screen to help you understand what they are used for.',
+						'event_espresso'
+					) . '</p>';
+		return $content;
+	}
 
-    protected function _country_selector_stop()
-    {
-        return '<p>'
-               . __(
-                   'Select the country where your business or organization is located. This affects the currency that is used in Event Espresso.',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _country_selector_stop()
+	{
+		return '<p>'
+			   . __(
+				   'Select the country where your business or organization is located. This affects the currency that is used in Event Espresso.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 
-    protected function _country_details_stop()
-    {
-        return '<p>' . __('Here you can fine tune country and currency settings.', 'event_espresso') . '</p>';
-    }
+	protected function _country_details_stop()
+	{
+		return '<p>' . __('Here you can fine tune country and currency settings.', 'event_espresso') . '</p>';
+	}
 
-    protected function _country_states_settings_stop()
-    {
-        return '<p>'
-               . __(
-                   'Used in certain areas of the plugin, here you can define what states/provinces will be displayed in case you do not do business in certain areas.',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _country_states_settings_stop()
+	{
+		return '<p>'
+			   . __(
+				   'Used in certain areas of the plugin, here you can define what states/provinces will be displayed in case you do not do business in certain areas.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -60,12 +60,12 @@ 
 
     protected function _start()
     {
-        $content = '<h3>' . __('Countries Settings', 'event_espresso') . '</h3>';
+        $content = '<h3>'.__('Countries Settings', 'event_espresso').'</h3>';
         $content .= '<p>'
                     . __(
                         'This tour of the Countries Page will go over different areas of the screen to help you understand what they are used for.',
                         'event_espresso'
-                    ) . '</p>';
+                    ).'</p>';
         return $content;
     }
 
@@ -75,12 +75,12 @@ 
                . __(
                    'Select the country where your business or organization is located. This affects the currency that is used in Event Espresso.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
     protected function _country_details_stop()
     {
-        return '<p>' . __('Here you can fine tune country and currency settings.', 'event_espresso') . '</p>';
+        return '<p>'.__('Here you can fine tune country and currency settings.', 'event_espresso').'</p>';
     }
 
     protected function _country_states_settings_stop()
@@ -89,6 +89,6 @@ 
                . __(
                    'Used in certain areas of the plugin, here you can define what states/provinces will be displayed in case you do not do business in certain areas.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 }

admin_pages/general_settings/help_tours/Admin_Options_Help_Tour.class.php

Indentation +87 added lines, -87 removed lines

@@ -15,99 +15,99 @@
 class Admin_Options_Help_Tour extends EE_Help_Tour
 {
 
-    protected function _set_tour_properties()
-    {
-        $this->_label = __('Admin Options Tour', 'event_espresso');
-        $this->_slug = 'admin-options-joyride';
-    }
+	protected function _set_tour_properties()
+	{
+		$this->_label = __('Admin Options Tour', 'event_espresso');
+		$this->_slug = 'admin-options-joyride';
+	}
 
-    protected function _set_tour_stops()
-    {
-        $this->_stops = array(
-            10 => array(
-                'content' => $this->_start(),
-            ),
-            20 => array(
-                'id'      => 'use_full_logging',
-                'content' => $this->_use_full_logging_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15,
-                ),
-            ),
-            30 => array(
-                'id'      => 'use_remote_logging',
-                'content' => $this->_use_remote_logging_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15,
-                ),
-            ),
-            40 => array(
-                'id'      => 'affiliate_info',
-                'content' => $this->_show_reg_footer_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15,
-                ),
-            ),
+	protected function _set_tour_stops()
+	{
+		$this->_stops = array(
+			10 => array(
+				'content' => $this->_start(),
+			),
+			20 => array(
+				'id'      => 'use_full_logging',
+				'content' => $this->_use_full_logging_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15,
+				),
+			),
+			30 => array(
+				'id'      => 'use_remote_logging',
+				'content' => $this->_use_remote_logging_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15,
+				),
+			),
+			40 => array(
+				'id'      => 'affiliate_info',
+				'content' => $this->_show_reg_footer_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15,
+				),
+			),
 
-            60 => array(
-                'id'      => 'help_tour_activation',
-                'content' => $this->_help_tour_activation_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15,
-                ),
-            ),
-        );
-    }
+			60 => array(
+				'id'      => 'help_tour_activation',
+				'content' => $this->_help_tour_activation_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15,
+				),
+			),
+		);
+	}
 
 
-    protected function _start()
-    {
-        $content = '<h3>' . __('Admin Options', 'event_espresso') . '</h3>';
-        $content .= '<p>'
-                    . __(
-                        'This tour of the Admin Options page will go over different areas of the screen to help you understand what they are used for.',
-                        'event_espresso'
-                    ) . '</p>';
-        return $content;
-    }
+	protected function _start()
+	{
+		$content = '<h3>' . __('Admin Options', 'event_espresso') . '</h3>';
+		$content .= '<p>'
+					. __(
+						'This tour of the Admin Options page will go over different areas of the screen to help you understand what they are used for.',
+						'event_espresso'
+					) . '</p>';
+		return $content;
+	}
 
-    protected function _use_full_logging_stop()
-    {
-        return '<p>'
-               . __(
-                   'When enabled, a log file is created which can be useful for debugging. Please disable this option when you are finished debugging.',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _use_full_logging_stop()
+	{
+		return '<p>'
+			   . __(
+				   'When enabled, a log file is created which can be useful for debugging. Please disable this option when you are finished debugging.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 
-    protected function _use_remote_logging_stop()
-    {
-        return '<p>'
-               . __(
-                   ' This option sends all Event Espresso debugging data and get / post variables to the specified URL below.',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _use_remote_logging_stop()
+	{
+		return '<p>'
+			   . __(
+				   ' This option sends all Event Espresso debugging data and get / post variables to the specified URL below.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 
-    protected function _show_reg_footer_stop()
-    {
-        return '<p>'
-               . __(
-                   'Support us by adding a small link to Event Espresso in your event pages. You can even earn money for yourself by adding your affiliate link there!',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _show_reg_footer_stop()
+	{
+		return '<p>'
+			   . __(
+				   'Support us by adding a small link to Event Espresso in your event pages. You can even earn money for yourself by adding your affiliate link there!',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 
-    protected function _help_tour_activation_stop()
-    {
-        return '<p>' . __('Turn these help tours on / off for Event Espresso pages.', 'event_espresso') . '</p>';
-    }
+	protected function _help_tour_activation_stop()
+	{
+		return '<p>' . __('Turn these help tours on / off for Event Espresso pages.', 'event_espresso') . '</p>';
+	}
 }

Spacing +6 added lines, -6 removed lines

@@ -70,12 +70,12 @@ 
 
     protected function _start()
     {
-        $content = '<h3>' . __('Admin Options', 'event_espresso') . '</h3>';
+        $content = '<h3>'.__('Admin Options', 'event_espresso').'</h3>';
         $content .= '<p>'
                     . __(
                         'This tour of the Admin Options page will go over different areas of the screen to help you understand what they are used for.',
                         'event_espresso'
-                    ) . '</p>';
+                    ).'</p>';
         return $content;
     }
 
@@ -85,7 +85,7 @@ 
                . __(
                    'When enabled, a log file is created which can be useful for debugging. Please disable this option when you are finished debugging.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
     protected function _use_remote_logging_stop()
@@ -94,7 +94,7 @@ 
                . __(
                    ' This option sends all Event Espresso debugging data and get / post variables to the specified URL below.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
     protected function _show_reg_footer_stop()
@@ -103,11 +103,11 @@ 
                . __(
                    'Support us by adding a small link to Event Espresso in your event pages. You can even earn money for yourself by adding your affiliate link there!',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
     protected function _help_tour_activation_stop()
     {
-        return '<p>' . __('Turn these help tours on / off for Event Espresso pages.', 'event_espresso') . '</p>';
+        return '<p>'.__('Turn these help tours on / off for Event Espresso pages.', 'event_espresso').'</p>';
     }
 }

admin_pages/general_settings/help_tours/Critical_Pages_Help_Tour.class.php

Indentation +96 added lines, -96 removed lines

@@ -15,107 +15,107 @@
 class Critical_Pages_Help_Tour extends EE_Help_Tour
 {
 
-    protected function _set_tour_properties()
-    {
-        $this->_label = __('Critical Pages Tour', 'event_espresso');
-        $this->_slug = 'critical-pages-joyride';
-    }
+	protected function _set_tour_properties()
+	{
+		$this->_label = __('Critical Pages Tour', 'event_espresso');
+		$this->_slug = 'critical-pages-joyride';
+	}
 
-    protected function _set_tour_stops()
-    {
-        $this->_stops = array(
-            10 => array(
-                'content' => $this->_start(),
-            ),
-            20 => array(
-                'id'      => 'reg_page_id',
-                'content' => $this->_reg_page_id_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15,
-                ),
-            ),
-            30 => array(
-                'id'      => 'txn_page_id',
-                'content' => $this->_txn_page_id_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15,
-                ),
-            ),
-            40 => array(
-                'id'      => 'thank_you_page_id',
-                'content' => $this->_thank_you_page_id_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15,
-                ),
-            ),
-            50 => array(
-                'id'      => 'cancel_page_id',
-                'content' => $this->_cancel_page_id_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15,
-                ),
-            ),
-        );
-    }
+	protected function _set_tour_stops()
+	{
+		$this->_stops = array(
+			10 => array(
+				'content' => $this->_start(),
+			),
+			20 => array(
+				'id'      => 'reg_page_id',
+				'content' => $this->_reg_page_id_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15,
+				),
+			),
+			30 => array(
+				'id'      => 'txn_page_id',
+				'content' => $this->_txn_page_id_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15,
+				),
+			),
+			40 => array(
+				'id'      => 'thank_you_page_id',
+				'content' => $this->_thank_you_page_id_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15,
+				),
+			),
+			50 => array(
+				'id'      => 'cancel_page_id',
+				'content' => $this->_cancel_page_id_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15,
+				),
+			),
+		);
+	}
 
 
-    protected function _start()
-    {
-        $content = '<h3>' . __('Critical Pages', 'event_espresso') . '</h3>';
-        $content .= '<p>'
-                    . __(
-                        'This section lists the pages that Event Espresso needs in order to function. Should you wish to change a page that is used you will need to move the shortcode to the new page and then allocate it here. Otherwise your registrations will not work correctly.',
-                        'event_espresso'
-                    ) . '</p>';
-        $content .= '<p>'
-                    . __(
-                        'This section also provides a status of the page to show you at a glance if something is not right.',
-                        'event_espresso'
-                    ) . '</p>';
-        return $content;
-    }
+	protected function _start()
+	{
+		$content = '<h3>' . __('Critical Pages', 'event_espresso') . '</h3>';
+		$content .= '<p>'
+					. __(
+						'This section lists the pages that Event Espresso needs in order to function. Should you wish to change a page that is used you will need to move the shortcode to the new page and then allocate it here. Otherwise your registrations will not work correctly.',
+						'event_espresso'
+					) . '</p>';
+		$content .= '<p>'
+					. __(
+						'This section also provides a status of the page to show you at a glance if something is not right.',
+						'event_espresso'
+					) . '</p>';
+		return $content;
+	}
 
-    protected function _reg_page_id_stop()
-    {
-        return '<p>'
-               . __(
-                   'This page processes the registrations and is required, even if it is not visible in your menus. ',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _reg_page_id_stop()
+	{
+		return '<p>'
+			   . __(
+				   'This page processes the registrations and is required, even if it is not visible in your menus. ',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 
-    protected function _txn_page_id_stop()
-    {
-        return '<p>'
-               . __(
-                   'This page processes payments. It should not be visible on your menus, and the page should not contain anything other than the shortcode.',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _txn_page_id_stop()
+	{
+		return '<p>'
+			   . __(
+				   'This page processes payments. It should not be visible on your menus, and the page should not contain anything other than the shortcode.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 
-    protected function _thank_you_page_id_stop()
-    {
-        return '<p>'
-               . __(
-                   'This page is displayed after a successful transaction. Feel free to add extra content to this page to personalise it!',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _thank_you_page_id_stop()
+	{
+		return '<p>'
+			   . __(
+				   'This page is displayed after a successful transaction. Feel free to add extra content to this page to personalise it!',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 
-    protected function _cancel_page_id_stop()
-    {
-        return '<p>'
-               . __(
-                   'This page is displayed after an unsuccessful transaction. Feel free to add extra content to this page to personalise it!',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _cancel_page_id_stop()
+	{
+		return '<p>'
+			   . __(
+				   'This page is displayed after an unsuccessful transaction. Feel free to add extra content to this page to personalise it!',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -69,17 +69,17 @@ 
 
     protected function _start()
     {
-        $content = '<h3>' . __('Critical Pages', 'event_espresso') . '</h3>';
+        $content = '<h3>'.__('Critical Pages', 'event_espresso').'</h3>';
         $content .= '<p>'
                     . __(
                         'This section lists the pages that Event Espresso needs in order to function. Should you wish to change a page that is used you will need to move the shortcode to the new page and then allocate it here. Otherwise your registrations will not work correctly.',
                         'event_espresso'
-                    ) . '</p>';
+                    ).'</p>';
         $content .= '<p>'
                     . __(
                         'This section also provides a status of the page to show you at a glance if something is not right.',
                         'event_espresso'
-                    ) . '</p>';
+                    ).'</p>';
         return $content;
     }
 
@@ -89,7 +89,7 @@ 
                . __(
                    'This page processes the registrations and is required, even if it is not visible in your menus. ',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
     protected function _txn_page_id_stop()
@@ -98,7 +98,7 @@ 
                . __(
                    'This page processes payments. It should not be visible on your menus, and the page should not contain anything other than the shortcode.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
     protected function _thank_you_page_id_stop()
@@ -107,7 +107,7 @@ 
                . __(
                    'This page is displayed after a successful transaction. Feel free to add extra content to this page to personalise it!',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
     protected function _cancel_page_id_stop()
@@ -116,6 +116,6 @@ 
                . __(
                    'This page is displayed after an unsuccessful transaction. Feel free to add extra content to this page to personalise it!',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 }

admin_pages/general_settings/help_tours/Your_Organization_Help_Tour.class.php

Indentation +120 added lines, -120 removed lines

@@ -15,136 +15,136 @@
 class Your_Organization_Help_Tour extends EE_Help_Tour
 {
 
-    protected function _set_tour_properties()
-    {
-        $this->_label = __('Your Organization Tour', 'event_espresso');
-        $this->_slug = 'your-organization-joyride';
-    }
+	protected function _set_tour_properties()
+	{
+		$this->_label = __('Your Organization Tour', 'event_espresso');
+		$this->_slug = 'your-organization-joyride';
+	}
 
 
-    protected function _set_tour_stops()
-    {
-        $this->_stops = array(
-            10 => array(
-                'content' => $this->_start(),
-            ),
-            30 => array(
-                'id'      => 'contact_info_h4',
-                'content' => $this->_contact_information_stop(),
-                'options' => array(
-                    'tipLocation'    => 'left',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15,
-                ),
-            ),
-            40 => array(
-                'id'      => 'upload_image',
-                'content' => $this->_upload_image_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15,
-                ),
-            ),
-            50 => array(
-                'id'      => 'organization_facebook',
-                'content' => $this->_organization_facebook_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15,
-                ),
-            ),
-            60 => array(
-                'id'      => 'ueip_optin',
-                'content' => $this->_ueip_option_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15,
-                ),
-            ),
-            70 => array(
-                'id'      => 'espresso_major_buttons_wrapper',
-                'content' => $this->_end_tour_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 185,
-                ),
-            ),
-        );
+	protected function _set_tour_stops()
+	{
+		$this->_stops = array(
+			10 => array(
+				'content' => $this->_start(),
+			),
+			30 => array(
+				'id'      => 'contact_info_h4',
+				'content' => $this->_contact_information_stop(),
+				'options' => array(
+					'tipLocation'    => 'left',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15,
+				),
+			),
+			40 => array(
+				'id'      => 'upload_image',
+				'content' => $this->_upload_image_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15,
+				),
+			),
+			50 => array(
+				'id'      => 'organization_facebook',
+				'content' => $this->_organization_facebook_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15,
+				),
+			),
+			60 => array(
+				'id'      => 'ueip_optin',
+				'content' => $this->_ueip_option_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15,
+				),
+			),
+			70 => array(
+				'id'      => 'espresso_major_buttons_wrapper',
+				'content' => $this->_end_tour_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 185,
+				),
+			),
+		);
 
-        if (is_main_site()) {
-            $this->_stops[20] = array(
-                'id'      => 'site_license_key',
-                'content' => $this->_site_license_key_stop(),
-                'options' => array(
-                    'tipLocation'    => 'right',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => 15,
-                ),
-            );
-        }
-        ksort($this->_stops);
-    }
+		if (is_main_site()) {
+			$this->_stops[20] = array(
+				'id'      => 'site_license_key',
+				'content' => $this->_site_license_key_stop(),
+				'options' => array(
+					'tipLocation'    => 'right',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => 15,
+				),
+			);
+		}
+		ksort($this->_stops);
+	}
 
 
-    protected function _start()
-    {
-        $content = '<h3>' . __('Organization Settings', 'event_espresso') . '</h3>';
-        $content .= '<p>'
-                    . __(
-                        'This tour of the Your Organization page will go over different areas of the screen to help you understand what they are used for.',
-                        'event_espresso'
-                    ) . '</p>';
+	protected function _start()
+	{
+		$content = '<h3>' . __('Organization Settings', 'event_espresso') . '</h3>';
+		$content .= '<p>'
+					. __(
+						'This tour of the Your Organization page will go over different areas of the screen to help you understand what they are used for.',
+						'event_espresso'
+					) . '</p>';
 
-        return $content;
-    }
+		return $content;
+	}
 
-    protected function _site_license_key_stop()
-    {
-        return '<p>'
-               . __(
-                   'Enter your support license key here to enable one-click updates.',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _site_license_key_stop()
+	{
+		return '<p>'
+			   . __(
+				   'Enter your support license key here to enable one-click updates.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 
-    protected function _contact_information_stop()
-    {
-        return '<p>'
-               . __(
-                   'You can change your business / organization information below. Be sure to keep this information updated as it is used in other areas of the site. Adjusting the country option here will update your currency settings. More options are available in the Countries tab.',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _contact_information_stop()
+	{
+		return '<p>'
+			   . __(
+				   'You can change your business / organization information below. Be sure to keep this information updated as it is used in other areas of the site. Adjusting the country option here will update your currency settings. More options are available in the Countries tab.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 
-    protected function _upload_image_stop()
-    {
-        return '<p>' . __('Add a logo. This can be used for invoices and tickets.', 'event_espresso') . '</p>';
-    }
+	protected function _upload_image_stop()
+	{
+		return '<p>' . __('Add a logo. This can be used for invoices and tickets.', 'event_espresso') . '</p>';
+	}
 
-    protected function _organization_facebook_stop()
-    {
-        return '<p>' . __('Add links to various social media networks.', 'event_espresso') . '</p>';
-    }
+	protected function _organization_facebook_stop()
+	{
+		return '<p>' . __('Add links to various social media networks.', 'event_espresso') . '</p>';
+	}
 
-    protected function _ueip_option_stop()
-    {
-        return '<p>'
-               . __(
-                   'Help us to help you! Sign up to the User eXperience Improvement Program and send us anonymous data that will help us improve Event Espresso.',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _ueip_option_stop()
+	{
+		return '<p>'
+			   . __(
+				   'Help us to help you! Sign up to the User eXperience Improvement Program and send us anonymous data that will help us improve Event Espresso.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 
-    protected function _end_tour_stop()
-    {
-        return '<p>'
-               . __(
-                   'You are almost done updating Your Organization information. Click on the Save button to save changes and then go to the Payment Methods screen so you can setup a payment gateway.',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _end_tour_stop()
+	{
+		return '<p>'
+			   . __(
+				   'You are almost done updating Your Organization information. Click on the Save button to save changes and then go to the Payment Methods screen so you can setup a payment gateway.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -92,12 +92,12 @@ 
 
     protected function _start()
     {
-        $content = '<h3>' . __('Organization Settings', 'event_espresso') . '</h3>';
+        $content = '<h3>'.__('Organization Settings', 'event_espresso').'</h3>';
         $content .= '<p>'
                     . __(
                         'This tour of the Your Organization page will go over different areas of the screen to help you understand what they are used for.',
                         'event_espresso'
-                    ) . '</p>';
+                    ).'</p>';
 
         return $content;
     }
@@ -108,7 +108,7 @@ 
                . __(
                    'Enter your support license key here to enable one-click updates.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
     protected function _contact_information_stop()
@@ -117,17 +117,17 @@ 
                . __(
                    'You can change your business / organization information below. Be sure to keep this information updated as it is used in other areas of the site. Adjusting the country option here will update your currency settings. More options are available in the Countries tab.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
     protected function _upload_image_stop()
     {
-        return '<p>' . __('Add a logo. This can be used for invoices and tickets.', 'event_espresso') . '</p>';
+        return '<p>'.__('Add a logo. This can be used for invoices and tickets.', 'event_espresso').'</p>';
     }
 
     protected function _organization_facebook_stop()
     {
-        return '<p>' . __('Add links to various social media networks.', 'event_espresso') . '</p>';
+        return '<p>'.__('Add links to various social media networks.', 'event_espresso').'</p>';
     }
 
     protected function _ueip_option_stop()
@@ -136,7 +136,7 @@ 
                . __(
                    'Help us to help you! Sign up to the User eXperience Improvement Program and send us anonymous data that will help us improve Event Espresso.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
     protected function _end_tour_stop()
@@ -145,6 +145,6 @@ 
                . __(
                    'You are almost done updating Your Organization information. Click on the Save button to save changes and then go to the Payment Methods screen so you can setup a payment gateway.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 }

admin_pages/messages/help_tours/Message_Templates_Edit_Help_Tour.class.php

Indentation +133 added lines, -133 removed lines

@@ -15,137 +15,137 @@
 class Message_Templates_Edit_Help_Tour extends EE_Help_Tour
 {
 
-    protected function _set_tour_properties()
-    {
-        $this->_label = __('Message Template Editor Tour', 'event_espresso');
-        $this->_slug = 'messages-templates-edit-joyride';
-    }
-
-
-    protected function _set_tour_stops()
-    {
-        $this->_stops = array(
-            10 => array(
-                'content' => $this->_start(),
-            ),
-            20 => array(
-                'id'      => 'submit-msg-context-switcher-sbmt',
-                'content' => $this->_context_switcher_stop(),
-                'options' => array(
-                    'tipLocation'    => 'bottom',
-                    'tipAdjustmentY' => -30,
-                    'tipAdjustmentX' => -60,
-                ),
-            ),
-            30 => array(
-                'class'   => 'messages-preview-button"',
-                'content' => $this->_preview_button_stop(),
-                'options' => array(
-                    'tipLocation'    => 'bottom',
-                    'tipAdjustmentY' => -30,
-                ),
-            ),
-            40 => array(
-                'content' => $this->_template_area_stop(),
-                'options' => array(
-                    'tipAdjustmentY' => -100,
-                    'tipAdjustmentX' => -60,
-                ),
-            ),
-            50 => array(
-                'id'      => 'mtp_valid_shortcodes',
-                'content' => $this->_mtp_valid_shortcodes_stop(),
-                'options' => array(
-                    'tipLocation'    => 'left',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => -15,
-                ),
-            ),
-            60 => array(
-                'id'      => 'mtp_extra_actions',
-                'content' => $this->_mtp_extra_actions_stop(),
-                'options' => array(
-                    'tipLocation'    => 'left',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => -15,
-                ),
-            ),
-            70 => array(
-                'id'      => 'espresso_espresso_messages_editor_overview',
-                'content' => $this->_update_metabox_stop(),
-                'options' => array(
-                    'tipLocation'    => 'left',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => -15,
-                ),
-            ),
-        );
-    }
-
-
-    protected function _start()
-    {
-        $content = '<h3>' . __('Message Template Editor', 'event_espresso') . '</h3>';
-        $content .= '<p>'
-                    . __(
-                        'This tour of the Message Template Editor page will go over different areas of the screen to help you understand what they are used for.',
-                        'event_espresso'
-                    ) . '</p>';
-        return $content;
-    }
-
-
-    protected function _context_switcher_stop()
-    {
-        return '<p>'
-               . __(
-                   'This dropdown allows you to swap between the different recipients templates that are available in this message type. Be sure to save changes befor switching to a different context.',
-                   'event_espresso'
-               ) . '</p>';
-    }
-
-
-    protected function _preview_button_stop()
-    {
-        return '<p>'
-               . __(
-                   'Clicking this button will show you a preview of how your message will look.',
-                   'event_espresso'
-               ) . '</p>';
-    }
-
-
-    protected function _template_area_stop()
-    {
-        return '<p>'
-               . __(
-                   'Depending on the messenger (recipient) and the message type, the main screen can show different boxes. Overall the screen allows you to confirm who the messages go to and who from, and the actual content of the message.',
-                   'event_espresso'
-               ) . '</p>';
-    }
-
-    protected function _mtp_valid_shortcodes_stop()
-    {
-        return '<p>'
-               . __(
-                   'These shortcodes allow you to quickly add data into your messages, without touching code. From emails, to ticket details, to your company logo, building messages with shortcodes is easy and fast.',
-                   'event_espresso'
-               ) . '</p>';
-    }
-
-
-    protected function _mtp_extra_actions_stop()
-    {
-        return '<p>'
-               . __(
-                   'Here you will find miscellaneous options to assist you, including a test send button and a reset button.',
-                   'event_espresso'
-               ) . '</p>';
-    }
-
-
-    protected function _update_metabox_stop()
-    {
-        return '<p>' . __('When done creating your message, click here to save it.', 'event_espresso') . '</p>';
-    }
+	protected function _set_tour_properties()
+	{
+		$this->_label = __('Message Template Editor Tour', 'event_espresso');
+		$this->_slug = 'messages-templates-edit-joyride';
+	}
+
+
+	protected function _set_tour_stops()
+	{
+		$this->_stops = array(
+			10 => array(
+				'content' => $this->_start(),
+			),
+			20 => array(
+				'id'      => 'submit-msg-context-switcher-sbmt',
+				'content' => $this->_context_switcher_stop(),
+				'options' => array(
+					'tipLocation'    => 'bottom',
+					'tipAdjustmentY' => -30,
+					'tipAdjustmentX' => -60,
+				),
+			),
+			30 => array(
+				'class'   => 'messages-preview-button"',
+				'content' => $this->_preview_button_stop(),
+				'options' => array(
+					'tipLocation'    => 'bottom',
+					'tipAdjustmentY' => -30,
+				),
+			),
+			40 => array(
+				'content' => $this->_template_area_stop(),
+				'options' => array(
+					'tipAdjustmentY' => -100,
+					'tipAdjustmentX' => -60,
+				),
+			),
+			50 => array(
+				'id'      => 'mtp_valid_shortcodes',
+				'content' => $this->_mtp_valid_shortcodes_stop(),
+				'options' => array(
+					'tipLocation'    => 'left',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => -15,
+				),
+			),
+			60 => array(
+				'id'      => 'mtp_extra_actions',
+				'content' => $this->_mtp_extra_actions_stop(),
+				'options' => array(
+					'tipLocation'    => 'left',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => -15,
+				),
+			),
+			70 => array(
+				'id'      => 'espresso_espresso_messages_editor_overview',
+				'content' => $this->_update_metabox_stop(),
+				'options' => array(
+					'tipLocation'    => 'left',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => -15,
+				),
+			),
+		);
+	}
+
+
+	protected function _start()
+	{
+		$content = '<h3>' . __('Message Template Editor', 'event_espresso') . '</h3>';
+		$content .= '<p>'
+					. __(
+						'This tour of the Message Template Editor page will go over different areas of the screen to help you understand what they are used for.',
+						'event_espresso'
+					) . '</p>';
+		return $content;
+	}
+
+
+	protected function _context_switcher_stop()
+	{
+		return '<p>'
+			   . __(
+				   'This dropdown allows you to swap between the different recipients templates that are available in this message type. Be sure to save changes befor switching to a different context.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
+
+
+	protected function _preview_button_stop()
+	{
+		return '<p>'
+			   . __(
+				   'Clicking this button will show you a preview of how your message will look.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
+
+
+	protected function _template_area_stop()
+	{
+		return '<p>'
+			   . __(
+				   'Depending on the messenger (recipient) and the message type, the main screen can show different boxes. Overall the screen allows you to confirm who the messages go to and who from, and the actual content of the message.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
+
+	protected function _mtp_valid_shortcodes_stop()
+	{
+		return '<p>'
+			   . __(
+				   'These shortcodes allow you to quickly add data into your messages, without touching code. From emails, to ticket details, to your company logo, building messages with shortcodes is easy and fast.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
+
+
+	protected function _mtp_extra_actions_stop()
+	{
+		return '<p>'
+			   . __(
+				   'Here you will find miscellaneous options to assist you, including a test send button and a reset button.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
+
+
+	protected function _update_metabox_stop()
+	{
+		return '<p>' . __('When done creating your message, click here to save it.', 'event_espresso') . '</p>';
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -85,12 +85,12 @@ 
 
     protected function _start()
     {
-        $content = '<h3>' . __('Message Template Editor', 'event_espresso') . '</h3>';
+        $content = '<h3>'.__('Message Template Editor', 'event_espresso').'</h3>';
         $content .= '<p>'
                     . __(
                         'This tour of the Message Template Editor page will go over different areas of the screen to help you understand what they are used for.',
                         'event_espresso'
-                    ) . '</p>';
+                    ).'</p>';
         return $content;
     }
 
@@ -101,7 +101,7 @@ 
                . __(
                    'This dropdown allows you to swap between the different recipients templates that are available in this message type. Be sure to save changes befor switching to a different context.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
 
@@ -111,7 +111,7 @@ 
                . __(
                    'Clicking this button will show you a preview of how your message will look.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
 
@@ -121,7 +121,7 @@ 
                . __(
                    'Depending on the messenger (recipient) and the message type, the main screen can show different boxes. Overall the screen allows you to confirm who the messages go to and who from, and the actual content of the message.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
     protected function _mtp_valid_shortcodes_stop()
@@ -130,7 +130,7 @@ 
                . __(
                    'These shortcodes allow you to quickly add data into your messages, without touching code. From emails, to ticket details, to your company logo, building messages with shortcodes is easy and fast.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
 
@@ -140,12 +140,12 @@ 
                . __(
                    'Here you will find miscellaneous options to assist you, including a test send button and a reset button.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
 
     protected function _update_metabox_stop()
     {
-        return '<p>' . __('When done creating your message, click here to save it.', 'event_espresso') . '</p>';
+        return '<p>'.__('When done creating your message, click here to save it.', 'event_espresso').'</p>';
     }
 }

admin_pages/messages/help_tours/Messages_Settings_Help_Tour.class.php

Indentation +99 added lines, -99 removed lines

@@ -15,112 +15,112 @@
 class Messages_Settings_Help_Tour extends EE_Help_Tour
 {
 
-    protected function _set_tour_properties()
-    {
-        $this->_label = __('Messages Settings Tour', 'event_espresso');
-        $this->_slug = 'messages-settings-joyride';
-    }
+	protected function _set_tour_properties()
+	{
+		$this->_label = __('Messages Settings Tour', 'event_espresso');
+		$this->_slug = 'messages-settings-joyride';
+	}
 
 
-    protected function _set_tour_stops()
-    {
-        $this->_stops = array(
-            10 => array(
-                'content' => $this->_start(),
-            ),
-            20 => array(
-                'class'   => 'messenger_links',
-                'content' => $this->_messenger_links_stop(),
-                'options' => array(
-                    'tipLocation'    => 'bottom',
-                    'tipAdjustmentX' => -5,
-                    'tipAdjustmentY' => -25,
-                ),
-            ),
-            30 => array(
-                'id'      => 'espresso_email_settings',
-                'content' => $this->_email_settings_metabox_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentX' => 20,
-                    'tipAdjustmentY' => -30,
-                ),
-            ),
-            40 => array(
-                'id'      => 'on-off-email',
-                'content' => $this->_on_off_toggle_stop(),
-                'options' => array(
-                    'tipLocation'    => 'left',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => -15,
-                ),
-            ),
-            50 => array(
-                'id'      => 'active-message-types',
-                'content' => $this->_active_mts_container_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentY' => -30,
-                ),
-            ),
-            60 => array(
-                'id'      => 'inactive-message-types',
-                'content' => $this->_inactive_mts_container_stop(),
-                'options' => array(
-                    'tipLocation'    => 'left',
-                    'tipAdjustmentY' => -50,
-                    'tipAdjustmentX' => -15,
-                ),
-            ),
-        );
-    }
+	protected function _set_tour_stops()
+	{
+		$this->_stops = array(
+			10 => array(
+				'content' => $this->_start(),
+			),
+			20 => array(
+				'class'   => 'messenger_links',
+				'content' => $this->_messenger_links_stop(),
+				'options' => array(
+					'tipLocation'    => 'bottom',
+					'tipAdjustmentX' => -5,
+					'tipAdjustmentY' => -25,
+				),
+			),
+			30 => array(
+				'id'      => 'espresso_email_settings',
+				'content' => $this->_email_settings_metabox_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentX' => 20,
+					'tipAdjustmentY' => -30,
+				),
+			),
+			40 => array(
+				'id'      => 'on-off-email',
+				'content' => $this->_on_off_toggle_stop(),
+				'options' => array(
+					'tipLocation'    => 'left',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => -15,
+				),
+			),
+			50 => array(
+				'id'      => 'active-message-types',
+				'content' => $this->_active_mts_container_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentY' => -30,
+				),
+			),
+			60 => array(
+				'id'      => 'inactive-message-types',
+				'content' => $this->_inactive_mts_container_stop(),
+				'options' => array(
+					'tipLocation'    => 'left',
+					'tipAdjustmentY' => -50,
+					'tipAdjustmentX' => -15,
+				),
+			),
+		);
+	}
 
 
-    protected function _start()
-    {
-        $content = '<h3>' . __('Messages Settings', 'event_espresso') . '</h3>';
-        $content .= '<p>'
-                    . __(
-                        'This tour of the Messages Settings page will go over different areas of the screen to help you understand what they are used for.',
-                        'event_espresso'
-                    ) . '</p>';
-        return $content;
-    }
+	protected function _start()
+	{
+		$content = '<h3>' . __('Messages Settings', 'event_espresso') . '</h3>';
+		$content .= '<p>'
+					. __(
+						'This tour of the Messages Settings page will go over different areas of the screen to help you understand what they are used for.',
+						'event_espresso'
+					) . '</p>';
+		return $content;
+	}
 
-    protected function _messenger_links_stop()
-    {
-        return '<p>' . __('Available messengers are shown above.', 'event_espresso') . '</p>';
-    }
+	protected function _messenger_links_stop()
+	{
+		return '<p>' . __('Available messengers are shown above.', 'event_espresso') . '</p>';
+	}
 
-    protected function _email_settings_metabox_stop()
-    {
-        return '<p>' . __('View the different message types that are currently active.', 'event_espresso') . '</p>';
-    }
+	protected function _email_settings_metabox_stop()
+	{
+		return '<p>' . __('View the different message types that are currently active.', 'event_espresso') . '</p>';
+	}
 
-    protected function _on_off_toggle_stop()
-    {
-        return '<p>'
-               . __(
-                   'This toggle will turn all messages on or off for this message type.',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _on_off_toggle_stop()
+	{
+		return '<p>'
+			   . __(
+				   'This toggle will turn all messages on or off for this message type.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 
-    protected function _active_mts_container_stop()
-    {
-        return '<p>'
-               . __(
-                   'These are your active message types. Click them to see a description and settings for each one.',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _active_mts_container_stop()
+	{
+		return '<p>'
+			   . __(
+				   'These are your active message types. Click them to see a description and settings for each one.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 
-    protected function _inactive_mts_container_stop()
-    {
-        return '<p>'
-               . __(
-                   'Drag message types here to deactivate them. Drag them from here to the active box to reactivate them.',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _inactive_mts_container_stop()
+	{
+		return '<p>'
+			   . __(
+				   'Drag message types here to deactivate them. Drag them from here to the active box to reactivate them.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 }

Spacing +7 added lines, -7 removed lines

@@ -78,23 +78,23 @@ 
 
     protected function _start()
     {
-        $content = '<h3>' . __('Messages Settings', 'event_espresso') . '</h3>';
+        $content = '<h3>'.__('Messages Settings', 'event_espresso').'</h3>';
         $content .= '<p>'
                     . __(
                         'This tour of the Messages Settings page will go over different areas of the screen to help you understand what they are used for.',
                         'event_espresso'
-                    ) . '</p>';
+                    ).'</p>';
         return $content;
     }
 
     protected function _messenger_links_stop()
     {
-        return '<p>' . __('Available messengers are shown above.', 'event_espresso') . '</p>';
+        return '<p>'.__('Available messengers are shown above.', 'event_espresso').'</p>';
     }
 
     protected function _email_settings_metabox_stop()
     {
-        return '<p>' . __('View the different message types that are currently active.', 'event_espresso') . '</p>';
+        return '<p>'.__('View the different message types that are currently active.', 'event_espresso').'</p>';
     }
 
     protected function _on_off_toggle_stop()
@@ -103,7 +103,7 @@ 
                . __(
                    'This toggle will turn all messages on or off for this message type.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
     protected function _active_mts_container_stop()
@@ -112,7 +112,7 @@ 
                . __(
                    'These are your active message types. Click them to see a description and settings for each one.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
     protected function _inactive_mts_container_stop()
@@ -121,6 +121,6 @@ 
                . __(
                    'Drag message types here to deactivate them. Drag them from here to the active box to reactivate them.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 }

admin_pages/messages/help_tours/Messages_Overview_Help_Tour.class.php

Indentation +117 added lines, -117 removed lines

@@ -15,131 +15,131 @@
 class Messages_Overview_Help_Tour extends EE_Help_Tour
 {
 
-    protected function _set_tour_properties()
-    {
-        $this->_label = __('Messages Overview Tour', 'event_espresso');
-        $this->_slug = 'messages-overview-joyride';
-    }
+	protected function _set_tour_properties()
+	{
+		$this->_label = __('Messages Overview Tour', 'event_espresso');
+		$this->_slug = 'messages-overview-joyride';
+	}
 
 
-    protected function _set_tour_stops()
-    {
-        $this->_stops = array(
-            10 => array(
-                'content' => $this->_start(),
-            ),
-            20 => array(
-                'id'      => 'event',
-                'content' => $this->event_column_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentX' => -5,
-                    'tipAdjustmentY' => -30,
-                ),
-            ),
-            30 => array(
-                'id'      => 'message_type',
-                'content' => $this->_message_type_column_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentX' => 20,
-                    'tipAdjustmentY' => -30,
-                ),
-            ),
-            40 => array(
-                'id'      => 'messenger',
-                'content' => $this->_messenger_column_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentX' => 5,
-                    'tipAdjustmentY' => -30,
-                ),
-            ),
-            50 => array(
-                'id'      => 'description',
-                'content' => $this->_description_column_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentX' => 5,
-                    'tipAdjustmentY' => -30,
-                ),
-            ),
-            60 => array(
-                'class'   => 'bulkactions',
-                'content' => $this->_bulk_actions_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentX' => 25,
-                    'tipAdjustmentY' => -35,
-                ),
-            ),
-            70 => array(
-                'id'      => 'ee_messenger_filter_by',
-                'content' => $this->_filters_stop(),
-                'options' => array(
-                    'tipLocation'    => 'top',
-                    'tipAdjustmentX' => 25,
-                    'tipAdjustmentY' => -30,
-                ),
-            ),
-        );
-    }
+	protected function _set_tour_stops()
+	{
+		$this->_stops = array(
+			10 => array(
+				'content' => $this->_start(),
+			),
+			20 => array(
+				'id'      => 'event',
+				'content' => $this->event_column_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentX' => -5,
+					'tipAdjustmentY' => -30,
+				),
+			),
+			30 => array(
+				'id'      => 'message_type',
+				'content' => $this->_message_type_column_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentX' => 20,
+					'tipAdjustmentY' => -30,
+				),
+			),
+			40 => array(
+				'id'      => 'messenger',
+				'content' => $this->_messenger_column_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentX' => 5,
+					'tipAdjustmentY' => -30,
+				),
+			),
+			50 => array(
+				'id'      => 'description',
+				'content' => $this->_description_column_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentX' => 5,
+					'tipAdjustmentY' => -30,
+				),
+			),
+			60 => array(
+				'class'   => 'bulkactions',
+				'content' => $this->_bulk_actions_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentX' => 25,
+					'tipAdjustmentY' => -35,
+				),
+			),
+			70 => array(
+				'id'      => 'ee_messenger_filter_by',
+				'content' => $this->_filters_stop(),
+				'options' => array(
+					'tipLocation'    => 'top',
+					'tipAdjustmentX' => 25,
+					'tipAdjustmentY' => -30,
+				),
+			),
+		);
+	}
 
 
-    protected function _start()
-    {
-        $content = '<h3>' . __('Messages Overview', 'event_espresso') . '</h3>';
-        $content .= '<p>'
-                    . __(
-                        'This tour of the Messages Overview page will go over different areas of the screen to help you understand what they are used for.',
-                        'event_espresso'
-                    ) . '</p>';
-        return $content;
-    }
+	protected function _start()
+	{
+		$content = '<h3>' . __('Messages Overview', 'event_espresso') . '</h3>';
+		$content .= '<p>'
+					. __(
+						'This tour of the Messages Overview page will go over different areas of the screen to help you understand what they are used for.',
+						'event_espresso'
+					) . '</p>';
+		return $content;
+	}
 
-    protected function event_column_stop()
-    {
-        return '<p>'
-               . __(
-                   'View if a message is associated with one event or multiple events. Can be sorted in ascending and descending order.',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function event_column_stop()
+	{
+		return '<p>'
+			   . __(
+				   'View if a message is associated with one event or multiple events. Can be sorted in ascending and descending order.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 
-    protected function _message_type_column_stop()
-    {
-        return '<p>'
-               . __(
-                   'View the type of message. Can be sorted in ascending or descending order.',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _message_type_column_stop()
+	{
+		return '<p>'
+			   . __(
+				   'View the type of message. Can be sorted in ascending or descending order.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 
-    protected function _messenger_column_stop()
-    {
-        return '<p>'
-               . __(
-                   'View who messages will be sent to. Can be sorted in ascending or descending order.',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _messenger_column_stop()
+	{
+		return '<p>'
+			   . __(
+				   'View who messages will be sent to. Can be sorted in ascending or descending order.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 
-    protected function _description_column_stop()
-    {
-        return '<p>' . __('View the description for each message type.', 'event_espresso') . '</p>';
-    }
+	protected function _description_column_stop()
+	{
+		return '<p>' . __('View the description for each message type.', 'event_espresso') . '</p>';
+	}
 
-    protected function _bulk_actions_stop()
-    {
-        return '<p>' . __('Perform bulk actions to multiple message types.', 'event_espresso') . '</p>';
-    }
+	protected function _bulk_actions_stop()
+	{
+		return '<p>' . __('Perform bulk actions to multiple message types.', 'event_espresso') . '</p>';
+	}
 
-    protected function _filters_stop()
-    {
-        return '<p>'
-               . __(
-                   'You can filter by different notifications by making a selection below and clicking on the filter button. To reset your selection, just click on the reset filters button.',
-                   'event_espresso'
-               ) . '</p>';
-    }
+	protected function _filters_stop()
+	{
+		return '<p>'
+			   . __(
+				   'You can filter by different notifications by making a selection below and clicking on the filter button. To reset your selection, just click on the reset filters button.',
+				   'event_espresso'
+			   ) . '</p>';
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -88,12 +88,12 @@ 
 
     protected function _start()
     {
-        $content = '<h3>' . __('Messages Overview', 'event_espresso') . '</h3>';
+        $content = '<h3>'.__('Messages Overview', 'event_espresso').'</h3>';
         $content .= '<p>'
                     . __(
                         'This tour of the Messages Overview page will go over different areas of the screen to help you understand what they are used for.',
                         'event_espresso'
-                    ) . '</p>';
+                    ).'</p>';
         return $content;
     }
 
@@ -103,7 +103,7 @@ 
                . __(
                    'View if a message is associated with one event or multiple events. Can be sorted in ascending and descending order.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
     protected function _message_type_column_stop()
@@ -112,7 +112,7 @@ 
                . __(
                    'View the type of message. Can be sorted in ascending or descending order.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
     protected function _messenger_column_stop()
@@ -121,17 +121,17 @@ 
                . __(
                    'View who messages will be sent to. Can be sorted in ascending or descending order.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 
     protected function _description_column_stop()
     {
-        return '<p>' . __('View the description for each message type.', 'event_espresso') . '</p>';
+        return '<p>'.__('View the description for each message type.', 'event_espresso').'</p>';
     }
 
     protected function _bulk_actions_stop()
     {
-        return '<p>' . __('Perform bulk actions to multiple message types.', 'event_espresso') . '</p>';
+        return '<p>'.__('Perform bulk actions to multiple message types.', 'event_espresso').'</p>';
     }
 
     protected function _filters_stop()
@@ -140,6 +140,6 @@ 
                . __(
                    'You can filter by different notifications by making a selection below and clicking on the filter button. To reset your selection, just click on the reset filters button.',
                    'event_espresso'
-               ) . '</p>';
+               ).'</p>';
     }
 }

admin_pages/messages/Messages_Template_List_Table.class.php

Indentation +375 added lines, -375 removed lines

@@ -13,379 +13,379 @@
 {
 
 
-    /**
-     * @return Messages_Admin_Page
-     */
-    public function get_admin_page()
-    {
-        return $this->_admin_page;
-    }
-
-
-    /**
-     * Setup data object
-     */
-    protected function _setup_data()
-    {
-        $this->_data = $this->get_admin_page()->get_message_templates(
-            $this->_per_page,
-            $this->_view,
-            false
-        );
-        $this->_all_data_count = $this->get_admin_page()->get_message_templates(
-            $this->_per_page,
-            $this->_view,
-            true,
-            true
-        );
-    }
-
-
-    /**
-     * Set internal properties
-     */
-    protected function _set_properties()
-    {
-        $this->_wp_list_args = array(
-            'singular' => esc_html__('Message Template Group', 'event_espresso'),
-            'plural'   => esc_html__('Message Template', 'event_espresso'),
-            'ajax'     => true, // for now,
-            'screen'   => $this->get_admin_page()->get_current_screen()->id,
-        );
-        $this->_columns = array(
-            // 'cb' => '<input type="checkbox" />', //no deleting default (global) templates!
-            'message_type' => esc_html__('Message Type', 'event_espresso'),
-            'messenger'    => esc_html__('Messenger', 'event_espresso'),
-            'description'  => esc_html__('Description', 'event_espresso'),
-        );
-
-        $this->_sortable_columns = array(
-            'messenger' => array('MTP_messenger' => true),
-        );
-
-        $this->_hidden_columns = array();
-    }
-
-
-    /**
-     * Overriding the single_row method from parent to verify whether the $item has an accessible
-     * message_type or messenger object before generating the row.
-     *
-     * @param EE_Message_Template_Group $item
-     * @return string
-     * @throws EE_Error
-     */
-    public function single_row($item)
-    {
-        $message_type = $item->message_type_obj();
-        $messenger = $item->messenger_obj();
-
-        if (! $message_type instanceof EE_message_type || ! $messenger instanceof EE_messenger) {
-            echo '';
-            return;
-        }
-
-        parent::single_row($item);
-    }
-
-
-    /**
-     * @return array
-     * @throws EE_Error
-     */
-    protected function _get_table_filters()
-    {
-        $filters = array();
-
-        // get select inputs
-        $select_inputs = array(
-            $this->_get_messengers_dropdown_filter(),
-            $this->_get_message_types_dropdown_filter(),
-        );
-
-        // set filters to select inputs if they aren't empty
-        foreach ($select_inputs as $select_input) {
-            if ($select_input) {
-                $filters[] = $select_input;
-            }
-        }
-        return $filters;
-    }
-
-    /**
-     * We're just removing the search box for message templates, not needed.
-     *
-     * @param string $text
-     * @param string $input_id
-     * @return string ;
-     */
-    public function search_box($text, $input_id)
-    {
-        return '';
-    }
-
-
-    /**
-     * Add counts to the _views property
-     */
-    protected function _add_view_counts()
-    {
-        foreach ($this->_views as $view => $args) {
-            $this->_views[ $view ]['count'] = $this->get_admin_page()->get_message_templates(
-                $this->_per_page,
-                $view,
-                true,
-                true
-            );
-        }
-    }
-
-
-    /**
-     * @param EE_Message_Template_Group $item
-     * @return string
-     */
-    public function column_cb($item)
-    {
-        return '';
-    }
-
-
-    /**
-     * @param EE_Message_Template_Group $item
-     * @return string
-     * @throws EE_Error
-     */
-    public function column_description($item)
-    {
-        return '<p>' . $item->message_type_obj()->description . '</p>';
-    }
-
-
-    /**
-     * @param EE_Message_Template_Group $item
-     * @return string
-     * @throws EE_Error
-     */
-    public function column_messenger($item)
-    {
-        // Return the name contents
-        return sprintf(
-            '%1$s <span style="color:silver">(id:%2$s)</span><br />%3$s%4$s',
-            /* $1%s */
-            $this->_get_name_link_for_messenger($item),
-            /* $2%s */
-            $item->GRP_ID(),
-            /* %4$s */
-            $this->_get_context_links($item),
-            /* $3%s */
-            $this->row_actions($this->_get_actions_for_messenger_column($item))
-        );
-    }
-
-    /**
-     * column_message_type
-     *
-     * @param  EE_Message_Template_Group $item message info for the row
-     * @return string message_type name
-     * @throws EE_Error
-     */
-    public function column_message_type($item)
-    {
-        return ucwords($item->message_type_obj()->label['singular']);
-    }
-
-
-    /**
-     * Generate dropdown filter select input for messengers
-     *
-     * @param bool $global
-     * @return string
-     * @throws EE_Error
-     */
-    protected function _get_messengers_dropdown_filter($global = true)
-    {
-        $messenger_options = array();
-        $active_message_template_groups_grouped_by_messenger = EEM_Message_Template_Group::instance()->get_all(
-            array(
-                array(
-                    'MTP_is_active' => true,
-                    'MTP_is_global' => $global,
-                ),
-                'group_by' => 'MTP_messenger',
-            )
-        );
-
-        foreach ($active_message_template_groups_grouped_by_messenger as $active_message_template_group) {
-            if ($active_message_template_group instanceof EE_Message_Template_Group) {
-                $messenger = $active_message_template_group->messenger_obj();
-                $messenger_label = $messenger instanceof EE_messenger
-                    ? $messenger->label['singular']
-                    : $active_message_template_group->messenger();
-                $messenger_options[ $active_message_template_group->messenger() ] = ucwords($messenger_label);
-            }
-        }
-        return $this->get_admin_page()->get_messengers_select_input($messenger_options);
-    }
-
-
-    /**
-     * Generate dropdown filter select input for message types
-     *
-     * @param bool $global
-     * @return string
-     * @throws EE_Error
-     */
-    protected function _get_message_types_dropdown_filter($global = true)
-    {
-        $message_type_options = array();
-        $active_message_template_groups_grouped_by_message_type = EEM_Message_Template_Group::instance()->get_all(
-            array(
-                array(
-                    'MTP_is_active' => true,
-                    'MTP_is_global' => true,
-                ),
-                'group_by' => 'MTP_message_type',
-            )
-        );
-
-        foreach ($active_message_template_groups_grouped_by_message_type as $active_message_template_group) {
-            if ($active_message_template_group instanceof EE_Message_Template_Group) {
-                $message_type = $active_message_template_group->message_type_obj();
-                $message_type_label = $message_type instanceof EE_message_type
-                    ? $message_type->label['singular']
-                    : $active_message_template_group->message_type();
-                $message_type_options[ $active_message_template_group->message_type() ] = ucwords($message_type_label);
-            }
-        }
-        return $this->get_admin_page()->get_message_types_select_input($message_type_options);
-    }
-
-
-    /**
-     * Return the edit url for the message template group.
-     *
-     * @param EE_Message_Template_Group $item
-     * @return string
-     * @throws EE_Error
-     */
-    protected function _get_edit_url(EE_Message_Template_Group $item)
-    {
-        $edit_url = '';
-        // edit link but only if item isn't trashed.
-        if (! $item->get('MTP_deleted')
-            && EE_Registry::instance()->CAP->current_user_can(
-                'ee_edit_message',
-                'espresso_messages_edit_message_template',
-                $item->ID()
-            )) {
-            $edit_url = EE_Admin_Page::add_query_args_and_nonce(
-                array(
-                    'action' => 'edit_message_template',
-                    'id'     => $item->GRP_ID(),
-                ),
-                EE_MSG_ADMIN_URL
-            );
-        }
-        return $edit_url;
-    }
-
-
-    /**
-     * Get the context link string for the messenger column.
-     *
-     * @param EE_Message_Template_Group $item
-     * @return string
-     * @throws EE_Error
-     */
-    protected function _get_context_links(EE_Message_Template_Group $item)
-    {
-        // first check if we even show the context links or not.
-        if (! EE_Registry::instance()->CAP->current_user_can(
-            'ee_edit_message',
-            'espresso_messages_edit_message_template',
-            $item->ID()
-        )
-            || $item->get('MTP_deleted')
-        ) {
-            return '';
-        }
-        // we want to display the contexts in here so we need to set them up
-        $c_label = $item->context_label();
-        $c_configs = $item->contexts_config();
-        $ctxt = array();
-        $context_templates = $item->context_templates();
-        foreach ($context_templates as $context => $template_fields) {
-            $mtp_to = ! empty($context_templates[ $context ]['to'])
-                      && $context_templates[ $context ]['to'] instanceof EE_Message_Template
-                ? $context_templates[ $context ]['to']->get('MTP_content')
-                : null;
-            $inactive_class = (
-                                  empty($mtp_to)
-                                  && ! empty($context_templates[ $context ]['to'])
-                              )
-                              || ! $item->is_context_active($context)
-                ? ' mtp-inactive'
-                : '';
-            $context_title = ucwords($c_configs[ $context ]['label']);
-            $edit_link = EE_Admin_Page::add_query_args_and_nonce(
-                array(
-                    'action'  => 'edit_message_template',
-                    'id'      => $item->GRP_ID(),
-                    'context' => $context,
-                ),
-                EE_MSG_ADMIN_URL
-            );
-            $ctxt[] = '<a'
-                      . ' href="' . $edit_link . '"'
-                      . ' class="' . $item->message_type() . '-' . $context . '-edit-link' . $inactive_class . '"'
-                      . ' title="' . esc_attr__('Edit Context', 'event_espresso') . '">'
-                      . $context_title
-                      . '</a>';
-        }
-
-        return sprintf('<strong>%s:</strong> ', ucwords($c_label['plural'])) . implode(' | ', $ctxt);
-    }
-
-
-    /**
-     * Get the Name string from the messenger column (linked to edit if the context allows for that).
-     *
-     * @param EE_Message_Template_Group $item
-     * @return string
-     * @throws EE_Error
-     */
-    protected function _get_name_link_for_messenger(EE_Message_Template_Group $item)
-    {
-        $edit_url = $this->_get_edit_url($item);
-        return $edit_url
-            ? '<a href="' . $edit_url . '"'
-              . ' title="' . esc_attr__('Edit Template Group', 'event_espresso') . '">'
-              . ucwords($item->messenger_obj()->label['singular'])
-              . '</a>'
-            : ucwords($item->messenger_obj()->label['singular']);
-    }
-
-
-    /**
-     * Return the actions array for the messenger column.
-     *
-     * @param EE_Message_Template_Group $item
-     * @return array
-     * @throws EE_Error
-     */
-    protected function _get_actions_for_messenger_column(EE_Message_Template_Group $item)
-    {
-        $actions = array();
-        if ($edit_url = $this->_get_edit_url($item)) {
-            $actions = array(
-                'edit' => '<a href="' . $edit_url . '"'
-                          . ' class="' . $item->message_type() . '-edit-link"'
-                          . ' title="' . esc_attr__('Edit Template Group', 'event_espresso') . '">'
-                          . esc_html__('Edit', 'event_espresso')
-                          . '</a>',
-            );
-        }
-        return $actions;
-    }
+	/**
+	 * @return Messages_Admin_Page
+	 */
+	public function get_admin_page()
+	{
+		return $this->_admin_page;
+	}
+
+
+	/**
+	 * Setup data object
+	 */
+	protected function _setup_data()
+	{
+		$this->_data = $this->get_admin_page()->get_message_templates(
+			$this->_per_page,
+			$this->_view,
+			false
+		);
+		$this->_all_data_count = $this->get_admin_page()->get_message_templates(
+			$this->_per_page,
+			$this->_view,
+			true,
+			true
+		);
+	}
+
+
+	/**
+	 * Set internal properties
+	 */
+	protected function _set_properties()
+	{
+		$this->_wp_list_args = array(
+			'singular' => esc_html__('Message Template Group', 'event_espresso'),
+			'plural'   => esc_html__('Message Template', 'event_espresso'),
+			'ajax'     => true, // for now,
+			'screen'   => $this->get_admin_page()->get_current_screen()->id,
+		);
+		$this->_columns = array(
+			// 'cb' => '<input type="checkbox" />', //no deleting default (global) templates!
+			'message_type' => esc_html__('Message Type', 'event_espresso'),
+			'messenger'    => esc_html__('Messenger', 'event_espresso'),
+			'description'  => esc_html__('Description', 'event_espresso'),
+		);
+
+		$this->_sortable_columns = array(
+			'messenger' => array('MTP_messenger' => true),
+		);
+
+		$this->_hidden_columns = array();
+	}
+
+
+	/**
+	 * Overriding the single_row method from parent to verify whether the $item has an accessible
+	 * message_type or messenger object before generating the row.
+	 *
+	 * @param EE_Message_Template_Group $item
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function single_row($item)
+	{
+		$message_type = $item->message_type_obj();
+		$messenger = $item->messenger_obj();
+
+		if (! $message_type instanceof EE_message_type || ! $messenger instanceof EE_messenger) {
+			echo '';
+			return;
+		}
+
+		parent::single_row($item);
+	}
+
+
+	/**
+	 * @return array
+	 * @throws EE_Error
+	 */
+	protected function _get_table_filters()
+	{
+		$filters = array();
+
+		// get select inputs
+		$select_inputs = array(
+			$this->_get_messengers_dropdown_filter(),
+			$this->_get_message_types_dropdown_filter(),
+		);
+
+		// set filters to select inputs if they aren't empty
+		foreach ($select_inputs as $select_input) {
+			if ($select_input) {
+				$filters[] = $select_input;
+			}
+		}
+		return $filters;
+	}
+
+	/**
+	 * We're just removing the search box for message templates, not needed.
+	 *
+	 * @param string $text
+	 * @param string $input_id
+	 * @return string ;
+	 */
+	public function search_box($text, $input_id)
+	{
+		return '';
+	}
+
+
+	/**
+	 * Add counts to the _views property
+	 */
+	protected function _add_view_counts()
+	{
+		foreach ($this->_views as $view => $args) {
+			$this->_views[ $view ]['count'] = $this->get_admin_page()->get_message_templates(
+				$this->_per_page,
+				$view,
+				true,
+				true
+			);
+		}
+	}
+
+
+	/**
+	 * @param EE_Message_Template_Group $item
+	 * @return string
+	 */
+	public function column_cb($item)
+	{
+		return '';
+	}
+
+
+	/**
+	 * @param EE_Message_Template_Group $item
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function column_description($item)
+	{
+		return '<p>' . $item->message_type_obj()->description . '</p>';
+	}
+
+
+	/**
+	 * @param EE_Message_Template_Group $item
+	 * @return string
+	 * @throws EE_Error
+	 */
+	public function column_messenger($item)
+	{
+		// Return the name contents
+		return sprintf(
+			'%1$s <span style="color:silver">(id:%2$s)</span><br />%3$s%4$s',
+			/* $1%s */
+			$this->_get_name_link_for_messenger($item),
+			/* $2%s */
+			$item->GRP_ID(),
+			/* %4$s */
+			$this->_get_context_links($item),
+			/* $3%s */
+			$this->row_actions($this->_get_actions_for_messenger_column($item))
+		);
+	}
+
+	/**
+	 * column_message_type
+	 *
+	 * @param  EE_Message_Template_Group $item message info for the row
+	 * @return string message_type name
+	 * @throws EE_Error
+	 */
+	public function column_message_type($item)
+	{
+		return ucwords($item->message_type_obj()->label['singular']);
+	}
+
+
+	/**
+	 * Generate dropdown filter select input for messengers
+	 *
+	 * @param bool $global
+	 * @return string
+	 * @throws EE_Error
+	 */
+	protected function _get_messengers_dropdown_filter($global = true)
+	{
+		$messenger_options = array();
+		$active_message_template_groups_grouped_by_messenger = EEM_Message_Template_Group::instance()->get_all(
+			array(
+				array(
+					'MTP_is_active' => true,
+					'MTP_is_global' => $global,
+				),
+				'group_by' => 'MTP_messenger',
+			)
+		);
+
+		foreach ($active_message_template_groups_grouped_by_messenger as $active_message_template_group) {
+			if ($active_message_template_group instanceof EE_Message_Template_Group) {
+				$messenger = $active_message_template_group->messenger_obj();
+				$messenger_label = $messenger instanceof EE_messenger
+					? $messenger->label['singular']
+					: $active_message_template_group->messenger();
+				$messenger_options[ $active_message_template_group->messenger() ] = ucwords($messenger_label);
+			}
+		}
+		return $this->get_admin_page()->get_messengers_select_input($messenger_options);
+	}
+
+
+	/**
+	 * Generate dropdown filter select input for message types
+	 *
+	 * @param bool $global
+	 * @return string
+	 * @throws EE_Error
+	 */
+	protected function _get_message_types_dropdown_filter($global = true)
+	{
+		$message_type_options = array();
+		$active_message_template_groups_grouped_by_message_type = EEM_Message_Template_Group::instance()->get_all(
+			array(
+				array(
+					'MTP_is_active' => true,
+					'MTP_is_global' => true,
+				),
+				'group_by' => 'MTP_message_type',
+			)
+		);
+
+		foreach ($active_message_template_groups_grouped_by_message_type as $active_message_template_group) {
+			if ($active_message_template_group instanceof EE_Message_Template_Group) {
+				$message_type = $active_message_template_group->message_type_obj();
+				$message_type_label = $message_type instanceof EE_message_type
+					? $message_type->label['singular']
+					: $active_message_template_group->message_type();
+				$message_type_options[ $active_message_template_group->message_type() ] = ucwords($message_type_label);
+			}
+		}
+		return $this->get_admin_page()->get_message_types_select_input($message_type_options);
+	}
+
+
+	/**
+	 * Return the edit url for the message template group.
+	 *
+	 * @param EE_Message_Template_Group $item
+	 * @return string
+	 * @throws EE_Error
+	 */
+	protected function _get_edit_url(EE_Message_Template_Group $item)
+	{
+		$edit_url = '';
+		// edit link but only if item isn't trashed.
+		if (! $item->get('MTP_deleted')
+			&& EE_Registry::instance()->CAP->current_user_can(
+				'ee_edit_message',
+				'espresso_messages_edit_message_template',
+				$item->ID()
+			)) {
+			$edit_url = EE_Admin_Page::add_query_args_and_nonce(
+				array(
+					'action' => 'edit_message_template',
+					'id'     => $item->GRP_ID(),
+				),
+				EE_MSG_ADMIN_URL
+			);
+		}
+		return $edit_url;
+	}
+
+
+	/**
+	 * Get the context link string for the messenger column.
+	 *
+	 * @param EE_Message_Template_Group $item
+	 * @return string
+	 * @throws EE_Error
+	 */
+	protected function _get_context_links(EE_Message_Template_Group $item)
+	{
+		// first check if we even show the context links or not.
+		if (! EE_Registry::instance()->CAP->current_user_can(
+			'ee_edit_message',
+			'espresso_messages_edit_message_template',
+			$item->ID()
+		)
+			|| $item->get('MTP_deleted')
+		) {
+			return '';
+		}
+		// we want to display the contexts in here so we need to set them up
+		$c_label = $item->context_label();
+		$c_configs = $item->contexts_config();
+		$ctxt = array();
+		$context_templates = $item->context_templates();
+		foreach ($context_templates as $context => $template_fields) {
+			$mtp_to = ! empty($context_templates[ $context ]['to'])
+					  && $context_templates[ $context ]['to'] instanceof EE_Message_Template
+				? $context_templates[ $context ]['to']->get('MTP_content')
+				: null;
+			$inactive_class = (
+								  empty($mtp_to)
+								  && ! empty($context_templates[ $context ]['to'])
+							  )
+							  || ! $item->is_context_active($context)
+				? ' mtp-inactive'
+				: '';
+			$context_title = ucwords($c_configs[ $context ]['label']);
+			$edit_link = EE_Admin_Page::add_query_args_and_nonce(
+				array(
+					'action'  => 'edit_message_template',
+					'id'      => $item->GRP_ID(),
+					'context' => $context,
+				),
+				EE_MSG_ADMIN_URL
+			);
+			$ctxt[] = '<a'
+					  . ' href="' . $edit_link . '"'
+					  . ' class="' . $item->message_type() . '-' . $context . '-edit-link' . $inactive_class . '"'
+					  . ' title="' . esc_attr__('Edit Context', 'event_espresso') . '">'
+					  . $context_title
+					  . '</a>';
+		}
+
+		return sprintf('<strong>%s:</strong> ', ucwords($c_label['plural'])) . implode(' | ', $ctxt);
+	}
+
+
+	/**
+	 * Get the Name string from the messenger column (linked to edit if the context allows for that).
+	 *
+	 * @param EE_Message_Template_Group $item
+	 * @return string
+	 * @throws EE_Error
+	 */
+	protected function _get_name_link_for_messenger(EE_Message_Template_Group $item)
+	{
+		$edit_url = $this->_get_edit_url($item);
+		return $edit_url
+			? '<a href="' . $edit_url . '"'
+			  . ' title="' . esc_attr__('Edit Template Group', 'event_espresso') . '">'
+			  . ucwords($item->messenger_obj()->label['singular'])
+			  . '</a>'
+			: ucwords($item->messenger_obj()->label['singular']);
+	}
+
+
+	/**
+	 * Return the actions array for the messenger column.
+	 *
+	 * @param EE_Message_Template_Group $item
+	 * @return array
+	 * @throws EE_Error
+	 */
+	protected function _get_actions_for_messenger_column(EE_Message_Template_Group $item)
+	{
+		$actions = array();
+		if ($edit_url = $this->_get_edit_url($item)) {
+			$actions = array(
+				'edit' => '<a href="' . $edit_url . '"'
+						  . ' class="' . $item->message_type() . '-edit-link"'
+						  . ' title="' . esc_attr__('Edit Template Group', 'event_espresso') . '">'
+						  . esc_html__('Edit', 'event_espresso')
+						  . '</a>',
+			);
+		}
+		return $actions;
+	}
 }

Spacing +21 added lines, -21 removed lines

@@ -80,7 +80,7 @@ 
         $message_type = $item->message_type_obj();
         $messenger = $item->messenger_obj();
 
-        if (! $message_type instanceof EE_message_type || ! $messenger instanceof EE_messenger) {
+        if ( ! $message_type instanceof EE_message_type || ! $messenger instanceof EE_messenger) {
             echo '';
             return;
         }
@@ -131,7 +131,7 @@ 
     protected function _add_view_counts()
     {
         foreach ($this->_views as $view => $args) {
-            $this->_views[ $view ]['count'] = $this->get_admin_page()->get_message_templates(
+            $this->_views[$view]['count'] = $this->get_admin_page()->get_message_templates(
                 $this->_per_page,
                 $view,
                 true,
@@ -158,7 +158,7 @@ 
      */
     public function column_description($item)
     {
-        return '<p>' . $item->message_type_obj()->description . '</p>';
+        return '<p>'.$item->message_type_obj()->description.'</p>';
     }
 
 
@@ -222,7 +222,7 @@ 
                 $messenger_label = $messenger instanceof EE_messenger
                     ? $messenger->label['singular']
                     : $active_message_template_group->messenger();
-                $messenger_options[ $active_message_template_group->messenger() ] = ucwords($messenger_label);
+                $messenger_options[$active_message_template_group->messenger()] = ucwords($messenger_label);
             }
         }
         return $this->get_admin_page()->get_messengers_select_input($messenger_options);
@@ -255,7 +255,7 @@ 
                 $message_type_label = $message_type instanceof EE_message_type
                     ? $message_type->label['singular']
                     : $active_message_template_group->message_type();
-                $message_type_options[ $active_message_template_group->message_type() ] = ucwords($message_type_label);
+                $message_type_options[$active_message_template_group->message_type()] = ucwords($message_type_label);
             }
         }
         return $this->get_admin_page()->get_message_types_select_input($message_type_options);
@@ -273,7 +273,7 @@ 
     {
         $edit_url = '';
         // edit link but only if item isn't trashed.
-        if (! $item->get('MTP_deleted')
+        if ( ! $item->get('MTP_deleted')
             && EE_Registry::instance()->CAP->current_user_can(
                 'ee_edit_message',
                 'espresso_messages_edit_message_template',
@@ -301,7 +301,7 @@ 
     protected function _get_context_links(EE_Message_Template_Group $item)
     {
         // first check if we even show the context links or not.
-        if (! EE_Registry::instance()->CAP->current_user_can(
+        if ( ! EE_Registry::instance()->CAP->current_user_can(
             'ee_edit_message',
             'espresso_messages_edit_message_template',
             $item->ID()
@@ -316,18 +316,18 @@ 
         $ctxt = array();
         $context_templates = $item->context_templates();
         foreach ($context_templates as $context => $template_fields) {
-            $mtp_to = ! empty($context_templates[ $context ]['to'])
-                      && $context_templates[ $context ]['to'] instanceof EE_Message_Template
-                ? $context_templates[ $context ]['to']->get('MTP_content')
+            $mtp_to = ! empty($context_templates[$context]['to'])
+                      && $context_templates[$context]['to'] instanceof EE_Message_Template
+                ? $context_templates[$context]['to']->get('MTP_content')
                 : null;
             $inactive_class = (
                                   empty($mtp_to)
-                                  && ! empty($context_templates[ $context ]['to'])
+                                  && ! empty($context_templates[$context]['to'])
                               )
                               || ! $item->is_context_active($context)
                 ? ' mtp-inactive'
                 : '';
-            $context_title = ucwords($c_configs[ $context ]['label']);
+            $context_title = ucwords($c_configs[$context]['label']);
             $edit_link = EE_Admin_Page::add_query_args_and_nonce(
                 array(
                     'action'  => 'edit_message_template',
@@ -337,14 +337,14 @@ 
                 EE_MSG_ADMIN_URL
             );
             $ctxt[] = '<a'
-                      . ' href="' . $edit_link . '"'
-                      . ' class="' . $item->message_type() . '-' . $context . '-edit-link' . $inactive_class . '"'
-                      . ' title="' . esc_attr__('Edit Context', 'event_espresso') . '">'
+                      . ' href="'.$edit_link.'"'
+                      . ' class="'.$item->message_type().'-'.$context.'-edit-link'.$inactive_class.'"'
+                      . ' title="'.esc_attr__('Edit Context', 'event_espresso').'">'
                       . $context_title
                       . '</a>';
         }
 
-        return sprintf('<strong>%s:</strong> ', ucwords($c_label['plural'])) . implode(' | ', $ctxt);
+        return sprintf('<strong>%s:</strong> ', ucwords($c_label['plural'])).implode(' | ', $ctxt);
     }
 
 
@@ -359,8 +359,8 @@ 
     {
         $edit_url = $this->_get_edit_url($item);
         return $edit_url
-            ? '<a href="' . $edit_url . '"'
-              . ' title="' . esc_attr__('Edit Template Group', 'event_espresso') . '">'
+            ? '<a href="'.$edit_url.'"'
+              . ' title="'.esc_attr__('Edit Template Group', 'event_espresso').'">'
               . ucwords($item->messenger_obj()->label['singular'])
               . '</a>'
             : ucwords($item->messenger_obj()->label['singular']);
@@ -379,9 +379,9 @@ 
         $actions = array();
         if ($edit_url = $this->_get_edit_url($item)) {
             $actions = array(
-                'edit' => '<a href="' . $edit_url . '"'
-                          . ' class="' . $item->message_type() . '-edit-link"'
-                          . ' title="' . esc_attr__('Edit Template Group', 'event_espresso') . '">'
+                'edit' => '<a href="'.$edit_url.'"'
+                          . ' class="'.$item->message_type().'-edit-link"'
+                          . ' title="'.esc_attr__('Edit Template Group', 'event_espresso').'">'
                           . esc_html__('Edit', 'event_espresso')
                           . '</a>',
             );