Merge pull request #280 from jacebrowning/jmac/views-installation-fix

Move views directory inside doorstop package
doorstop-dev · Aug 26, 2017 · 6f0a1c5 · 6f0a1c5
2 parents 0d804e9 + 05c3e03
commit 6f0a1c5
Show file tree

Hide file tree

Showing 8 changed files with 3 additions and 3 deletions.
diff --git a/doorstop/core/publisher.py b/doorstop/core/publisher.py
@@ -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)

diff --git a/doorstop/server/main.py b/doorstop/server/main.py
@@ -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:

diff --git a/views/base.tpl → doorstop/views/base.tpl b/views/base.tpl → doorstop/views/base.tpl
diff --git a/views/document_list.tpl → doorstop/views/document_list.tpl b/views/document_list.tpl → doorstop/views/document_list.tpl
diff --git a/views/index.tpl → doorstop/views/index.tpl b/views/index.tpl → doorstop/views/index.tpl
diff --git a/views/item_list.tpl → doorstop/views/item_list.tpl b/views/item_list.tpl → doorstop/views/item_list.tpl
diff --git a/views/sidebar.tpl → doorstop/views/sidebar.tpl b/views/sidebar.tpl → doorstop/views/sidebar.tpl
diff --git a/setup.py b/setup.py
@@ -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': [