Merge branch 'master' into dev

adim_project/templates/adim/base_annotation.html

@@ -261,36 +261,36 @@ if (t === "light") {
             <div class="btn-toolbar" role="toolbar" id="draw-tool-tb">
                 <div class="btn-group-vertical">
                 {% block draw-tool-tb %}
-                    <label class="btn btn-lg-off btn-primary">
+                    <label class="btn btn-lg-off btn-primary" title="Selection (A)">
                         <input type="radio" name="toolType" value="select" id="tool-select" data-tool-name="select">
                         <span class="icon-cursor"></span><span class="tool-text"> Select</span>
                     </label>
-                    <label class="btn btn-lg-off btn-primary">
+                    <label class="btn btn-lg-off btn-primary" title="Déplacement (Espace)">
                         <input type="radio" name="toolType" value="pan" id="tool-pan" data-tool-name="pan">
                         <span class="icon-handdrag"></span><span class="tool-text"> Pan</span>
                     </label>
 
-                    <label class="btn btn-lg-off btn-primary">
+                    <label class="btn btn-lg-off btn-primary" title="Dessin libre (D)">
                         <input type="radio" name="toolType" value="drawing" id="tool-drawing" data-tool-name="drawing">
                         <span class="icon-pencil"></span><span class="tool-text"> Dessin</span>
                     </label>
-                    <label class="btn btn-lg-off btn-primary">
+                    <label class="btn btn-lg-off btn-primary" title="Lignes (L)">
                         <input type="radio" name="toolType" value="lines" id="tool-lines" data-tool-name="lines">
                         <span class="icon-line"></span><span class="tool-text"> Lignes</span>
                     </label>
-                    <label class="btn btn-lg-off btn-primary">
+                    <label class="btn btn-lg-off btn-primary" title="Cercle (C)">
                         <input type="radio" name="toolType" value="ellipse" id="tool-ellipse" data-tool-name="ellipse">
                         <span class="icon icon-elipse"></span><span class="tool-text"> Cercle</span>
                     </label>
-                    <label class="btn btn-lg-off btn-primary">
+                    <label class="btn btn-lg-off btn-primary" title="Rectangle (R)">
                         <input type="radio" name="toolType" value="rectangle" id="tool-rectangle" data-tool-name="rectangle">
                         <span class="icon icon-rectangle"></span><span class="tool-text"> Rectangle</span>
                     </label>
-                    <label class="btn btn-lg-off btn-primary">
+                    <label class="btn btn-lg-off btn-primary" title="Flèche (F)">
                         <input type="radio" name="toolType" value="arrow" id="tool-arrow" data-tool-name="arrow">
                         <span class="icon icon-arrow-right"></span><span class="tool-text"> Flèche</span>
                     </label>
-                    <label class="btn btn-lg-off btn-primary">
+                    <label class="btn btn-lg-off btn-primary" title="Texte (T)">
                         <input type="radio" name="toolType" value="text" id="tool-text" data-tool-name="text">
                         <span class="icon-font"></span><span class="tool-text"> Texte</span>
                     </label>
@@ -303,7 +303,7 @@ if (t === "light") {
                 {% block param-tool-tb %}
                     <div class="btn-group" id="tool-colorselect">
                         <button type="button" class="btn btn-default tinter dropdown-toggle" autocomplete="off"
-                                data-toggle="dropdown" data-attr-name="color">
+                                data-toggle="dropdown" data-attr-name="color" title="Choix de la couleur">
                             <span class="adim-icon-color"></span>
                         </button>
 
@@ -324,14 +324,14 @@ if (t === "light") {
                         </ul>
                     </div>
 
-                    <button type="button" class="btn btn-default" id="tool-fill-color" title="Contours ou remplissage"
+                    <button type="button" class="btn btn-default" id="tool-fill-color" title="Contours / plein"
                             data-toggle="button" data-attr-name="fill" >
                         <span class="tool-fill-on icon-pattern hide"></span>
                         <span class="tool-fill-off icon-roundrectangle"></span>
                         <span class="tool-text">Plein</span>
                     </button>
 
-                    <button class="btn btn-default" id="attr-font" type="button">
+                    <button class="btn btn-default" id="attr-font" type="button" title="Taille des caractères">
                         <span class="icon-fontcase"></span>
                     </button>