From 213030bf4f2cd875482bb7038d0c0c83a7f02869 Mon Sep 17 00:00:00 2001
From: Phill Price <phill@csl-web.com>
Date: Sat, 15 Nov 2014 19:34:22 +0000
Subject: [PATCH 1/3] Works with the bootstrap forms module to have classes
 directly on the label and input

---
 templates/BootstrapFieldHolder.ss      | 10 +++++-----
 templates/BootstrapTextField_holder.ss |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/templates/BootstrapFieldHolder.ss b/templates/BootstrapFieldHolder.ss
index 2abe198..51fc574 100644
--- a/templates/BootstrapFieldHolder.ss
+++ b/templates/BootstrapFieldHolder.ss
@@ -1,17 +1,17 @@
 <div id="$Name" class="field $extraClass $HolderClasses" $HolderAttributes <% if DisplayLogic %>data-display-logic-masters="$DisplayLogicMasters"<% end_if %>>
-    <label class="control-label" for="$ID">$Title</label>
-    <div class="controls">
+    <label class="control-label $labelClasses" for="$ID">$Title</label>
+    <div class="controls $inputClasses">
         $Field
-        
+
         <% if HelpText %>
         <p class="help-block">$HelpText</p>
         <% end_if %>
         <% if InlineHelpText %>
         <span class="help-inline">$InlineHelpText</span>
-        <% end_if %>    
+        <% end_if %>
     </div>
     <% if DisplayLogic %>
     <div class="display-logic-eval">$DisplayLogic</div>
-    <% end_if %>    
+    <% end_if %>
 </div>
 
diff --git a/templates/BootstrapTextField_holder.ss b/templates/BootstrapTextField_holder.ss
index ed5e525..c4a66c5 100644
--- a/templates/BootstrapTextField_holder.ss
+++ b/templates/BootstrapTextField_holder.ss
@@ -1,6 +1,6 @@
 <div id="$Name" class="field $extraClass $HolderClasses" $HolderAttributes <% if DisplayLogic %>data-display-logic-masters="$DisplayLogicMasters"<% end_if %>>
-    <label class="control-label" for="$ID">$Title</label>
-    <div class="controls">    
+    <label class="control-label $labelClasses" for="$ID">$Title</label>
+    <div class="controls $inputClasses">
         <% if AppendedText || PrependedText %>
         	<div class="<% if AppendedText %>$input-append<% end_if %><% if PrependedText %> input-prepend<% end_if %>">
         		<% if PrependedText %><span class="add-on">$PrependedText</span><% end_if %>$Field<% if AppendedText %><span class="add-on">$AppendedText</span><% end_if %>
@@ -19,5 +19,5 @@
     </div>
     <% if DisplayLogic %>
     <div class="display-logic-eval">$DisplayLogic</div>
-    <% end_if %>    
+    <% end_if %>
 </div>

From 0f9bc7147c0d7be755588850267b459fadad9ef9 Mon Sep 17 00:00:00 2001
From: Phill Price <phill@phillprice.com>
Date: Sat, 15 Nov 2014 21:53:31 +0000
Subject: [PATCH 2/3] Update composer.json

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 2f2a533..cfb1ca2 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "unclecheese/display-logic",
+    "name": "phillprice/silverstripe-display-logic",
     "replace": {
     	"silverstripe/display-logic": "*"
     },

From 6a155fd79cf181b1571622eab34ac57a29e093e7 Mon Sep 17 00:00:00 2001
From: Phill Price <phill@phillprice.com>
Date: Sat, 15 Nov 2014 23:08:23 +0000
Subject: [PATCH 3/3] Update composer.json

---
 composer.json | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/composer.json b/composer.json
index cfb1ca2..b73b721 100644
--- a/composer.json
+++ b/composer.json
@@ -1,8 +1,5 @@
 {
     "name": "phillprice/silverstripe-display-logic",
-    "replace": {
-    	"silverstripe/display-logic": "*"
-    },
     "description": "Allows assignment of conditions for display and hide of specific form fields based on client side behavior.",
     "type": "silverstripe-module",
     "keywords": ["silverstripe", "display", "logic", "forms", "cms"],