Merge branch 'master' of ssh://git.thearcway.org:2222/~/r/mafaldo/scout-subs

3 files changed, 49 insertions, 11 deletions

diff --git a/server/templates/server/doc_list.html b/server/templates/server/doc_list.html
index 06c8893..db1ee4e 100644
--- a/server/templates/server/doc_list.html
+++ b/server/templates/server/doc_list.html
@@ -437,7 +437,11 @@
                   <div class="col s12">
                     <div class="card">
                       <div class="card-image">
-                        {% if doc.signed_doc %} <img class="lazyload" data-src="{{ sign_doc_file.0 }}{{ doc.id }}{{ sign_doc_file.1 }}"> {% endif %}
+                        {% if doc.signed_doc %}
+                            <img class="lazy" data-src="{{ sign_doc_file.0 }}{{ doc.id }}{{ sign_doc_file.1 }}">
+                          {% else %}
+                            <p>Foto della conferma firmata non caricata</p>
+                          {% endif %}
                       </div>
                     </div>
                   </div>
@@ -447,7 +451,11 @@
                   <div class="col s12">
                     <div class="card">
                       <div class="card-image">
-                        {% if doc.medical_data.health_care_certificate %}<img class="lazyload" data-src="{{ health_file.0 }}{{ doc.id }}{{ health_file.1}}">{% endif %}
+                        {% if doc.medical_data.health_care_certificate %}
+                            <img class="lazy" data-src="{{ health_file.0 }}{{ doc.id }}{{ health_file.1}}">
+                          {% else %}
+                            <p>Foto della tessera della cassa malati non caricata</p>
+                          {% endif %}
                       </div>
                     </div>
                   </div>
@@ -456,7 +464,11 @@
                   <div class="col s12">
                     <div class="card">
                       <div class="card-image">
-                        {% if doc.medical_data.vac_certificate %}<img class="lazyload" data-src="{{ vac_file.0 }}{{ doc.id }}{{ vac_file.1}}">{% endif %}
+                        {% if doc.medical_data.vac_certificate %}
+                            <img class="lazy" data-src="{{ vac_file.0 }}{{ doc.id }}{{ vac_file.1}}">
+                          {% else %}
+                            <p>Foto del certificato di vacinazione non caricato</p>
+                          {% endif %}
                       </div>
                     </div>
                   </div>
@@ -487,7 +499,9 @@ $(document).ready(function(){
       update();
       document.getElementById('progress_bar').className = "determinate";
     {% endif %}
-    lazyload();
+    var lazyLoadInstance = new LazyLoad({
+      // Your custom settings go here
+    });
 });
 
 function resetModal() {
diff --git a/server/templates/server/doc_list_readonly.html b/server/templates/server/doc_list_readonly.html
index c29fb74..ab80242 100644
--- a/server/templates/server/doc_list_readonly.html
+++ b/server/templates/server/doc_list_readonly.html
@@ -417,7 +417,11 @@
                   <div class="col s12">
                     <div class="card">
                       <div class="card-image">
-                        {% if doc.signed_doc %} <img class="lazyload" data-src="{{ sign_doc_file.0 }}{{ doc.id }}{{ sign_doc_file.1 }}"> {% endif %}
+                        {% if doc.signed_doc %}
+                            <img class="lazy" data-src="{{ sign_doc_file.0 }}{{ doc.id }}{{ sign_doc_file.1 }}">
+                          {% else %}
+                            <p>Foto della conferma firmata non caricata</p>
+                          {% endif %}
                       </div>
                     </div>
                   </div>
@@ -427,7 +431,11 @@
                   <div class="col s12">
                     <div class="card">
                       <div class="card-image">
-                        {% if doc.medical_data.health_care_certificate %}<img class="lazyload" data-src="{{ health_file.0 }}{{ doc.id }}{{ health_file.1}}">{% endif %}
+                        {% if doc.medical_data.health_care_certificate %}
+                            <img class="lazy" data-src="{{ health_file.0 }}{{ doc.id }}{{ health_file.1}}">
+                          {% else %}
+                            <p>Foto della tessera della cassa malati non caricata</p>
+                          {% endif %}
                       </div>
                     </div>
                   </div>
@@ -436,7 +444,11 @@
                   <div class="col s12">
                     <div class="card">
                       <div class="card-image">
-                        {% if doc.medical_data.vac_certificate %}<img class="lazyload" data-src="{{ vac_file.0 }}{{ doc.id }}{{ vac_file.1}}">{% endif %}
+                        {% if doc.medical_data.vac_certificate %}
+                            <img class="lazy" data-src="{{ vac_file.0 }}{{ doc.id }}{{ vac_file.1}}">
+                          {% else %}
+                            <p>Foto del certificato di vacinazione non caricato</p>
+                          {% endif %}
                       </div>
                     </div>
                   </div>
@@ -467,7 +479,9 @@ $(document).ready(function(){
       update();
       document.getElementById('progress_bar').className = "determinate";
     {% endif %}
-    lazyload();
+    var lazyLoadInstance = new LazyLoad({
+      // Your custom settings go here
+    });
 });
 
 function resetModal() {
diff --git a/server/templates/server/user_list.html b/server/templates/server/user_list.html
index 6224df7..dffb8b2 100644
--- a/server/templates/server/user_list.html
+++ b/server/templates/server/user_list.html
@@ -271,7 +271,11 @@
                 <div class="col s12">
                   <div class="card">
                     <div class="card-image">
-                      {% if user.medic.health_care_certificate %}<img class="lazyload" data-src="{{ health_file.0 }}{{ user.id }}{{ health_file.1}}">{% endif %}
+                      {% if user.medic.health_care_certificate %}
+                        <img class="lazy" data-src="{{ health_file.0 }}{{ user.id }}{{ health_file.1}}">
+                      {% else %}
+                        <p>Foto della tessera della cassa malati non caricata</p>
+                      {% endif %}
                     </div>
                   </div>
                 </div>
@@ -280,7 +284,11 @@
                 <div class="col s12">
                   <div class="card">
                     <div class="card-image">
-                      {% if user.medic.vac_certificate %}<img class="lazyload" data-src="{{ vac_file.0 }}{{ user.id }}{{ vac_file.1 }}">{% endif %}
+                      {% if user.medic.vac_certificate %}
+                        <img class="lazy" data-src="{{ vac_file.0 }}{{ user.id }}{{ vac_file.1 }}">
+                      {% else %}
+                        <p>Foto del certificato di vacinazione non caricato</p>
+                      {% endif %}
                     </div>
                   </div>
                 </div>
@@ -313,7 +321,9 @@
 $(document).ready(function(){
     $('.modal').modal();
     $('.collapsible').collapsible();
-    lazyload();
+    var lazyLoadInstance = new LazyLoad({
+      // Your custom settings go here
+    });
 });
 
 function send(id) {