generating joconde external url + small change on comment submit button + small change on __str__ for metacategories
--- a/src/iconolab/models.py Wed Aug 17 16:46:20 2016 +0200
+++ b/src/iconolab/models.py Thu Aug 18 10:57:00 2016 +0200
@@ -68,7 +68,7 @@
@property
def get_joconde_url(self):
- return self.joconde_ref
+ return settings.JOCONDE_NOTICE_BASE_URL+self.joconde_ref.rjust(11, '0')
def __str__(self):
return "metadatas:for:"+str(self.item.item_guid)
@@ -496,7 +496,7 @@
triggers_notifications = models.IntegerField(choices=NOTIFIED_USERS, default=NONE)
def __str__(self):
- return self.label+":from:"+self.collection.name
+ return self.label
class MetaCategoryInfo(models.Model):
--- a/src/iconolab/settings/dev.py.tmpl Wed Aug 17 16:46:20 2016 +0200
+++ b/src/iconolab/settings/dev.py.tmpl Thu Aug 18 10:57:00 2016 +0200
@@ -219,4 +219,26 @@
USE_TZ = True
+
+IMPORT_FIELDS_DICT = {
+ "AUTR": [],
+ "ECOLE": [],
+ "TITR": ["Titre"],
+ "DENO": [],
+ "APPL": [],
+ "PERI": ["Période"],
+ "MILL": [],
+ "EPOCH": [],
+ "TECH": [],
+ "DIMS": ["Dimensions"],
+ "EPOCH": [],
+ "LIEUX": [],
+ "DECV": [],
+ "LOCA": ["Localisation"],
+ "PHOT": ["Photo"],
+ "INV": ["No inventaire",],
+ "REF": ["REFERENCE"],
+}
+
INTERNAL_TAGS_URL = BASE_URL
+JOCONDE_NOTICE_BASE_URL = "http://www.culture.gouv.fr/public/mistral/joconde_fr?ACTION=CHERCHER&FIELD_98=REF&VALUE_98="
--- a/src/iconolab/templates/iconolab/detail_annotation.html Wed Aug 17 16:46:20 2016 +0200
+++ b/src/iconolab/templates/iconolab/detail_annotation.html Thu Aug 18 10:57:00 2016 +0200
@@ -219,7 +219,7 @@
</div>
</fieldset>
<p class="submit">
- <input class="btn btn-default" type="submit" name="post" class="submit-post" value="{% trans "Post" %}"/>
+ <input class="btn btn-default" type="submit" name="post" class="submit-post" value="Publier"/>
</p>
</form>
{% endif %}
--- a/src/iconolab/templates/iconolab/detail_item.html Wed Aug 17 16:46:20 2016 +0200
+++ b/src/iconolab/templates/iconolab/detail_item.html Thu Aug 18 10:57:00 2016 +0200
@@ -31,7 +31,7 @@
{% if item.metadatas.discovery_context %}<h5>Contexte de découverte: <small>{{item.metadatas.discovery_context}}</small></h5>{% endif %}
{% if item.metadatas.photo_credits %}<h5>Crédits photographique: <small>{{item.metadatas.photo_credits}}</small></h5>{% endif %}
{% if item.metadatas.inventory_number %}<h5>Numéro d'inventaire: <small>{{item.metadatas.inventory_number}}</small></h5>{% endif %}
- {% if item.metadatas.joconde_ref %}<h5>Cet objet dans Joconde <small>{{item.metadatas.get_joconde_url}}</small></h5>{% endif %}
+ {% if item.metadatas.joconde_ref %}<h5><a href="{{item.metadatas.get_joconde_url}}">Cet objet dans Joconde</a></h5>{% endif %}
<br>
{% if item.images.all.count > 1 %}
<h4>Autres images pour cet objet: </h4>