From b4d7f80d24aa10cca36da30b0c37217f8ed5a9ec Mon Sep 17 00:00:00 2001 From: ultimatemember Date: Wed, 14 Jan 2015 00:12:09 +0200 Subject: [PATCH] Revert "Last Sync" This reverts commit 605d2d62134fe509b623cad61757d5effe1a1636. --- admin/assets/css/um-admin-modal.css | 20 +- admin/assets/js/um-admin-dragdrop.js | 2 +- admin/assets/js/um-admin-modal.js | 15 +- .../ReduxFramework/ReduxCore/framework.php | 2 +- admin/core/um-admin-actions-modal.php | 12 +- admin/core/um-admin-builder.php | 6 +- admin/core/um-admin-dragdrop.php | 2 +- admin/core/um-admin-metabox.php | 6 +- admin/templates/dashboard.php | 2 +- admin/templates/form/builder.php | 2 +- admin/templates/form/profile_settings.php | 4 +- assets/css/um-fonticons.css | 12142 +++++++++++++++- assets/css/um-select.css | 4 +- assets/font/ultimatemember.eot | Bin 125904 -> 886756 bytes assets/font/ultimatemember.svg | 4685 +++++- assets/font/ultimatemember.ttf | Bin 125712 -> 886564 bytes assets/font/ultimatemember.woff | Bin 77296 -> 483560 bytes core/um-actions-profile.php | 2 +- core/um-cache.php | 18 - core/um-fields.php | 2 +- core/um-fonticons.php | 2 +- core/um-short-functions.php | 18 - core/um-taxonomies.php | 2 +- um-init.php | 2 - 24 files changed, 15928 insertions(+), 1022 deletions(-) delete mode 100644 core/um-cache.php diff --git a/admin/assets/css/um-admin-modal.css b/admin/assets/css/um-admin-modal.css index 1bcd7960..4e18099a 100644 --- a/admin/assets/css/um-admin-modal.css +++ b/admin/assets/css/um-admin-modal.css @@ -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; } diff --git a/admin/assets/js/um-admin-dragdrop.js b/admin/assets/js/um-admin-dragdrop.js index 0b549d93..42d8de82 100644 --- a/admin/assets/js/um-admin-dragdrop.js +++ b/admin/assets/js/um-admin-dragdrop.js @@ -240,7 +240,7 @@ function UM_Rows_Refresh(){ function UM_Add_Icon(){ - var add_icon_html = ''; + var add_icon_html = ''; jQuery('.um-admin-drag-col').each(function(){ if ( jQuery(this).find('.um-admin-drag-add-field').length == 0 ) { diff --git a/admin/assets/js/um-admin-modal.js b/admin/assets/js/um-admin-modal.js index c290253e..64232a29 100644 --- a/admin/assets/js/um-admin-modal.js +++ b/admin/assets/js/um-admin-modal.js @@ -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(); + }); }); \ No newline at end of file diff --git a/admin/core/lib/ReduxFramework/ReduxCore/framework.php b/admin/core/lib/ReduxFramework/ReduxCore/framework.php index afa2b330..3aed7790 100644 --- a/admin/core/lib/ReduxFramework/ReduxCore/framework.php +++ b/admin/core/lib/ReduxFramework/ReduxCore/framework.php @@ -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', '', '' ); } diff --git a/admin/core/um-admin-actions-modal.php b/admin/core/um-admin-actions-modal.php index 15358016..21eb273b 100644 --- a/admin/core/um-admin-actions-modal.php +++ b/admin/core/um-admin-actions-modal.php @@ -20,9 +20,9 @@
in_edit = true; $metabox->edit_array = $edit_array; ?> - tooltip('Here you can setup conditional logic to show/hide this field based on specific fields value or conditions'); ?> + tooltip('Here you can setup conditional logic to show/hide this field based on specific fields value or conditions'); ?> - tooltip('Here you can setup conditional logic to show/hide this field based on specific fields value or conditions'); ?> + tooltip('Here you can setup conditional logic to show/hide this field based on specific fields value or conditions'); ?>
@@ -44,7 +44,7 @@ field_input( '_conditional_value' . $k, $form_id ); ?> -

+

@@ -67,7 +67,7 @@ field_input( '_conditional_operator', $form_id ); ?> field_input( '_conditional_value', $form_id ); ?> -

+

@@ -116,6 +116,10 @@ ?> +
+

+
+
icons->all as $icon){ ?> diff --git a/admin/core/um-admin-builder.php b/admin/core/um-admin-builder.php index 5f95eb0c..1e808969 100644 --- a/admin/core/um-admin-builder.php +++ b/admin/core/um-admin-builder.php @@ -89,7 +89,7 @@ class UM_Admin_Builder {
- +
@@ -155,7 +155,7 @@ class UM_Admin_Builder {
- + @@ -226,7 +226,7 @@ class UM_Admin_Builder {
- +
diff --git a/admin/core/um-admin-dragdrop.php b/admin/core/um-admin-dragdrop.php index 5850ff29..8c8795c0 100644 --- a/admin/core/um-admin-dragdrop.php +++ b/admin/core/um-admin-dragdrop.php @@ -137,7 +137,7 @@ class UM_Admin_DragDrop {