moved to use new admin register_page

extra/auquotidien.py

@@ -1,13 +1,11 @@
-import modules.root
+from qommon import get_publisher_class
+
 import modules.links_ui
 import modules.announces_ui
-
 import modules.admin
 import modules.formpage
-
 import modules.template
-
-from qommon import get_publisher_class
+import modules.root
 
 get_publisher_class().register_translation_domain('auquotidien')
 

extra/modules/admin.ptl

@@ -29,9 +29,7 @@ class AdminRootDirectory(wcs.admin.root.RootDirectory):
         self.items[-1] = ('/', N_('Au Quotidien'))
         from wcs.admin.menu import html_top
         html_top('/')
-        'hello world'
-
-wcs.root.RootDirectory.admin = AdminRootDirectory()
+        'hello world (FIXME)'
 
 class UpdateOneDirectory(Directory):
     _q_exports = ['']
@@ -188,4 +186,4 @@ class PanelDirectory(Directory):
             '</ul>'
 
 
-get_publisher_class().get_admin().register_page('panel', PanelDirectory())
+AdminRootDirectory.register_page('panel', PanelDirectory())

extra/modules/announces_ui.ptl

@@ -139,4 +139,5 @@ class AnnouncesDirectory(Directory):
     def listing(self):
         return redirect('.')
 
-get_publisher_class().get_admin().register_page('announces', AnnouncesDirectory())
+from admin import AdminRootDirectory
+AdminRootDirectory.register_page('announces', AnnouncesDirectory())

extra/modules/links_ui.ptl

@@ -169,4 +169,5 @@ Sortable.create('links-list', {dropOnEmpty:true,constraint:false,
     def listing(self):
         return redirect('.')
 
-get_publisher_class().get_admin().register_page('links', LinksDirectory())
+from admin import AdminRootDirectory
+AdminRootDirectory.register_page('links', LinksDirectory())

extra/modules/root.ptl

@@ -21,6 +21,8 @@ from qommon.admin.emails import EmailsDirectory
 from links import Link
 from announces import Announce, AnnounceSubscription
 
+import admin
+
 OldRootDirectory = wcs.root.RootDirectory
 
 class AnnouncesDirectory(Directory):
@@ -244,6 +246,7 @@ class AlternateRootDirectory(OldRootDirectory):
             ('announces', 'announces_dir'),
             'accessibility', 'contact', 'help']
 
+    admin = admin.AdminRootDirectory()
     announces_dir = AnnouncesDirectory()
     register = AlternateRegisterDirectory()
     login = AlternateLoginDirectory()