X-Git-Url: http://git.cascardo.info/?p=cascardo%2Fipsilon.git;a=blobdiff_plain;f=ipsilon%2Froot.py;h=6326436700256c342e97d211a84639855ff805e9;hp=b2654ac05d7d0b78b8aa072871b90cc5b2674427;hb=1bcc0d697dd37a9268641f0cbaa7e9e781552233;hpb=907d40cac424c9c7bf3a190b445858bc6eab949e diff --git a/ipsilon/root.py b/ipsilon/root.py old mode 100755 new mode 100644 index b2654ac..6326436 --- a/ipsilon/root.py +++ b/ipsilon/root.py @@ -1,5 +1,3 @@ -#!/usr/bin/python -# # Copyright (C) 2013 Simo Sorce # # see file 'COPYING' for use and warranty information @@ -23,9 +21,12 @@ from ipsilon.login.common import Login from ipsilon.login.common import Logout from ipsilon.admin.common import Admin from ipsilon.providers.common import LoadProviders +from ipsilon.admin.loginstack import LoginStack from ipsilon.admin.info import InfoPlugins from ipsilon.admin.login import LoginPlugins from ipsilon.admin.providers import ProviderPlugins +from ipsilon.rest.common import Rest +from ipsilon.rest.providers import RestProviderPlugins import cherrypy sites = dict() @@ -39,6 +40,7 @@ class Root(Page): if template_env: sites[site]['template_env'] = template_env super(Root, self).__init__(sites[site]) + self.html_heads = dict() # set up error pages cherrypy.config['error_page.400'] = errors.Error_400(self._site) @@ -55,9 +57,14 @@ class Root(Page): # after all plugins are setup we can instantiate the admin pages self.admin = Admin(self._site, 'admin') - InfoPlugins(self._site, self.admin) - LoginPlugins(self._site, self.admin) + self.rest = Rest(self._site, 'rest') + self.stack = LoginStack(self._site, self.admin) + LoginPlugins(self._site, self.stack) + InfoPlugins(self._site, self.stack) ProviderPlugins(self._site, self.admin) + RestProviderPlugins(self._site, self.rest) def root(self): - return self._template('index.html', title='Ipsilon') + self.debug(self.html_heads) + return self._template('index.html', title='Ipsilon', + heads=self.html_heads)