finally add tweeter to all course views except documents...

diff --git a/teleforma/htdocs/css/teleforma.css b/teleforma/htdocs/css/teleforma.css
index fb70960cadb1fd49eef0d323584743cc919d3754..c9de882e8877faa2caf2d4a78960bba20efca421 100644 (file)
--- a/teleforma/htdocs/css/teleforma.css
+++ b/teleforma/htdocs/css/teleforma.css
@@ -1369,8 +1369,8 @@ input,textarea{
 
 .desk_center {
     float: left;
-    width:55%;
-    padding: 0em 0em 0em 1em;
+    width:52%;
+    padding: 0em 2em 0em 1em;
     max-height: 550px;
     overflow-y: scroll;
     }

diff --git a/teleforma/templates/teleforma/courses.html b/teleforma/templates/teleforma/courses.html
index 00b4a43097483382cc54b09a4aba097e1af43e80..c805af477a27d18ab6a2b526b37bbc88e5b47df1 100644 (file)
--- a/teleforma/templates/teleforma/courses.html
+++ b/teleforma/templates/teleforma/courses.html
@@ -1,8 +1,17 @@
 {% extends "telemeta/base.html" %}
 {% load i18n %}
 
-{% block extra_stylesheets %}
-{% endblock %}
+
+{% block extra_javascript %}
+
+<script type="text/javascript" src="/static/jqchat/jqchat.js"></script>
+<script type="text/javascript">
+$(document).ready(function(){
+    InitChatWindow("{% url jqchat_ajax room.id %}", null);
+    });
+</script>
+
+{% endblock extra_javascript %}
 
 
 {% block content %}
@@ -80,6 +89,23 @@
 </div>
 
 {% block chat %}
+{% if room %}
+<div id="module-set" style="width: 290px">
+<div class="module">
+<h3><img src="{% url telemeta-images "search_wh2.png" %}" alt="rss" style="vertical-align:middle" />{% trans "Tweeter" %}</h3>
+
+<div style="background: white;">
+<div id="chatwindow"><span id="loading">Loading...</span></div>
+<form id="chatform">{% csrf_token %}
+<label for="msg"></label>
+<input type="text" id="msg" />
+<input type="submit" value="{% trans "Send" %}" />
+</form>
+<!--<script type="text/javascript">document.getElementById("msg").focus();</script>-->
+</div>
+</div>
+</div>
+{% endif %}
 {% endblock chat %}
 
 {% endblock content %}

diff --git a/teleforma/views.py b/teleforma/views.py
index ef9865e07aaac9a254872100206dd09ca30a9088..eb9fdd2c0b22ce2fdcc39513b445280a84968405 100755 (executable)
--- a/teleforma/views.py
+++ b/teleforma/views.py
@@ -80,12 +80,13 @@ def document_view(request, pk):
     response = HttpResponse(fsock, mimetype=mimetype)
     return response
 
-def get_room(content_type, id, name):
-    rooms = jqchat.models.Room.objects.filter(content_type=content_type, object_id=id)
+def get_room(content_type=None, id=None, name=None):
+    rooms = jqchat.models.Room.objects.filter(content_type=content_type,
+                                                object_id=id, name=name)
     if not rooms:
         room = jqchat.models.Room.objects.create(content_type=content_type,
-                                      object_id=id,
-                                      name=name[:20])
+                                          object_id=id,
+                                          name=name[:20])
     else:
         room = rooms[0]
     return room
@@ -101,7 +102,8 @@ class CourseView(DetailView):
         course = self.get_object()
         context['notes'] = course.notes.all().filter(author=self.request.user)
         content_type = ContentType.objects.get(app_label="teleforma", model="course")
-        context['room'] = get_room(content_type, course.id, course.title)
+        context['room'] = get_room(name=course.title, content_type=content_type,
+                                   id=course.id)
         return context
 
     @method_decorator(login_required)
@@ -118,6 +120,7 @@ class CoursesView(ListView):
         context = super(CoursesView, self).get_context_data(**kwargs)
         context['object_list'] = get_courses(self.request.user)
         context['notes'] = Note.objects.filter(author=self.request.user)
+        context['room'] = get_room(name='site')
         return context
 
     @method_decorator(login_required)
@@ -140,7 +143,8 @@ class MediaView(DetailView):
         context['item'] = media.item
         context['notes'] = media.notes.all().filter(author=self.request.user)
         content_type = ContentType.objects.get(app_label="teleforma", model="media")
-        context['room'] = get_room(content_type, media.id, media.item.title)
+        context['room'] = get_room(name=media.item.title, content_type=content_type,
+                                   id=media.id)
         return context
 
     @method_decorator(login_required)