Merge pull request #30 from phillprice/master

...
unclecheese · Nov 21, 2014 · e56f602 · e56f602
2 parents 4dbd674 + 6a155fd
commit e56f602
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/composer.json b/composer.json
@@ -1,8 +1,5 @@
 {
-    "name": "unclecheese/display-logic",
-    "replace": {
-    	"silverstripe/display-logic": "*"
-    },
+    "name": "phillprice/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"],

diff --git 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
@@ -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>