diff --git a/webconference/templates/webconference/jitsi.html b/webconference/templates/webconference/jitsi.html index 9a7487f..b5eec6e 100644 --- a/webconference/templates/webconference/jitsi.html +++ b/webconference/templates/webconference/jitsi.html @@ -1,14 +1,13 @@ - -{% load static i18n %} - - - - {% trans "Web Conference" %} - - +{% extends "webconference/view.html" %} + +{% load static i18n pagination permissions_tags subject_counter access_conference %} +{% load django_bootstrap_breadcrumbs %} + +{% block javascript%} + {{ block.super }} - - -
+{% endblock%} -
+{% block breadcrumbs %} + {{ block.super }} +{% endblock %} - +{% block content %} +
+ +
+ - - +{% endblock %} diff --git a/webconference/urls.py b/webconference/urls.py index bbc1e4e..9e1698b 100644 --- a/webconference/urls.py +++ b/webconference/urls.py @@ -12,6 +12,6 @@ urlpatterns = [ url(r'^view/(?P[\w_-]+)/$', views.InsideView.as_view(), name = 'view'), url(r'^conference/(?P[\w_-]+)/$',views.Conference.as_view(), name = 'conference'), url(r'^finish/$',views.finish, name = 'exit'), - url(r'^online/$',views.online, name = 'online'), + url(r'^participando/$',views.participando, name = 'participando'), url(r'^settings/$', views.ConferenceSettings.as_view(), name = 'settings'), ] diff --git a/webconference/views.py b/webconference/views.py index 55aafa2..f32d21d 100644 --- a/webconference/views.py +++ b/webconference/views.py @@ -89,6 +89,11 @@ class Conference(LoginRequiredMixin,LogMixin,generic.TemplateView): def get_context_data(self, **kwargs): context = super(Conference, self).get_context_data(**kwargs) + conference = get_object_or_404(Webconference, slug = kwargs.get('slug')) + context['title'] = _("%s - Web Conference")%(conference) + context['webconference'] = conference + context['topic'] = conference.topic + context['subject'] = conference.topic.subject context['name_room'] = kwargs.get('slug') context['user_image'] = 'http://localhost:8000'+str(self.request.user.image.url) try: @@ -96,7 +101,7 @@ class Conference(LoginRequiredMixin,LogMixin,generic.TemplateView): except AttributeError: context['domain'] = 'meet.jit.si' - conference = get_object_or_404(Webconference, slug = kwargs.get('slug')) + self.log_context['category_id'] = conference.topic.subject.category.id self.log_context['category_name'] = conference.topic.subject.category.name self.log_context['category_slug'] = conference.topic.subject.category.slug @@ -115,8 +120,8 @@ class Conference(LoginRequiredMixin,LogMixin,generic.TemplateView): return context -@log_decorator('resources', 'online', 'webconference') -def online(request): +@log_decorator('resources', 'participando', 'webconference') +def participando(request): webconference = get_object_or_404(Webconference, slug = request.GET['slug']) log_context = {} log_context['category_id'] = webconference.topic.subject.category.id -- libgit2 0.21.2