Ajustes na tela de web confenrencia

Jailson Dias
1 parent 73bbb444
Showing 3 changed files with 71 additions and 64 deletions Show diff stats
webconference/templates/webconference/jitsi.html
webconference/urls.py
webconference/views.py
-<!DOCTYPE html>
-{% load static i18n %}
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>{% trans "Web Conference" %}</title>
-    <script type="text/javascript" src="{% static 'js/jquery-3.1.0.min.js' %}"></script>
-    <!-- <script src="https://meet.jit.si/external_api.js"></script> -->
+{% extends "webconference/view.html" %}
+
+{% load static i18n pagination permissions_tags subject_counter access_conference %}
+{% load django_bootstrap_breadcrumbs %}
+
+{% block javascript%}
+    {{ block.super }}
     <script src="{% static 'js/jitsi.js' %}"></script>
     <style>
-      body, html, #jitsi, iframe{
+      #jitsi, iframe{
           margin-left: -1px;
           margin-right: 0px;
           margin-top: -2px;
@@ -19,57 +18,60 @@
           height: 100%;
       }
       </style>
-  </head>
-  <body>
-    <div id="jitsi">
+{% endblock%}
-    </div>
+{% block breadcrumbs %}
+    {{ block.super }}
+{% endblock %}
-    <script>
-    // code to start jitsi api
-      var domain = "{{domain}}"; // domain that jitsi will itself connect
-      var room = "{{name_room}}"; // name of the room to be created
-      var width = $("body").width(); // width of the window to be created
-      var height = $("body").height(); // height of the window to be created
-      var html = document.getElementById("jitsi");
-      var api = new JitsiMeetExternalAPI(domain, room, width, height,html);
-      // window.onload = initpage;
-      window.onload = initpage;
-      function initpage(){
-        api.executeCommand('displayName', '{{user}}');
-        api.executeCommand('email', '{{user.email}}');
-        api.executeCommand('avatarUrl', '{{user_image}}');
-        api.addEventListener('videoConferenceLeft', function(res){
-          $.ajax({
-            method: "GET",
-      			url: "{% url 'webconferences:exit'%}",
-      			dataType: 'json',
-      			data: res,
-      			success: function(response) {
-              window.location.replace(response['url']);
-      				console.log(response);
-      			},
-      			error: function(response) {
-      				console.log(response);
-      			}
-      		});
-        });
-        var repeater = setInterval(function () {
-          $.ajax({
-            method: "GET",
-            url: "{% url 'webconferences:online'%}",
-            dataType: 'json',
-            data: {'slug':'{{name_room}}'},
-            success: function(response) {
-              console.log(response);
-            },
-            error: function(response) {
-              console.log(response);
-            }
-          });
-        }, 60*1000);
-      }
-    </script>
+{% block content %}
+<div id="jitsi">
+
+</div>
+<script>
+// code to start jitsi api
+  var domain = "{{domain}}"; // domain that jitsi will itself connect
+  var room = "{{name_room}}"; // name of the room to be created
+  var height = $(document).height(); // height of the window to be created
+  var html = document.getElementById("jitsi");
+  $('#jitsi').css({'height':height});
+  var api = new JitsiMeetExternalAPI(domain, room, 0, 0,html);
+  // window.onload = initpage;
+  window.onload = initpage;
+  function initpage(){
+    api.executeCommand('displayName', '{{user}}');
+    api.executeCommand('email', '{{user.email}}');
+    api.executeCommand('avatarUrl', '{{user_image}}');
+    api.addEventListener('videoConferenceLeft', function(res){
+      $.ajax({
+        method: "GET",
+        url: "{% url 'webconferences:exit'%}",
+        dataType: 'json',
+        data: res,
+        success: function(response) {
+          window.location.replace(response['url']);
+          console.log(response);
+        },
+        error: function(response) {
+          console.log(response);
+        }
+      });
+    });
+    var repeater = setInterval(function () {
+      $.ajax({
+        method: "GET",
+        url: "{% url 'webconferences:participando'%}",
+        dataType: 'json',
+        data: {'slug':'{{name_room}}'},
+        success: function(response) {
+          console.log(response);
+        },
+        error: function(response) {
+          console.log(response);
+        }
+      });
+    }, 60*1000);
+  }
+</script>
-  </body>
-</html>
+{% endblock %}
@@ -12,6 +12,6 @@ urlpatterns = [
 	url(r'^view/(?P<slug>[\w_-]+)/$', views.InsideView.as_view(), name = 'view'),
 	url(r'^conference/(?P<slug>[\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'),
 ]
@@ -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
	@@ -12,6 +12,6 @@ urlpatterns = [		@@ -12,6 +12,6 @@ urlpatterns = [
12	url(r'^view/(?P<slug>[\w_-]+)/$', views.InsideView.as_view(), name = 'view'),	12	url(r'^view/(?P<slug>[\w_-]+)/$', views.InsideView.as_view(), name = 'view'),
13	url(r'^conference/(?P<slug>[\w_-]+)/$',views.Conference.as_view(), name = 'conference'),	13	url(r'^conference/(?P<slug>[\w_-]+)/$',views.Conference.as_view(), name = 'conference'),
14	url(r'^finish/$',views.finish, name = 'exit'),	14	url(r'^finish/$',views.finish, name = 'exit'),
15	- url(r'^online/$',views.online, name = 'online'),	15	+ url(r'^participando/$',views.participando, name = 'participando'),
16	url(r'^settings/$', views.ConferenceSettings.as_view(), name = 'settings'),	16	url(r'^settings/$', views.ConferenceSettings.as_view(), name = 'settings'),
17	]	17	]