summaryrefslogtreecommitdiff
path: root/service/pixelated/resources/root_resource.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/resources/root_resource.py
parenta0de084e04f02a5f09d5a14b86ece156f4f6df5f (diff)
get templates from pkg_resources
Diffstat (limited to 'service/pixelated/resources/root_resource.py')
-rw-r--r--service/pixelated/resources/root_resource.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/service/pixelated/resources/root_resource.py b/service/pixelated/resources/root_resource.py
index 375f27f6..e6a25e00 100644
--- a/service/pixelated/resources/root_resource.py
+++ b/service/pixelated/resources/root_resource.py
@@ -15,6 +15,7 @@
# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
import json
import os
+import pkg_resources
from pixelated.resources.users import UsersResource
import pixelated
@@ -50,9 +51,8 @@ class RootResource(BaseResource):
self._assets_folder = self._get_assets_folder()
self._startup_assets_folder = self._get_startup_folder()
self._static_folder = static_folder
- self._html_template = open(os.path.join(templates_folder, 'index.html')).read()
self._services_factory = services_factory
- with open(os.path.join(self._startup_assets_folder, 'Interstitial.html')) as f:
+ with open(pkg_resources.resource_filename('templates', 'Interstitial.html')) as f:
self.interstitial = f.read()
self._redirect_to_login_resource = Redirect('login')
self._inbox_resource = InboxResource(services_factory)
@@ -60,7 +60,7 @@ class RootResource(BaseResource):
def _startup_mode(self):
self.putChildProtected('assets', File(self._assets_folder))
- self.putChildPublic('startup-assets', File(self._startup_assets_folder))
+ self.putChildPublic('startup-assets', File(pkg_resources.resource_filename('templates', '.')))
self.putChildPublic('static', File(self._static_folder))
self._mode = MODE_STARTUP
logger.debug('Root in STARTUP mode. %s' % self)