Merge pull request #64 from purplewhite/master

Bugfix Cover thumb sizes
This commit is contained in:
Ultimate Member
2015-12-30 16:56:43 +02:00
4 changed files with 42 additions and 5 deletions
+10
View File
@@ -428,6 +428,16 @@ p.um-notice.warning {
outline: none !important;
}
.um-form .wp-editor-container {
border: 1px solid #ddd;
}
.um-form .wp-editor-container textarea {
background: #ddd !important;
color: #222 !important;
border-radius: 0;
}
/*
- Radio & Checkboxes
*/
+1 -1
View File
File diff suppressed because one or more lines are too long
+4 -2
View File
@@ -228,10 +228,12 @@
<?php if ($cover_photos) {
$sizes = um_get_option('cover_thumb_sizes');
if ( $ultimatemember->mobile->isTablet() ) {
$cover_size = 600;
$cover_size = $sizes[1];
} else {
$cover_size = 300;
$cover_size = $sizes[0];
}
?>
+27 -2
View File
@@ -1219,8 +1219,33 @@ class UM_Fields {
$output .= '<div class="um-field-area">';
$output .= '<textarea style="height: '.$height.';" class="'.$this->get_class($key, $data).'" name="'.$key.'" id="'.$key.'" placeholder="'.$placeholder.'">'.$this->field_value( $key, $default, $data ).'</textarea>
if ( isset( $data['html'] ) && $data['html'] != 0 && $key != "description" ) {
$textarea_settings = array(
'media_buttons' => false,
'wpautop' => false,
'editor_class' => $this->get_class($key, $data),
'editor_height' => $height,
'tinymce'=> array(
'toolbar1' => 'formatselect,bullist,numlist,bold,italic,underline,forecolor,blockquote,hr,removeformat,link,unlink,undo,redo',
'toolbar2' => ''
)
);
// turn on the output buffer
ob_start();
// echo the editor to the buffer
wp_editor( $this->field_value( $key, $default, $data ) , $key, $textarea_settings );
// add the contents of the buffer to the output variable
$output .= ob_get_clean();
}
else $output .= '<textarea style="height: '.$height.';" class="'.$this->get_class($key, $data).'" name="'.$key.'" id="'.$key.'" placeholder="'.$placeholder.'">'.$this->field_value( $key, $default, $data ).'</textarea>';
$output .= '
</div>';
if ( $this->is_error($key) ) {