diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-06-23 19:57:49 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-06-23 19:57:49 +0200 |
| commit | 6793ee9d4010d5b5399e8c27979d3f7d1d88f8f8 (patch) | |
| tree | defe0289658996d430c5e748a6f2ed07ce92b45e | |
| parent | eb347add15c8c04a2e464c9153620bd41f2d0a2f (diff) | |
| parent | 2808bb76a4b7ed06aacff8f5cf45e215ac95f0cf (diff) | |
| download | Chimère-6793ee9d4010d5b5399e8c27979d3f7d1d88f8f8.tar.bz2 Chimère-6793ee9d4010d5b5399e8c27979d3f7d1d88f8f8.zip | |
Merge branch 'master' into v3.0
Conflicts:
chimere/static/chimere/js/jquery.chimere.js
| -rw-r--r-- | chimere/static/chimere/js/jquery.chimere.js | 2 | ||||
| -rw-r--r-- | chimere/utils.py | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js index c799852..e180682 100644 --- a/chimere/static/chimere/js/jquery.chimere.js +++ b/chimere/static/chimere/js/jquery.chimere.js @@ -1,4 +1,4 @@ -/* Copyright (C) 2008-2016 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> +/* Copyright (C) 2008-2016 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as diff --git a/chimere/utils.py b/chimere/utils.py index 11c9c4e..8096315 100644 --- a/chimere/utils.py +++ b/chimere/utils.py @@ -1240,9 +1240,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 |