10h30/ultimatemember
1
0
Fork 0
mirror of https://github.com/10h30/ultimatemember.git synced 2026-06-05 15:09:37 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/full-class'

Browse Source
This commit is contained in:
nikitozzzzzzz
2018-04-03 11:52:21 +03:00
parent 03b38d11e7 f2b6249516
commit 02f7d6538e
11 changed files with 435 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/core/class-fields.php
+7 -7
View File
@@ -448,18 +448,18 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
$label = apply_filters( 'um_edit_label_all_fields', $label, $data );
}
$output .= '<label for="' . $key . UM()->form()->form_suffix . '">' . __( $label, UM_TEXTDOMAIN ) . '</label>';
$output .= '<label for="' . $key . UM()->form()->form_suffix . '">' . __( $label, 'ultimate-member' ) . '</label>';
if (isset( $data['help'] ) && !empty( $data['help'] ) && $this->viewing == false && !strstr( $key, 'confirm_user_pass' )) {
if (!UM()->mobile()->isMobile()) {
if (!isset( $this->disable_tooltips )) {
$output .= '<span class="um-tip um-tip-w" title="' . __( $data['help'], UM_TEXTDOMAIN ) . '"><i class="um-icon-help-circled"></i></span>';
$output .= '<span class="um-tip um-tip-w" title="' . __( $data['help'], 'ultimate-member' ) . '"><i class="um-icon-help-circled"></i></span>';
}
}
if (UM()->mobile()->isMobile() || isset( $this->disable_tooltips )) {
$output .= '<span class="um-tip-text">' . __( $data['help'], UM_TEXTDOMAIN ) . '</span>';
$output .= '<span class="um-tip-text">' . __( $data['help'], 'ultimate-member' ) . '</span>';
}
}
@@ -2561,7 +2561,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
$field_value = $v;
}
$output .= '>' . __( $um_field_checkbox_item_title, UM_TEXTDOMAIN ) . '</option>';
$output .= '>' . __( $um_field_checkbox_item_title, 'ultimate-member' ) . '</option>';
}
@@ -2876,7 +2876,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
$output .= ' />';
$output .= '<span class="um-field-radio-state"><i class="' . $class . '"></i></span>';
$output .= '<span class="um-field-radio-option">' . __( $um_field_checkbox_item_title, UM_TEXTDOMAIN ) . '</span>';
$output .= '<span class="um-field-radio-option">' . __( $um_field_checkbox_item_title, 'ultimate-member' ) . '</span>';
$output .= '</label>';
if ($i % 2 == 0) {
@@ -3030,7 +3030,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
* ?>
*/
$um_field_checkbox_item_title = apply_filters( "um_field_checkbox_item_title", $um_field_checkbox_item_title, $key, $v, $data );
$output .= '<span class="um-field-checkbox-option">' . __( $um_field_checkbox_item_title, UM_TEXTDOMAIN ) . '</span>';
$output .= '<span class="um-field-checkbox-option">' . __( $um_field_checkbox_item_title, 'ultimate-member' ) . '</span>';
$output .= '</label>';
if ($i % 2 == 0) {
@@ -3075,7 +3075,7 @@ if ( ! class_exists( 'um\core\Fields' ) ) {
if (!empty( $fields )) {
$output .= '<div class="um-field-group" data-max_entries="' . $max_entries . '">
<div class="um-field-group-head"><i class="um-icon-plus"></i>' . __( $label, UM_TEXTDOMAIN ) . '</div>';
<div class="um-field-group-head"><i class="um-icon-plus"></i>' . __( $label, 'ultimate-member' ) . '</div>';
$output .= '<div class="um-field-group-body"><a href="#" class="um-field-group-cancel"><i class="um-icon-close"></i></a>';
foreach ($fields as $subkey => $subdata) {
includes/core/class-tracking.php
-30
View File
@@ -27,8 +27,6 @@ if ( ! class_exists( 'um\core\Tracking' ) ) {
$this->schedule_send();
add_action( 'admin_notices', array( $this, 'admin_notices' ), 10 );
add_action( 'um_admin_do_action__opt_into_tracking', array( $this, 'um_admin_do_action__opt_into_tracking' ) );
add_action( 'um_admin_do_action__opt_out_of_tracking', array( $this, 'um_admin_do_action__opt_out_of_tracking' ) );
}
@@ -183,33 +181,5 @@ if ( ! class_exists( 'um\core\Tracking' ) ) {
add_action( 'um_daily_scheduled_events', array( $this, 'send_checkin' ) );
}
/**
* Show admin notices
*/
public function admin_notices() {
if( ! current_user_can( 'manage_options' ) )
return;
$hide_notice = get_option('um_tracking_notice');
if ( $hide_notice )
return;
$optin_url = esc_url( add_query_arg( 'um_adm_action', 'opt_into_tracking' ) );
$optout_url = esc_url( add_query_arg( 'um_adm_action', 'opt_out_of_tracking' ) );
echo '<div class="updated um-admin-notice"><p>';
printf( __( 'Thanks for installing <strong>%s</strong>! The core plugin is free but we also sell extensions which allow us to continue developing and supporting the plugin full time. If you subscribe to our mailing list (no spam) we will email you a 20%% discount code which you can use to purchase the <a href="%s" target="_blank">extensions bundle</a>.', 'ultimate-member' ), ultimatemember_plugin_name, 'https://ultimatemember.com/core-extensions-bundle/' );
echo '</p>';
echo '<p><a href="' . esc_url( $optin_url ) . '" class="button button-primary">' . __( 'Subscribe to mailing list', 'ultimate-member' ) . '</a>';
echo '&nbsp;<a href="' . esc_url( $optout_url ) . '" class="button-secondary">' . __( 'No thanks', 'ultimate-member' ) . '</a></p></div>';
}
}
}