# HG changeset patch
# User veltr
# Date 1379521889 -7200
# Node ID 597fa9d099739468d1d48cc7656ac12e1d7a2723
# Parent eb4e56cb675b92a35f99d09f4a32de352fd8b4d5
Added Term List View
diff -r eb4e56cb675b -r 597fa9d09973 src/core/models/term.py
--- a/src/core/models/term.py Mon Sep 16 10:44:50 2013 +0200
+++ b/src/core/models/term.py Wed Sep 18 18:31:29 2013 +0200
@@ -157,6 +157,9 @@
self.validation_date = None
self.save()
+ def __unicode__(self):
+ return self.label
+
class Meta:
app_label = 'core'
diff -r eb4e56cb675b -r 597fa9d09973 src/jocondelab/admin.py
--- a/src/jocondelab/admin.py Mon Sep 16 10:44:50 2013 +0200
+++ b/src/jocondelab/admin.py Wed Sep 18 18:31:29 2013 +0200
@@ -1,2 +1,10 @@
+from jocondelab.models import DbpediaYears, DbpediaGeo, ContributedTerm, ContributedFields, Contribution, ContributableTerm, TagcloudTerm
+from django.contrib import admin
-
+admin.site.register(DbpediaYears)
+admin.site.register(DbpediaGeo)
+admin.site.register(ContributedTerm)
+admin.site.register(ContributedFields)
+admin.site.register(Contribution)
+admin.site.register(ContributableTerm)
+admin.site.register(TagcloudTerm)
\ No newline at end of file
diff -r eb4e56cb675b -r 597fa9d09973 src/jocondelab/migrations/0009_auto__contribution_allow_null_thesaurus.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jocondelab/migrations/0009_auto__contribution_allow_null_thesaurus.py Wed Sep 18 18:31:29 2013 +0200
@@ -0,0 +1,282 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+ def forwards(self, orm):
+
+ # Changing field 'Contribution.thesaurus'
+ db.alter_column(u'jocondelab_contribution', 'thesaurus_id', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['core.Thesaurus'], null=True))
+
+ def backwards(self, orm):
+
+ # Changing field 'Contribution.thesaurus'
+ db.alter_column(u'jocondelab_contribution', 'thesaurus_id', self.gf('django.db.models.fields.related.ForeignKey')(default=1, to=orm['core.Thesaurus']))
+
+ models = {
+ u'auth.group': {
+ 'Meta': {'object_name': 'Group'},
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+ },
+ u'auth.permission': {
+ 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ },
+ u'contenttypes.contenttype': {
+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+ },
+ 'core.autrnoticeterm': {
+ 'Meta': {'object_name': 'AutrNoticeTerm', '_ormbases': ['core.NoticeTerm']},
+ u'noticeterm_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.NoticeTerm']", 'unique': 'True', 'primary_key': 'True'})
+ },
+ 'core.domnnoticeterm': {
+ 'Meta': {'object_name': 'DomnNoticeTerm', '_ormbases': ['core.NoticeTerm']},
+ u'noticeterm_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.NoticeTerm']", 'unique': 'True', 'primary_key': 'True'})
+ },
+ 'core.ecolnoticeterm': {
+ 'Meta': {'object_name': 'EcolNoticeTerm', '_ormbases': ['core.NoticeTerm']},
+ u'noticeterm_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.NoticeTerm']", 'unique': 'True', 'primary_key': 'True'})
+ },
+ 'core.epoqnoticeterm': {
+ 'Meta': {'object_name': 'EpoqNoticeTerm', '_ormbases': ['core.NoticeTerm']},
+ u'noticeterm_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.NoticeTerm']", 'unique': 'True', 'primary_key': 'True'})
+ },
+ 'core.lieuxnoticeterm': {
+ 'Meta': {'object_name': 'LieuxNoticeTerm', '_ormbases': ['core.NoticeTerm']},
+ u'noticeterm_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.NoticeTerm']", 'unique': 'True', 'primary_key': 'True'})
+ },
+ 'core.notice': {
+ 'Meta': {'object_name': 'Notice'},
+ 'adpt': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'appl': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'aptn': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'attr': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'autr': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'autr_terms': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'autr+'", 'symmetrical': 'False', 'through': "orm['core.AutrNoticeTerm']", 'to': "orm['core.Term']"}),
+ 'bibl': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'comm': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'contact': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'coor': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'copy': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'dacq': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'data': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'dation': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'ddpt': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'decv': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'deno': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'depo': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'desc': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'desy': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'dims': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+ 'dmaj': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'dmis': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'domn': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'domn_terms': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'domn+'", 'symmetrical': 'False', 'through': "orm['core.DomnNoticeTerm']", 'to': "orm['core.Term']"}),
+ 'drep': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'ecol': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'ecol_terms': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'ecol+'", 'symmetrical': 'False', 'through': "orm['core.EcolNoticeTerm']", 'to': "orm['core.Term']"}),
+ 'epoq': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'epoq_terms': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'epoq+'", 'symmetrical': 'False', 'through': "orm['core.EpoqNoticeTerm']", 'to': "orm['core.Term']"}),
+ 'etat': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'expo': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'gene': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'geohi': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'hist': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'image': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'insc': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'inv': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+ 'label': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'labo': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'lieux': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'lieux_terms': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'lieux+'", 'symmetrical': 'False', 'through': "orm['core.LieuxNoticeTerm']", 'to': "orm['core.Term']"}),
+ 'loca': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'loca2': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'mill': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'milu': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'mosa': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'msgcom': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'museo': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'nsda': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'onom': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'paut': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'pdat': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'pdec': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'peoc': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'peri': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'peri_terms': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'peri+'", 'symmetrical': 'False', 'through': "orm['core.PeriNoticeTerm']", 'to': "orm['core.Term']"}),
+ 'peru': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'phot': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'pins': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'plieux': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'prep': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'puti': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'reda': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'ref': ('django.db.models.fields.CharField', [], {'max_length': '20', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+ 'refim': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+ 'repr': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'repr_terms': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'repr+'", 'symmetrical': 'False', 'through': "orm['core.ReprNoticeTerm']", 'to': "orm['core.Term']"}),
+ 'srep': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'srep_terms': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'srep+'", 'symmetrical': 'False', 'through': "orm['core.SrepNoticeTerm']", 'to': "orm['core.Term']"}),
+ 'stat': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'tech': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+ 'tico': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'titr': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'util': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'video': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+ 'www': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'})
+ },
+ 'core.noticeterm': {
+ 'Meta': {'object_name': 'NoticeTerm'},
+ 'graph': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'notice': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Notice']"}),
+ 'term': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Term']"})
+ },
+ 'core.perinoticeterm': {
+ 'Meta': {'object_name': 'PeriNoticeTerm', '_ormbases': ['core.NoticeTerm']},
+ u'noticeterm_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.NoticeTerm']", 'unique': 'True', 'primary_key': 'True'})
+ },
+ 'core.reprnoticeterm': {
+ 'Meta': {'object_name': 'ReprNoticeTerm', '_ormbases': ['core.NoticeTerm']},
+ u'noticeterm_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.NoticeTerm']", 'unique': 'True', 'primary_key': 'True'})
+ },
+ 'core.srepnoticeterm': {
+ 'Meta': {'object_name': 'SrepNoticeTerm', '_ormbases': ['core.NoticeTerm']},
+ u'noticeterm_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.NoticeTerm']", 'unique': 'True', 'primary_key': 'True'})
+ },
+ 'core.term': {
+ 'Meta': {'object_name': 'Term'},
+ 'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+ 'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+ 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}),
+ 'lang': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '128', 'null': 'True', 'blank': 'True'}),
+ u'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
+ u'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
+ 'link_semantic_level': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}),
+ 'nb_notice': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}),
+ 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}),
+ 'notices': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'terms+'", 'symmetrical': 'False', 'through': "orm['core.NoticeTerm']", 'to': "orm['core.Notice']"}),
+ 'parent': ('mptt.fields.TreeForeignKey', [], {'blank': 'True', 'related_name': "'children'", 'null': 'True', 'to': "orm['core.Term']"}),
+ u'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
+ 'thesaurus': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Thesaurus']"}),
+ u'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
+ 'uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+ 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}),
+ 'validated': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
+ 'validation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+ 'validator': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+ 'wikipedia_edition': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+ 'wikipedia_revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+ 'wp_alternative_label': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'wp_label': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '1024', 'null': 'True', 'blank': 'True'})
+ },
+ 'core.thesaurus': {
+ 'Meta': {'ordering': "['label']", 'object_name': 'Thesaurus'},
+ 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128', 'db_index': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+ 'uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'})
+ },
+ 'core.user': {
+ 'Meta': {'object_name': 'User'},
+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'language': ('django.db.models.fields.CharField', [], {'default': "'en'", 'max_length': '2'}),
+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+ },
+ 'jocondelab.contributedfields': {
+ 'Meta': {'object_name': 'ContributedFields'},
+ 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'db_index': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'label': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+ 'language_code': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}),
+ 'term': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'dbpedia_fields'", 'to': "orm['jocondelab.ContributedTerm']"}),
+ 'thumbnail': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'})
+ },
+ 'jocondelab.contributedterm': {
+ 'Meta': {'object_name': 'ContributedTerm'},
+ 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'dbpedia_language': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}),
+ 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+ },
+ 'jocondelab.contribution': {
+ 'Meta': {'object_name': 'Contribution'},
+ 'contribution_count': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'notice': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Notice']"}),
+ 'term': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'contributions'", 'to': "orm['jocondelab.ContributedTerm']"}),
+ 'thesaurus': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Thesaurus']", 'null': 'True', 'blank': 'True'})
+ },
+ 'jocondelab.country': {
+ 'Meta': {'object_name': 'Country'},
+ 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'iso_code_2': ('django.db.models.fields.CharField', [], {'max_length': '2', 'db_index': 'True'}),
+ 'iso_code_3': ('django.db.models.fields.CharField', [], {'max_length': '3', 'db_index': 'True'}),
+ 'nb_notices': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'})
+ },
+ 'jocondelab.dbpediafields': {
+ 'Meta': {'object_name': 'DbpediaFields'},
+ 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'db_index': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'label': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+ 'language_code': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}),
+ 'term': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'dbpedia_fields'", 'to': "orm['core.Term']"}),
+ 'thumbnail': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'})
+ },
+ 'jocondelab.dbpediageo': {
+ 'Meta': {'object_name': 'DbpediaGeo'},
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'latitude': ('django.db.models.fields.FloatField', [], {'db_index': 'True'}),
+ 'longitude': ('django.db.models.fields.FloatField', [], {'db_index': 'True'}),
+ 'term': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'geo'", 'unique': 'True', 'to': "orm['core.Term']"})
+ },
+ 'jocondelab.dbpediayears': {
+ 'Meta': {'object_name': 'DbpediaYears'},
+ 'end_year': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'start_year': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
+ 'term': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'years'", 'unique': 'True', 'to': "orm['core.Term']"})
+ },
+ 'jocondelab.termlinks': {
+ 'Meta': {'object_name': 'TermLinks'},
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'object': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'termlinks_objects'", 'to': "orm['core.Term']"}),
+ 'subject': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'termlinks_subjects'", 'to': "orm['core.Term']"})
+ }
+ }
+
+ complete_apps = ['jocondelab']
\ No newline at end of file
diff -r eb4e56cb675b -r 597fa9d09973 src/jocondelab/migrations/0010_auto__add_contributable_term.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jocondelab/migrations/0010_auto__add_contributable_term.py Wed Sep 18 18:31:29 2013 +0200
@@ -0,0 +1,291 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+ def forwards(self, orm):
+ # Adding model 'ContributableTerm'
+ db.create_table(u'jocondelab_contributableterm', (
+ (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+ ('term', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['core.Term'], unique=True)),
+ ))
+ db.send_create_signal('jocondelab', ['ContributableTerm'])
+
+
+ def backwards(self, orm):
+ # Deleting model 'ContributableTerm'
+ db.delete_table(u'jocondelab_contributableterm')
+
+
+ models = {
+ u'auth.group': {
+ 'Meta': {'object_name': 'Group'},
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+ },
+ u'auth.permission': {
+ 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ },
+ u'contenttypes.contenttype': {
+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+ },
+ 'core.autrnoticeterm': {
+ 'Meta': {'object_name': 'AutrNoticeTerm', '_ormbases': ['core.NoticeTerm']},
+ u'noticeterm_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.NoticeTerm']", 'unique': 'True', 'primary_key': 'True'})
+ },
+ 'core.domnnoticeterm': {
+ 'Meta': {'object_name': 'DomnNoticeTerm', '_ormbases': ['core.NoticeTerm']},
+ u'noticeterm_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.NoticeTerm']", 'unique': 'True', 'primary_key': 'True'})
+ },
+ 'core.ecolnoticeterm': {
+ 'Meta': {'object_name': 'EcolNoticeTerm', '_ormbases': ['core.NoticeTerm']},
+ u'noticeterm_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.NoticeTerm']", 'unique': 'True', 'primary_key': 'True'})
+ },
+ 'core.epoqnoticeterm': {
+ 'Meta': {'object_name': 'EpoqNoticeTerm', '_ormbases': ['core.NoticeTerm']},
+ u'noticeterm_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.NoticeTerm']", 'unique': 'True', 'primary_key': 'True'})
+ },
+ 'core.lieuxnoticeterm': {
+ 'Meta': {'object_name': 'LieuxNoticeTerm', '_ormbases': ['core.NoticeTerm']},
+ u'noticeterm_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.NoticeTerm']", 'unique': 'True', 'primary_key': 'True'})
+ },
+ 'core.notice': {
+ 'Meta': {'object_name': 'Notice'},
+ 'adpt': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'appl': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'aptn': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'attr': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'autr': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'autr_terms': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'autr+'", 'symmetrical': 'False', 'through': "orm['core.AutrNoticeTerm']", 'to': "orm['core.Term']"}),
+ 'bibl': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'comm': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'contact': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'coor': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'copy': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'dacq': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'data': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'dation': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'ddpt': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'decv': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'deno': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'depo': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'desc': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'desy': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'dims': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+ 'dmaj': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'dmis': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'domn': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'domn_terms': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'domn+'", 'symmetrical': 'False', 'through': "orm['core.DomnNoticeTerm']", 'to': "orm['core.Term']"}),
+ 'drep': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'ecol': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'ecol_terms': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'ecol+'", 'symmetrical': 'False', 'through': "orm['core.EcolNoticeTerm']", 'to': "orm['core.Term']"}),
+ 'epoq': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'epoq_terms': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'epoq+'", 'symmetrical': 'False', 'through': "orm['core.EpoqNoticeTerm']", 'to': "orm['core.Term']"}),
+ 'etat': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'expo': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'gene': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'geohi': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'hist': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'image': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'insc': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'inv': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+ 'label': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'labo': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'lieux': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'lieux_terms': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'lieux+'", 'symmetrical': 'False', 'through': "orm['core.LieuxNoticeTerm']", 'to': "orm['core.Term']"}),
+ 'loca': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'loca2': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'mill': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'milu': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'mosa': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'msgcom': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'museo': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'nsda': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'onom': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'paut': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'pdat': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'pdec': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'peoc': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'peri': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'peri_terms': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'peri+'", 'symmetrical': 'False', 'through': "orm['core.PeriNoticeTerm']", 'to': "orm['core.Term']"}),
+ 'peru': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'phot': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'pins': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'plieux': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'prep': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'puti': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'reda': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'ref': ('django.db.models.fields.CharField', [], {'max_length': '20', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+ 'refim': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+ 'repr': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'repr_terms': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'repr+'", 'symmetrical': 'False', 'through': "orm['core.ReprNoticeTerm']", 'to': "orm['core.Term']"}),
+ 'srep': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'srep_terms': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'srep+'", 'symmetrical': 'False', 'through': "orm['core.SrepNoticeTerm']", 'to': "orm['core.Term']"}),
+ 'stat': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'tech': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+ 'tico': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'titr': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'util': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'video': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+ 'www': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'})
+ },
+ 'core.noticeterm': {
+ 'Meta': {'object_name': 'NoticeTerm'},
+ 'graph': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'notice': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Notice']"}),
+ 'term': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Term']"})
+ },
+ 'core.perinoticeterm': {
+ 'Meta': {'object_name': 'PeriNoticeTerm', '_ormbases': ['core.NoticeTerm']},
+ u'noticeterm_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.NoticeTerm']", 'unique': 'True', 'primary_key': 'True'})
+ },
+ 'core.reprnoticeterm': {
+ 'Meta': {'object_name': 'ReprNoticeTerm', '_ormbases': ['core.NoticeTerm']},
+ u'noticeterm_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.NoticeTerm']", 'unique': 'True', 'primary_key': 'True'})
+ },
+ 'core.srepnoticeterm': {
+ 'Meta': {'object_name': 'SrepNoticeTerm', '_ormbases': ['core.NoticeTerm']},
+ u'noticeterm_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.NoticeTerm']", 'unique': 'True', 'primary_key': 'True'})
+ },
+ 'core.term': {
+ 'Meta': {'object_name': 'Term'},
+ 'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+ 'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+ 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}),
+ 'lang': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '128', 'null': 'True', 'blank': 'True'}),
+ u'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
+ u'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
+ 'link_semantic_level': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}),
+ 'nb_notice': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}),
+ 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}),
+ 'notices': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'terms+'", 'symmetrical': 'False', 'through': "orm['core.NoticeTerm']", 'to': "orm['core.Notice']"}),
+ 'parent': ('mptt.fields.TreeForeignKey', [], {'blank': 'True', 'related_name': "'children'", 'null': 'True', 'to': "orm['core.Term']"}),
+ u'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
+ 'thesaurus': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Thesaurus']"}),
+ u'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
+ 'uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+ 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}),
+ 'validated': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
+ 'validation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+ 'validator': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+ 'wikipedia_edition': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+ 'wikipedia_revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+ 'wp_alternative_label': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'wp_label': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '1024', 'null': 'True', 'blank': 'True'})
+ },
+ 'core.thesaurus': {
+ 'Meta': {'ordering': "['label']", 'object_name': 'Thesaurus'},
+ 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128', 'db_index': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+ 'uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'})
+ },
+ 'core.user': {
+ 'Meta': {'object_name': 'User'},
+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'language': ('django.db.models.fields.CharField', [], {'default': "'en'", 'max_length': '2'}),
+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+ },
+ 'jocondelab.contributableterm': {
+ 'Meta': {'object_name': 'ContributableTerm'},
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'term': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Term']", 'unique': 'True'})
+ },
+ 'jocondelab.contributedfields': {
+ 'Meta': {'object_name': 'ContributedFields'},
+ 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'db_index': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'label': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+ 'language_code': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}),
+ 'term': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'dbpedia_fields'", 'to': "orm['jocondelab.ContributedTerm']"}),
+ 'thumbnail': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'})
+ },
+ 'jocondelab.contributedterm': {
+ 'Meta': {'object_name': 'ContributedTerm'},
+ 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'dbpedia_language': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}),
+ 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+ },
+ 'jocondelab.contribution': {
+ 'Meta': {'object_name': 'Contribution'},
+ 'contribution_count': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'notice': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Notice']"}),
+ 'term': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'contributions'", 'to': "orm['jocondelab.ContributedTerm']"}),
+ 'thesaurus': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Thesaurus']", 'null': 'True', 'blank': 'True'})
+ },
+ 'jocondelab.country': {
+ 'Meta': {'object_name': 'Country'},
+ 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'iso_code_2': ('django.db.models.fields.CharField', [], {'max_length': '2', 'db_index': 'True'}),
+ 'iso_code_3': ('django.db.models.fields.CharField', [], {'max_length': '3', 'db_index': 'True'}),
+ 'nb_notices': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'})
+ },
+ 'jocondelab.dbpediafields': {
+ 'Meta': {'object_name': 'DbpediaFields'},
+ 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'db_index': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'label': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+ 'language_code': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}),
+ 'term': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'dbpedia_fields'", 'to': "orm['core.Term']"}),
+ 'thumbnail': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'})
+ },
+ 'jocondelab.dbpediageo': {
+ 'Meta': {'object_name': 'DbpediaGeo'},
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'latitude': ('django.db.models.fields.FloatField', [], {'db_index': 'True'}),
+ 'longitude': ('django.db.models.fields.FloatField', [], {'db_index': 'True'}),
+ 'term': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'geo'", 'unique': 'True', 'to': "orm['core.Term']"})
+ },
+ 'jocondelab.dbpediayears': {
+ 'Meta': {'object_name': 'DbpediaYears'},
+ 'end_year': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'start_year': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
+ 'term': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'years'", 'unique': 'True', 'to': "orm['core.Term']"})
+ },
+ 'jocondelab.termlinks': {
+ 'Meta': {'object_name': 'TermLinks'},
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'object': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'termlinks_objects'", 'to': "orm['core.Term']"}),
+ 'subject': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'termlinks_subjects'", 'to': "orm['core.Term']"})
+ }
+ }
+
+ complete_apps = ['jocondelab']
\ No newline at end of file
diff -r eb4e56cb675b -r 597fa9d09973 src/jocondelab/migrations/0011_auto__add_tagcloud_term.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jocondelab/migrations/0011_auto__add_tagcloud_term.py Wed Sep 18 18:31:29 2013 +0200
@@ -0,0 +1,296 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+ def forwards(self, orm):
+ # Adding model 'TagcloudTerm'
+ db.create_table(u'jocondelab_tagcloudterm', (
+ (u'id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+ ('term', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['core.Term'], unique=True)),
+ ))
+ db.send_create_signal('jocondelab', ['TagcloudTerm'])
+
+
+ def backwards(self, orm):
+ # Deleting model 'TagcloudTerm'
+ db.delete_table(u'jocondelab_tagcloudterm')
+
+
+ models = {
+ u'auth.group': {
+ 'Meta': {'object_name': 'Group'},
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+ 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'})
+ },
+ u'auth.permission': {
+ 'Meta': {'ordering': "(u'content_type__app_label', u'content_type__model', u'codename')", 'unique_together': "((u'content_type', u'codename'),)", 'object_name': 'Permission'},
+ 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['contenttypes.ContentType']"}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ },
+ u'contenttypes.contenttype': {
+ 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"},
+ 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+ },
+ 'core.autrnoticeterm': {
+ 'Meta': {'object_name': 'AutrNoticeTerm', '_ormbases': ['core.NoticeTerm']},
+ u'noticeterm_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.NoticeTerm']", 'unique': 'True', 'primary_key': 'True'})
+ },
+ 'core.domnnoticeterm': {
+ 'Meta': {'object_name': 'DomnNoticeTerm', '_ormbases': ['core.NoticeTerm']},
+ u'noticeterm_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.NoticeTerm']", 'unique': 'True', 'primary_key': 'True'})
+ },
+ 'core.ecolnoticeterm': {
+ 'Meta': {'object_name': 'EcolNoticeTerm', '_ormbases': ['core.NoticeTerm']},
+ u'noticeterm_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.NoticeTerm']", 'unique': 'True', 'primary_key': 'True'})
+ },
+ 'core.epoqnoticeterm': {
+ 'Meta': {'object_name': 'EpoqNoticeTerm', '_ormbases': ['core.NoticeTerm']},
+ u'noticeterm_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.NoticeTerm']", 'unique': 'True', 'primary_key': 'True'})
+ },
+ 'core.lieuxnoticeterm': {
+ 'Meta': {'object_name': 'LieuxNoticeTerm', '_ormbases': ['core.NoticeTerm']},
+ u'noticeterm_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.NoticeTerm']", 'unique': 'True', 'primary_key': 'True'})
+ },
+ 'core.notice': {
+ 'Meta': {'object_name': 'Notice'},
+ 'adpt': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'appl': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'aptn': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'attr': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'autr': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'autr_terms': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'autr+'", 'symmetrical': 'False', 'through': "orm['core.AutrNoticeTerm']", 'to': "orm['core.Term']"}),
+ 'bibl': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'comm': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'contact': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'coor': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'copy': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'dacq': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'data': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'dation': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'ddpt': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'decv': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'deno': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'depo': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'desc': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'desy': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'dims': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+ 'dmaj': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'dmis': ('django.db.models.fields.DateField', [], {'null': 'True', 'blank': 'True'}),
+ 'domn': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'domn_terms': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'domn+'", 'symmetrical': 'False', 'through': "orm['core.DomnNoticeTerm']", 'to': "orm['core.Term']"}),
+ 'drep': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'ecol': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'ecol_terms': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'ecol+'", 'symmetrical': 'False', 'through': "orm['core.EcolNoticeTerm']", 'to': "orm['core.Term']"}),
+ 'epoq': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'epoq_terms': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'epoq+'", 'symmetrical': 'False', 'through': "orm['core.EpoqNoticeTerm']", 'to': "orm['core.Term']"}),
+ 'etat': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'expo': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'gene': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'geohi': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'hist': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'image': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'insc': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'inv': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+ 'label': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'labo': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'lieux': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'lieux_terms': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'lieux+'", 'symmetrical': 'False', 'through': "orm['core.LieuxNoticeTerm']", 'to': "orm['core.Term']"}),
+ 'loca': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'loca2': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'mill': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'milu': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'mosa': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'msgcom': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'museo': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'nsda': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'onom': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'paut': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'pdat': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'pdec': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'peoc': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'peri': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}),
+ 'peri_terms': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'peri+'", 'symmetrical': 'False', 'through': "orm['core.PeriNoticeTerm']", 'to': "orm['core.Term']"}),
+ 'peru': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'phot': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'pins': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'plieux': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'prep': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'puti': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'reda': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'ref': ('django.db.models.fields.CharField', [], {'max_length': '20', 'unique': 'True', 'null': 'True', 'blank': 'True'}),
+ 'refim': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+ 'repr': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'repr_terms': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'repr+'", 'symmetrical': 'False', 'through': "orm['core.ReprNoticeTerm']", 'to': "orm['core.Term']"}),
+ 'srep': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'srep_terms': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'srep+'", 'symmetrical': 'False', 'through': "orm['core.SrepNoticeTerm']", 'to': "orm['core.Term']"}),
+ 'stat': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'tech': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+ 'tico': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'titr': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'util': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'video': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+ 'www': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'})
+ },
+ 'core.noticeterm': {
+ 'Meta': {'object_name': 'NoticeTerm'},
+ 'graph': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'notice': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Notice']"}),
+ 'term': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Term']"})
+ },
+ 'core.perinoticeterm': {
+ 'Meta': {'object_name': 'PeriNoticeTerm', '_ormbases': ['core.NoticeTerm']},
+ u'noticeterm_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.NoticeTerm']", 'unique': 'True', 'primary_key': 'True'})
+ },
+ 'core.reprnoticeterm': {
+ 'Meta': {'object_name': 'ReprNoticeTerm', '_ormbases': ['core.NoticeTerm']},
+ u'noticeterm_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.NoticeTerm']", 'unique': 'True', 'primary_key': 'True'})
+ },
+ 'core.srepnoticeterm': {
+ 'Meta': {'object_name': 'SrepNoticeTerm', '_ormbases': ['core.NoticeTerm']},
+ u'noticeterm_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['core.NoticeTerm']", 'unique': 'True', 'primary_key': 'True'})
+ },
+ 'core.term': {
+ 'Meta': {'object_name': 'Term'},
+ 'alternative_wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+ 'alternative_wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+ 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}),
+ 'lang': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '128', 'null': 'True', 'blank': 'True'}),
+ u'level': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
+ u'lft': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
+ 'link_semantic_level': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}),
+ 'nb_notice': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}),
+ 'normalized_label': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'db_index': 'True'}),
+ 'notices': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'terms+'", 'symmetrical': 'False', 'through': "orm['core.NoticeTerm']", 'to': "orm['core.Notice']"}),
+ 'parent': ('mptt.fields.TreeForeignKey', [], {'blank': 'True', 'related_name': "'children'", 'null': 'True', 'to': "orm['core.Term']"}),
+ u'rght': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
+ 'thesaurus': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Thesaurus']"}),
+ u'tree_id': ('django.db.models.fields.PositiveIntegerField', [], {'db_index': 'True'}),
+ 'uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+ 'url_status': ('django.db.models.fields.IntegerField', [], {'default': 'None', 'null': 'True', 'db_index': 'True', 'blank': 'True'}),
+ 'validated': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'db_index': 'True'}),
+ 'validation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}),
+ 'validator': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.User']", 'null': 'True', 'blank': 'True'}),
+ 'wikipedia_edition': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'wikipedia_pageid': ('django.db.models.fields.BigIntegerField', [], {'db_index': 'True', 'null': 'True', 'blank': 'True'}),
+ 'wikipedia_revision_id': ('django.db.models.fields.BigIntegerField', [], {'null': 'True', 'blank': 'True'}),
+ 'wikipedia_url': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+ 'wp_alternative_label': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '1024', 'null': 'True', 'blank': 'True'}),
+ 'wp_label': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '1024', 'null': 'True', 'blank': 'True'})
+ },
+ 'core.thesaurus': {
+ 'Meta': {'ordering': "['label']", 'object_name': 'Thesaurus'},
+ 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'label': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128', 'db_index': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '1024'}),
+ 'uri': ('django.db.models.fields.URLField', [], {'db_index': 'True', 'max_length': '2048', 'null': 'True', 'blank': 'True'})
+ },
+ 'core.user': {
+ 'Meta': {'object_name': 'User'},
+ 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+ 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+ 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+ 'language': ('django.db.models.fields.CharField', [], {'default': "'en'", 'max_length': '2'}),
+ 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+ 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+ 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+ 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': u"orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}),
+ 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+ },
+ 'jocondelab.contributableterm': {
+ 'Meta': {'object_name': 'ContributableTerm'},
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'term': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Term']", 'unique': 'True'})
+ },
+ 'jocondelab.contributedfields': {
+ 'Meta': {'object_name': 'ContributedFields'},
+ 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'db_index': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'label': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+ 'language_code': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}),
+ 'term': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'dbpedia_fields'", 'to': "orm['jocondelab.ContributedTerm']"}),
+ 'thumbnail': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'})
+ },
+ 'jocondelab.contributedterm': {
+ 'Meta': {'object_name': 'ContributedTerm'},
+ 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
+ 'dbpedia_language': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}),
+ 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'})
+ },
+ 'jocondelab.contribution': {
+ 'Meta': {'object_name': 'Contribution'},
+ 'contribution_count': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'notice': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Notice']"}),
+ 'term': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'contributions'", 'to': "orm['jocondelab.ContributedTerm']"}),
+ 'thesaurus': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Thesaurus']", 'null': 'True', 'blank': 'True'})
+ },
+ 'jocondelab.country': {
+ 'Meta': {'object_name': 'Country'},
+ 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'unique': 'True', 'max_length': '2048', 'db_index': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'iso_code_2': ('django.db.models.fields.CharField', [], {'max_length': '2', 'db_index': 'True'}),
+ 'iso_code_3': ('django.db.models.fields.CharField', [], {'max_length': '3', 'db_index': 'True'}),
+ 'nb_notices': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'})
+ },
+ 'jocondelab.dbpediafields': {
+ 'Meta': {'object_name': 'DbpediaFields'},
+ 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}),
+ 'dbpedia_uri': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'db_index': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'label': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}),
+ 'language_code': ('django.db.models.fields.CharField', [], {'max_length': '15', 'db_index': 'True'}),
+ 'term': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'dbpedia_fields'", 'to': "orm['core.Term']"}),
+ 'thumbnail': ('django.db.models.fields.URLField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'})
+ },
+ 'jocondelab.dbpediageo': {
+ 'Meta': {'object_name': 'DbpediaGeo'},
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'latitude': ('django.db.models.fields.FloatField', [], {'db_index': 'True'}),
+ 'longitude': ('django.db.models.fields.FloatField', [], {'db_index': 'True'}),
+ 'term': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'geo'", 'unique': 'True', 'to': "orm['core.Term']"})
+ },
+ 'jocondelab.dbpediayears': {
+ 'Meta': {'object_name': 'DbpediaYears'},
+ 'end_year': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'start_year': ('django.db.models.fields.IntegerField', [], {'db_index': 'True'}),
+ 'term': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'years'", 'unique': 'True', 'to': "orm['core.Term']"})
+ },
+ 'jocondelab.tagcloudterm': {
+ 'Meta': {'object_name': 'TagcloudTerm'},
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'term': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['core.Term']", 'unique': 'True'})
+ },
+ 'jocondelab.termlinks': {
+ 'Meta': {'object_name': 'TermLinks'},
+ u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'object': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'termlinks_objects'", 'to': "orm['core.Term']"}),
+ 'subject': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'termlinks_subjects'", 'to': "orm['core.Term']"})
+ }
+ }
+
+ complete_apps = ['jocondelab']
\ No newline at end of file
diff -r eb4e56cb675b -r 597fa9d09973 src/jocondelab/models/__init__.py
--- a/src/jocondelab/models/__init__.py Mon Sep 16 10:44:50 2013 +0200
+++ b/src/jocondelab/models/__init__.py Wed Sep 18 18:31:29 2013 +0200
@@ -1,4 +1,5 @@
-__all__ = ['Country', 'DbpediaFields', 'TermLinks', 'DbpediaYears', 'DbpediaGeo', 'ContributedTerm', 'ContributedFields', 'Contribution' ]
+__all__ = ['Country', 'DbpediaFields', 'TermLinks', 'DbpediaYears', 'DbpediaGeo', 'ContributedTerm', 'ContributedFields', 'Contribution', 'ContributableTerm', 'TagcloudTerm' ]
from jocondelab.models.data import Country, DbpediaFields, TermLinks, DbpediaYears, DbpediaGeo
-from jocondelab.models.contribution import ContributedTerm, ContributedFields, Contribution
\ No newline at end of file
+from jocondelab.models.contribution import ContributedTerm, ContributedFields, Contribution, ContributableTerm
+from jocondelab.models.displaysettings import TagcloudTerm
diff -r eb4e56cb675b -r 597fa9d09973 src/jocondelab/models/contribution.py
--- a/src/jocondelab/models/contribution.py Mon Sep 16 10:44:50 2013 +0200
+++ b/src/jocondelab/models/contribution.py Wed Sep 18 18:31:29 2013 +0200
@@ -5,7 +5,7 @@
@author: ymh
'''
from django.db import models
-from core.models import Thesaurus, Notice
+from core.models import Thesaurus, Notice, Term
class ContributedTerm(models.Model):
@@ -15,6 +15,9 @@
class Meta:
app_label = 'jocondelab'
+
+ def __unicode__(self):
+ return self.dbpedia_uri
class ContributedFields(models.Model):
@@ -27,6 +30,9 @@
class Meta:
app_label = 'jocondelab'
+
+ def __unicode__(self):
+ return u'"%s"@%s'%(self.label, self.language_code)
class Contribution(models.Model):
@@ -37,3 +43,16 @@
class Meta:
app_label = 'jocondelab'
+
+ def __unicode__(self):
+ return u'%s, %s'%((self.notice.titr or self.notice.deno),self.term.dbpedia_uri)
+
+class ContributableTerm(models.Model):
+
+ term = models.ForeignKey(Term, blank=False, null=False, db_index=True, unique=True)
+
+ class Meta:
+ app_label = 'jocondelab'
+
+ def __unicode__(self):
+ return self.term.label
\ No newline at end of file
diff -r eb4e56cb675b -r 597fa9d09973 src/jocondelab/models/data.py
--- a/src/jocondelab/models/data.py Mon Sep 16 10:44:50 2013 +0200
+++ b/src/jocondelab/models/data.py Wed Sep 18 18:31:29 2013 +0200
@@ -15,6 +15,9 @@
class Meta:
app_label = 'jocondelab'
+
+ def __unicode__(self):
+ return self.dbpedia_uri
class DbpediaFields(models.Model):
@@ -28,6 +31,9 @@
class Meta:
app_label = 'jocondelab'
+
+ def __unicode__(self):
+ return u'"%s"@%s'%(self.label, self.language_code)
class TermLinks(models.Model):
@@ -44,6 +50,9 @@
class Meta:
app_label = 'jocondelab'
+
+ def __unicode__(self):
+ return u'%s: %d - %d'%(self.term.dbpedia_uri, self.start_year, self.end_year)
class DbpediaGeo(models.Model):
term = models.ForeignKey(Term, unique=True, blank=False, null=False, db_index=True, related_name="geo")
@@ -51,4 +60,7 @@
longitude = models.FloatField(null=False, blank=False, db_index=True)
class Meta:
- app_label = 'jocondelab'
\ No newline at end of file
+ app_label = 'jocondelab'
+
+ def __unicode__(self):
+ return u'%s: %.4f%s, %.4f%s'%(self.term.dbpedia_uri, abs(self.latitude), 'N' if self.latitude > 0 else 'S', abs(self.longitude), 'E' if self.longitude > 0 else 'W')
\ No newline at end of file
diff -r eb4e56cb675b -r 597fa9d09973 src/jocondelab/models/displaysettings.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jocondelab/models/displaysettings.py Wed Sep 18 18:31:29 2013 +0200
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+'''
+Created on Aug 08, 2013
+
+@author: rvelt
+'''
+from django.db import models
+from core.models import (Term)
+
+class TagcloudTerm(models.Model):
+
+ term = models.ForeignKey(Term, blank=False, null=False, db_index=True, unique=True)
+
+ class Meta:
+ app_label = 'jocondelab'
+
+ def __unicode__(self):
+ return self.term.label
\ No newline at end of file
diff -r eb4e56cb675b -r 597fa9d09973 src/jocondelab/settings.py
--- a/src/jocondelab/settings.py Mon Sep 16 10:44:50 2013 +0200
+++ b/src/jocondelab/settings.py Wed Sep 18 18:31:29 2013 +0200
@@ -46,6 +46,7 @@
('de', ugettext('German')),
('pt', ugettext('Portuguese')),
('ar', ugettext('Arabic')),
+ ('ru', ugettext('Russian')),
('zh-cn', ugettext('Chinese')),
('ja', ugettext('Japanese')),
('ca', ugettext('Catalan')),
diff -r eb4e56cb675b -r 597fa9d09973 src/jocondelab/static/jocondelab/css/front-common.css
--- a/src/jocondelab/static/jocondelab/css/front-common.css Mon Sep 16 10:44:50 2013 +0200
+++ b/src/jocondelab/static/jocondelab/css/front-common.css Wed Sep 18 18:31:29 2013 +0200
@@ -130,7 +130,7 @@
}
footer {
- margin: 40px auto 20px; text-align: right;
+ padding: 40px 0 20px; text-align: right;
}
input {
@@ -149,6 +149,10 @@
float: left; margin-top: 10px; height: 50px; line-height: 50px; overflow: hidden;
}
+html[dir=rtl] .main-title {
+ float: right;
+}
+
.main-title h1, .main-title h2 {
display: inline;
}
@@ -172,7 +176,11 @@
/* HEADER > SEARCH FORM */
.header-search-form {
- position: absolute; top: 8px; right: 0; max-width: 35%; text-align: right;
+ position: absolute; top: 8px; right: 0; max-width: 35%;
+}
+
+html[dir=rtl] .header-search-form {
+ left: 0; right: auto;
}
.search-input, .search-form .tagit {
@@ -181,6 +189,10 @@
overflow: hidden;
}
+html[dir=rtl] .search-input, html[dir=rtl] .search-form .tagit {
+ background-position: 4px center;
+}
+
.header-search-input, .header-search-form .tagit {
margin: 0 auto; width: 260px; max-width: 90%; font-size: 14px; z-index: 1;
}
@@ -205,12 +217,38 @@
float: right;
}
+html[dir=rtl] .header-search-form .tagit {
+ float: left;
+}
+
+html[dir=rtl] ul.tagit li {
+ float: right;
+}
+
+/* Big Search Form (on search and home pages) */
+
+.big-search-form {
+ text-align: center; margin: 20px 0; clear: both;
+}
+
+.big-search-input, .big-search-form .tagit {
+ margin: 0 auto; width: 80%; font-size: 15px;
+}
+
+.big-search-input {
+ line-height: 32px; height: 32px; padding: 0 9px;
+}
+
/* HEADER > MENUS */
.menu-links {
position: absolute; right: 0; top: 44px; font-size: 14px; font-weight: bold;
}
+html[dir=rtl] .menu-links {
+ left: 0; right: auto;
+}
+
.menu-link {
float: right; margin-left: 20px;
}
@@ -254,6 +292,10 @@
/* RESULTS LIST */
+.results {
+ clear: both;
+}
+
.resultcount {
font-size: 18px; margin: 10px 0;
}
diff -r eb4e56cb675b -r 597fa9d09973 src/jocondelab/static/jocondelab/css/front-home.css
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jocondelab/static/jocondelab/css/front-home.css Wed Sep 18 18:31:29 2013 +0200
@@ -0,0 +1,39 @@
+.about-jl {
+ font-size: 18px; font-weight: bold; margin: 20px 0;
+}
+
+.module-list {
+ margin: 0 0 20px; width: 100%; clear: both; float: left;
+}
+
+.module-item {
+ width: 20%; height: 80px; float: left;
+}
+
+@media screen and (max-width: 720px) and (min-width: 400px){
+ .module-item {
+ width: 33%;
+ }
+}
+
+@media screen and (max-width: 400px) {
+ .module-item {
+ width: 100%;
+ }
+}
+
+.module-item:nth-child(even) {
+ background: #fff8e0;
+}
+
+.module-item:nth-child(odd) {
+ background: #f8f8f8;
+}
+
+.module-item:hover {
+ background: #ffffff;
+}
+
+.module-item h3 {
+ margin: 10px 5px; font-size: 16px; text-decoration: underline; text-align: center;
+}
diff -r eb4e56cb675b -r 597fa9d09973 src/jocondelab/static/jocondelab/css/front-notice.css
--- a/src/jocondelab/static/jocondelab/css/front-notice.css Mon Sep 16 10:44:50 2013 +0200
+++ b/src/jocondelab/static/jocondelab/css/front-notice.css Wed Sep 18 18:31:29 2013 +0200
@@ -44,6 +44,14 @@
width: 130px; font-weight: 700; text-align: left; padding-right: 2px;
}
+html[dir=rtl] .notice-datasheet th {
+ text-align: right; padding-right: 0; padding-left: 2px;
+}
+
+html[dir=rtl] .notice-datasheet td {
+ text-align: right;
+}
+
.notice-datasheet th, .notice-datasheet td {
padding-top: 3px;
}
@@ -56,7 +64,7 @@
margin: -2px 5px 4px 0;
}
-.notice-term.term-untranslated {
+.notice-term.term-untranslated, .notice-term.contribution-null {
background: transparent; color: #333333; font-style: italic;
}
@@ -74,7 +82,7 @@
}
.contribution-frame {
- margin: 10px 10px 0 0; background: #ffe0c0; padding: 10px;
+ margin: 10px 0; background: #ffe8c0; padding: 10px;
}
.contribution-frame h2 {
@@ -89,6 +97,10 @@
float: right; height: 16px; width: 13px; margin-left: 3px;
}
+html[dir=rtl] .contribution-vote {
+ float: left; margin-left: 0; margin-right: 3px;
+}
+
.contribution-upvote, .contribution-downvote {
display: block; background: url(../img/vote-sprite.png); width: 11px; height: 6px;
}
diff -r eb4e56cb675b -r 597fa9d09973 src/jocondelab/static/jocondelab/css/front-search.css
--- a/src/jocondelab/static/jocondelab/css/front-search.css Mon Sep 16 10:44:50 2013 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-/* TERM CLOUD */
-
-.term-cloud {
- line-height: 26px; width: 80%; font-size: 12px; text-align: center; margin: 0 auto;
-}
-
-.term-cloud li {
- display: inline-block; margin: 0 10px;
-}
-
-.term-frequency {
- font-size: .8em;
-}
-
-.big-search-form {
- text-align: center; margin: 20px 0;
-}
-
-.big-search-input, .big-search-form .tagit {
- margin: 0 auto; width: 80%; font-size: 15px;
-}
-
-.big-search-input {
- line-height: 32px; height: 32px; padding: 0 9px;
-}
diff -r eb4e56cb675b -r 597fa9d09973 src/jocondelab/static/jocondelab/css/front-termlist.css
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jocondelab/static/jocondelab/css/front-termlist.css Wed Sep 18 18:31:29 2013 +0200
@@ -0,0 +1,80 @@
+/* TERM CLOUD */
+
+.term-cloud {
+ line-height: 26px; width: 80%; font-size: 12px; text-align: center; margin: 10px auto; clear: both;
+}
+
+.term-cloud li {
+ display: inline-block; margin: 0 10px;
+}
+
+.term-tabs {
+ width: 100%; clear: both; height: 41px;
+}
+
+.term-tab {
+ width: 25%; float: left;
+}
+
+.term-tab h2 {
+ height: 20px; margin: 0 2px; border: 1px #cccccc; border-style: solid solid none; padding: 10px;
+ font-size: 15px; background: #f8f8f8; color: #666666; border-radius: 8px 8px 0 0; overflow: hidden; line-height: 1.1em;
+}
+
+@media screen and (max-width: 640px) {
+ .term-tab h2 {
+ font-size: 12px;
+ }
+}
+
+.term-tab.active h2 {
+ color: #000000; background: #ffffff; font-weight: bold;
+}
+
+.term-contents {
+ background: #ffffff; border: 1px solid #cccccc; padding: 10px;
+}
+
+.term-filter {
+ margin: 5px; font-size: 16px; font-weight: bold; color: #666666;
+}
+
+.letter {
+ display: inline-block;
+}
+
+.term-filter.active, .letter.active {
+ color: #0000C0;
+}
+
+.term-contents-empty {
+ text-align: center; font-size: 18px; font-style: italic; color: #999999;
+}
+
+.terms {
+ width: 100%;
+}
+
+.term {
+ float: left; width: 290px; margin: 5px; border: 1px solid #e0e0e0; padding: 5px; height: 60px; overflow: hidden;
+}
+
+html[dir=rtl] {
+ float: right;
+}
+
+.term-image-wrap {
+ float: left; width: 48px; height: 60px; margin-right: 5px;
+}
+
+.term h3 {
+ font-size: 13px; font-weight: bold;
+}
+
+.term img {
+ display: block; margin: 0 auto; max-width: 48px; max-height: 60px;
+}
+
+.term p {
+ font-size: 11px; line-height: 1.1em;
+}
diff -r eb4e56cb675b -r 597fa9d09973 src/jocondelab/static/jocondelab/img/vote-sprite.png
Binary file src/jocondelab/static/jocondelab/img/vote-sprite.png has changed
diff -r eb4e56cb675b -r 597fa9d09973 src/jocondelab/static/jocondelab/js/front-common.js
--- a/src/jocondelab/static/jocondelab/js/front-common.js Mon Sep 16 10:44:50 2013 +0200
+++ b/src/jocondelab/static/jocondelab/js/front-common.js Wed Sep 18 18:31:29 2013 +0200
@@ -22,12 +22,13 @@
},
allowSpaces: true,
afterTagAdded : submitIfChanged,
- afterTagRemoved: submitIfChanged
+ afterTagRemoved: submitIfChanged,
+ singleFieldDelimiter: ";"
});
/* DBPEDIA OVERLAY */
- var lang = $("html").attr("lang"),
+ var lang = $("html").attr("lang").substr(0,2) || "fr",
sparqlTpl = _.template(
'select distinct * where { '
+ 'OPTIONAL { <<%= uri %>> rdfs:label ?l FILTER( langMatches( lang(?l), "<%- lang %>" ) ) }. '
diff -r eb4e56cb675b -r 597fa9d09973 src/jocondelab/static/jocondelab/js/front-notice.js
--- a/src/jocondelab/static/jocondelab/js/front-notice.js Mon Sep 16 10:44:50 2013 +0200
+++ b/src/jocondelab/static/jocondelab/js/front-notice.js Wed Sep 18 18:31:29 2013 +0200
@@ -3,7 +3,7 @@
$('.notice-images a').magnificPopup({type:'image'});
dbpediaBox.bind(".notice-term a");
- var lang = document.querySelector("html").lang.substr(0,2) || "en",
+ var lang = document.querySelector("html").lang.substr(0,2) || "fr",
labelsCache = {},
dbpCache = {},
eventCache = {},
@@ -51,6 +51,12 @@
t.label = b.lr.value;
t.language = b.lr["xml:lang"];
}
+ if (!t.label) {
+ t.label = label;
+ }
+ if (!t.language) {
+ t.language = lang;
+ }
return t;
});
res.local = _(res.translations).find(function(t) {
@@ -186,7 +192,8 @@
$source.attr("href", termdata.wikipedia_url);
}
- var eltTemplate = '';
+ var tmpTemplate = '',
+ $ntl = $(".notice-term-list");
$(".notice-contribution-field").autocomplete({
source: function( request, response ) {
@@ -224,18 +231,17 @@
},
select: function(e, ui) {
var $this = $(this),
- $newItem = $(eltTemplate);
- $this.next(".notice-term-list").append($newItem);
- $newItem.find(".term-link").text(gettext("Validating Resource…"));
+ $tmpItem = $(tmpTemplate);
+ $ntl.append($tmpItem);
+ $tmpItem.text(gettext("Validating Resource…"));
$this.autocomplete("close");
$this.val("");
getDbpedia(ui.item.label, function(label, termdata) {
- $newItem.find(".term-link").text(gettext("Saving contribution…"));
+ $tmpItem.text(gettext("Saving contribution…"));
if (termdata.dbpedia_uri) {
- dbpediaBox.bind($newItem.find("term-link"), termdata.dbpedia_uri);
$.ajax({
url: urls.ajax_contribute,
- dataType: "json",
+ dataType: "html",
type: "POST",
data: {
csrfmiddlewaretoken: csrf_token,
@@ -244,19 +250,27 @@
dbpedia_uri: termdata.dbpedia_uri,
translations: JSON.stringify(termdata.translations)
},
- success: function() {
- $newItem.find(".term-link").text(termdata.label);
+ success: function(html) {
+ var $el = $(html),
+ samecontrib = $ntl.find("[data-contribution-id='" + $el.attr("data-contribution-id") + "']");
+ if (samecontrib.length) {
+ samecontrib.replaceWith($el);
+ } else {
+ $ntl.append($el);
+ }
+ $tmpItem.remove();
+ dbpediaBox.bind($el);
},
error: function() {
- $newItem.remove();
+ $tmpItem.remove();
}
})
} else {
- $newItem.remove();
+ $tmpItem.remove();
alert(gettext("No DbPedia resource found for term") + " " + ui.item.label);
}
}, function() {
- $newItem.remove();
+ $tmpItem.remove();
alert(gettext("No DbPedia resource found for term") + " " + ui.item.label);
});
},
@@ -266,4 +280,23 @@
},
minLength: 2
});
+
+ $(".notice-contribution-list").on("click",".contribution-upvote, .contribution-downvote", function() {
+ var $this = $(this),
+ $li = $(this).parents("li"),
+ endpoint = urls[$this.hasClass("contribution-upvote") ? "upvote" : "downvote"];
+ $.ajax({
+ url: endpoint,
+ dataType: "html",
+ type: "POST",
+ data: {
+ csrfmiddlewaretoken: csrf_token,
+ contribution_id: $li.attr("data-contribution-id"),
+ },
+ success: function(html) {
+ $li.replaceWith($(html));
+ }
+ });
+ return false;
+ });
});
diff -r eb4e56cb675b -r 597fa9d09973 src/jocondelab/static/jocondelab/js/front-termlist.js
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jocondelab/static/jocondelab/js/front-termlist.js Wed Sep 18 18:31:29 2013 +0200
@@ -0,0 +1,28 @@
+$(function() {
+
+ var $tt = $(".term-tab"),
+ $tc = $(".term-contents");
+
+ function loadUrl(url) {
+ $tc.empty().append($(".loading-please-wait").clone().show());
+ $.ajax({
+ url: url,
+ dataType: "html",
+ success: function(html) {
+ $tc.html(html);
+ $tc.find(".term-filter a").click(function() {
+ loadUrl($(this).attr("href"));
+ return false;
+ });
+ }
+ })
+ }
+
+ $tt.click(function() {
+ var $this = $(this);
+ $tt.removeClass("active");
+ $this.addClass("active");
+ loadUrl($this.find("a").attr("href"));
+ return false;
+ });
+});
diff -r eb4e56cb675b -r 597fa9d09973 src/jocondelab/templates/jocondelab/front_base.html
--- a/src/jocondelab/templates/jocondelab/front_base.html Mon Sep 16 10:44:50 2013 +0200
+++ b/src/jocondelab/templates/jocondelab/front_base.html Wed Sep 18 18:31:29 2013 +0200
@@ -1,6 +1,6 @@
{% load i18n %}
-
+
{% block head %}
@@ -67,7 +67,7 @@
{% trans 'Accueil' %}
+
+ {{term.label}}
+
\ No newline at end of file
diff -r eb4e56cb675b -r 597fa9d09973 src/jocondelab/templates/jocondelab/partial/datasheet_row.html
--- a/src/jocondelab/templates/jocondelab/partial/datasheet_row.html Mon Sep 16 10:44:50 2013 +0200
+++ b/src/jocondelab/templates/jocondelab/partial/datasheet_row.html Wed Sep 18 18:31:29 2013 +0200
@@ -5,12 +5,13 @@
| {% trans fieldname context 'Thesaurus label' %}{% trans ':' %} |
- {% for termtype, terms in linked_terms.items %}
- {% for term in terms %}
- -
- {{term.label}}
+ {% for term in linked_terms.translated %}
+
-
+ {{term.label}}
- {% endfor %}
+ {% endfor %}
+ {% for term in linked_terms.untranslated %}
+ - {{term.label}}
{% endfor %}
|
@@ -18,7 +19,7 @@
{% elif base_field %}
{% trans fieldname context 'Thesaurus label' %}{% trans ':' %} |
- {{base_field}} |
+ {{base_field}} |
{% endif %}
diff -r eb4e56cb675b -r 597fa9d09973 src/jocondelab/templates/jocondelab/partial/notice_list.html
--- a/src/jocondelab/templates/jocondelab/partial/notice_list.html Mon Sep 16 10:44:50 2013 +0200
+++ b/src/jocondelab/templates/jocondelab/partial/notice_list.html Wed Sep 18 18:31:29 2013 +0200
@@ -7,17 +7,13 @@
