Merge pull request #1 from pulkitpahwa/master

Fields Rendering bugs removed
IronCountySchoolDistrict · Jul 11, 2016 · 82bdaf9 · 82bdaf9
2 parents 89b377f + bb4a658
commit 82bdaf9
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 10 deletions.
diff --git a/materialize_forms/templates/materialize/field_choices.html b/materialize_forms/templates/materialize/field_choices.html
@@ -16,4 +16,4 @@
     {{ field }}
     <label for="{{ field.auto_id }}">{{ field.label }}</label>
     {% include "materialize/field_errors.html" %}
-{% endfor %}
+{% endfor %}
diff --git a/materialize_forms/templates/materialize/field_visible.html b/materialize_forms/templates/materialize/field_visible.html
@@ -1,7 +1,9 @@
 {% if input_type == "checkbox" %}
-    {{ field }}
-    <label for="{{ field.auto_id }}">{{ field.label }}</label>
-    {% include "materialize/field_help.html" %}
+    <div style = "padding:10px">
+      {{ field }}
+      <label for="{{ field.auto_id }}">{{ field.label }}</label>
+      {% include "materialize/field_help.html" %}
+    </div>
 {% else %}
     {% if input_type == "multicheckbox" %}
         {% include "materialize/field_choices.html" with type="checkbox" %}
@@ -19,12 +21,31 @@
                 {% include "materialize/field_errors.html" %}
             </div>
             {% else %}
-                <div class="col {{ col }}">
-                    <label for="{{ field.auto_id }}">{{ field.label }}</label>
-                    {{ field }}
-                    {% include "materialize/field_help.html" %}
-                    {% include "materialize/field_errors.html" %}
-                </div>
+               {% if input_type == "default" %}
+               {# for file fields#}
+                  <div class=" file-field input-field col {{ col }}">
+                      <div class = "row">
+                         <div class = "col">
+                             <label for="{{ field.auto_id }}">{{ field.label }}</label>
+                         </div>
+                         <div class = "btn col push-s1">
+                             <span>{{field.name}}</span>
+                             {{ field }}
+                             {% include "materialize/field_help.html" %}
+                             {% include "materialize/field_errors.html" %}
+                         </div>
+                      </div>
+                  </div>
+               {%else%}
+                  <div class="col {{ col }}" style="padding:10px">
+                      <label for="{{ field.auto_id }}" style = "margin-bottom:10px;">{{ field.label }}</label>
+                      <br/>
+                      <br/>
+                      {{ field }}
+                      {% include "materialize/field_help.html" %}
+                      {% include "materialize/field_errors.html" %}
+                  </div>
+                {%endif%}
             {% endif %}
         {% endif %}
     {% endif %}