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

Revert "Last Sync"

Browse Source 
This reverts commit 605d2d6213.
This commit is contained in:
ultimatemember
2015-01-14 00:12:09 +02:00
parent c4e6ef4933
commit b4d7f80d24
24 changed files with 15928 additions and 1022 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/assets/css/um-admin-modal.css
+19 -1
View File
@@ -208,6 +208,24 @@
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;
@@ -217,7 +235,7 @@
cursor: pointer;
float: left;
margin: 5px;
color: #777;
color: #bbb;
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-fontawesome-webfont-97"></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-plus-add"></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
+14 -1
View File
@@ -168,7 +168,7 @@ jQuery(document).ready(function() {
link.addClass('active');
} else {
content.hide();
link.find('i').removeClass().addClass('um-icon-fontawesome-webfont-97');
link.find('i').removeClass().addClass('um-icon-plus-add');
link.removeClass('active');
}
um_admin_modal_responsive();
@@ -276,5 +276,18 @@ 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' ) || !get_option('um_options') ){
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-modal.php
+8 -4
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-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'); ?>
<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'); ?>
<?php } else { ?>
<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'); ?>
<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'); ?>
<?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-fontawesome-webfont-97" 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-plus-add" 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-fontawesome-webfont-97" 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-plus-add" style="margin-right:0!important"></i></a></p>
<div class="um-admin-clear"></div>
</div>
@@ -116,6 +116,10 @@
?>
<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-fontawesome-webfont-97"></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-plus-add"></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-fontawesome-webfont-97"></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-plus-add"></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-fontawesome-webfont-97"></i>
<i class="um-icon-plus-add"></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-fontawesome-webfont-97"></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-plus-add"></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-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>
<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>
<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'); ?>
<?php $tabs = array('overview', 'analytics'); ?>
<?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-fontawesome-webfont-97"></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-plus-add"></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-fontawesome-webfont-97" 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-plus-add" 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-fontawesome-webfont-97" 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-plus-add" style="margin-right:0!important"></i></a>
</span>