# HG changeset patch
# User verrierj
# Date 1314714732 -7200
# Node ID 7a44c25db9a54b826f7671e5a18d93212d4de885
# Parent  6d3be9c30cdcf03fefc0e0189c4867e49fe7af8d
Added link to change the language #8

diff -r 6d3be9c30cdc -r 7a44c25db9a5 src/ldt/ldt/templates/ldt/ldt_base.html
--- a/src/ldt/ldt/templates/ldt/ldt_base.html	Mon Aug 29 16:54:23 2011 +0200
+++ b/src/ldt/ldt/templates/ldt/ldt_base.html	Tue Aug 30 16:32:12 2011 +0200
@@ -137,19 +137,6 @@
 		        </div>
 		        {% endif %}
             </div>
-            {% if LANGUAGES.1 %}
-              <div id="language_chooser">            
-                <form action="{{BASE_URL}}enmi/i18n/setlang/" method="post">
-                <input name="next" type="hidden" value="" />
-                <label >{% trans "Langue" %}&nbsp;: </label>
-                <select name="language"  onchange="submit()">
-                {% for lang in LANGUAGES %}
-                <option value="{{ lang.0 }}"{% ifequal lang.0 LANGUAGE_CODE %} selected="selected"{% endifequal %}>{% trans lang.1 %}</option>
-                {% endfor %}    
-                </select>        
-                </form>            
-              </div>  
-            {% endif %}
         {% endblock %}
         </div>
         <div id="inner_content" class="span-24 last">
@@ -162,8 +149,9 @@
         <a href="http://www.iri.centrepompidou.fr"><img src="{{LDT_MEDIA_PREFIX}}/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">{{VERSION}}</span></div>
+        	<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">{{VERSION}}</span></div>
+        	<div id="versionwrapper"><span class="version" id="version">{{WEB_VERSION}}</span></div>          
         </div>
         {% endblock %}
     </div>
diff -r 6d3be9c30cdc -r 7a44c25db9a5 src/ldt/ldt/user/templates/ldt/user/change_language.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/ldt/ldt/user/templates/ldt/user/change_language.html	Tue Aug 30 16:32:12 2011 +0200
@@ -0,0 +1,27 @@
+{% extends "ldt/user/user_base.html" %}
+{# form of language's change #}
+{% load i18n %}
+
+{% block content_title %}{% trans "Language change" %} {% endblock %}
+
+{% block css_import %}
+{{ block.super }}
+    <style type="text/css">
+        label.error { float: none; color: red; padding-left: .5em; vertical-align: middle; }
+    </style>
+{% endblock %}
+
+{% block content %}
+{{ block.super }}
+<p>{% trans "Please change the language" %}</p>
+<form action="{{BASE_URL}}/ldtplatform/i18n/setlang/" method="post">
+	{% csrf_token %}
+	<input name="next" type="hidden" value="" />
+	<label >{% trans "Language" %}&nbsp;: </label>
+	<select name="language"  onchange="submit()">
+	{% for lang in LANGUAGES %}
+		<option value="{{ lang.0 }}"{% ifequal lang.0 LANGUAGE_CODE %} selected="selected"{% endifequal %}>{% trans lang.1 %}</option>
+	{% endfor %}    
+	</select>        
+</form>
+{% endblock%}
diff -r 6d3be9c30cdc -r 7a44c25db9a5 src/ldt/ldt/user/templates/ldt/user/user_base.html
--- a/src/ldt/ldt/user/templates/ldt/user/user_base.html	Mon Aug 29 16:54:23 2011 +0200
+++ b/src/ldt/ldt/user/templates/ldt/user/user_base.html	Tue Aug 30 16:32:12 2011 +0200
@@ -14,7 +14,10 @@
 <ul>
     <li><a href="{% url ldt.user.views.change_password %}" >{% trans "Password change" %} </a></li>
     <li><a href="{% url ldt.user.views.change_email %}">{% trans "Mail change" %}</a></li>
-    <li><a href="{% url ldt.user.views.change_name %}">{% trans "Change user name" %}</a></li>
+    <li><a href="{% url ldt.user.views.change_name %}">{% trans "Name change" %}</a></li>
+    {% if LANGUAGES.1 %}
+    <li><a href="{% url ldt.user.views.change_language %}">{% trans "Language change" %}</a></li> 
+    {% endif %}
 </ul>
 {% endif %}
 <div id="iri-user-content" class="span-24 last">
diff -r 6d3be9c30cdc -r 7a44c25db9a5 src/ldt/ldt/user/urls.py
--- a/src/ldt/ldt/user/urls.py	Mon Aug 29 16:54:23 2011 +0200
+++ b/src/ldt/ldt/user/urls.py	Tue Aug 30 16:32:12 2011 +0200
@@ -7,6 +7,7 @@
     url(r'^emailchange/$', 'ldt.user.views.change_email'),    
     url(r'^namechange/$', 'ldt.user.views.change_name'),
     url(r'^pwdchange/$', 'ldt.user.views.change_password'),
+    url(r'^languagechange/$', 'ldt.user.views.change_language'),
 #    url(r'^space/ldt/$', 'ldt.ldt_utils.views.list_ldt'),
 #    url(r'^space/ldt/indexproject/(?P<id>.*)$', 'ldt.ldt_utils.views.index_project'),
 #    url(r'^space/ldt/init/(?P<method>.*)/(?P<url>.*)$', 'ldt.ldt_utils.views.init'),
diff -r 6d3be9c30cdc -r 7a44c25db9a5 src/ldt/ldt/user/views.py
--- a/src/ldt/ldt/user/views.py	Mon Aug 29 16:54:23 2011 +0200
+++ b/src/ldt/ldt/user/views.py	Tue Aug 30 16:32:12 2011 +0200
@@ -77,3 +77,7 @@
         form = NameChangeForm(request.user)
     return render_to_response('ldt/user/change_name.html', {'form': form, }, context_instance=RequestContext(request))
 
+@login_required   
+def change_language(request):
+    return render_to_response('ldt/user/change_language.html', context_instance=RequestContext(request))
+