mirror of
https://github.com/10h30/ultimatemember.git
synced 2026-06-05 15:09:37 +09:00
Bugfixes, Minor Update
This commit is contained in:
@@ -188,9 +188,13 @@
|
|||||||
- WP Editor
|
- 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 .um-admin-editor-h label,
|
||||||
.um-admin-modal-body.um-admin-metabox .wp-editor-wrap
|
.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 {
|
.um-admin-modal-body.um-admin-metabox .wp-editor-wrap textarea {
|
||||||
border: 0 !important;
|
border: 0 !important;
|
||||||
|
|||||||
@@ -386,6 +386,20 @@ class UM_Admin_Metabox {
|
|||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
case '_visibility':
|
||||||
|
?>
|
||||||
|
|
||||||
|
<p><label for="_visibility">Visibility <?php $this->tooltip('Where this field should appear?'); ?></label>
|
||||||
|
<select name="_visibility" id="_visibility" class="umaf-selectjs" style="width: 100%">
|
||||||
|
<option value="all" <?php selected( 'all', $this->edit_mode_value ); ?>>View everywhere</option>
|
||||||
|
<option value="edit" <?php selected( 'edit', $this->edit_mode_value ); ?>>Edit mode only</option>
|
||||||
|
<option value="view" <?php selected( 'view', $this->edit_mode_value ); ?>>View mode only</option>
|
||||||
|
</select>
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<?php
|
||||||
|
break;
|
||||||
|
|
||||||
case '_conditional_action':
|
case '_conditional_action':
|
||||||
case '_conditional_action1':
|
case '_conditional_action1':
|
||||||
case '_conditional_action2':
|
case '_conditional_action2':
|
||||||
|
|||||||
@@ -199,7 +199,7 @@
|
|||||||
background: rgba(0,0,0,.5);
|
background: rgba(0,0,0,.5);
|
||||||
text-align: center;
|
text-align: center;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
padding: 0 40px;
|
padding: 0;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
text-shadow: 0 1px #666;
|
text-shadow: 0 1px #666;
|
||||||
cursor: pointer !important;
|
cursor: pointer !important;
|
||||||
@@ -229,7 +229,6 @@
|
|||||||
.um-profile-photo-overlay i {
|
.um-profile-photo-overlay i {
|
||||||
font-size: 46px;
|
font-size: 46px;
|
||||||
display: block;
|
display: block;
|
||||||
margin-bottom: 6px;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@@ -28,14 +28,12 @@ div.uimob960 .uimob960-hide
|
|||||||
|
|
||||||
/********************************************/
|
/********************************************/
|
||||||
|
|
||||||
div.uimob340 .um-cover-overlay span.um-cover-overlay-t,
|
div.uimob340 .um-cover-overlay span.um-cover-overlay-t
|
||||||
div.uimob340 .um-profile-photo-overlay span.um-profile-photo-overlay-t
|
|
||||||
{
|
{
|
||||||
display: none !important;
|
display: none !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
div.uimob340 .um-cover-overlay,
|
div.uimob340 .um-cover-overlay
|
||||||
div.uimob340 .um-profile-photo-overlay
|
|
||||||
{
|
{
|
||||||
padding: 0;
|
padding: 0;
|
||||||
}
|
}
|
||||||
@@ -208,14 +206,12 @@ div.uimob340 .um-account-meta {
|
|||||||
|
|
||||||
/********************************************/
|
/********************************************/
|
||||||
|
|
||||||
div.uimob500 .um-cover-overlay span.um-cover-overlay-t,
|
div.uimob500 .um-cover-overlay span.um-cover-overlay-t
|
||||||
div.uimob500 .um-profile-photo-overlay span.um-profile-photo-overlay-t
|
|
||||||
{
|
{
|
||||||
display: none !important;
|
display: none !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
div.uimob500 .um-cover-overlay,
|
div.uimob500 .um-cover-overlay
|
||||||
div.uimob500 .um-profile-photo-overlay
|
|
||||||
{
|
{
|
||||||
padding: 0;
|
padding: 0;
|
||||||
}
|
}
|
||||||
@@ -453,13 +449,7 @@ div.uimob800 .um-header .um-profile-meta {
|
|||||||
padding-left: 200px;
|
padding-left: 200px;
|
||||||
}
|
}
|
||||||
|
|
||||||
div.uimob800 .um-profile-photo-overlay span.um-profile-photo-overlay-t
|
div.uimob800 .um-cover-overlay
|
||||||
{
|
|
||||||
display: none !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
div.uimob800 .um-cover-overlay,
|
|
||||||
div.uimob800 .um-profile-photo-overlay
|
|
||||||
{
|
{
|
||||||
padding: 0;
|
padding: 0;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -137,7 +137,6 @@
|
|||||||
<span class="um-profile-photo-overlay-s">
|
<span class="um-profile-photo-overlay-s">
|
||||||
<ins>
|
<ins>
|
||||||
<i class="um-icon-camera-5"></i>
|
<i class="um-icon-camera-5"></i>
|
||||||
<span class="um-profile-photo-overlay-t">'.__('Change your profile photo').'</span>
|
|
||||||
</ins>
|
</ins>
|
||||||
</span>
|
</span>
|
||||||
</span>';
|
</span>';
|
||||||
@@ -277,7 +276,7 @@
|
|||||||
|
|
||||||
<div class="um-profile-edit um-profile-headericon">
|
<div class="um-profile-edit um-profile-headericon">
|
||||||
|
|
||||||
<a href="#" class="um-profile-edit-a active um-profile-save"><i class="um-icon-check"></i></a>
|
<a href="#" class="um-profile-edit-a um-profile-save"><i class="um-icon-check"></i></a>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
+2
-2
@@ -354,7 +354,7 @@ class UM_Builtin {
|
|||||||
|
|
||||||
'block' => array(
|
'block' => array(
|
||||||
'name' => 'Content Block',
|
'name' => 'Content Block',
|
||||||
'col1' => array('_title'),
|
'col1' => array('_title','_visibility'),
|
||||||
'col2' => array('_public','_roles'),
|
'col2' => array('_public','_roles'),
|
||||||
'col_full' => array('_content'),
|
'col_full' => array('_content'),
|
||||||
'mce_content' => true,
|
'mce_content' => true,
|
||||||
@@ -372,7 +372,7 @@ class UM_Builtin {
|
|||||||
|
|
||||||
'shortcode' => array(
|
'shortcode' => array(
|
||||||
'name' => 'Shortcode',
|
'name' => 'Shortcode',
|
||||||
'col1' => array('_title'),
|
'col1' => array('_title','_visibility'),
|
||||||
'col2' => array('_public','_roles'),
|
'col2' => array('_public','_roles'),
|
||||||
'col_full' => array('_content'),
|
'col_full' => array('_content'),
|
||||||
'validate' => array(
|
'validate' => array(
|
||||||
|
|||||||
+36
-2
@@ -748,6 +748,8 @@ class UM_Fields {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ( !isset( $array['visibility'] ) ) $array['visibility'] = 'all';
|
||||||
|
|
||||||
return $array;
|
return $array;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -769,6 +771,8 @@ class UM_Fields {
|
|||||||
|
|
||||||
if ( isset( $data['in_group'] ) && $data['in_group'] != '' && $rule != 'group' ) return;
|
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_view_field( $data ) ) return;
|
||||||
if ( !um_can_edit_field( $data ) ) return;
|
if ( !um_can_edit_field( $data ) ) return;
|
||||||
|
|
||||||
@@ -784,7 +788,7 @@ class UM_Fields {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Begin by field type */
|
/* Begin by field type */
|
||||||
|
|
||||||
switch( $type ) {
|
switch( $type ) {
|
||||||
@@ -1779,7 +1783,13 @@ class UM_Fields {
|
|||||||
|
|
||||||
if ( isset( $data['in_group'] ) && $data['in_group'] != '' && $rule != 'group' ) return;
|
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;
|
if ( !um_can_view_field( $data ) ) return;
|
||||||
|
|
||||||
@@ -1802,6 +1812,30 @@ class UM_Fields {
|
|||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
/* HTML */
|
||||||
|
case 'block':
|
||||||
|
$output .= '<div class="um-field ' . $classes . '">
|
||||||
|
<div class="um-field-block">'.$content.'</div>
|
||||||
|
</div>';
|
||||||
|
break;
|
||||||
|
|
||||||
|
/* Shortcode */
|
||||||
|
case 'shortcode':
|
||||||
|
$output .= '<div class="um-field ' . $classes . '">
|
||||||
|
<div class="um-field-shortcode">'.do_shortcode($content).'</div>
|
||||||
|
</div>';
|
||||||
|
break;
|
||||||
|
|
||||||
|
/* Gap/Space */
|
||||||
|
case 'spacing':
|
||||||
|
$output .= '<div class="um-field-spacing" style="height: '.$spacing.'"></div>';
|
||||||
|
break;
|
||||||
|
|
||||||
|
/* A line divider */
|
||||||
|
case 'divider':
|
||||||
|
$output .= '<div class="um-field-divider" style="border-bottom: '.$borderwidth.'px '.$borderstyle.' '.$bordercolor.'"></div>';
|
||||||
|
break;
|
||||||
|
|
||||||
/* Rating */
|
/* Rating */
|
||||||
case 'rating':
|
case 'rating':
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user