version 0.3.1

Signed-off-by: Josh Crawford <joshua@sgroup.com.au>

README.md

@@ -71,7 +71,6 @@ A Super Table field can be set to be static, which turns the field into a non-re
 
 - Test more third-party fieldtypes, purely for a complete list.
 - Add ability to collapse rows.
-- Fix issue with Redactor - requires full rewrite using non tables [#3](https://github.com/engram-design/SuperTable/issues/3).
 - New settings layout, including drag/drop, full control over field layout. Allows you to set out the field exactly as you like.
 - Add template hook to allow other plugins to provide layouts for editing field.
 - Allow for SuperTable-in-SuperTable - because why not.
@@ -84,6 +83,13 @@ Thanks go to [@brandonkelly](https://github.com/brandonkelly) and [@benparizek](
 
 ## Changelog
 
+#### 0.3.1
+
+- Fix for field labels on inner-Matrix field being hidden [#16](https://github.com/engram-design/SuperTable/issues/16).
+- Latest Redactor version fixes [#3](https://github.com/engram-design/SuperTable/issues/3).
+- Fix for width not being applied for columns [#15](https://github.com/engram-design/SuperTable/issues/15).
+- Fix issues with multiple Matrix Configurators causing many javascript issues [see Craft 2.4.2677](https://buildwithcraft.com/updates#build2677).
+
 #### 0.3.0
 
 - Added composer support.

supertable/SuperTablePlugin.php

@@ -14,7 +14,7 @@ public function getName()
 
     public function getVersion()
     {
-        return '0.3.0';
+        return '0.3.1';
     }
 
     public function getDeveloper()

supertable/resources/css/SuperTableInput.css

@@ -7,7 +7,7 @@ table.editable.superTable tbody tr td {
 	text-align: left;
 }
 
-table.editable.superTable tbody tr td .field .heading {
+table.editable.superTable tbody tr td > .field > .heading {
 	display: none;
 }
 

supertable/resources/js/MatrixConfiguratorAlt.js

@@ -44,7 +44,8 @@ Craft.MatrixConfiguratorAlt = Garnish.Base.extend({
 		this.inputIdPrefix = Craft.formatInputId(this.inputNamePrefix);
 
 		// Fix to support more than one Matrix in a single field
-		this.$container = $('.fieldtype-settings[name="'+inputNamePrefix+'"] .matrix-configurator > .field > .input');
+		this.$container = $('#' + this.inputIdPrefix + '-matrix-configurator:first .input:first');
+		//this.$container = $('.matrix-configurator:first .input:first');
 
 		this.$blockTypesColumnContainer = this.$container.children('.block-types').children();
 		this.$fieldsColumnContainer = this.$container.children('.fields').children();

supertable/templates/fields.html

@@ -1,16 +1,19 @@
 {% if element is not defined %}{% set element = null %}{% endif %}
 {% if namespace is not defined %}{% set namespace = 'fields' %}{% endif %}
 
+{% set columnSettings = [] %}
+{% if settings is defined and settings %}
+	{% for col in settings.columns %}
+		{% set columnSettings = columnSettings | merge([col]) %}
+	{% endfor %}
+{% endif %}
+
 {% namespace namespace %}
-	{% for field in fields %}
+	{% for index, field in fields %}
 
 		{# Additional field settings #}
-		{% if settings is defined and settings %}
-			{% set fieldId = field.getField().id %}
-
-			{% if settings[fieldId] is defined %}
-				{% set width = settings[fieldId].width %}
-			{% endif %}
+		{% if columnSettings[index] is defined %}
+			{% set width = columnSettings[index].width %}
 		{% endif %}
 
 		{% if settings is defined and settings.fieldLayout == 'row' %}

supertable/templates/settings.html

@@ -58,7 +58,7 @@
 						</td>
 
 						<td class="settings-col hidden">
-							<div class="fieldtype-settings" name="{{ fieldName }}[typesettings]">
+							<div class="fieldtype-settings">
 								<div>
 									{% namespace fieldName~'[typesettings]' %}
 										{{ fieldType.getSettingsHtml()|raw  }}