From ed69fa3b7bf0b543b6c5d3f41504965a1b085808 Mon Sep 17 00:00:00 2001 From: Roald de Vries Date: Mon, 5 Dec 2016 10:39:10 +0100 Subject: use static instead of {startup,public}-assets --- service/pixelated/resources/login_resource.py | 20 -------------------- service/pixelated/resources/root_resource.py | 13 ------------- service/setup.py | 4 ++-- service/templates/Interstitial.html | 6 +++--- service/templates/login.html | 10 +++++----- service/test/unit/resources/test_login_resource.py | 2 +- 6 files changed, 11 insertions(+), 44 deletions(-) (limited to 'service') diff --git a/service/pixelated/resources/login_resource.py b/service/pixelated/resources/login_resource.py index 2ca85af9..4318752e 100644 --- a/service/pixelated/resources/login_resource.py +++ b/service/pixelated/resources/login_resource.py @@ -35,22 +35,6 @@ from twisted.web.template import Element, XMLFile, renderElement, renderer log = Logger() -def _get_startup_folder(): - path = os.path.dirname(os.path.abspath(__file__)) - return os.path.join(path, '..', 'assets') - - -def _get_public_folder(): - static_folder = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "..", "..", "web-ui", "public")) - # this is a workaround for packaging - if not os.path.exists(static_folder): - static_folder = os.path.abspath( - os.path.join(os.path.abspath(__file__), "..", "..", "..", "..", "web-ui", "public")) - if not os.path.exists(static_folder): - static_folder = os.path.join('/', 'usr', 'share', 'pixelated-user-agent') - return static_folder - - def _get_static_folder(): static_folder = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "..", "..", "web-ui", "public")) # this is a workaround for packaging @@ -124,15 +108,11 @@ class LoginResource(BaseResource): def __init__(self, services_factory, provider=None, disclaimer_banner=None, authenticator=None): BaseResource.__init__(self, services_factory) self._static_folder = _get_static_folder() - self._public_folder = _get_public_folder() - self._startup_folder = _get_startup_folder() self._disclaimer_banner = disclaimer_banner self._provider = provider self._authenticator = authenticator or Authenticator(provider) self._bootstrap_user_services = BootstrapUserServices(services_factory, provider) - self.putChild('startup-assets', File(self._startup_folder)) - self.putChild('public-assets', File(self._public_folder)) with open(pkg_resources.resource_filename('templates', 'Interstitial.html')) as f: self.interstitial = f.read() diff --git a/service/pixelated/resources/root_resource.py b/service/pixelated/resources/root_resource.py index e6a25e00..8253a5c1 100644 --- a/service/pixelated/resources/root_resource.py +++ b/service/pixelated/resources/root_resource.py @@ -48,8 +48,6 @@ class RootResource(BaseResource): def __init__(self, services_factory, templates_folder, static_folder, public=False): BaseResource.__init__(self, services_factory) self._public = public - self._assets_folder = self._get_assets_folder() - self._startup_assets_folder = self._get_startup_folder() self._static_folder = static_folder self._services_factory = services_factory with open(pkg_resources.resource_filename('templates', 'Interstitial.html')) as f: @@ -59,8 +57,6 @@ class RootResource(BaseResource): self._startup_mode() def _startup_mode(self): - self.putChildProtected('assets', File(self._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) @@ -120,12 +116,3 @@ class RootResource(BaseResource): self._inbox_resource.initialize() self._mode = MODE_RUNNING logger.debug('Root in RUNNING mode. %s' % self) - - def _get_assets_folder(self): - pixelated_path = os.path.dirname(os.path.abspath(pixelated.__file__)) - return os.path.join(pixelated_path, '..', '..', 'web-ui', 'public') - - # TODO: use the public folder for this - def _get_startup_folder(self): - path = os.path.dirname(os.path.abspath(__file__)) - return os.path.join(path, '..', 'assets') diff --git a/service/setup.py b/service/setup.py index d7fd1607..da706ed3 100644 --- a/service/setup.py +++ b/service/setup.py @@ -41,11 +41,11 @@ setup(name='pixelated-user-agent', 'pixelated.adapter.mailstore.maintenance', 'pixelated.bitmask_libraries', 'pixelated.config', - 'pixelated.assets', 'pixelated.certificates', 'pixelated.support', 'pixelated.resources', - 'pixelated.extensions' + 'pixelated.extensions', + 'templates' ], install_requires=[], entry_points={ diff --git a/service/templates/Interstitial.html b/service/templates/Interstitial.html index bc6cc738..7787a1c5 100644 --- a/service/templates/Interstitial.html +++ b/service/templates/Interstitial.html @@ -4,15 +4,15 @@ - - + +
- + diff --git a/service/templates/login.html b/service/templates/login.html index c2f5e78e..c60e9305 100644 --- a/service/templates/login.html +++ b/service/templates/login.html @@ -3,16 +3,16 @@ Pixelated - Login - - - - + + + +