new template tag absstatic to have absolute url for static file and avoid using LDT_MEDIA_PREFIX
new absurl template tag can be used instead of template tag url to have absolute url
replacement of all LDT_MEDIA_PREFIX in different templates and views
--- a/src/ldt/ldt/auth/views.py Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/auth/views.py Wed Nov 28 12:27:08 2012 +0100
@@ -8,7 +8,7 @@
redirect_field_name=REDIRECT_FIELD_NAME,
authentication_form=AuthenticationForm,
current_app=None):
-
- extra_context = {'social_list': social_list}
+ social_img=[{"facebook" : "ldt/img/logo_facebook.png",}, {"twitter" : "ldt/img/logo_twitter.png",}, {"google" : "ldt/img/logo_google.png",}, {"yahoo" : "ldt/img/logo_yahoo.png"},]
+ extra_context = {'social_list': social_list, 'social_img' : social_img}
return django_login(request, template_name, redirect_field_name, authentication_form, current_app, extra_context)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/ldt/ldt/ldt_utils/migrations/0025_chg_site_domain.py Wed Nov 28 12:27:08 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
--- a/src/ldt/ldt/ldt_utils/templates/admin/ldt_utils/app_index.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/admin/ldt_utils/app_index.html Wed Nov 28 12:27:08 2012 +0100
@@ -1,7 +1,9 @@
{% extends "admin/app_index.html" %}
+{% load absurl %}
+{% load absstatic %}
{% block extrastyle %}
{{ block.super }}
- <link rel="stylesheet" type="text/css" href="{% load ldtmedia %}{% ldt_media_prefix %}css/dashboard.css" />
+ <link rel="stylesheet" type="text/css" href='{% absstatic "ldt/css/dashboard.css" %}' />
{% endblock %}
{% load i18n %}
{% block content %}
@@ -11,7 +13,7 @@
<table summary="Import">
<caption>Import</caption>
<tr>
- <th><a href="{{WEB_URL}}{% url admin:ldt_content_import_file %}">Import
+ <th><a href="{% absurl admin:ldt_content_import_file %}">Import
an ldt</a></th>
<td> </td>
<!--tr>
@@ -21,12 +23,12 @@
<td> </td>
</tr-->
<tr>
- <th><a href="{{WEB_URL}}{% url admin:ldt_content_reindex %}">Reindex</a>
+ <th><a href="{% absurl admin:ldt_content_reindex %}">Reindex</a>
</th>
<td> </td>
</tr>
<tr>
- <th><a href="{{WEB_URL}}{% url admin:ldt_project_compute_stats %}">Compute stats</a>
+ <th><a href="{% absurl admin:ldt_project_compute_stats %}">Compute stats</a>
</th>
<td> </td>
</tr>
--- a/src/ldt/ldt/ldt_utils/templates/front/front_all_contents.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/front/front_all_contents.html Wed Nov 28 12:27:08 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}}
-<script src="{{LDT_MEDIA_PREFIX}}js/raphael.js" type="text/javascript"></script>
-<script src="{{LDT_MEDIA_PREFIX}}js/Ldt_front_sparkline.js" type="text/javascript"></script>
+<script src='{% absstatic "ldt/js/raphael.js" %}' type="text/javascript"></script>
+<script src='{% absstatic "ldt/js/Ldt_front_sparkline.js" %}' type="text/javascript"></script>
{% endblock %}
{% block css_import %}
{{block.super}}
-<link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/front_home.css" type="text/css"/>
+<link rel="stylesheet" href='{% absstatic "ldt/css/front_home.css" %}' type="text/css"/>
{% endblock %}
{% block js_declaration %}
@@ -51,7 +52,7 @@
{% else %}{% trans 'All medias' %}{% endif %}</h2>
</li>
<li class="li_right">
- <span class="tag_link"><a href="#" id="tag_cloud_link" title="{% trans 'Filter the medias' %}"><img id="hide_tag_cloud" src="{{LDT_MEDIA_PREFIX}}img/little_minus_pink.png" alt="{% trans 'Filter the medias' %}" /><img id="show_tag_cloud" src="{{LDT_MEDIA_PREFIX}}img/little_plus_pink.png" alt="{% trans 'Filter the medias' %}" /> {% trans 'Filter the medias' %}</a></span>
+ <span class="tag_link"><a href="#" id="tag_cloud_link" title="{% trans 'Filter the medias' %}"><img id="hide_tag_cloud" src='{% absstatic "ldt/img/little_minus_pink.png" %}' alt="{% trans 'Filter the medias' %}" /><img id="show_tag_cloud" src='{% absstatic "ldt/img/little_plus_pink.png" %}' alt="{% trans 'Filter the medias' %}" /> {% trans 'Filter the medias' %}</a></span>
</li>
</ul>
</li>
--- a/src/ldt/ldt/ldt_utils/templates/front/front_base.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/front/front_base.html Wed Nov 28 12:27:08 2012 +0100
@@ -1,6 +1,7 @@
{% load i18n %}
{% load logintag %}
{% load navigation %}
+{% load absstatic %}
{% load analytics %}
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
@@ -9,15 +10,15 @@
{% block head %}
<meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
<meta http-equiv="content-language" content="{{LANGUAGE_CODE}}" />
- <link rel="SHORTCUT ICON" href="{{LDT_MEDIA_PREFIX}}/img/favicon.ico" />
+ <link rel="SHORTCUT ICON" href='{% absstatic "ldt/img/favicon.ico" %}' />
<title>{% block title %}Lignes de temps{% endblock %}</title>
{% block js_import %}
- <script src="{{LDT_MEDIA_PREFIX}}js/jquery.min.js" type="text/javascript"></script>
- <script src="{{LDT_MEDIA_PREFIX}}js/jquery.textchange.min.js" type="text/javascript"></script>
+ <script src='{% absstatic "ldt/js/jquery.min.js" %}' type="text/javascript"></script>
+ <script src='{% absstatic "ldt/js/jquery.textchange.min.js" %}' type="text/javascript"></script>
{% endblock %}
{% block css_declaration %}{% endblock %}
{% block css_import %}
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/front_common.css" type="text/css"/>
+ <link rel="stylesheet" href='{% absstatic "ldt/css/front_common.css" %}' type="text/css"/>
{% endblock %}
{% block js_declaration %}
<script type="text/javascript">
@@ -55,7 +56,7 @@
{% if user.is_authenticated %}
<li id="li_annotation">
<div class="fl">
- <!-- a href="#"><img src="{{LDT_MEDIA_PREFIX}}img/annot_icon.png" id="annot_icon" /></a -->
+ <!-- a href="#"><img src='{% absstatic "ldt/img/annot_icon.png" %}' id="annot_icon" /></a -->
<a href="{% url root-view %}" title="{% trans "My projects" %}">{% trans "My projects" %}</a>
</div>
<div class="fl">
--- a/src/ldt/ldt/ldt_utils/templates/front/front_group.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/front/front_group.html Wed Nov 28 12:27:08 2012 +0100
@@ -2,12 +2,13 @@
{% load i18n %}
{% load thumbnail %}
{% load front_tags %}
+{% load absstatic %}
{% block title %}Lignes de temps : groupe "{{group.name}}"{% endblock %}
{% block css_import %}
{{block.super}}
-<link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/front_group.css" type="text/css"/>
+<link rel="stylesheet" href='{% absstatic "ldt/css/front_group.css" %}' type="text/css"/>
{% endblock %}
{% block js_declaration %}
--- a/src/ldt/ldt/ldt_utils/templates/front/front_home.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/front/front_home.html Wed Nov 28 12:27:08 2012 +0100
@@ -2,19 +2,19 @@
{% load i18n %}
{% load thumbnail %}
{% load front_tags %}
-
+{% load absstatic %}
{% block title %}{% trans "front.home" %}{% endblock %}
{% block js_import %}
{{block.super}}
-<script src="{{LDT_MEDIA_PREFIX}}js/raphael.js" type="text/javascript"/></script>
-<script src="{{LDT_MEDIA_PREFIX}}js/Ldt_front_sparkline.js" type="text/javascript"/></script>
+<script src='{% absstatic "ldt/js/raphael.js" %}' type="text/javascript"/></script>
+<script src='{% absstatic "ldt/js/Ldt_front_sparkline.js" %}' type="text/javascript"/></script>
{% endblock %}
{% block css_import %}
{{block.super}}
-<link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/front_home.css" type="text/css"/>
+<link rel="stylesheet" href='{% absstatic "ldt/css/front_home.css" %}' type="text/css"/>
{% endblock %}
{% block js_declaration %}
@@ -42,7 +42,7 @@
<ul class="title_ul">
<li><h2>{% trans 'Last annotated medias' %}</h2></li>
<li class="li_right">
- <a class="blue" href="{% url ldt.ldt_utils.views.front.all_contents %}" title="{% trans 'view all medias' %}">{% trans 'All medias' %}</a> <span class="tag_link"><a href="#" id="tag_cloud_link" title="{% trans 'Filter the medias' %}"><img id="hide_tag_cloud" src="{{LDT_MEDIA_PREFIX}}img/little_minus_pink.png" alt="{% trans 'Filter the medias' %}" /><img id="show_tag_cloud" src="{{LDT_MEDIA_PREFIX}}img/little_plus_pink.png" alt="{% trans 'Filter the medias' %}" /> {% trans 'Filter the medias' %}</a></span>
+ <a class="blue" href="{% url ldt.ldt_utils.views.front.all_contents %}" title="{% trans 'view all medias' %}">{% trans 'All medias' %}</a> <span class="tag_link"><a href="#" id="tag_cloud_link" title="{% trans 'Filter the medias' %}"><img id="hide_tag_cloud" src='{% absstatic "ldt/img/little_minus_pink.png" %}' alt="{% trans 'Filter the medias' %}" /><img id="show_tag_cloud" src='{% absstatic "ldt/img/little_plus_pink.png" %}' alt="{% trans 'Filter the medias' %}" /> {% trans 'Filter the medias' %}</a></span>
</li>
</ul>
</li>
--- a/src/ldt/ldt/ldt_utils/templates/front/front_player.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/front/front_player.html Wed Nov 28 12:27:08 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}}
-<link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/front_player.css" type="text/css"/>
-<link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/embed_popup.css" type="text/css"/>
-<link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/jq-css/jquery.qtip.css" type="text/css"/>
+<link rel="stylesheet" href='{% absstatic "ldt/css/front_player.css" %}' type="text/css"/>
+<link rel="stylesheet" href='{% absstatic "ldt/css/embed_popup.css" %}' type="text/css"/>
+<link rel="stylesheet" href='{% absstatic "ldt/css/jq-css/jquery.qtip.css" %}' type="text/css"/>
{% endblock %}
{% block js_declaration %}
--- a/src/ldt/ldt/ldt_utils/templates/front/front_search_results.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/front/front_search_results.html Wed Nov 28 12:27:08 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}}
-<script src="{{LDT_MEDIA_PREFIX}}js/raphael.js" type="text/javascript"/></script>
+<script src='{% absstatic "ldt/js/raphael.js" %}' type="text/javascript"/></script>
{% endblock %}
{% block css_import %}
{{block.super}}
-<link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/front_search.css" type="text/css"/>
+<link rel="stylesheet" href='{% absstatic "ldt/css/front_search.css" %}' type="text/css"/>
{% endblock %}
{% block js_declaration %}
@@ -40,7 +41,7 @@
var global_csrf_token = "{{ csrf_token }}";
</script>
-<script src="{{LDT_MEDIA_PREFIX}}js/Ldt_front_search_results.js" type="text/javascript"></script>
+<script src='{% absstatic "ldt/js/Ldt_front_search_results.js" %}' type="text/javascript"></script>
{% endblock %}
{% block body %}
@@ -106,7 +107,7 @@
<li class="li_segment" id="li_{{segment.project_id}}_{{segment.iri_id}}_{{segment.ensemble_id}}_{{segment.cutting_id}}_{{segment.element_id}}">
<div class="left_segment">
<div class="color_zone"></div>
- <a href="{% url ldt.ldt_utils.views.front.annot_content segment.iri_id segment.project_id segment.cutting_id %}#id={{segment.element_id}}"><img src="{{LDT_MEDIA_PREFIX}}img/annot_icon_80x45.png" width="80" height="45" alt="" /></a>
+ <a href="{% url ldt.ldt_utils.views.front.annot_content segment.iri_id segment.project_id segment.cutting_id %}#id={{segment.element_id}}"><img src='{% absstatic "ldt/img/annot_icon_80x45.png" %}' width="80" height="45" alt="" /></a>
<!--p class="duree_segment">{{ segment.duration|str_duration:"::" }}</p-->
</div>
<h4 class="title_segment"><a class="blue under" href="{% url ldt.ldt_utils.views.front.annot_content segment.iri_id segment.project_id segment.cutting_id %}#id={{segment.element_id}}" title="{% trans 'view this annotation in the player' %}">
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/content_list.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/content_list.html Wed Nov 28 12:27:08 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}}
- <link rel="stylesheet" type="text/css" href="{{LDT_MEDIA_PREFIX}}/css/ldt.css" />
+ <link rel="stylesheet" type="text/css" href='{% absstatic "ldt/css/ldt.css" %}' />
{% endblock %}
{% block breadcrumb %}
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/copy_ldt.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/copy_ldt.html Wed Nov 28 12:27:08 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 }}
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/ldt.css" />
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/ldtform.css" />
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/workspace.css" />
+ <link rel="stylesheet" href='{% absstatic "ldt/css/ldt.css" %}' />
+ <link rel="stylesheet" href='{% absstatic "ldt/css/ldtform.css" %}' />
+ <link rel="stylesheet" href='{% absstatic "ldt/css/workspace.css" %}' />
{% endblock %}
{% block body %}
<div id="add_contribution" class="span-12 last">
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_content.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_content.html Wed Nov 28 12:27:08 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 @@
<script type="text/javascript" src="{{ADMIN_MEDIA_PREFIX}}js/core.js" ></script>
<script type="text/javascript" src="{{ADMIN_MEDIA_PREFIX}}js/jquery.init.js"></script>
<script type="text/javascript" src="{{ADMIN_MEDIA_PREFIX}}js/jquery.min.js"></script>
- <script type="text/javascript" src="{% url ldt.jsi18n packages='ldt' %}" ></script>
- <script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/projectscontents.js"></script>
- <script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/jquery.textchange.min.js"></script>
- <script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/jquery-ui.min.js"></script>
- <script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/swfupload/swfupload.js"></script>
+ <script type="text/javascript" src="{% absurl ldt.jsi18n packages='ldt' %}" ></script>
+ <script type="text/javascript" src='{% absstatic "ldt/js/projectscontents.js" %}'></script>
+ <script type="text/javascript" src='{% absstatic "ldt/js/jquery.textchange.min.js" %}'></script>
+ <script type="text/javascript" src='{% absstatic "ldt/js/jquery-ui.min.js" %}'></script>
+ <script type="text/javascript" src='{% absstatic "ldt/js/swfupload/swfupload.js" %}'></script>
{{ 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 }}
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/ldtform.css" />
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/style.css" />
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/blueprint/screen.css" type="text/css" media="screen, projection" />
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/blueprint/print.css" type="text/css" media="print" />
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}/css/workspace.css" type="text/css"/>
+ <link rel="stylesheet" href='{% absstatic "ldt/css/ldtform.css" %}'/>
+ <link rel="stylesheet" href='{% absstatic "ldt/css/style.css" %}'/>
+ <link rel="stylesheet" href='{% absstatic "ldt/css/blueprint/screen.css" %}' type="text/css" media="screen, projection" />
+ <link rel="stylesheet" href='{% absstatic "ldt/css/blueprint/print.css" %}' type="text/css" media="print" />
+ <link rel="stylesheet" href='{% absstatic "ldt//css/workspace.css" %}'type="text/css"/>
{% endblock %}
@@ -136,7 +138,7 @@
<div id="submitcontent" class="span-18 last">
<div id="submitcontent-loader" class="span-10">
- <div id="submitcontent-loader-img" class="submitcontent-loader-content span-10 last"><img alt="loader" src="{{LDT_MEDIA_PREFIX}}img/ajax-loader-220x19.gif"/></div>
+ <div id="submitcontent-loader-img" class="submitcontent-loader-content span-10 last"><img alt="loader" src='{% absstatic "ldt/img/ajax-loader-220x19.gif" %}'/></div>
<div id="submitcontent-loader-msg" class="submitcontent-loader-content span-10 last">{% trans "media file is being processed please wait." %}</div>
<span> </span>
</div>
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_group.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_group.html Wed Nov 28 12:27:08 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 }}
- <script type="text/javascript" src="{% url ldt.jsi18n packages='ldt' %}" ></script>
- <script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/projectscontents.js" ></script>
- <script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/tiny_mce/tiny_mce.js"></script>
+ <script type="text/javascript" src="{% absurl ldt.jsi18n packages='ldt' %}" ></script>
+ <script type="text/javascript" src='{% absstatic "ldt/js/projectscontents.js" %}' ></script>
+ <script type="text/javascript" src='{% absstatic "ldt/js/tiny_mce/tiny_mce.js" %}'></script>
{{ content_form.media.js }}
{% endblock %}
{% block css_import %}
{{ block.super }}
{{ content_form.media.css }}
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/ldt.css" />
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/ldtform.css" />
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/workspace.css" />
+ <link rel="stylesheet" href='{% absstatic "ldt/css/ldt.css" %}' />
+ <link rel="stylesheet" href='{% absstatic "ldt/css/ldtform.css" %}' />
+ <link rel="stylesheet" href='{% absstatic "ldt/css/workspace.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' %}";
});
</script>
@@ -53,7 +55,7 @@
<div id="add_group" class="span-18 last">
<div class="projectscontentstitle span-18 last">{% if group_id %}{% trans "Update a group" %}{% else %}{% trans "Create a group" %}{% endif %}</div>
- <form action="{% if group_id %}{% url ldt.ldt_utils.views.group.update_group group_id %} {% else %}{% url ldt.ldt_utils.views.group.create_group %}{% endif %}" method="POST" enctype="multipart/form-data" {% if target_parent %}target="_parent"{% endif %}>
+ <form action="{% if group_id %}{% absurl ldt.ldt_utils.views.group.update_group group_id %} {% else %}{% absurl ldt.ldt_utils.views.group.create_group %}{% endif %}" method="POST" enctype="multipart/form-data" {% if target_parent %}target="_parent"{% endif %}>
{% csrf_token %}
<input type="hidden" name="form_status" value="{{form_status}}" id="project_form_status" />
<input type="hidden" name="id_group" value="" id="id_group"/>
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_ldt.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_ldt.html Wed Nov 28 12:27:08 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 }}
- <script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/jquery.nyroModal.min.js"></script>
+ <script type="text/javascript" src='{% absstatic "ldt/js/jquery.nyroModal.min.js" %}'></script>
<script type="text/javascript" src="{% url ldt.jsi18n packages='ldt' %}" ></script>
- <script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/projectscontents.js"></script>
- <script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/tiny_mce/tiny_mce.js"></script>
+ <script type="text/javascript" src='{% absstatic "ldt/js/projectscontents.js" %}'></script>
+ <script type="text/javascript" src='{% absstatic "ldt/js/tiny_mce/tiny_mce.js" %}'></script>
{{ content_form.media.js }}
{% endblock %}
{% block css_import %}
{{ block.super }}
{{ content_form.media.css }}
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/ldt.css" />
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/ldtform.css" />
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/workspace.css" />
+ <link rel="stylesheet" href='{% absstatic "ldt/css/ldt.css" %}' />
+ <link rel="stylesheet" href='{% absstatic "ldt/css/ldtform.css" %}' />
+ <link rel="stylesheet" href='{% absstatic "ldt/css/workspace.css" %}' />
{% endblock %}
{% block js_declaration %}
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_iframe.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_iframe.html Wed Nov 28 12:27:08 2012 +0100
@@ -1,5 +1,7 @@
{% load i18n %}
{% load thumbnail %}
+{% load absstatic %}
+{% load absurl %}
{% load analytics %}
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
@@ -24,7 +26,7 @@
<div>
<div id="{{ player_id }}_embed" class="iri_player_embed"></div>
- <script type="text/javascript" src="{{WEB_URL}}{{LDT_MEDIA_PREFIX}}metadataplayer/LdtPlayer-core.js"></script>
+ <script type="text/javascript" src='{% absstatic "ldt/metadataplayer/LdtPlayer-core.js" %}'></script>
<script type="text/javascript">
if (typeof jQuery == "undefined") {
@@ -33,14 +35,14 @@
var metadatas = {metadata: {url: '{{json_url}}'}};
var metadata_key = "metadata";
- IriSP.libFiles.defaultDir = "{{WEB_URL}}{{LDT_MEDIA_PREFIX}}js/";
- IriSP.libFiles.locations.jwPlayerSWF = "{{WEB_URL}}{{LDT_MEDIA_PREFIX}}swf/player.swf";
- IriSP.libFiles.locations.recordMicSwf = "{{WEB_URL}}{{LDT_MEDIA_PREFIX}}swf/record_mic.swf";
- IriSP.libFiles.locations.zeroClipboardSwf = "{{WEB_URL}}{{LDT_MEDIA_PREFIX}}swf/ZeroClipboard10.swf";
- IriSP.libFiles.locations.cssjQueryUI = "{{WEB_URL}}{{LDT_MEDIA_PREFIX}}css/jq-css/themes/base/jquery-ui.css"
+ IriSP.libFiles.defaultDir = '{% absstatic "ldt/js/" %}';
+ IriSP.libFiles.locations.jwPlayerSWF = '{% absstatic "ldt/swf/player.swf" %}';
+ IriSP.libFiles.locations.recordMicSwf = '{% absstatic "ldt/swf/record_mic.swf" %}';
+ IriSP.libFiles.locations.zeroClipboardSwf = '{% absstatic "ldt/swf/ZeroClipboard10.swf" %}';
+ IriSP.libFiles.locations.cssjQueryUI = '{% absstatic "ldt/css/jq-css/themes/base/jquery-ui.css" %}';
IriSP.language = '{{LANGUAGE_CODE}}';
- IriSP.widgetsDir = "{{WEB_URL}}{{LDT_MEDIA_PREFIX}}metadataplayer";
+ IriSP.widgetsDir = '{% absstatic "ldt/metadataplayer" %}';
var _metadata = {
url: metadatas[metadata_key].url + '?callback=?',
format: 'ldt'
@@ -48,7 +50,7 @@
var _config = {
width: '{{ player_width }}',
container: '{{ player_id }}_embed',
- css: '{{WEB_URL}}{{LDT_MEDIA_PREFIX}}metadataplayer/LdtPlayer-core.css',
+ css: '{% absstatic "ldt/metadataplayer/LdtPlayer-core.css" %}',
default_options: {
metadata: _metadata
},
@@ -119,9 +121,9 @@
{% if annotations_list %},{
type: "AnnotationsList",
container: "AnnotationsList_ext",
- ajax_url: "{{WEB_URL}}{% url 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 %}",
+ ajax_url: "{% 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 %}",
ajax_granularity : 300000,
- default_thumbnail : "{{WEB_URL}}{{LDT_MEDIA_PREFIX}}css/imgs/video_sequence.png",
+ default_thumbnail : '{% absstatic "ldt/css/imgs/video_sequence.png" %}',
show_audio: true,
rtmp_streamer: "rtmp://media.iri.centrepompidou.fr/ddc_micro_record/"
}{% endif %},{
@@ -147,7 +149,7 @@
{% if createannotation %},{
type: "CreateAnnotation",
- api_endpoint_template: "{{WEB_URL}}{% url api_dispatch_list resource_name='annotations' api_name='1.0' %}",
+ api_endpoint_template: "{% absurl api_dispatch_list resource_name='annotations' api_name='1.0' %}",
api_method: "PUT",
after_send_timeout: 8000,
{% if tag_titles %}
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_popup.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_popup.html Wed Nov 28 12:27:08 2012 +0100
@@ -1,13 +1,16 @@
{% extends "ldt/ldt_utils/workspace_base.html" %}
{% load i18n %}
{% load front_tags %}
+{% load absurl %}
+{% load static %}
+{% load absstatic %}
{% load analytics %}
{% block js_import %}
{{ block.super }}
- <script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/jquery.min.js"></script>
- <script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/jquery.qtip.min.js"></script>
- <script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/embed_popup.js"></script>
- <script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/jscolor/jscolor.js"></script>
+ <script type="text/javascript" src='{% absstatic "ldt/js/jquery.min.js" %}'></script>
+ <script type="text/javascript" src='{% absstatic "ldtjs/jquery.qtip.min.js" %}'></script>
+ <script type="text/javascript" src='{% absstatic "ldt/js/embed_popup.js" %}'></script>
+ <script type="text/javascript" src='{% absstatic "ldt/js/jscolor/jscolor.js" %}'></script>
{{ 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 }}
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/style.css" />
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/workspace.css" type="text/css"/>
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/embed_popup.css" type="text/css"/>
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/jq-css/jquery.qtip.css" type="text/css"/>
+ <link rel="stylesheet" href='{% absstatic "ldt/css/style.css" %}' />
+ <link rel="stylesheet" href='{% absstatic "ldt/css/workspace.css" %}'/>
+ <link rel="stylesheet" href='{% absstatic "ldt/css/embed_popup.css" %}'/>
+ <link rel="stylesheet" href='{% absstatic "ldt/css/jq-css/jquery.qtip.css" %}' type="text/css"/>
{% endblock %}
@@ -79,8 +91,8 @@
</div>
<div id="player_size">
{% trans 'Player Size : ' %}
- <input type="text" class="number_area" id="player_width" onchange="put_new_code();"></input> x
- <input type="text" class="number_area" id="player_height" onchange="put_new_code();"></input>
+ <input type="text" class="number_area" id="player_width" onChange="put_new_code();"></input> x
+ <input type="text" class="number_area" id="player_height" onChange="put_new_code();"></input>
</div>
<a id="displayPreMode" class="OptionsEmbedDisplay">
<span id= "preModeExpArrow" class="expArrow"></span>
@@ -208,7 +220,7 @@
<a id="displayPlayer" href="javascript:toggle();">{% trans 'Show Player' %}</a>
<div id="player_div" style="display:none">
<button type="button" class="refresh_button" id="refresh_player_button" title="Rafraichir le player" >
- <img src="{{LDT_MEDIA_PREFIX}}img/arrow_refresh.png" id="refresh_player" ></img>
+ <img src='{% absstatic "ldt/img/arrow_refresh.png" %}' id="refresh_player" ></img>
</button>
<div class="ldt_player" id="wrapper_{{player_id}}"></div>
</div>
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/error_confirm.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/error_confirm.html Wed Nov 28 12:27:08 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 }}
<script type="text/javascript" src="{% url ldt.jsi18n packages='ldt' %}" ></script>
- <script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/projectscontents.js"></script>
+ <script type="text/javascript" src='{% absstatic "ldt/js/projectscontents.js" %}'></script>
{% endblock %}
{% block css_import %}
{{ block.super }}
{{ content_form.media.css }}
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/ldtform.css" />
+ <link rel="stylesheet" href='{% absstatic "ldt/css/ldtform.css" %}' />
{% endblock %}
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/error_confirm_popup.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/error_confirm_popup.html Wed Nov 28 12:27:08 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 }}
<script type="text/javascript" src="{% url ldt.jsi18n packages='ldt' %}" ></script>
- <script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/projectscontents.js"></script>
+ <script type="text/javascript" src='{% absstatic "ldt/js/projectscontents.js" %}' ></script>
{% endblock %}
{% block css_import %}
{{ block.super }}
{{ content_form.media.css }}
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/ldt.css" />
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/ldtform.css" />
+ <link rel="stylesheet" href='{% absstatic "ldt/css/ldt.css" %}' />
+ <link rel="stylesheet" href='{% absstatic "ldt/css/ldtform.css" %}' />
{% endblock %}
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/groups.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/groups.html Wed Nov 28 12:27:08 2012 +0100
@@ -1,10 +1,10 @@
{% extends "ldt/ldt_base.html" %}
{% load i18n %}
-
+{% load absstatic %}
{% block js_import %}
{{block.super}}
<script type="text/javascript" src="{% url ldt.jsi18n packages='ldt' %}" ></script>
- <script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/projectscontents.js" ></script>
+ <script type="text/javascript" src='{% absstatic "ldt/js/projectscontents.js" %}' ></script>
{% endblock %}
{% block js_declaration %}
@@ -82,7 +82,7 @@
{% block css_import %}
{{block.super}}
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}/css/workspace.css" type="text/css"/>
+ <link rel="stylesheet" href='{% absstatic "ldt/css/workspace.css" %}' type="text/css"/>
{% endblock %}
{% block content %}
@@ -91,13 +91,13 @@
<div class="span-12 last titlediv" >
<div class="span-8 projectscontentstitle">{% trans "My groups" %}
{% if can_add_group %}
- <a class="create_group" href="{% url ldt.ldt_utils.views.group.create_group %}"><img class='icon_title' src="{{LDT_MEDIA_PREFIX}}img/group_add.png" alt="{% trans 'Create group' %}" title="{% trans 'Create group' %}" /></a>
+ <a class="create_group" href="{% url ldt.ldt_utils.views.group.create_group %}"><img class='icon_title' src='{% absstatic "ldt/img/group_add.png" %}' alt="{% trans 'Create group' %}" title="{% trans 'Create group' %}" /></a>
{% endif %}
</div>
<div class="span-4 last searchfielddiv" >
<div class="span-4 last searchfielddiv" >
- <div class="searchfield rounded"><input id="searchgroupsinput" class="searchfieldinput searchfieldinputbase" placeholder="{% trans 'search' %}" type="text" /><img id="projectsajaxloader" class="searchajaxloader" src="{{LDT_MEDIA_PREFIX}}/img/ajax-loader-16x16.gif" alt="loader"/><img id="projecsclear" class="searchclear" src="{{LDT_MEDIA_PREFIX}}img/clear-left.png"/></div>
+ <div class="searchfield rounded"><input id="searchgroupsinput" class="searchfieldinput searchfieldinputbase" placeholder="{% trans 'search' %}" type="text" /><img id="projectsajaxloader" class="searchajaxloader" src='{% absstatic "ldt/img/ajax-loader-16x16.gif" %}' alt="loader"/><img id="projecsclear" class="searchclear" src='{% absstatic "ldt/img/clear-left.png" %}'/></div>
</div>
</div>
</div>
@@ -109,7 +109,7 @@
<div class="span-12 last titlediv" >
<div class="span-8 projectscontentstitle" >{% trans "The group's projects" %}</div>
<div class="span-4 last searchfielddiv" >
- <div class="searchfield rounded"><input id="searchprojectsinput" class="searchfieldinput searchfieldinputbase" placeholder="{% trans 'search' %}" type="text" /><img id="projectsajaxloader" class="searchajaxloader" src="{{LDT_MEDIA_PREFIX}}/img/ajax-loader-16x16.gif" alt="loader"/><img id="projecsclear" class="searchclear" src="{{LDT_MEDIA_PREFIX}}img/clear-left.png"/></div>
+ <div class="searchfield rounded"><input id="searchprojectsinput" class="searchfieldinput searchfieldinputbase" placeholder="{% trans 'search' %}" type="text" /><img id="projectsajaxloader" class="searchajaxloader" src='{% absstatic "ldt/img/ajax-loader-16x16.gif" %}' alt="loader"/><img id="projecsclear" class="searchclear" src='{% absstatic "ldt/img/clear-left.png" %}' /></div>
</div>
</div>
<div class="span-12 last projectscontentsdiv" id="projectslistcontainer">
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/init_ldt.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/init_ldt.html Wed Nov 28 12:27:08 2012 +0100
@@ -1,3 +1,4 @@
+{% load absstatic %}
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -6,10 +7,10 @@
<meta http-equiv="Cache" content="no store" />
<meta http-equiv="Expires" content="-1" />
<title>Ligne de Temps - IRI</title>
-<script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/jquery.min.js"></script>
-<script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/jquery.nyroModal.min.js"></script>
+<script type="text/javascript" src='{% absstatic "ldt/js/jquery.min.js" %}'></script>
+<script type="text/javascript" src='{% absstatic "ldt/js/jquery.nyroModal.min.js" %}'></script>
<script type="text/javascript" src="{% url ldt.jsi18n packages='ldt' %}" ></script>
-<script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/projectscontents.js"></script>
+<script type="text/javascript" src='{% absstatic "ldt/js/projectscontents.js" %}'></script>
<script type="text/javascript">
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/ldt_list.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/ldt_list.html Wed Nov 28 12:27:08 2012 +0100
@@ -1,10 +1,10 @@
{% extends "ldt/ldt_base.html" %}
{% load i18n %}
-
+{% load absstatic %}
{% block js_import %}
{{block.super}}
<script type="text/javascript" src="{% url ldt.jsi18n packages='ldt' %}" ></script>
- <script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/projectscontents.js" ></script>
+ <script type="text/javascript" src='{% absstatic "ldt/js/projectscontents.js" %}' ></script>
{% endblock %}
@@ -68,7 +68,7 @@
{% block css_import %}
{{block.super}}
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}/css/workspace.css" type="text/css"/>
+ <link rel="stylesheet" href='{% absstatic "ldt/css/workspace.css" %}' type="text/css"/>
{% endblock %}
{% block content %}
@@ -77,7 +77,7 @@
<div class="span-12 last titlediv" >
<div class="span-8 projectscontentstitle" >{% trans "project list" %}</div>
<div class="span-4 last searchfielddiv" >
- <div class="searchfield rounded"><input id="searchprojectsinput" class="searchfieldinput searchfieldinputbase" value="{% trans 'search' %}" type="text" /><img id="projectsajaxloader" class="searchajaxloader" src="{{LDT_MEDIA_PREFIX}}/img/ajax-loader-16x16.gif"/><img id="projectsclear" class="searchclear" src="{{LDT_MEDIA_PREFIX}}/img/clear-left.png"/></div>
+ <div class="searchfield rounded"><input id="searchprojectsinput" class="searchfieldinput searchfieldinputbase" value="{% trans 'search' %}" type="text" /><img id="projectsajaxloader" class="searchajaxloader" src='{% absstatic "ldt/img/ajax-loader-16x16.gif" %}'/><img id="projectsclear" class="searchclear" src='{% absstatic "ldt/img/clear-left.png" %}'/></div>
</div>
</div>
<div class="span-12 last projectscontentsdiv" id="projectslistcontainer">
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/loading.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/loading.html Wed Nov 28 12:27:08 2012 +0100
@@ -1,3 +1,4 @@
+{% load absstatic %}
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<?xml version="1.0" encoding="UTF-8"?>
@@ -20,7 +21,7 @@
<body>
<div class="center">
<div><img alt="loading"
- src="{{LDT_MEDIA_PREFIX}}img/loadingAnimation.gif" /></div>
+ src='{% absstatic "ldt/img/loadingAnimation.gif" %}' /></div>
</div>
</body>
</html>
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/contentslist.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/contentslist.html Wed Nov 28 12:27:08 2012 +0100
@@ -1,6 +1,7 @@
{% load i18n %}
{% load thumbnail %}
{% load front_tags %}
+{% load absstatic %}
<ul class="prev_next_cont_proj" >
<li id="content_tags_li"><span id="content_tags" class="clickable">{% if tag_cloud|length > 0 %}{% trans 'All categories' %}{% endif %}</span>{% if current_content_tag %}{% if current_content_tag != "" %} > {{current_content_tag}} <span id="no_content_tag" class="clickable">[x]</span>{% endif %}{% endif %}</li>
@@ -25,8 +26,8 @@
<tbody class="projectscontentsbody">
{% for content in contents %}
<tr class="imageline {% cycle 'projectscontentsoddline' 'projectscontentsevenline'%}">
- <td class="cellimg"><div class="cellimgdiv"><img src="{{LDT_MEDIA_PREFIX}}/img/page_add.png" title="{% trans 'create project' %}" alt="{% trans 'create project' %}" href="{% url ldt.ldt_utils.views.project.create_project content.iri_id %}" class="ldt_link_create_project"/></div></td>
- <td class="cellimg"><div class="cellimgdiv"><img alt="{% trans 'preview media'%}" title="{% trans 'preview media'%}" src="{{LDT_MEDIA_PREFIX}}/img/control_play.png" href="{% url ldt.ldt_utils.views.lignesdetemps.index content.iri_id %}" class="ldt_link_open_ldt"/></div></td>
+ <td class="cellimg"><div class="cellimgdiv"><img src='{% absstatic "ldt/img/page_add.png" %}' title="{% trans 'create project' %}" alt="{% trans 'create project' %}" href="{% url ldt.ldt_utils.views.project.create_project content.iri_id %}" class="ldt_link_create_project"/></div></td>
+ <td class="cellimg"><div class="cellimgdiv"><img alt="{% trans 'preview media'%}" title="{% trans 'preview media'%}" src='{% absstatic "ldt/img/control_play.png" %}' href="{% url ldt.ldt_utils.views.lignesdetemps.index content.iri_id %}" class="ldt_link_open_ldt"/></div></td>
<td>{% thumbnail content.image "50x50" format="PNG" crop="top" as im %}<img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}">{% endthumbnail %}</td>
<td class="contenttitle"><a {% if content.change %} class="contenttitlelink infostooltip" href="{% url ldt.ldt_utils.views.content.write_content iri_id=content.iri_id %}" data-title="{{ content.title}}" data-desc="{{ content.description }}" {% else %} class="contenttitlelink qtiplink" title="{% trans "You can't edit this content" %}" {% endif %}>{{ content.title|default:"_" }}</a></td>
</tr>
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_player.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_player.html Wed Nov 28 12:27:08 2012 +0100
@@ -1,10 +1,12 @@
{% spaceless %}
{% load i18n %}
+{% load absurl %}
+{% load absstatic %}
{% load thumbnail %}
<div>
<div id="{{ player_id }}_embed" class="iri_player_embed">
</div>
-<script type="text/javascript" src="{{WEB_URL}}{{LDT_MEDIA_PREFIX}}metadataplayer/LdtPlayer-core.js"></script>
+<script type="text/javascript" src='{% absstatic "ldt/metadataplayer/LdtPlayer-core.js" %}'></script>
<script type="text/javascript">
if (typeof jQuery == "undefined") {
@@ -13,14 +15,14 @@
var metadatas = {metadata: {url: '{{json_url}}'}};
var metadata_key = "metadata";
-IriSP.libFiles.defaultDir = "{{WEB_URL}}{{LDT_MEDIA_PREFIX}}js/";
-IriSP.libFiles.locations.jwPlayerSWF = "{{WEB_URL}}{{LDT_MEDIA_PREFIX}}swf/player.swf";
-IriSP.libFiles.locations.recordMicSwf = "{{WEB_URL}}{{LDT_MEDIA_PREFIX}}swf/record_mic.swf";
-IriSP.libFiles.locations.zeroClipboardSwf = "{{WEB_URL}}{{LDT_MEDIA_PREFIX}}swf/ZeroClipboard10.swf";
-IriSP.libFiles.locations.cssjQueryUI = "{{WEB_URL}}{{LDT_MEDIA_PREFIX}}css/jq-css/themes/base/jquery-ui.css"
+IriSP.libFiles.defaultDir = '{% absstatic "ldt/js/" %}';
+IriSP.libFiles.locations.jwPlayerSWF = '{% absstatic "ldt/swf/player.swf" %}';
+IriSP.libFiles.locations.recordMicSwf = '{% absstatic "ldt/swf/record_mic.swf" %}';
+IriSP.libFiles.locations.zeroClipboardSwf = '{% absstatic "ldt/swf/ZeroClipboard10.swf" %}';
+IriSP.libFiles.locations.cssjQueryUI = '{% absstatic "ldt/css/jq-css/themes/base/jquery-ui.css" %}';
IriSP.language = '{{LANGUAGE_CODE}}';
-IriSP.widgetsDir = "{{WEB_URL}}{{LDT_MEDIA_PREFIX}}metadataplayer";
+IriSP.widgetsDir = '{% absstatic "ldt/metadataplayer" %}';
var _metadata = {
url: metadatas[metadata_key].url,
format: 'ldt'
@@ -28,7 +30,7 @@
var _config = {
width: '{{ player_width }}',
container: '{{ player_id }}_embed',
- css: '{{WEB_URL}}{{LDT_MEDIA_PREFIX}}metadataplayer/LdtPlayer-core.css',
+ css: '{% absstatic "ldt/metadataplayer/LdtPlayer-core.css" %}',
default_options: {
metadata: _metadata
},
@@ -66,9 +68,9 @@
},{
type: "AnnotationsList",
container: "AnnotationsList_ext",
- ajax_url: "{{WEB_URL}}{% url 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 %}",
+ ajax_url: "{% 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 %}",
ajax_granularity : 300000,
- default_thumbnail : "{{WEB_URL}}{{LDT_MEDIA_PREFIX}}css/imgs/video_sequence.png",
+ default_thumbnail : '{% absstatic "ldt/css/imgs/video_sequence.png" %}',
show_audio: true,
rtmp_streamer: "rtmp://media.iri.centrepompidou.fr/ddc_micro_record/"
},{
@@ -86,7 +88,7 @@
hide_timeout: 5000
},{
type: "CreateAnnotation",
- api_endpoint_template: "{{WEB_URL}}{% url api_dispatch_list resource_name='annotations' api_name='1.0' %}",
+ api_endpoint_template: "{% absurl api_dispatch_list resource_name='annotations' api_name='1.0' %}",
after_send_timeout: 8000,
show_mic_record: {% if show_mic_record %}true{% else %}false{% endif %},
close_after_send: false,
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/groupslist.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/groupslist.html Wed Nov 28 12:27:08 2012 +0100
@@ -1,12 +1,15 @@
{% load i18n %}
{% load thumbnail %}
+{% load absstatic %}
+{% load static %}
<script type="text/javascript">
$(document).ready(function () {
var icon_size = 16;
$(".editable").each(function () {
- var img = $('<img src="{{LDT_MEDIA_PREFIX}}img/pencil.png"/>');
+ var src='{% absstatic "ldt/img/pencil.png" %}';
+ var img = $('<img src='+src+' >');
var top = $(this).offset().top + $(this).height() - icon_size;
var left = $(this).offset().left + $(this).width() - icon_size;
img.css({'position' : 'absolute',
@@ -42,7 +45,7 @@
<td>{{ group.name }}</td>
{% endif %}
- <td class="align_right"><img src="{{LDT_MEDIA_PREFIX}}/img/control_play.png" class="next_icon"/></td>
+ <td class="align_right"><img src='{% absstatic "ldt/img/control_play.png" %}' class="next_icon"/></td>
</tr>
{% endfor %}
@@ -54,7 +57,7 @@
</td>
<td>{% trans "Projects shared with me only" %}</td>
- <td class="align_right"><img src="{{LDT_MEDIA_PREFIX}}/img/control_play.png" class="next_icon"/></td>
+ <td class="align_right"><img src='{% absstatic "ldt/img/control_play.png" %}' class="next_icon"/></td>
</tr>
{% endif %}
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/ldt_div.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/ldt_div.html Wed Nov 28 12:27:08 2012 +0100
@@ -1,7 +1,9 @@
+{% load absurl %}
+{% load absstatic %}
{% comment %}
Yes we include swfobject.js in the middle of the page...
{% endcomment %}
-<script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/swfobject.js"></script>
+<script type="text/javascript" src='{% absstatic "ldt/js/swfobject.js" %}'></script>
<div id="ldtInit" name="ldtInit" style="background-color: #00FF00; width: 1201px; height: 831px; left: 100px; top: 100px; z-index: 99999999; margin: 0; padding: 0;"> </div>
<script language="JavaScript" type="text/javascript">
@@ -27,14 +29,14 @@
{% else %}
readOnly:'true',
{% endifequal %}
- segmentPassMask:"{{WEB_URL}}{% url ldt.ldt_utils.views.lignesdetemps.index_segment '{4}' '{0}' '{1}' '{2}' '{3}' %}",
- simplePlayerPassMask:"{{WEB_URL}}{% url ldt.ldt_utils.views.front.annot_content '{0}' '{4}' '{2}' %}#id={3}"
+ segmentPassMask:"{% absurl ldt.ldt_utils.views.lignesdetemps.index_segment '{4}' '{0}' '{1}' '{2}' '{3}' %}",
+ simplePlayerPassMask:"{% absurl ldt.ldt_utils.views.front.annot_content '{0}' '{4}' '{2}' %}#id={3}"
};
var attributes = { id: "ldtInitSwf", name: "ldtInitSwf"};
- swfobject.embedSWF("{{LDT_MEDIA_PREFIX}}swf/ldt/LignesDeTempsFlex.swf", "ldtInit", "1000", "630", "10.2.0", "{{LDT_MEDIA_PREFIX}}swf/expressInstall.swf", flashvars, params, attributes);
+ swfobject.embedSWF('{% absstatic "ldt/swf/ldt/LignesDeTempsFlex.swf" %}', "ldtInit", "1000", "630", "10.2.0", '{% absstatic "ldt/swf/expressInstall.swf" %}', flashvars, params, attributes);
</script>
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/permissions.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/permissions.html Wed Nov 28 12:27:08 2012 +0100
@@ -1,6 +1,7 @@
{% load i18n %}
+{% load absstatic %}
-<script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/jquery-ui.min.js"></script>
+<script type="text/javascript" src='{% absstatic "ldt/js/jquery-ui.min.js" %}'></script>
<script type="text/javascript">
function init_events() {
@@ -17,8 +18,8 @@
}
$(document).ready(function() {
- var can_edit = '{{LDT_MEDIA_PREFIX}}img/pencil.png';
- var can_view = '{{LDT_MEDIA_PREFIX}}img/eye.png';
+ var can_edit = '{% absstatic "ldt/img/pencil.png" %}';
+ var can_view = '{% absstatic "ldt/img/eye.png" %}';
{% if group_edition %}
var search_url = "{% url ldt.ldt_utils.views.workspace.share_filter filter='__FILTER__' use_groups='false' %}";
@@ -75,8 +76,9 @@
selection.each(function () {
var id_item = $("input",$(this)).val();
+ var eye_img = '{% absstatic "ldt/img/eye.png" %}';
$("#read").append('<input type="hidden" name="read_list" value="' + id_item + '"/>');
- $("td:last",$(this)).append('<img class="can_view" src="{{LDT_MEDIA_PREFIX}}img/eye.png" title="{% trans "share.eye" %}" alt="{% trans "share.eye" %}"/>');
+ $("td:last",$(this)).append('<img class="can_view" src="'+eye_img+'" title="{% trans "share.eye" %}" alt="{% trans "share.eye" %}"/>');
});
});
@@ -107,7 +109,7 @@
{% if not group_edition %}
<div id="shareproject" class="clear dropdownlist">
-<img class="shareicon" src="{{LDT_MEDIA_PREFIX}}img/user_add.png" />{% trans "share" %}
+<img class="shareicon" src='{% absstatic "ldt/img/user_add.png" %}' />{% trans "share" %}
</div>
{% endif %}
@@ -129,8 +131,8 @@
{% trans "User and group list" %}<br />
<div class="searchfield span-4">
<input type="text" name="search" id="searchuserinput" class="searchfieldinput searchfieldinputbase" placeholder="{% trans 'search' %}"/>
- <img id="projectsajaxloader" class="searchajaxloader" src="{{LDT_MEDIA_PREFIX}}/img/ajax-loader-16x16.gif" alt="loader"/>
- <img id="projecsclear" class="searchclear" src="{{LDT_MEDIA_PREFIX}}img/clear-left.png"/>
+ <img id="projectsajaxloader" class="searchajaxloader" src='{% absstatic "ldt/img/ajax-loader-16x16.gif" %}' alt="loader"/>
+ <img id="projecsclear" class="searchclear" src='{% absstatic "ldt/img/clear-left.png" %}'/>
</div>
</div><br /><br />
@@ -141,13 +143,13 @@
</div>
<div id="elemslistfooter">
- <a href="#" id="selectallitems" title="{% trans "select all displayed elements" %}"><img class="shareicon" src="{{LDT_MEDIA_PREFIX}}img/user_go.png" title="{% trans "select all displayed elements" %}"/>{% trans "select all displayed elements" %}</a>
+ <a href="#" id="selectallitems" title="{% trans "select all displayed elements" %}"><img class="shareicon" src='{% absstatic "ldt/img/user_go.png" %}' title="{% trans "select all displayed elements" %}"/>{% trans "select all displayed elements" %}</a>
</div>
</div>
<div id="selectors">
- <a href="#" id="selectelems"><img src="{{LDT_MEDIA_PREFIX}}img/to-right.gif" title="{% trans "select users" %}"></a><br />
- <a href="#" id="removeelems"><img src="{{LDT_MEDIA_PREFIX}}img/to-left.gif" title="{% trans "remove users" %}"></a>
+ <a href="#" id="selectelems"><img src='{% absstatic "ldt/img/to-right.gif" %}' title="{% trans "select users" %}"></a><br />
+ <a href="#" id="removeelems"><img src='{% absstatic "ldt/img/to-left.gif" %}' title="{% trans "remove users" %}"></a>
</div>
{% if media_form %}
<br /> <br />
@@ -164,18 +166,18 @@
<tr class="shareline">
<td style="width: 5%;">
{% if elem.type == "user" %}
- <img src="{{LDT_MEDIA_PREFIX}}img/user.png" alt="{% trans "user" %}"/>
+ <img src='{% absstatic "ldt/img/user.png" %}' alt="{% trans "user" %}"/>
{% else %}
- <img src="{{LDT_MEDIA_PREFIX}}img/group.png" alt="{% trans "group" %}"/>
+ <img src='{% absstatic "ldt/img/group.png" %}' alt="{% trans "group" %}"/>
{% endif %}
</td>
<td style="width: 95%;">{{ elem.name }}</td>
<td>
{% if elem.change %}
- <img class="can_edit" src="{{LDT_MEDIA_PREFIX}}img/pencil.png" alt="{% trans "share.pencil" %}" />
+ <img class="can_edit" src='{% absstatic "ldt/img/pencil.png" %}' alt="{% trans "share.pencil" %}" />
{% else %}
- <img class="can_view" src="{{LDT_MEDIA_PREFIX}}img/eye.png" alt="{% trans "share.eye" %}" />
+ <img class="can_view" src='{% absstatic "ldt/img/eye.png" %}' alt="{% trans "share.eye" %}" />
{% endif %}
</td>
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/picture.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/picture.html Wed Nov 28 12:27:08 2012 +0100
@@ -1,6 +1,6 @@
{% load i18n %}
{% load thumbnail %}
-
+{% load absstatic %}
<script type="text/javascript">
$(document).ready(function () {
@@ -13,7 +13,7 @@
</script>
<div class="clear dropdownlist">
-<img class="shareicon" title="{% trans "choose a profile image" %}" src="{{LDT_MEDIA_PREFIX}}img/zoom_in.png"/>
+<img class="shareicon" title="{% trans "choose a profile image" %}" src='{% absstatic "ldt/img/zoom_in.png" %}'/>
{% trans "choose a profile image" %}
</div>
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html Wed Nov 28 12:27:08 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 %}
<td class="cellimg"><div class="cellimgdiv"><a href="{% url index_project_full project.ldt_id %}">
{% if project.change and project.state != 2 %}
- <img src="{{LDT_MEDIA_PREFIX}}img/page_edit.png" alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/>
+ <img src='{% absstatic "ldt/img/page_edit.png" %}' alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/>
{% else %}
- <img src="{{LDT_MEDIA_PREFIX}}img/page_eye.png" alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/>
+ <img src='{% absstatic "ldt/img/page_eye.png" %}' alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/>
{% endif %}
</a></div></td>
{% else %}
<td class="cellimg"><div class="cellimgdiv"><a href="{% url index_project project.ldt_id %}" class="ldt_link_open_ldt">
{% if project.change and project.state != 2 %}
- <img src="{{LDT_MEDIA_PREFIX}}img/page_edit.png" alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/>
+ <img src='{% absstatic "ldt/img/page_edit.png" %}' alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/>
{% else %}
- <img src="{{LDT_MEDIA_PREFIX}}img/page_eye.png" alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/>
+ <img src='{% absstatic "ldt/img/page_eye.png" %}' alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/>
{% endif %}
</a></div></td>
{% endif %}
- <td class="cellimg"><div class="cellimgdiv"><img src="{{LDT_MEDIA_PREFIX}}img/page_copy.png" href="{% url ldt.ldt_utils.views.project.copy_project project.ldt_id group_id %}" class="ldt_link_copy_project" alt="{% trans 'copy project' %}" title="{% trans 'copy project' %}"/></div></td>
+ <td class="cellimg"><div class="cellimgdiv"><img src='{% absstatic "ldt/img/page_copy.png" %}' href="{% url ldt.ldt_utils.views.project.copy_project project.ldt_id group_id %}" class="ldt_link_copy_project" alt="{% trans 'copy project' %}" title="{% trans 'copy project' %}"/></div></td>
<td class="cellimg"><div class="cellimgdiv">
<a href='{% url ldt.ldt_utils.views.workspace.popup_embed %}?json_url={{WEB_URL}}{{json_url_id}}&player_id=player_project_{{project.ldt_id}}&ldt_id={{project.ldt_id}}'>
- <img src="{{LDT_MEDIA_PREFIX}}img/plugin.png" id="player_project_{{project.ldt_id}}" class="ldt_link_embed" alt="{% trans 'link json by id' %}" title="{% trans 'link json by id' %}"/></div>
+ <img src='{% absstatic "ldt/img/plugin.png" %}' id="player_project_{{project.ldt_id}}" class="ldt_link_embed" alt="{% trans 'link json by id' %}" title="{% trans 'link json by id' %}"/></div>
</a>
</td>
<td class="cellimg">
{% ifequal project.state 2 %}
- <img src="{{LDT_MEDIA_PREFIX}}img/icon-yes.gif" {% if project.change %} alt="{% trans 'Project published, click to unpublish' %}" title="{% trans 'Project published, click to unpublish' %}" class="publishedproject qtiplink" {% else %} class="qtiplink" title="{% trans "You are not allowed to change this project" %}"{% endif %} id="project_{{project.ldt_id}}" /></div>
+ <img src='{% absstatic "ldt/img/icon-yes.gif" %}' {% if project.change %} alt="{% trans 'Project published, click to unpublish' %}" title="{% trans 'Project published, click to unpublish' %}" class="publishedproject qtiplink" {% else %} class="qtiplink" title="{% trans "You are not allowed to change this project" %}"{% endif %} id="project_{{project.ldt_id}}" /></div>
{% else %}
- <img src="{{LDT_MEDIA_PREFIX}}img/icon-no.gif" {% if project.change %} alt="{% trans 'Project not published, click to publish' %}" title="{% trans 'Project not published, click to publish' %}" class="unpublishedproject qtiplink" {% else %} class="qtiplink" title="{% trans "You are not allowed to change this project" %}"{% endif %}id="project_{{project.ldt_id}}" />
+ <img src='{% absstatic "ldt/img/icon-no.gif" %}' {% if project.change %} alt="{% trans 'Project not published, click to publish' %}" title="{% trans 'Project not published, click to publish' %}" class="unpublishedproject qtiplink" {% else %} class="qtiplink" title="{% trans "You are not allowed to change this project" %}"{% endif %}id="project_{{project.ldt_id}}" />
{% endifequal %}
</td>
<td>{% thumbnail project.image "50x50" crop="center" format="PNG" as im %}<img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" />{% empty %} {% endthumbnail %}</td>
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/publishedprojectslist.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/publishedprojectslist.html Wed Nov 28 12:27:08 2012 +0100
@@ -1,6 +1,7 @@
{% load i18n %}
{% load thumbnail %}
{% load front_tags %}
+{% load absstatic %}
{% if nb_pj_pages %}
<ul class="prev_next_cont_proj" >
@@ -18,14 +19,14 @@
<tr class="imageline {% cycle 'projectscontentsoddline' 'projectscontentsevenline'%}" >
{% url ldt.ldt_utils.views.json.project_json_id project.ldt_id as json_url_id %}
{% if is_gecko %}
- <td class="cellimg"><div class="cellimgdiv"><a href="{% url index_project_full project.ldt_id %}"><img src="{{LDT_MEDIA_PREFIX}}img/page_eye.png" alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/></a></div></td>
+ <td class="cellimg"><div class="cellimgdiv"><a href="{% url index_project_full project.ldt_id %}"><img src='{% absstatic "ldt/img/page_eye.png" %}' alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/></a></div></td>
{% else %}
- <td class="cellimg"><div class="cellimgdiv"><a href="{% url index_project project.ldt_id %}" class="ldt_link_open_ldt"><img src="{{LDT_MEDIA_PREFIX}}img/page_eye.png" alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/></a></div></td>
+ <td class="cellimg"><div class="cellimgdiv"><a href="{% url index_project project.ldt_id %}" class="ldt_link_open_ldt"><img src='{% absstatic "ldt/img/page_eye.png" %}' alt="{% trans 'open ldt' %}" title="{% trans 'open ldt' %}"/></a></div></td>
{% endif %}
- <td class="cellimg"><div class="cellimgdiv"><img src="{{LDT_MEDIA_PREFIX}}img/page_copy.png" href="{% url ldt.ldt_utils.views.project.copy_project project.ldt_id %}" class="ldt_link_copy_project" alt="{% trans 'copy the project' %}" title="{% trans 'copy the project' %}"/></div></td>
- <td class="cellimg"><div class="cellimgdiv"><img src="{{LDT_MEDIA_PREFIX}}img/plugin.png" href="{{WEB_URL}}{{json_url_id}}" id="player_project_{{project.ldt_id}}" class="ldt_link_embed" alt="{% trans 'link json by id' %}" title="{% trans 'link json by id' %}"/></div></td>
+ <td class="cellimg"><div class="cellimgdiv"><img src='{% absstatic "ldt/img/page_copy.png" %}' href="{% url ldt.ldt_utils.views.project.copy_project project.ldt_id %}" class="ldt_link_copy_project" alt="{% trans 'copy the project' %}" title="{% trans 'copy the project' %}"/></div></td>
+ <td class="cellimg"><div class="cellimgdiv"><img src='{% absstatic "ldt/img/plugin.png" %}' href="{{WEB_URL}}{{json_url_id}}" id="player_project_{{project.ldt_id}}" class="ldt_link_embed" alt="{% trans 'link json by id' %}" title="{% trans 'link json by id' %}"/></div></td>
<td class="cellimg">
- <img src="{{LDT_MEDIA_PREFIX}}img/icon-yes.gif" alt="{% trans 'Project published' %}" id="project_{{project.ldt_id}}" />
+ <img src='{% absstatic "ldt/img/icon-yes.gif" %}' alt="{% trans 'Project published' %}" id="project_{{project.ldt_id}}" />
</td>
<td>{% thumbnail project.image "50x50" crop="center" format="PNG" as im %}<img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" />{% empty %} {% endthumbnail %}</td>
<td class="projecttitle">
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/sharewith.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/sharewith.html Wed Nov 28 12:27:08 2012 +0100
@@ -1,12 +1,12 @@
{% load i18n %}
-
+{% load absstatic %}
{% for res in elem_list %}
<tr class="shareline">
<td class="firstcolsharetable">
{% if res.type == "user" %}
- <img src="{{LDT_MEDIA_PREFIX}}img/user.png" alt="{% trans "user" %}"/>
+ <img src='{% absstatic "ldt/img/user.png" %}' alt="{% trans "user" %}"/>
{% else %}
- <img src="{{LDT_MEDIA_PREFIX}}img/group.png" alt={% trans "group" %}"/>
+ <img src='{% absstatic "ldt/img/group.png" %}' alt={% trans "group" %}"/>
{% endif %}
</td>
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/published_projects.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/published_projects.html Wed Nov 28 12:27:08 2012 +0100
@@ -1,10 +1,10 @@
{% extends "ldt/ldt_base.html" %}
{% load i18n %}
-
+{% load absstatic %}
{% block js_import %}
{{block.super}}
<script type="text/javascript" src="{% url ldt.jsi18n packages='ldt' %}" ></script>
- <script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/projectscontents.js" ></script>
+ <script type="text/javascript" src='{% absstatic "ldt/js/projectscontents.js" %}' ></script>
{% endblock %}
{% block js_declaration %}
@@ -43,7 +43,7 @@
{% block css_import %}
{{block.super}}
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}/css/workspace.css" type="text/css"/>
+ <link rel="stylesheet" href='{% absstatic "ldt/css/workspace.css" %}' type="text/css"/>
{% endblock %}
{% block content %}
@@ -65,9 +65,9 @@
<div class="span-12 last" id="projectsdiv">
<div class="span-12 last titlediv" >
<div class="span-8 projectscontentstitle" >{% trans "Published projects" %}
- <a class='ldt_link_create_project' href="{% url ldt.ldt_utils.views.project.create_ldt_view %}" ><img class='icon_title' src="{{LDT_MEDIA_PREFIX}}img/page_add_large.png" alt="{% trans 'Create project' %}" title="{% trans 'Create project' %}" /></a></div>
+ <a class='ldt_link_create_project' href="{% url ldt.ldt_utils.views.project.create_ldt_view %}" ><img class='icon_title' src='{% absstatic "ldt/img/page_add_large.png" %}' alt="{% trans 'Create project' %}" title="{% trans 'Create project' %}" /></a></div>
<div class="span-4 last searchfielddiv" >
- <div class="searchfield rounded"><input id="searchprojectsinput" class="searchfieldinput searchfieldinputbase" placeholder="{% trans 'search' %}" type="text" /><img id="projectsajaxloader" class="searchajaxloader" src="{{LDT_MEDIA_PREFIX}}/img/ajax-loader-16x16.gif" alt="loader"/><img id="projecsclear" class="searchclear" src="{{LDT_MEDIA_PREFIX}}img/clear-left.png"/></div>
+ <div class="searchfield rounded"><input id="searchprojectsinput" class="searchfieldinput searchfieldinputbase" placeholder="{% trans 'search' %}" type="text" /><img id="projectsajaxloader" class="searchajaxloader" src='{% absstatic "ldt/img/ajax-loader-16x16.gif" %}' alt="loader"/><img id="projecsclear" class="searchclear" src='{% absstatic "ldt/img/clear-left.png" %}'/></div>
</div>
</div>
<div class="span-12 last projectscontentsdiv" id="projectslistcontainer">
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/reset_confirm.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/reset_confirm.html Wed Nov 28 12:27:08 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 }}
<script type="text/javascript" src="{% url ldt.jsi18n packages='ldt' %}" ></script>
- <script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/projectscontents.js"></script>
+ <script type="text/javascript" src='{% absstatic "ldt/js/projectscontents.js" %}'></script>
{% endblock %}
{% block css_import %}
{{ block.super }}
{{ content_form.media.css }}
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/ldt.css" />
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/ldtform.css" />
+ <link rel="stylesheet" href='{% absstatic "ldt/css/ldt.css" %}' />
+ <link rel="stylesheet" href='{% absstatic "ldt/css/ldtform.css" %}' />
{% endblock %}
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/reset_confirm_popup.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/reset_confirm_popup.html Wed Nov 28 12:27:08 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 }}
<script type="text/javascript" src="{% url ldt.jsi18n packages='ldt' %}" ></script>
- <script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/projectscontents.js"></script>
+ <script type="text/javascript" src='{% absstatic "ldt/js/projectscontents.js" %}'></script>
{% endblock %}
{% block css_import %}
{{ block.super }}
{{ content_form.media.css }}
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/ldt.css" />
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/ldtform.css" />
+ <link rel="stylesheet" href='{% absstatic "ldt/css/ldt.css" %}' />
+ <link rel="stylesheet" href='{% absstatic "ldt/css/ldtform.css" %}' />
{% endblock %}
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/search_results.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/search_results.html Wed Nov 28 12:27:08 2012 +0100
@@ -1,15 +1,15 @@
{% extends "ldt/ldt_base.html" %}
{% load i18n %}
-
+{% load absstatic %}
{% block js_import %}
{{ block.super }}
<script type="text/javascript" src="{% url ldt.jsi18n packages='ldt' %}" ></script>
- <script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/projectscontents.js" ></script>
+ <script type="text/javascript" src='{% absstatic "ldt/js/projectscontents.js" %}'></script>
{% endblock %}
{% block css_import %}
{{ block.super }}
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/workspace.css" />
+ <link rel="stylesheet" href='{% absstatic "ldt/css/workspace.css" %}' />
<style type="text/css">
.titleresults {
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/workspace_base.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/workspace_base.html Wed Nov 28 12:27:08 2012 +0100
@@ -1,10 +1,10 @@
{% extends "ldt/ldt_base.html" %}
{% load i18n %}
-
+{% load absstatic %}
{% block js_import %}
{{block.super}}
<script type="text/javascript" src="{% url ldt.jsi18n packages='ldt' %}" ></script>
- <script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/projectscontents.js" ></script>
+ <script type="text/javascript" src='{% absstatic "ldt/js/projectscontents.js" %}'></script>
{% endblock %}
@@ -42,7 +42,7 @@
{% block css_import %}
{{block.super}}
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}/css/workspace.css" type="text/css"/>
+ <link rel="stylesheet" href='{% absstatic "ldt//css/workspace.css" %}' type="text/css"/>
{% endblock %}
{% block content %}
@@ -50,12 +50,12 @@
<div class="span-12" id="contentsdiv">
<div class="span-12 last titlediv" >
<div class="span-8 projectscontentstitle">{% trans "content list" %}
- <a class='content_link_create' href="{% url ldt.ldt_utils.views.content.write_content %}" ><img class='icon_title' src="{{LDT_MEDIA_PREFIX}}img/film_add.png" alt="{% trans 'Create content' %}" title="{% trans 'Create content' %}" /></a></div>
+ <a class='content_link_create' href="{% url ldt.ldt_utils.views.content.write_content %}" ><img class='icon_title' src='{% absstatic "ldt/img/film_add.png" %}' alt="{% trans 'Create content' %}" title="{% trans 'Create content' %}" /></a></div>
<div class="span-4 last searchfielddiv" >
<div class="searchfield rounded">
<input id="searchcontentsinput" class="searchfieldinput searchfieldinputbase" placeholder="{% trans 'search' %}" type="text" />
- <img id="contentsajaxloader" class="searchajaxloader" src="{{LDT_MEDIA_PREFIX}}/img/ajax-loader-16x16.gif" alt="loader"/>
- <img id="contentsclear" class="searchclear" src="{{LDT_MEDIA_PREFIX}}img/clear-left.png"/>
+ <img id="contentsajaxloader" class="searchajaxloader" src='{% absstatic "ldt//img/ajax-loader-16x16.gif" %}' alt="loader"/>
+ <img id="contentsclear" class="searchclear" src='{% absstatic "ldt/img/clear-left.png" %}' />
</div>
</div>
</div>
@@ -66,9 +66,9 @@
<div class="span-12 last" id="projectsdiv">
<div class="span-12 last titlediv" >
<div class="span-8 projectscontentstitle" >{% trans "My projects" %}
- <a class='ldt_link_create_project' href="{% url ldt.ldt_utils.views.project.create_ldt_view %}" ><img class='icon_title' src="{{LDT_MEDIA_PREFIX}}img/page_add_large.png" alt="{% trans 'Create project' %}" title="{% trans 'Create project' %}" /></a></div>
+ <a class='ldt_link_create_project' href="{% url ldt.ldt_utils.views.project.create_ldt_view %}" ><img class='icon_title' src='{% absstatic "ldt/img/page_add_large.png" %}' alt="{% trans 'Create project' %}" title="{% trans 'Create project' %}" /></a></div>
<div class="span-4 last searchfielddiv" >
- <div class="searchfield rounded"><input id="searchprojectsinput" class="searchfieldinput searchfieldinputbase" placeholder="{% trans 'search' %}" type="text" /><img id="projectsajaxloader" class="searchajaxloader" src="{{LDT_MEDIA_PREFIX}}/img/ajax-loader-16x16.gif" alt="loader"/><img id="projecsclear" class="searchclear" src="{{LDT_MEDIA_PREFIX}}img/clear-left.png"/></div>
+ <div class="searchfield rounded"><input id="searchprojectsinput" class="searchfieldinput searchfieldinputbase" placeholder="{% trans 'search' %}" type="text" /><img id="projectsajaxloader" class="searchajaxloader" src='{% absstatic "ldt//img/ajax-loader-16x16.gif" %}' alt="loader"/><img id="projecsclear" class="searchclear" src='{% absstatic "ldt/img/clear-left.png" %}'/></div>
</div>
</div>
<div class="span-12 last projectscontentsdiv" id="projectslistcontainer">
--- a/src/ldt/ldt/ldt_utils/urls.py Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/urls.py Wed Nov 28 12:27:08 2012 +0100
@@ -34,7 +34,7 @@
url(r'^filtergroups/_(?P<filter>[\w\%\_\-\+]*?)/$', "views.group.groups_filter",),
url(r'filtershare/_(?P<filter>[\w\%\_\-\+]*?)/(?P<use_groups>true|false)$', "views.workspace.share_filter"),
url(r'^embedpopup/?$', "views.workspace.popup_embed"),
- url(r'^embediframe/?$', "views.workspace.iframe_embed"),
+ url(r'^embediframe/?$', "views.workspace.iframe_embed", name="embediframe_page"),
url(r'^segment/(?P<project_id>.*)/(?P<content_id>.*)/(?P<ensemble_id>.*)/(?P<cutting_id>.*)/(?P<segment_id>.*)/$', 'views.lignesdetemps.index_segment'),
url(r'^segmentInit/(?P<project_id>.*)/(?P<content_id>.*)/(?P<ensemble_id>.*)/(?P<cutting_id>.*)/(?P<segment_id>.*)/$', 'views.lignesdetemps.init_segment'),
url(r'^segmentLdt/(?P<project_id>.*)/(?P<content_id>.*)/(?P<ensemble_id>.*)/(?P<cutting_id>.*)/(?P<segment_id>.*)/$', 'views.lignesdetemps.ldt_segment'),
--- a/src/ldt/ldt/ldt_utils/views/front.py Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/views/front.py Wed Nov 28 12:27:08 2012 +0100
@@ -11,6 +11,8 @@
from ldt.ldt_utils.views.content import get_content_tags
from ldt.ldt_utils.views.workspace import get_search_results
from tagging.models import Tag, TaggedItem
+from django.contrib.sites.models import Site
+from django.template import Context, Template
import base64
@@ -143,7 +145,30 @@
search = ''
field = 'all'
content_tag = None
-
+ context_color = Context({})
+ template_colorurl_string = """
+ {% load absstatic %}
+ {% absstatic "ldt/swf/ldt/pkg/color.xml" %}
+ """
+ t_colorurl = Template(template_colorurl_string)
+ t_colorurl_render = t_colorurl.render(context_color)
+ colorurl=t_colorurl_render.strip()
+ context_i18nurl = Context({})
+ template_i18nurl_string = """
+ {% load absstatic %}
+ {% absstatic "ldt/swf/ldt/pkg/i18n" %}
+ """
+ t_i18nurl = Template(template_i18nurl_string)
+ t_i18nurl_render = t_i18nurl.render(context_i18nurl)
+ i18nurl=t_i18nurl_render.strip()
+ context_baseurl = Context({})
+ template_baseurl_string = """
+ {% load absstatic %}
+ {% absstatic "ldt/swf/ldt/" %}
+ """
+ t_baseurl = Template(template_baseurl_string)
+ t_baseurl_render = t_baseurl.render(context_i18nurl)
+ baseurl=t_baseurl_render.strip()
sform = SearchForm(request.GET)
if sform.is_valid():
search = sform.cleaned_data["search"]
@@ -156,7 +181,7 @@
content_list = TaggedItem.objects.get_by_model(Content.objects.all(), '"'+content_tag+'"')
results, nb = get_search_results(request, search, field, page, content_list)
- return render_to_response('front/front_search_results.html', {'results': results, 'nb_results' : nb, 'search' : search, 'field': field, 'tag_label':content_tag, 'LDT_MEDIA_PREFIX': settings.LDT_MEDIA_PREFIX, 'colorurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/color.xml', 'i18nurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/i18n', 'language': language_code, 'baseurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/'}, context_instance=RequestContext(request))
+ return render_to_response('front/front_search_results.html', {'results': results, 'nb_results' : nb, 'search' : search, 'field': field, 'tag_label':content_tag, 'colorurl': colorurl, 'i18nurl': i18nurl, 'language': language_code, 'baseurl': baseurl}, context_instance=RequestContext(request))
--- a/src/ldt/ldt/ldt_utils/views/lignesdetemps.py Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/views/lignesdetemps.py Wed Nov 28 12:27:08 2012 +0100
@@ -13,14 +13,39 @@
import base64
import django.core.urlresolvers
import lxml.etree
-
+from django.contrib.sites.models import Site
+from django.template import Context, Template
def search_index_get(request, field, query):
language_code = request.LANGUAGE_CODE[:2]
url = settings.WEB_URL + django.core.urlresolvers.reverse("ldt.ldt_utils.views.lignesdetemps.search_init", args=[field, query])
- return render_to_response('ldt/ldt_utils/init_ldt.html', {'LDT_MEDIA_PREFIX': settings.LDT_MEDIA_PREFIX, 'colorurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/color.xml', 'i18nurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/i18n', 'language': language_code, 'baseurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/', 'url': url}, context_instance=RequestContext(request))
+ context_color = Context({})
+ template_colorurl_string = """
+ {% load absstatic %}
+ {% absstatic "ldt/swf/ldt/pkg/color.xml" %}
+ """
+ t_colorurl = Template(template_colorurl_string)
+ t_colorurl_render = t_colorurl.render(context_color)
+ colorurl=t_colorurl_render.strip()
+ context_i18nurl = Context({})
+ template_i18nurl_string = """
+ {% load absstatic %}
+ {% absstatic "ldt/swf/ldt/pkg/i18n" %}
+ """
+ t_i18nurl = Template(template_i18nurl_string)
+ t_i18nurl_render = t_i18nurl.render(context_i18nurl)
+ i18nurl=t_i18nurl_render.strip()
+ context_baseurl = Context({})
+ template_baseurl_string = """
+ {% load absstatic %}
+ {% absstatic "ldt/swf/ldt/" %}
+ """
+ t_baseurl = Template(template_baseurl_string)
+ t_baseurl_render = t_baseurl.render(context_i18nurl)
+ baseurl=t_baseurl_render.strip()
+ return render_to_response('ldt/ldt_utils/init_ldt.html', {'colorurl': colorurl, 'i18nurl': i18nurl, 'language': language_code, 'baseurl': baseurl, 'url': url}, context_instance=RequestContext(request))
def search_init(request, field, query):
@@ -82,8 +107,31 @@
language_code = request.LANGUAGE_CODE[:2]
readonly = 'true'
template_path = 'ldt/ldt_utils/init_ldt.html'
-
- return render_to_response(template_path, {'LDT_MEDIA_PREFIX': settings.LDT_MEDIA_PREFIX, 'colorurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/color.xml', 'i18nurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/i18n', 'language': language_code, 'baseurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/', 'url': url_str, 'posturl': post_url, 'id': id, 'readonly': readonly}, context_instance=RequestContext(request))
+ context_color = Context({})
+ template_colorurl_string = """
+ {% load absstatic %}
+ {% absstatic "ldt/swf/ldt/pkg/color.xml" %}
+ """
+ t_colorurl = Template(template_colorurl_string)
+ t_colorurl_render = t_colorurl.render(context_color)
+ colorurl=t_colorurl_render.strip()
+ context_i18nurl = Context({})
+ template_i18nurl_string = """
+ {% load absstatic %}
+ {% absstatic "ldt/swf/ldt/pkg/i18n" %}
+ """
+ t_i18nurl = Template(template_i18nurl_string)
+ t_i18nurl_render = t_i18nurl.render(context_i18nurl)
+ i18nurl=t_i18nurl_render.strip()
+ context_baseurl = Context({})
+ template_baseurl_string = """
+ {% load absstatic %}
+ {% absstatic "ldt/swf/ldt/" %}
+ """
+ t_baseurl = Template(template_baseurl_string)
+ t_baseurl_render = t_baseurl.render(context_i18nurl)
+ baseurl=t_baseurl_render.strip()
+ return render_to_response(template_path, {'colorurl': colorurl, 'i18nurl': i18nurl, 'language': language_code, 'baseurl': baseurl, 'url': url_str, 'posturl': post_url, 'id': id, 'readonly': readonly}, context_instance=RequestContext(request))
def init_segment(request, project_id, content_id, ensemble_id, cutting_id, segment_id):
@@ -179,7 +227,30 @@
urlStr = settings.WEB_URL + reverse("ldt.ldt_utils.views.lignesdetemps.init", args=['ldt_project', id])
posturl = settings.WEB_URL + reverse("ldt.ldt_utils.views.lignesdetemps.save_ldt_project")
language_code = request.LANGUAGE_CODE[:2]
-
+ context_color = Context({})
+ template_colorurl_string = """
+ {% load absstatic %}
+ {% absstatic "ldt/swf/ldt/pkg/color.xml" %}
+ """
+ t_colorurl = Template(template_colorurl_string)
+ t_colorurl_render = t_colorurl.render(context_color)
+ colorurl=t_colorurl_render.strip()
+ context_i18nurl = Context({})
+ template_i18nurl_string = """
+ {% load absstatic %}
+ {% absstatic "ldt/swf/ldt/pkg/i18n" %}
+ """
+ t_i18nurl = Template(template_i18nurl_string)
+ t_i18nurl_render = t_i18nurl.render(context_i18nurl)
+ i18nurl=t_i18nurl_render.strip()
+ context_baseurl = Context({})
+ template_baseurl_string = """
+ {% load absstatic %}
+ {% absstatic "ldt/swf/ldt/" %}
+ """
+ t_baseurl = Template(template_baseurl_string)
+ t_baseurl_render = t_baseurl.render(context_i18nurl)
+ baseurl=t_baseurl_render.strip()
try:
ldt = Project.safe_objects.get(ldt_id=id)
except Project.DoesNotExist:
@@ -195,7 +266,7 @@
else:
template_path = 'ldt/ldt_utils/init_ldt.html'
- return render_to_response(template_path, {'LDT_MEDIA_PREFIX': settings.LDT_MEDIA_PREFIX, 'colorurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/color.xml', 'i18nurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/i18n', 'language': language_code, 'baseurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/', 'url': urlStr, 'posturl': posturl, 'id': id, 'readonly': readonly}, context_instance=RequestContext(request))
+ return render_to_response(template_path, {'colorurl': colorurl, 'i18nurl': i18nurl, 'language': language_code, 'baseurl': baseurl, 'url': urlStr, 'posturl': posturl, 'id': id, 'readonly': readonly}, context_instance=RequestContext(request))
def init(request, method, url):
@@ -314,8 +385,31 @@
urlStr = settings.WEB_URL + reverse("ldt.ldt_utils.views.lignesdetemps.init", args=['ldt', url])
language_code = request.LANGUAGE_CODE[:2]
-
- return render_to_response('ldt/ldt_utils/init_ldt.html', {'LDT_MEDIA_PREFIX': settings.LDT_MEDIA_PREFIX, 'colorurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/color.xml', 'i18nurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/i18n', 'language': language_code, 'baseurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/', 'url': urlStr, 'weburl':settings.WEB_URL + settings.BASE_URL}, context_instance=RequestContext(request))
+ context_color = Context({})
+ template_colorurl_string = """
+ {% load absstatic %}
+ {% absstatic "ldt/swf/ldt/pkg/color.xml" %}
+ """
+ t_colorurl = Template(template_colorurl_string)
+ t_colorurl_render = t_colorurl.render(context_color)
+ colorurl=t_colorurl_render.strip()
+ context_i18nurl = Context({})
+ template_i18nurl_string = """
+ {% load absstatic %}
+ {% absstatic "ldt/swf/ldt/pkg/i18n" %}
+ """
+ t_i18nurl = Template(template_i18nurl_string)
+ t_i18nurl_render = t_i18nurl.render(context_i18nurl)
+ i18nurl=t_i18nurl_render.strip()
+ context_baseurl = Context({})
+ template_baseurl_string = """
+ {% load absstatic %}
+ {% absstatic "ldt/swf/ldt/" %}
+ """
+ t_baseurl = Template(template_baseurl_string)
+ t_baseurl_render = t_baseurl.render(context_i18nurl)
+ baseurl=t_baseurl_render.strip()
+ return render_to_response('ldt/ldt_utils/init_ldt.html', {'colorurl': colorurl, 'i18nurl': i18nurl, 'language': language_code, 'baseurl': baseurl, 'url': urlStr, 'weburl':settings.WEB_URL + settings.BASE_URL}, context_instance=RequestContext(request))
def ldt(request, url, startSegment=None):
--- a/src/ldt/ldt/ldt_utils/views/workspace.py Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/views/workspace.py Wed Nov 28 12:27:08 2012 +0100
@@ -3,7 +3,7 @@
from django.contrib.auth.models import Group
from django.core.urlresolvers import reverse#, resolve
from django.core.paginator import Paginator, InvalidPage, EmptyPage
-from django.http import HttpResponseForbidden
+from django.http import HttpResponseForbidden, HttpResponse
from ldt.indexation import get_results_with_context, highlight_documents
from django.shortcuts import render_to_response
from django.template import RequestContext
@@ -17,12 +17,16 @@
from ldt.ldt_utils.views.content import get_contents_page, get_content_tags
from ldt.ldt_utils.views.project import get_projects_page, get_published_projects_page
from ldt.security.utils import add_change_attr, get_userlist
+from ldt.templatetags import absurl
from operator import itemgetter
from itertools import groupby
import base64
import django.core.urlresolvers
import ldt.auth as ldt_auth
from django.utils.safestring import mark_safe
+from django.contrib.sites.models import Site
+from django.template import Context, Template
+import logging
@@ -93,7 +97,6 @@
json_url = request.GET.get("json_url")
player_id = request.GET.get("player_id")
ldt_id = request.GET.get("ldt_id")
-
rend_dict = get_datas_for_embed(request, json_url, player_id, ldt_id)
embed_rendered = dict((typestr,
@@ -101,7 +104,6 @@
for typestr in ('seo_body', 'seo_meta', 'links'))
rend_dict['embed_rendered'] = embed_rendered
-
return render_to_response("ldt/ldt_utils/embed_popup.html", rend_dict, context_instance=RequestContext(request))
@@ -197,15 +199,13 @@
if not ldt_auth.check_access(request.user, project):
return HttpResponseForbidden(_("You can not access this project"))
WEB_URL=settings.WEB_URL
- LDT_MEDIA_PREFIX=settings.LDT_MEDIA_PREFIX
LANGUAGE_CODE=settings.LANGUAGE_CODE
ps = ProjectJsonSerializer(project, from_contents=True, from_display=True)
annotations = ps.get_annotations(first_cutting=True)
rend_dict = {'json_url':json_url, 'player_id':player_id, 'annotations':annotations, 'ldt_id': ldt_id, 'stream_mode': stream_mode,
'external_url': external_url,
'polemic':False, 'show_mic_record':False, 'annotations_list':False, 'iframe_url':iframe_url, 'WEB_URL':WEB_URL,
- 'LDT_MEDIA_PREFIX':LDT_MEDIA_PREFIX, 'LANGUAGE_CODE':LANGUAGE_CODE}
-
+ 'LANGUAGE_CODE':LANGUAGE_CODE}
return rend_dict
@@ -241,7 +241,30 @@
results = []
search = ''
field = 'all'
-
+ context_color = Context({})
+ template_colorurl_string = """
+ {% load absstatic %}
+ {% absstatic "ldt/swf/ldt/pkg/color.xml" %}
+ """
+ t_colorurl = Template(template_colorurl_string)
+ t_colorurl_render = t_colorurl.render(context_color)
+ colorurl=t_colorurl_render.strip()
+ context_i18nurl = Context({})
+ template_i18nurl_string = """
+ {% load absstatic %}
+ {% absstatic "ldt/swf/ldt/pkg/i18n" %}
+ """
+ t_i18nurl = Template(template_i18nurl_string)
+ t_i18nurl_render = t_i18nurl.render(context_i18nurl)
+ i18nurl=t_i18nurl_render.strip()
+ context_baseurl = Context({})
+ template_baseurl_string = """
+ {% load absstatic %}
+ {% absstatic "ldt/swf/ldt/" %}
+ """
+ t_baseurl = Template(template_baseurl_string)
+ t_baseurl_render = t_baseurl.render(context_i18nurl)
+ baseurl=t_baseurl_render.strip()
sform = SearchForm(request.GET)
if sform.is_valid():
@@ -250,14 +273,22 @@
field = sform.cleaned_data["field"]
page = sform.cleaned_data["page"] or 1
ldt_pres = sform.cleaned_data["ldt_pres"]
-
if ldt_pres:
- url = settings.WEB_URL + django.core.urlresolvers.reverse("ldt.ldt_utils.views.lignesdetemps.search_init", args=[field, queryStr])
- return render_to_response('ldt/ldt_utils/init_ldt_full.html', {'LDT_MEDIA_PREFIX': settings.LDT_MEDIA_PREFIX, 'colorurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/color.xml', 'i18nurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/i18n', 'language': language_code, 'baseurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/', 'url': url}, context_instance=RequestContext(request))
- else:
+ #the following code will use the absurl templatetag to have the url and stop using WEB_URL+reverse
+ context_url = Context({})
+ template_url_string = """
+ {% load absurl %}
+ {% absurl ldt.ldt_utils.views.lignesdetemps.search_init field='"""+field+"""' query='"""+queryStr+"""' %}
+ """
+ t_url = Template(template_url_string)
+ t_render= t_url.render(context_url)
+ url=t_render.strip()
+ #url = settings.WEB_URL + django.core.urlresolvers.reverse("ldt.ldt_utils.views.lignesdetemps.search_init", args=[field, queryStr])
+ return render_to_response('ldt/ldt_utils/init_ldt_full.html', {'colorurl': colorurl, 'i18nurl': i18nurl , 'language': language_code, 'baseurl': baseurl, 'url': url}, context_instance=RequestContext(request))
+ else:
results, nb = get_search_results(request, search, field, page)
- return render_to_response('ldt/ldt_utils/search_results.html', {'results': results, 'nb_results' : nb, 'search' : search, 'field': field, 'LDT_MEDIA_PREFIX': settings.LDT_MEDIA_PREFIX, 'colorurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/color.xml', 'i18nurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/i18n', 'language': language_code, 'baseurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/'}, context_instance=RequestContext(request))
+ return render_to_response('ldt/ldt_utils/search_results.html', {'results': results, 'nb_results' : nb, 'search' : search, 'field': field, 'colorurl': colorurl, 'i18nurl': i18nurl , 'language': language_code, 'baseurl': baseurl}, context_instance=RequestContext(request))
def get_search_results(request, search, field, page, content_list=None):
--- a/src/ldt/ldt/static/ldt/js/embed_popup.js Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/static/ldt/js/embed_popup.js Wed Nov 28 12:27:08 2012 +0100
@@ -161,21 +161,21 @@
<div> \n \
<div id="'+player_id+'_embed" style="float:left; width:'+player_width_val+';" class="iri_player_embed">\n\
</div>\n\
-<script type="text/javascript" src="'+WEB_URL+LDT_MEDIA_PREFIX+'metadataplayer/LdtPlayer-core.js"></script>\n\
+<script type="text/javascript" src="'+LdtPlayer_core+'"></script>\n\
<script type="text/javascript">\n\
if (typeof jQuery == "undefined") {\n\
jQuery = IriSP.jQuery;\n\
}\n\
var metadatas = {metadata: {url: "'+json_url+'"}};\n\
var metadata_key = "metadata";\n\
- IriSP.libFiles.defaultDir = "'+WEB_URL+LDT_MEDIA_PREFIX+'js/";\n\
- IriSP.libFiles.locations.jwPlayerSWF = "'+WEB_URL+LDT_MEDIA_PREFIX+'swf/player.swf";\n\
- IriSP.libFiles.locations.recordMicSwf = "'+WEB_URL+LDT_MEDIA_PREFIX+'swf/record_mic.swf";\n\
- IriSP.libFiles.locations.zeroClipboardSwf = "'+WEB_URL+LDT_MEDIA_PREFIX+'swf/ZeroClipboard10.swf";\n\
- IriSP.libFiles.locations.cssjQueryUI = "'+WEB_URL+LDT_MEDIA_PREFIX+'css/jq-css/themes/base/jquery-ui.css"\n\
+ IriSP.libFiles.defaultDir = "'+defaultDir+'";\n\
+ IriSP.libFiles.locations.jwPlayerSWF = "'+jwPlayerSWF+'";\n\
+ IriSP.libFiles.locations.recordMicSwf = "'+recordMicSwf+'";\n\
+ IriSP.libFiles.locations.zeroClipboardSwf = "'+zeroClipboardSwf+'";\n\
+ IriSP.libFiles.locations.cssjQueryUI = "'+cssjQueryUI+'"\n\
IriSP.language = "'+LANGUAGE_CODE+'";\n\
\n\
- IriSP.widgetsDir = "'+WEB_URL+LDT_MEDIA_PREFIX+'metadataplayer";\n\
+ IriSP.widgetsDir = "'+widgetsDir+'";\n\
var _metadata = {\n\
url: metadatas[metadata_key].url + "?callback=?",\n\
format: "ldt"\n\
@@ -183,7 +183,7 @@
var _config = {\n\
width: "'+player_width_val+'",\n\
container: "'+player_id+'_embed",\n\
- css: "'+WEB_URL+LDT_MEDIA_PREFIX+'metadataplayer/LdtPlayer-core.css",\n\
+ css: "'+configCss+'",\n\
default_options: {\n\
metadata: _metadata\n\
},\n';
@@ -386,9 +386,10 @@
if(annotationslist_val.checked){
widget_code+=',{\n\
type: "AnnotationsList",\n\
+ ajax_url: "'+segment_api+'",\n\
container: "AnnotationsList_ext",\n\
ajax_granularity : 300000,\n\
- default_thumbnail : "'+WEB_URL+LDT_MEDIA_PREFIX+'css/imgs/video_sequence.png",\n\
+ default_thumbnail : "'+default_thumbnail+'",\n\
show_audio: true,\n\
rtmp_streamer: "rtmp://media.iri.centrepompidou.fr/ddc_micro_record/"\n\
}';
--- a/src/ldt/ldt/static/ldt/js/projectscontents.js Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/static/ldt/js/projectscontents.js Wed Nov 28 12:27:08 2012 +0100
@@ -324,7 +324,7 @@
}
function display_loading_icon (project) {
- project.attr('src', LDT_MEDIA_PREFIX + "img/ajax-loader-transp.gif");
+ project.attr('src', project_load_src);
}
function init_events_groups (base_node, embed_url, groupfilterurl) {
--- a/src/ldt/ldt/templates/403.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/templates/403.html Wed Nov 28 12:27:08 2012 +0100
@@ -1,10 +1,10 @@
{% extends "ldt/ldt_base.html" %}
{% load i18n %}
-
+{% load absstatic %}
{% block content %}
<div style="text-align:center;vertical-align:middle;">
<h1>{% trans '403 error' %}</h1>
- <img src="{{LDT_MEDIA_PREFIX}}/img/403_gandalf.gif" alt="Gif 404" style="display:block;margin:auto;vertical-align:middle;"/>
+ <img src='{% absstatic "ldt/img/403_gandalf.gif" %}'alt="Gif 404" style="display:block;margin:auto;vertical-align:middle;"/>
<br>
<h1>{% trans "You don't have the right permission to access this page" %}</h1>
</div>
--- a/src/ldt/ldt/templates/404.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/templates/404.html Wed Nov 28 12:27:08 2012 +0100
@@ -1,10 +1,11 @@
{% extends "ldt/ldt_base.html" %}
{% load i18n %}
+{% load absstatic %}
{% block content %}
<div style="text-align:center;vertical-align:middle;">
<h1>{% trans '404 error' %}</h1>
- <img src="{{LDT_MEDIA_PREFIX}}/img/404_gandalf.gif" alt="Gif 404" style="display:block;margin:auto;vertical-align:middle;"/>
+ <img src='{% absstatic "ldt/img/404_gandalf.gif" %}' alt="Gif 404" style="display:block;margin:auto;vertical-align:middle;"/>
<br>
<h1>{% trans "Sorry, we couldn't find your page" %}</h1>
</div>
--- a/src/ldt/ldt/templates/base.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/templates/base.html Wed Nov 28 12:27:08 2012 +0100
@@ -1,3 +1,4 @@
+{% load absstatic %}
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
{% block html_declare %}
<html lang="en">
@@ -5,7 +6,7 @@
<head>
<title>{% if user.is_authenticated %}Hello {{ user }}{% else %}Please login{% endif %}</title>
- <link rel="stylesheet" type="text/css" media="screen" href="{{ LDT_MEDIA_PREFIX }}css/socialauth.css" />
+ <link rel="stylesheet" type="text/css" media="screen" href='{% absstatic "ldt/css/socialauth.css" %}' />
{% block extra_head %}
{% endblock %}
</head>
--- a/src/ldt/ldt/templates/ldt/ldt_base.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/templates/ldt/ldt_base.html Wed Nov 28 12:27:08 2012 +0100
@@ -2,20 +2,21 @@
{% load i18n %}
{% load logintag %}
{% load navigation %}
+{% load absstatic %}
{% load thumbnail %}
{% block js_import %}
<script type="text/javascript">
- var LDT_MEDIA_PREFIX = "{{LDT_MEDIA_PREFIX}}"; // Required for search bar icon in projectscontents.js
+ var project_load_src = '{% absstatic "ldt/img/ajax-loader-transp.gif" %}'; // Required for search bar icon in projectscontents.js
</script>
{{ block.super }}
- <script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/jquery.nyroModal.min.js"></script>
+ <script type="text/javascript" src='{% absstatic "ldt/js/jquery.nyroModal.min.js" %}'></script>
<!--[if IE 6]>
- <script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/jquery.nyroModal-ie6.min.js"></script>
+ <script type="text/javascript" src='{% absstatic "ldt/js/jquery.nyroModal-ie6.min.js" %}'></script>
<![endif]-->
- <script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/jquery.qtip.min.js"></script>
- <script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/jquery.validate.js" ></script>
+ <script type="text/javascript" src='{% absstatic "ldt/js/jquery.qtip.min.js" %}'></script>
+ <script type="text/javascript" src='{% absstatic "ldt/js/jquery.validate.js" %}' ></script>
{% endblock %}
{% block js_declaration %}
@@ -71,10 +72,10 @@
{% block css_import %}
{{ block.super }}
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}/css/tabs.css" type="text/css" media="screen, projection" />
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}/css/nyroModal.css" type="text/css"/>
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}/js/login_ajax/login_ajax.css" type="text/css"/>
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}/css/jquery.qtip.min.css" type="text/css"/>
+ <link rel="stylesheet" href='{% absstatic "ldt/css/tabs.css" %}' type="text/css" media="screen, projection" />
+ <link rel="stylesheet" href='{% absstatic "ldt/css/nyroModal.css" %}' type="text/css"/>
+ <link rel="stylesheet" href='{% absstatic "ldt/js/login_ajax/login_ajax.css" %}' type="text/css"/>
+ <link rel="stylesheet" href='{% absstatic "ldt/css/jquery.qtip.min.css" %}' type="text/css"/>
{% endblock %}
{% block body %}
@@ -140,7 +141,7 @@
<div id="footer" class="span-24 last">
{% block footer %}
<div class="footer_img">
- <a href="http://www.iri.centrepompidou.fr"><img src="{{LDT_MEDIA_PREFIX}}/img/logo_IRI_footer.png" alt="Logo IRI" /></a>
+ <a href="http://www.iri.centrepompidou.fr"><img src='{% absstatic "ldt/img/logo_IRI_footer.png" %}' alt="Logo IRI" /></a>
</div>
<div style="float: right; text-align: right;" class="small" id="copyright_version">
<div>©2011 <a style="text-decoration: none; color: #4F5155;" href="http://www.iri.centrepompidou.fr">IRI</a></div>
--- a/src/ldt/ldt/templates/ldt/ldt_raw_base.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/templates/ldt/ldt_raw_base.html Wed Nov 28 12:27:08 2012 +0100
@@ -1,6 +1,7 @@
{% load i18n %}
{% load logintag %}
{% load navigation %}
+{% load absstatic %}
{% load analytics %}
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
@@ -10,28 +11,28 @@
{% block head %}
<meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
<meta http-equiv="content-language" content="{{LANGUAGE_CODE}}" />
- <link rel="SHORTCUT ICON" href="{{LDT_MEDIA_PREFIX}}/img/favicon.ico" />
+ <link rel="SHORTCUT ICON" href='{% absstatic "ldt//img/favicon.ico" %}' />
<title>{% block title %}{% trans "page_title" %}{% endblock %}</title>
{% block js_import %}
- <script type="text/javascript" src="{{LDT_MEDIA_PREFIX}}js/jquery.min.js"></script>
+ <script type="text/javascript" src='{% absstatic "ldt/js/jquery.min.js" %}'></script>
{% endblock %}
{% block css_declaration %}
<style type="text/css">
.rounded {
- behavior:url("{{LDT_MEDIA_PREFIX}}css/border-radius.htc");
+ behavior:url('{% absstatic "ldt/css/border-radius.htc" %}');
}
</style>
{% endblock %}
{% block css_import %}
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/blueprint/screen.css" type="text/css" media="screen, projection" />
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/blueprint/print.css" type="text/css" media="print" />
+ <link rel="stylesheet" href='{% absstatic "ldt/css/blueprint/screen.css" %}' type="text/css" media="screen, projection" />
+ <link rel="stylesheet" href='{% absstatic "ldt/css/blueprint/print.css" %}' type="text/css" media="print" />
<!--[if lt IE 8]>
<link rel="stylesheet" href="{{BASE_URL}}static/css/blueprint/ie.css" type="text/css" media="screen, projection" />
<![endif]-->
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/style.css" type="text/css"/>
+ <link rel="stylesheet" href='{% absstatic "ldt/css/style.css" %}' type="text/css"/>
{% endblock %}
{% block js_declaration %}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/ldt/ldt/templatetags/absstatic.py Wed Nov 28 12:27:08 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
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/ldt/ldt/templatetags/absurl.py Wed Nov 28 12:27:08 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
--- a/src/ldt/ldt/user/templates/ldt/user/user_base.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/user/templates/ldt/user/user_base.html Wed Nov 28 12:27:08 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 }}
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}/css/workspace.css" type="text/css"/>
+ <link rel="stylesheet" href='{% absstatic "ldt/css/workspace.css" %}' type="text/css"/>
{% endblock %}
--- a/src/ldt/ldt/user/templates/registration/base.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/user/templates/registration/base.html Wed Nov 28 12:27:08 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 }}
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/registration.css" />
+ <link rel="stylesheet" href='{% absstatic "ldt/css/registration.css" %}' />
{% endblock %}
{% block pageclass %}profile{% endblock %}
--- a/src/ldt/ldt/user/templates/registration/login.html Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/user/templates/registration/login.html Wed Nov 28 12:27:08 2012 +0100
@@ -1,5 +1,6 @@
{% extends "registration/base.html" %}
{% load i18n %}
+{% load absstatic %}
{% block js_declaration %}{{ block.super }}
<script type="text/javascript">
$(document).ready(function() {
@@ -10,8 +11,8 @@
{% block css_import %}
{{ block.super }}
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/ldt.css" />
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/ldtform.css" />
+ <link rel="stylesheet" href='{% absstatic "ldt/css/ldt.css" %}' />
+ <link rel="stylesheet" href='{% absstatic "ldt/css/ldtform.css" %}' />
{% endblock %}
--- a/src/ldt/ldt/utils/context_processors.py Fri Nov 23 15:02:45 2012 +0100
+++ b/src/ldt/ldt/utils/context_processors.py Wed Nov 28 12:27:08 2012 +0100
@@ -4,7 +4,7 @@
def ldt_context(request):
return {'BASE_URL': settings.BASE_URL, 'MEDIA_URL': settings.MEDIA_URL, \
- 'LDT_MEDIA_PREFIX': settings.LDT_MEDIA_PREFIX, 'WEB_URL': settings.WEB_URL, \
+ 'WEB_URL': settings.WEB_URL, \
'ADMIN_MEDIA_PREFIX': settings.ADMIN_MEDIA_PREFIX, 'VERSION': ldt.get_version(), \
'WEB_VERSION' : settings.WEB_VERSION, }
--- a/web/ldtplatform/templates/registration/login.html Fri Nov 23 15:02:45 2012 +0100
+++ b/web/ldtplatform/templates/registration/login.html Wed Nov 28 12:27:08 2012 +0100
@@ -1,13 +1,29 @@
{% extends "registration/base.html" %}
{% load i18n %}
+{% load absstatic %}
+{% load static %}
+
{% block js_declaration %}
-{{ block.super }}
+
+ <script type="text/javascript">
+ $(document).ready(function(){
+ $('.social_link').each(function(i){
+ {% if social_list %}
+ {% for backend_name in social_list %}
+ var coucou='ldt/img/logo_{{backend_name}}.png'
+ {% with "ldt/img/logo_"|add:backend_name|add:".png" as src_path %}
+ document.getElementById('{{backend_name}}_logo_id').src='{% absstatic src_path %}';
+ {% endwith %}
+ {% endfor %}
+ {% endif %}
+ });
+ });
+ </script>
{% endblock %}
-
{% block css_import %}
{{ block.super }}
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/ldt.css" />
- <link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/ldtform.css" />
+ <link rel="stylesheet" href='{% absstatic "ldt/css/ldt.css" %}'/>
+ <link rel="stylesheet" href='{% absstatic "ldt/css/ldtform.css" %}' />
{% endblock %}
@@ -40,10 +56,12 @@
{% if social_list %}
<p>{% trans "Or login with your external account" %} :</p>
<ul>
- {% for backend_name in social_list %}
- <li><a href="{{ backend_name }}"><img src="{{LDT_MEDIA_PREFIX}}img/logo_{{backend_name}}.png" /> {{ backend_name }}</a></li>
- {% endfor %}
- {% comment %}{{social_list|safe}}{% endcomment %}
+ {% for backend_name in social_list %}
+
+ <li><a href="{{ backend_name }}"><img class='social_link' id="{{backend_name}}_logo_id"/> {{ backend_name }}</a></li>
+
+ {% endfor %}
+ {% comment %}{{social_list|safe}}{% endcomment %}
</ul>
{% endif %}
</div>