--- a/src/ldt/ldt/api/ldt/authentication.py Mon Jul 22 18:46:20 2013 +0200
+++ b/src/ldt/ldt/api/ldt/authentication.py Mon Jul 22 18:56:30 2013 +0200
@@ -3,11 +3,11 @@
from django.utils.http import same_origin
from tastypie.authentication import Authentication
from tastypie.http import HttpUnauthorized
-from django.contrib.auth.models import User
+from django.contrib.auth import get_user_model
from django.contrib.auth import login
from ldt.security import set_current_user
-
+User = get_user_model()
# imported from tastypie's next version 0.9.12
class SessionAuthentication(Authentication):
--- a/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_popup.html Mon Jul 22 18:46:20 2013 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/ldt/ldt_utils/embed_popup.html Mon Jul 22 18:56:30 2013 +0200
@@ -63,12 +63,12 @@
<p class="margin0">{% trans "List of the project's contents" %}:<br/>
<ul>
{% for c in contents %}
- <li>{{ c.title }} - <span class="middle_text">{% trans 'Link to the Metadata Player' %} : <a href="{% url ldt.ldt_utils.views.front.annot_content c.iri_id ldt_id %}" target="_blank">{% trans 'See' %}</a> - </span><span class="click_to_select">{% trans 'Select' %}</span> : <input id="" class="copy_input" value="{% absurl ldt.ldt_utils.views.front.annot_content c.iri_id ldt_id %}"/></li>
+ <li>{{ c.title }} - <span class="middle_text">{% trans 'Link to the Metadata Player' %} : <a href="{% url 'ldt.ldt_utils.views.front.annot_content' c.iri_id ldt_id %}" target="_blank">{% trans 'See' %}</a> - </span><span class="click_to_select">{% trans 'Select' %}</span> : <input id="" class="copy_input" value="{% absurl 'ldt.ldt_utils.views.front.annot_content' c.iri_id ldt_id %}"/></li>
{% endfor %}
</ul>
</p>
<div>{% trans 'project id' %} <span id="project_id_select" class="click_to_select">({% trans 'Select' %})</span> : <input id="project_id_input" class="copy_input" value="{{ldt_id}}"/></div>
- <div>{% trans 'The project in Lignes de Temps' %} : <span class="middle_text"><a href="{% url index_project_full ldt_id %}" target="_blank">{% trans 'See' %}</a> - </span><span class="click_to_select">{% trans 'Select' %}</span> : <input id="" class="copy_input" value="{% absurl index_project_full ldt_id %}"/></div>
+ <div>{% trans 'The project in Lignes de Temps' %} : <span class="middle_text"><a href="{% url 'index_project_full' ldt_id %}" target="_blank">{% trans 'See' %}</a> - </span><span class="click_to_select">{% trans 'Select' %}</span> : <input id="" class="copy_input" value="{% absurl 'index_project_full' ldt_id %}"/></div>
</div>
<br>
<div id="button_row">
@@ -85,7 +85,7 @@
<div style="float: left;">
<div id="links_code" class="ldt_player_code">{% include "ldt/ldt_utils/partial/embed_links.html" %}</div>
<div id="ldt_iframe_code">
- <textarea id="ldt_iframe_id_code" readonly="readonly" class="ldt_player_code" >{% autoescape off %}<iframe src='{% absurl embed_ldt ldt_id %}' width='1005' height='635' seamless='seamless'></iframe>{% endautoescape %}</textarea>
+ <textarea id="ldt_iframe_id_code" readonly="readonly" class="ldt_player_code" >{% autoescape off %}<iframe src="{% absurl 'embed_ldt' ldt_id %}" width='1005' height='635' seamless='seamless'></iframe>{% endautoescape %}</textarea>
</div>
<div id="seo_body_code">
<textarea id="seo_body_id_code" readonly="readonly" class="ldt_player_code" >{{ embed_rendered.seo_body }}</textarea>