# HG changeset patch # User grandjoncl # Date 1354527793 -3600 # Node ID c558d677ee527dffe8c65ae29d796b8bf3fcbed1 # Parent a6a37775a76dd0a1aa56b61172ada2422fd99b14# Parent 563d51c73231d32df2ed1ffce38449ef23fde80f Merge with 563d51c73231d32df2ed1ffce38449ef23fde80f diff -r a6a37775a76d -r c558d677ee52 .settings/org.eclipse.core.resources.prefs --- a/.settings/org.eclipse.core.resources.prefs Sat Dec 01 02:15:38 2012 +0100 +++ b/.settings/org.eclipse.core.resources.prefs Mon Dec 03 10:43:13 2012 +0100 @@ -1,41 +1,42 @@ -eclipse.preferences.version=1 -encoding//src/ldt/ldt/core/migrations/0001_initial.py=utf-8 -encoding//src/ldt/ldt/core/migrations/0002_auto__del_owner.py=utf-8 -encoding//src/ldt/ldt/indexation/backends/elasticsearch_backend.py=utf-8 -encoding//src/ldt/ldt/indexation/highlighter.py=utf-8 -encoding//src/ldt/ldt/indexation/models.py=utf-8 -encoding//src/ldt/ldt/indexation/query_parser.py=utf-8 -encoding//src/ldt/ldt/indexation/search_indexes.py=utf-8 -encoding//src/ldt/ldt/indexation/tests.py=utf-8 -encoding//src/ldt/ldt/ldt_utils/migrations/0001_initial.py=utf-8 -encoding//src/ldt/ldt/ldt_utils/migrations/0002_auto__add_field_media_mimetype_field__chg_field_media_external_src_url.py=utf-8 -encoding//src/ldt/ldt/ldt_utils/migrations/0003_auto__chg_field_project_owner.py=utf-8 -encoding//src/ldt/ldt/ldt_utils/migrations/0004_auto__add_field_project_description.py=utf-8 -encoding//src/ldt/ldt/ldt_utils/migrations/0005_add_permissions.py=utf-8 -encoding//src/ldt/ldt/ldt_utils/migrations/0006_auto__add_field_media_image.py=utf-8 -encoding//src/ldt/ldt/ldt_utils/migrations/0007_auto__add_field_content_image__del_field_media_image.py=utf-8 -encoding//src/ldt/ldt/ldt_utils/migrations/0008_auto__add_field_project_image.py=utf-8 -encoding//src/ldt/ldt/ldt_utils/migrations/0009_auto__chg_field_content_image__chg_field_project_image.py=utf-8 -encoding//src/ldt/ldt/ldt_utils/migrations/0010_auto__add_annotationstat.py=utf-8 -encoding//src/ldt/ldt/ldt_utils/migrations/0011_gen_stat_annotation.py=utf-8 -encoding//src/ldt/ldt/ldt_utils/migrations/0012_auto__add_field_content_last_annotated.py=utf-8 -encoding//src/ldt/ldt/ldt_utils/migrations/0013_auto__add_field_content_front_project__chg_field_content_last_annotate.py=utf-8 -encoding//src/ldt/ldt/ldt_utils/migrations/0014_auto__del_annotationstat__chg_field_content_last_annotated.py=utf-8 -encoding//src/ldt/ldt/ldt_utils/migrations/0015_auto__add_contentstat__del_field_content_last_annotated__del_field_con.py=utf-8 -encoding//src/ldt/ldt/ldt_utils/migrations/0016_one_to_one_stat_annotation.py=utf-8 -encoding//src/ldt/ldt/ldt_utils/migrations/0017_correct_image_path.py=utf-8 -encoding//src/ldt/ldt/ldt_utils/migrations/0018_auto__chg_field_content_iri_id__chg_field_project_ldt_id__chg_field_au.py=utf-8 -encoding//src/ldt/ldt/ldt_utils/migrations/0019_recalculate_media_hash_src.py=utf-8 -encoding//src/ldt/ldt/ldt_utils/migrations/0020_auto__add_field_segment_id_hash__chg_field_segment_iri_id__chg_field_s.py=utf-8 -encoding//src/ldt/ldt/ldt_utils/migrations/0021_recalculate_segment_id_hash_script.py=utf-8 -encoding//src/ldt/ldt/ldt_utils/migrations/0022_auto__add_unique_media_src_hash__chg_field_segment_cutting_id__chg_fie.py=utf-8 -encoding//src/ldt/ldt/ldt_utils/migrations/0023_auto__add_field_segment_audio_src__add_field_segment_audio_href.py=utf-8 -encoding//src/ldt/ldt/ldt_utils/migrations/0024_auto__chg_field_tag_name.py=utf-8 -encoding//src/ldt/ldt/ldt_utils/views/json.py=utf-8 -encoding//src/ldt/ldt/management/utils.py=utf-8 -encoding//src/ldt/ldt/test/test_runner.py=utf-8 -encoding//src/ldt/ldt/text/migrations/0001_initial.py=utf-8 -encoding//src/ldt/ldt/user/migrations/0001_initial.py=utf-8 -encoding//src/ldt/ldt/user/migrations/0008_auto__chg_field_groupprofile_image__chg_field_groupprofile_group__chg_.py=utf-8 -encoding//virtualenv/web/env/guardianenv/Lib/site-packages/guardian/migrations/0001_initial.py=utf-8 -encoding/=UTF-8 +eclipse.preferences.version=1 +encoding//src/ldt/ldt/core/migrations/0001_initial.py=utf-8 +encoding//src/ldt/ldt/core/migrations/0002_auto__del_owner.py=utf-8 +encoding//src/ldt/ldt/indexation/backends/elasticsearch_backend.py=utf-8 +encoding//src/ldt/ldt/indexation/highlighter.py=utf-8 +encoding//src/ldt/ldt/indexation/models.py=utf-8 +encoding//src/ldt/ldt/indexation/query_parser.py=utf-8 +encoding//src/ldt/ldt/indexation/search_indexes.py=utf-8 +encoding//src/ldt/ldt/indexation/tests.py=utf-8 +encoding//src/ldt/ldt/ldt_utils/migrations/0001_initial.py=utf-8 +encoding//src/ldt/ldt/ldt_utils/migrations/0002_auto__add_field_media_mimetype_field__chg_field_media_external_src_url.py=utf-8 +encoding//src/ldt/ldt/ldt_utils/migrations/0003_auto__chg_field_project_owner.py=utf-8 +encoding//src/ldt/ldt/ldt_utils/migrations/0004_auto__add_field_project_description.py=utf-8 +encoding//src/ldt/ldt/ldt_utils/migrations/0005_add_permissions.py=utf-8 +encoding//src/ldt/ldt/ldt_utils/migrations/0006_auto__add_field_media_image.py=utf-8 +encoding//src/ldt/ldt/ldt_utils/migrations/0007_auto__add_field_content_image__del_field_media_image.py=utf-8 +encoding//src/ldt/ldt/ldt_utils/migrations/0008_auto__add_field_project_image.py=utf-8 +encoding//src/ldt/ldt/ldt_utils/migrations/0009_auto__chg_field_content_image__chg_field_project_image.py=utf-8 +encoding//src/ldt/ldt/ldt_utils/migrations/0010_auto__add_annotationstat.py=utf-8 +encoding//src/ldt/ldt/ldt_utils/migrations/0011_gen_stat_annotation.py=utf-8 +encoding//src/ldt/ldt/ldt_utils/migrations/0012_auto__add_field_content_last_annotated.py=utf-8 +encoding//src/ldt/ldt/ldt_utils/migrations/0013_auto__add_field_content_front_project__chg_field_content_last_annotate.py=utf-8 +encoding//src/ldt/ldt/ldt_utils/migrations/0014_auto__del_annotationstat__chg_field_content_last_annotated.py=utf-8 +encoding//src/ldt/ldt/ldt_utils/migrations/0015_auto__add_contentstat__del_field_content_last_annotated__del_field_con.py=utf-8 +encoding//src/ldt/ldt/ldt_utils/migrations/0016_one_to_one_stat_annotation.py=utf-8 +encoding//src/ldt/ldt/ldt_utils/migrations/0017_correct_image_path.py=utf-8 +encoding//src/ldt/ldt/ldt_utils/migrations/0018_auto__chg_field_content_iri_id__chg_field_project_ldt_id__chg_field_au.py=utf-8 +encoding//src/ldt/ldt/ldt_utils/migrations/0019_recalculate_media_hash_src.py=utf-8 +encoding//src/ldt/ldt/ldt_utils/migrations/0020_auto__add_field_segment_id_hash__chg_field_segment_iri_id__chg_field_s.py=utf-8 +encoding//src/ldt/ldt/ldt_utils/migrations/0021_recalculate_segment_id_hash_script.py=utf-8 +encoding//src/ldt/ldt/ldt_utils/migrations/0022_auto__add_unique_media_src_hash__chg_field_segment_cutting_id__chg_fie.py=utf-8 +encoding//src/ldt/ldt/ldt_utils/migrations/0023_auto__add_field_segment_audio_src__add_field_segment_audio_href.py=utf-8 +encoding//src/ldt/ldt/ldt_utils/migrations/0024_auto__chg_field_tag_name.py=utf-8 +encoding//src/ldt/ldt/ldt_utils/migrations/0025_chg_site_domain.py=utf-8 +encoding//src/ldt/ldt/ldt_utils/views/json.py=utf-8 +encoding//src/ldt/ldt/management/utils.py=utf-8 +encoding//src/ldt/ldt/test/test_runner.py=utf-8 +encoding//src/ldt/ldt/text/migrations/0001_initial.py=utf-8 +encoding//src/ldt/ldt/user/migrations/0001_initial.py=utf-8 +encoding//src/ldt/ldt/user/migrations/0008_auto__chg_field_groupprofile_image__chg_field_groupprofile_group__chg_.py=utf-8 +encoding//virtualenv/web/env/guardianenv/Lib/site-packages/guardian/migrations/0001_initial.py=utf-8 +encoding/=UTF-8 diff -r a6a37775a76d -r c558d677ee52 src/ldt/ldt/auth/views.py --- a/src/ldt/ldt/auth/views.py Sat Dec 01 02:15:38 2012 +0100 +++ b/src/ldt/ldt/auth/views.py Mon Dec 03 10:43:13 2012 +0100 @@ -8,7 +8,6 @@ redirect_field_name=REDIRECT_FIELD_NAME, authentication_form=AuthenticationForm, current_app=None): - extra_context = {'social_list': social_list} return django_login(request, template_name, redirect_field_name, authentication_form, current_app, extra_context) diff -r a6a37775a76d -r c558d677ee52 src/ldt/ldt/ldt_utils/migrations/0025_chg_site_domain.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/ldt/ldt/ldt_utils/migrations/0025_chg_site_domain.py Mon Dec 03 10:43:13 2012 +0100 @@ -0,0 +1,165 @@ +# -*- coding: utf-8 -*- +import datetime +from south.db import db +from south.v2 import DataMigration +from django.conf import settings +from django.db import models + +class Migration(DataMigration): + + def forwards(self, orm): + Sites = orm['sites.Site'] + site = Sites.objects.get(id=settings.SITE_ID) + web_url = settings.WEB_URL + domain_area = web_url.split("//",1) + domain = domain_area[1] + if site.domain!=domain: + site.domain = domain + site.save() + if site.name!=domain: + site.name=domain + site.save() + + def backwards(self, orm): + #do nothing + pass + + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + '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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.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': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + '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'}), + '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': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'}) + }, + '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'}), + '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'}) + }, + 'ldt_utils.author': { + 'Meta': {'object_name': 'Author'}, + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}), + 'firstname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), + 'handle': ('django.db.models.fields.CharField', [], {'max_length': '255', 'unique': 'True', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'lastname': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}) + }, + 'ldt_utils.content': { + 'Meta': {'ordering': "['title']", 'object_name': 'Content'}, + 'authors': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['ldt_utils.Author']", 'symmetrical': 'False', 'blank': 'True'}), + 'content_creation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'creation_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'duration': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'front_project': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ldt_utils.Project']", 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('sorl.thumbnail.fields.ImageField', [], {'default': "'thumbnails/contents/content_default_icon.png'", 'max_length': '200'}), + 'iri_id': ('django.db.models.fields.CharField', [], {'default': "u'ccfe5711-3581-11e2-8abd-00161798aedb'", 'unique': 'True', 'max_length': '255'}), + 'iriurl': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), + 'media_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ldt_utils.Media']", 'null': 'True', 'blank': 'True'}), + 'tags': ('tagging.fields.TagField', [], {'max_length': '2048', 'null': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), + 'update_date': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}) + }, + 'ldt_utils.contentstat': { + 'Meta': {'object_name': 'ContentStat'}, + 'annotation_volume_str': ('django.db.models.fields.CommaSeparatedIntegerField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), + 'content': ('django.db.models.fields.related.OneToOneField', [], {'related_name': "'stat_annotation'", 'unique': 'True', 'to': "orm['ldt_utils.Content']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'last_annotated': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now', 'null': 'True', 'blank': 'True'}), + 'nb_annotations': ('django.db.models.fields.IntegerField', [], {'default': '0', 'db_index': 'True'}), + 'polemics_volume_str': ('django.db.models.fields.CommaSeparatedIntegerField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}) + }, + 'ldt_utils.media': { + 'Meta': {'object_name': 'Media'}, + 'creation_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'creator': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'duration': ('django.db.models.fields.IntegerField', [], {'null': 'True', 'blank': 'True'}), + 'external_id': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), + 'external_permalink': ('django.db.models.fields.URLField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), + 'external_publication_url': ('django.db.models.fields.URLField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), + 'external_src_url': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'media_creation_date': ('django.db.models.fields.DateTimeField', [], {'null': 'True', 'blank': 'True'}), + 'mimetype_field': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), + 'src': ('django.db.models.fields.CharField', [], {'max_length': '1024'}), + 'src_hash': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128', 'blank': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), + 'update_date': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'videopath': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}) + }, + 'ldt_utils.project': { + 'Meta': {'ordering': "['title']", 'object_name': 'Project'}, + 'changed_by': ('django.db.models.fields.CharField', [], {'max_length': '70'}), + 'contents': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['ldt_utils.Content']", 'symmetrical': 'False'}), + 'created_by': ('django.db.models.fields.CharField', [], {'max_length': '70'}), + 'creation_date': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'image': ('sorl.thumbnail.fields.ImageField', [], {'default': "'thumbnails/projects/project_default_icon.png'", 'max_length': '200'}), + 'ldt': ('django.db.models.fields.TextField', [], {'null': 'True'}), + 'ldt_id': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '255'}), + 'modification_date': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}), + 'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True', 'blank': 'True'}), + 'state': ('django.db.models.fields.IntegerField', [], {'default': '1'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '1024'}) + }, + 'ldt_utils.segment': { + 'Meta': {'object_name': 'Segment'}, + 'abstract': ('django.db.models.fields.TextField', [], {'null': 'True', 'blank': 'True'}), + 'audio_href': ('django.db.models.fields.CharField', [], {'max_length': '512', 'null': 'True', 'blank': 'True'}), + 'audio_src': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'author': ('django.db.models.fields.CharField', [], {'max_length': '1024', 'null': 'True', 'blank': 'True'}), + 'content': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ldt_utils.Content']"}), + 'cutting_id': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}), + 'date': ('django.db.models.fields.CharField', [], {'max_length': '128', 'null': 'True', 'blank': 'True'}), + 'duration': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), + 'element_id': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}), + 'ensemble_id': ('django.db.models.fields.CharField', [], {'max_length': '512', 'db_index': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'id_hash': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128', 'blank': 'True'}), + 'iri_id': ('django.db.models.fields.CharField', [], {'max_length': '255', 'db_index': 'True'}), + 'polemics': ('django.db.models.fields.IntegerField', [], {'default': '0', 'null': 'True', 'blank': 'True'}), + 'project_id': ('django.db.models.fields.CharField', [], {'db_index': 'True', 'max_length': '255', 'null': 'True', 'blank': 'True'}), + 'project_obj': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['ldt_utils.Project']", 'null': 'True'}), + 'start_ts': ('django.db.models.fields.IntegerField', [], {'null': 'True'}), + 'tags': ('tagging.fields.TagField', [], {'max_length': '2048', 'null': 'True'}), + 'title': ('django.db.models.fields.CharField', [], {'max_length': '2048', 'null': 'True', 'blank': 'True'}) + }, + 'sites.site': { + 'Meta': {'ordering': "('domain',)", 'object_name': 'Site', 'db_table': "'django_site'"}, + 'domain': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + } + } + + complete_apps = ['sites', 'ldt_utils'] + symmetrical = True diff -r a6a37775a76d -r c558d677ee52 src/ldt/ldt/ldt_utils/templates/admin/ldt_utils/app_index.html --- a/src/ldt/ldt/ldt_utils/templates/admin/ldt_utils/app_index.html Sat Dec 01 02:15:38 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/admin/ldt_utils/app_index.html Mon Dec 03 10:43:13 2012 +0100 @@ -1,7 +1,9 @@ {% extends "admin/app_index.html" %} +{% load absurl %} +{% load absstatic %} {% block extrastyle %} {{ block.super }} - + {% endblock %} {% load i18n %} {% block content %} @@ -11,7 +13,7 @@ - - - diff -r a6a37775a76d -r c558d677ee52 src/ldt/ldt/ldt_utils/templates/front/front_all_contents.html --- a/src/ldt/ldt/ldt_utils/templates/front/front_all_contents.html Sat Dec 01 02:15:38 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/front/front_all_contents.html Mon Dec 03 10:43:13 2012 +0100 @@ -2,6 +2,7 @@ {% load i18n %} {% load thumbnail %} {% load front_tags %} +{% load absstatic %} {% block title %} {% if tag_label %} @@ -13,13 +14,13 @@ {% block js_import %} {{block.super}} - - + + {% endblock %} {% block css_import %} {{block.super}} - + {% endblock %} {% block js_declaration %} @@ -51,7 +52,7 @@ {% else %}{% trans 'All medias' %}{% endif %}
  • - {% trans 'Filter the medias' %}{% trans 'Filter the medias' %} {% trans 'Filter the medias' %} + {% trans 'Filter the medias' %}{% trans 'Filter the medias' %} {% trans 'Filter the medias' %}
  • diff -r a6a37775a76d -r c558d677ee52 src/ldt/ldt/ldt_utils/templates/front/front_base.html --- a/src/ldt/ldt/ldt_utils/templates/front/front_base.html Sat Dec 01 02:15:38 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/front/front_base.html Mon Dec 03 10:43:13 2012 +0100 @@ -1,6 +1,7 @@ {% load i18n %} {% load logintag %} {% load navigation %} +{% load absstatic %} {% load analytics %} @@ -9,15 +10,15 @@ {% block head %} - + {% block title %}Lignes de temps{% endblock %} {% block js_import %} - - + + {% endblock %} {% block css_declaration %}{% endblock %} {% block css_import %} - + {% endblock %} {% block js_declaration %} - + + {% endblock %} {% block css_import %} {{block.super}} - + {% endblock %} {% block js_declaration %} @@ -42,7 +42,7 @@ diff -r a6a37775a76d -r c558d677ee52 src/ldt/ldt/ldt_utils/templates/front/front_player.html --- a/src/ldt/ldt/ldt_utils/templates/front/front_player.html Sat Dec 01 02:15:38 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/front/front_player.html Mon Dec 03 10:43:13 2012 +0100 @@ -1,14 +1,15 @@ {% extends "front/front_base.html" %} {% load i18n %} {% load thumbnail %} +{% load absstatic %} {% block title %}Lignes de temps : {% trans 'Annotate' %} "{{content.title}}"{% endblock %} {% block css_import %} {{block.super}} - - - + + + {% endblock %} {% block js_declaration %} diff -r a6a37775a76d -r c558d677ee52 src/ldt/ldt/ldt_utils/templates/front/front_search_results.html --- a/src/ldt/ldt/ldt_utils/templates/front/front_search_results.html Sat Dec 01 02:15:38 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/front/front_search_results.html Mon Dec 03 10:43:13 2012 +0100 @@ -1,18 +1,19 @@ {% extends "front/front_base.html" %} {% load i18n %} {% load thumbnail %} +{% load absstatic %} {% load front_tags %} {% block title %}Lignes de temps : {% trans 'search' %} "{{search}}" {% endblock %} {% block js_import %} {{block.super}} - + {% endblock %} {% block css_import %} {{block.super}} - + {% endblock %} {% block js_declaration %} @@ -40,7 +41,7 @@ var global_csrf_token = "{{ csrf_token }}"; - + {% endblock %} {% block body %} @@ -106,7 +107,7 @@
  • - +

    diff -r a6a37775a76d -r c558d677ee52 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/content_list.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/content_list.html Sat Dec 01 02:15:38 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/content_list.html Mon Dec 03 10:43:13 2012 +0100 @@ -1,5 +1,6 @@ {% extends "ldt/user/user_base.html" %} {% load i18n %} +{% load absstatic %} {% block js_declaration %} {{block.super}} @@ -47,7 +48,7 @@ {% block css_import %} {{block.super}} - + {% endblock %} {% block breadcrumb %} diff -r a6a37775a76d -r c558d677ee52 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/copy_ldt.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/copy_ldt.html Sat Dec 01 02:15:38 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/copy_ldt.html Mon Dec 03 10:43:13 2012 +0100 @@ -1,11 +1,11 @@ {% extends "ldt/ldt_raw_base.html" %} - +{% load absstatic %} {% load i18n %} {# form of copy of project ldt #} {% block css_import %} {{ block.super }} - - - + + + {% endblock %} {% block body %}
    diff -r a6a37775a76d -r c558d677ee52 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_content.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_content.html Sat Dec 01 02:15:38 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_content.html Mon Dec 03 10:43:13 2012 +0100 @@ -1,5 +1,7 @@ {% extends "ldt/ldt_utils/workspace_base.html" %} {% load i18n %} +{% load absstatic %} +{% load absurl %} {# form of creation of content #} {% load adminmedia %} @@ -9,11 +11,11 @@ - - - - - + + + + + {{ content_form.media.js }} {% endblock %} @@ -28,7 +30,7 @@ "{{cookie_name}}" : "{{session_key}}"}; onCreateContentReady("{% url ldt.ldt_utils.views.content.upload %}", - "{{LDT_MEDIA_PREFIX}}", + '{% absstatic "ldt" %}', post_added_params, '{% trans "Browse" %}', '{% trans "File uploaded" %}', @@ -54,11 +56,11 @@ {% block css_import %} {{ block.super }} {{ content_form.media.css }} - - - - - + + + + + {% endblock %} @@ -136,7 +138,7 @@
    -
    loader
    +
    loader
    {% trans "media file is being processed please wait." %}
     
    diff -r a6a37775a76d -r c558d677ee52 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_group.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_group.html Sat Dec 01 02:15:38 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_group.html Mon Dec 03 10:43:13 2012 +0100 @@ -1,23 +1,25 @@ {% extends "ldt/ldt_utils/workspace_base.html" %} {% load i18n %} +{% load absstatic %} +{% load absurl %} {% load adminmedia %} {% load thumbnail %} {% block js_import %} {{ block.super }} - - - + + + {{ content_form.media.js }} {% endblock %} {% block css_import %} {{ block.super }} {{ content_form.media.css }} - - - + + + {% endblock %} @@ -42,7 +44,7 @@ $( this ).find("button[type=submit]").removeClass("e-clicked"); }); - var search_url = "{% url ldt.ldt_utils.views.workspace.share_filter filter='__FILTER__' use_groups='false' %}"; + var search_url = "{% absurl ldt.ldt_utils.views.workspace.share_filter filter='__FILTER__' use_groups='false' %}"; }); @@ -53,7 +55,7 @@
    {% if group_id %}{% trans "Update a group" %}{% else %}{% trans "Create a group" %}{% endif %}
    -
    + {% csrf_token %} diff -r a6a37775a76d -r c558d677ee52 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_ldt.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_ldt.html Sat Dec 01 02:15:38 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_ldt.html Mon Dec 03 10:43:13 2012 +0100 @@ -1,23 +1,23 @@ {% extends "ldt/ldt_raw_base.html" %} - +{% load absstatic %} {% load i18n %} {# form of creation of content #} {% load adminmedia %} {% block js_import %} {{ block.super }} - + - - + + {{ content_form.media.js }} {% endblock %} {% block css_import %} {{ block.super }} {{ content_form.media.css }} - - - + + + {% endblock %} {% block js_declaration %} diff -r a6a37775a76d -r c558d677ee52 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_iframe.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_iframe.html Sat Dec 01 02:15:38 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_iframe.html Mon Dec 03 10:43:13 2012 +0100 @@ -1,5 +1,7 @@ {% load i18n %} {% load thumbnail %} +{% load absstatic %} +{% load absurl %} {% load analytics %}
    - + - - - + + + + {{ content_form.media.js }} {% endblock %} @@ -23,12 +26,21 @@ var translate_show="{% trans 'Show Player' %}"; var translate_hide="{% trans 'Hide Player' %}"; var WEB_URL='{{WEB_URL}}'; - var LDT_MEDIA_PREFIX='{{LDT_MEDIA_PREFIX}}'; var LANGUAGE_CODE='{{LANGUAGE_CODE}}'; var json_url='{{json_url}}'; var player_id='{{player_id}}'; - var segment_api='{% url segment_api_empty resource_name="segments" api_name="1.0" %}'; + var defaultDir='{% absstatic "ldt/js/" %}'; + var jwPlayerSWF='{% absstatic "ldt/swf/player.swf" %}'; + var recordMicSwf='{% absstatic "ldt/swf/record_mic.swf" %}'; + var zeroClipboardSwf='{% absstatic "ldt/swf/ZeroClipboard10.swf" %}'; + var cssjQueryUI='{% absstatic "ldt/css/jq-css/themes/base/jquery-ui.css" %}'; + var widgetsDir='{% absstatic "ldt/metadataplayer" %}'; + var configCss='{% absstatic "ldt/metadataplayer/LdtPlayer-core.css" %}'; + var default_thumbnail='{% absstatic "ldt/css/imgs/video_sequence.png" %}'; + var segment_api="{% absurl segment_api_empty resource_name='segments' api_name='1.0' %}{% templatetag openvariable %}media{% templatetag closevariable %}/{% templatetag openvariable %}begin{% templatetag closevariable %}/{% templatetag openvariable %}end{% templatetag closevariable %}"; + var LdtPlayer_core='{% absstatic "ldt/metadataplayer/LdtPlayer-core.js" %}'; var creator_name='{{request.user.username}}'; + $j(document).ready(function(){ init_events(); }); @@ -38,10 +50,10 @@ {% block css_import %} {{ block.super }} {{ content_form.media.css }} - - - - + + + + {% endblock %} @@ -79,8 +91,8 @@
    {% trans 'Player Size : ' %} - x - + x +
    @@ -208,7 +220,7 @@ {% trans 'Show Player' %} diff -r a6a37775a76d -r c558d677ee52 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/error_confirm.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/error_confirm.html Sat Dec 01 02:15:38 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/error_confirm.html Mon Dec 03 10:43:13 2012 +0100 @@ -1,17 +1,17 @@ {% extends "ldt/ldt_utils/workspace_base.html" %} - +{% load absstatic %} {% load i18n %} {# form of creation of content #} {% block js_import %} {{ block.super }} - + {% endblock %} {% block css_import %} {{ block.super }} {{ content_form.media.css }} - + {% endblock %} diff -r a6a37775a76d -r c558d677ee52 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/error_confirm_popup.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/error_confirm_popup.html Sat Dec 01 02:15:38 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/error_confirm_popup.html Mon Dec 03 10:43:13 2012 +0100 @@ -1,18 +1,18 @@ {% extends "ldt/ldt_raw_base.html" %} - +{% load absstatic %} {% load i18n %} {# form of creation of content #} {% block js_import %} {{ block.super }} - + {% endblock %} {% block css_import %} {{ block.super }} {{ content_form.media.css }} - - + + {% endblock %} diff -r a6a37775a76d -r c558d677ee52 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/groups.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/groups.html Sat Dec 01 02:15:38 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/groups.html Mon Dec 03 10:43:13 2012 +0100 @@ -1,10 +1,10 @@ {% extends "ldt/ldt_base.html" %} {% load i18n %} - +{% load absstatic %} {% block js_import %} {{block.super}} - + {% endblock %} {% block js_declaration %} @@ -82,7 +82,7 @@ {% block css_import %} {{block.super}} - + {% endblock %} {% block content %} @@ -91,13 +91,13 @@
    {% trans "My groups" %} {% if can_add_group %} - {% trans 'Create group' %} + {% trans 'Create group' %} {% endif %}
    -
    loader
    +
    loader
    @@ -109,7 +109,7 @@
    {% trans "The group's projects" %}
    -
    loader
    +
    loader
    diff -r a6a37775a76d -r c558d677ee52 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/init_ldt.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/init_ldt.html Sat Dec 01 02:15:38 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/init_ldt.html Mon Dec 03 10:43:13 2012 +0100 @@ -1,3 +1,4 @@ +{% load absstatic %} @@ -6,10 +7,10 @@ Ligne de Temps - IRI - - + + - + - + {% endblock %} @@ -68,7 +68,7 @@ {% block css_import %} {{block.super}} - + {% endblock %} {% block content %} @@ -77,7 +77,7 @@
    {% trans "project list" %}
    -
    +
    diff -r a6a37775a76d -r c558d677ee52 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/loading.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/loading.html Sat Dec 01 02:15:38 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/loading.html Mon Dec 03 10:43:13 2012 +0100 @@ -1,3 +1,4 @@ +{% load absstatic %} @@ -20,7 +21,7 @@
    loading
    + src='{% absstatic "ldt/img/loadingAnimation.gif" %}' />
    diff -r a6a37775a76d -r c558d677ee52 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/contentslist.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/contentslist.html Sat Dec 01 02:15:38 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/contentslist.html Mon Dec 03 10:43:13 2012 +0100 @@ -1,6 +1,7 @@ {% load i18n %} {% load thumbnail %} {% load front_tags %} +{% load absstatic %}
    • {% if tag_cloud|length > 0 %}{% trans 'All categories' %}{% endif %}{% if current_content_tag %}{% if current_content_tag != "" %} > {{current_content_tag}} [x]{% endif %}{% endif %}
    • @@ -25,8 +26,8 @@

  • {% for content in contents %} - - + + diff -r a6a37775a76d -r c558d677ee52 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_player.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_player.html Sat Dec 01 02:15:38 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_player.html Mon Dec 03 10:43:13 2012 +0100 @@ -1,10 +1,12 @@ {% spaceless %} {% load i18n %} +{% load absurl %} +{% load absstatic %} {% load thumbnail %}
    - + +
     
    diff -r a6a37775a76d -r c558d677ee52 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/permissions.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/permissions.html Sat Dec 01 02:15:38 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/permissions.html Mon Dec 03 10:43:13 2012 +0100 @@ -1,6 +1,7 @@ {% load i18n %} +{% load absstatic %} - + diff -r a6a37775a76d -r c558d677ee52 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html Sat Dec 01 02:15:38 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html Mon Dec 03 10:43:13 2012 +0100 @@ -1,5 +1,6 @@ {% load i18n %} {% load thumbnail %} +{% load absstatic %} {% load front_tags %} {% if nb_pj_pages %} @@ -21,33 +22,33 @@ {% if is_gecko %}
    {% else %} {% endif %} - + diff -r a6a37775a76d -r c558d677ee52 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/publishedprojectslist.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/publishedprojectslist.html Sat Dec 01 02:15:38 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/publishedprojectslist.html Mon Dec 03 10:43:13 2012 +0100 @@ -1,6 +1,7 @@ {% load i18n %} {% load thumbnail %} {% load front_tags %} +{% load absstatic %} {% if nb_pj_pages %} {% url ldt.ldt_utils.views.json.project_json_id project.ldt_id as json_url_id %} {% if is_gecko %} - + {% else %} - + {% endif %} - - + + diff -r a6a37775a76d -r c558d677ee52 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/published_projects.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/published_projects.html Sat Dec 01 02:15:38 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/published_projects.html Mon Dec 03 10:43:13 2012 +0100 @@ -1,10 +1,10 @@ {% extends "ldt/ldt_base.html" %} {% load i18n %} - +{% load absstatic %} {% block js_import %} {{block.super}} - + {% endblock %} {% block js_declaration %} @@ -43,7 +43,7 @@ {% block css_import %} {{block.super}} - + {% endblock %} {% block content %} @@ -65,9 +65,9 @@
    {% trans "Published projects" %} - {% trans 'Create project' %}
    + {% trans 'Create project' %}
    -
    loader
    +
    loader
    diff -r a6a37775a76d -r c558d677ee52 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/reset_confirm.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/reset_confirm.html Sat Dec 01 02:15:38 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/reset_confirm.html Mon Dec 03 10:43:13 2012 +0100 @@ -1,18 +1,18 @@ {% extends "ldt/ldt_utils/workspace_base.html" %} - +{% load absstatic %} {% load i18n %} {# form of creation of content #} {% block js_import %} {{ block.super }} - + {% endblock %} {% block css_import %} {{ block.super }} {{ content_form.media.css }} - - + + {% endblock %} diff -r a6a37775a76d -r c558d677ee52 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/reset_confirm_popup.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/reset_confirm_popup.html Sat Dec 01 02:15:38 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/reset_confirm_popup.html Mon Dec 03 10:43:13 2012 +0100 @@ -1,18 +1,18 @@ {% extends "ldt/ldt_raw_base.html" %} - +{% load absstatic %} {% load i18n %} {# form of creation of content #} {% block js_import %} {{ block.super }} - + {% endblock %} {% block css_import %} {{ block.super }} {{ content_form.media.css }} - - + + {% endblock %} diff -r a6a37775a76d -r c558d677ee52 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/search_results.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/search_results.html Sat Dec 01 02:15:38 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/search_results.html Mon Dec 03 10:43:13 2012 +0100 @@ -1,15 +1,15 @@ {% extends "ldt/ldt_base.html" %} {% load i18n %} - +{% load absstatic %} {% block js_import %} {{ block.super }} - + {% endblock %} {% block css_import %} {{ block.super }} - + {% endblock %} {% block css_import %} - - + + - + {% endblock %} {% block js_declaration %} diff -r a6a37775a76d -r c558d677ee52 src/ldt/ldt/templatetags/absstatic.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/ldt/ldt/templatetags/absstatic.py Mon Dec 03 10:43:13 2012 +0100 @@ -0,0 +1,24 @@ +from django import template +from django.contrib.staticfiles.storage import staticfiles_storage +from django.contrib.sites.models import Site +from django.template import Library +import logging +import urlparse + +register = template.Library() + +@register.simple_tag +def absstatic(context, path): + try: + request=context['request'] + if request.is_secure(): + domain = "https://%s" % Site.objects.get_current().domain + else: + domain = "http://%s" % Site.objects.get_current().domain + except: + domain = "http://%s" % Site.objects.get_current().domain + + new_path = staticfiles_storage.url(path) + return urlparse.urljoin(domain, new_path) + +absstatic=register.simple_tag(takes_context=True)(absstatic) \ No newline at end of file diff -r a6a37775a76d -r c558d677ee52 src/ldt/ldt/templatetags/absurl.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/ldt/ldt/templatetags/absurl.py Mon Dec 03 10:43:13 2012 +0100 @@ -0,0 +1,31 @@ +import urlparse +from django.template import Library +from django.template.defaulttags import URLNode, url +from django.contrib.sites.models import Site +import logging + + +register = Library() + +class AbsoluteURLNode(URLNode): + def render(self, context): + path = super(AbsoluteURLNode, self).render(context) + try: + request=context['request'] + if request.is_secure(): + domain = "https://%s" % Site.objects.get_current().domain + else: + domain = "http://%s" % Site.objects.get_current().domain + except: + domain = "http://%s" % Site.objects.get_current().domain + return urlparse.urljoin(domain, path) + +@register.simple_tag +def absurl(parser, token, node_cls=AbsoluteURLNode): + """Just like {% url %} but ads the domain of the current site.""" + node_instance = url(parser, token) + return node_cls(view_name=node_instance.view_name, + args=node_instance.args, + kwargs=node_instance.kwargs, + asvar=node_instance.asvar) +absurl = register.tag(absurl) \ No newline at end of file diff -r a6a37775a76d -r c558d677ee52 src/ldt/ldt/user/templates/ldt/user/user_base.html --- a/src/ldt/ldt/user/templates/ldt/user/user_base.html Sat Dec 01 02:15:38 2012 +0100 +++ b/src/ldt/ldt/user/templates/ldt/user/user_base.html Mon Dec 03 10:43:13 2012 +0100 @@ -2,10 +2,11 @@ {# this page inherit base html, all pages of ldt inherit this page. #} {# all contents are writed in the "iricontent" block #} {% load i18n %} +{% load absstatic %} {% block css_import %} {{ block.super }} - + {% endblock %} diff -r a6a37775a76d -r c558d677ee52 src/ldt/ldt/user/templates/registration/base.html --- a/src/ldt/ldt/user/templates/registration/base.html Sat Dec 01 02:15:38 2012 +0100 +++ b/src/ldt/ldt/user/templates/registration/base.html Mon Dec 03 10:43:13 2012 +0100 @@ -1,9 +1,10 @@ {% extends "ldt/user/user_base.html" %} +{% load absstatic %} {% block js_import %} {{ block.super }} {% endblock %} {% block css_import %} {{ block.super }} - + {% endblock %} {% block pageclass %}profile{% endblock %} diff -r a6a37775a76d -r c558d677ee52 src/ldt/ldt/user/templates/registration/login.html --- a/src/ldt/ldt/user/templates/registration/login.html Sat Dec 01 02:15:38 2012 +0100 +++ b/src/ldt/ldt/user/templates/registration/login.html Mon Dec 03 10:43:13 2012 +0100 @@ -1,5 +1,6 @@ {% extends "registration/base.html" %} {% load i18n %} +{% load absstatic %} {% block js_declaration %}{{ block.super }} +{% endblock %} +{% block css_import %} + {{ block.super }} + + +{% endblock %} + + +{% block login %} +{% endblock %} + +{% block content_title %}{% trans 'Log in' %}{% endblock %} +{% block iricontent %} + {% if form.errors %} +

    {% trans "Sorry, that's not a valid username or password." %}

    + {% endif %} +
    + +
    + {% csrf_token %} + +
      + {{form.as_ul}} +
    + +
    + +
    +
    + + +
    + +{% endblock %} + + +
    Import
    Import + Import an ldt  
    Reindex + Reindex  
    Compute stats + Compute stats  
    {% trans 'create project' %}
    {% trans 'preview media'%}
    {% trans 'create project' %}
    {% trans 'preview media'%}
    {% thumbnail content.image "50x50" format="PNG" crop="top" as im %}{% endthumbnail %} {{ content.title|default:"_" }}
    {% trans 'copy project' %}
    {% trans 'copy project' %}
    + {% trans 'link json by id' %} {% ifequal project.state 2 %} - {% trans 'Project published, click to unpublish' %} + {% trans 'Project published, click to unpublish' %} {% else %} - {% trans 'Project not published, click to publish' %} + {% trans 'Project not published, click to publish' %} {% endifequal %} {% thumbnail project.image "50x50" crop="center" format="PNG" as im %}{% empty %} {% endthumbnail %}
    {% trans 'open ldt' %}
    {% trans 'open ldt' %}
    {% trans 'open ldt' %}
    {% trans 'open ldt' %}
    {% trans 'copy the project' %}
    {% trans 'link json by id' %}
    {% trans 'copy the project' %}
    {% trans 'link json by id' %}
    - {% trans 'Project published' %} + {% trans 'Project published' %} {% thumbnail project.image "50x50" crop="center" format="PNG" as im %}{% empty %} {% endthumbnail %} diff -r a6a37775a76d -r c558d677ee52 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/sharewith.html --- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/sharewith.html Sat Dec 01 02:15:38 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/sharewith.html Mon Dec 03 10:43:13 2012 +0100 @@ -1,12 +1,12 @@ {% load i18n %} - +{% load absstatic %} {% for res in elem_list %}
    {% if res.type == "user" %} - {% trans + {% trans {% else %} - {% + {% {% endif %}