From bbc129ea511f23f346dcfab1d8611b6e7c32a2d0 Mon Sep 17 00:00:00 2001
From: Jocelyn Delalande <jocelyn@crapouillou.net>
Date: Wed, 21 Feb 2018 17:49:45 +0100
Subject: [PATCH 1/8] Cleanup commented code

---
 templates/index.html | 287 -------------------------------------------
 1 file changed, 287 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index edc7bb48..09f99be7 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -52,206 +52,6 @@
 <!-- /.navbar-header -->
 
 <ul class="nav navbar-top-links navbar-right">
-<!--
-<li class="dropdown">
-    <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-        <i class="fa fa-envelope fa-fw"></i> <i class="fa fa-caret-down"></i>
-    </a>
-    <ul class="dropdown-menu dropdown-messages">
-        <li>
-            <a href="#">
-                <div>
-                    <strong>John Smith</strong>
-                                    <span class="pull-right text-muted">
-                                        <em>Yesterday</em>
-                                    </span>
-                </div>
-                <div>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque eleifend...</div>
-            </a>
-        </li>
-        <li class="divider"></li>
-        <li>
-            <a href="#">
-                <div>
-                    <strong>John Smith</strong>
-                                    <span class="pull-right text-muted">
-                                        <em>Yesterday</em>
-                                    </span>
-                </div>
-                <div>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque eleifend...</div>
-            </a>
-        </li>
-        <li class="divider"></li>
-        <li>
-            <a href="#">
-                <div>
-                    <strong>John Smith</strong>
-                                    <span class="pull-right text-muted">
-                                        <em>Yesterday</em>
-                                    </span>
-                </div>
-                <div>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque eleifend...</div>
-            </a>
-        </li>
-        <li class="divider"></li>
-        <li>
-            <a class="text-center" href="#">
-                <strong>Read All Messages</strong>
-                <i class="fa fa-angle-right"></i>
-            </a>
-        </li>
-    </ul>
-    <!-- /.dropdown-messages
-</li> -->
-<!-- /.dropdown -->
-<!--
-<li class="dropdown">
-    <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-        <i class="fa fa-tasks fa-fw"></i> <i class="fa fa-caret-down"></i>
-    </a>
-    <ul class="dropdown-menu dropdown-tasks">
-        <li>
-            <a href="#">
-                <div>
-                    <p>
-                        <strong>Task 1</strong>
-                        <span class="pull-right text-muted">40% Complete</span>
-                    </p>
-
-                    <div class="progress progress-striped active">
-                        <div class="progress-bar progress-bar-success" role="progressbar" aria-valuenow="40"
-                             aria-valuemin="0" aria-valuemax="100" style="width: 40%">
-                            <span class="sr-only">40% Complete (success)</span>
-                        </div>
-                    </div>
-                </div>
-            </a>
-        </li>
-        <li class="divider"></li>
-        <li>
-            <a href="#">
-                <div>
-                    <p>
-                        <strong>Task 2</strong>
-                        <span class="pull-right text-muted">20% Complete</span>
-                    </p>
-
-                    <div class="progress progress-striped active">
-                        <div class="progress-bar progress-bar-info" role="progressbar" aria-valuenow="20"
-                             aria-valuemin="0" aria-valuemax="100" style="width: 20%">
-                            <span class="sr-only">20% Complete</span>
-                        </div>
-                    </div>
-                </div>
-            </a>
-        </li>
-        <li class="divider"></li>
-        <li>
-            <a href="#">
-                <div>
-                    <p>
-                        <strong>Task 3</strong>
-                        <span class="pull-right text-muted">60% Complete</span>
-                    </p>
-
-                    <div class="progress progress-striped active">
-                        <div class="progress-bar progress-bar-warning" role="progressbar" aria-valuenow="60"
-                             aria-valuemin="0" aria-valuemax="100" style="width: 60%">
-                            <span class="sr-only">60% Complete (warning)</span>
-                        </div>
-                    </div>
-                </div>
-            </a>
-        </li>
-        <li class="divider"></li>
-        <li>
-            <a href="#">
-                <div>
-                    <p>
-                        <strong>Task 4</strong>
-                        <span class="pull-right text-muted">80% Complete</span>
-                    </p>
-
-                    <div class="progress progress-striped active">
-                        <div class="progress-bar progress-bar-danger" role="progressbar" aria-valuenow="80"
-                             aria-valuemin="0" aria-valuemax="100" style="width: 80%">
-                            <span class="sr-only">80% Complete (danger)</span>
-                        </div>
-                    </div>
-                </div>
-            </a>
-        </li>
-        <li class="divider"></li>
-        <li>
-            <a class="text-center" href="#">
-                <strong>See All Tasks</strong>
-                <i class="fa fa-angle-right"></i>
-            </a>
-        </li>
-    </ul>
-    <!-- /.dropdown-tasks
-</li> -->
-<!-- /.dropdown -->
-<!--
-<li class="dropdown">
-    <a class="dropdown-toggle" data-toggle="dropdown" href="#">
-        <i class="fa fa-bell fa-fw"></i> <i class="fa fa-caret-down"></i>
-    </a>
-    <ul class="dropdown-menu dropdown-alerts">
-        <li>
-            <a href="#">
-                <div>
-                    <i class="fa fa-comment fa-fw"></i> New Comment
-                    <span class="pull-right text-muted small">4 minutes ago</span>
-                </div>
-            </a>
-        </li>
-        <li class="divider"></li>
-        <li>
-            <a href="#">
-                <div>
-                    <i class="fa fa-twitter fa-fw"></i> 3 New Followers
-                    <span class="pull-right text-muted small">12 minutes ago</span>
-                </div>
-            </a>
-        </li>
-        <li class="divider"></li>
-        <li>
-            <a href="#">
-                <div>
-                    <i class="fa fa-envelope fa-fw"></i> Message Sent
-                    <span class="pull-right text-muted small">4 minutes ago</span>
-                </div>
-            </a>
-        </li>
-        <li class="divider"></li>
-        <li>
-            <a href="#">
-                <div>
-                    <i class="fa fa-tasks fa-fw"></i> New Task
-                    <span class="pull-right text-muted small">4 minutes ago</span>
-                </div>
-            </a>
-        </li>
-        <li class="divider"></li>
-        <li>
-            <a href="#">
-                <div>
-                    <i class="fa fa-upload fa-fw"></i> Server Rebooted
-                    <span class="pull-right text-muted small">4 minutes ago</span>
-                </div>
-            </a>
-        </li>
-        <li class="divider"></li>
-        <li>
-            <a class="text-center" href="#">
-                <strong>See All Alerts</strong>
-                <i class="fa fa-angle-right"></i>
-            </a>
-        </li>
-    </ul>
-    <!-- /.dropdown-alerts
-</li> -->
 <!-- /.dropdown -->
 <li class="dropdown">
     <a class="dropdown-toggle" data-toggle="dropdown" id="user-toggle" aria-haspopup="true" role="button" aria-expanded="false">
@@ -315,93 +115,6 @@
                     </div>
                 </div>            
             </li>
-            <!--
-            <li>
-                <a href="{% static "index.html"><i class="fa fa-dashboard fa-fw"></i> Dashboard</a>
-            </li>
-            <li>
-                <a href="#"><i class="fa fa-bar-chart-o fa-fw"></i> Charts<span class="fa arrow"></span></a>
-                <ul class="nav nav-second-level">
-                    <li>
-                        <a href="{% static "flot.html">Flot Charts</a>
-                    </li>
-                    <li>
-                        <a href="{% static "morris.html">Morris.js Charts</a>
-                    </li>
-                </ul>
-                <!-- /.nav-second-level -->
-            <!--
-            </li>
-            <li>
-                <a href="{% static "tables.html"><i class="fa fa-table fa-fw"></i> Tables</a>
-            </li>
-            <li>
-                <a href="{% static "forms.html"><i class="fa fa-edit fa-fw"></i> Forms</a>
-            </li>
-            <li>
-                <a href="#"><i class="fa fa-wrench fa-fw"></i> UI Elements<span class="fa arrow"></span></a>
-                <ul class="nav nav-second-level">
-                    <li>
-                        <a href="{% static "panels-wells.html">Panels and Wells</a>
-                    </li>
-                    <li>
-                        <a href="{% static "buttons.html">Buttons</a>
-                    </li>
-                    <li>
-                        <a href="{% static "notifications.html">Notifications</a>
-                    </li>
-                    <li>
-                        <a href="{% static "typography.html">Typography</a>
-                    </li>
-                    <li>
-                        <a href="{% static "grid.html">Grid</a>
-                    </li>
-                </ul>
-                <!-- /.nav-second-level -->
-           <!--
-            </li>
-            <li>
-                <a href="#"><i class="fa fa-sitemap fa-fw"></i> Multi-Level Dropdown<span class="fa arrow"></span></a>
-                <ul class="nav nav-second-level">
-                    <li>
-                        <a href="#">Second Level Item</a>
-                    </li>
-                    <li>
-                        <a href="#">Second Level Item</a>
-                    </li>
-                    <li>
-                        <a href="#">Third Level <span class="fa arrow"></span></a>
-                        <ul class="nav nav-third-level">
-                            <li>
-                                <a href="#">Third Level Item</a>
-                            </li>
-                            <li>
-                                <a href="#">Third Level Item</a>
-                            </li>
-                            <li>
-                                <a href="#">Third Level Item</a>
-                            </li>
-                            <li>
-                                <a href="#">Third Level Item</a>
-                            </li>
-                        </ul>
-                        <!-- /.nav-third-level -->
-                    <!--</li>
-                </ul>
-                <!-- /.nav-second-level -->
-            <!--</li>
-            <li class="active">
-                <a href="#"><i class="fa fa-files-o fa-fw"></i> Sample Pages<span class="fa arrow"></span></a>
-                <ul class="nav nav-second-level">
-                    <li>
-                        <a href="blank.html">Blank Page</a>
-                    </li>
-                    <li>
-                        <a href="account/login.html">Login Page</a>
-                    </li>
-                </ul>
-                <!-- /.nav-second-level -->
-            <!--/li-->
         </ul>
         <!-- /#side-menu -->
     </div>

From ca5ef10866f16b1236675bab6d72efe071b261ea Mon Sep 17 00:00:00 2001
From: Jocelyn Delalande <jocelyn@crapouillou.net>
Date: Wed, 21 Feb 2018 18:33:16 +0100
Subject: [PATCH 2/8] Move sidebar stuff to top bar

---
 templates/index.html | 74 ++++++++++++++++++++++----------------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index 09f99be7..0b51d14a 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -51,8 +51,13 @@
 </div>
 <!-- /.navbar-header -->
 
+<ul class="nav navbar-nav navbar-top-links navbar-left">
+    <li>
+        <a href="#/addPatient"><i class="fa fa-pencil-square-o navbar-link"></i> {% trans 'New patient' %}</a>
+    </li>
+</ul>
 <ul class="nav navbar-top-links navbar-right">
-<!-- /.dropdown -->
+        <!-- /.dropdown -->
 <li class="dropdown">
     <a class="dropdown-toggle" data-toggle="dropdown" id="user-toggle" aria-haspopup="true" role="button" aria-expanded="false">
         <i class="fa fa-user fa-fw"></i> {{ request.user.username }} <i class="fa fa-caret-down"></i>
@@ -74,47 +79,42 @@
 </li>
 <!-- /.dropdown -->
 </ul>
-<!-- /.navbar-top-links -->
+    <form class="navbar-form navbar-right" ng-controller="SearchCtrl">
+        <div class="search-container">
+            <div class="input-group custom-search-form">
+                <input type="search" class="form-control" placeholder="{% trans "Search..." %}"
+                       ng-model="query" ng-keydown="onEnterKeyDown($event)">
+                <span class="input-group-btn">
+                    <button class="btn btn-default" type="button" ng-click="search()">
+                        <i class="fa fa-search"></i>
+                    </button>
+                </span>
+            </div>
+        </div>
+        <!-- /input-group -->
+    </form>
+
+    <ul class="nav navbar-top-links navbar-right">
+        <li ng-show="editFormManager.available">
+            <button ng-show="editFormManager.action_available('edit')" type="button" class="btn btn-default btn-xs navbar-btn" ng-click="editFormManager.call_action('edit')">
+                <i class="fa fa-edit"></i> {% trans 'Edit' %}
+            </button>
+            <!-- buttons to submit / cancel form -->
+            <span ng-show="editFormManager.action_available('save')">
+                <button type="button" class="btn btn-default btn-xs navbar-btn" ng-click="editFormManager.call_action('save')">
+                    <i class="fa fa-thumbs-o-up"></i> {% trans 'End of editing' %}
+                </button>
+            </span>
+            <button ng-show="editFormManager.action_available('delete')" type="button" class="btn btn-danger btn-xs navbar-btn" ng-click="editFormManager.call_action('delete')"><i class="fa fa-trash"></i> {% trans 'Delete' %}</button>
 
+        </li>
+    </ul>
+
+<!-- /.navbar-top-links -->
 
     <div class="navbar-default sidebar" role="navigation">
     <div class="sidebar-nav sidebar-collapse">
         <ul class="nav" id="side-menu">
-            <li class="sidebar-search" ng-controller="SearchCtrl">
-                <div class="search-container">
-                    <div class="input-group custom-search-form">
-                        <input type="search" class="form-control" placeholder="{% trans "Search..." %}"
-                               ng-model="query" ng-keydown="onEnterKeyDown($event)">
-                            <span class="input-group-btn">
-                                <button class="btn btn-default" type="button" ng-click="search()">
-                                    <i class="fa fa-search"></i>
-                                </button>
-                            </span>
-                    </div>
-                </div>
-                <!-- /input-group -->
-            </li>
-            <li>
-                <a href="#/addPatient"><i class="fa fa-pencil-square-o"></i> {% trans 'New patient' %}</a>
-            </li>
-            <li ng-show="editFormManager.available">
-                <div id="editorcommand" class="panel panel-default editor" data-spy="affix">
-                    <div class="panel-heading">
-                        <span>{% trans 'Edit' %}</span>
-                    </div>
-                    <div class="panel-body row" style="margin-left: 5px; margin-right: 5px">
-                        <button ng-show="editFormManager.action_available('edit')" type="button" class="btn btn-default btn-xs" ng-click="editFormManager.call_action('edit')"><i class="fa fa-edit"></i> {% trans 'Edit' %}</button>
-                        <!-- buttons to submit / cancel form -->
-                          <span ng-show="editFormManager.action_available('save')">
-                            <button type="button" class="btn btn-default btn-xs" ng-click="editFormManager.call_action('save')">
-                              <i class="fa fa-thumbs-o-up"></i> {% trans 'End of editing' %}
-                            </button>
-                          </span>
-                        <button ng-show="editFormManager.action_available('delete')" type="button" class="btn btn-danger btn-xs" ng-click="editFormManager.call_action('delete')"><i class="fa fa-trash"></i> {% trans 'Delete' %}</button>
-
-                    </div>
-                </div>            
-            </li>
         </ul>
         <!-- /#side-menu -->
     </div>

From cb886a06f584c240a85c819f6a48a6e94160ce49 Mon Sep 17 00:00:00 2001
From: Jocelyn Delalande <jocelyn@crapouillou.net>
Date: Wed, 21 Feb 2018 18:37:21 +0100
Subject: [PATCH 3/8] Fix the navbar to the top

Keep it visible, even on scroll.
---
 templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/index.html b/templates/index.html
index 0b51d14a..ce790f1e 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -39,7 +39,7 @@
 
 <div id="wrapper" ng-controller="MainController">
 
-<nav class="navbar navbar-default navbar-static-top" role="navigation" style="margin-bottom: 0">
+<nav class="navbar navbar-default navbar-fixed-top" role="navigation" style="margin-bottom: 0">
 <div class="navbar-header">
     <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".sidebar-collapse" aria-expanded="false">
         <span class="sr-only">Toggle navigation</span>

From 8c01cabc63e6cacf1bbbc1bd45d47af29a530297 Mon Sep 17 00:00:00 2001
From: Jocelyn Delalande <jocelyn@crapouillou.net>
Date: Wed, 21 Feb 2018 18:49:07 +0100
Subject: [PATCH 4/8] Remove sidebar

---
 libreosteoweb/static/css/libreosteo.css | 4 ++++
 libreosteoweb/static/css/sb-admin-2.css | 1 -
 libreosteoweb/static/js/sb-admin-2.js   | 7 -------
 templates/index.html                    | 8 --------
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/libreosteoweb/static/css/libreosteo.css b/libreosteoweb/static/css/libreosteo.css
index 3d9dfaab..8ceb0521 100644
--- a/libreosteoweb/static/css/libreosteo.css
+++ b/libreosteoweb/static/css/libreosteo.css
@@ -15,6 +15,10 @@
     You should have received a copy of the GNU General Public License
     along with Libreosteo.  If not, see <http://www.gnu.org/licenses/>.
 */
+
+/* For fixed navbar */
+body { padding-top: 50px; }
+
 .editable-click {
     !important;
     color : black;
diff --git a/libreosteoweb/static/css/sb-admin-2.css b/libreosteoweb/static/css/sb-admin-2.css
index 63a2ccd8..8fc85998 100644
--- a/libreosteoweb/static/css/sb-admin-2.css
+++ b/libreosteoweb/static/css/sb-admin-2.css
@@ -21,7 +21,6 @@ body {
 @media(min-width:768px) {
     #page-wrapper {
         position: inherit;
-        margin: 0 0 0 250px;
         padding: 0 30px;
         border-left: 1px solid #e7e7e7;
     }
diff --git a/libreosteoweb/static/js/sb-admin-2.js b/libreosteoweb/static/js/sb-admin-2.js
index 2d22b3f4..bab350f0 100644
--- a/libreosteoweb/static/js/sb-admin-2.js
+++ b/libreosteoweb/static/js/sb-admin-2.js
@@ -26,10 +26,3 @@ $(function() {
         }
     })
 });
-
-
-$('#editorcommand').affix({
-    offset: {
-        top: $('#editorcommand').offset().top
-    }
-});
diff --git a/templates/index.html b/templates/index.html
index ce790f1e..1135fbfb 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -112,14 +112,6 @@
 
 <!-- /.navbar-top-links -->
 
-    <div class="navbar-default sidebar" role="navigation">
-    <div class="sidebar-nav sidebar-collapse">
-        <ul class="nav" id="side-menu">
-        </ul>
-        <!-- /#side-menu -->
-    </div>
-    </div>
-    <!-- /.sidebar-collapse -->
 </nav>
 <!-- /.navbar-static-side -->
 <div id="page-wrapper">

From f1b016bcc079bdacb026510a5527ee5aa1a4b2d2 Mon Sep 17 00:00:00 2001
From: Jocelyn Delalande <jocelyn@crapouillou.net>
Date: Wed, 21 Feb 2018 19:40:58 +0100
Subject: [PATCH 5/8] Fix old makemessages strings locations

(iso-functional cosmetic commit)
---
 locale/fr/LC_MESSAGES/django.po | 264 ++++++++++++++++----------------
 1 file changed, 136 insertions(+), 128 deletions(-)

diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 331f29a5..71cbffe5 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -17,478 +17,486 @@ msgstr ""
 "X-Loco-Target-Locale: zxx\n"
 "X-Generator: Poedit 1.8.7.1\n"
 
-#: Libreosteo/settings/base.py:154
+#: Libreosteo/settings/base.py:167
 msgid "French"
 msgstr "Français"
 
-#: Libreosteo/settings/base.py:155
+#: Libreosteo/settings/base.py:168
 msgid "English"
 msgstr "Anglais"
 
-#: libreosteoweb/api/file_integrator.py:55
+#: libreosteoweb/api/file_integrator.py:69
 msgid "Analyze failed on this file"
 msgstr "L'analyse a échoué sur ce fichier"
 
-#: libreosteoweb/api/file_integrator.py:62
+#: libreosteoweb/api/file_integrator.py:76
 msgid "Cannot recognize the patient file"
 msgstr "Impossible de reconnaître le fichier patient"
 
-#: libreosteoweb/api/file_integrator.py:99
-#: libreosteoweb/api/file_integrator.py:274
+#: libreosteoweb/api/file_integrator.py:113
+#: libreosteoweb/api/file_integrator.py:288
 msgid "Cannot read the content file. Check the encoding."
 msgstr "Impossible de lire le contenu du fichier. Vérifiez l'encodage."
 
-#: libreosteoweb/api/file_integrator.py:416
+#: libreosteoweb/api/file_integrator.py:430
 msgid "Missing patient file to integrate it."
 msgstr "Il manque le fichier patient pour intégrer."
 
-#: libreosteoweb/api/file_integrator.py:442
+#: libreosteoweb/api/file_integrator.py:456
 msgid "Imported examination"
 msgstr "Consultations importées"
 
-#: libreosteoweb/api/file_integrator.py:455
+#: libreosteoweb/api/file_integrator.py:469
 msgid "There is a problem when reading this line :"
 msgstr "Il y a un problème lors de la lecture de la ligne :"
 
-#: libreosteoweb/api/file_integrator.py:458
+#: libreosteoweb/api/file_integrator.py:472
 msgid "There is a problem when reading this line."
 msgstr "Il y a un problème lors de la lecture de la ligne."
 
-#: libreosteoweb/api/receivers.py:60
+#: libreosteoweb/api/receivers.py:74
 msgid "New patient created"
 msgstr "Nouveau patient créé"
 
-#: libreosteoweb/api/receivers.py:67
+#: libreosteoweb/api/receivers.py:81
 msgid "Patient updated"
 msgstr "Fiche patient mise à jour"
 
-#: libreosteoweb/api/receivers.py:80
+#: libreosteoweb/api/receivers.py:94
 msgid "New examination"
 msgstr "Nouvelle consultation"
 
-#: libreosteoweb/api/serializers.py:20
+#: libreosteoweb/api/serializers.py:35
 msgid "Birth date is invalid"
 msgstr "La date de naissance est invalide"
 
-#: libreosteoweb/api/serializers.py:25 libreosteoweb/api/serializers.py:47
-#: libreosteoweb/models.py:40 libreosteoweb/models.py:92
+#: libreosteoweb/api/serializers.py:40 libreosteoweb/api/serializers.py:63
+#: libreosteoweb/models.py:55 libreosteoweb/models.py:107
 msgid "Birth date"
 msgstr "Date de naissance"
 
-#: libreosteoweb/api/serializers.py:42
+#: libreosteoweb/api/serializers.py:58
 msgid "This patient already exists"
 msgstr "Ce patient existe déjà"
 
-#: libreosteoweb/api/serializers.py:109
+#: libreosteoweb/api/serializers.py:126
 msgid "Reason is mandatory when the examination is not invoiced"
 msgstr "La raison est obligatoire lorsque la consultation n'est pas facturée"
 
-#: libreosteoweb/api/serializers.py:112
+#: libreosteoweb/api/serializers.py:129
 msgid "Amount is invalid"
 msgstr "Le montant est invalide"
 
-#: libreosteoweb/api/serializers.py:114
+#: libreosteoweb/api/serializers.py:131
 msgid "Paiment mode is mandatory when the examination is invoiced"
 msgstr ""
 "Le mode de paiement est obligatoire lorsque la consultation est facturée"
 
-#: libreosteoweb/api/serializers.py:117
+#: libreosteoweb/api/serializers.py:134
 msgid "Check information is missing"
 msgstr "Les informations de chèque sont manquantes"
 
-#: libreosteoweb/api/views.py:593
+#: libreosteoweb/api/views.py:615
 msgid "This archive file seems to be incorrect. Impossible to load it."
 msgstr "Ce fichier d'archive semble être incorrect. Impossible de le charger."
 
-#: libreosteoweb/models.py:23 libreosteoweb/models.py:37
-#: libreosteoweb/models.py:90 libreosteoweb/models.py:187
+#: libreosteoweb/models.py:38 libreosteoweb/models.py:52
+#: libreosteoweb/models.py:105 libreosteoweb/models.py:202
 msgid "Family name"
 msgstr "Nom de famille"
 
-#: libreosteoweb/models.py:24 libreosteoweb/models.py:39
-#: libreosteoweb/models.py:91 libreosteoweb/models.py:189
+#: libreosteoweb/models.py:39 libreosteoweb/models.py:54
+#: libreosteoweb/models.py:106 libreosteoweb/models.py:204
 msgid "Firstname"
 msgstr "Prénom"
 
-#: libreosteoweb/models.py:25 libreosteoweb/models.py:46
-#: libreosteoweb/models.py:201 libreosteoweb/models.py:232
+#: libreosteoweb/models.py:40 libreosteoweb/models.py:61
+#: libreosteoweb/models.py:216 libreosteoweb/models.py:255
 msgid "Phone"
 msgstr "Téléphone"
 
-#: libreosteoweb/models.py:26 libreosteoweb/models.py:44
-#: libreosteoweb/models.py:193 libreosteoweb/models.py:200
-#: libreosteoweb/models.py:231
+#: libreosteoweb/models.py:41 libreosteoweb/models.py:59
+#: libreosteoweb/models.py:208 libreosteoweb/models.py:215
+#: libreosteoweb/models.py:254
 msgid "City"
 msgstr "Ville"
 
-#: libreosteoweb/models.py:38 libreosteoweb/models.py:188
+#: libreosteoweb/models.py:53 libreosteoweb/models.py:203
 msgid "Original name"
 msgstr "Nom de jeune fille"
 
-#: libreosteoweb/models.py:41 libreosteoweb/models.py:190
-#: libreosteoweb/models.py:197 libreosteoweb/models.py:228
+#: libreosteoweb/models.py:56 libreosteoweb/models.py:205
+#: libreosteoweb/models.py:212 libreosteoweb/models.py:251
 msgid "Street"
 msgstr "Rue"
 
-#: libreosteoweb/models.py:42 libreosteoweb/models.py:191
-#: libreosteoweb/models.py:198 libreosteoweb/models.py:229
+#: libreosteoweb/models.py:57 libreosteoweb/models.py:206
+#: libreosteoweb/models.py:213 libreosteoweb/models.py:252
 msgid "Address complement"
 msgstr "Complément d'adresse"
 
-#: libreosteoweb/models.py:43 libreosteoweb/models.py:192
-#: libreosteoweb/models.py:199 libreosteoweb/models.py:230
+#: libreosteoweb/models.py:58 libreosteoweb/models.py:207
+#: libreosteoweb/models.py:214 libreosteoweb/models.py:253
 msgid "Zipcode"
 msgstr "Code postal"
 
-#: libreosteoweb/models.py:45
+#: libreosteoweb/models.py:60
 msgid "Email"
 msgstr "email"
 
-#: libreosteoweb/models.py:47
+#: libreosteoweb/models.py:62
 msgid "Mobile phone"
 msgstr "Mobile"
 
-#: libreosteoweb/models.py:48
+#: libreosteoweb/models.py:63
 msgid "Job"
 msgstr "Profession"
 
-#: libreosteoweb/models.py:49
+#: libreosteoweb/models.py:64
 msgid "Hobbies"
 msgstr "Loisirs"
 
-#: libreosteoweb/models.py:51
+#: libreosteoweb/models.py:66
 msgid "Regular doctor"
 msgstr "Médecin traitant"
 
-#: libreosteoweb/models.py:52
+#: libreosteoweb/models.py:67
 msgid "Smoker"
 msgstr "Fumeur"
 
-#: libreosteoweb/models.py:53
+#: libreosteoweb/models.py:68
 msgid "Laterality"
 msgstr "Latéralité"
 
-#: libreosteoweb/models.py:53
+#: libreosteoweb/models.py:68
 msgid "Left-handed"
 msgstr "Gaucher"
 
-#: libreosteoweb/models.py:53
+#: libreosteoweb/models.py:68
 msgid "Right-handed"
 msgstr "Droitier"
 
-#: libreosteoweb/models.py:54
+#: libreosteoweb/models.py:69
 msgid "Important note"
 msgstr "Note importante"
 
-#: libreosteoweb/models.py:55
+#: libreosteoweb/models.py:70
 msgid "Current treatment"
 msgstr "Traitement en cours"
 
-#: libreosteoweb/models.py:56
+#: libreosteoweb/models.py:71
 msgid "Surgical history"
 msgstr "Antécédents chirurgicaux"
 
-#: libreosteoweb/models.py:57
+#: libreosteoweb/models.py:72
 msgid "Medical history"
 msgstr "Antécédents médicaux"
 
-#: libreosteoweb/models.py:58
+#: libreosteoweb/models.py:73
 msgid "Family history"
 msgstr "Antécédents familiaux"
 
-#: libreosteoweb/models.py:59
+#: libreosteoweb/models.py:74
 msgid "Trauma history"
 msgstr "Antécédents traumatiques"
 
-#: libreosteoweb/models.py:60 templates/partials/patient-detail.html:242
+#: libreosteoweb/models.py:75 templates/partials/patient-detail.html:242
 msgid "Medical reports"
 msgstr "Compte-rendus médicaux"
 
-#: libreosteoweb/models.py:61
+#: libreosteoweb/models.py:76
 msgid "Creation date"
 msgstr "Date de création"
 
-#: libreosteoweb/models.py:62
+#: libreosteoweb/models.py:77
 msgid "Sex"
 msgstr "Sexe"
 
-#: libreosteoweb/models.py:62
+#: libreosteoweb/models.py:77
 msgid "Male"
 msgstr "Masculin"
 
-#: libreosteoweb/models.py:62
+#: libreosteoweb/models.py:77
 msgid "Female"
 msgstr "Féminin"
 
-#: libreosteoweb/models.py:93
+#: libreosteoweb/models.py:108
 msgid "Parent"
 msgstr "Parent"
 
-#: libreosteoweb/models.py:103 templates/partials/invoice-modal.html:21
+#: libreosteoweb/models.py:118 templates/partials/invoice-modal.html:21
 #: templates/partials/invoice-modal.html:23
 msgid "Reason"
 msgstr "Motif"
 
-#: libreosteoweb/models.py:104
+#: libreosteoweb/models.py:119
 msgid "Reason description/Context"
 msgstr "Détail du motif de consultation / Contexte"
 
-#: libreosteoweb/models.py:105
+#: libreosteoweb/models.py:120
 msgid "ORL Sphere"
 msgstr "Sphère ORL"
 
-#: libreosteoweb/models.py:106
+#: libreosteoweb/models.py:121
 msgid "Visceral Sphere"
 msgstr "Sphère viscérale"
 
-#: libreosteoweb/models.py:107
+#: libreosteoweb/models.py:122
 msgid "Cardio-Pulmo Sphere"
 msgstr "Sphère cardio-pulmonaire"
 
-#: libreosteoweb/models.py:108
+#: libreosteoweb/models.py:123
 msgid "Uro-gyneco Sphere"
 msgstr "Sphère uro-gynéco"
 
-#: libreosteoweb/models.py:109
+#: libreosteoweb/models.py:124
 msgid "Periphery Sphere"
 msgstr "Sphère périphérique"
 
-#: libreosteoweb/models.py:110
+#: libreosteoweb/models.py:125
 msgid "General state"
 msgstr "État général"
 
-#: libreosteoweb/models.py:111
+#: libreosteoweb/models.py:126
 msgid "Medical examination"
 msgstr "Examen médical"
 
-#: libreosteoweb/models.py:112
+#: libreosteoweb/models.py:127
 msgid "Diagnosis"
 msgstr "Diagnostic ostéopathique"
 
-#: libreosteoweb/models.py:113
+#: libreosteoweb/models.py:128
 msgid "Treatments"
 msgstr "Traitements"
 
-#: libreosteoweb/models.py:114
+#: libreosteoweb/models.py:129
 msgid "Conclusion"
 msgstr "Conclusion"
 
-#: libreosteoweb/models.py:115 libreosteoweb/models.py:166
-#: libreosteoweb/models.py:176 libreosteoweb/models.py:212
+#: libreosteoweb/models.py:130 libreosteoweb/models.py:181
+#: libreosteoweb/models.py:191 libreosteoweb/models.py:235
 #: templates/partials/filemanager.html:16
 #: templates/partials/patient-detail.html:277
 msgid "Date"
 msgstr "Date"
 
-#: libreosteoweb/models.py:120
+#: libreosteoweb/models.py:135
 msgid "Status"
 msgstr "État"
 
-#: libreosteoweb/models.py:121
+#: libreosteoweb/models.py:136
 msgid "Status reason"
 msgstr "Raison de l'état"
 
-#: libreosteoweb/models.py:126 libreosteoweb/models.py:214
+#: libreosteoweb/models.py:141 libreosteoweb/models.py:237
 msgid "Type"
 msgstr "Type"
 
-#: libreosteoweb/models.py:127 templates/partials/examination.html:32
+#: libreosteoweb/models.py:142 templates/partials/examination.html:32
 msgid "Invoice"
 msgstr "Facture"
 
-#: libreosteoweb/models.py:128
+#: libreosteoweb/models.py:143
 msgid "Patient"
 msgstr "Patient"
 
-#: libreosteoweb/models.py:129
+#: libreosteoweb/models.py:144
 msgid "Therapeut"
 msgstr "Thérapeute"
 
-#: libreosteoweb/models.py:137
+#: libreosteoweb/models.py:152
 msgid "Normal examination"
 msgstr "Consultation normale"
 
-#: libreosteoweb/models.py:138
+#: libreosteoweb/models.py:153
 msgid "Continuing examination"
 msgstr "Poursuite de traitement"
 
-#: libreosteoweb/models.py:139
+#: libreosteoweb/models.py:154
 msgid "Return"
 msgstr "Retour"
 
-#: libreosteoweb/models.py:140
+#: libreosteoweb/models.py:155
 msgid "Emergency"
 msgstr "Urgence"
 
-#: libreosteoweb/models.py:164 libreosteoweb/models.py:255
-#: libreosteoweb/models.py:305
+#: libreosteoweb/models.py:179 libreosteoweb/models.py:278
+#: libreosteoweb/models.py:328
 msgid "User"
 msgstr "Utilisateur"
 
-#: libreosteoweb/models.py:165 libreosteoweb/models.py:215
+#: libreosteoweb/models.py:180 libreosteoweb/models.py:238
 #: templates/partials/timeline.html:34
 msgid "Comment"
 msgstr "Commentaire"
 
-#: libreosteoweb/models.py:167
+#: libreosteoweb/models.py:182
 msgid "Examination"
 msgstr "Consultation"
 
-#: libreosteoweb/models.py:177 libreosteoweb/models.py:234
+#: libreosteoweb/models.py:192 libreosteoweb/models.py:257
 #: templates/partials/invoice-modal.html:27
 #: templates/partials/invoice-modal.html:29
 msgid "Amount"
 msgstr "Montant"
 
-#: libreosteoweb/models.py:178 libreosteoweb/models.py:235
+#: libreosteoweb/models.py:193 libreosteoweb/models.py:258
 msgid "Currency"
 msgstr "Monnaie"
 
-#: libreosteoweb/models.py:179
+#: libreosteoweb/models.py:194
 msgid "Paiment mode"
 msgstr "Mode de paiement"
 
-#: libreosteoweb/models.py:180
+#: libreosteoweb/models.py:195
 msgid "Header"
 msgstr "Entête"
 
-#: libreosteoweb/models.py:181
+#: libreosteoweb/models.py:196
 msgid "Therapeut name"
 msgstr "Nom du thérapeute"
 
-#: libreosteoweb/models.py:182
+#: libreosteoweb/models.py:197
 msgid "Therapeut firstname"
 msgstr "Prénom du thérapeute"
 
-#: libreosteoweb/models.py:183 libreosteoweb/models.py:254
+#: libreosteoweb/models.py:198 libreosteoweb/models.py:277
 msgid "Quality"
 msgstr "Qualité"
 
-#: libreosteoweb/models.py:184 libreosteoweb/models.py:253
+#: libreosteoweb/models.py:199 libreosteoweb/models.py:276
 msgid "Adeli"
 msgstr "Adeli"
 
-#: libreosteoweb/models.py:185
+#: libreosteoweb/models.py:200
 msgid "Location"
 msgstr "Lieu"
 
-#: libreosteoweb/models.py:186 templates/partials/invoice-modal.html:61
+#: libreosteoweb/models.py:201 templates/partials/invoice-modal.html:61
 #: templates/partials/invoice-modal.html:62
 msgid "Number"
 msgstr "Numéro"
 
-#: libreosteoweb/models.py:194
+#: libreosteoweb/models.py:209
 msgid "Content"
 msgstr "Contenu"
 
-#: libreosteoweb/models.py:195
+#: libreosteoweb/models.py:210
 msgid "Footer"
 msgstr "Pied de page"
 
-#: libreosteoweb/models.py:196 libreosteoweb/models.py:233
-#: libreosteoweb/models.py:256
+#: libreosteoweb/models.py:211 libreosteoweb/models.py:256
+#: libreosteoweb/models.py:279
 msgid "Siret"
 msgstr "Siret"
 
-#: libreosteoweb/models.py:213
+#: libreosteoweb/models.py:227
+msgid "Code"
+msgstr "Code"
+
+#: libreosteoweb/models.py:228
+msgid "Text"
+msgstr "Libellé"
+
+#: libreosteoweb/models.py:236
 msgid "Class"
 msgstr "Classe"
 
-#: libreosteoweb/models.py:216
+#: libreosteoweb/models.py:239
 msgid "Reference"
 msgstr "Référence"
 
-#: libreosteoweb/models.py:217
+#: libreosteoweb/models.py:240
 msgid "user"
 msgstr "utilisateur"
 
-#: libreosteoweb/models.py:227
+#: libreosteoweb/models.py:250
 msgid "Invoice office header"
 msgstr "Entête de facture"
 
-#: libreosteoweb/models.py:236
+#: libreosteoweb/models.py:259
 msgid "Invoice content"
 msgstr "Contenu de la facture"
 
-#: libreosteoweb/models.py:237 libreosteoweb/models.py:257
+#: libreosteoweb/models.py:260 libreosteoweb/models.py:280
 msgid "Invoice footer"
 msgstr "Pied de page de facture"
 
-#: libreosteoweb/models.py:238
+#: libreosteoweb/models.py:261
 msgid "Invoice start sequence"
 msgstr "sequence de démarrage de facture"
 
-#: libreosteoweb/models.py:274 templates/partials/import-file.html:77
+#: libreosteoweb/models.py:297 templates/partials/import-file.html:77
 #: templates/partials/import-file.html:101
 msgid "Patient file"
 msgstr "Fichier patient"
 
-#: libreosteoweb/models.py:275 templates/partials/import-file.html:79
+#: libreosteoweb/models.py:298 templates/partials/import-file.html:79
 #: templates/partials/import-file.html:121
 msgid "Examination file"
 msgstr "Fichier de consultation"
 
-#: libreosteoweb/models.py:276
+#: libreosteoweb/models.py:299
 msgid "validity status"
 msgstr "validité"
 
-#: libreosteoweb/models.py:300
+#: libreosteoweb/models.py:323
 msgid "Document file"
 msgstr "Fichier document"
 
-#: libreosteoweb/models.py:301 templates/partials/filemanager.html:13
+#: libreosteoweb/models.py:324 templates/partials/filemanager.html:13
 #: templates/partials/patient-detail.html:274
 msgid "Title"
 msgstr "Titre"
 
-#: libreosteoweb/models.py:302 templates/partials/filemanager.html:17
+#: libreosteoweb/models.py:325 templates/partials/filemanager.html:17
 #: templates/partials/patient-detail.html:250
 #: templates/partials/patient-detail.html:278
 #: templates/partials/patient-detail.html:282
 msgid "Notes"
 msgstr "Notes"
 
-#: libreosteoweb/models.py:303
+#: libreosteoweb/models.py:326
 msgid "Adding date"
 msgstr "Date d'ajout"
 
-#: libreosteoweb/models.py:304
+#: libreosteoweb/models.py:327
 msgid "Document date"
 msgstr "Date document"
 
-#: libreosteoweb/models.py:306
+#: libreosteoweb/models.py:329
 msgid "Mime-Type"
 msgstr "Type mime"
 
-#: libreosteoweb/models.py:328
+#: libreosteoweb/models.py:351
 msgid "patient"
 msgstr "patient"
 
-#: libreosteoweb/models.py:329
+#: libreosteoweb/models.py:352
 msgid "document"
 msgstr "document"
 
-#: libreosteoweb/models.py:330
+#: libreosteoweb/models.py:353
 msgid "attachmentType"
 msgstr "Type de pièce jointe"
 
-#: templates/404.html:257 templates/index.html:261
+#: templates/404.html:257 templates/index.html:66
 msgid "User Profile"
 msgstr "Profil utilisateur"
 
-#: templates/404.html:259 templates/index.html:263
+#: templates/404.html:259 templates/index.html:68
 msgid "Settings"
 msgstr "Paramètres"
 
-#: templates/404.html:262 templates/index.html:270
+#: templates/404.html:262 templates/index.html:75
 msgid "Logout"
 msgstr "Déconnexion"
 
-#: templates/404.html:278 templates/index.html:286
+#: templates/404.html:278 templates/index.html:96
 msgid "Search..."
 msgstr "Recherche..."
 
-#: templates/404.html:290 templates/index.html:298
+#: templates/404.html:290 templates/index.html:56
 #: templates/partials/add-patient.html:3
 msgid "New patient"
 msgstr "Nouveau patient"
@@ -983,15 +991,15 @@ msgstr "Utilisateurs"
 msgid "Add user"
 msgstr "Ajouter un utilisateur"
 
-#: templates/partials/officeevent.html:5
+#: templates/partials/officeevent.html:6
 msgid "Events"
 msgstr "Évènements"
 
-#: templates/partials/officeevent.html:13
+#: templates/partials/officeevent.html:14
 msgid "By day"
 msgstr "Par jour"
 
-#: templates/partials/officeevent.html:18
+#: templates/partials/officeevent.html:19
 msgid "All"
 msgstr "Tout"
 

From 46e0f7908274a5334ad90290460606d234ff6b24 Mon Sep 17 00:00:00 2001
From: Jocelyn Delalande <jocelyn@crapouillou.net>
Date: Wed, 21 Feb 2018 19:28:28 +0100
Subject: [PATCH 6/8] Add an "Help" menu to the navbar

---
 locale/fr/LC_MESSAGES/django.mo | Bin 18776 -> 19080 bytes
 locale/fr/LC_MESSAGES/django.po |  35 ++++++++++++++++++++++----------
 templates/index.html            |  11 ++++++++++
 3 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo
index f107b27003e1544505d9b719210e8401faab4be9..2158184101894400531943632e7459465fef483d 100644
GIT binary patch
delta 5498
zcmZA334Bdg0>|-_Cn5<U_FD6hsE8$@b}FbQsipR<jEQ(5DvRW$sMZsumUiq*i7=*G
z(#HC1MXRN0)mX+>YHiWh=rT-=Dbs3y|J-B7XYQwe-*e8r@1FJL_1vO>*-Ha_mn#J>
zHC(qzZL+S6F+Bo|X;MM0#tf-q%taiE%Us5^u4+v8QpOyuZVZ^pwTvl;)vb}(jd~mg
zV=h+1saO`5VkKOQrH%2K?G*H)Js5-^U_~rO#$wJQ|CuZNQy%|g+d~<x23(1M7>j9+
zftY}y*b^D68H{>wy48zu)TdxQ`ZpUXRHorL>IK(OlfQwC(EN=2XCCm6?$@g0w7ane
z^@bRR@wUA;>bU`^2@FL&my8<N6x;qPhSR^9M}gHfYwV5fs3qHn_3;#{gS)6D4Xo=7
zI1IH?^)LimqB`z`nsHa#o`m{*e`_-8xlHtFhF%JK!HcL7&Oj~oeAEn9qn>*kAHyPy
z#A0;gO;m?vBb+_1gyGcdqGsM4bw-j<10IB0(XkP%zdksV26gy4>X784+Sj9Iya_eH
zUAFxr>mk$tkE3RI*7~)*{}XDa_pulLhI+o2+i{@V=X5lJ1|71|s25E`4QL)}YYI>^
z+J>6JL9B;oa1Q<(b=dM~)ahQ1>gXNRS=xqr-vQKfCs14bt&f6c_y9G-GHkfM4HZ#a
zQ5Cf!Zq$l2K^@kXsLv(X_CBbY4o1CrIO@3^)Bt8#m!tYwk5TB`N<n*b7PZIMQ6IQz
zy^k6|Xanbk)lknjMs?T*HPDWz6-q#@<Pg+Kcu~*KLJfEc>iGhsKcCq^K{MNAZ|t!3
z4^ad86kT{0wKeBaFT8>6@n5LV$8sXoK^xT4$D^K0M15``YUxu@@10!I&i>D#pqVd6
z&7i>6H{ovT+fjR$&U&eXmrzSP6ZQNGEZJ++K(=8`d=J~=Y19D18ahi~3-z8TtV#c-
z83m0r3Dwac)RKEpFP?zvXfg)jT-5UmQA@cRwWoy`h<?=PccVJ`7<Gt`Vkx|edha*r
z(@cJ(P#Rs2I~@e0K2X8dBT+MmvGsPS0mY*_?2FIfAk;wCqTc&1YC`)l29IH5ypNqR
zsuBCYiGrt*b7-nW^Vf@dENVa*s26xqGkpcs;XDk&#i)U;M13tc*!z1>E41Hw1ho=h
zpx%4c)^9|!{$*&mZ6CacIvha^Qyo>a*24MJ-582nP={|X>hpI|1ATxxtYJ)79fqT}
zq6X@I6zcgWFcLfZD7Yyk+XtrG2Nt4cwgNSf^{9arVMTh_hrt0XX;WrH{cJP7L2T}x
zIH!ZOR?ZeoK%M%Tn2!0VzYig;oj+hcHw7(KSJZ>gqL#>m>iBuoh_g^Xvy)IWTY!A?
z%nH<5dEd65MEz~Qfcz|&pHW*?y^XU)b&<byCKh>*&-A094xU3DiWFp0=1tU(#|c!2
z-=Thd?x3Cz<GaNon5w7&cR_WOfc#LJ-l&0%#}LdzP3Sc&iwm$0{hL)3LTT88daxKZ
zgX7lkQ5}Y~b5@`tvf3sZb?Anm?vF#QU^eRX&qi(8DpbcssP}Kh8n_q3=--^7ps&+4
z)Qj$*X7r1#yEtjuqEOT!s*ZZDA!^3WP)pqko8tiF9GV%Z&uzBu!|K#O!wCEeeL7?T
z9h?zWK<!O5Y5+Y@ALxtfI1RNGldO5Dfy_m9v<NlBHP%AZ3i(khQH*;23~EI#bzuE7
zC|spM1L@n*d0-@}qcNzNWuflRN4=;3AH$8-Pf&Y(1*7l|=3`C%nAFCdsQaf-1Gs_O
zs#~2{f6XxHN$1z9E@}nhPy^_XIxNFcXJjmDra7n=O|#BM?fC-K%+{fvD@46#C)ULM
zs0o}$^?TE23$D)2($&N!+=xW&ZC}(2hoDA0!kUA6(HyLXD^N?l1vRh(wtg7Z(M7C_
zcTg))Io=tduMq{!uoY^CT~K@96ZN8gsQbfgJr&hq2I?=}Ow{lEY}6sn$0RI5P2etS
zC4NP{FSLs@@Jh&*`b>QaTAEmE57diNQHN<Fs>3|gK;FRba2@IlEa>XA7orBT1J&Un
z)Y6|pP3SVl;C1Yd;oUT0AHP}@^x|Y|I_l6&MxFX)sHJ@i)xj>*zz$;_JdK*^KT#dt
zLk+<7lw$?d%xj}oI1<%gbBv;Y(}6-DCZjq`MeS8CYUE2$9jrvH)LPrV4>hm@SPD<u
z`{z&t`3XnhFQ^WOF>S46DrzDxqwfg{3n;Y2Vtg9!;T?>pq9tyX;I#L~($trt29l3@
z@lFiH1E>jniW>0esBgt3)N{8{9sg<#Ph|adiW?+4OVtv~P>;7JqE3Au)CW^-`(#uH
zdAJ^DqfU7&CocsPQ5_bcKEE5aLdP%|Poh@tLK5q*2Y;YJ9pA%f40y)*eU3rRs1NG?
zNDRd>sLy3%2u{TS>_c=lCwoXw@<+0OXeBq1N3RXqe=YrN((REuuTvgr>*Mh_8AJX|
zG-F-ENTZSxOO6-F4szPIiNj>7t!o8zV54kZ_@>!Pj8)6El{`l-lQZONqKj{i8AV2u
zcgZ@UYZf_5rjv_A*I5U%!nz2DlJ{&~JgM*h5en~<56C;D715#m3(=K9wAZ?{ce-@=
z>XL6s1CmAdl50fQQiqcN{kFxDujIqB+(nA?{nr)@CPRp>ToOm#Bs0ij(v0jU1*9F(
z-g8t;2cl~w;Ruu*!ilIeq)Vq?*Q-R|oWGJENE0%TxYc<ZvYXr_gUBlK8qw96%po6<
zm&l7m-{BVI5YhD(d7CUGPm}iK6Y}u7Md1{QC1c4qqz2hWd{_DB|F20jY$q?1rjOh_
zPk8|O(6+sSe<K4)8Qb=dr)=R_>t;+Lt;wHk8~98|TUn0jB-GY#SpQ*7#7pFRQpL83
zKM?(G(Dyl&JbE2_q|%GB>yi2wl*eiF`%&m_Z-iMr){pT=@&e)a#`GuoB!L_tQ^>>X
zaSA6NR<Is9XzR7D^|692Crj=B7TXYxfn+9mp1eXDlR|QvbRzRfHu*bQMv6%qd3b$E
z;X1iu8yez1GJ%{UOGqY}OmwOLlAqIfTub~!S1r<)d`0qzmwZM(C%uWTHDm;tOLB;=
z6J#Ulp$gY<Ql3PT)nq5p6+uGiZgb_|f+I(JOt;MRbWeu2#N3QD?__sQZdO)iw%6S#
zH8VRmJ=*WDJ>BIRpXF~6kzYEzPj==wPm0$)(KE`Ol|07dKN49OP|7pO>(6Oe;0p3&
z=cHw3_{&Gva0R!BbH}x7-!gV_^O#!UZJWlnXlh$p$Hd0@hs7k7Yx2MTlhd+2roZhu
zg)!x3B<Fh7`rmOBwdocR;PKyT`(;3>E@`9v$J*ZrD%U^F>v6x3=FLva@c4IhiEst?
aOdI7HKmK5$|5UeLrOFJlBZ^39=lUH9;91oG

delta 5208
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

diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 71cbffe5..414d3753 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -2,13 +2,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Libreosteo 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-02-19 15:54+0100\n"
-"PO-Revision-Date: 2016-10-20 13:59+0200\n"
+"POT-Creation-Date: 2018-02-21 19:30+0100\n"
+"PO-Revision-Date: 2018-02-21 19:36+0100\n"
 "Last-Translator: GURY <jeanbaptiste.gury@gmail.com>\n"
 "Language-Team: France <jeanbaptiste.gury@gmail.com>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=UTF-8\n" 
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Poedit-SourceCharset: UTF-8\n"
@@ -577,24 +577,40 @@ msgstr "Veuillez vous identifier"
 msgid "Sign in"
 msgstr "Identification"
 
-#: templates/index.html:265
+#: templates/index.html:70
 msgid "Import/export"
 msgstr "Import/export"
 
-#: templates/index.html:267 templates/partials/rebuild-index.html:3
+#: templates/index.html:72 templates/partials/rebuild-index.html:3
 #: templates/partials/rebuild-index.html:13
 msgid "Rebuild index"
 msgstr "Réindexer"
 
-#: templates/index.html:303 templates/index.html.py:306
+#: templates/index.html:82
+msgid "Help"
+msgstr "Aide"
+
+#: templates/index.html:85
+msgid "Project web page"
+msgstr "Site vitrine"
+
+#: templates/index.html:86
+msgid "Community support (forum)"
+msgstr "Support communautaire (forum)"
+
+#: templates/index.html:88
+msgid "Version"
+msgstr "Version"
+
+#: templates/index.html:111
 msgid "Edit"
 msgstr "Éditer"
 
-#: templates/index.html:310
+#: templates/index.html:116
 msgid "End of editing"
 msgstr "Fin d'édition"
 
-#: templates/index.html:313
+#: templates/index.html:119
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -1138,6 +1154,3 @@ msgstr "Profil mis à jour"
 
 #~ msgid "Export"
 #~ msgstr "Exporter"
-
-#~ msgid "Version"
-#~ msgstr "Version"
diff --git a/templates/index.html b/templates/index.html
index 1135fbfb..00404215 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -77,6 +77,17 @@
     </ul>
     <!-- /.dropdown-user -->
 </li>
+<li class="dropdown">
+    <a class="dropdown-toggle" data-toggle="dropdown" id="user-toggle" aria-haspopup="true" role="button" aria-expanded="false">
+        <i class="fa fa-question-circle fa-fw"></i><i class="fa fa-caret-down"></i><span class="sr-only">{% trans "Help" %}</span>
+    </a>
+    <ul class="dropdown-menu">
+        <li><a href="#"><i class="fa fa-globe fa-fw"></i> {% trans 'Project web page' %}</a></li>
+        <li><a href="#"><i class="fa fa-comment fa-fw"></i> {% trans "Community support (forum)" %}</a></li>
+        <li class="divider"></li>
+        <li class="disabled"><a href="#"><i class="fa fa-info-circle fa-fw"></i> {% trans 'Version' %} {{ version }}</a></li>
+    </ul>
+</li>
 <!-- /.dropdown -->
 </ul>
     <form class="navbar-form navbar-right" ng-controller="SearchCtrl">

From 309a5e46eb652216af76fd1673196387d518d0c6 Mon Sep 17 00:00:00 2001
From: Jocelyn Delalande <jocelyn@crapouillou.net>
Date: Wed, 21 Feb 2018 19:28:55 +0100
Subject: [PATCH 7/8] Move version information to the help menu

---
 libreosteoweb/static/css/libreosteo.css | 3 ---
 templates/index.html                    | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/libreosteoweb/static/css/libreosteo.css b/libreosteoweb/static/css/libreosteo.css
index 8ceb0521..8466ca20 100644
--- a/libreosteoweb/static/css/libreosteo.css
+++ b/libreosteoweb/static/css/libreosteo.css
@@ -169,9 +169,6 @@ div.readyForEditMode {
   min-height:34px;
 }
 
-.version {
-    font-size : 0.5em;
-}
 .editor {
     width: 250px;
     top:0px;
diff --git a/templates/index.html b/templates/index.html
index 00404215..acbb0be8 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -47,7 +47,7 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
     </button>
-    <a class="navbar-brand" href="/">Libreosteo <div class="version">{{ version }}</div></a>
+    <a class="navbar-brand" href="/">Libreosteo</a>
 </div>
 <!-- /.navbar-header -->
 

From 549e6298757655e69b6b0625ad15547471f3ee4f Mon Sep 17 00:00:00 2001
From: Jocelyn Delalande <jocelyn@crapouillou.net>
Date: Wed, 28 Feb 2018 17:23:03 +0100
Subject: [PATCH 8/8] Fix pointer on help top menu

---
 templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/index.html b/templates/index.html
index acbb0be8..34e3f821 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -78,7 +78,7 @@
     <!-- /.dropdown-user -->
 </li>
 <li class="dropdown">
-    <a class="dropdown-toggle" data-toggle="dropdown" id="user-toggle" aria-haspopup="true" role="button" aria-expanded="false">
+    <a href="#" target="_self" class="dropdown-toggle" data-toggle="dropdown" id="user-toggle" aria-haspopup="true" role="button" aria-expanded="false">
         <i class="fa fa-question-circle fa-fw"></i><i class="fa fa-caret-down"></i><span class="sr-only">{% trans "Help" %}</span>
     </a>
     <ul class="dropdown-menu">