From a469a722e5f4e6660777cb7dc39e0099b7e6ff06 Mon Sep 17 00:00:00 2001
From: Kavanaugh Latiolais <kav@liffft.com>
Date: Mon, 11 Jul 2016 22:58:10 -0400
Subject: [PATCH 1/3] Removed required*

---
 src/components/fields/TitleField.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/fields/TitleField.js b/src/components/fields/TitleField.js
index f64f9685ac..261aa39591 100644
--- a/src/components/fields/TitleField.js
+++ b/src/components/fields/TitleField.js
@@ -1,10 +1,10 @@
 import React, {PropTypes} from "react";
 
-const REQUIRED_FIELD_SYMBOL = "*";
+// const REQUIRED_FIELD_SYMBOL = "*";
 
 function TitleField(props) {
-  const {id, title, required} = props;
-  const legend = required ? title + REQUIRED_FIELD_SYMBOL : title;
+  const {id, legend} = props;
+  //const legend = required ? title + REQUIRED_FIELD_SYMBOL : title;
   return <legend id={id}>{legend}</legend>;
 }
 

From aad72f9a45d1c397d0f633a78ffd4d0f1f91ea7d Mon Sep 17 00:00:00 2001
From: Kavanaugh Latiolais <kav@liffft.com>
Date: Mon, 11 Jul 2016 23:02:54 -0400
Subject: [PATCH 2/3] More Required* removal

---
 src/components/fields/SchemaField.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/fields/SchemaField.js b/src/components/fields/SchemaField.js
index 141fa2ef08..6bb6137e7a 100644
--- a/src/components/fields/SchemaField.js
+++ b/src/components/fields/SchemaField.js
@@ -14,7 +14,7 @@ import StringField from "./StringField";
 import UnsupportedField from "./UnsupportedField";
 import DescriptionField from "./DescriptionField";
 
-const REQUIRED_FIELD_SYMBOL = "*";
+// const REQUIRED_FIELD_SYMBOL = "*";
 const COMPONENT_TYPES = {
   "array":     ArrayField,
   "boolean":   BooleanField,
@@ -41,7 +41,7 @@ function getLabel(label, required, id) {
   }
   return (
     <label className="control-label" htmlFor={id}>
-      {required ? label + REQUIRED_FIELD_SYMBOL : label}
+      label //{required ? label + REQUIRED_FIELD_SYMBOL : label}
     </label>
   );
 }

From d12378c8136cd50b0a9dff5b6583d74b4e32ce55 Mon Sep 17 00:00:00 2001
From: Kavanaugh Latiolais <kav@liffft.com>
Date: Wed, 13 Jul 2016 20:48:53 -0400
Subject: [PATCH 3/3] Moving to css class for required

---
 src/components/fields/SchemaField.js | 5 ++---
 src/components/fields/TitleField.js  | 7 ++-----
 test/ObjectField_test.js             | 4 ++--
 test/TitleField_test.js              | 9 ++++-----
 4 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/components/fields/SchemaField.js b/src/components/fields/SchemaField.js
index 6bb6137e7a..e4db1a4c90 100644
--- a/src/components/fields/SchemaField.js
+++ b/src/components/fields/SchemaField.js
@@ -14,7 +14,6 @@ import StringField from "./StringField";
 import UnsupportedField from "./UnsupportedField";
 import DescriptionField from "./DescriptionField";
 
-// const REQUIRED_FIELD_SYMBOL = "*";
 const COMPONENT_TYPES = {
   "array":     ArrayField,
   "boolean":   BooleanField,
@@ -40,8 +39,8 @@ function getLabel(label, required, id) {
     return null;
   }
   return (
-    <label className="control-label" htmlFor={id}>
-      label //{required ? label + REQUIRED_FIELD_SYMBOL : label}
+    <label className={required ? "control-label control-label-required":"control-label"} htmlFor={id}>
+      {label}
     </label>
   );
 }
diff --git a/src/components/fields/TitleField.js b/src/components/fields/TitleField.js
index 261aa39591..6d91bfd668 100644
--- a/src/components/fields/TitleField.js
+++ b/src/components/fields/TitleField.js
@@ -1,11 +1,8 @@
 import React, {PropTypes} from "react";
 
-// const REQUIRED_FIELD_SYMBOL = "*";
-
 function TitleField(props) {
-  const {id, legend} = props;
-  //const legend = required ? title + REQUIRED_FIELD_SYMBOL : title;
-  return <legend id={id}>{legend}</legend>;
+  const {id, title, required} = props;
+  return <legend id={id} className={required ? "legend-required":""}>{title}</legend>;
 }
 
 if (process.env.NODE_ENV !== "production") {
diff --git a/test/ObjectField_test.js b/test/ObjectField_test.js
index e724fda2b9..66d85709ab 100644
--- a/test/ObjectField_test.js
+++ b/test/ObjectField_test.js
@@ -107,8 +107,8 @@ describe("ObjectField", () => {
       // Required field is <input type="text" required="">
       expect(node.querySelector("input[type=text]").getAttribute("required"))
         .eql("");
-      expect(node.querySelector(".field-string label").textContent)
-        .eql("Foo*");
+      expect(node.querySelector(".control-label-required").textContent)
+        .eql("Foo");
     });
 
     it("should fill fields with form data", () => {
diff --git a/test/TitleField_test.js b/test/TitleField_test.js
index 3fd1670096..b6b30eb3ba 100644
--- a/test/TitleField_test.js
+++ b/test/TitleField_test.js
@@ -47,23 +47,22 @@ describe("TitleField", () => {
     expect(node.id).to.equal("sample_id");
   });
 
-  it("should include only title, when field is not required", () => {
+  it("should not add 'legend-required' class to the title, when field is not required", () => {
     const props = {
       title: "Field title",
       required: false
     };
     const {node} = createComponent(TitleFieldWrapper, props);
 
-    expect(node.textContent).to.equal(props.title);
+    expect(node.className).not.to.equal("legend-required");
   });
 
-  it("should add an asterisk to the title, when field is required", () => {
+  it("should add 'legend-required' class to the title, when field is required", () => {
     const props = {
       title: "Field title",
       required: true
     };
     const {node} = createComponent(TitleFieldWrapper, props);
-
-    expect(node.textContent).to.equal(props.title + "*");
+    expect(node.className).to.equal("legend-required");
   });
 });