diff options
Diffstat (limited to 'ishtar_common')
-rw-r--r-- | ishtar_common/__init__.py | 6 | ||||
-rw-r--r-- | ishtar_common/models.py | 9 | ||||
-rw-r--r-- | ishtar_common/templates/ishtar/sheet_source.html | 25 | ||||
-rw-r--r-- | ishtar_common/templatetags/window_field.py | 2 |
4 files changed, 39 insertions, 3 deletions
diff --git a/ishtar_common/__init__.py b/ishtar_common/__init__.py index 7b8a90c36..84ec7c204 100644 --- a/ishtar_common/__init__.py +++ b/ishtar_common/__init__.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # -*- coding: utf-8 -*- -# Copyright (C) 2014 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> +# Copyright (C) 2014-2015 Étienne Loks <etienne.loks_AT_peacefrogsDOTnet> from django.utils.translation import ugettext as _ @@ -10,8 +10,10 @@ _(u"email address") VERSION = (0, 9) +_(u"Related item") + + def get_version(): return u'.'.join((unicode(num) for num in VERSION)) __version__ = get_version() - diff --git a/ishtar_common/models.py b/ishtar_common/models.py index f720dc5ab..ec3d2e2a6 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -2153,7 +2153,7 @@ class Source(models.Model): item_number = models.IntegerField(_(u"Item number"), default=1) reference = models.CharField(_(u"Ref."), max_length=25, null=True, blank=True) - internal_reference = models.CharField(_(u"Internal reference"), + internal_reference = models.CharField(_(u"Internal ref."), max_length=25, null=True, blank=True) description = models.TextField(_(u"Description"), blank=True, null=True) comment = models.TextField(_(u"Comment"), blank=True, null=True) @@ -2167,6 +2167,13 @@ class Source(models.Model): def __unicode__(self): return self.title + @property + def associated_filename(self): + values = [unicode(getattr(self, attr)) + for attr in ('source_type', 'title') + if getattr(self, attr)] + return slugify(u"-".join(values)) + if settings.COUNTRY == 'fr': class Arrondissement(models.Model): name = models.CharField(u"Nom", max_length=30) diff --git a/ishtar_common/templates/ishtar/sheet_source.html b/ishtar_common/templates/ishtar/sheet_source.html new file mode 100644 index 000000000..044d1b89d --- /dev/null +++ b/ishtar_common/templates/ishtar/sheet_source.html @@ -0,0 +1,25 @@ +{% extends "ishtar/sheet.html" %} +{% load i18n window_field window_link %} +{% block content %} +{% block export %} +<div class='tool'>TO BE DEFINED</div> +{% endblock %} +{% block general %} +{% field "Title" item.title %} +{% field "Source type" item.source_type %} +{% field "Format type" item.format_type %} +{% field "Scale" item.scale %} +{% field_url "Web link" item.associated_url %} +{% field_multiple "Authors" item.authors %} +{% field "Item number" item.item_number %} +{% field "Ref." item.reference %} +{% field "Internal ref." item.internal_reference %} +{% field "Description" item.description %} +{% field "Comment" item.comment %} +{% field "Additional information" item.additional_information %} +{% endblock %} +{% block related %} +{% field "Related item" item.owner %} +{% endblock %} +{% endblock %} + diff --git a/ishtar_common/templatetags/window_field.py b/ishtar_common/templatetags/window_field.py index 21828c5bd..11d00d7c9 100644 --- a/ishtar_common/templatetags/window_field.py +++ b/ishtar_common/templatetags/window_field.py @@ -11,6 +11,8 @@ def field(caption, data, pre_data='', post_data=''): @register.inclusion_tag('ishtar/blocks/window_field_url.html') def field_url(caption, link, link_name=''): + if not link.startswith('http://'): + link = 'http://' + link return {'caption': caption, 'link': link, "link_name": link_name} |