# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1437221483 -7200
# Node ID 3097cb0581ac841782fda1e3114b18672a6bb015
# Parent  0679b00bb2f13b7082e170e34f15ba849e28e8cb# Parent  5eecb7d31547e5dc964a3ae0d4b7f482e0fbc130
merge changes from mdp adaptation for remie

diff -r 5eecb7d31547 -r 3097cb0581ac .hgtags
--- a/.hgtags	Fri Jul 03 15:49:04 2015 +0200
+++ b/.hgtags	Sat Jul 18 14:11:23 2015 +0200
@@ -246,3 +246,5 @@
 3e9428287eb122d573cf0e6a3fc3ec54663c8967 V01.56.02
 da3829c1adfb10bfe0cad743ec4f2365ba5940e2 V01.56.02
 5fa85499f70347bb608270ba14fec5a62fd5146d V01.56.03
+eb55bae28748d260855886bafad532e68ee43207 V01.56.04
+0fb6a1bdd10b1e72ca3db5ed68a40b4b744733a4 V01.56.05
diff -r 5eecb7d31547 -r 3097cb0581ac .settings/org.eclipse.core.resources.prefs
--- a/.settings/org.eclipse.core.resources.prefs	Fri Jul 03 15:49:04 2015 +0200
+++ b/.settings/org.eclipse.core.resources.prefs	Sat Jul 18 14:11:23 2015 +0200
@@ -15,5 +15,6 @@
 encoding//src/ldt/ldt/management/utils.py=utf-8
 encoding//src/ldt/ldt/test/test_runner.py=utf-8
 encoding//src/ldt/ldt/text/migrations/0001_initial.py=utf-8
+encoding//src/ldt/ldt/user/migrations/0001_initial.py=utf-8
 encoding//virtualenv/web/env/guardianenv/Lib/site-packages/guardian/migrations/0001_initial.py=utf-8
 encoding/<project>=UTF-8
diff -r 5eecb7d31547 -r 3097cb0581ac src/ldt/ldt/__init__.py
--- a/src/ldt/ldt/__init__.py	Fri Jul 03 15:49:04 2015 +0200
+++ b/src/ldt/ldt/__init__.py	Sat Jul 18 14:11:23 2015 +0200
@@ -1,6 +1,6 @@
 __all__ = ["VERSION", "get_version", "__version__"]
 
-VERSION = (1, 56, 03, "final", 0)
+VERSION = (1, 56, 05, "final", 0)
 
 
 def get_version():
diff -r 5eecb7d31547 -r 3097cb0581ac src/ldt/ldt/ldt_utils/templates/front/front_base.html
--- a/src/ldt/ldt/ldt_utils/templates/front/front_base.html	Fri Jul 03 15:49:04 2015 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/front/front_base.html	Sat Jul 18 14:11:23 2015 +0200
@@ -13,8 +13,8 @@
     <link rel="SHORTCUT ICON" href='{% static "ldt/img/favicon.ico" %}' />
     <title>{% block title %}Lignes de temps{% endblock %}</title>
     {% block js_import %}
-    	<script src='{% static "ldt/js/jquery.min.js" %}' type="text/javascript"></script>
-    	<script src='{% static "ldt/js/jquery.textchange.min.js" %}' type="text/javascript"></script>
+        <script src='{% static "ldt/js/jquery.min.js" %}' type="text/javascript"></script>
+        <script src='{% static "ldt/js/jquery.textchange.min.js" %}' type="text/javascript"></script>
     {% endblock %}
     {% block css_declaration %}{% endblock %}
     {% block css_import %}
@@ -22,17 +22,17 @@
     {% endblock %}
     {% block js_declaration %}
     <script type="text/javascript">
-    	$(document).ready(function () {    		
-    		$("#id_search").bind('hastext', function () {
-				$("#search_submit").addClass('search_valid').removeClass('search_invalid');
-				$("#search_submit").removeAttr('disabled');			
-    		});
-    		$("#id_search").bind('notext', function () {
-				$("#search_submit").addClass('search_invalid').removeClass('search_valid');
-				$("#search_submit").attr('disabled', 'disabled');
-    		});
-    	});
-    </script>    
+        $(document).ready(function () {            
+            $("#id_search").bind('hastext', function () {
+                $("#search_submit").addClass('search_valid').removeClass('search_invalid');
+                $("#search_submit").removeAttr('disabled');
+            });
+            $("#id_search").bind('notext', function () {
+                $("#search_submit").addClass('search_invalid').removeClass('search_valid');
+                $("#search_submit").attr('disabled', 'disabled');
+            });
+        });
+    </script>
     {% endblock %}
 {% endblock %}
 </head>
@@ -67,10 +67,10 @@
         
         <li id="li_connexion">
              {% if user.is_authenticated %}
-             	<a href="{% url 'ldt.user.views.logout_view' %}" title="{% trans "Log out" %}">{% trans "Log out" %}</a>
+                 <a href="{% url 'ldt.user.views.logout_view' %}" title="{% trans "Log out" %}">{% trans "Log out" %}</a>
              {% else %}
-             	<a href="{% url 'auth_login' %}" title="{% trans "Log in" %}">{% trans "Log in" %}</a>
-             {% endif %}       
+                 <a href="{% url 'auth_login' %}" title="{% trans "Log in" %}">{% trans "Log in" %}</a>
+             {% endif %}
         </li>
     </ul>
 {% block body %}
@@ -79,7 +79,7 @@
 <!-- FOOTER COMMUN -->
     <ul id="footer">
         <li>{% blocktrans %}{{WEB_VERSION}} | {{ VERSION }}{% endblocktrans %}</li>
-        <li>©2013 IRI</li>
+        <li>©{% now "Y" %} IRI</li>
         <li>
             <a target="_blank" href="http://www.iri.centrepompidou.fr" title="{% trans 'link IRI'%}">{% trans "about" %}</a>
         </li>
diff -r 5eecb7d31547 -r 3097cb0581ac src/ldt/ldt/ldt_utils/views/embed/v1/views.py
--- a/src/ldt/ldt/ldt_utils/views/embed/v1/views.py	Fri Jul 03 15:49:04 2015 +0200
+++ b/src/ldt/ldt/ldt_utils/views/embed/v1/views.py	Sat Jul 18 14:11:23 2015 +0200
@@ -5,8 +5,8 @@
 
 class ConfigViewV1(ConfigView):
     template_name = "ldt/ldt_utils/embed/v1/mdplayer_config.html"
-    iframe_base_url = reverse_lazy("embed_iframe_v1", urlconf="ldtplatform.urls")
+    iframe_base_url = reverse_lazy("embed_iframe_v1")#, urlconf="ldtplatform.urls")
     
 class IframeViewV1(IframeView):
     template_name = "ldt/ldt_utils/embed/v1/iframe.html"
-    iframe_base_url = reverse_lazy("embed_iframe_v1", urlconf="ldtplatform.urls")
\ No newline at end of file
+    iframe_base_url = reverse_lazy("embed_iframe_v1")#, urlconf="ldtplatform.urls")
\ No newline at end of file
diff -r 5eecb7d31547 -r 3097cb0581ac src/ldt/ldt/ldt_utils/views/embed/v2/views.py
--- a/src/ldt/ldt/ldt_utils/views/embed/v2/views.py	Fri Jul 03 15:49:04 2015 +0200
+++ b/src/ldt/ldt/ldt_utils/views/embed/v2/views.py	Sat Jul 18 14:11:23 2015 +0200
@@ -15,11 +15,11 @@
 
 class ConfigViewV2(ConfigView):
     template_name = "ldt/ldt_utils/embed/v2/mdplayer_config.html"
-    iframe_base_url = reverse_lazy("embed_iframe_v2", urlconf="ldtplatform.urls")
+    iframe_base_url = reverse_lazy("embed_iframe_v2")#, urlconf="ldtplatform.urls")
     
 class IframeViewV2(IframeView):
     template_name = "ldt/ldt_utils/embed/v2/iframe.html"
-    iframe_base_url = reverse_lazy("embed_iframe_v2", urlconf="ldtplatform.urls")
+    iframe_base_url = reverse_lazy("embed_iframe_v2")#, urlconf="ldtplatform.urls")
     
     def get(self, request):
         content_id = request.GET.get("content_id")
diff -r 5eecb7d31547 -r 3097cb0581ac src/ldt/ldt/static/ldt/img/user_default_icon.png
Binary file src/ldt/ldt/static/ldt/img/user_default_icon.png has changed
diff -r 5eecb7d31547 -r 3097cb0581ac src/ldt/ldt/templates/ldt/ldt_base.html
--- a/src/ldt/ldt/templates/ldt/ldt_base.html	Fri Jul 03 15:49:04 2015 +0200
+++ b/src/ldt/ldt/templates/ldt/ldt_base.html	Sat Jul 18 14:11:23 2015 +0200
@@ -6,10 +6,10 @@
 {% load thumbnail %}
 
 {% block js_import %}
-	<script type="text/javascript">
-		var project_load_src = '{% static "ldt/img/ajax-loader-transp.gif" %}'; // Required for search bar icon in projectscontents.js
-	</script>
-	
+    <script type="text/javascript">
+        var project_load_src = '{% static "ldt/img/ajax-loader-transp.gif" %}'; // Required for search bar icon in projectscontents.js
+    </script>
+    
     {{ block.super }}
     <script type="text/javascript" src='{% static "ldt/js/jquery.nyroModal.min.js" %}'></script>
     <!--[if IE 6]>
@@ -87,9 +87,9 @@
             <p><a href="{% url 'ldt.ldt_utils.views.workspace.home' %}">{% block base_title %}{% trans "header_title" %}{% endblock %}</a></p>
         </div>
         <div id="loginstate" >
-	        {% if user.is_staff %}
-	        	<a href="{% url 'admin:index' %}" title="{% trans "Link to admin" %}">{% trans "Staff" %}</a>|
-	        {% endif %}
+            {% if user.is_staff %}
+                <a href="{% url 'admin:index' %}" title="{% trans "Link to admin" %}">{% trans "Staff" %}</a>|
+            {% endif %}
             {% if user.is_authenticated %}
             <a href="{% url 'front_home' %}" title="{% trans "front link" %}">{% trans "front link" %}</a> |            
             <a href="{% url 'ldt.user.views.profile' %}"  title="{% trans "Profile change" %}">
@@ -123,14 +123,14 @@
                 {% endif %}
                 </div>
                 {% if user.is_authenticated %}
-		        <div class="block span-4 last">
-		            <form method="get" id="quick_search_form" action="{% url 'ldt.ldt_utils.views.workspace.search_index' %}" title="{% trans "search"%}" accept-charset="utf-8">
-					<input type="text" name="search" id="id_search" size="16"/>
-					<input type='hidden' name='field' value='all' />
-					<input type="submit" class="quick_search_submit" value="" />					
-					</form>
-		        </div>
-		        {% endif %}
+                <div class="block span-4 last">
+                    <form method="get" id="quick_search_form" action="{% url 'ldt.ldt_utils.views.workspace.search_index' %}" title="{% trans "search"%}" accept-charset="utf-8">
+                    <input type="text" name="search" id="id_search" size="16"/>
+                    <input type='hidden' name='field' value='all' />
+                    <input type="submit" class="quick_search_submit" value="" />
+                    </form>
+                </div>
+                {% endif %}
             </div>
         {% endblock %}
         </div>
@@ -144,8 +144,8 @@
         <a href="http://www.iri.centrepompidou.fr"><img src='{% static "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>
-        	<div id="versionwrapper"><span class="version" id="version" title="{% trans "Version number" %}"> {% blocktrans %} web {{WEB_VERSION}} | platform {{ VERSION }}{% endblocktrans %}</span></div>
+            <div>©{% now "Y" %} <a style="text-decoration: none; color: #4F5155;" href="http://www.iri.centrepompidou.fr">IRI</a></div>
+            <div id="versionwrapper"><span class="version" id="version" title="{% trans "Version number" %}"> {% blocktrans %} web {{WEB_VERSION}} | platform {{ VERSION }}{% endblocktrans %}</span></div>
         </div>
         {% endblock %}
     </div>
diff -r 5eecb7d31547 -r 3097cb0581ac src/ldt/ldt/user/migrations/0001_initial.py
--- a/src/ldt/ldt/user/migrations/0001_initial.py	Fri Jul 03 15:49:04 2015 +0200
+++ b/src/ldt/ldt/user/migrations/0001_initial.py	Sat Jul 18 14:11:23 2015 +0200
@@ -31,10 +31,12 @@
                 ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
                 ('language', models.CharField(default=ldt.user.models.get_ldtuser_language_default, max_length=2)),
                 ('image', sorl.thumbnail.fields.ImageField(default=ldt.user.models.get_ldtuser_image_default, max_length=200, upload_to=b'thumbnails/users/')),
-                ('groups', models.ManyToManyField(related_query_name='user', related_name='user_set', to='auth.Group', blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', verbose_name='groups')),
-                ('user_permissions', models.ManyToManyField(related_query_name='user', related_name='user_set', to='auth.Permission', blank=True, help_text='Specific permissions for this user.', verbose_name='user permissions')),
+                ('groups', models.ManyToManyField(related_query_name='user', related_name='user_set', to=b'auth.Group', blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', verbose_name='groups')),
+                ('user_permissions', models.ManyToManyField(related_query_name='user', related_name='user_set', to=b'auth.Permission', blank=True, help_text='Specific permissions for this user.', verbose_name='user permissions')),
             ],
             options={
+                'verbose_name': 'user',
+                'verbose_name_plural': 'users',
                 'permissions': ((),),
             },
         ),
@@ -47,4 +49,8 @@
                 ('group', models.OneToOneField(related_name='profile', to='auth.Group')),
             ],
         ),
+        migrations.AlterModelOptions(
+            name='ldtuser',
+            options={'verbose_name': 'user', 'verbose_name_plural': 'users'},
+        ),
     ]
diff -r 5eecb7d31547 -r 3097cb0581ac src/ldt/ldt/user/models.py
--- a/src/ldt/ldt/user/models.py	Fri Jul 03 15:49:04 2015 +0200
+++ b/src/ldt/ldt/user/models.py	Sat Jul 18 14:11:23 2015 +0200
@@ -7,10 +7,10 @@
 from django.db.models.signals import post_save
 from django.utils import timezone
 from sorl.thumbnail import ImageField
-from south.signals import post_migrate
+from django.db.models.signals import post_migrate
 
 
-class LdtUserManager(BaseUserManager):    
+class LdtUserManager(BaseUserManager):
 
     def create_user(self, username, email=None, password=None, **extra_fields):
         """