diff --git a/basicswap/http_server.py b/basicswap/http_server.py index 7893656..6ffb25d 100644 --- a/basicswap/http_server.py +++ b/basicswap/http_server.py @@ -520,10 +520,12 @@ class HttpHandler(BaseHTTPRequestHandler): }) def page_404(self, url_split): + swap_client = self.server.swap_client + summary = swap_client.getSummary() template = env.get_template('404.html') - return bytes(template.render( - title=self.server.title, - ), 'UTF-8') + return self.render_template(template, { + 'summary': summary, + }) def putHeaders(self, status_code, content_type): self.send_response(status_code) diff --git a/basicswap/static/images/elements/dots-green.svg b/basicswap/static/images/elements/dots-green.svg new file mode 100644 index 0000000..cbec4c4 --- /dev/null +++ b/basicswap/static/images/elements/dots-green.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/basicswap/static/images/elements/dots-violet.svg b/basicswap/static/images/elements/dots-violet.svg new file mode 100644 index 0000000..113188b --- /dev/null +++ b/basicswap/static/images/elements/dots-violet.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/basicswap/static/images/elements/wave-red.svg b/basicswap/static/images/elements/wave-red.svg new file mode 100644 index 0000000..5c3ef45 --- /dev/null +++ b/basicswap/static/images/elements/wave-red.svg @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/basicswap/static/images/elements/wave-yellow.svg b/basicswap/static/images/elements/wave-yellow.svg new file mode 100644 index 0000000..4b61099 --- /dev/null +++ b/basicswap/static/images/elements/wave-yellow.svg @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/basicswap/static/images/other/what-why.gif b/basicswap/static/images/other/what-why.gif new file mode 100644 index 0000000..dd1f967 Binary files /dev/null and b/basicswap/static/images/other/what-why.gif differ diff --git a/basicswap/templates/404.html b/basicswap/templates/404.html index a520bde..3c9736f 100644 --- a/basicswap/templates/404.html +++ b/basicswap/templates/404.html @@ -1,6 +1,125 @@ {% include 'header.html' %} +
-

404 Page Not Found

+
+
+
+ +
+
+
-

home

- + {% for m in messages %} + +
+
+
+
+
+
+
+ + + +
+
+

{{ m }}

+
+
+
+
+ + + + + +
+
+
+
+
+ + {% endfor %} + + {% for m in err_messages %} + +
+
+
+
+
+
+
+ + + +
+
+

+

Error: {{ m }}

+

+
+
+
+
+ + + + + +
+
+
+
+
+ + {% endfor %} + +
+
+
+
+
+ Error 404 +

Oh no! Error 404

+

Something went wrong, so this page is broken.

+
+
Go back to Homepage
+
Try Again
+
+
+
+
+ +
+
+
+ + + + +
+ +
+{% include 'footer.html' %} + + + + diff --git a/basicswap/ui/page_bids.py b/basicswap/ui/page_bids.py index 5f706f1..082e1e0 100644 --- a/basicswap/ui/page_bids.py +++ b/basicswap/ui/page_bids.py @@ -171,9 +171,9 @@ def page_bids(self, url_split, post_string, sent=False, available=False, receive 'page_type_sent': 'Sent' if sent else '', 'page_type_available': 'Available' if available else '', 'page_type_received': 'Received' if received else '', - 'page_type_sent_description': 'Sent description' if sent else '', - 'page_type_available_description': 'Available description' if available else '', - 'page_type_received_description': 'Received description' if received else '', + 'page_type_sent_description': '' if sent else '', + 'page_type_available_description': '' if available else '', + 'page_type_received_description': '' if received else '', 'messages': messages, 'filters': filters, 'data': page_data, diff --git a/basicswap/ui/page_offers.py b/basicswap/ui/page_offers.py index 7503ff3..5b794e1 100644 --- a/basicswap/ui/page_offers.py +++ b/basicswap/ui/page_offers.py @@ -558,7 +558,7 @@ def page_offers(self, url_split, post_string, sent=False): template = server.env.get_template('offers.html') return self.render_template(template, { 'page_type': 'Sent Offers' if sent else 'Network Offers', - 'page_type_description': 'Sent Offers description' if sent else 'Network Offers description', + 'page_type_description': '' if sent else '', 'messages': messages, 'coins_from': coins_from, 'coins': coins_to,