summaryrefslogtreecommitdiff
path: root/service/pixelated/application.py
diff options
context:
space:
mode:
authorRoald de Vries <rdevries@thoughtworks.com>2016-12-05 10:32:12 +0100
committerRoald de Vries <rdevries@thoughtworks.com>2016-12-05 10:32:12 +0100
commit391cc55537a97ec8b2b55662db9c63f86ab885ef (patch)
tree3dcf6adc12efa9a84e02f9340fae925b057fcb89 /service/pixelated/application.py
parenta0de084e04f02a5f09d5a14b86ece156f4f6df5f (diff)
get templates from pkg_resources
Diffstat (limited to 'service/pixelated/application.py')
-rw-r--r--service/pixelated/application.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/service/pixelated/application.py b/service/pixelated/application.py
index 0c2383dd..7263482d 100644
--- a/service/pixelated/application.py
+++ b/service/pixelated/application.py
@@ -42,6 +42,16 @@ from pixelated.resources.root_resource import RootResource
log = Logger()
+def get_templates_folder():
+ return os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "templates")
+
+
+def get_static_folder():
+ # TODO: make sure sandbox keeps working
+ # TODO: make sure this works for packaging
+ return os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "..", "web-ui", "public"))
+
+
class UserAgentMode(object):
def __init__(self, is_single_user):
self.is_single_user = is_single_user
@@ -88,16 +98,6 @@ def _create_service_factory(args):
return ServicesFactory(UserAgentMode(is_single_user=False))
-def get_templates_folder():
- return os.path.join(os.path.dirname(os.path.abspath(__file__)), "assets")
-
-
-def get_static_folder():
- # TODO: make sure sandbox keeps working
- # TODO: make sure this works for packaging
- return os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "..", "web-ui", "public"))
-
-
def initialize():
log.info('Starting the Pixelated user agent')
args = arguments.parse_user_agent_args()