# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1368306545 -7200
# Node ID 54ef33bb4065d2a93bd7fc49d22b07335e581677
# Parent  615d19953572cde4631c4cc85d8c1e4f6509edc0# Parent  eb9cc63ce7423fe953f6332fd7f28624e5840ef3
Merge with eb9cc63ce7423fe953f6332fd7f28624e5840ef3

diff -r 615d19953572 -r 54ef33bb4065 .hgtags
--- a/.hgtags	Wed Apr 24 12:46:44 2013 +0200
+++ b/.hgtags	Sat May 11 23:09:05 2013 +0200
@@ -144,6 +144,21 @@
 996bb5b1adbc920f8ecb49f9d7b45f51a8aa3c04 V01.44
 62be1eedf90855ab3cef1ab8a9f0c66130638673 V01.45
 e1b6be4d85a47f4cecce2cf6e88ff190301bd8dc V01.46
+1db1fa8c8076e791cfeedb8c2eb73d731656e034 V01.46.01
+65712578e1f3adc7b441f5e853456442de4b7380 V01.46.02
+d0fdcae534a9826644e9f15c6a8c7888dad76c02 V01.46.03
+5647cbc32e53dafb824583ea8d0cbaf38ff38bb9 V01.46.04
+d6ab4eb5029118bb85e1bc6cd88b681830d21be7 V01.46.05
+d6ab4eb5029118bb85e1bc6cd88b681830d21be7 V01.46.05
+d9ab25b8cbf71d8c70c36a325f5aabf9204663ac V01.46.05
+2014becc0211facd3f45c999442cc5b3e23cb53a V01.46.06
+b9acd7c5893006755e7dca29eb64f23854eac1bf V01.46.07
+b9acd7c5893006755e7dca29eb64f23854eac1bf V01.46.07
+390e37187eb6da44cb5f4d765ffda6f9bfb1afb1 V01.46.07
+9e21c880c3ee2206a9150a46ea865bbc4a7ccccc V01.46.08
+8837650d6f629d0582169c6bda8432290a1680b0 V01.46.09
+af204bb19efa9dc45d09017968144bfb470acace V01.46.10
 86dbc665226d08c082a559b2c218efcd56105c69 V01.47
 56c6497c0785d20c3c17da90446d030eba3c78f3 V01.48
 e590a85b91cccd905ddd25db54357f4f584e83fa V01.49
+
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/__init__.py
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/api/ldt/resources/project.py
--- a/src/ldt/ldt/api/ldt/resources/project.py	Wed Apr 24 12:46:44 2013 +0200
+++ b/src/ldt/ldt/api/ldt/resources/project.py	Sat May 11 23:09:05 2013 +0200
@@ -8,10 +8,12 @@
 from ldt.api.ldt.resources import ContentResource
 from ldt.api.ldt.resources.user import UserResource
 from ldt.security import protect_models, unprotect_models
+from ldt.security.permissionchecker import check_object_perm_for_user
+from tastypie import fields, http
 from tastypie.authorization import Authorization
+from tastypie.exceptions import BadRequest
 from tastypie.resources import Bundle, ModelResource, ALL
-from tastypie import fields
-from tastypie.exceptions import BadRequest
+from tastypie.utils import dict_strip_unicode_keys
 
 
 class ProjectResource(ModelResource):
@@ -53,6 +55,7 @@
             kwargs['ldt_id'] = bundle_or_obj.ldt_id
         return self._build_reverse_url("api_dispatch_detail", kwargs=kwargs)
         
+    # Create a new project. Used with post_detail and with no ldt_id in the url
     def obj_create(self, bundle, request=None, **kwargs):
         unprotect_models()
         bundle = super(ProjectResource, self).obj_create(bundle, request)
@@ -65,6 +68,44 @@
         protect_models()
         return bundle
     
+    
+    # Prevent for put_list and delete all objects.
     def obj_delete_list(self, request=None, **kwargs):
         raise BadRequest("PUT with a list of projects is forbidden.")
+    
+    
+    # Updates an existing project. Used with post_detail and with a ldt_id in the url
+    def post_detail(self, request, **kwargs):
+        # Inspired by put_detail but we only update an object. We can not create one.
+        """
+        Since always_return_data is not set to True, 
+        the request returns accepted (202) if the project is well updated
+        and Not Found (404) if the id in url or datas were incorrect.
+        """
+        deserialized = self.deserialize(request, request.raw_post_data, format=request.META.get('CONTENT_TYPE', 'application/json'))
+        deserialized = self.alter_deserialized_detail_data(request, deserialized)
+        bundle = self.build_bundle(data=dict_strip_unicode_keys(deserialized), request=request)
+        self.is_valid(bundle, request)
+        try:
+            # We have to check if the user can change the project BEFORE calling obj_update
+            proj = Project.objects.get(ldt_id=bundle.data['ldt_id'])
+            if check_object_perm_for_user(proj, "change_project", request.user):
+                # Even if the user has the guardian right to change the project, 
+                # tastypie's save_m2m will raise an error. So we unprotect just for this saving.
+                unprotect_models()
+                updated_bundle = self.obj_update(bundle, request=request, **self.remove_api_resource_names(kwargs))
+                protect_models()
+            else:
+                raise BadRequest("User has no right to change the project.")
+            
+            if not self._meta.always_return_data:
+                return http.HttpAccepted()
+            else:
+                updated_bundle = self.full_dehydrate(updated_bundle)
+                updated_bundle = self.alter_detail_data_to_serialize(request, updated_bundle)
+                return self.create_response(request, updated_bundle, response_class=http.HttpAccepted)
+        except Exception as e:
+            return http.HttpNotFound("Object does not exist or Datas are not correct.\nError = " + str(e) + "\n")
+        return http.HttpResponse("fuuuuu")
+    
     
\ No newline at end of file
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/api/ldt/serializers/cinelabserializer.py
--- a/src/ldt/ldt/api/ldt/serializers/cinelabserializer.py	Wed Apr 24 12:46:44 2013 +0200
+++ b/src/ldt/ldt/api/ldt/serializers/cinelabserializer.py	Sat May 11 23:09:05 2013 +0200
@@ -63,7 +63,10 @@
         
         cinelab = simplejson.loads(content)
         meta = cinelab["meta"]
-        ldt_id = generate_uuid()
+        if "id" in meta and meta["id"]!="":
+            ldt_id = meta["id"]
+        else:
+            ldt_id = generate_uuid()
         # default state = (1, 'edition') OR (2, 'published')
         state = 2
         contents = [reverse("api_dispatch_detail", kwargs={"api_name":"1.0", "resource_name":"contents", "iri_id":c["id"]}) for c in cinelab["medias"]]
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/ldt_utils/models.py
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/ldt_utils/templates/front/front_group.html
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/ldt_utils/templates/front/front_groups.html
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/ldt_utils/templates/front/front_home.html
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/create_content.html
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_popup.html
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/groups.html
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/groups.html	Wed Apr 24 12:46:44 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/groups.html	Sat May 11 23:09:05 2013 +0200
@@ -5,6 +5,7 @@
 {{block.super}}
     <script type="text/javascript" src="{% url 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.history.js" %}'></script>
 {% endblock %}
 
 {% block js_declaration %}
@@ -12,6 +13,7 @@
 <script type="text/javascript">
 
 var groups_filter_url = "{% url ldt.ldt_utils.views.group.groups_filter filter='__FILTER__' %}";
+var content_filter_url = "{% url ldt.ldt_utils.views.content.contents_filter filter_c='__FILTER__' %}";
 var project_filter_url = "{% url ldt.ldt_utils.views.project.projects_filter filter='__FILTER__' is_owner='false' status='0' id_group='__ID_GROUP__' %}";
 var publish_project_url = "{% url ldt.ldt_utils.views.project.publish '__PROJECT_ID__' %}";
 var unpublish_project_url = "{% url ldt.ldt_utils.views.project.unpublish '__PROJECT_ID__' %}";
@@ -23,6 +25,20 @@
 	
 var global_csrf_token = "{{ csrf_token }}";
 
+//Functions to manage history with parameters
+function getURLParameter(name) {
+    return decodeURI(
+        (RegExp(name + '=' + '(.+?)(&|$)').exec(location.search)||[,null])[1]
+    );
+}
+function update_history(){
+    // Group id
+    g = $("#id_group").val();
+    // Project filter
+    pf = ($("#searchprojectsinput").val()==undefined || $("#searchprojectsinput").val()=="") ? "undefined" : $("#searchprojectsinput").val();
+    History.replaceState(null, null, "?pf=" + pf + "&g=" + g);
+}
+
 $(document).ready(function(){
 	
 	input_list_init = [
@@ -46,6 +62,7 @@
         $('#search_div').show();
         $('#id_group').val(id_group);
         $('#searchprojectsinput').val("");
+        update_history();
         $(".searchclear",$('#search_div')).hide();
     	// Send the request to update the projects list
         $.ajax({
@@ -62,7 +79,7 @@
             	alert(jqXHR.responseText());            	
             }
         });
-    });    
+    });
     
     var leave_msg = '{% trans "Do you want to leave this group ?" %}';
     
@@ -73,9 +90,21 @@
 		if (leave) {
 			window.location = $(this).attr('href');
 		}
-    	
     });
     
+    // If some filters parameters were set, we run the filter on contents and projects
+    g = getURLParameter("g");
+    pf = getURLParameter("pf");
+    if(pf=="null" || pf==null || pf=="undefined" || pf==undefined){
+        pf = "";
+    }
+    if(pf!="" || g>=0){
+        // Project filter with current group g
+        $("#searchprojectsinput").val(pf);
+        $('#id_group').val(g);
+        searchCallback($('#searchprojectsinput'), "#projectslistcontainer", project_filter_url, 0, 0);
+    }
+    
 });
 </script>
 {% endblock %}
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_player.html
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_player.html	Wed Apr 24 12:46:44 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/embed_player.html	Sat May 11 23:09:05 2013 +0200
@@ -67,13 +67,7 @@
         },{
             type: "Controller"
         },{
-            type: "Segments",
-            annotation_type: ["chap","découpage"]
-        },{
-            type: "Annotation",
-            start_minimized: true,
-            site_name : "Lignes de Temps",
-            annotation_type: ["chap","découpage"]
+            type: "MultiSegments"
         },{
             type: "Tweet",
             hide_timeout: 5000
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/ldt_div.html
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/ldt_div.html	Wed Apr 24 12:46:44 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/ldt_div.html	Sat May 11 23:09:05 2013 +0200
@@ -26,6 +26,9 @@
 		readOnly: '{{readonly}}',
 		postUrl:'{{posturl}}',
 		postVars: encodeURIComponent('id={{id}}&csrfmiddlewaretoken={{csrf_token}}'),
+		{% if audio_record_url %}
+		streamRecordingUrl: '{{ audio_record_url }}',
+		{% endif %}
 		{% else %}
 		readOnly:'true',
 		{% endifequal %}
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/projectslist.html
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/partial/publishedprojectslist.html
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/published_projects.html
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/published_projects.html	Wed Apr 24 12:46:44 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/published_projects.html	Sat May 11 23:09:05 2013 +0200
@@ -5,6 +5,7 @@
 {{block.super}}
     <script type="text/javascript" src="{% url 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.history.js" %}'></script>
 {% endblock %}
 
 {% block js_declaration %}
@@ -25,6 +26,20 @@
 	
 var global_csrf_token = "{{ csrf_token }}";
 
+// Functions to manage history with parameters
+function getURLParameter(name) {
+    return decodeURI(
+        (RegExp(name + '=' + '(.+?)(&|$)').exec(location.search)||[,null])[1]
+    );
+}
+function update_history(){
+    // Project filter
+    pf = ($("#searchprojectsinput").val()==undefined || $("#searchprojectsinput").val()=="") ? "undefined" : $("#searchprojectsinput").val();
+    // Project page
+    pp = $("#current_project_page").val();
+    History.replaceState(null, null, "?pf=" + pf + "&pp=" + pp);
+}
+
 $(document).ready(function(){
 	
 	input_list_init = [
@@ -36,6 +51,18 @@
 	
 	init_events(document);
 
+    // If some filters parameters were set, we run the filter on contents and projects
+    pf = getURLParameter("pf");
+    pp = parseInt(getURLParameter("pp"));
+    if(pf=="null" || pf==null || pf=="undefined" || pf==undefined){
+        pf = "";
+    }
+    if(pf!="" || pp>0){
+        // Project filter with current page pp
+        $("#searchprojectsinput").val(pf);
+        searchCallback($('#searchprojectsinput'), "#projectslistcontainer", project_filter_url, 0, pp);
+    }
+
 });
 </script>
 
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/workspace_base.html
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/workspace_base.html	Wed Apr 24 12:46:44 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/workspace_base.html	Sat May 11 23:09:05 2013 +0200
@@ -5,6 +5,7 @@
 {{block.super}}
     <script type="text/javascript" src="{% url 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.history.js" %}'></script>
 {% endblock %}
 
 
@@ -24,6 +25,26 @@
 	
 var global_csrf_token = "{{ csrf_token }}";
 
+//Functions to manage history with parameters
+function getURLParameter(name) {
+    return decodeURI(
+        (RegExp(name + '=' + '(.+?)(&|$)').exec(location.search)||[,null])[1]
+    );
+}
+function update_history(){
+    // Content filter
+    cf = ($("#searchcontentsinput").val()==undefined || $("#searchcontentsinput").val()=="") ? "undefined" : $("#searchcontentsinput").val();
+    // Content page
+    cp = $("#current_content_page").val();
+    // Content tag
+    ct = ($("#current_content_tag").val()==undefined || $("#current_content_tag").val()=="") ? "undefined" : $("#current_content_tag").val();
+    // Project filter
+    pf = ($("#searchprojectsinput").val()==undefined || $("#searchprojectsinput").val()=="") ? "undefined" : $("#searchprojectsinput").val();
+    // Project page
+    pp = $("#current_project_page").val();
+    History.replaceState(null, null, "?cf=" + cf + "&cp=" + cp + "&ct=" + ct + "&pf=" + pf + "&pp=" + pp);
+}
+
 $(document).ready(function(){
 	
 	input_list_init = [
@@ -34,6 +55,32 @@
 	searchFieldInit(input_list_init);
     
 	init_events(document);
+	
+	// If some filters parameters were set, we run the filter on contents and projects
+	cf = getURLParameter("cf");
+	ct = getURLParameter("ct");
+	cp = parseInt(getURLParameter("cp"));
+	if(cf=="null" || cf==null || cf=="undefined" || cf==undefined){
+		cf = "";
+	}
+    if(ct=="null" || ct==null || ct=="undefined" || ct==undefined){
+        ct = "";
+    }
+	if(cf!="" || cp>0){
+		// Content filter with current page cp and current tag ct
+		$("#searchcontentsinput").val(cf);
+		searchCallback($("#searchcontentsinput"), "#contentslistcontainer", content_filter_url, 0, cp, ct);
+	}
+    pf = getURLParameter("pf");
+    pp = parseInt(getURLParameter("pp"));
+    if(pf=="null" || pf==null || pf=="undefined" || pf==undefined){
+        pf = "";
+    }
+    if(pf!="" || pp>0){
+    	// Project filter with current page pp
+        $("#searchprojectsinput").val(pf);
+        searchCallback($('#searchprojectsinput'), "#projectslistcontainer", project_filter_url, 0, pp);
+    }
 
 });
 </script>
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/ldt_utils/urls.py
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/ldt_utils/views/content.py
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/ldt_utils/views/front.py
--- a/src/ldt/ldt/ldt_utils/views/front.py	Wed Apr 24 12:46:44 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/views/front.py	Sat May 11 23:09:05 2013 +0200
@@ -6,7 +6,6 @@
 from django.db.models import Count
 from django.shortcuts import render_to_response
 from django.template import RequestContext
-from guardian.shortcuts import get_objects_for_group
 from ldt.ldt_utils.models import Content, Project
 from ldt.ldt_utils.forms import SearchForm
 from ldt.ldt_utils.views.content import get_content_tags
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/ldt_utils/views/group.py
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/ldt_utils/views/lignesdetemps.py
--- a/src/ldt/ldt/ldt_utils/views/lignesdetemps.py	Wed Apr 24 12:46:44 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/views/lignesdetemps.py	Sat May 11 23:09:05 2013 +0200
@@ -9,14 +9,17 @@
 from ldt.ldt_utils.searchutils import search_generate_ldt
 from ldt.ldt_utils.stat import update_stat_project
 from ldt.ldt_utils.utils import LdtUtils, clean_description
+from ldt.security.permissionchecker import check_object_perm_for_user
 from ldt.security.utils import set_forbidden_stream
-from ldt.security.permissionchecker import check_object_perm_for_user
 from ldt.utils.projectldt_parser import absolute_src_xml, relative_src_xml
 from ldt.utils.url import absstatic, absurl
 from ldt.utils.web_url_management import get_web_url
 import base64
+import logging
 import lxml.etree
 
+logger = logging.getLogger(__name__)
+
 def search_index_get(request, field, query):
     
     language_code = request.LANGUAGE_CODE[:2]
@@ -191,6 +194,8 @@
     colorurl = absstatic(request, "ldt/swf/ldt/pkg/color.xml")
     i18nurl = absstatic(request, "ldt/swf/ldt/pkg/i18n")
     baseurl = absstatic(request, "ldt/swf/ldt/")
+    audio_record_url = None
+    
     try:
         ldt = Project.safe_objects.get(ldt_id=id)
     except Project.DoesNotExist:
@@ -200,13 +205,21 @@
         readonly = 'true'
     else:
         readonly = 'false'
+        # Add audio annotation feature if possible
+        if hasattr(settings, "AUDIO_RECORD_URL"):
+            if settings.AUDIO_RECORD_URL and settings.AUDIO_RECORD_URL!="":
+                audio_record_url = settings.AUDIO_RECORD_URL
     
     if full:
         template_path = 'ldt/ldt_utils/init_ldt_full.html'
     else:
         template_path = 'ldt/ldt_utils/init_ldt.html'
     
-    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))
+    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 embed_ldt(request, id): 
@@ -324,7 +337,7 @@
         description = ldtproject.get_description(doc)
         new_desc = clean_description(description)
         
-        if new_desc:        
+        if new_desc:
             desc_node = doc.xpath('/iri/project')[0]
             desc_node.set('abstract', new_desc)
             ldtproject.ldt = lxml.etree.tostring(doc, pretty_print=True)
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/ldt_utils/views/workspace.py
--- a/src/ldt/ldt/ldt_utils/views/workspace.py	Wed Apr 24 12:46:44 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/views/workspace.py	Sat May 11 23:09:05 2013 +0200
@@ -227,7 +227,7 @@
 
 def get_datas_for_embed(request, json_url, player_id, ldt_id):
     
-    project = Project.safe_objects.prefetch_related("contents").get(ldt_id=ldt_id); #@UndefinedVariable
+    project = Project.safe_objects.prefetch_related("contents").get(ldt_id=ldt_id) #@UndefinedVariable
     project_contents = project.contents.all()
     content = project_contents[0]
     WEB_URL = get_web_url(request)
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/locale/fr/LC_MESSAGES/django.mo
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/locale/fr/LC_MESSAGES/django.po
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/management/commands/reindex.py
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/security/__init__.py
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/security/permissionchecker.py
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/security/utils.py
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/settings.py
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/static/ldt/css/embed_popup.css
--- a/src/ldt/ldt/static/ldt/css/embed_popup.css	Wed Apr 24 12:46:44 2013 +0200
+++ b/src/ldt/ldt/static/ldt/css/embed_popup.css	Sat May 11 23:09:05 2013 +0200
@@ -6,6 +6,15 @@
 word-wrap: break-word; /* Internet Explorer 5.5+ */
 }
 
+.margin0{
+	margin:0 0 0 0;
+}
+.large_text{
+    font-size: 1.5em;
+}
+.middle_text{
+	font-size: 0.9em;
+}
 
 input
 {
@@ -118,6 +127,7 @@
 .click_to_select:hover {
     text-decoration: underline;
 }
+
 .copy_input {
     width: 260px;
     height: 14px;
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/static/ldt/css/front_group.css
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/static/ldt/js/embed_popup.js
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/static/ldt/js/jquery.history.js
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/ldt/ldt/static/ldt/js/jquery.history.js	Sat May 11 23:09:05 2013 +0200
@@ -0,0 +1,1 @@
+window.JSON||(window.JSON={}),function(){function f(a){return a<10?"0"+a:a}function quote(a){return escapable.lastIndex=0,escapable.test(a)?'"'+a.replace(escapable,function(a){var b=meta[a];return typeof b=="string"?b:"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)})+'"':'"'+a+'"'}function str(a,b){var c,d,e,f,g=gap,h,i=b[a];i&&typeof i=="object"&&typeof i.toJSON=="function"&&(i=i.toJSON(a)),typeof rep=="function"&&(i=rep.call(b,a,i));switch(typeof i){case"string":return quote(i);case"number":return isFinite(i)?String(i):"null";case"boolean":case"null":return String(i);case"object":if(!i)return"null";gap+=indent,h=[];if(Object.prototype.toString.apply(i)==="[object Array]"){f=i.length;for(c=0;c<f;c+=1)h[c]=str(c,i)||"null";return e=h.length===0?"[]":gap?"[\n"+gap+h.join(",\n"+gap)+"\n"+g+"]":"["+h.join(",")+"]",gap=g,e}if(rep&&typeof rep=="object"){f=rep.length;for(c=0;c<f;c+=1)d=rep[c],typeof d=="string"&&(e=str(d,i),e&&h.push(quote(d)+(gap?": ":":")+e))}else for(d in i)Object.hasOwnProperty.call(i,d)&&(e=str(d,i),e&&h.push(quote(d)+(gap?": ":":")+e));return e=h.length===0?"{}":gap?"{\n"+gap+h.join(",\n"+gap)+"\n"+g+"}":"{"+h.join(",")+"}",gap=g,e}}"use strict",typeof Date.prototype.toJSON!="function"&&(Date.prototype.toJSON=function(a){return isFinite(this.valueOf())?this.getUTCFullYear()+"-"+f(this.getUTCMonth()+1)+"-"+f(this.getUTCDate())+"T"+f(this.getUTCHours())+":"+f(this.getUTCMinutes())+":"+f(this.getUTCSeconds())+"Z":null},String.prototype.toJSON=Number.prototype.toJSON=Boolean.prototype.toJSON=function(a){return this.valueOf()});var JSON=window.JSON,cx=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,escapable=/[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,gap,indent,meta={"\b":"\\b","\t":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"},rep;typeof JSON.stringify!="function"&&(JSON.stringify=function(a,b,c){var d;gap="",indent="";if(typeof c=="number")for(d=0;d<c;d+=1)indent+=" ";else typeof c=="string"&&(indent=c);rep=b;if(!b||typeof b=="function"||typeof b=="object"&&typeof b.length=="number")return str("",{"":a});throw new Error("JSON.stringify")}),typeof JSON.parse!="function"&&(JSON.parse=function(text,reviver){function walk(a,b){var c,d,e=a[b];if(e&&typeof e=="object")for(c in e)Object.hasOwnProperty.call(e,c)&&(d=walk(e,c),d!==undefined?e[c]=d:delete e[c]);return reviver.call(a,b,e)}var j;text=String(text),cx.lastIndex=0,cx.test(text)&&(text=text.replace(cx,function(a){return"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)}));if(/^[\],:{}\s]*$/.test(text.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,"")))return j=eval("("+text+")"),typeof reviver=="function"?walk({"":j},""):j;throw new SyntaxError("JSON.parse")})}(),function(a,b){"use strict";var c=a.History=a.History||{},d=a.jQuery;if(typeof c.Adapter!="undefined")throw new Error("History.js Adapter has already been loaded...");c.Adapter={bind:function(a,b,c){d(a).bind(b,c)},trigger:function(a,b,c){d(a).trigger(b,c)},extractEventData:function(a,c,d){var e=c&&c.originalEvent&&c.originalEvent[a]||d&&d[a]||b;return e},onDomLoad:function(a){d(a)}},typeof c.init!="undefined"&&c.init()}(window),function(a,b){"use strict";var c=a.document,d=a.setTimeout||d,e=a.clearTimeout||e,f=a.setInterval||f,g=a.History=a.History||{};if(typeof g.initHtml4!="undefined")throw new Error("History.js HTML4 Support has already been loaded...");g.initHtml4=function(){if(typeof g.initHtml4.initialized!="undefined")return!1;g.initHtml4.initialized=!0,g.enabled=!0,g.savedHashes=[],g.isLastHash=function(a){var b=g.getHashByIndex(),c;return c=a===b,c},g.saveHash=function(a){return g.isLastHash(a)?!1:(g.savedHashes.push(a),!0)},g.getHashByIndex=function(a){var b=null;return typeof a=="undefined"?b=g.savedHashes[g.savedHashes.length-1]:a<0?b=g.savedHashes[g.savedHashes.length+a]:b=g.savedHashes[a],b},g.discardedHashes={},g.discardedStates={},g.discardState=function(a,b,c){var d=g.getHashByState(a),e;return e={discardedState:a,backState:c,forwardState:b},g.discardedStates[d]=e,!0},g.discardHash=function(a,b,c){var d={discardedHash:a,backState:c,forwardState:b};return g.discardedHashes[a]=d,!0},g.discardedState=function(a){var b=g.getHashByState(a),c;return c=g.discardedStates[b]||!1,c},g.discardedHash=function(a){var b=g.discardedHashes[a]||!1;return b},g.recycleState=function(a){var b=g.getHashByState(a);return g.discardedState(a)&&delete g.discardedStates[b],!0},g.emulated.hashChange&&(g.hashChangeInit=function(){g.checkerFunction=null;var b="",d,e,h,i;return g.isInternetExplorer()?(d="historyjs-iframe",e=c.createElement("iframe"),e.setAttribute("id",d),e.style.display="none",c.body.appendChild(e),e.contentWindow.document.open(),e.contentWindow.document.close(),h="",i=!1,g.checkerFunction=function(){if(i)return!1;i=!0;var c=g.getHash()||"",d=g.unescapeHash(e.contentWindow.document.location.hash)||"";return c!==b?(b=c,d!==c&&(h=d=c,e.contentWindow.document.open(),e.contentWindow.document.close(),e.contentWindow.document.location.hash=g.escapeHash(c)),g.Adapter.trigger(a,"hashchange")):d!==h&&(h=d,g.setHash(d,!1)),i=!1,!0}):g.checkerFunction=function(){var c=g.getHash();return c!==b&&(b=c,g.Adapter.trigger(a,"hashchange")),!0},g.intervalList.push(f(g.checkerFunction,g.options.hashChangeInterval)),!0},g.Adapter.onDomLoad(g.hashChangeInit)),g.emulated.pushState&&(g.onHashChange=function(b){var d=b&&b.newURL||c.location.href,e=g.getHashByUrl(d),f=null,h=null,i=null,j;return g.isLastHash(e)?(g.busy(!1),!1):(g.doubleCheckComplete(),g.saveHash(e),e&&g.isTraditionalAnchor(e)?(g.Adapter.trigger(a,"anchorchange"),g.busy(!1),!1):(f=g.extractState(g.getFullUrl(e||c.location.href,!1),!0),g.isLastSavedState(f)?(g.busy(!1),!1):(h=g.getHashByState(f),j=g.discardedState(f),j?(g.getHashByIndex(-2)===g.getHashByState(j.forwardState)?g.back(!1):g.forward(!1),!1):(g.pushState(f.data,f.title,f.url,!1),!0))))},g.Adapter.bind(a,"hashchange",g.onHashChange),g.pushState=function(b,d,e,f){if(g.getHashByUrl(e))throw new Error("History.js does not support states with fragement-identifiers (hashes/anchors).");if(f!==!1&&g.busy())return g.pushQueue({scope:g,callback:g.pushState,args:arguments,queue:f}),!1;g.busy(!0);var h=g.createStateObject(b,d,e),i=g.getHashByState(h),j=g.getState(!1),k=g.getHashByState(j),l=g.getHash();return g.storeState(h),g.expectedStateId=h.id,g.recycleState(h),g.setTitle(h),i===k?(g.busy(!1),!1):i!==l&&i!==g.getShortUrl(c.location.href)?(g.setHash(i,!1),!1):(g.saveState(h),g.Adapter.trigger(a,"statechange"),g.busy(!1),!0)},g.replaceState=function(a,b,c,d){if(g.getHashByUrl(c))throw new Error("History.js does not support states with fragement-identifiers (hashes/anchors).");if(d!==!1&&g.busy())return g.pushQueue({scope:g,callback:g.replaceState,args:arguments,queue:d}),!1;g.busy(!0);var e=g.createStateObject(a,b,c),f=g.getState(!1),h=g.getStateByIndex(-2);return g.discardState(f,e,h),g.pushState(e.data,e.title,e.url,!1),!0}),g.emulated.pushState&&g.getHash()&&!g.emulated.hashChange&&g.Adapter.onDomLoad(function(){g.Adapter.trigger(a,"hashchange")})},typeof g.init!="undefined"&&g.init()}(window),function(a,b){"use strict";var c=a.console||b,d=a.document,e=a.navigator,f=a.sessionStorage||!1,g=a.setTimeout,h=a.clearTimeout,i=a.setInterval,j=a.clearInterval,k=a.JSON,l=a.alert,m=a.History=a.History||{},n=a.history;k.stringify=k.stringify||k.encode,k.parse=k.parse||k.decode;if(typeof m.init!="undefined")throw new Error("History.js Core has already been loaded...");m.init=function(){return typeof m.Adapter=="undefined"?!1:(typeof m.initCore!="undefined"&&m.initCore(),typeof m.initHtml4!="undefined"&&m.initHtml4(),!0)},m.initCore=function(){if(typeof m.initCore.initialized!="undefined")return!1;m.initCore.initialized=!0,m.options=m.options||{},m.options.hashChangeInterval=m.options.hashChangeInterval||100,m.options.safariPollInterval=m.options.safariPollInterval||500,m.options.doubleCheckInterval=m.options.doubleCheckInterval||500,m.options.storeInterval=m.options.storeInterval||1e3,m.options.busyDelay=m.options.busyDelay||250,m.options.debug=m.options.debug||!1,m.options.initialTitle=m.options.initialTitle||d.title,m.intervalList=[],m.clearAllIntervals=function(){var a,b=m.intervalList;if(typeof b!="undefined"&&b!==null){for(a=0;a<b.length;a++)j(b[a]);m.intervalList=null}},m.debug=function(){(m.options.debug||!1)&&m.log.apply(m,arguments)},m.log=function(){var a=typeof c!="undefined"&&typeof c.log!="undefined"&&typeof c.log.apply!="undefined",b=d.getElementById("log"),e,f,g,h,i;a?(h=Array.prototype.slice.call(arguments),e=h.shift(),typeof c.debug!="undefined"?c.debug.apply(c,[e,h]):c.log.apply(c,[e,h])):e="\n"+arguments[0]+"\n";for(f=1,g=arguments.length;f<g;++f){i=arguments[f];if(typeof i=="object"&&typeof k!="undefined")try{i=k.stringify(i)}catch(j){}e+="\n"+i+"\n"}return b?(b.value+=e+"\n-----\n",b.scrollTop=b.scrollHeight-b.clientHeight):a||l(e),!0},m.getInternetExplorerMajorVersion=function(){var a=m.getInternetExplorerMajorVersion.cached=typeof m.getInternetExplorerMajorVersion.cached!="undefined"?m.getInternetExplorerMajorVersion.cached:function(){var a=3,b=d.createElement("div"),c=b.getElementsByTagName("i");while((b.innerHTML="<!--[if gt IE "+ ++a+"]><i></i><![endif]-->")&&c[0]);return a>4?a:!1}();return a},m.isInternetExplorer=function(){var a=m.isInternetExplorer.cached=typeof m.isInternetExplorer.cached!="undefined"?m.isInternetExplorer.cached:Boolean(m.getInternetExplorerMajorVersion());return a},m.emulated={pushState:!Boolean(a.history&&a.history.pushState&&a.history.replaceState&&!/ Mobile\/([1-7][a-z]|(8([abcde]|f(1[0-8]))))/i.test(e.userAgent)&&!/AppleWebKit\/5([0-2]|3[0-2])/i.test(e.userAgent)),hashChange:Boolean(!("onhashchange"in a||"onhashchange"in d)||m.isInternetExplorer()&&m.getInternetExplorerMajorVersion()<8)},m.enabled=!m.emulated.pushState,m.bugs={setHash:Boolean(!m.emulated.pushState&&e.vendor==="Apple Computer, Inc."&&/AppleWebKit\/5([0-2]|3[0-3])/.test(e.userAgent)),safariPoll:Boolean(!m.emulated.pushState&&e.vendor==="Apple Computer, Inc."&&/AppleWebKit\/5([0-2]|3[0-3])/.test(e.userAgent)),ieDoubleCheck:Boolean(m.isInternetExplorer()&&m.getInternetExplorerMajorVersion()<8),hashEscape:Boolean(m.isInternetExplorer()&&m.getInternetExplorerMajorVersion()<7)},m.isEmptyObject=function(a){for(var b in a)return!1;return!0},m.cloneObject=function(a){var b,c;return a?(b=k.stringify(a),c=k.parse(b)):c={},c},m.getRootUrl=function(){var a=d.location.protocol+"//"+(d.location.hostname||d.location.host);if(d.location.port||!1)a+=":"+d.location.port;return a+="/",a},m.getBaseHref=function(){var a=d.getElementsByTagName("base"),b=null,c="";return a.length===1&&(b=a[0],c=b.href.replace(/[^\/]+$/,"")),c=c.replace(/\/+$/,""),c&&(c+="/"),c},m.getBaseUrl=function(){var a=m.getBaseHref()||m.getBasePageUrl()||m.getRootUrl();return a},m.getPageUrl=function(){var a=m.getState(!1,!1),b=(a||{}).url||d.location.href,c;return c=b.replace(/\/+$/,"").replace(/[^\/]+$/,function(a,b,c){return/\./.test(a)?a:a+"/"}),c},m.getBasePageUrl=function(){var a=d.location.href.replace(/[#\?].*/,"").replace(/[^\/]+$/,function(a,b,c){return/[^\/]$/.test(a)?"":a}).replace(/\/+$/,"")+"/";return a},m.getFullUrl=function(a,b){var c=a,d=a.substring(0,1);return b=typeof b=="undefined"?!0:b,/[a-z]+\:\/\//.test(a)||(d==="/"?c=m.getRootUrl()+a.replace(/^\/+/,""):d==="#"?c=m.getPageUrl().replace(/#.*/,"")+a:d==="?"?c=m.getPageUrl().replace(/[\?#].*/,"")+a:b?c=m.getBaseUrl()+a.replace(/^(\.\/)+/,""):c=m.getBasePageUrl()+a.replace(/^(\.\/)+/,"")),c.replace(/\#$/,"")},m.getShortUrl=function(a){var b=a,c=m.getBaseUrl(),d=m.getRootUrl();return m.emulated.pushState&&(b=b.replace(c,"")),b=b.replace(d,"/"),m.isTraditionalAnchor(b)&&(b="./"+b),b=b.replace(/^(\.\/)+/g,"./").replace(/\#$/,""),b},m.store={},m.idToState=m.idToState||{},m.stateToId=m.stateToId||{},m.urlToId=m.urlToId||{},m.storedStates=m.storedStates||[],m.savedStates=m.savedStates||[],m.normalizeStore=function(){m.store.idToState=m.store.idToState||{},m.store.urlToId=m.store.urlToId||{},m.store.stateToId=m.store.stateToId||{}},m.getState=function(a,b){typeof a=="undefined"&&(a=!0),typeof b=="undefined"&&(b=!0);var c=m.getLastSavedState();return!c&&b&&(c=m.createStateObject()),a&&(c=m.cloneObject(c),c.url=c.cleanUrl||c.url),c},m.getIdByState=function(a){var b=m.extractId(a.url),c;if(!b){c=m.getStateString(a);if(typeof m.stateToId[c]!="undefined")b=m.stateToId[c];else if(typeof m.store.stateToId[c]!="undefined")b=m.store.stateToId[c];else{for(;;){b=(new Date).getTime()+String(Math.random()).replace(/\D/g,"");if(typeof m.idToState[b]=="undefined"&&typeof m.store.idToState[b]=="undefined")break}m.stateToId[c]=b,m.idToState[b]=a}}return b},m.normalizeState=function(a){var b,c;if(!a||typeof a!="object")a={};if(typeof a.normalized!="undefined")return a;if(!a.data||typeof a.data!="object")a.data={};b={},b.normalized=!0,b.title=a.title||"",b.url=m.getFullUrl(m.unescapeString(a.url||d.location.href)),b.hash=m.getShortUrl(b.url),b.data=m.cloneObject(a.data),b.id=m.getIdByState(b),b.cleanUrl=b.url.replace(/\??\&_suid.*/,""),b.url=b.cleanUrl,c=!m.isEmptyObject(b.data);if(b.title||c)b.hash=m.getShortUrl(b.url).replace(/\??\&_suid.*/,""),/\?/.test(b.hash)||(b.hash+="?"),b.hash+="&_suid="+b.id;return b.hashedUrl=m.getFullUrl(b.hash),(m.emulated.pushState||m.bugs.safariPoll)&&m.hasUrlDuplicate(b)&&(b.url=b.hashedUrl),b},m.createStateObject=function(a,b,c){var d={data:a,title:b,url:c};return d=m.normalizeState(d),d},m.getStateById=function(a){a=String(a);var c=m.idToState[a]||m.store.idToState[a]||b;return c},m.getStateString=function(a){var b,c,d;return b=m.normalizeState(a),c={data:b.data,title:a.title,url:a.url},d=k.stringify(c),d},m.getStateId=function(a){var b,c;return b=m.normalizeState(a),c=b.id,c},m.getHashByState=function(a){var b,c;return b=m.normalizeState(a),c=b.hash,c},m.extractId=function(a){var b,c,d;return c=/(.*)\&_suid=([0-9]+)$/.exec(a),d=c?c[1]||a:a,b=c?String(c[2]||""):"",b||!1},m.isTraditionalAnchor=function(a){var b=!/[\/\?\.]/.test(a);return b},m.extractState=function(a,b){var c=null,d,e;return b=b||!1,d=m.extractId(a),d&&(c=m.getStateById(d)),c||(e=m.getFullUrl(a),d=m.getIdByUrl(e)||!1,d&&(c=m.getStateById(d)),!c&&b&&!m.isTraditionalAnchor(a)&&(c=m.createStateObject(null,null,e))),c},m.getIdByUrl=function(a){var c=m.urlToId[a]||m.store.urlToId[a]||b;return c},m.getLastSavedState=function(){return m.savedStates[m.savedStates.length-1]||b},m.getLastStoredState=function(){return m.storedStates[m.storedStates.length-1]||b},m.hasUrlDuplicate=function(a){var b=!1,c;return c=m.extractState(a.url),b=c&&c.id!==a.id,b},m.storeState=function(a){return m.urlToId[a.url]=a.id,m.storedStates.push(m.cloneObject(a)),a},m.isLastSavedState=function(a){var b=!1,c,d,e;return m.savedStates.length&&(c=a.id,d=m.getLastSavedState(),e=d.id,b=c===e),b},m.saveState=function(a){return m.isLastSavedState(a)?!1:(m.savedStates.push(m.cloneObject(a)),!0)},m.getStateByIndex=function(a){var b=null;return typeof a=="undefined"?b=m.savedStates[m.savedStates.length-1]:a<0?b=m.savedStates[m.savedStates.length+a]:b=m.savedStates[a],b},m.getHash=function(){var a=m.unescapeHash(d.location.hash);return a},m.unescapeString=function(b){var c=b,d;for(;;){d=a.unescape(c);if(d===c)break;c=d}return c},m.unescapeHash=function(a){var b=m.normalizeHash(a);return b=m.unescapeString(b),b},m.normalizeHash=function(a){var b=a.replace(/[^#]*#/,"").replace(/#.*/,"");return b},m.setHash=function(a,b){var c,e,f;return b!==!1&&m.busy()?(m.pushQueue({scope:m,callback:m.setHash,args:arguments,queue:b}),!1):(c=m.escapeHash(a),m.busy(!0),e=m.extractState(a,!0),e&&!m.emulated.pushState?m.pushState(e.data,e.title,e.url,!1):d.location.hash!==c&&(m.bugs.setHash?(f=m.getPageUrl(),m.pushState(null,null,f+"#"+c,!1)):d.location.hash=c),m)},m.escapeHash=function(b){var c=m.normalizeHash(b);return c=a.escape(c),m.bugs.hashEscape||(c=c.replace(/\%21/g,"!").replace(/\%26/g,"&").replace(/\%3D/g,"=").replace(/\%3F/g,"?")),c},m.getHashByUrl=function(a){var b=String(a).replace(/([^#]*)#?([^#]*)#?(.*)/,"$2");return b=m.unescapeHash(b),b},m.setTitle=function(a){var b=a.title,c;b||(c=m.getStateByIndex(0),c&&c.url===a.url&&(b=c.title||m.options.initialTitle));try{d.getElementsByTagName("title")[0].innerHTML=b.replace("<","&lt;").replace(">","&gt;").replace(" & "," &amp; ")}catch(e){}return d.title=b,m},m.queues=[],m.busy=function(a){typeof a!="undefined"?m.busy.flag=a:typeof m.busy.flag=="undefined"&&(m.busy.flag=!1);if(!m.busy.flag){h(m.busy.timeout);var b=function(){var a,c,d;if(m.busy.flag)return;for(a=m.queues.length-1;a>=0;--a){c=m.queues[a];if(c.length===0)continue;d=c.shift(),m.fireQueueItem(d),m.busy.timeout=g(b,m.options.busyDelay)}};m.busy.timeout=g(b,m.options.busyDelay)}return m.busy.flag},m.busy.flag=!1,m.fireQueueItem=function(a){return a.callback.apply(a.scope||m,a.args||[])},m.pushQueue=function(a){return m.queues[a.queue||0]=m.queues[a.queue||0]||[],m.queues[a.queue||0].push(a),m},m.queue=function(a,b){return typeof a=="function"&&(a={callback:a}),typeof b!="undefined"&&(a.queue=b),m.busy()?m.pushQueue(a):m.fireQueueItem(a),m},m.clearQueue=function(){return m.busy.flag=!1,m.queues=[],m},m.stateChanged=!1,m.doubleChecker=!1,m.doubleCheckComplete=function(){return m.stateChanged=!0,m.doubleCheckClear(),m},m.doubleCheckClear=function(){return m.doubleChecker&&(h(m.doubleChecker),m.doubleChecker=!1),m},m.doubleCheck=function(a){return m.stateChanged=!1,m.doubleCheckClear(),m.bugs.ieDoubleCheck&&(m.doubleChecker=g(function(){return m.doubleCheckClear(),m.stateChanged||a(),!0},m.options.doubleCheckInterval)),m},m.safariStatePoll=function(){var b=m.extractState(d.location.href),c;if(!m.isLastSavedState(b))c=b;else return;return c||(c=m.createStateObject()),m.Adapter.trigger(a,"popstate"),m},m.back=function(a){return a!==!1&&m.busy()?(m.pushQueue({scope:m,callback:m.back,args:arguments,queue:a}),!1):(m.busy(!0),m.doubleCheck(function(){m.back(!1)}),n.go(-1),!0)},m.forward=function(a){return a!==!1&&m.busy()?(m.pushQueue({scope:m,callback:m.forward,args:arguments,queue:a}),!1):(m.busy(!0),m.doubleCheck(function(){m.forward(!1)}),n.go(1),!0)},m.go=function(a,b){var c;if(a>0)for(c=1;c<=a;++c)m.forward(b);else{if(!(a<0))throw new Error("History.go: History.go requires a positive or negative integer passed.");for(c=-1;c>=a;--c)m.back(b)}return m};if(m.emulated.pushState){var o=function(){};m.pushState=m.pushState||o,m.replaceState=m.replaceState||o}else m.onPopState=function(b,c){var e=!1,f=!1,g,h;return m.doubleCheckComplete(),g=m.getHash(),g?(h=m.extractState(g||d.location.href,!0),h?m.replaceState(h.data,h.title,h.url,!1):(m.Adapter.trigger(a,"anchorchange"),m.busy(!1)),m.expectedStateId=!1,!1):(e=m.Adapter.extractEventData("state",b,c)||!1,e?f=m.getStateById(e):m.expectedStateId?f=m.getStateById(m.expectedStateId):f=m.extractState(d.location.href),f||(f=m.createStateObject(null,null,d.location.href)),m.expectedStateId=!1,m.isLastSavedState(f)?(m.busy(!1),!1):(m.storeState(f),m.saveState(f),m.setTitle(f),m.Adapter.trigger(a,"statechange"),m.busy(!1),!0))},m.Adapter.bind(a,"popstate",m.onPopState),m.pushState=function(b,c,d,e){if(m.getHashByUrl(d)&&m.emulated.pushState)throw new Error("History.js does not support states with fragement-identifiers (hashes/anchors).");if(e!==!1&&m.busy())return m.pushQueue({scope:m,callback:m.pushState,args:arguments,queue:e}),!1;m.busy(!0);var f=m.createStateObject(b,c,d);return m.isLastSavedState(f)?m.busy(!1):(m.storeState(f),m.expectedStateId=f.id,n.pushState(f.id,f.title,f.url),m.Adapter.trigger(a,"popstate")),!0},m.replaceState=function(b,c,d,e){if(m.getHashByUrl(d)&&m.emulated.pushState)throw new Error("History.js does not support states with fragement-identifiers (hashes/anchors).");if(e!==!1&&m.busy())return m.pushQueue({scope:m,callback:m.replaceState,args:arguments,queue:e}),!1;m.busy(!0);var f=m.createStateObject(b,c,d);return m.isLastSavedState(f)?m.busy(!1):(m.storeState(f),m.expectedStateId=f.id,n.replaceState(f.id,f.title,f.url),m.Adapter.trigger(a,"popstate")),!0};if(f){try{m.store=k.parse(f.getItem("History.store"))||{}}catch(p){m.store={}}m.normalizeStore()}else m.store={},m.normalizeStore();m.Adapter.bind(a,"beforeunload",m.clearAllIntervals),m.Adapter.bind(a,"unload",m.clearAllIntervals),m.saveState(m.storeState(m.extractState(d.location.href,!0))),f&&(m.onUnload=function(){var a,b;try{a=k.parse(f.getItem("History.store"))||{}}catch(c){a={}}a.idToState=a.idToState||{},a.urlToId=a.urlToId||{},a.stateToId=a.stateToId||{};for(b in m.idToState){if(!m.idToState.hasOwnProperty(b))continue;a.idToState[b]=m.idToState[b]}for(b in m.urlToId){if(!m.urlToId.hasOwnProperty(b))continue;a.urlToId[b]=m.urlToId[b]}for(b in m.stateToId){if(!m.stateToId.hasOwnProperty(b))continue;a.stateToId[b]=m.stateToId[b]}m.store=a,m.normalizeStore(),f.setItem("History.store",k.stringify(a))},m.intervalList.push(i(m.onUnload,m.options.storeInterval)),m.Adapter.bind(a,"beforeunload",m.onUnload),m.Adapter.bind(a,"unload",m.onUnload));if(!m.emulated.pushState){m.bugs.safariPoll&&m.intervalList.push(i(m.safariStatePoll,m.options.safariPollInterval));if(e.vendor==="Apple Computer, Inc."||(e.appCodeName||"")==="Mozilla")m.Adapter.bind(a,"hashchange",function(){m.Adapter.trigger(a,"popstate")}),m.getHash()&&m.Adapter.onDomLoad(function(){m.Adapter.trigger(a,"hashchange")})}},m.init()}(window)
\ No newline at end of file
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/static/ldt/js/projectscontents.js
--- a/src/ldt/ldt/static/ldt/js/projectscontents.js	Wed Apr 24 12:46:44 2013 +0200
+++ b/src/ldt/ldt/static/ldt/js/projectscontents.js	Sat May 11 23:09:05 2013 +0200
@@ -167,6 +167,8 @@
     	else if(num_page=="next"){
     		num_page = parseInt($('#current_content_page').val()) + 1;
     	}
+    	$('#current_content_page').val(num_page);
+    	update_history();
     	searchCallback($("#searchcontentsinput"),"#contentslistcontainer",content_filter_url,0,num_page,$('#current_content_tag').val());
 	});
     
@@ -178,9 +180,14 @@
     $('.contents_tag',base_node).click(function(e){
     	$('#searchcontentsinput').val("");
     	$('#current_content_tag').val($(this).attr('alt'));
+    	$('#current_content_page').val(0);
+    	update_history();
     	searchCallback($("#searchcontentsinput"),"#contentslistcontainer",content_filter_url,0,0,$('#current_content_tag').val());
 	});
     $("#no_content_tag",base_node).click(function(){
+    	$('#current_content_tag').val("");
+    	$('#current_content_page').val(0);
+    	update_history();
     	searchCallback($("#searchcontentsinput"),"#contentslistcontainer",content_filter_url,0,0);
     });
     
@@ -246,6 +253,8 @@
     	else if(num_page=="next"){
     		num_page = parseInt($('#current_project_page').val()) + 1;
     	}
+    	$('#current_project_page').val(num_page);
+    	update_history();
     	searchCallback($('#searchprojectsinput'), "#projectslistcontainer", searchprojectfilterurl, 0, num_page);
 	});
     
@@ -366,6 +375,14 @@
         	// Validate search only if key is enter or if the call does not come from keyboard
         	if(e.which===13 || e.which==undefined){
         		searchCallback(e.target, value['container_selector'], value['url']);
+        		// History management
+        		if(content_filter_url==value['url']){
+        			$("#current_content_page").val(0);
+        		}
+        		else if(project_filter_url==value['url']){
+        			$("#current_project_page").val(0);
+        		}
+        		update_history();
         	}
         });
     });
@@ -562,3 +579,4 @@
 		$(checkbox_names).trigger("change");
 	});		
 }
+
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/static/ldt/metadataplayer/Annotation.js
--- a/src/ldt/ldt/static/ldt/metadataplayer/Annotation.js	Wed Apr 24 12:46:44 2013 +0200
+++ b/src/ldt/ldt/static/ldt/metadataplayer/Annotation.js	Sat May 11 23:09:05 2013 +0200
@@ -174,6 +174,9 @@
     	e.originalEvent.dataTransfer.setData("text/x-iri-title",currentAnnotation.title);
     	e.originalEvent.dataTransfer.setData("text/x-iri-description",currentAnnotation.description);
     	e.originalEvent.dataTransfer.setData("text/x-iri-uri",url);
+    	if (typeof currentAnnotation.thumbnail !== "undefined" && currentAnnotation.thumbnail) {
+    		e.originalEvent.dataTransfer.setData("text/x-iri-image",currentAnnotation.thumbnail);
+    	}
     });
 }
 
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/static/ldt/metadataplayer/AnnotationsList.js
--- a/src/ldt/ldt/static/ldt/metadataplayer/AnnotationsList.js	Wed Apr 24 12:46:44 2013 +0200
+++ b/src/ldt/ldt/static/ldt/metadataplayer/AnnotationsList.js	Sat May 11 23:09:05 2013 +0200
@@ -234,7 +234,9 @@
 	        	e.originalEvent.dataTransfer.setData("text/x-iri-title",_title);
 	        	e.originalEvent.dataTransfer.setData("text/x-iri-description",_description);
 	        	e.originalEvent.dataTransfer.setData("text/x-iri-uri",_url);
-	        	e.originalEvent.dataTransfer.setData("text/x-iri-image",_thumbnail);
+	        	if (typeof _annotation.thumbnail !== "undefined" && _annotation.thumbnail) {
+	        		e.originalEvent.dataTransfer.setData("text/x-iri-image",_annotation.thumbnail);
+	        	}
 	        });
             _el.on("remove", function() {
                 _annotation.off("select", _onselect);
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/static/ldt/metadataplayer/LdtPlayer-core.js
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/static/ldt/metadataplayer/Polemic.js
--- a/src/ldt/ldt/static/ldt/metadataplayer/Polemic.js	Wed Apr 24 12:46:44 2013 +0200
+++ b/src/ldt/ldt/static/ldt/metadataplayer/Polemic.js	Sat May 11 23:09:05 2013 +0200
@@ -141,6 +141,9 @@
 			        	e.originalEvent.dataTransfer.setData("text/x-iri-title",_annotation.title);
 			        	e.originalEvent.dataTransfer.setData("text/x-iri-description",_annotation.description);
 			        	e.originalEvent.dataTransfer.setData("text/x-iri-uri",url);
+			        	if (typeof _annotation.thumbnail !== "undefined" && _annotation.thumbnail) {
+			        		e.originalEvent.dataTransfer.setData("text/x-iri-image",_annotation.thumbnail);
+			        	}
 			        });
                 _annotation.on("select", function() {
                     if (_this.tooltip) {
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/static/ldt/metadataplayer/Segments.js
--- a/src/ldt/ldt/static/ldt/metadataplayer/Segments.js	Wed Apr 24 12:46:44 2013 +0200
+++ b/src/ldt/ldt/static/ldt/metadataplayer/Segments.js	Sat May 11 23:09:05 2013 +0200
@@ -102,9 +102,12 @@
 	    	var url = (typeof _annotation.url !== "undefined" 
 	                ? _annotation.url
 	                : (document.location.href.replace(/#.*$/,'') + '#id='  + _annotation.id));
-	        	e.originalEvent.dataTransfer.setData("text/x-iri-title",_annotation.title);
-	        	e.originalEvent.dataTransfer.setData("text/x-iri-description",_annotation.description);
-	        	e.originalEvent.dataTransfer.setData("text/x-iri-uri",url);
+	            e.originalEvent.dataTransfer.setData("text/x-iri-title",_annotation.title);
+	            e.originalEvent.dataTransfer.setData("text/x-iri-description",_annotation.description);
+	            e.originalEvent.dataTransfer.setData("text/x-iri-uri",url);
+                if (typeof _annotation.thumbnail !== "undefined" && _annotation.thumbnail) {
+	        	    e.originalEvent.dataTransfer.setData("text/x-iri-image",_annotation.thumbnail);
+	        	}
 	        })
             .appendTo(list_$)
         _annotation.on("select", function() {
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/static/ldt/metadataplayer/Tweet.js
diff -r 615d19953572 -r 54ef33bb4065 src/ldt/ldt/static/ldt/swf/ldt/LignesDeTempsFlex.swf
Binary file src/ldt/ldt/static/ldt/swf/ldt/LignesDeTempsFlex.swf has changed