.publications_autre {border:1px solid #CCC; background:#FAFAFA; margin:10px; padding:10px; display:none;}
-#actualites {position: relative;}
-#rss-actualites {position: absolute; right: 26px; top: 10px;}
+#agenda, #actualites {position: relative;}
+#rss-agenda, #rss-actualites {position: absolute; right: 26px; top: 10px;}
form {padding-right:20px}
kw.append(self.type)
except: pass
- kw = [x.strip() for x in kw if len(x.strip()) > 0]
+ kw = [x.strip() for x in kw if len(x.strip()) > 0 and x is not None]
for k in kw:
cal.vevent.add('x-auf-keywords').value = k
cal.vevent.add('dtend').value = combine(self.fin, self.fuseau)
cal.vevent.add('created').value = combine(datetime.datetime.now(), "UTC")
cal.vevent.add('dtstamp').value = combine(datetime.datetime.now(), "UTC")
- if len(self.description) > 0:
+ if len(description) > 0:
cal.vevent.add('description').value = description
if len(self.contact) > 0:
cal.vevent.add('contact').value = self.contact
# -*- encoding: utf-8 -*-
+from django.core.urlresolvers import reverse
from django.contrib.syndication.feeds import Feed
from savoirs.models import Actualite
+from savoirs.lib.calendrier import evenements
from datetime import datetime, time
class FilActualite(Feed):
description = "Agrégateur de ressources scientifiques et pédagogiques de l'AUF"
limitation = 10
+ title_template = "savoirs/rss_actualite_titre.html"
+ description_template = "savoirs/rss_actualite_description.html"
+
def items(self):
return Actualite.objects.filter(visible=True).order_by('-date')[:self.limitation]
- def item_title(self, item):
- return item.titre
-
- def item_description(self, item):
- return item.url
-
def item_link(self, item):
return item.url
def item_pubdate(self,item):
return datetime.combine(item.date, time())
-
def item_author_name(self,item):
if item.source:
return item.source.nom
+class FilEvenement(Feed):
+ title = "Calendrier des ressources scientifiques et pédagogiques de l'AUF"
+ link = '/'
+ description = "Evènements connexes aux ressources scientifiques et pédagogiques de l'AUF"
+
+ title_template = "savoirs/rss_evenement_titre.html"
+ description_template = "savoirs/rss_evenement_description.html"
+
+ def items(self):
+ return evenements()
+
+ def item_link(self, item):
+ return reverse('savoirs.views.evenement', args=[item.uid.value])
+
+ def item_pubdate(self,item):
+ return item.dtstart.value
+
+ def item_author_name(self,item):
+ return ""
from django.conf.urls.defaults import patterns, include, handler500, url
from django.conf import settings
from django.contrib import admin
-from savoirs.rss import FilActualite
+from savoirs.rss import FilActualite, FilEvenement
admin.autodiscover()
handler500 # Pyflakes
-site_feeds = {'actualites': FilActualite }
+site_feeds = {'actualites': FilActualite,
+ 'agenda': FilEvenement }
urlpatterns = patterns(