diff --git a/grip/exporter.py b/grip/exporter.py index 6629bf1..0b2a1b5 100644 --- a/grip/exporter.py +++ b/grip/exporter.py @@ -22,11 +22,11 @@ def write_html(path=None): style_urls = _get_style_urls(config['STYLE_URLS_SOURCE'], config['STYLE_URLS_RE'], None) - style_url_contents = [urlopen(css).read().decode('utf-8') for css in style_urls] + styles = [urlopen(css).read().decode('utf-8') for css in style_urls] text = _read_file(path) outname = os.path.splitext(path)[0] + '.html' - page = render_page(text=text, style_url_contents=style_url_contents) + page = render_page(text=text, styles=styles) with open(outname, 'w') as f: f.write(page.encode('utf-8')) diff --git a/grip/renderer.py b/grip/renderer.py index e9dd886..5c805b6 100644 --- a/grip/renderer.py +++ b/grip/renderer.py @@ -1,11 +1,12 @@ from jinja2 import Environment, PackageLoader +from flask import make_response from .github_renderer import render_content as github_render from .offline_renderer import render_content as offline_render -from flask import make_response # Get jinja templates env = Environment(loader=PackageLoader('grip', 'templates')) +index_template = env.get_template('index.html') def render_content(text, gfm=False, context=None, render_offline=False, @@ -17,17 +18,11 @@ def render_content(text, gfm=False, context=None, render_offline=False, def render_page(text, filename=None, gfm=False, context=None, render_offline=False, - username=None, password=None, style_urls=[], style_url_contents=None): + username=None, password=None, style_urls=[], styles=None): """Renders the specified markup text to an HTML page.""" - if style_url_contents: - index_template = env.get_template('index_export.html') - else: - index_template = env.get_template('index.html') - content = render_content(text, gfm, context, render_offline, username, password) return index_template.render(content=content, filename=filename, - style_urls=style_urls, - style_url_contents=style_url_contents) + style_urls=style_urls, styles=styles) def render_image(image_data, content_type): diff --git a/grip/templates/index.html b/grip/templates/index.html index 4aea283..3064e35 100644 --- a/grip/templates/index.html +++ b/grip/templates/index.html @@ -6,6 +6,13 @@ {%- for style_url in style_urls -%} {% endfor -%} + {%- if styles %} + + {% endif -%} - -{% endblock %} - -{% block page %} -
-
-
- {{ content|safe }} -
-
-
- -
 
-{% endblock %}