From ead01de7af065eecf41e2cb90a755d6fca113efa Mon Sep 17 00:00:00 2001 From: yomguy Date: Fri, 13 Apr 2012 03:08:30 +0200 Subject: [PATCH] finally add tweeter to all course views except documents... --- teleforma/htdocs/css/teleforma.css | 4 +-- teleforma/templates/teleforma/courses.html | 30 ++++++++++++++++++++-- teleforma/views.py | 16 +++++++----- 3 files changed, 40 insertions(+), 10 deletions(-) diff --git a/teleforma/htdocs/css/teleforma.css b/teleforma/htdocs/css/teleforma.css index fb70960c..c9de882e 100644 --- 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 00b4a430..c805af47 100644 --- 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 %} + + + + +{% endblock extra_javascript %} {% block content %} @@ -80,6 +89,23 @@ {% block chat %} +{% if room %} +
+
+

rss{% trans "Tweeter" %}

+ +
+
Loading...
+
{% csrf_token %} + + + +
+ +
+
+
+{% endif %} {% endblock chat %} {% endblock content %} diff --git a/teleforma/views.py b/teleforma/views.py index ef9865e0..eb9fdd2c 100755 --- 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) -- 2.39.5