Skip to content

Commit

Permalink
Merge pull request #280 from jacebrowning/jmac/views-installation-fix
Browse files Browse the repository at this point in the history
Move views directory inside doorstop package
  • Loading branch information
jacebrowning committed Aug 26, 2017
2 parents 0d804e9 + 05c3e03 commit 6f0a1c5
Show file tree
Hide file tree
Showing 8 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion doorstop/core/publisher.py
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,7 @@ def _lines_html(obj, linkify=False, extensions=EXTENSIONS,
try:
bottle.TEMPLATE_PATH.insert(0,
os.path.join(os.path.dirname(__file__),
'..', '..', 'views'))
'..', 'views'))
if 'baseurl' not in bottle.SimpleTemplate.defaults:
bottle.SimpleTemplate.defaults['baseurl'] = ''
html = bottle_template(template, body=body, toc=toc_html, parent=obj.parent)
Expand Down
2 changes: 1 addition & 1 deletion doorstop/server/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def run(args, cwd, _):
host = args.host
port = args.port or settings.SERVER_PORT
bottle.TEMPLATE_PATH.insert(0, os.path.join(os.path.dirname(__file__),
'..', '..', 'views'))
'..', 'views'))

# If you started without WSGI, the base will be '/'.
if args.baseurl == '' and not args.wsgi:
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def build_description():

packages=setuptools.find_packages(),
package_data={'doorstop.core': ['files/*.html', 'files/*.css', 'files/assets/doorstop/*'],
'views': ['*.tpl']},
'doorstop': ['views/*.tpl']},

entry_points={
'console_scripts': [
Expand Down

0 comments on commit 6f0a1c5

Please sign in to comment.