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

CSS conflicts fixed

Browse Source
This commit is contained in:
ultimatemember
2015-01-11 19:07:55 +02:00
parent 4a6d8c5df5
commit 49a262fa18
36 changed files with 266 additions and 309 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/core/lib/ReduxFramework/ReduxCore/framework.php
+3 -1
View File
@@ -1327,9 +1327,11 @@
add_submenu_page( $this->slug, __('Forms', $this->slug), __('Forms', $this->slug), 'manage_options', 'edit.php?post_type=um_form', '', '' );
add_submenu_page( $this->slug, __('Member Levels', $this->slug), __('Member Levels', $this->slug), 'manage_options', 'edit.php?post_type=um_role', '', '' );
add_submenu_page( $this->slug, __('User Roles', $this->slug), __('User Roles', $this->slug), 'manage_options', 'edit.php?post_type=um_role', '', '' );
if ( um_get_option('members_page' ) ){
add_submenu_page( $this->slug, __('Member Directories', $this->slug), __('Member Directories', $this->slug), 'manage_options', 'edit.php?post_type=um_directory', '', '' );
}
}
admin/core/um-admin-actions-fields.php
+1 -1
View File
@@ -31,7 +31,7 @@
$save[ $_metakey ]['icon'] = '';
foreach( $array['post'] as $key => $val){
if ( substr( $key, 0, 1) === '_' ) { // field attribute
if ( substr( $key, 0, 1) === '_' && $val != '' ) { // field attribute
$new_key = ltrim ($key,'_');
if ( $new_key == 'options' ) {
admin/core/um-admin-enqueue.php
-5
View File
@@ -23,11 +23,6 @@ class UM_Admin_Enqueue {
***/
function admin_footer_text() {
$copyright = sprintf(__('Thank you for creating with <a href="http://ultimatemember.com">Ultimate Member</a> and <a href="https://wordpress.org">WordPress</a>.','ultimatemember'));
if ( um_get_option('admin_load_time') == 1 ) {
$copyright .= '<br />' . sprintf(__('%1$s queries made in %2$s seconds','ultimatemember'), get_num_queries(), timer_stop(0) );
}
return '<span id="footer-thankyou">' . $copyright . '</span>';
}
admin/core/um-admin-metabox.php
+1
View File
@@ -309,6 +309,7 @@ class UM_Admin_Metabox {
// save
delete_post_meta( $post_id, '_um_can_view_roles' );
delete_post_meta( $post_id, '_um_can_edit_roles' );
delete_post_meta( $post_id, '_um_can_delete_roles' );
foreach( $_POST as $k => $v ) {
if (strstr($k, '_um_')){
update_post_meta( $post_id, $k, $v);
admin/templates/directory/search.php
+2 -2
View File
@@ -76,7 +76,7 @@
<label class="um-admin-half"><?php _e('Results Text','ultimatemember'); ?> <?php $this->tooltip('Customize the search result text . e.g. Found 3,000 Members. Leave this blank to not show result text'); ?></label>
<span class="um-admin-half">
<input type="text" name="_um_directory_header" id="_um_directory_header" value="<?php echo $ultimatemember->query->get_meta_value('_um_directory_header', null, um_get_option('directory_header') ); ?>" />
<input type="text" name="_um_directory_header" id="_um_directory_header" value="<?php echo $ultimatemember->query->get_meta_value('_um_directory_header', null, __('{total_users} Members','ultimatemember') ); ?>" />
</span>
</p><div class="um-admin-clear"></div>
@@ -85,7 +85,7 @@
<label class="um-admin-half"><?php _e('Custom text If no users were found','ultimatemember'); ?> <?php $this->tooltip('This is the text that is displayed if no users are found during a search'); ?></label>
<span class="um-admin-half">
<input type="text" name="_um_directory_no_users" id="_um_directory_no_users" value="<?php echo $ultimatemember->query->get_meta_value('_um_directory_no_users', null, um_get_option('directory_no_users') ); ?>" />
<input type="text" name="_um_directory_no_users" id="_um_directory_no_users" value="<?php echo $ultimatemember->query->get_meta_value('_um_directory_no_users', null, __('We are sorry. We cannot find any users who match your search criteria.','ultimatemember') ); ?>" />
</span>
</p><div class="um-admin-clear"></div>
admin/templates/role/delete.php
+2 -2
View File
@@ -3,7 +3,7 @@
<div class="">
<p>
<label class="um-admin-half"><?php _e('Action to be taken after account is deleted','ultimatemember'); ?> <?php $this->tooltip('', 'e'); ?></label>
<label class="um-admin-half"><?php _e('Action to be taken after account is deleted','ultimatemember'); ?> <?php $this->tooltip( __('Select what happens when a user with this role deletes their own account','ultimatemember') ); ?></label>
<span class="um-admin-half">
<select name="_um_after_delete" id="_um_after_delete" class="umaf-selectjs um-adm-conditional" style="width: 300px" data-cond1="redirect_url" data-cond1-show="_um_after_delete">
@@ -15,7 +15,7 @@
</p><div class="um-admin-clear"></div>
<p class="_um_after_delete">
<label class="um-admin-half" for="_um_delete_redirect_url"><?php _e('Set Custom Redirect URL','ultimatemember'); ?> <?php $this->tooltip('', 'e'); ?></label>
<label class="um-admin-half" for="_um_delete_redirect_url"><?php _e('Set Custom Redirect URL','ultimatemember'); ?> <?php $this->tooltip( __('Set a url to redirect this user role to after they delete account','ultimatemember') ); ?></label>
<span class="um-admin-half">
<input type="text" value="<?php echo $ultimatemember->query->get_meta_value('_um_delete_redirect_url', null, 'na'); ?>" name="_um_delete_redirect_url" id="_um_delete_redirect_url" />
admin/templates/role/general.php
+1 -11
View File
@@ -6,17 +6,7 @@
<label class="um-admin-half"><?php _e('Can edit their profile?','ultimatemember'); ?> <?php $this->tooltip('Can this role edit his own profile?'); ?></label>
<span class="um-admin-half"><?php $this->ui_on_off('_um_can_edit_profile', 1); ?></span>
</p><div class="um-admin-clear"></div>
<p>
<label class="um-admin-half"><?php _e('Can upload pictures?','ultimatemember'); ?> <?php $this->tooltip('Can upload pictures, and photos to his profile'); ?></label>
<span class="um-admin-half"><?php $this->ui_on_off('_um_can_upload_pics', 1); ?></span>
</p><div class="um-admin-clear"></div>
<p>
<label class="um-admin-half"><?php _e('Can upload files?','ultimatemember'); ?> <?php $this->tooltip('Can this role upload files and documents in his profile'); ?></label>
<span class="um-admin-half"><?php $this->ui_on_off('_um_can_upload_files', 1); ?></span>
</p><div class="um-admin-clear"></div>
<p>
<label class="um-admin-half"><?php _e('Can delete their account?','ultimatemember'); ?> <?php $this->tooltip('Allow this role to delete their account and end their membership on your site'); ?></label>
<span class="um-admin-half"><?php $this->ui_on_off('_um_can_delete_profile', 1); ?></span>
admin/templates/role/home.php
+2 -2
View File
@@ -3,7 +3,7 @@
<div class="">
<p>
<label class="um-admin-half"><?php _e('Can view default homepage?','ultimatemember'); ?> <?php $this->tooltip('', 'e'); ?></label>
<label class="um-admin-half"><?php _e('Can view default homepage?','ultimatemember'); ?> <?php $this->tooltip( __('Allow this user role to view your site\'s homepage','ultimatemember') ); ?></label>
<span class="um-admin-half">
<?php $this->ui_on_off('_um_default_homepage', 1, true, 1, 'xxx', 'redirect-home-url'); ?>
@@ -12,7 +12,7 @@
</p><div class="um-admin-clear"></div>
<p class="redirect-home-url">
<label class="um-admin-half" for="_um_redirect_homepage"><?php _e('Custom Homepage Redirect','ultimatemember'); ?> <?php $this->tooltip('', 'e'); ?></label>
<label class="um-admin-half" for="_um_redirect_homepage"><?php _e('Custom Homepage Redirect','ultimatemember'); ?> <?php $this->tooltip( __('Set a url to redirect this user role to if they try to view your site\'s homepage ','ultimatemember') ); ?></label>
<span class="um-admin-half">
<input type="text" value="<?php echo $ultimatemember->query->get_meta_value('_um_redirect_homepage', null, 'na'); ?>" name="_um_redirect_homepage" id="_um_redirect_homepage" />
admin/templates/role/login.php
+2 -2
View File
@@ -3,7 +3,7 @@
<div class="">
<p>
<label class="um-admin-half"><?php _e('Action to be taken after login','ultimatemember'); ?> <?php $this->tooltip('', 'e'); ?></label>
<label class="um-admin-half"><?php _e('Action to be taken after login','ultimatemember'); ?> <?php $this->tooltip( __('Select what happens when a user with this role logins to your site','ultimatemember') ); ?></label>
<span class="um-admin-half">
<select name="_um_after_login" id="_um_after_login" class="umaf-selectjs um-adm-conditional" style="width: 300px" data-cond1="redirect_url" data-cond1-show="_um_after_login">
@@ -17,7 +17,7 @@
</p><div class="um-admin-clear"></div>
<p class="_um_after_login">
<label class="um-admin-half" for="_um_login_redirect_url"><?php _e('Set Custom Redirect URL','ultimatemember'); ?> <?php $this->tooltip('', 'e'); ?></label>
<label class="um-admin-half" for="_um_login_redirect_url"><?php _e('Set Custom Redirect URL','ultimatemember'); ?> <?php $this->tooltip( __('Set a url to redirect this user role to after they login with their account','ultimatemember') ); ?></label>
<span class="um-admin-half">
<input type="text" value="<?php echo $ultimatemember->query->get_meta_value('_um_login_redirect_url', null, 'na'); ?>" name="_um_login_redirect_url" id="_um_login_redirect_url" />
admin/templates/role/logout.php
+2 -2
View File
@@ -3,7 +3,7 @@
<div class="">
<p>
<label class="um-admin-half"><?php _e('Action to be taken after logout','ultimatemember'); ?> <?php $this->tooltip('', 'e'); ?></label>
<label class="um-admin-half"><?php _e('Action to be taken after logout','ultimatemember'); ?> <?php $this->tooltip( __('Select what happens when a user with this role logouts of your site','ultimatemember') ); ?></label>
<span class="um-admin-half">
<select name="_um_after_logout" id="_um_after_logout" class="umaf-selectjs um-adm-conditional" style="width: 300px" data-cond1="redirect_url" data-cond1-show="_um_after_logout">
@@ -15,7 +15,7 @@
</p><div class="um-admin-clear"></div>
<p class="_um_after_logout">
<label class="um-admin-half" for="_um_logout_redirect_url"><?php _e('Set Custom Redirect URL','ultimatemember'); ?> <?php $this->tooltip('', 'e'); ?></label>
<label class="um-admin-half" for="_um_logout_redirect_url"><?php _e('Set Custom Redirect URL','ultimatemember'); ?> <?php $this->tooltip( __('Set a url to redirect this user role to after they logout from site','ultimatemember') ); ?></label>
<span class="um-admin-half">
<input type="text" value="<?php echo $ultimatemember->query->get_meta_value('_um_logout_redirect_url', null, 'na'); ?>" name="_um_logout_redirect_url" id="_um_logout_redirect_url" />
admin/templates/role/profile.php
+1 -1
View File
@@ -26,7 +26,7 @@
</p><div class="um-admin-clear"></div>
<p>
<label class="um-admin-half"><?php _e('Can view/access private profiles?','ultimatemember'); ?> <?php $this->tooltip( __('Can this role edit his own profile?','ultimatemember') ); ?></label>
<label class="um-admin-half"><?php _e('Can view/access private profiles?','ultimatemember'); ?> <?php $this->tooltip( __('Can this role view private profiles?','ultimatemember') ); ?></label>
<span class="um-admin-half"><?php $this->ui_on_off('_um_can_access_private_profile'); ?></span>
</p><div class="um-admin-clear"></div>
admin/templates/role/register.php
+11 -11
View File
@@ -3,7 +3,7 @@
<div class="">
<p>
<label class="um-admin-half"><?php _e('Registration Status','ultimatemember'); ?> <?php $this->tooltip('', 'e'); ?></label>
<label class="um-admin-half"><?php _e('Registration Status','ultimatemember'); ?> <?php $this->tooltip( __('Select the status you would like this user role to have after they register on your site','ultimatemember') ); ?></label>
<span class="um-admin-half">
<select name="_um_status" id="_um_status" class="umaf-selectjs um-adm-conditional" style="width: 300px"
@@ -22,7 +22,7 @@
<div class="approved">
<p>
<label class="um-admin-half"><?php _e('Action to be taken after registration','ultimatemember'); ?> <?php $this->tooltip('', 'e'); ?></label>
<label class="um-admin-half"><?php _e('Action to be taken after registration','ultimatemember'); ?> <?php $this->tooltip( __('Select what action is taken after a person registers on your site. Depending on the status you can redirect them to their profile, a custom url or show a custom message','ultimatemember') ); ?></label>
<span class="um-admin-half">
<select name="_um_auto_approve_act" id="_um_auto_approve_act" class="umaf-selectjs um-adm-conditional" style="width: 300px" data-cond1="redirect_url" data-cond1-show="_um_auto_approve_act">
@@ -34,7 +34,7 @@
</p><div class="um-admin-clear"></div>
<p class="_um_auto_approve_act">
<label class="um-admin-half" for="_um_auto_approve_url"><?php _e('Set Custom Redirect URL','ultimatemember'); ?> <?php $this->tooltip('', 'e'); ?></label>
<label class="um-admin-half" for="_um_auto_approve_url"><?php _e('Set Custom Redirect URL','ultimatemember'); ?></label>
<span class="um-admin-half">
<input type="text" value="<?php echo $ultimatemember->query->get_meta_value('_um_auto_approve_url', null, 'na'); ?>" name="_um_auto_approve_url" id="_um_auto_approve_url" />
@@ -49,7 +49,7 @@
<div class="checkmail">
<p>
<label class="um-admin-half"><?php _e('Action to be taken after registration','ultimatemember'); ?> <?php $this->tooltip('', 'e'); ?></label>
<label class="um-admin-half"><?php _e('Action to be taken after registration','ultimatemember'); ?> <?php $this->tooltip( __('Select what action is taken after a person registers on your site. Depending on the status you can redirect them to their profile, a custom url or show a custom message','ultimatemember') ); ?></label>
<span class="um-admin-half">
<select name="_um_checkmail_action" id="_um_checkmail_action" class="umaf-selectjs um-adm-conditional" style="width: 300px"
@@ -63,16 +63,16 @@
</p><div class="um-admin-clear"></div>
<p class="_um_checkmail_action-1">
<label class="um-admin-half"><?php _e('Personalize the custom message','ultimatemember'); ?> <?php $this->tooltip('', 'e'); ?></label>
<label class="um-admin-half"><?php _e('Personalize the custom message','ultimatemember'); ?></label>
<span class="um-admin-half">
<textarea name="_um_checkmail_message" id="_um_checkmail_message"><?php echo $ultimatemember->query->get_meta_value('_um_checkmail_message', null, 'na'); ?></textarea>
<textarea name="_um_checkmail_message" id="_um_checkmail_message"><?php echo $ultimatemember->query->get_meta_value('_um_checkmail_message', null, __('Thank you for registering. Before you can login we need you to activate your account by clicking the activation link in the email we just sent you.','ultimatemember') ); ?></textarea>
</span>
</p><div class="um-admin-clear"></div>
<p class="_um_checkmail_action-2">
<label class="um-admin-half" for="_um_checkmail_url"><?php _e('Set Custom Redirect URL','ultimatemember'); ?> <?php $this->tooltip('', 'e'); ?></label>
<label class="um-admin-half" for="_um_checkmail_url"><?php _e('Set Custom Redirect URL','ultimatemember'); ?></label>
<span class="um-admin-half">
<input type="text" value="<?php echo $ultimatemember->query->get_meta_value('_um_checkmail_url', null, 'na'); ?>" name="_um_checkmail_url" id="_um_checkmail_url" />
@@ -87,7 +87,7 @@
<div class="pending">
<p>
<label class="um-admin-half"><?php _e('Action to be taken after registration','ultimatemember'); ?> <?php $this->tooltip('', 'e'); ?></label>
<label class="um-admin-half"><?php _e('Action to be taken after registration','ultimatemember'); ?> <?php $this->tooltip( __('Select what action is taken after a person registers on your site. Depending on the status you can redirect them to their profile, a custom url or show a custom message','ultimatemember') ); ?></label>
<span class="um-admin-half">
<select name="_um_pending_action" id="_um_pending_action" class="umaf-selectjs um-adm-conditional" style="width: 300px"
@@ -101,16 +101,16 @@
</p><div class="um-admin-clear"></div>
<p class="_um_pending_action-1">
<label class="um-admin-half"><?php _e('Personalize the custom message','ultimatemember'); ?> <?php $this->tooltip('', 'e'); ?></label>
<label class="um-admin-half"><?php _e('Personalize the custom message','ultimatemember'); ?></label>
<span class="um-admin-half">
<textarea name="_um_pending_message" id="_um_pending_message"><?php echo $ultimatemember->query->get_meta_value('_um_pending_message', null, 'na'); ?></textarea>
<textarea name="_um_pending_message" id="_um_pending_message"><?php echo $ultimatemember->query->get_meta_value('_um_pending_message', null, __('Thank you for applying for membership to our site. We will review your details and send you an email letting you know whether your application has been successful or not.','ultimatemember') ); ?></textarea>
</span>
</p><div class="um-admin-clear"></div>
<p class="_um_pending_action-2">
<label class="um-admin-half" for="_um_pending_url"><?php _e('Set Custom Redirect URL','ultimatemember'); ?> <?php $this->tooltip('', 'e'); ?></label>
<label class="um-admin-half" for="_um_pending_url"><?php _e('Set Custom Redirect URL','ultimatemember'); ?></label>
<span class="um-admin-half">
<input type="text" value="<?php echo $ultimatemember->query->get_meta_value('_um_pending_url', null, 'na'); ?>" name="_um_pending_url" id="_um_pending_url" />