Fix label height 'master' merge

.gitignore

@@ -0,0 +1 @@
+/node_modules/

Gruntfile.js

@@ -0,0 +1,39 @@
+/*global module:false*/
+module.exports = function(grunt) {
+
+  // Project configuration.
+  grunt.initConfig({
+    // Metadata.
+    pkg: grunt.file.readJSON('package.json'),
+    banner: '/**\n' + 
+      ' * <%= pkg.title || pkg.name %> - v<%= pkg.version %> - <%= grunt.template.today("yyyy-mm-dd") %>\n' +
+      '<%= pkg.homepage ? " * " + pkg.homepage + "\\n" : "" %>' +
+      ' * Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author %>;' + ' License: <%= pkg.license %>\n' +
+      ' */',
+    cssmin: {
+      combine: {
+         options: {
+          banner: '<%= banner %>'
+        },
+        files: {
+          'css/dist/cmb.min.css': [ 
+            'css/src/layout.css', 
+            'css/src/generic.css', 
+            'css/src/repeatable.css', 
+            'css/src/sortable.css', 
+            'css/src/group.css', 
+            'css/src/file.css', 
+            'css/src/misc-fields.css' 
+          ]
+        }
+      }
+    }
+  });
+
+  // These plugins provide necessary tasks.
+  grunt.loadNpmTasks('grunt-contrib-cssmin');
+
+  // Default task.
+  grunt.registerTask('default', [ 'cssmin' ] );
+
+};

class.cmb-meta-box.php

@@ -117,7 +117,12 @@ function enqueue_scripts() {
 
 	function enqueue_styles() {
 
-		wp_enqueue_style( 'cmb-styles', trailingslashit( CMB_URL ) . 'style.css' );
+		$suffix = CMB_DEV ? '' : '.min';
+
+		if ( version_compare( get_bloginfo( 'version' ), '3.8', '>=' ) )
+			wp_enqueue_style( 'cmb-styles', trailingslashit( CMB_URL ) . "css/dist/cmb$suffix.css" );
+		else
+			wp_enqueue_style( 'cmb-styles', trailingslashit( CMB_URL ) . 'css/legacy.css' );
 
 		foreach ( $this->fields as $field )
 			$field->enqueue_styles();
@@ -221,57 +226,60 @@ function show() { ?>
 	 */
 	static function layout_fields( array $fields ) { ?>
 
-		<table class="form-table cmb_metabox">
+		<div class="cmb_metabox">
 
 			<?php $current_colspan = 0;
 
 			foreach ( $fields as $field ) :
 
 				if ( $current_colspan == 0 ) : ?>
 
-					<tr>
+					<div class="cmb-row">
 
 				<?php endif;
 
 				$current_colspan += $field->args['cols'];
 
-				$classes = array('field');
+				$classes = array( 'field', get_class($field) );
 
 				if ( ! empty( $field->args['repeatable'] ) )
 					$classes[] = 'repeatable';
 
-				$classes[] = get_class($field);
-
-				$classes = 'class="' . esc_attr( implode(' ', array_map( 'sanitize_html_class', $classes ) ) ) . '"';
+				if ( ! empty( $field->args['sortable'] ) )
+					$classes[] = 'cmb-sortable';
 
-				$attrs = array();
+				$attrs = array(
+					sprintf( 'id="%s"', sanitize_html_class( $field->id ) ),
+					sprintf( 'class="%s"', esc_attr( implode(' ', array_map( 'sanitize_html_class', $classes ) ) ) )
+				);
 
+				// Field Repeatable Max.
 				if ( isset( $field->args['repeatable_max']  ) )
-					$attrs[] = 'data-rep-max="' . intval( $field->args['repeatable_max'] ) . '"';
-
-				$attrs = implode( ' ', $attrs );
+					$attrs[] = sprintf( 'data-rep-max="%s"', intval( $field->args['repeatable_max'] ) );
 
 				?>
 
-				<td style="width: <?php esc_attr_e( $field->args['cols'] / 12 * 100 ); ?>%" colspan="<?php esc_attr_e( $field->args['cols'] ); ?>">
-					<div <?php echo $classes; ?> <?php echo $attrs; ?>>
-						<?php $field->display(); ?>
-					</div>
-				</td>
+				<div class="cmb-cell-<?php echo intval( $field->args['cols'] ); ?>">
+
+						<div <?php echo implode( ' ', $attrs ); ?>>
+							<?php $field->display(); ?>
+						</div>
+
+						<input type="hidden" name="_cmb_present_<?php esc_attr_e( $field->id ); ?>" value="1" />
 
-				<?php if ( $current_colspan == 12 ) :
+				</div>
+
+				<?php if ( $current_colspan == 12 || $field === end( $fields ) ) :
 
 					$current_colspan = 0; ?>
 
-					</tr>
+					</div><!-- .cmb-row -->
 
 				<?php endif; ?>
 
-				<input type="hidden" name="_cmb_present_<?php esc_attr_e( $field->id ); ?>" value="1" />
-
 			<?php endforeach; ?>
-
-		</table>
+			
+		</div>
 
 	<?php }
 

classes.fields.php

@@ -67,6 +67,10 @@ public function __construct( $name, $title, array $values, $args = array() ) {
 	 * @uses wp_enqueue_script()
 	 */
 	public function enqueue_scripts() {
+
+		if ( isset( $this->args['sortable'] ) && $this->args['sortable'] )
+			wp_enqueue_script( 'jquery-ui-sortable' );
+
 	}
 
 	/**
@@ -325,7 +329,7 @@ public function display() {
 			<div class="field-item" data-class="<?php echo esc_attr( get_class($this) ) ?>" style="position: relative; <?php echo esc_attr( $this->args['style'] ); ?>">
 
 			<?php if ( $this->args['repeatable'] ) : ?>
-				<button class="cmb-delete-field" title="Remove field"><span class="cmb-delete-field-icon">&times;</span> Remove Group</button>
+				<button class="cmb-delete-field" title="Remove field"><span class="cmb-delete-field-icon">&times;</span></button>
 			<?php endif; ?>
 
 			<?php $this->html(); ?>
@@ -344,7 +348,7 @@ public function display() {
 			$this->field_index = 'x'; // x used to distinguish hidden fields.
 			$this->value = ''; ?>
 
-			<div class="field-item hidden" data-class="<?php echo esc_attr( get_class($this) ) ?>" style="position: relative">
+			<div class="field-item hidden" data-class="<?php echo esc_attr( get_class($this) ) ?>" style="position: relative; <?php echo esc_attr( $this->args['style'] ); ?>">
 
 			<?php if ( $this->args['repeatable'] ) : ?>
 				<button class="cmb-delete-field" title="Remove field"><span class="cmb-delete-field-icon">&times;</span> Remove Group</button>
@@ -369,9 +373,7 @@ public function display() {
  */
 class CMB_Text_Field extends CMB_Field {
 
-	public function html() { 
-
-		?>
+	public function html() { ?>
 
 		<input type="text" <?php $this->id_attr(); ?> <?php $this->boolean_attr(); ?> <?php $this->class_attr(); ?> <?php $this->name_attr(); ?> value="<?php echo esc_attr( $this->get_value() ); ?>" />
 
@@ -541,7 +543,7 @@ private function parse_image_size( $size ) {
 
 		// Handle default WP size format. 
 		if ( is_array( $size ) && isset( $size[0] ) && isset( $size[1] ) )
-			$size = array( 'width' => $size[0], 'height' => $size[0] );
+			$size = array( 'width' => $size[0], 'height' => $size[1] );
 
 		return wp_parse_args( $size, array(
 			'width'  => get_option( 'thumbnail_size_w' ),
@@ -598,10 +600,10 @@ public function html() { ?>
 class CMB_Date_Field extends CMB_Field {
 
 	public function enqueue_scripts() {
-		
+
 		parent::enqueue_scripts();
 
-		wp_enqueue_style( 'cmb-jquery-ui', trailingslashit( CMB_URL ) . 'css/jquery-ui.css', '1.10.3' );
+		wp_enqueue_style( 'cmb-jquery-ui', trailingslashit( CMB_URL ) . 'css/vendor/jquery-ui/jquery-ui.css', '1.10.3' );
 
 		wp_enqueue_script( 'cmb-datetime', trailingslashit( CMB_URL ) . 'js/field.datetime.js', array( 'jquery', 'jquery-ui-core', 'jquery-ui-datepicker', 'cmb-scripts' ) );
 	}
@@ -619,7 +621,7 @@ public function enqueue_scripts() {
 
 		parent::enqueue_scripts();
 
-		wp_enqueue_style( 'cmb-jquery-ui', trailingslashit( CMB_URL ) . 'css/jquery-ui.css', '1.10.3' );
+		wp_enqueue_style( 'cmb-jquery-ui', trailingslashit( CMB_URL ) . 'css/vendor/jquery-ui/jquery-ui.css', '1.10.3' );
 
 		wp_enqueue_script( 'cmb-timepicker', trailingslashit( CMB_URL ) . 'js/jquery.timePicker.min.js', array( 'jquery', 'cmb-scripts' ) );
 		wp_enqueue_script( 'cmb-datetime', trailingslashit( CMB_URL ) . 'js/field.datetime.js', array( 'jquery', 'jquery-ui-core', 'jquery-ui-datepicker', 'cmb-scripts' ) );
@@ -643,7 +645,7 @@ public function enqueue_scripts() {
 
 		parent::enqueue_scripts();
 
-		wp_enqueue_style( 'cmb-jquery-ui', trailingslashit( CMB_URL ) . 'css/jquery-ui.css', '1.10.3' );
+		wp_enqueue_style( 'cmb-jquery-ui', trailingslashit( CMB_URL ) . 'css/vendor/jquery-ui/jquery-ui.css', '1.10.3' );
 
 		wp_enqueue_script( 'cmb-timepicker', trailingslashit( CMB_URL ) . 'js/jquery.timePicker.min.js', array( 'jquery', 'cmb-scripts' ) );		
 		wp_enqueue_script( 'cmb-datetime', trailingslashit( CMB_URL ) . 'js/field.datetime.js', array( 'jquery', 'jquery-ui-core', 'jquery-ui-datepicker', 'cmb-scripts' ) );
@@ -1268,7 +1270,7 @@ function cmb_ajax_post_select() {
 class CMB_Group_Field extends CMB_Field {
 
 	static $added_js;
-	public $fields = array();
+	private $fields = array();
 
 	function __construct() {
 
@@ -1309,11 +1311,11 @@ public function enqueue_styles() {
 		parent::enqueue_styles();
 
 		foreach ( $this->args['fields'] as $f ) {
-
 			$class = _cmb_field_class_for_type( $f['type'] );
 			$field = new $class( '', '', array(), $f );
 			$field->enqueue_styles();
 		}
+
 	}
 
 	public function display() {
@@ -1325,8 +1327,14 @@ public function display() {
 		$this->title();
 		$this->description();
 
+		// if there are no values and it's not repeateble, we want to do one with empty string
+		if ( ! $this->get_values() && ! $this->args['repeatable'] )
+			$values = array( '' );
+		else
+			$values = $this->get_values();
+
 		$i = 0;
-		foreach ( $this->get_values() as $value ) {
+		foreach ( $values as $value ) {
 
 			$this->field_index = $i;
 			$this->value = $value; 	
@@ -1354,27 +1362,16 @@ public function display() {
 
 				</div>
 
-				<button class="button repeat-field"><?php esc_html_e( 'Add New', 'cmb' ); ?></button>
+				<button class="button repeat-field"><?php esc_html_e( 'Add New Group', 'cmb' ); ?></button>
 
 		<?php }
 
 	}
 
-	public function add_field( CMB_Field $field ) {
-
-		$field->parent = &$this;
-		$this->fields[$field->id] = $field;
-
-	}
-
-	public function &get_fields() {
-		return $this->fields;
-	}
-
 	public function html() {
 
 		$fields = &$this->get_fields();
-		$value  = $this->value;
+		$value = $this->value;
 
 		if ( ! empty( $value ) ) {
 			foreach ( $value as $field_id => $field_value ) {
@@ -1391,40 +1388,49 @@ public function html() {
 
 		?>
 
-		<div class="group <?php echo ! empty( $this->args['repeatable'] ) ? 'cloneable' : '' ?>" style="position: relative">
-
-			<?php if ( $this->args['repeatable'] ) : ?>
-				<button class="cmb-delete-field" title="Remove field"><span class="cmb-delete-field-icon">&times;</span> Remove Group</button>
-			<?php endif; ?>
-
-			<?php CMB_Meta_Box::layout_fields( $fields ); ?>
+		<?php if ( $this->args['repeatable'] ) : ?>
+			<button class="cmb-delete-field" title="Remove field"><span class="cmb-delete-field-icon">&times;</span> Remove Group</button>
+		<?php endif; ?>
 
-		</div>
+		<?php CMB_Meta_Box::layout_fields( $fields ); ?>
 
 	<?php }
 
 	public function parse_save_values() {
 
 		$fields = &$this->get_fields();
 		$values = &$this->get_values();
-		
+
 		foreach ( $values as &$group_value ) {
 			foreach ( $group_value as $field_id => &$field_value ) {
 
 				if ( ! isset( $fields[$field_id] ) ) {
 					$field_value = array();
 					continue;
 				}
-
+				
 				$field = $fields[$field_id];
 				$field->values = $field_value;
 				$field->parse_save_values();
-				
+
 				$field_value = $field->get_values();
 
+				// if the field is a repeatable field, store the whole array of them, if it's not repeatble,
+				// just store the first (and only) one directly
+				if ( ! $field->args['repeatable'] )
+					$field_value = reset( $field_value );
 			}
 		}
-
+
+	}
+
+	public function add_field( CMB_Field $field ) {
+		$field->parent = $this;
+		$this->fields[$field->id] = $field;
+	}
+
+	public function &get_fields() {
+		return $this->fields;
 	}
 
 	public function set_values( array $values ) {
@@ -1440,4 +1446,4 @@ public function set_values( array $values ) {
 
 	}
 
-}
+}

css/dist/cmb.css

@@ -0,0 +1,18 @@
+/**
+ * CMB Styles
+ *
+ * This file is used for development only and is loaded when CMB_DEV is defined as true.
+ * cmb.min.css is generated by the Grunt build process.
+ */
+
+@import '../src/layout.css';
+@import '../src/generic.css';
+
+/** Features **/
+@import '../src/repeatable.css';
+@import '../src/sortable.css';
+
+/** Fields **/
+@import '../src/group.css';
+@import '../src/file.css';
+@import '../src/misc-fields.css';