Merge pull request #87 from cuzzlor/Issue-#79-IFieldConfiguration.Add…

…FieldContainerClass

Issue #79 IFieldConfiguration.AddFieldContainerClass

ChameleonForms.Tests/Templates/Default/DefaultFormTemplateShould.Output_field_with_container_class.approved.html

@@ -0,0 +1,4 @@
+            <dt>labelhtml</dt>
+            <dd class="a-container-class-1 a-container-class-2">
+                elementhtml validationhtml
+            </dd>

ChameleonForms.Tests/Templates/Default/DefaultFormTemplateTests.cs

@@ -114,6 +114,16 @@ public void Output_field()
             HtmlApprovals.VerifyHtml(result.ToHtmlString());
         }
 
+        [Test]
+        public void Output_field_with_container_class()
+        {
+            var t = new DefaultFormTemplate();
+
+            var result = t.Field(new HtmlString("labelhtml"), new HtmlString("elementhtml"), new HtmlString("validationhtml"), null, new FieldConfiguration().AddFieldContainerClass("a-container-class-1").AddFieldContainerClass("a-container-class-2").ToReadonly(), false);
+
+            HtmlApprovals.VerifyHtml(result.ToHtmlString());
+        }
+
         [Test]
         public void Output_field_with_hint()
         {

ChameleonForms.Tests/Templates/TwitterBootstrap3/FieldTests.cs

@@ -21,6 +21,16 @@ public void Output_field()
             HtmlApprovals.VerifyHtml(result.ToHtmlString());
         }
 
+        [Test]
+        public void Output_field_with_container_class()
+        {
+            var t = new TwitterBootstrapFormTemplate();
+
+            var result = t.Field(new HtmlString("labelhtml"), new HtmlString("elementhtml"), new HtmlString("validationhtml"), null, new FieldConfiguration().AddFieldContainerClass("a-container-class-1").AddFieldContainerClass("a-container-class-2").ToReadonly(), false);
+
+            HtmlApprovals.VerifyHtml(result.ToHtmlString());
+        }
+
         [Test]
         public void Output_field_with_hint()
         {

ChameleonForms.Tests/Templates/TwitterBootstrap3/FieldTests_TwitterBootstrapTemplateShould.Output_field_with_container_class.approved.html

@@ -0,0 +1,4 @@
+<div class="form-group has-error a-container-class-1 a-container-class-2">
+labelhtml            elementhtml
+             validationhtml
+            </div>

ChameleonForms/Component/Config/FieldConfiguration.cs

@@ -350,6 +350,18 @@ public interface IFieldConfiguration : IHtmlString
         /// </summary>
         string LabelClasses { get; }
 
+        /// <summary>
+        /// Specify one or more CSS classes to use for the field container element.
+        /// </summary>
+        /// <param name="class">Any CSS class(es) to use for the field container element</param>
+        /// <returns>The <see cref="IFieldConfiguration"/> to allow for method chaining</returns>
+        IFieldConfiguration AddFieldContainerClass(string @class);
+
+        /// <summary>
+        /// Any CSS class(es) to use for the field container element.
+        /// </summary>
+        string FieldContainerClasses { get; }
+
         /// <summary>
         /// Specify one or more CSS classes to use for the field validation message.
         /// </summary>
@@ -626,6 +638,16 @@ public IFieldConfiguration AddLabelClass(string @class)
 
         public string LabelClasses { get; private set; }
 
+        public IFieldConfiguration AddFieldContainerClass(string @class)
+        {
+            if (!string.IsNullOrEmpty(FieldContainerClasses))
+                FieldContainerClasses += " ";
+            FieldContainerClasses += @class;
+            return this;
+        }
+
+        public string FieldContainerClasses { get; private set; }
+
         public IFieldConfiguration AddValidationClass(string @class)
         {
             if (!string.IsNullOrEmpty(ValidationClasses))

ChameleonForms/Component/Config/ReadonlyFieldConfiguration.cs

@@ -98,6 +98,11 @@ public interface IReadonlyFieldConfiguration
         /// </summary>
         string LabelClasses { get; }
 
+        /// <summary>
+        /// Any CSS class(es) to use for the field container element.
+        /// </summary>
+        string FieldContainerClasses { get; }
+
         /// <summary>
         /// Any CSS class(es) to use for the field validation message.
         /// </summary>
@@ -205,6 +210,11 @@ public string LabelClasses
             get { return _fieldConfiguration.LabelClasses; }
         }
 
+        public string FieldContainerClasses
+        {
+            get { return _fieldConfiguration.FieldContainerClasses; }
+        }
+
         public string ValidationClasses
         {
             get { return _fieldConfiguration.ValidationClasses; }

ChameleonForms/Templates/Default/DefaultHtmlHelpers.cshtml

@@ -1,9 +1,8 @@
-@using System.Web.Mvc
+@* Generator: MvcHelper *@
+@using System.Web.Mvc
 @using Component.Config
 @using Enums
 
-@* Generator: MvcHelper *@
-
 @* The @:'s are to stop compilation errors with the Razor engine due to unclosed HTML tags *@
 
 @helper EndForm() {
@@ -61,7 +60,7 @@
 
 @helper BeginFieldInternal(IHtmlString labelHtml, IHtmlString elementHtml, IHtmlString validationHtml, IReadonlyFieldConfiguration fieldConfiguration, ModelMetadata fieldMetadata, IHtmlString requiredDesignator) {
 @:            <dt>@labelHtml@(new HtmlString(fieldMetadata != null && fieldMetadata.IsRequired ? requiredDesignator.ToHtmlString() : ""))</dt>
-@:            <dd>
+@:            <dd@(RenderIfNotEmpty(fieldConfiguration.FieldContainerClasses,@<text> class="@fieldConfiguration.FieldContainerClasses"</text>))>
 @:                @GetPrependedHtml(fieldConfiguration)@elementHtml@GetAppendedHtml(fieldConfiguration)@GetHint(fieldConfiguration) @validationHtml
 }
 
@@ -118,4 +117,9 @@ foreach(var i in items) {
 @:        <li>@i</li>
 }
 @:    </ul>
+}
+
+@* http://stackoverflow.com/questions/15160654/mvc-razor-helper-method-to-render-alternate-content-when-empty *@
+@helper RenderIfNotEmpty(string mayBeEmpty, Func<object, IHtmlString> template) {
+    if (!string.IsNullOrEmpty(mayBeEmpty)) {@template(null)}
 }