prepare telecaster inclusion

diff --git a/example/settings.py b/example/settings.py
index 15749e895e40e454aaf11da5e52bc2724f471a62..8c01e6840011aee58df0e33ba8295ea8f9a95584 100644 (file)
--- a/example/settings.py
+++ b/example/settings.py
@@ -144,6 +144,7 @@ INSTALLED_APPS = (
     'timezones',
     'jqchat',
 #    'follow',
+     'telecaster',
 )
 
 TEMPLATE_CONTEXT_PROCESSORS = (
@@ -181,3 +182,5 @@ DEFAULT_FROM_EMAIL = 'webmaster@parisson.com'
 POSTMAN_AUTO_MODERATE_AS=True
 
 #FILE_PROTECTION_METHOD = 'xsendfile'
+
+TELECASTER_CONF = '/etc/telecaster/telecaster.xml'

diff --git a/example/update_schema.sh b/example/update_schema.sh
index 93714a935853145c5788fdaf82aef016fff9deb6..e0d592e6d6577f00c1f0401c824f05e9107d744e 100755 (executable)
--- a/example/update_schema.sh
+++ b/example/update_schema.sh
@@ -2,5 +2,6 @@
 
 ./manage.py schemamigration teleforma --auto
 ./manage.py schemamigration telemeta --auto
+./manage.py schemamigration telecaster --auto
 ./manage.py migrate
 

diff --git a/example/urls.py b/example/urls.py
index b6ae6b3ef2213139099ef05545a82a5ee500f546..250c91a7746b4cab1a91e1ed745f6ca4de7d5c04 100644 (file)
--- a/example/urls.py
+++ b/example/urls.py
@@ -20,6 +20,7 @@ urlpatterns = patterns('',
 
     # TeleForma
     (r'^', include('teleforma.urls')),
+    (r'^telecaster/', include('telecaster.urls')),
 
     # Languages
     (r'^i18n/', include('django.conf.urls.i18n')),

diff --git a/teleforma/templates/teleforma/inc/conference_list.html b/teleforma/templates/teleforma/inc/conference_list.html
index e010c85513575c7dff16d9c12419cbc23da7e7d5..518f48aec1c364abc4501f8d7e10ad1d32d69618 100644 (file)
--- a/teleforma/templates/teleforma/inc/conference_list.html
+++ b/teleforma/templates/teleforma/inc/conference_list.html
@@ -30,7 +30,8 @@
                 {% if stream.streaming %}
                 <img src="{{ STATIC_URL }}teleforma/images/network-wireless.png" style="vertical-align:middle" title="streaming" />
                 <img src="{{ STATIC_URL }}telemeta/images/media-record.png" style="vertical-align:middle" title="recording" />
-                <script type="text/javascript">
+
+               <!-- <script type="text/javascript">
                     function update_snapshots_callback_{{ stream.course.code }}_{{ stream.course_type }}() {
                         var d = 3000;
                         var refresh = function(){
@@ -39,7 +40,8 @@
                         setInterval(refresh,d);
                     };
                     update_snapshots_callback_{{ stream.course.code }}_{{ stream.course_type }}();
-                    </script>
+               </script>
+               -->
               {% endif %}
             </td>
             {% else %}

diff --git a/teleforma/views.py b/teleforma/views.py
index 0c357580b0b696e38cdc724c256a92a164b99c2d..ed1d016a0cb2be9ec9188135e63091f52044512b 100755 (executable)
--- a/teleforma/views.py
+++ b/teleforma/views.py
@@ -319,6 +319,31 @@ class ConferenceView(DetailView):
     def dispatch(self, *args, **kwargs):
         return super(ConferenceView, self).dispatch(*args, **kwargs)
 
+
+class ConferenceNewView(DetailView):
+
+    model = Conference
+    template_name='teleforma/course_conference.html'
+
+    def get_context_data(self, **kwargs):
+        context = super(ConferenceNewView, self).get_context_data(**kwargs)
+        context['all_courses'] = get_courses(self.request.user)
+        conference = Conference()
+        context['mime_type'] = 'video/webm'
+        context['course'] = conference.course
+        context['type'] = conference.course_type
+        context['notes'] = conference.notes.all().filter(author=self.request.user)
+        content_type = ContentType.objects.get(app_label="teleforma", model="conference")
+        context['room'] = get_room(name=conference.course.title, content_type=content_type,
+                                   id=conference.id)
+        context['livestream'] = conference.livestream.get().url
+        return context
+
+    @method_decorator(login_required)
+    def dispatch(self, *args, **kwargs):
+        return super(ConferenceView, self).dispatch(*args, **kwargs)
+
+
 class UsersView(ListView):
 
     model = User