]> git.parisson.com Git - teleforma.git/commitdiff
rm room for record
authoryomguy <yomguy@parisson.com>
Wed, 18 Jul 2012 21:08:16 +0000 (23:08 +0200)
committeryomguy <yomguy@parisson.com>
Wed, 18 Jul 2012 21:08:16 +0000 (23:08 +0200)
teleforma/static/teleforma/css/teleforma.css
teleforma/views.py

index 25731ff3b3adb0b955fff2c29992d9c2fc2299d9..2debd91b5c88cfd3eb8100e28dcf0e856b548130 100644 (file)
@@ -340,8 +340,9 @@ label.disabled { color: #d7d7d7 }
     -webkit-border-radius: 5px 5px 5px 5px;
     border-radius: 5px 5px 5px 5px;
 }
+
 #quick_search_pattern {
-    background: #FFF url(search_bg.png) no-repeat;
+    background: #FFF;
     padding: .4em .1em;
     padding-left: 25px;
     width: 180px;
index 0df3ee74d83034e3f4e30767820647efc7f9cf31..8a5d82aa73676a24021fb51fb0badbc0c07a47bd 100755 (executable)
@@ -371,9 +371,6 @@ class ConferenceRecordView(FormView):
         status.update()
         context['host'] = status.ip
         context['hidden_fields'] = self.hidden_fields
-        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)
         return context
 
     def get_success_url(self):
@@ -414,7 +411,7 @@ class ConferenceRecordView(FormView):
         f = open(path, 'w')
         f.write(img.read())
         f.close()
-        command = '/usr/bin/dwepb ' + path + ' -o ' + dir + os.sep + 'preview.png &'
+        command = '/usr/bin/dwebp ' + path + ' -o ' + dir + os.sep + 'preview.png &'
         os.system(command)
 
     @method_decorator(login_required)