--- a/src/jocondelab/static/jocondelab/css/front-common.css	Mon Sep 30 14:27:18 2013 +0200
+++ b/src/jocondelab/static/jocondelab/css/front-common.css	Tue Oct 01 18:00:11 2013 +0200
@@ -138,7 +138,11 @@
 }
 
 footer {
-    padding: 40px 0 20px; text-align: right;
+    padding: 40px 0 20px; text-align: right; font-size: 16px;
+}
+
+footer img {
+    vertical-align: middle; margin: 0 10px;
 }
 
 input {
@@ -499,11 +503,7 @@
 }
 
 @media screen and (max-width: 540px) {
-    
-    .header-widgets {
-        width: 100%;
-    }
-    
+        
     .language-menu-link {
         display: table-cell;
     }

--- a/src/jocondelab/static/jocondelab/css/front-geo.css	Mon Sep 30 14:27:18 2013 +0200
+++ b/src/jocondelab/static/jocondelab/css/front-geo.css	Tue Oct 01 18:00:11 2013 +0200
@@ -16,3 +16,14 @@
     border: none; margin: 10px; border-radius: 4px;
 }
 
+@media screen and (max-height: 520px) {
+    .map-container {
+        height: 300px;
+    }
+}
+
+@media screen and (max-height: 360px) {
+    .map-container {
+        height: 200px;
+    }
+}

--- a/src/jocondelab/static/jocondelab/css/front-home.css	Mon Sep 30 14:27:18 2013 +0200
+++ b/src/jocondelab/static/jocondelab/css/front-home.css	Tue Oct 01 18:00:11 2013 +0200
@@ -7,24 +7,14 @@
 }
 
 .module-item {
-    width: 25%; height: 120px; float: left;
-    background: -webkit-linear-gradient(to right bottom, #ffffff 0%, #f0f0f0 100%);
+    float: left;
+    background: linear-gradient(to right bottom, #ffffff 0%, #f0f0f0 100%);
     background: -moz-linear-gradient(to right bottom, #ffffff 0%, #f0f0f0 100%);
-}
-
-@media screen and (max-width: 760px) and (min-width: 400px){
-    .module-item {
-        width: 50%;
-    }
-}
-
-@media screen and (max-width: 400px) {
-    .module-item {
-        width: 100%;
-    }
+    background: -webkit-linear-gradient(to right bottom, #ffffff 0%, #f0f0f0 100%);
 }
 
 .module-item:hover {
+    background: linear-gradient(to right bottom, #f0f0f0 0%, #ffffff 100%);
     background: -webkit-linear-gradient(to right bottom, #f0f0f0 0%, #ffffff 100%);
     background: -moz-linear-gradient(to right bottom, #f0f0f0 0%, #ffffff 100%);
 }

--- a/src/jocondelab/static/jocondelab/css/front-notice.css	Mon Sep 30 14:27:18 2013 +0200
+++ b/src/jocondelab/static/jocondelab/css/front-notice.css	Tue Oct 01 18:00:11 2013 +0200
@@ -10,6 +10,18 @@
     max-width: 100%; max-height: 420px;
 }
 
+.describe-mode .notice-images {
+    float: none; margin: 15px 0; text-align: center; width: 100%;
+}
+
+.describe-mode .notice-images li {
+    margin: 0; box-shadow: 0 0 3px #999999; display: inline-block; max-width: 100%;
+}
+
+.describe-mode .notice-images img {
+    max-height: 500px;
+}
+
 .notice-colright-wrapper {
     float: right; width: 67%; margin-top: 10px;
 }
@@ -28,7 +40,7 @@
 }
 
 .notice-datasheet {
-    font-size: 13px;
+    font-size: 13px; line-height: 1.2 em;
 }
 
 .datasheet-title {
@@ -48,7 +60,7 @@
 }
 
 .notice-datasheet th, .notice-datasheet td {
-    line-height: 1.2em; padding-top: 8px;
+    padding-top: 10px;
 }
 
 .notice-term {

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jocondelab/static/jocondelab/js/front-home.js	Tue Oct 01 18:00:11 2013 +0200
@@ -0,0 +1,20 @@
+$(function() {
+    var $items = $(".module-item");
+    
+    function resizeMenuItems() {
+        var baseWidth = $(".main").width(),
+            h = 0,
+            n = Math.min($items.length, Math.floor(baseWidth/150)),
+            w = Math.floor(baseWidth/n);
+        console.log(n,w);
+        $items.css("width", w + "px");
+        $items.each(function() {
+            var $this = $(this);
+            h = Math.max(h, $this.find("h3").outerHeight(true) + $this.find("p").outerHeight(true));
+        });
+        $items.css("height", h + "px");
+    }
+    
+    $(window).resize(resizeMenuItems);
+    resizeMenuItems();
+});

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/jocondelab/static/jocondelab/lib/jquery.ui.touch-punch.min.js	Tue Oct 01 18:00:11 2013 +0200
@@ -0,0 +1,11 @@
+/*
+ * jQuery UI Touch Punch 0.2.2
+ *
+ * Copyright 2011, Dave Furfero
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ *
+ * Depends:
+ *  jquery.ui.widget.js
+ *  jquery.ui.mouse.js
+ */
+(function(b){b.support.touch="ontouchend" in document;if(!b.support.touch){return;}var c=b.ui.mouse.prototype,e=c._mouseInit,a;function d(g,h){if(g.originalEvent.touches.length>1){return;}g.preventDefault();var i=g.originalEvent.changedTouches[0],f=document.createEvent("MouseEvents");f.initMouseEvent(h,true,true,window,1,i.screenX,i.screenY,i.clientX,i.clientY,false,false,false,false,0,null);g.target.dispatchEvent(f);}c._touchStart=function(g){var f=this;if(a||!f._mouseCapture(g.originalEvent.changedTouches[0])){return;}a=true;f._touchMoved=false;d(g,"mouseover");d(g,"mousemove");d(g,"mousedown");};c._touchMove=function(f){if(!a){return;}this._touchMoved=true;d(f,"mousemove");};c._touchEnd=function(f){if(!a){return;}d(f,"mouseup");d(f,"mouseout");if(!this._touchMoved){d(f,"click");}a=false;};c._mouseInit=function(){var f=this;f.element.bind("touchstart",b.proxy(f,"_touchStart")).bind("touchmove",b.proxy(f,"_touchMove")).bind("touchend",b.proxy(f,"_touchEnd"));e.call(f);};})(jQuery);
\ No newline at end of file

--- a/src/jocondelab/templates/jocondelab/front_base.html	Mon Sep 30 14:27:18 2013 +0200
+++ b/src/jocondelab/templates/jocondelab/front_base.html	Tue Oct 01 18:00:11 2013 +0200
@@ -5,7 +5,7 @@
     <head>
     {% block head %}
     	<meta charset="UTF-8" />
-    	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=false">
+    	<meta name="viewport" content="width=device-width, initial-scale=1">
         <link rel="SHORTCUT ICON" href="{{STATIC_URL}}jocondelab/img/favicon.ico" />
         <title>{% block title %}JocondeLab{% endblock %}</title>
         
@@ -14,6 +14,7 @@
         <script type="text/javascript" src="{{STATIC_URL}}jocondelab/lib/underscore-min.js"></script>
         <script type="text/javascript" src="{{STATIC_URL}}jocondelab/lib/jquery.min.js"></script>
         <script type="text/javascript" src="{{STATIC_URL}}jocondelab/lib/jquery-ui.min.js"></script>
+        <script type="text/javascript" src="{{STATIC_URL}}jocondelab/lib/jquery.ui.touch-punch.min.js"></script>
         <script type="text/javascript" src="{{STATIC_URL}}jocondelab/lib/tag-it.min.js"></script>
         {% endblock %}
         
@@ -82,20 +83,32 @@
         </form>
         <div class="menus-wrapper">
             <ul class="main-menu menu-list">
-                <li class="menu-item">
-                    <a href="{% url 'front_home' %}">{% trans 'Accueil' %}</a>
+                {% url 'front_home' as url %}
+                <li class="menu-item{% if request.path == url %} menu-item-current{% endif %}">
+                    <a href="{{url}}">{% trans 'Accueil' %}</a>
+                </li>
+                {% url 'front_about' as url %}
+                <li class="menu-item{% if request.path == url %} menu-item-current{% endif %}">
+                    <a href="{{url}}">{% trans 'À propos' %}</a>
+                </li>
+                {% url 'front_geo' as url %}
+                <li class="menu-item{% if request.path == url %} menu-item-current{% endif %}">
+                    <a href="{{url}}">{% trans 'Mappemonde' %}</a>
                 </li>
-                <li class="menu-item">
-                    <a href="{% url 'front_termlist' %}">{% trans 'Liste des termes' %}</a>
+                {% url 'front_timeline' as url %}
+                <li class="menu-item{% if request.path == url %} menu-item-current{% endif %}">
+                    <a href="{{url}}">{% trans 'Frise chronologique' %}</a>
+                </li>
+                {% url 'front_termlist' as url %}
+                <li class="menu-item{% if request.path == url %} menu-item-current{% endif %}">
+                    <a href="{{url}}">{% trans 'Index' %}</a>
+                </li>
+                {% url 'random_describe' as url %}
+                <li class="menu-item{% if request.path == url %} menu-item-current{% endif %}">
+                    <a href="{{url}}">{% trans "Contribuer" %}</a>
                 </li>
                 <li class="menu-item">
-                    <a href="{% url 'front_timeline' %}">{% trans 'Frise chronologique' %}</a>
-                </li>
-                <li class="menu-item">
-                    <a href="{% url 'front_geo' %}">{% trans 'Mappemonde' %}</a>
-                </li>
-                <li class="menu-item">
-                    <a href="{% url 'random_describe' %}">{% trans "Contribuer à l'iconographie" %}</a>
+                    <a href="{% url 'front_about' %}">{% trans 'Travaux étudiants' %}</a>
                 </li>
             </ul>
         </div>
@@ -106,7 +119,15 @@
             </section>
             <footer>
             {% block footer %}
-                <p>&copy; 2013 Institut de Recherche et d'Innovation et Ministère de la Culture et de la Communication</p>
+                <p>Ce site vous est proposé par
+                    <a href="http://www.culture.gouv.fr/" title="Ministère de la Culture et de la Communication" target="_blank">
+                        <img src="{{STATIC_URL}}jocondelab/img/logo_mcc_footer.png" alt="Logo du Ministère de la Culture et de la Communication" />
+                    </a>
+                    et
+                    <a href="http://www.iri.centrepompidou.fr/" title="Institut de Recherche et d'Innovation" target="_blank">
+                        <img src="{{STATIC_URL}}jocondelab/img/logo_IRI_footer.png" alt="Logo de l'Institut de Recherche et d'Innovation" />
+                    </a>
+                </p>
             {% endblock %}
             </footer>
         </div>

--- a/src/jocondelab/templates/jocondelab/front_describe.html	Mon Sep 30 14:27:18 2013 +0200
+++ b/src/jocondelab/templates/jocondelab/front_describe.html	Tue Oct 01 18:00:11 2013 +0200
@@ -1,17 +1,22 @@
 {% extends "jocondelab/front_notice.html" %}
 {% load i18n %}
 
-{% block title %}JocondeLab » {% trans "Contribuer à l'iconographie" %}{% endblock %}
-
-{% block breadcrumbs %}<a href="{% url 'random_describe' %}">{% trans "Contibuer à l'iconographie" %}</a>{% endblock %}
+{% block title %}JocondeLab &raquo; {% trans "Contribuer" %}{% endblock %}
 
-{% block contribution %}
+{% block breadcrumbs %}<a href="{% url 'random_describe' %}">{% trans "Contribuer" %}</a>{% endblock %}
+{% block main %}
+<div class="describe-mode">
+    {% block images %}{{block.super}}{% endblock %}
+    {% block contribution %}
     <form class="contribution-frame description-frame">
-        <h2>{% trans "Complétez l'iconographie" %}</h2>
+        <h2>{% trans "Décrivez le sujet de cette œuvre" %}</h2>
         <input class="notice-contribution-field" data-thesaurus-label="REPR" type="text" size="60" placeholder="{% trans 'Que voyez-vous dans cette oeuvre ?' %}" />
         <ul class="notice-term-list notice-contribution-list contribution-novote"></ul>
         <p class="button-links">
-            <a href="{% url 'random_describe' %}">{% trans 'Décrire une autre oeuvre' %}</a>
+            <a href="{% url 'random_describe' %}">{% trans 'Œuvre suivante' %}</a>
         </p>
     </form>
+    {% endblock %}
+    {% block datasheet %}{{block.super}}{% endblock %}
+</div>
 {% endblock %}

--- a/src/jocondelab/templates/jocondelab/front_home.html	Mon Sep 30 14:27:18 2013 +0200
+++ b/src/jocondelab/templates/jocondelab/front_home.html	Tue Oct 01 18:00:11 2013 +0200
@@ -1,6 +1,11 @@
 {% extends "jocondelab/front_search.html" %}
 {% load i18n %}
 
+{% block js_declaration %}
+{{block.super}}
+    <script type="text/javascript" src="{{STATIC_URL}}jocondelab/js/front-home.js"></script>
+{% endblock %}
+
 {% block css_declaration %}
 {{block.super}}
     <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}jocondelab/css/front-home.css" />
@@ -16,27 +21,27 @@
             
             <ul class="module-list">
                 <li class="module-item">
-                    <h3><a href="{% url 'front_termlist' %}">{% trans 'Liste des termes' %}</a></h3>
+                    <h3><a href="{% url 'front_about' %}">{% trans "À propos" %}</a></h3>
+                    <p>{% trans "Tout savoir sur l'expérimentation JocondeLab" %}</p>
+                </li>
+                <li class="module-item">
+                    <h3><a href="{% url 'front_geo' %}">{% trans "Mappemonde" %}</a></h3>
+                    <p>{% trans "Découvrez le monde à travers les collections des musées de France" %}</p>
+                </li>
+                <li class="module-item">
+                    <h3><a href="{% url 'front_timeline' %}">{% trans "Frise chronologique" %}</a></h3>
+                    <p>{% trans "Découvrez les collections des musées de France au fil du temps (période ou date précise)" %}</p>
+                </li>
+                <li class="module-item">
+                    <h3><a href="{% url 'front_termlist' %}">{% trans "Index" %}</a></h3>
                     <p>Court texte de présentation de la liste de termes</p>
                 </li>
                 <li class="module-item">
-                    <h3><a href="{% url 'front_timeline' %}">{% trans 'Frise chronologique' %}</a></h3>
-                    <p>Court texte de présentation de la frise chronologique</p>
-                </li>
-                <li class="module-item">
-                    <h3><a href="{% url 'front_geo' %}">{% trans 'Mappemonde' %}</a></h3>
-                    <p>Court texte de présentation de la mappemonde</p>
+                    <h3><a href="{% url 'random_describe' %}">{% trans "Contribuer" %}</a></h3>
+                    <p>{% trans "Aidez-nous à décrire le sujet d'une œuvre à l'aide de Wikipédia" %}</p>
                 </li>
                 <li class="module-item">
-                    <h3><a href="{% url 'random_describe' %}">{% trans "Contribuer à l'iconographie" %}</a></h3>
-                    <p>Court texte de présentation de la contribution iconographique</p>
-                </li>
-                <li class="module-item">
-                    <h3><a href="{% url 'front_about' %}">{% trans 'À propos' %}</a></h3>
-                    <p>Pour en savoir plus</p>
-                </li>
-                <li class="module-item">
-                    <h3><a href="{% url 'front_about' %}">{% trans 'Travaux étudiants' %}</a></h3>
+                    <h3><a href="{% url 'front_about' %}">{% trans "Travaux étudiants" %}</a></h3>
                     <p>Les travaux des étudiants des Gobelins</p>
                 </li>
             </ul>

--- a/src/jocondelab/templates/jocondelab/front_notice.html	Mon Sep 30 14:27:18 2013 +0200
+++ b/src/jocondelab/templates/jocondelab/front_notice.html	Tue Oct 01 18:00:11 2013 +0200
@@ -37,10 +37,11 @@
 {% block main %}
             <div class="notice-colright-wrapper">
                 <div class="notice-colright">
+    {% block datasheet %}
                     <table class="notice-datasheet">
                     {% if object.autr %}
                         <tr class="datasheet-title">
-                            <th>{% trans 'Auteur(s)&nbsp;:' %}</th>
+                            <th>{% trans 'Artiste(s)&nbsp;:' %}</th>
                             <td>{% show_datasheet_row 'AUTR' %}</td>
                         </tr>
                     {% endif %}
@@ -62,10 +63,16 @@
                             <td>{% show_datasheet_row 'TITR' %}{% show_datasheet_row 'APPL' %}{% show_datasheet_row 'DENO' %}</td>
                         </tr>
                     {% endif %}
-                    {% if object.repr or object.srep %}
+                    {% if object.repr %}
                         <tr>
                             <th>{% trans 'Sujet représenté&nbsp;:' %}</th>
-                            <td>{% show_datasheet_row 'REPR' %}{% show_datasheet_row 'SREP' %}</td>
+                            <td>{% show_datasheet_row 'REPR' %}</td>
+                        </tr>
+                    {% endif %}
+                    {% if object.srep %}
+                        <tr>
+                            <th>{% trans 'Source&nbsp;:' %}</th>
+                            <td>{% show_datasheet_row 'SREP' %}</td>
                         </tr>
                     {% endif %}
                     {% if object.peri or object.mill or object.epoq %}
@@ -76,7 +83,7 @@
                     {% endif %}
                     {% if object.tech %}
                         <tr>
-                            <th>{% trans 'Matériaux / Techniques&nbsp;:' %}</th>
+                            <th>{% trans 'Techniques&nbsp;:' %}</th>
                             <td>{% show_datasheet_row 'TECH' %}</td>
                         </tr>
                     {% endif %}
@@ -100,7 +107,7 @@
                     {% endif %}
                     {% if object.loca %}
                         <tr>
-                            <th>{% trans 'Lieu de conservation&nbsp;:' %}</th>
+                            <th>{% trans 'Conservé à&nbsp;:' %}</th>
                             <td>{% show_datasheet_row 'LOCA' %}</td>
                         </tr>
                     {% endif %}
@@ -119,12 +126,13 @@
                     </table>
 
                     <p class="notice-jocondelink">
-                        <a href="{{JOCONDE_NOTICE_BASE_URL}}{{ notice.ref }}" target="_blank">{% trans 'Visiter sur le portail Joconde' %}</a>
+                        <a href="{{JOCONDE_NOTICE_BASE_URL}}{{ notice.ref }}" target="_blank">{% trans 'Cette œuvre sur le portail Joconde' %}</a>
                     </p>
+    {% endblock %}
 
-{% block contribution %}
+    {% block contribution %}
                     <form class="contribution-frame folksonomy-frame">
-                        <h2>{% trans 'Contribution (Folksonomie)' %}</h2>
+                        <h2>{% trans "Apportez d'autres informations à partir des vocabulaires de Wikipédia" %}</h2>
                         <input class="notice-contribution-field" type="text" size="60" placeholder="{% trans 'Complétez les mots-clés de la fiche' %}" />
                         <ul class="notice-term-list notice-contribution-list">
                         {% for term in contributions %}
@@ -132,10 +140,11 @@
                         {% endfor %}
                         </ul>
                     </form>
-{% endblock %}
+    {% endblock %}
 
                 </div>
             </div>
+    {% block images %}
             <ul class="notice-images">
                 {% for img in images %}
                 <li>
@@ -145,4 +154,5 @@
                 </li>
                 {% endfor %}
             </ul>
+    {% endblock %}
 {% endblock %}

--- a/src/jocondelab/templates/jocondelab/front_termlist.html	Mon Sep 30 14:27:18 2013 +0200
+++ b/src/jocondelab/templates/jocondelab/front_termlist.html	Tue Oct 01 18:00:11 2013 +0200
@@ -11,9 +11,9 @@
     <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}jocondelab/css/front-termlist.css" />
 {% endblock %}
 
-{% block title %}JocondeLab &raquo; {% trans 'Liste des termes' %}{% endblock %}
+{% block title %}JocondeLab &raquo; {% trans 'Index' %}{% endblock %}
 
-{% block breadcrumbs %}<a href="{% url 'front_termlist' %}">{% trans 'Liste des termes' %}</a>{% endblock %}
+{% block breadcrumbs %}<a href="{% url 'front_termlist' %}">{% trans 'Index' %}</a>{% endblock %}
 
 {% block main %}
             
@@ -27,16 +27,16 @@
             
             <ul class="term-tabs">
                 <li class="term-tab{% if thesaurus == 'AUTR' %} active{% endif %}">
-                    <h2><a href="{% url 'front_termlist' %}?thesaurus=AUTR">{% trans "Auteurs" %}</a></h2>
+                    <h2><a href="{% url 'front_termlist' %}?thesaurus=AUTR">{% trans "Artistes" %}</a></h2>
                 </li>
                 <li class="term-tab{% if thesaurus == 'REPR' %} active{% endif %}">
-                    <h2><a href="{% url 'front_termlist' %}?thesaurus=REPR">{% trans "Sujets Représentés" %}</a></h2>
+                    <h2><a href="{% url 'front_termlist' %}?thesaurus=REPR">{% trans "Sujets représentés" %}</a></h2>
                 </li>
                 <li class="term-tab{% if thesaurus == 'DOMN' %} active{% endif %}">
-                    <h2><a href="{% url 'front_termlist' %}?thesaurus=DOMN">{% trans "Domaines" %}</a></h2>
+                    <h2><a href="{% url 'front_termlist' %}?thesaurus=DOMN">{% trans "Catégories" %}</a></h2>
                 </li>
                 <li class="term-tab{% if thesaurus == 'EPOQ' %} active{% endif %}">
-                    <h2><a href="{% url 'front_termlist' %}?thesaurus=EPOQ">{% trans "Epoques" %}</a></h2>
+                    <h2><a href="{% url 'front_termlist' %}?thesaurus=EPOQ">{% trans "Époques" %}</a></h2>
                 </li>
             </ul>
             

--- a/src/jocondelab/templates/jocondelab/front_timeline.html	Mon Sep 30 14:27:18 2013 +0200
+++ b/src/jocondelab/templates/jocondelab/front_timeline.html	Tue Oct 01 18:00:11 2013 +0200
@@ -25,7 +25,7 @@
 
 {% block main %}
             
-            <h2 class="timeline-section-title">{% trans 'Rechercher par période nommée' %}</h2>
+            <h2 class="timeline-section-title">{% trans 'Recherche par période' %}</h2>
             <div class="timeline-wrapper">
                 <div class="timeline-container">
                     <canvas class="timeline-canvas"></canvas>
@@ -37,7 +37,7 @@
                     <a class="timeline-zoom-button timeline-zoom-out" href="#"></a>
                 </div>
             </div>
-            <h2 class="timeline-section-title">{% trans 'Rechercher par millésime' %}</h2>
+            <h2 class="timeline-section-title">{% trans 'Recherche par date' %}</h2>
             <div class="timeline-mill-slider"></div>
             <button class="timeline-mill-submit">
                 {% trans 'Afficher les contenus de ' %}

--- a/src/jocondelab/templates/jocondelab/partial/wrapped_notice_list.html	Mon Sep 30 14:27:18 2013 +0200
+++ b/src/jocondelab/templates/jocondelab/partial/wrapped_notice_list.html	Tue Oct 01 18:00:11 2013 +0200
@@ -1,7 +1,7 @@
 {% load i18n %}
 {% load jlutils %}
 
-<h2 class="resultcount"><b>{{count}}</b> {% if searchterm %}{% trans 'résultats pour :' %} <b>{{searchterm}}</b>{% else %}{% trans 'résultats' %}{% endif %}</h2>
+<h2 class="resultcount"><b>{{count}}</b> {% if searchterm %}{% trans 'résultats pour :' %} <b>{{searchterm}}</b>{% else %}{% trans 'œuvres des musées de France' %}{% endif %}</h2>
 
 <ul class="notice-list clearfix"{% if page_count %} data-page-count="{{page_count}}"{% endif %} data-current-page="{{current_page}}">
 {% if wkinfo %}

--- a/src/jocondelab/urls.py	Mon Sep 30 14:27:18 2013 +0200
+++ b/src/jocondelab/urls.py	Tue Oct 01 18:00:11 2013 +0200
@@ -33,9 +33,9 @@
     url(r'^bo/term/validate/$', login_required(TermValidate.as_view()), name='validate_term'),
     url(r'^bo/tree/(?P<thes_id>\d+)/$', login_required(ThesaurusTree.as_view()), name='term_tree'),
     url(r'^$', SearchView.as_view(template_name="jocondelab/front_home.html"), name='front_home'),
-    url(r'^termlist/$', FrontTermListView.as_view(), name='front_termlist'),
+    url(r'^index/$', FrontTermListView.as_view(), name='front_termlist'),
     url(r'^search/$', SearchView.as_view(), name='front_search'),
-    url(r'^geo/$', GeoView.as_view(), name='front_geo'),
+    url(r'^map/$', GeoView.as_view(), name='front_geo'),
     url(r'^timeline/$', TemplateView.as_view(template_name="jocondelab/front_timeline.html"), name='front_timeline'),
     url(r'^about/$', TemplateView.as_view(template_name="jocondelab/front_about.html"), name='front_about'),
     url(r'^notice/(?P<pk>\d+)/$', NoticeView.as_view(), name='front_notice'),

--- a/src/jocondelab/views/front_office.py	Mon Sep 30 14:27:18 2013 +0200
+++ b/src/jocondelab/views/front_office.py	Tue Oct 01 18:00:11 2013 +0200
@@ -140,20 +140,32 @@
         context["title"] = self.object.titr if self.object.titr else self.object.deno
         
         termsbythesaurus = {}
-        for nt in Term.objects.filter(noticeterm__notice=self.object).select_related('thesaurus,dbpedia_fields').distinct():
-            translated_term = nt.dbpedia_fields.filter(language_code = lang)
+        for nt in Term.objects.filter(noticeterm__notice=self.object, dbpedia_fields=None).select_related('thesaurus').order_by('label').distinct():
             term = {
                 "thesaurus": nt.thesaurus.label,
                 "dbpedia_uri": nt.dbpedia_uri,
-                "translated": True if translated_term else False,
-                "label": translated_term[0].label if translated_term else nt.label
+                "translated": False,
+                "label": nt.label
             }
             if not term["thesaurus"] in termsbythesaurus:
                 termsbythesaurus[term["thesaurus"]] = {
                    "translated": [],
                    "untranslated": []
                    }
-            termsbythesaurus[term["thesaurus"]]["translated" if term["translated"] else "untranslated"].append(term)
+            termsbythesaurus[term["thesaurus"]]["untranslated"].append(term)
+        for nt in Term.objects.filter(noticeterm__notice=self.object, dbpedia_fields__language_code=lang).select_related('thesaurus,dbpedia_fields').order_by('dbpedia_fields__label').distinct():
+            term = {
+                "thesaurus": nt.thesaurus.label,
+                "dbpedia_uri": nt.dbpedia_uri,
+                "translated": True,
+                "label": nt.dbpedia_fields.get(language_code = lang).label
+            }
+            if not term["thesaurus"] in termsbythesaurus:
+                termsbythesaurus[term["thesaurus"]] = {
+                   "translated": [],
+                   "untranslated": []
+                   }
+            termsbythesaurus[term["thesaurus"]]["translated"].append(term)
         context["terms_by_thesaurus"] = termsbythesaurus
         
         if self.show_contributions:
@@ -177,7 +189,7 @@
         if self.pk_url_kwarg in self.kwargs:
             return super(NoticeView, self).get_object()
         else:
-            queryset = self.get_queryset().filter(image=True, repr='', noticeterm__term__id__in=ContributableTerm.objects.values('term__id'))
+            queryset = self.get_queryset().filter(image=True, repr='', peri__contains='4e quart 19e siècle', noticeterm__term__id__in=ContributableTerm.objects.values('term__id'))
             return queryset[random.randint(0, queryset.count() - 1)]
 
 class FrontTermListView(TemplateView):