diff --git a/chat/indico_chat/views.py b/chat/indico_chat/views.py index 375aa43..c1c2fef 100644 --- a/chat/indico_chat/views.py +++ b/chat/indico_chat/views.py @@ -17,26 +17,27 @@ from __future__ import unicode_literals from indico.core.plugins import WPJinjaMixinPlugin -from indico.legacy.webinterface.pages.conferences import WPConferenceDefaultDisplayBase, WPConferenceModifBase +from indico.modules.events.management.views import WPEventManagementLegacy +from indico.modules.events.views import WPConferenceDisplayLegacyBase -class WPChatEventPage(WPJinjaMixinPlugin, WPConferenceDefaultDisplayBase): +class WPChatEventPage(WPJinjaMixinPlugin, WPConferenceDisplayLegacyBase): menu_entry_plugin = 'chat' menu_entry_name = 'chatrooms' def __init__(self, rh, conf, **kwargs): - WPConferenceDefaultDisplayBase.__init__(self, rh, conf, **kwargs) + WPConferenceDisplayLegacyBase.__init__(self, rh, conf, **kwargs) self._conf = conf def _getBody(self, params): return self._getPageContent(params) def getCSSFiles(self): - return WPConferenceDefaultDisplayBase.getCSSFiles(self) + self._asset_env['eventservices_sass'].urls() + return WPConferenceDisplayLegacyBase.getCSSFiles(self) + self._asset_env['eventservices_sass'].urls() def getJSFiles(self): - return WPConferenceDefaultDisplayBase.getJSFiles(self) + self._asset_env['modules_event_display_js'].urls() + return WPConferenceDisplayLegacyBase.getJSFiles(self) + self._asset_env['modules_event_display_js'].urls() -class WPChatEventMgmt(WPJinjaMixinPlugin, WPConferenceModifBase): +class WPChatEventMgmt(WPJinjaMixinPlugin, WPEventManagementLegacy): sidemenu_option = 'chat' diff --git a/piwik/indico_piwik/views.py b/piwik/indico_piwik/views.py index 6915785..711a1fd 100644 --- a/piwik/indico_piwik/views.py +++ b/piwik/indico_piwik/views.py @@ -15,8 +15,8 @@ # along with Indico; if not, see . from indico.core.plugins import WPJinjaMixinPlugin -from indico.legacy.webinterface.pages.conferences import WPConferenceModifBase +from indico.modules.events.management.views import WPEventManagementLegacy -class WPStatistics(WPJinjaMixinPlugin, WPConferenceModifBase): +class WPStatistics(WPJinjaMixinPlugin, WPEventManagementLegacy): sidemenu_option = 'statistics' diff --git a/search/indico_search/views.py b/search/indico_search/views.py index e1d365f..780841d 100644 --- a/search/indico_search/views.py +++ b/search/indico_search/views.py @@ -17,8 +17,8 @@ from __future__ import unicode_literals from indico.core.plugins import WPJinjaMixinPlugin -from indico.legacy.webinterface.pages.conferences import WPConferenceDefaultDisplayBase from indico.modules.categories.views import WPCategory +from indico.modules.events.views import WPConferenceDisplayLegacyBase class WPSearchCategory(WPJinjaMixinPlugin, WPCategory): @@ -26,6 +26,6 @@ class WPSearchCategory(WPJinjaMixinPlugin, WPCategory): return self._getPageContent(params) -class WPSearchConference(WPJinjaMixinPlugin, WPConferenceDefaultDisplayBase): +class WPSearchConference(WPJinjaMixinPlugin, WPConferenceDisplayLegacyBase): def _getBody(self, params): return self._getPageContent(params)