diff --git a/chat/indico_chat/controllers/logs.py b/chat/indico_chat/controllers/logs.py
index 9764f79..347823f 100644
--- a/chat/indico_chat/controllers/logs.py
+++ b/chat/indico_chat/controllers/logs.py
@@ -47,7 +47,7 @@ class RHChatManageEventLogs(RHEventChatroomMixin, RHChatManageEventBase):
if not retrieve_logs(self.chatroom):
flash(_('There are no logs available for this room.'), 'warning')
return redirect(url_for_plugin('.manage_rooms', self.event))
- return WPChatEventMgmt.render_template('manage_event_logs.html', self._conf,
+ return WPChatEventMgmt.render_template('manage_event_logs.html', self.event,
event_chatroom=self.event_chatroom,
start_date=self.event.start_dt_local,
end_date=self.event.end_dt_local)
diff --git a/chat/indico_chat/controllers/management.py b/chat/indico_chat/controllers/management.py
index e366550..9c5f7f4 100644
--- a/chat/indico_chat/controllers/management.py
+++ b/chat/indico_chat/controllers/management.py
@@ -57,8 +57,7 @@ class RHChatManageEvent(AttachChatroomMixin, RHChatManageEventBase):
attach_form = self._get_attach_form()
if not attach_form.chatroom._get_object_list():
attach_form = None
- return WPChatEventMgmt.render_template('manage_event.html', self._conf, event_chatrooms=chatrooms,
- event=self.event,
+ return WPChatEventMgmt.render_template('manage_event.html', self.event, event_chatrooms=chatrooms,
chat_links=current_plugin.settings.get('chat_links'),
logs_enabled=logs_enabled, attach_form=attach_form)
diff --git a/chat/indico_chat/templates/event_page.html b/chat/indico_chat/templates/event_page.html
index fc19197..50f3c5d 100644
--- a/chat/indico_chat/templates/event_page.html
+++ b/chat/indico_chat/templates/event_page.html
@@ -1,5 +1,10 @@
-
{% trans %}Chat Rooms{% endtrans %}
-
+{% extends 'events/display/conference/base.html' %}
+
+{% block title %}
+ {% trans %}Chat Rooms{% endtrans %}
+{% endblock %}
+
+{% block content %}
{% for event_chatroom in event_chatrooms %}
{% set chatroom = event_chatroom.chatroom %}
{% set server = chatroom.server %}
@@ -49,7 +54,8 @@
{% endfor %}
-
-
+
+
+{% endblock %}
diff --git a/chat/indico_chat/templates/manage_event.html b/chat/indico_chat/templates/manage_event.html
index b3d269a..78da586 100644
--- a/chat/indico_chat/templates/manage_event.html
+++ b/chat/indico_chat/templates/manage_event.html
@@ -1,6 +1,11 @@
-{% extends 'layout/base.html' %}
+{% extends 'events/management/base.html' %}
+
{% from 'forms/_form.html' import form_header, form_row, form_footer %}
+{% block title %}
+ {% trans %}Chat{% endtrans %}
+{% endblock %}
+
{% block content %}
{% if event_chatrooms %}
diff --git a/chat/indico_chat/templates/manage_event_logs.html b/chat/indico_chat/templates/manage_event_logs.html
index e69067a..22d308d 100644
--- a/chat/indico_chat/templates/manage_event_logs.html
+++ b/chat/indico_chat/templates/manage_event_logs.html
@@ -1,7 +1,8 @@
-{% extends 'layout/base.html' %}
+{% extends 'events/management/base.html' %}
+
{% set chatroom = event_chatroom.chatroom %}
-{% block title %}{% trans %}Chat Rooms{% endtrans %}{% endblock %}
+{% block title %}{% trans %}Chat{% endtrans %}{% endblock %}
{% block subtitle %}{% trans room=chatroom.name %}Logs for {{ room }}{% endtrans %}{% endblock %}
diff --git a/chat/indico_chat/views.py b/chat/indico_chat/views.py
index c1c2fef..dab56e4 100644
--- a/chat/indico_chat/views.py
+++ b/chat/indico_chat/views.py
@@ -17,27 +17,14 @@
from __future__ import unicode_literals
from indico.core.plugins import WPJinjaMixinPlugin
-from indico.modules.events.management.views import WPEventManagementLegacy
-from indico.modules.events.views import WPConferenceDisplayLegacyBase
+from indico.modules.events.management.views import WPEventManagement
+from indico.modules.events.views import WPConferenceDisplayBase
-class WPChatEventPage(WPJinjaMixinPlugin, WPConferenceDisplayLegacyBase):
+class WPChatEventPage(WPJinjaMixinPlugin, WPConferenceDisplayBase):
menu_entry_plugin = 'chat'
menu_entry_name = 'chatrooms'
- def __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 WPConferenceDisplayLegacyBase.getCSSFiles(self) + self._asset_env['eventservices_sass'].urls()
-
- def getJSFiles(self):
- return WPConferenceDisplayLegacyBase.getJSFiles(self) + self._asset_env['modules_event_display_js'].urls()
-
-
-class WPChatEventMgmt(WPJinjaMixinPlugin, WPEventManagementLegacy):
+class WPChatEventMgmt(WPJinjaMixinPlugin, WPEventManagement):
sidemenu_option = 'chat'