Merge branch 'v2.2'

Conflicts:
	chimere/static/chimere/js/jquery.chimere.js

1 files changed, 10 insertions, 2 deletions

diff --git a/chimere/utils.py b/chimere/utils.py
index 1aa639a..ddc9471 100644
--- a/chimere/utils.py
+++ b/chimere/utils.py
@@ -1197,9 +1197,13 @@ class HtmlXsltManager(ImportManager):
                 "point" not in item and not ("lat" in item and item['lat']):
             return
         cls = None
+        origin = self.importer_instance.origin
+        origin_lnk = item.get('link')
+        if origin_lnk:
+            origin = u"<a href='%s' target='_blank'>%s</a>" % (
+                origin_lnk, origin)
         dct = {
-            'origin': "<a href='%s' target='_blank'>%s</a>" % (
-                item.get('link') or '#', self.importer_instance.origin),
+            'origin': origin,
             'license': self.importer_instance.license,
             'name': item['name']}
         category = None
@@ -1220,6 +1224,10 @@ class HtmlXsltManager(ImportManager):
         dct['description'] = item.get('description', '')
         if 'date' in item:
             dct.update(self.parse_date(item['date']))
+        if "start_date" in item and item["start_date"]:
+            dct['start_date'] = item["start_date"]
+            if "end_date" in item and item["end_date"]:
+                dct['end_date'] = item["end_date"]
         key = item['key']
         it, updated, created = self.create_or_update_item(cls, dct, key,
                                                           category=category)