From a434d2da8d8df588f269a3e2a6c80c355586ed9b Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Tue, 31 Mar 2015 16:35:15 -0400 Subject: Merge the login and info plugins configurations Having separate login and info plugins configuration pages doesn't really make a lot of sense. As a first step moving towards login stacks put login and info plugin configuration into a common "Login Stack" menu item. Signed-off-by: Simo Sorce --- ipsilon/root.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'ipsilon/root.py') diff --git a/ipsilon/root.py b/ipsilon/root.py index 93b6cd4..6326436 100644 --- a/ipsilon/root.py +++ b/ipsilon/root.py @@ -21,6 +21,7 @@ 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 @@ -57,8 +58,9 @@ class Root(Page): # after all plugins are setup we can instantiate the admin pages self.admin = Admin(self._site, 'admin') self.rest = Rest(self._site, 'rest') - InfoPlugins(self._site, self.admin) - LoginPlugins(self._site, self.admin) + 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) -- cgit