From 71eb997b4d5a6cd204ee9e61db47e8ee4fb30ac8 Mon Sep 17 00:00:00 2001 From: ultimatemember Date: Wed, 7 Jan 2015 00:12:03 +0200 Subject: [PATCH] Bugfixes, Minor Update --- admin/assets/css/um-admin-modal.css | 6 ++++- admin/core/um-admin-metabox.php | 14 +++++++++++ assets/css/um-profile.css | 3 +-- assets/css/um-responsive.css | 20 ++++----------- core/um-actions-profile.php | 3 +-- core/um-builtin.php | 4 +-- core/um-fields.php | 38 +++++++++++++++++++++++++++-- 7 files changed, 64 insertions(+), 24 deletions(-) diff --git a/admin/assets/css/um-admin-modal.css b/admin/assets/css/um-admin-modal.css index c3f6152b..4e18099a 100644 --- a/admin/assets/css/um-admin-modal.css +++ b/admin/assets/css/um-admin-modal.css @@ -188,9 +188,13 @@ - WP Editor */ +.um-admin-modal-body.um-admin-metabox .um-admin-editor-h { + margin-top: 12px; +} + .um-admin-modal-body.um-admin-metabox .um-admin-editor-h label, .um-admin-modal-body.um-admin-metabox .wp-editor-wrap -{margin: 0 0 10px 0 !important} +{margin: 0 0 4px 0 !important} .um-admin-modal-body.um-admin-metabox .wp-editor-wrap textarea { border: 0 !important; diff --git a/admin/core/um-admin-metabox.php b/admin/core/um-admin-metabox.php index 11e54ae9..b20f687e 100644 --- a/admin/core/um-admin-metabox.php +++ b/admin/core/um-admin-metabox.php @@ -386,6 +386,20 @@ class UM_Admin_Metabox { break; + case '_visibility': + ?> + +

+ +

+ + - '.__('Change your profile photo').' '; @@ -277,7 +276,7 @@
- +
diff --git a/core/um-builtin.php b/core/um-builtin.php index 4e748a7d..929e62ba 100644 --- a/core/um-builtin.php +++ b/core/um-builtin.php @@ -354,7 +354,7 @@ class UM_Builtin { 'block' => array( 'name' => 'Content Block', - 'col1' => array('_title'), + 'col1' => array('_title','_visibility'), 'col2' => array('_public','_roles'), 'col_full' => array('_content'), 'mce_content' => true, @@ -372,7 +372,7 @@ class UM_Builtin { 'shortcode' => array( 'name' => 'Shortcode', - 'col1' => array('_title'), + 'col1' => array('_title','_visibility'), 'col2' => array('_public','_roles'), 'col_full' => array('_content'), 'validate' => array( diff --git a/core/um-fields.php b/core/um-fields.php index 0cdd4a65..f1432b1d 100644 --- a/core/um-fields.php +++ b/core/um-fields.php @@ -748,6 +748,8 @@ class UM_Fields { } + if ( !isset( $array['visibility'] ) ) $array['visibility'] = 'all'; + return $array; } @@ -769,6 +771,8 @@ class UM_Fields { if ( isset( $data['in_group'] ) && $data['in_group'] != '' && $rule != 'group' ) return; + if ( $visibility == 'view' ) return; + if ( !um_can_view_field( $data ) ) return; if ( !um_can_edit_field( $data ) ) return; @@ -784,7 +788,7 @@ class UM_Fields { return; } } - + /* Begin by field type */ switch( $type ) { @@ -1779,7 +1783,13 @@ class UM_Fields { if ( isset( $data['in_group'] ) && $data['in_group'] != '' && $rule != 'group' ) return; - if ( ! $this->field_value( $key, $default, $data ) ) return; + if ( $visibility == 'edit' ) return; + + if ( in_array( $type, array('block','shortcode','spacing','divider','group') ) ) { + + } else { + if ( ! $this->field_value( $key, $default, $data ) ) return; + } if ( !um_can_view_field( $data ) ) return; @@ -1802,6 +1812,30 @@ class UM_Fields { break; + /* HTML */ + case 'block': + $output .= '
+
'.$content.'
+
'; + break; + + /* Shortcode */ + case 'shortcode': + $output .= '
+
'.do_shortcode($content).'
+
'; + break; + + /* Gap/Space */ + case 'spacing': + $output .= '
'; + break; + + /* A line divider */ + case 'divider': + $output .= '
'; + break; + /* Rating */ case 'rating':