Skip to content

allow optional header and footer #171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

allow optional header and footer #171

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c2c2039
add optional header and footer inclusion
chriddyp Nov 30, 2017
d868d2c
initialize head and footer to `None`
chriddyp Dec 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 50 additions & 6 deletions dash/dash.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ def add_url(name, view_func, methods=['GET']):
self._layout = None
self._cached_layout = None
self.routes = []
self.head = None
self.footer = None

@property
def layout(self):
Expand Down Expand Up @@ -283,14 +285,16 @@ def index(self, *args, **kwargs):
scripts = self._generate_scripts_html()
css = self._generate_css_dist_html()
config = self._generate_config_html()
title = getattr(self, 'title', 'Dash')
custom_head_html = self._generate_head()
custom_footer_html = self._generate_footer()

return '''
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<title>{}</title>
{}
{component_css}
{custom_head_html}
</head>
<body>
<div id="react-entry-point">
Expand All @@ -299,12 +303,18 @@ def index(self, *args, **kwargs):
</div>
</div>
<footer>
{}
{}
{config}
{component_scripts}
{custom_footer_html}
</footer>
</body>
</html>
'''.format(title, css, config, scripts)
'''.format(
component_css=css,
config=config,
component_scripts=scripts,
custom_head_html=custom_head_html,
custom_footer_html=custom_footer_html)

def dependencies(self):
return flask.jsonify([
Expand All @@ -325,6 +335,40 @@ def react(self, *args, **kwargs):
'Use `callback` instead. `callback` has a new syntax too, '
'so make sure to call `help(app.callback)` to learn more.')

def _generate_footer_or_header_html(self, footer_or_header):
section = getattr(self, footer_or_header)
if isinstance(section, collections.Callable):
section_instance = section()
else:
section_instance = section

def convert_to_html(element):
if isinstance(element, Component):
element_html = element.to_html5()
elif isinstance(element, basestring):
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

failing in python3. need:
from past.builtins import basestring # pip install future

element_html = element
elif element is None:
element_html = ''
return element_html

if isinstance(section_instance, collections.Iterable):
section_html = '\n'.join(
[convert_to_html(element) for element in section_instance])
else:
section_html = convert_to_html(section_instance)

return section_html

def _generate_footer(self):
return self._generate_footer_or_header_html('footer')

def _generate_head(self):
head_html = self._generate_footer_or_header_html('head')
if head_html == '':
head_html = '<title>{}</title>'.format(
getattr(self, 'title', 'Dash'))
return head_html

def _validate_callback(self, output, inputs, state, events):
layout = self._cached_layout or self._layout_value()

Expand Down