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

- fixed encoding if not installed mbstring PHP library;

Browse Source 
- some texts changes;
- some fixes on first install and forms metaboxes;
This commit is contained in:
nikitozzzzzzz
2017-08-03 10:52:40 +03:00
parent f676d1c112
commit 6c9668c0cb
12 changed files with 61 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/admin/templates/form/login_customize.php
+9 -9
View File
@@ -4,11 +4,11 @@
'prefix_id' => 'form',
'fields' => array(
array(
'id' => '_um_login_use_globals',
'id' => '_um_login_use_custom_settings',
'type' => 'select',
'label' => __( 'Apply custom settings to this form', 'ultimate-member' ),
'tooltip' => __( 'Switch to yes if you want to customize this form settings, styling & appearance', 'ultimate-member' ),
'value' => UM()->query()->get_meta_value( '_um_login_use_globals', null, 0 ),
'value' => UM()->query()->get_meta_value( '_um_login_use_custom_settings', null, 0 ),
'options' => array(
0 => __( 'No', 'ultimate-member' ),
1 => __( 'Yes', 'ultimate-member' ),
@@ -20,7 +20,7 @@
'label' => __( 'Template', 'ultimate-member' ),
'value' => UM()->query()->get_meta_value( '_um_login_template', null, um_get_option( 'login_template' ) ),
'options' => UM()->shortcodes()->get_templates( 'login' ),
'conditional' => array( '_um_login_use_globals', '=', 1 )
'conditional' => array( '_um_login_use_custom_settings', '=', 1 )
),
array(
'id' => '_um_login_max_width',
@@ -28,7 +28,7 @@
'label' => __( 'Max. Width (px)', 'ultimate-member' ),
'tooltip' => __( 'The maximum width of shortcode in pixels e.g. 600px', 'ultimate-member' ),
'value' => UM()->query()->get_meta_value('_um_login_max_width', null, um_get_option( 'login_max_width' ) ),
'conditional' => array( '_um_login_use_globals', '=', 1 )
'conditional' => array( '_um_login_use_custom_settings', '=', 1 )
),
array(
'id' => '_um_login_icons',
@@ -41,7 +41,7 @@
'label' => __( 'Show with label', 'ultimate-member' ),
'off' => __( 'Turn off', 'ultimate-member' )
),
'conditional' => array( '_um_login_use_globals', '=', 1 )
'conditional' => array( '_um_login_use_custom_settings', '=', 1 )
),
array(
'id' => '_um_login_primary_btn_word',
@@ -49,14 +49,14 @@
'label' => __( 'Primary Button Text', 'ultimate-member' ),
'tooltip' => __( 'Customize the button text', 'ultimate-member' ),
'value' => UM()->query()->get_meta_value( '_um_login_primary_btn_word', null, um_get_option( 'login_primary_btn_word' ) ),
'conditional' => array( '_um_login_use_globals', '=', 1 )
'conditional' => array( '_um_login_use_custom_settings', '=', 1 )
),
array(
'id' => '_um_login_secondary_btn',
'type' => 'checkbox',
'label' => __( 'Show Secondary Button', 'ultimate-member' ),
'value' => UM()->query()->get_meta_value( '_um_login_secondary_btn', null, 1 ),
'conditional' => array( '_um_login_use_globals', '=', 1 )
'conditional' => array( '_um_login_use_custom_settings', '=', 1 )
),
array(
'id' => '_um_login_secondary_btn_word',
@@ -71,14 +71,14 @@
'type' => 'checkbox',
'label' => __( 'Show Forgot Password Link?', 'ultimate-member' ),
'value' => UM()->query()->get_meta_value( '_um_login_forgot_pass_link', null, um_get_option('login_forgot_pass_link') ),
'conditional' => array( '_um_login_use_globals', '=', 1 )
'conditional' => array( '_um_login_use_custom_settings', '=', 1 )
),
array(
'id' => '_um_login_show_rememberme',
'type' => 'checkbox',
'label' => __( 'Show "Remember Me"?', 'ultimate-member' ),
'value' => UM()->query()->get_meta_value( '_um_login_show_rememberme', null, um_get_option('login_show_rememberme') ),
'conditional' => array( '_um_login_use_globals', '=', 1 )
'conditional' => array( '_um_login_use_custom_settings', '=', 1 )
),
)
) )->render_form(); ?>
includes/admin/templates/form/profile_customize.php
+18 -17
View File
@@ -11,11 +11,11 @@
'prefix_id' => 'form',
'fields' => array(
array(
'id' => '_um_profile_use_globals',
'id' => '_um_profile_use_custom_settings',
'type' => 'select',
'label' => __( 'Apply custom settings to this form', 'ultimate-member' ),
'tooltip' => __( 'Switch to yes if you want to customize this form settings, styling & appearance', 'ultimate-member' ),
'value' => UM()->query()->get_meta_value( '_um_profile_use_globals', null, 0 ),
'value' => UM()->query()->get_meta_value( '_um_profile_use_custom_settings', null, 0 ),
'options' => array(
0 => __( 'No', 'ultimate-member' ),
1 => __( 'Yes', 'ultimate-member' ),
@@ -24,10 +24,11 @@
array(
'id' => '_um_profile_role',
'type' => 'select',
'label' => __( 'Make this profile role-specific', 'ultimate-member' ),
'label' => __( 'Make this profile form role-specific', 'ultimate-member' ),
'tooltip' => __( 'Please note if you make a profile form specific to a role then you must make sure that every other role is assigned a profile form', 'ultimate-member' ),
'value' => ! empty( $profile_role ) ? $profile_role : 0,
'options' => UM()->roles()->get_roles( __( 'All roles', 'ultimate-member' ) ),
'conditional' => array( '_um_profile_use_globals', '=', 1 )
'conditional' => array( '_um_profile_use_custom_settings', '=', 1 )
),
array(
'id' => '_um_profile_template',
@@ -35,7 +36,7 @@
'label' => __( 'Template', 'ultimate-member' ),
'value' => UM()->query()->get_meta_value( '_um_profile_template', null, um_get_option( 'profile_template' ) ),
'options' => UM()->shortcodes()->get_templates( 'profile' ),
'conditional' => array( '_um_profile_use_globals', '=', 1 )
'conditional' => array( '_um_profile_use_custom_settings', '=', 1 )
),
array(
'id' => '_um_profile_max_width',
@@ -43,7 +44,7 @@
'label' => __( 'Max. Width (px)', 'ultimate-member' ),
'tooltip' => __( 'The maximum width of shortcode in pixels e.g. 600px', 'ultimate-member' ),
'value' => UM()->query()->get_meta_value('_um_profile_max_width', null, um_get_option( 'profile_max_width' ) ),
'conditional' => array( '_um_profile_use_globals', '=', 1 )
'conditional' => array( '_um_profile_use_custom_settings', '=', 1 )
),
array(
'id' => '_um_profile_area_max_width',
@@ -51,7 +52,7 @@
'label' => __( 'Profile Area Max. Width (px)', 'ultimate-member' ),
'tooltip' => __( 'The maximum width of the profile area inside profile (below profile header)', 'ultimate-member' ),
'value' => UM()->query()->get_meta_value('_um_profile_area_max_width', null, um_get_option( 'profile_area_max_width' ) ),
'conditional' => array( '_um_profile_use_globals', '=', 1 )
'conditional' => array( '_um_profile_use_custom_settings', '=', 1 )
),
array(
'id' => '_um_profile_icons',
@@ -64,7 +65,7 @@
'label' => __( 'Show with label', 'ultimate-member' ),
'off' => __( 'Turn off', 'ultimate-member' )
),
'conditional' => array( '_um_profile_use_globals', '=', 1 )
'conditional' => array( '_um_profile_use_custom_settings', '=', 1 )
),
array(
'id' => '_um_profile_primary_btn_word',
@@ -72,14 +73,14 @@
'label' => __( 'Primary Button Text', 'ultimate-member' ),
'tooltip' => __( 'Customize the button text', 'ultimate-member' ),
'value' => UM()->query()->get_meta_value( '_um_profile_primary_btn_word', null, um_get_option( 'profile_primary_btn_word' ) ),
'conditional' => array( '_um_profile_use_globals', '=', 1 )
'conditional' => array( '_um_profile_use_custom_settings', '=', 1 )
),
array(
'id' => '_um_profile_secondary_btn',
'type' => 'checkbox',
'label' => __( 'Show Secondary Button', 'ultimate-member' ),
'value' => UM()->query()->get_meta_value( '_um_profile_secondary_btn', null, 1 ),
'conditional' => array( '_um_profile_use_globals', '=', 1 )
'conditional' => array( '_um_profile_use_custom_settings', '=', 1 )
),
array(
'id' => '_um_profile_secondary_btn_word',
@@ -94,7 +95,7 @@
'type' => 'checkbox',
'label' => __( 'Enable Cover Photos', 'ultimate-member' ),
'value' => UM()->query()->get_meta_value( '_um_profile_cover_enabled', null, 1 ),
'conditional' => array( '_um_profile_use_globals', '=', 1 )
'conditional' => array( '_um_profile_use_custom_settings', '=', 1 )
),
array(
'id' => '_um_profile_cover_ratio',
@@ -115,7 +116,7 @@
'label' => __( 'Profile Photo Size', 'ultimate-member' ),
'tooltip' => __( 'Set the profile photo size in pixels here', 'ultimate-member' ),
'value' => UM()->query()->get_meta_value( '_um_profile_photosize', null, um_get_option( 'profile_photosize' ) ),
'conditional' => array( '_um_profile_use_globals', '=', 1 )
'conditional' => array( '_um_profile_use_custom_settings', '=', 1 )
),
array(
'id' => '_um_profile_photo_required',
@@ -123,28 +124,28 @@
'label' => __( 'Make Profile Photo Required', 'ultimate-member' ),
'tooltip' => __( 'Require user to update a profile photo when updating their profile', 'ultimate-member' ),
'value' => UM()->query()->get_meta_value( '_um_profile_photo_required' ),
'conditional' => array( '_um_profile_use_globals', '=', 1 )
'conditional' => array( '_um_profile_use_custom_settings', '=', 1 )
),
array(
'id' => '_um_profile_show_name',
'type' => 'checkbox',
'label' => __( 'Show display name in profile header?', 'ultimate-member' ),
'value' => UM()->query()->get_meta_value( '_um_profile_show_name', null, 1 ),
'conditional' => array( '_um_profile_use_globals', '=', 1 )
'conditional' => array( '_um_profile_use_custom_settings', '=', 1 )
),
array(
'id' => '_um_profile_show_social_links',
'type' => 'checkbox',
'label' => __( 'Show social links in profile header?', 'ultimate-member' ),
'value' => UM()->query()->get_meta_value( '_um_profile_show_social_links', null, 0 ),
'conditional' => array( '_um_profile_use_globals', '=', 1 )
'value' => UM()->query()->get_meta_value( '_um_profile_show_social_links', null, UM()->um_get_option( 'profile_show_social_links' ) ),
'conditional' => array( '_um_profile_use_custom_settings', '=', 1 )
),
array(
'id' => '_um_profile_show_bio',
'type' => 'checkbox',
'label' => __( 'Show user description in profile header?', 'ultimate-member' ),
'value' => UM()->query()->get_meta_value( '_um_profile_show_bio', null, 1 ),
'conditional' => array( '_um_profile_use_globals', '=', 1 )
'conditional' => array( '_um_profile_use_custom_settings', '=', 1 )
),
)
includes/admin/templates/form/profile_settings.php
+1
View File
@@ -15,6 +15,7 @@
'id' => '_um_profile_metafields',
'type' => 'multi_selects',
'label' => __( 'Field(s) to show in user meta', 'ultimate-member' ),
'tooltip' => __( 'Fields selected here will appear in the profile header area below the user\'s display name', 'ultimate-member' ),
'value' => $_um_search_fields,
'options' => $user_fields,
'add_text' => __( 'Add New Field', 'ultimate-member' ),
includes/admin/templates/form/register_customize.php
+8 -8
View File
@@ -11,11 +11,11 @@
'prefix_id' => 'form',
'fields' => array(
array(
'id' => '_um_register_use_globals',
'id' => '_um_register_use_custom_settings',
'type' => 'select',
'label' => __( 'Apply custom settings to this form', 'ultimate-member' ),
'tooltip' => __( 'Switch to yes if you want to customize this form settings, styling & appearance', 'ultimate-member' ),
'value' => UM()->query()->get_meta_value( '_um_register_use_globals', null, 0 ),
'value' => UM()->query()->get_meta_value( '_um_register_use_custom_settings', null, 0 ),
'options' => array(
0 => __( 'No', 'ultimate-member' ),
1 => __( 'Yes', 'ultimate-member' ),
@@ -27,7 +27,7 @@
'label' => __( 'Assign role to form', 'ultimate-member' ),
'value' => ! empty( $register_role ) ? $register_role : 0,
'options' => UM()->roles()->get_roles( __( 'Default', 'ultimate-member' ) ),
'conditional' => array( '_um_register_use_globals', '=', 1 )
'conditional' => array( '_um_register_use_custom_settings', '=', 1 )
),
array(
'id' => '_um_register_template',
@@ -35,7 +35,7 @@
'label' => __( 'Template', 'ultimate-member' ),
'value' => UM()->query()->get_meta_value( '_um_register_template', null, um_get_option( 'register_template' ) ),
'options' => UM()->shortcodes()->get_templates( 'register' ),
'conditional' => array( '_um_register_use_globals', '=', 1 )
'conditional' => array( '_um_register_use_custom_settings', '=', 1 )
),
array(
'id' => '_um_register_max_width',
@@ -43,7 +43,7 @@
'label' => __( 'Max. Width (px)', 'ultimate-member' ),
'tooltip' => __( 'The maximum width of shortcode in pixels e.g. 600px', 'ultimate-member' ),
'value' => UM()->query()->get_meta_value('_um_register_max_width', null, um_get_option( 'register_max_width' ) ),
'conditional' => array( '_um_register_use_globals', '=', 1 )
'conditional' => array( '_um_register_use_custom_settings', '=', 1 )
),
array(
'id' => '_um_register_icons',
@@ -56,7 +56,7 @@
'label' => __( 'Show with label', 'ultimate-member' ),
'off' => __( 'Turn off', 'ultimate-member' )
),
'conditional' => array( '_um_register_use_globals', '=', 1 )
'conditional' => array( '_um_register_use_custom_settings', '=', 1 )
),
array(
'id' => '_um_register_primary_btn_word',
@@ -64,14 +64,14 @@
'label' => __( 'Primary Button Text', 'ultimate-member' ),
'tooltip' => __( 'Customize the button text', 'ultimate-member' ),
'value' => UM()->query()->get_meta_value( '_um_register_primary_btn_word', null, um_get_option( 'register_primary_btn_word' ) ),
'conditional' => array( '_um_register_use_globals', '=', 1 )
'conditional' => array( '_um_register_use_custom_settings', '=', 1 )
),
array(
'id' => '_um_register_secondary_btn',
'type' => 'checkbox',
'label' => __( 'Show Secondary Button', 'ultimate-member' ),
'value' => UM()->query()->get_meta_value( '_um_register_secondary_btn', null, 1 ),
'conditional' => array( '_um_register_use_globals', '=', 1 )
'conditional' => array( '_um_register_use_custom_settings', '=', 1 )
),
array(
'id' => '_um_register_secondary_btn_word',