New version fixes.

[wolnelektury.git] / src / waiter / templates / waiter / wait.html

diff --git a/src/waiter/templates/waiter/wait.html b/src/waiter/templates/waiter/wait.html
index 6ef1b77..22f5af8 100644 (file)
--- a/src/waiter/templates/waiter/wait.html
+++ b/src/waiter/templates/waiter/wait.html
@@ -1,93 +1,100 @@
-{% extends "base.html" %}
+{% extends "base/base.html" %}

 {% load i18n %}
 {% load i18n %}

-{% load static from staticfiles %}
+{% load static from static %}

 
 {% block titleextra %}
 
 {% block titleextra %}

-{% if file_url %}
+  {% if file_url %}

     {% trans "The file is ready for download!" %}
     {% trans "The file is ready for download!" %}

-{% else %}
+  {% else %}

     {% if waiting %}
     {% if waiting %}

-        {% trans "Your file is being prepared, please wait." %}
+      {% trans "Your file is being prepared, please wait." %}

     {% else %}
     {% else %}

-        {% trans "Something went wrong." %}
+      {% trans "Something went wrong." %}

     {% endif %}
     {% endif %}

-{% endif %}
+  {% endif %}

 {% endblock %}
 
 
 {% block extrahead %}
 {% endblock %}
 
 
 {% block extrahead %}

-{% if file_url %}
+  {% if file_url %}

     <meta http-equiv="refresh" content="3; url={{ file_url }}" />
     <meta http-equiv="refresh" content="3; url={{ file_url }}" />

-{% else %}
+  {% else %}

     {% if waiting %}
     {% if waiting %}

-        <noscript>
-            <meta http-equiv="refresh" content="10" />
-        </noscript>
+      <noscript>
+        <meta http-equiv="refresh" content="10" />
+      </noscript>

     {% endif %}
     {% endif %}

-{% endif %}
+  {% endif %}

 {% endblock %}
 
 
 {% block body %}
 {% endblock %}
 
 
 {% block body %}

-{% if file_url %}
+  {% if file_url %}

     <h1>{% trans "The file is ready for download!" %}</h1>
 
     <div class="normal-text white-box">
     <h1>{% trans "The file is ready for download!" %}</h1>
 
     <div class="normal-text white-box">

-    <p>{% blocktrans %}Your file is ready!
-        If the download doesn't start in a few seconds,
-        feel free to use this <a href="{{ file_url }}">direct link</a>.{% endblocktrans %}</p>
+      <p>
+        {% blocktrans %}Your file is ready!
+          If the download doesn't start in a few seconds,
+          feel free to use this <a href="{{ file_url }}">direct link</a>.{% endblocktrans %}
+      </p>

     </div>
     </div>

-{% else %}
- {% if waiting %}
-    <h1><img src="{% static "img/indicator.gif" %}" alt="{% trans 'Please wait' %}"/>
-        {% trans "Your file is being prepared, please wait." %}</h1>
+  {% else %}
+    {% if waiting %}
+      <h1>
+        <img src="{% static "img/indicator.gif" %}" alt="{% trans 'Please wait' %}"/>
+        {% trans "Your file is being prepared, please wait." %}
+      </h1>

 
 

-    <div class="normal-text">
-    <p>{% blocktrans with d=waiting.description %}The file you requested was: <em>{{d}}</em>.{% endblocktrans %}</p>
+      <div class="normal-text">
+        <p>{% blocktrans with d=waiting.description %}The file you requested was: <em>{{d}}</em>.{% endblocktrans %}</p>

 
 

-    <p>{% blocktrans %}<strong>Be aware:</strong> Generating the file can take a while.
-        Please be patient, or bookmark this page and come back later.</p>{% endblocktrans %}
-    </div>
- {% else %}
-    <h1>{% trans "Something went wrong." %}</h1>
+        <p>
+          {% blocktrans %}<strong>Be aware:</strong> Generating the file can take a while.
+            Please be patient, or bookmark this page and come back later.{% endblocktrans %}
+        </p>
+      </div>
+    {% else %}
+      <h1>{% trans "Something went wrong." %}</h1>

 
 

-    <div class="normal-text">
-    {% url 'suggest' as s %}
-    <p>{% blocktrans %}Something seems to have gone wrong while generating your file.
-        Please order it again or <a id='suggest' class='ajaxable' href="{{s}}">complain to us</a> about it.{% endblocktrans %}</p>
-    </div>
- {% endif %}
-{% endif %}
-       
+      <div class="normal-text">
+        {% url 'suggest' as s %}
+        <p>
+          {% blocktrans %}Something seems to have gone wrong while generating your file.
+            Please order it again or <a id='suggest' class='ajaxable' href="{{s}}">complain to us</a> about it.{% endblocktrans %}
+        </p>
+      </div>
+    {% endif %}
+  {% endif %}

 {% endblock %}
 
 {% block extrabody %}
 {% endblock %}
 
 {% block extrabody %}

-{% if waiting %}
-<script language="JavaScript">
-<!--
-(function($) {
-    $(function(){
+  {% if waiting %}
+  <script language="JavaScript">
+    <!--
+    (function($) {
+        $(function(){

 
 

-function wait() {
-    $.ajax({
-        href: '',
-        success: function(data) {
-            if (data) {
+    function wait() {
+        $.ajax({
+            href: '',
+            success: function(data) {
+                if (data) {
+                    location.reload();
+                }
+                else
+                    setTimeout(wait, 10*1000);
+            },
+            error: function(xhr) {

                 location.reload();
             }
                 location.reload();
             }

-            else
-                setTimeout(wait, 10*1000);
-        },
-        error: function(xhr) {
-            location.reload();
-        }
-    });
-}
-setTimeout(wait, 10*1000);
+        });
+    }
+    setTimeout(wait, 10*1000);

 
 

-    });
-})(jQuery);
-//-->
-</script>
-{% endif %}
+        });
+    })(jQuery);
+    //-->
+  </script>
+  {% endif %}

 {% endblock %}
 {% endblock %}