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

Last Sync

Browse Source
This commit is contained in:
ultimatemember
2015-01-14 00:09:28 +02:00
parent f9ec4c05d1
commit 605d2d6213
24 changed files with 1022 additions and 15928 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/assets/css/um-admin-modal.css
+1 -19
View File
@@ -208,24 +208,6 @@
padding-bottom: 22px !important;
}
p._icon_search{
position: relative;
width: 85% !important;
margin: 0 auto !important;
padding: 12px 0 0 0 !important;
}
p._icon_search:before {
position: absolute;
right: 6px;
top: 13px;
font-size: 18px;
content: "\ebe1";
font-family: "ultimatemember";
color: #aaa;
}
p._icon_search input[type=text]{padding-right: 40px!important}
.um-admin-icons {
padding: 0 0 15px 12px;
float: left;
@@ -235,7 +217,7 @@ p._icon_search input[type=text]{padding-right: 40px!important}
cursor: pointer;
float: left;
margin: 5px;
color: #bbb;
color: #777;
border: 4px solid #eee;
border-radius: 3px;
}
admin/assets/js/um-admin-dragdrop.js
+1 -1
View File
@@ -240,7 +240,7 @@ function UM_Rows_Refresh(){
function UM_Add_Icon(){
var add_icon_html = '<a href="#" class="um-admin-drag-add-field um-admin-tipsy-n" title="Add Field" data-modal="UM_fields" data-modal-size="normal" data-dynamic-content="um_admin_show_fields" data-arg2="'+jQuery('.um-admin-drag-ajax').data('form_id')+'" data-arg1=""><i class="um-icon-plus-add"></i></a>';
var add_icon_html = '<a href="#" class="um-admin-drag-add-field um-admin-tipsy-n" title="Add Field" data-modal="UM_fields" data-modal-size="normal" data-dynamic-content="um_admin_show_fields" data-arg2="'+jQuery('.um-admin-drag-ajax').data('form_id')+'" data-arg1=""><i class="um-icon-fontawesome-webfont-97"></i></a>';
jQuery('.um-admin-drag-col').each(function(){
if ( jQuery(this).find('.um-admin-drag-add-field').length == 0 ) {
admin/assets/js/um-admin-modal.js
+1 -14
View File
@@ -168,7 +168,7 @@ jQuery(document).ready(function() {
link.addClass('active');
} else {
content.hide();
link.find('i').removeClass().addClass('um-icon-plus-add');
link.find('i').removeClass().addClass('um-icon-fontawesome-webfont-97');
link.removeClass('active');
}
um_admin_modal_responsive();
@@ -276,18 +276,5 @@ jQuery(document).ready(function() {
element.find('.um-admin-icon-value').html('No icon selected.');
jQuery(this).hide();
});
/**
search font icons
**/
jQuery(document).on('keyup blur', '#_icon_search', function(){
if ( jQuery(this).val().toLowerCase() != '' ) {
jQuery('.um-admin-icons span').hide();
jQuery('.um-admin-icons span[data-code*="'+jQuery(this).val().toLowerCase()+'"]').show();
} else {
jQuery('.um-admin-icons span:hidden').show();
}
um_admin_modal_responsive();
});
});
admin/core/lib/ReduxFramework/ReduxCore/framework.php
+1 -1
View File
@@ -1329,7 +1329,7 @@
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' ) ){
if ( um_get_option('members_page' ) || !get_option('um_options') ){
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-modal.php
+4 -8
View File
@@ -20,9 +20,9 @@
<div class="um-admin-btn-toggle">
<?php if ( $in_edit ) { $metabox->in_edit = true; $metabox->edit_array = $edit_array; ?>
<a href="#"><i class="um-icon-plus-add"></i><?php _e('Manage conditional fields support'); ?></a> <?php $metabox->tooltip('Here you can setup conditional logic to show/hide this field based on specific fields value or conditions'); ?>
<a href="#"><i class="um-icon-fontawesome-webfont-97"></i><?php _e('Manage conditional fields support'); ?></a> <?php $metabox->tooltip('Here you can setup conditional logic to show/hide this field based on specific fields value or conditions'); ?>
<?php } else { ?>
<a href="#"><i class="um-icon-plus-add"></i><?php _e('Add conditional fields support'); ?></a> <?php $metabox->tooltip('Here you can setup conditional logic to show/hide this field based on specific fields value or conditions'); ?>
<a href="#"><i class="um-icon-fontawesome-webfont-97"></i><?php _e('Add conditional fields support'); ?></a> <?php $metabox->tooltip('Here you can setup conditional logic to show/hide this field based on specific fields value or conditions'); ?>
<?php } ?>
<div class="um-admin-btn-content">
@@ -44,7 +44,7 @@
<?php $metabox->field_input( '_conditional_value' . $k, $form_id ); ?>
<?php if ( $k == '' ) { ?>
<p><a href="#" class="um-admin-new-condition button um-admin-tipsy-n" title="Add new condition"><i class="um-icon-plus-add" style="margin-right:0!important"></i></a></p>
<p><a href="#" class="um-admin-new-condition button um-admin-tipsy-n" title="Add new condition"><i class="um-icon-fontawesome-webfont-97" style="margin-right:0!important"></i></a></p>
<?php } else { ?>
<p><a href="#" class="um-admin-remove-condition button um-admin-tipsy-n" title="Remove condition"><i class="um-icon-remove" style="margin-right:0!important"></i></a></p>
<?php } ?>
@@ -67,7 +67,7 @@
<?php $metabox->field_input( '_conditional_operator', $form_id ); ?>
<?php $metabox->field_input( '_conditional_value', $form_id ); ?>
<p><a href="#" class="um-admin-new-condition button um-admin-tipsy-n" title="Add new condition"><i class="um-icon-plus-add" style="margin-right:0!important"></i></a></p>
<p><a href="#" class="um-admin-new-condition button um-admin-tipsy-n" title="Add new condition"><i class="um-icon-fontawesome-webfont-97" style="margin-right:0!important"></i></a></p>
<div class="um-admin-clear"></div>
</div>
@@ -116,10 +116,6 @@
?>
<div class="um-admin-metabox">
<p class="_icon_search"><input type="text" name="_icon_search" id="_icon_search" value="" placeholder="<?php _e('Search Icons...','ultimatemember'); ?>" /></p>
</div>
<div class="um-admin-icons">
<?php foreach($ultimatemember->icons->all as $icon){ ?>
<span data-code="<?php echo $icon; ?>" title="<?php echo $icon; ?>" class="um-admin-tipsy-n"><i class="<?php echo $icon; ?>"></i></span>
admin/core/um-admin-builder.php
+3 -3
View File
@@ -89,7 +89,7 @@ class UM_Admin_Builder {
<!-- Master Row Actions -->
<div class="um-admin-drag-row-icons">
<a href="#" class="um-admin-drag-rowsub-add um-admin-tipsy-n" title="<?php _e('Add Row','ultimatemember'); ?>" data-row_action="add_subrow"><i class="um-icon-plus-add"></i></a>
<a href="#" class="um-admin-drag-rowsub-add um-admin-tipsy-n" title="<?php _e('Add Row','ultimatemember'); ?>" data-row_action="add_subrow"><i class="um-icon-fontawesome-webfont-97"></i></a>
<a href="#" class="um-admin-drag-row-edit um-admin-tipsy-n" title="<?php _e('Edit Row','ultimatemember'); ?>" data-modal="UM_edit_row" data-modal-size="normal" data-dynamic-content="um_admin_edit_field_popup" data-arg1="row" data-arg2="<?php echo $this->form_id; ?>" data-arg3="_um_row_1"><i class="um-icon-pencil-3"></i></a>
<span class="um-admin-drag-row-start"><i class="um-icon-cursor-move"></i></span>
</div><div class="um-admin-clear"></div>
@@ -155,7 +155,7 @@ class UM_Admin_Builder {
<!-- Master Row Actions -->
<div class="um-admin-drag-row-icons">
<a href="#" class="um-admin-drag-rowsub-add um-admin-tipsy-n" title="<?php _e('Add Row','ultimatemember'); ?>" data-row_action="add_subrow"><i class="um-icon-plus-add"></i></a>
<a href="#" class="um-admin-drag-rowsub-add um-admin-tipsy-n" title="<?php _e('Add Row','ultimatemember'); ?>" data-row_action="add_subrow"><i class="um-icon-fontawesome-webfont-97"></i></a>
<a href="#" class="um-admin-drag-row-edit um-admin-tipsy-n" title="<?php _e('Edit Row','ultimatemember'); ?>" data-modal="UM_edit_row" data-modal-size="normal" data-dynamic-content="um_admin_edit_field_popup" data-arg1="row" data-arg2="<?php echo $this->form_id; ?>" data-arg3="<?php echo $row_id; ?>"><i class="um-icon-pencil-3"></i></a>
<span class="um-admin-drag-row-start"><i class="um-icon-cursor-move"></i></span>
<?php if ( $row_id != '_um_row_1' ) {?>
@@ -226,7 +226,7 @@ class UM_Admin_Builder {
<div class="um-admin-drag-fld-title um-field-type-<?php echo $type; ?>">
<?php if ( $type == 'group' ) { ?>
<i class="um-icon-plus-add"></i>
<i class="um-icon-fontawesome-webfont-97"></i>
<?php } else if ( isset($keyarray['icon']) && !empty( $keyarray['icon'] ) ) { ?>
<i class="<?php echo $keyarray['icon']; ?>"></i>
<?php } ?><?php echo $title; ?></div>
admin/core/um-admin-dragdrop.php
+1 -1
View File
@@ -137,7 +137,7 @@ class UM_Admin_DragDrop {
<div class="um-col-demon-row" style="display:none;">
<div class="um-admin-drag-row-icons">
<a href="#" class="um-admin-drag-rowsub-add um-admin-tipsy-n" title="<?php _e('Add Row','ultimatemember'); ?>" data-row_action="add_subrow"><i class="um-icon-plus-add"></i></a>
<a href="#" class="um-admin-drag-rowsub-add um-admin-tipsy-n" title="<?php _e('Add Row','ultimatemember'); ?>" data-row_action="add_subrow"><i class="um-icon-fontawesome-webfont-97"></i></a>
<a href="#" class="um-admin-drag-row-edit um-admin-tipsy-n" title="<?php _e('Edit Row','ultimatemember'); ?>" data-modal="UM_edit_row" data-modal-size="normal" data-dynamic-content="um_admin_edit_field_popup" data-arg1="row" data-arg2="<?php echo get_the_ID(); ?>"><i class="um-icon-pencil-3"></i></a>
<span class="um-admin-drag-row-start"><i class="um-icon-cursor-move"></i></span>
<a href="#" class="um-admin-tipsy-n" title="<?php _e('Delete Row','ultimatemember'); ?>" data-remove_element="um-admin-drag-row"><i class="um-icon-trash-bin-3"></i></a>
admin/core/um-admin-metabox.php
+3 -3
View File
@@ -122,9 +122,9 @@ class UM_Admin_Metabox {
?>
<span class="um-admin-yesno">
<span class="btn pos-<?php echo $active; ?>"><i class="um-icon-circle-line"></i></span>
<span class="yes" data-value="1">Yes</span>
<span class="no" data-value="0">No</span>
<span class="btn pos-<?php echo $active; ?>"><i class="um-icon-fontawesome-webfont-432"></i></span>
<span class="yes" data-value="1"><?php _e('Yes','ultimatemember'); ?></span>
<span class="no" data-value="0"><?php _e('No','ultimatemember'); ?></span>
<input type="hidden" name="<?php echo $id; ?>" id="<?php echo $id; ?>" value="<?php echo $active; ?>" <?php echo $is_conditional; ?> />
</span>
admin/templates/dashboard.php
+1 -1
View File
@@ -24,7 +24,7 @@
<div class="um-admin-dash-main">
<?php $tabs = array('overview', 'analytics'); ?>
<?php $tabs = array('overview'); ?>
<?php foreach( $tabs as $tab ) { ?>
<div class="um-admin-dash-content" id="<?php echo $tab; ?>">
admin/templates/form/builder.php
+1 -1
View File
@@ -25,7 +25,7 @@
</div>
<div class="um-admin-drag-addrow um-admin-tipsy-n" title="<?php _e('Add Master Row','ultimatemember'); ?>" data-row_action="add_row"><i class="um-icon-plus-add"></i></div>
<div class="um-admin-drag-addrow um-admin-tipsy-n" title="<?php _e('Add Master Row','ultimatemember'); ?>" data-row_action="add_row"><i class="um-icon-fontawesome-webfont-97"></i></div>
</div>
admin/templates/form/profile_settings.php
+2 -2
View File
@@ -20,7 +20,7 @@
</select>
<?php if ( $i == 1 ) { ?>
<a href="#" class="um-admin-clone button um-admin-tipsy-n" title="New Field"><i class="um-icon-plus-add" style="margin-right:0!important"></i></a>
<a href="#" class="um-admin-clone button um-admin-tipsy-n" title="New Field"><i class="um-icon-fontawesome-webfont-97" style="margin-right:0!important"></i></a>
<?php } else { ?>
<a href="#" class="um-admin-clone-remove button um-admin-tipsy-n" title="Remove Field"><i class="um-icon-remove" style="margin-right:0!important"></i></a>
<?php } ?>
@@ -40,7 +40,7 @@
<?php } ?>
</select>
<a href="#" class="um-admin-clone button um-admin-tipsy-n" title="New Field"><i class="um-icon-plus-add" style="margin-right:0!important"></i></a>
<a href="#" class="um-admin-clone button um-admin-tipsy-n" title="New Field"><i class="um-icon-fontawesome-webfont-97" style="margin-right:0!important"></i></a>
</span>
assets/css/um-fonticons.css
+480 -11662
View File
File diff suppressed because it is too large Load Diff
assets/css/um-select.css
+2 -2
View File
@@ -192,7 +192,7 @@ Version: 3.4.8 Timestamp: Thu May 1 09:50:32 EDT 2014
}
.select2-container .select2-choice .select2-arrow:before {
content: "\e87a" !important;
content: "\e08d" !important;
font-size: 27px !important;
font-family: "ultimatemember" !important;
top: -1px !important;
@@ -241,7 +241,7 @@ Version: 3.4.8 Timestamp: Thu May 1 09:50:32 EDT 2014
}
.select2-search:before {
content: "\ebe1" !important;
content: "c" !important;
font-size: 22px !important;
height: 32px !important;
line-height: 32px !important;
assets/font/ultimatemember.eot
BIN
View File
Binary file not shown.
assets/font/ultimatemember.svg
+479 -4206
View File
File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 MiB

After

Width:  |  Height:  |  Size: 328 KiB

assets/font/ultimatemember.ttf
BIN
View File
Binary file not shown.
assets/font/ultimatemember.woff
BIN
View File
Binary file not shown.
core/um-actions-profile.php
+1 -1
View File
@@ -173,7 +173,7 @@
<?php } else { ?>
<?php if ( !isset( $ultimatemember->user->cannot_edit ) ) { ?>
<a href="#" class="um-cover-add um-manual-trigger" data-parent=".um-cover" data-child=".um-btn-auto-width"><span class="um-cover-add-i"><i class="um-icon-plus-add um-tip-n" title="<?php _e('Upload a cover photo','ultimatemember'); ?>"></i></span></a>
<a href="#" class="um-cover-add um-manual-trigger" data-parent=".um-cover" data-child=".um-btn-auto-width"><span class="um-cover-add-i"><i class="um-icon-fontawesome-webfont-97 um-tip-n" title="<?php _e('Upload a cover photo','ultimatemember'); ?>"></i></span></a>
<?php } ?>
<?php } ?>
core/um-cache.php
+18
View File
@@ -0,0 +1,18 @@
<?php
class UM_Cache {
function __construct() {
add_action( 'init', array(&$this, 'do_not_cache' ) );
}
function do_not_cache() {
if ( um_is_core_uri() )
define( "DONOTCACHEPAGE", true );
}
}
core/um-fields.php
+1 -1
View File
@@ -1512,7 +1512,7 @@ class UM_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-add"></i>'.$label.'</div>';
<div class="um-field-group-head"><i class="um-icon-fontawesome-webfont-97"></i>'.$label.'</div>';
$output .= '<div class="um-field-group-body"><a href="#" class="um-field-group-cancel"><i class="um-icon-remove"></i></a>';
foreach($fields as $subkey => $subdata) {
core/um-fonticons.php
+1 -1
View File
@@ -3,7 +3,7 @@
class UM_FontIcons {
function __construct() {
if ( !get_option('um_cache_fonticons') ) {
$file = um_path . 'assets/css/um-fonticons.css';
$css = file_get_contents($file);
core/um-short-functions.php
+18
View File
@@ -120,6 +120,24 @@
return false;
}
/***
*** @Is core URL
***/
function um_is_core_uri() {
global $ultimatemember;
$array = $ultimatemember->permalinks->core;
$current_url = trailingslashit( $ultimatemember->permalinks->get_current_url(true) );
if ( !isset( $array ) || !is_array( $array ) ) return false;
foreach( $array as $k => $id ) {
$page_url = trailingslashit( get_permalink( $id ) );
if ( strstr( $current_url, $page_url ) )
return true;
}
return false;
}
/***
*** @Check value of queried search in text input
***/
core/um-taxonomies.php
+1 -1
View File
@@ -49,7 +49,7 @@ class UM_Taxonomies {
)
);
if ( um_get_option('members_page') ){
if ( um_get_option('members_page') || !get_option('um_options') ){
register_post_type( 'um_directory', array(
'labels' => array(
um-init.php
+2
View File
@@ -53,6 +53,7 @@ class UM_API {
require_once um_path . 'core/um-logout.php';
require_once um_path . 'core/um-modal.php';
require_once um_path . 'core/um-cron.php';
require_once um_path . 'core/um-cache.php';
require_once um_path . 'core/lib/mobiledetect/Mobile_Detect.php';
@@ -116,6 +117,7 @@ class UM_API {
$this->logout = new UM_Logout();
$this->modal = new UM_Modal();
$this->cron = new UM_Cron();
$this->cache = new UM_Cache();
$this->mobile = new Mobile_Detect;