ENH: Add blocks to Style template

Also make the generated HTML nicer

Nicer generated HTML

Author: TomAugspurger

pandas/formats/style.py

@@ -10,7 +10,7 @@
 from collections import defaultdict, MutableMapping
 
 try:
-    from jinja2 import Template, PackageLoader, Environment
+    from jinja2 import PackageLoader, Environment
 except ImportError:
     msg = "pandas.Styler requires jinja2. "\
           "Please install with `conda install Jinja2`\n"\
@@ -34,7 +34,6 @@
     no_mpl_message = "{0} requires matplotlib."
 
 
-
 @contextmanager
 def _mpl(func):
     if has_mpl:
@@ -105,7 +104,8 @@ class Styler(object):
     pandas.DataFrame.style
     """
     env = Environment(
-        loader=PackageLoader("pandas", "formats/templates")
+        loader=PackageLoader("pandas", "formats/templates"),
+        trim_blocks=True,
     )
     template = env.get_template("html.tpl")
 
@@ -355,7 +355,7 @@ def format(self, formatter, subset=None):
                 self._display_funcs[(i, j)] = formatter
         return self
 
-    def render(self):
+    def render(self, **kwargs):
         """
         Render the built up styles to HTML
 
@@ -382,6 +382,7 @@ def render(self):
         trimmed = [x for x in d['cellstyle']
                    if any(any(y) for y in x['props'])]
         d['cellstyle'] = trimmed
+        d.update(kwargs)
         return self.template.render(**d)
 
     def _update_ctx(self, attrs):

pandas/formats/templates/html.tpl

@@ -1,48 +1,61 @@
+{%- block before_style -%}{%- endblock before_style -%}
+{% block style %}
 <style  type="text/css" >
+{% block table_styles %}
 {% for s in table_styles %}
     #T_{{uuid}} {{s.selector}} {
     {% for p,val in s.props %}
-        {{p}}: {{val}};
-    {% endfor %}
+      {{p}}: {{val}};
+    {% endfor -%}
     }
-{% endfor %}
-{% for s in cellstyle %}
+{%- endfor -%}
+{% endblock table_styles %}
+{% block before_cellstyle %}{% endblock before_cellstyle %}
+{% block cellstyle %}
+{%- for s in cellstyle %}
     #T_{{uuid}}{{s.selector}} {
     {% for p,val in s.props %}
         {{p}}: {{val}};
     {% endfor %}
     }
-{% endfor %}
+{%- endfor -%}
+{%- endblock cellstyle %}
 </style>
-
-<table id="T_{{uuid}}" {{ table_attributes }}>
-{% if caption %}
-    <caption>{{caption}}</caption>
-{% endif %}
-
-<thead>
-    {% for r in head %}
-    <tr>
-        {% for c in r %}
-        {% if c.is_visible != False %}
-        <{{c.type}} class="{{c.class}}" {{ c.attributes|join(" ") }}>
-          {{c.value}}
-        {% endif %}
-        {% endfor %}
-    </tr>
-    {% endfor %}
-</thead>
-<tbody>
-    {% for r in body %}
-    <tr>
-        {% for c in r %}
-        {% if c.is_visible != False %}
-        <{{c.type}} id="T_{{uuid}}{{c.id}}"
-          class="{{c.class}}" {{ c.attributes|join(" ") }}>
-            {{ c.display_value }}
-        {% endif %}
-        {% endfor %}
-    </tr>
-    {% endfor %}
-</tbody>
-</table>
+{%- endblock style %}
+{%- block before_table %}{% endblock before_table %} 
+{%- block table %}  
+<table id="T_{{uuid}}" {% if table_attributes %}{{ table_attributes }}{% endif %}> 
+{%- block caption %} 
+{%- if caption -%} 
+    <caption>{{caption}}</caption> 
+{%- endif -%} 
+{%- endblock caption %} 
+{%- block head %} 
+<thead> 
+    {%- for r in head %} 
+    <tr> 
+        {%- for c in r %} 
+        {%- if c.is_visible != False %} 
+        <{{ c.type }} class="{{c.class}}" {{ c.attributes|join(" ") }}>{{c.value}}</{{ c.type }}>
+        {%- endif %} 
+        {%- endfor %} 
+    </tr> 
+    {%- endfor %} 
+</thead> 
+{%- endblock head %} 
+{%- block body %} 
+<tbody> 
+    {%- for r in body %} 
+    <tr> 
+        {%- for c in r %} 
+        {%- if c.is_visible != False %} 
+        <{{ c.type }} id="T_{{ uuid }}{{ c.id }}" class="{{ c.class }}" {{ c.attributes|join(" ") }}>{{ c.display_value }}</{{ c.type }}>
+        {%- endif %} 
+        {%- endfor %} 
+    </tr> 
+    {%- endfor %} 
+</tbody> 
+{%- endblock body %} 
+</table> 
+{%- endblock table %} 
+{%- block after_table %}{% endblock after_table %}