Version 1.7.1

7a763ee5 · Patrick Colmant · Patrick · 779e2832 · 7a763ee5 · 7a763ee5
Commit 7a763ee5 authored Jul 05, 2015 by Patrick Colmant Committed by Patrick Jul 05, 2015
57 changed files
--- a/mysite/common_settings.py
+++ b/mysite/common_settings.py
--- a/mysite/locale/fr/LC_MESSAGES/django.mo
+++ b/mysite/locale/fr/LC_MESSAGES/django.mo
--- a/mysite/locale/fr/LC_MESSAGES/django.po
+++ b/mysite/locale/fr/LC_MESSAGES/django.po
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# FIRST AUTHOR pcolmant@gmail.com, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Repanier\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 10:15+0200\n"
-"PO-Revision-Date: 2014-06-03 18:24+0100\n"
+"POT-Creation-Date: 2015-05-20 19:55+0200\n"
+"PO-Revision-Date: 2015-05-21 21:19+0100\n"
 "Last-Translator: Patrick Colmant <pcolmant@gmail.com>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Patrick Colmant <pcolmant@gmail.com>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 1.6.4\n"
+"X-Generator: Poedit 1.7.1\n"
+"X-Poedit-SourceCharset: UTF-8\n"

-#: ptidej_settings.py:18
+#: ptidej_settings.py:34
 msgid "Homepage"
 msgstr "Page d'accueil"

-#: ptidej_settings.py:19
+#: ptidej_settings.py:35
 msgid "Secondary Page"
 msgstr "Page interne"

-#: ptidej_settings.py:25
+#: ptidej_settings.py:41
 msgid "French"
 msgstr "Fançais"

-#: ptidej_settings.py:34
+#: ptidej_settings.py:76
 msgid "Hero"
 msgstr "Héro"

-#: ptidej_settings.py:53
+#: ptidej_settings.py:95
 msgid "Column 1"
 msgstr "Colonne 1"

-#: ptidej_settings.py:75
+#: ptidej_settings.py:115
 msgid "Column 2"
 msgstr "Colonne 2"

-#: ptidej_settings.py:97
+#: ptidej_settings.py:135
 msgid "Column 3"
 msgstr "Colonne 3"

-#: ptidej_settings.py:122
+#: ptidej_settings.py:160
 msgid "Content"
 msgstr "Contenu"

-#: ptidej_settings.py:137
+#: ptidej_settings.py:175
 msgid "Footer"
 msgstr "Pide de page"

-#: ptidej_settings.py:153
-msgid "info"
-msgstr "info"
-
-#: ptidej_settings.py:154
-msgid "new"
-msgstr "nouveau"
-
-#: ptidej_settings.py:155
-msgid "hint"
-msgstr "atteindre"
-
-#: ptidej_settings.py:159
-msgid "normal"
-msgstr "normal"
-
-#: ptidej_settings.py:160
-msgid "2x"
-msgstr "2x"
-
-#: ptidej_settings.py:161
-msgid "3x"
-msgstr "3x"
-
-#: ptidej_settings.py:162
-msgid "4x"
-msgstr "4x"
-
-#: templates/base.html:35 templates/base_wo_cms_toolbar.html:35
+#: templates/base.html:36 templates/base_wo_cms_toolbar.html:33
 msgid "Skip to main content"
 msgstr "Aller au contenu principal"

-#: templates/base.html:42 templates/base_wo_cms_toolbar.html:41
+#: templates/base.html:43 templates/base_wo_cms_toolbar.html:39
 msgid "Toggle navigation"
 msgstr "Basculer la navigation"

-#: templates/base.html:62 templates/base_wo_cms_toolbar.html:61
+#: templates/base.html:63 templates/base_wo_cms_toolbar.html:58
 msgid "Welkom"
 msgstr "Bienvenue"

-#: templates/base.html:64 templates/base_wo_cms_toolbar.html:63
+#: templates/base.html:65 templates/base_wo_cms_toolbar.html:60
 #: templates/registration/logged_out.html:7
 msgid "Logout"
 msgstr "Deconnexion"

-#: templates/base.html:69 templates/base_wo_cms_toolbar.html:71
-#: templates/registration/login.html:7 templates/registration/login.html:32
+#: templates/base.html:70 templates/registration/login.html:8
+#: templates/registration/login.html:54
 msgid "Login"
 msgstr "Connexion"

-#: templates/base.html:74 templates/base_wo_cms_toolbar.html:76
+#: templates/base.html:76 templates/base_wo_cms_toolbar.html:71
 msgid "Language"
 msgstr "Langue"

-#: templates/base.html:87 templates/base_wo_cms_toolbar.html:90
+#: templates/base.html:90 templates/base_wo_cms_toolbar.html:86
 msgid ""
 "It will be easier for you to crawl this website with a newer browser. For "
 "example"
@@ -116,15 +88,15 @@ msgstr ""
 "Votre navigateur est trop ancien pour visiter ce site confortablement. Nous "
 "vous recommandons de le mettre à jour ou d'utiliser par exemple "

-#: templates/base.html:87 templates/base_wo_cms_toolbar.html:90
+#: templates/base.html:90 templates/base_wo_cms_toolbar.html:86
 msgid "or"
 msgstr "ou"

-#: templates/base.html:95 templates/base_wo_cms_toolbar.html:99
+#: templates/base.html:98
 msgid "Contact"
 msgstr "Contact"

-#: templates/base.html:95 templates/base_wo_cms_toolbar.html:99
+#: templates/base.html:98
 msgid "Participer"
 msgstr "Participer"

@@ -140,11 +112,14 @@ msgstr "Réinitialisation du mot de passe"

 #: templates/password_reset/recovery_done.html:11
 msgid ""
-"Your password has successfully been reset. You can use it right now on the "
-"<a href=\"/go_repanier/\">login page</a>."
+"Your password has successfully been reset. You can use it right now on the"
 msgstr ""
-"Votre mote de passe a été mis à jour. Vous pouvez vous <a href=\"/"
-"go_repanier/\">connecter</a> dès à présent."
+"Votre mot de passe a été réinitialisé avec succès. Vous pouvez l&#39;"
+"utiliser dès maintenant sur la"
+
+#: templates/password_reset/recovery_done.html:11
+msgid "login page"
+msgstr "Page de connexion"

 #: templates/password_reset/recovery_email.txt:1
 #, python-format
@@ -179,11 +154,11 @@ msgstr ""
 msgid "Password recovery on %(domain)s"
 msgstr "Réinitialisation du mot de passe sur %(domain)s"

-#: templates/password_reset/recovery_form.html:15
+#: templates/password_reset/recovery_form.html:14
 msgid "Username or Email"
 msgstr "Nom d'utilisateur ou Email"

-#: templates/password_reset/recovery_form.html:17
+#: templates/password_reset/recovery_form.html:16
 msgid "Recover my password"
 msgstr "Réinitialiser mon mot de passe"

@@ -204,6 +179,14 @@ msgstr ""
 "mot de passe."

 #: templates/password_reset/reset.html:18
+msgid "New password"
+msgstr "Enregistrer le nouveau mot de passe"
+
+#: templates/password_reset/reset.html:22
+msgid "New password (confirm)"
+msgstr "Confirmer le nouveau mot de passe"
+
+#: templates/password_reset/reset.html:25
 msgid "Set new password"
 msgstr "Enregistrer le nouveau mot de passe"

@@ -224,22 +207,77 @@ msgstr ""
 "Vous êtes maintenant déconnecté. Vous pouvez vous <a href=\"/go_repanier"
 "\">re connecter</a> ou vous rendre à la <a href=\"/\">page d'accueil</a>."

-#: templates/registration/login.html:16
-msgid "Please correct the error below."
-msgstr "Veuillez corriger l'erreur ci-dessous."
+#: templates/registration/login.html:3
+msgid "Too many attempt."
+msgstr "Trop de tentatives."

-#: templates/registration/login.html:16
-msgid "Please correct the errors below."
-msgstr "Veuillez corriger les erreurs ci-dessous."
-
-#: templates/registration/login.html:20 templates/registration/login.html:22
+#: templates/registration/login.html:23 templates/registration/login.html:31
 msgid "Username"
 msgstr "Nom d'utilisateur"

-#: templates/registration/login.html:26 templates/registration/login.html:28
+#: templates/registration/login.html:33 templates/registration/login.html:41
 msgid "Password"
 msgstr "Mot de passe"

-#: templates/registration/login.html:33
+#: templates/registration/login.html:48
+msgid "Validation code (2 latest digits of your phone number)"
+msgstr "Code de validation (4 derniers chiffres de votre ✆)"
+
+#: templates/registration/login.html:49
+msgid "Validation code"
+msgstr "Code de validation"
+
+#: templates/registration/login.html:55
 msgid "Password lost"
 msgstr "Mot de passe perdu ?"
+
+#~ msgid "Permanence"
+#~ msgstr "Permanence"
+
+#~ msgid "Permanences"
+#~ msgstr "Permanences"
+
+#~ msgid "Permanence on "
+#~ msgstr "Permanence du "
+
+#~ msgid "Please correct the error below."
+#~ msgstr "Veuillez corriger l'erreur ci-dessous."
+
+#~ msgid "Please correct the errors below."
+#~ msgstr "Veuillez corriger les erreurs ci-dessous."
+
+#~ msgid "Closure"
+#~ msgstr "Clôture"
+
+#~ msgid "Closures"
+#~ msgstr "Clôtures"
+
+#~ msgid "Closure on "
+#~ msgstr "Clôture du "
+
+#~ msgid "Dutch"
+#~ msgstr "Dutch"
+
+#~ msgid "English"
+#~ msgstr "English"
+
+#~ msgid "info"
+#~ msgstr "info"
+
+#~ msgid "new"
+#~ msgstr "nouveau"
+
+#~ msgid "hint"
+#~ msgstr "atteindre"
+
+#~ msgid "normal"
+#~ msgstr "normal"
+
+#~ msgid "2x"
+#~ msgstr "2x"
+
+#~ msgid "3x"
+#~ msgstr "3x"
+
+#~ msgid "4x"
+#~ msgstr "4x"
--- a/mysite/locale/fr/LC_MESSAGES/djangojs.mo
+++ b/mysite/locale/fr/LC_MESSAGES/djangojs.mo
--- a/mysite/locale/fr/LC_MESSAGES/djangojs.po
+++ b/mysite/locale/fr/LC_MESSAGES/djangojs.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Repanier\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 10:15+0200\n"
-"PO-Revision-Date: 2014-03-18 21:20+0100\n"
+"POT-Creation-Date: 2015-04-02 08:38+0200\n"
+"PO-Revision-Date: 2015-04-02 08:41+0100\n"
 "Last-Translator: Patrick Colmant <pcolmant@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: fr\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 1.6.4\n"
+"X-Generator: Poedit 1.7.1\n"

 #: collect-static/admin/js/SelectFilter2.js:45
 #, c-format
@@ -82,15 +82,15 @@ msgstr "Tout supprimer"
 msgid "Click to remove all chosen %s at once."
 msgstr "Cliquer pour supprimer tous les %s choisis en même temps."

-#: collect-static/admin/js/actions.js:18
+#: collect-static/admin/js/actions.js:22
 #: collect-static/admin/js/actions.min.js:1
 msgid "%(sel)s of %(cnt)s selected"
 msgid_plural "%(sel)s of %(cnt)s selected"
 msgstr[0] "%(sel)s parmi %(cnt)s sélectionné"
 msgstr[1] "%(sel)s parmi %(cnt)s sélectionnés"

-#: collect-static/admin/js/actions.js:109
-#: collect-static/admin/js/actions.min.js:5
+#: collect-static/admin/js/actions.js:114
+#: collect-static/admin/js/actions.min.js:4
 msgid ""
 "You have unsaved changes on individual editable fields. If you run an "
 "action, your unsaved changes will be lost."
@@ -98,7 +98,7 @@ msgstr ""
 "Vous voulez quitter sans avoir sauvegarder les modifications. Elles seront "
 "perdues."

-#: collect-static/admin/js/actions.js:121
+#: collect-static/admin/js/actions.js:126
 #: collect-static/admin/js/actions.min.js:5
 msgid ""
 "You have selected an action, but you haven't saved your changes to "
@@ -108,8 +108,8 @@ msgstr ""
 "Vous voulez sauvegarder sans avoir fait de modification. Ne vous êtes-vous "
 "pas trompé de bouton..."

-#: collect-static/admin/js/actions.js:123
-#: collect-static/admin/js/actions.min.js:6
+#: collect-static/admin/js/actions.js:128
+#: collect-static/admin/js/actions.min.js:5
 msgid ""
 "You have selected an action, and you haven't made any changes on individual "
 "fields. You're probably looking for the Go button rather than the Save "
@@ -118,76 +118,102 @@ msgstr ""
 "Vous voulez sauvegarder sans avoir fait de modification. Ne vous êtes-vous "
 "pas trompé de bouton..."

-#: collect-static/admin/js/calendar.js:8
-msgid ""
-"January February March April May June July August September October November "
-"December"
-msgstr ""
-"janvier février mars avril mai juin juillet août septembre octobre novembre "
-"décembre"
-
-#: collect-static/admin/js/calendar.js:9
-msgid "S M T W T F S"
-msgstr "D L M M J V S"
-
-#: collect-static/admin/js/collapse.js:8
-#: collect-static/admin/js/collapse.js:19
-#: collect-static/admin/js/collapse.min.js:1
-msgid "Show"
-msgstr "Afficher"
+#: collect-static/admin/js/admin/DateTimeShortcuts.js:79
+#, c-format
+msgid "Note: You are %s hour ahead of server time."
+msgid_plural "Note: You are %s hours ahead of server time."
+msgstr[0] "Note: Vous êtes %s heure à l'avance sur l'heure du serveur."
+msgstr[1] "Note: Vous êtes %s heures à l'avance sur l'heure du serveur."

-#: collect-static/admin/js/collapse.js:16
-#: collect-static/admin/js/collapse.min.js:1
-msgid "Hide"
-msgstr "Masquer"
+#: collect-static/admin/js/admin/DateTimeShortcuts.js:87
+#, c-format
+msgid "Note: You are %s hour behind server time."
+msgid_plural "Note: You are %s hours behind server time."
+msgstr[0] "Note: Vous êtes %s heure en retard sur l'heure du serveur."
+msgstr[1] "Note: Vous êtes %s heures en retard sur l'heure du serveur."

-#: collect-static/admin/js/admin/DateTimeShortcuts.js:52
-#: collect-static/admin/js/admin/DateTimeShortcuts.js:88
+#: collect-static/admin/js/admin/DateTimeShortcuts.js:114
+#: collect-static/admin/js/admin/DateTimeShortcuts.js:149
 msgid "Now"
 msgstr "Maintenant"

-#: collect-static/admin/js/admin/DateTimeShortcuts.js:56
+#: collect-static/admin/js/admin/DateTimeShortcuts.js:118
 msgid "Clock"
 msgstr "Horloge"

-#: collect-static/admin/js/admin/DateTimeShortcuts.js:84
+#: collect-static/admin/js/admin/DateTimeShortcuts.js:146
 msgid "Choose a time"
 msgstr "Choisir une heure"

-#: collect-static/admin/js/admin/DateTimeShortcuts.js:89
+#: collect-static/admin/js/admin/DateTimeShortcuts.js:150
 msgid "Midnight"
 msgstr "Minuit"

-#: collect-static/admin/js/admin/DateTimeShortcuts.js:90
+#: collect-static/admin/js/admin/DateTimeShortcuts.js:151
 msgid "6 a.m."
 msgstr "6 a.m."

-#: collect-static/admin/js/admin/DateTimeShortcuts.js:91
+#: collect-static/admin/js/admin/DateTimeShortcuts.js:152
 msgid "Noon"
 msgstr "Midi"

-#: collect-static/admin/js/admin/DateTimeShortcuts.js:95
-#: collect-static/admin/js/admin/DateTimeShortcuts.js:208
+#: collect-static/admin/js/admin/DateTimeShortcuts.js:156
+#: collect-static/admin/js/admin/DateTimeShortcuts.js:276
 msgid "Cancel"
 msgstr "Annuler"

-#: collect-static/admin/js/admin/DateTimeShortcuts.js:148
-#: collect-static/admin/js/admin/DateTimeShortcuts.js:201
+#: collect-static/admin/js/admin/DateTimeShortcuts.js:216
+#: collect-static/admin/js/admin/DateTimeShortcuts.js:269
 msgid "Today"
 msgstr "Aujourd'hui"

-#: collect-static/admin/js/admin/DateTimeShortcuts.js:152
+#: collect-static/admin/js/admin/DateTimeShortcuts.js:220
 msgid "Calendar"
 msgstr "Calendrier"

-#: collect-static/admin/js/admin/DateTimeShortcuts.js:199
+#: collect-static/admin/js/admin/DateTimeShortcuts.js:267
 msgid "Yesterday"
 msgstr "Hier"

-#: collect-static/admin/js/admin/DateTimeShortcuts.js:203
+#: collect-static/admin/js/admin/DateTimeShortcuts.js:271
 msgid "Tomorrow"
 msgstr "Demain"

+#: collect-static/admin/js/calendar.js:8
+msgid ""
+"January February March April May June July August September October November "
+"December"
+msgstr ""
+"janvier février mars avril mai juin juillet août septembre octobre novembre "
+"décembre"
+
+#: collect-static/admin/js/calendar.js:9
+msgid "S M T W T F S"
+msgstr "D L M M J V S"
+
+#: collect-static/admin/js/collapse.js:8
+#: collect-static/admin/js/collapse.js:19
+#: collect-static/admin/js/collapse.min.js:1
+msgid "Show"
+msgstr "Afficher"
+
+#: collect-static/admin/js/collapse.js:16
+#: collect-static/admin/js/collapse.min.js:1
+msgid "Hide"
+msgstr "Masquer"
+
 #: collect-static/cms/js/modules/cms.changeform.js:60
 msgid "Are you sure you want to change tabs without saving the page first?"
 msgstr "Etes-vous sur de changer d'onglet sans avoir d'abord sauvegardé?"
+
+#: collect-static/treebeard/treebeard-admin.js:158
+msgid "Abort"
+msgstr "Abandonner"
+
+#: collect-static/treebeard/treebeard-admin.js:180
+msgid "As Sibling"
+msgstr "Comme pair"
+
+#: collect-static/treebeard/treebeard-admin.js:198
+msgid "As child"
+msgstr "Comme enfant"
--- a/mysite/templates/base.html
+++ b/mysite/templates/base.html
@@ -3,7 +3,7 @@
 {%get_current_language as LANGUAGE_CODE%}
 <html lang="{{LANGUAGE_CODE}}">
  <head>
-    <title>Repanier | {% page_attribute "title" %}</title>
+    <title>{% page_attribute "title" %}</title>
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -12,6 +12,7 @@
    {# <!-- <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap-theme.min.css"> --> #}
    {# <!-- <link rel="stylesheet" href="{{ STATIC_URL}}bootstrap/css/bootstrap-theme.min.css"> --> #}
    {% addtoblock "css" %}<link rel="stylesheet" href="{{ STATIC_URL}}bootstrap/css/custom.css">{% endaddtoblock %}
+      {#    {% addtoblock "css" %}<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css">{% endaddtoblock %}#}
    {% addtoblock "css" %}
    <!--[if lt IE 9]>
      <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
@@ -29,6 +30,8 @@
    </style>
    {% endaddtoblock %}
    {% render_block "css"  %}
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
    {% render_block "jshead" %}
  </head>
  <body>
@@ -68,16 +71,18 @@
            <li class="dropdown">
              <a href="{% url "login_form" %}">{% trans "Login" %}</a>
            </li>
-            {% endif %} 
-            {% if languages.count > 1 %}
+            {% endif %}
+              {% if languages %}
+                  {% if languages|length > 1 %}
            <li class="dropdown">
              <a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans "Language" %} <b class="caret"></b></a>
              <ul class="dropdown-menu">
                {% language_chooser "native" %}
              </ul>
            </li>
-            {% endif %} 
-          </ul> 
+            {% endif %}
+              {% endif %}
+          </ul>
        </div>
      </div>
    </div>
@@ -97,8 +102,6 @@
        </p>
      </div>
    </div>
-    {% addtoblock "js" %}<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>{% endaddtoblock %}
-    {% addtoblock "js" %}<script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>{% endaddtoblock %}
    {% render_block "jsuncompressed" %}
    {% render_block "js" %}
    {% render_block "lastjs"  %}

--- a/mysite/templates/base_wo_cms_toolbar.html
+++ b/mysite/templates/base_wo_cms_toolbar.html
@@ -3,15 +3,13 @@
 {%get_current_language as LANGUAGE_CODE%}
 <html lang="{{LANGUAGE_CODE}}">
  <head>
-    <title>Repanier | {% page_attribute "title" %}</title>
+    <title>{% page_attribute "title" %}</title>
    <meta charset="utf-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <!-- <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap.min.css"> -->
    {% addtoblock "css" %}<link rel="stylesheet" href="{{ STATIC_URL}}bootstrap/css/bootstrap.css">{% endaddtoblock %}
-    <!-- <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.1.1/css/bootstrap-theme.min.css"> -->
-    <!-- <link rel="stylesheet" href="{{ STATIC_URL}}bootstrap/css/bootstrap-theme.min.css"> -->
    {% addtoblock "css" %}<link rel="stylesheet" href="{{ STATIC_URL}}bootstrap/css/custom.css">{% endaddtoblock %}
+      {#    {% addtoblock "css" %}<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css">{% endaddtoblock %}#}
    {% addtoblock "css" %}
    <!--[if lt IE 9]>
      <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
@@ -29,6 +27,26 @@
    </style>
    {% endaddtoblock %}
    {% render_block "css"  %}
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
+    <script type="text/javascript">
+      // ensuring django namespace is set correctly
+      window.django = window.django || undefined;
+
+      // ensuring jQuery namespace is set correctly
+      window.jQuery = (django && django.jQuery) ? django.jQuery : window.jQuery || undefined;
+
+      // ensuring Class namespace is set correctly
+      window.Class = window.Class || undefined;
+
+      // ensuring CMS namespace is set correctly
+      var CMS = {
+        '$': (typeof jQuery === 'function') ? jQuery : undefined,
+        'Class': (typeof Class === 'function') ? Class : undefined,
+        'API': {}
+      };
+    </script>
+
    {% render_block "jshead" %}
  </head>
  <body>
@@ -56,29 +74,29 @@
          </ul>
          <!-- Right Nav Section -->
          <ul class="nav navbar-nav navbar-right">
-            {% if user.is_authenticated %}
-            <li class="dropdown">
-                <a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans "Welkom" %} {{ user.username }} <b class="caret"></b></a>
+            <li id="li_my_name" class="dropdown">
+              <a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans "Welkom" %} <span id="my_name"></span>
+                <b class="caret"></b></a>
                <ul class="dropdown-menu">
                  <li><a href="{% url "logout_form" %}">{% trans "Logout" %}</a></li>
                </ul>
            </li>
-            <li id="li_my_basket" style="display:none" class="dropdown">
-              <a href="?offeritem=purchased"><span id="my_basket">{{ prepared_amount }}</span> &euro; <span class="glyphicon glyphicon-shopping-cart"></span></a>
-            </li>
-            {% else %}
-            <li class="dropdown">
-              <a href="{% url "login_form" %}">{% trans "Login" %}</a>
+              {% if permanence %}
+                <li id="li_my_basket" style="display:none;" class="dropdown">
+                  <a href="{% url "basket_view" permanence.id %}?offeritem=purchased"><span
+                          id="my_basket"></span> &euro; <span class="glyphicon glyphicon-shopping-cart"></span></a>
            </li>
-            {% endif %} 
-            {% if languages.count > 1 %}
+              {% endif %}
+              {% if languages %}
+                  {% if languages|length > 1 %}
            <li class="dropdown">
              <a href="#" class="dropdown-toggle" data-toggle="dropdown">{% trans "Language" %} <b class="caret"></b></a>
              <ul class="dropdown-menu">
                {% language_chooser "native" %}
              </ul>
            </li>
-            {% endif %} 
+                  {% endif %}
+              {% endif %}
          </ul> 
        </div><!--/.nav-collapse -->
      </div>
@@ -92,19 +110,14 @@
    {% block base_content%}{% endblock %}
    </div>
    <!-- Footer -->
-    <div class="navbar navbar-default navbar-fixed-bottom">
-    <div class="container">
-    <div class = "navbar-text">
+    <div class="footer">
+      <div class="container" align="center">
          {% block footer %}
-            {% static_placeholder 'footer' or %}{% trans "Contact" %} : coordi@repanier.be<span  class="hidden-xs"> | {% trans "Participer" %} : <a href="https://github.com/pcolmant/repanier">github</a></span>{% endstatic_placeholder %}
          {% endblock %}
+      </div>
    </div>
-    </div>
-    </div>
-    {% addtoblock "js" %}<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.0/jquery.min.js"></script>{% endaddtoblock %}
-    {% addtoblock "js" %}<script src="//netdna.bootstrapcdn.com/bootstrap/3.1.1/js/bootstrap.min.js"></script>{% endaddtoblock %}
    {% render_block "jsuncompressed" %}
    {% render_block "js" %}
-    {% render_block "lastjs"  %}
+    {% render_block "lastjs" %}
  </body>
 </html>
\ No newline at end of file
--- a/mysite/templates/cmsplugin_filer_image/plugins/image/default.html
+++ b/mysite/templates/cmsplugin_filer_image/plugins/image/default.html
@@ -24,12 +24,12 @@
 	{# just a plain link to some external image #}
 	<img class="img-responsive img-rounded" {% if instance.alignment %}style = "float: {{ instance.alignment }}; margin: 10px;"{% endif %} alt="{% if instance.alt %}{{ instance.alt }}{% endif %}" src="{{ instance.image_url }}"{% if size.0 %} width="{{ size.0 }}"{% endif %}{% if size.1 %} height="{{ size.1 }}"{% endif %}{% if instance.caption %} title="{{ instance.caption }}"{% endif %} />
 {% endif %}
-{% if instance.caption or instance.description %}
-	<span class="filer_image_info">
-		{% if instance.caption %}<span class="title">{{ instance.caption }}</span>{% endif %}
-		{% if instance.description %}<span class="desc">{{ instance.description }}</span>{% endif %}
-	</span>
-{% endif %}
+<!--{% if instance.caption or instance.description %}-->
+	<!--<span class="filer_image_info">-->
+	<!--{% if instance.caption %}<span class="title">{{ instance.caption }}</span>{% endif %}-->
+	<!--{% if instance.description %}<span class="desc">{{ instance.description }}</span>{% endif %}-->
+	<!--</span>-->
+	<!--{% endif %}-->
 {% if link %}</a>{% endif %}

 {% endspaceless %}
--- a/mysite/templates/home.html
+++ b/mysite/templates/home.html
@@ -4,55 +4,20 @@
 {% block base_content %}
    <div class="container">
      <div class="jumbotron">
-        {% placeholder "home-hero" or %}
-<h3>Gasath Ptidej</h3>
-<p>Bienvenue sur le site de commande du groupe Gasath Ptidej.</p>
-<p class="text-muted"><span class="glyphicon glyphicon-pushpin"></span>&nbsp;Veuillez utiliser ce site pour passer vos commandes.</p>
-<h3>Premi&egrave;re connexion</h3>
-<p class="text-muted">Cliquez sur &quot;Connexion&quot; en haut &agrave; droite de l&#39;&eacute;cran. Ensuite sur &quot;Mot de passe perdu ?&quot;. Respectez bien les majuscules/minuscules/espaces.</p>
-        {% endplaceholder %}
+          {% placeholder "home-hero" %}
      </div>
    </div>
    <div class="container">
      <!-- Example row of columns -->
      <div class="row">
        <div class="col-md-4">
-
-          {% placeholder 'home-col-1'  or %}
- <div class="panel panel-warning">
-  <div class="panel-heading"><h4>Tableau des permanences</h4></div> 
-          <ul class="list-group">
-           <li class="list-group-item">Le tableau des permanences est à présent disponible à partir du menu "Permanence" en haut de l'écran, entrée "Tableau des permanences".</li>
-           <li class="list-group-item">Pour vous inscrire à une permanence, sélectionnez votre nom.</li>
-           <li class="list-group-item">Pour vous désinscrire, désélectionnez votre nom.</li>
-           <li class="list-group-item">Seules sont reprises les permanences planifiées par le/la responsable commandes.</li>
-          </ul>
-      </div>
-          {% endplaceholder %}
+            {% placeholder 'home-col-1' %}
        </div>
        <div class="col-md-4">
-          {% placeholder 'home-col-2' or %}
-<div class="panel panel-warning">
-  <div class="panel-heading"><h4>Commandes</h4></div>  
-          <ul class="list-group">
-           <li class="list-group-item">A partir du menu "Permanence" en haut de l'écran, vous sélectionnez une permanence.</li>
-           <li class="list-group-item">Si elle est ouverte, vous pouvez modifiez votre commande jusqu'à la clôture des commandes.</li>
-           <li class="list-group-item">Un récapitulatif vous perviendra par mail au moment de la clôture.</li>
-           <li class="list-group-item">Dès qu'elle est fermée, vous ne pouvez plus modifier votre commande.</li>
-          </ul>
-      </div>
-          {% endplaceholder %}
+