Merge branch 'dev' into django-18

adim_app/static/_src/less/adim.css

@@ -198,8 +198,9 @@ body {
   padding-top: 33%;
 }
 body,
-#page-loader {
-  background: repeating-linear-gradient(-45deg, #424242, #424242 19px, #5c5c5c 20px, #4a4a4a 21px, #4a4a4a 20px, #4a4a4a 36px, #353535 38px, #4a4a4a 40px);
+#page-loader,
+#home-container {
+  background: repeating-linear-gradient(-45deg, #424242, #424242 19px, #5c5c5c 20px, #4a4a4a 21px, #4a4a4a 20px, #4a4a4a 36px, #353535 38px, #4a4a4a 40px) !important;
 }
 .theme-light #page-loader {
   background-color: #f2f2f2;

adim_app/static/_src/less/adim.less

@@ -94,7 +94,7 @@ html, body {
 // ============================================================================
 // ============================================================================
 // DEV DEV DEV
-body, #page-loader {
+body, #page-loader, #home-container {
     background: repeating-linear-gradient(
             -45deg,
             @x-bodyBg,
@@ -105,7 +105,7 @@ body, #page-loader {
             lighten(@x-bodyBg, 3%) 36px,
             darken(@x-bodyBg, 5%) 38px,
             lighten(@x-bodyBg, 3%) 40px
-    );
+    ) !important;
 }
 // ============================================================================
 // ============================================================================

adim_app/templates/adim_app/annotation_new.html

@@ -60,7 +60,7 @@ window.ADIM_CONFIG = {
                         <span class="glyphicon glyphicon-plus"></span>&nbsp;
                         <span>Nouvelle image</span>
                         <input id="fileupload" type="file" name="image_file" data-url="{% url "adim.app:upload_file" %}"
-                               accept="image/png,image/jpg">
+                               accept="image/png,image/jpg,image/jpeg">
                     </span>
                 </p>
 

adim_app/templates/adim_app/base_annotation.html

@@ -16,7 +16,7 @@
             <span class="glyphicon glyphicon-plus"></span>&nbsp;
             <span>Nouvelle image</span>
             <form action="{% url "adim.app:upload_file" %}" method="post" enctype="multipart/form-data">{% csrf_token %}
-                <input id="fileupload-alt" type="file" name="image_file" data-url="{% url "adim.app:upload_file" %}" accept="image/png,image/jpg">
+                <input id="fileupload-alt" type="file" name="image_file" data-url="{% url "adim.app:upload_file" %}" accept="image/png,image/jpg,image/jpeg">
             </form>
         </span>
     </li>