Merge branch 'random-changes' into develop

setup.py

@@ -39,6 +39,7 @@ setuptools.setup(
         "pyyaml",
         "requests",
         "toml",
+        "django-htmlmin",
     ],
 
     packages = [

uitwww/templates/layout.html

@@ -27,7 +27,8 @@
 
         <link rel="stylesheet" href="https://static.ubuntu-it.org/fonts/ubuntu/include.min.css">
         <link rel="stylesheet" href="https://static.ubuntu-it.org/themes/italy/theme.min.css">
-        <link rel="stylesheet" href="{{ url_for("static", filename="website.css") }}" />
+        <link rel="stylesheet" href="{{ url_for("static", filename="website.css") }}">
+        <link rel="shortcut icon" href="{{ url_for("static", filename="favicon.ico") }}">
 
         {% block extra_header %}{% endblock %}
     </head>

uitwww/utils.py

@@ -18,6 +18,7 @@ import datetime
 import random
 import string
 
+from htmlmin.minify import html_minify
 import gunicorn.app.base as baseapp
 
 
@@ -106,6 +107,22 @@ class ReverseProxied:
 def prepare_app(app):
     """Add some utilities to the app"""
 
+    @app.after_request
+    def after_request(response):
+        if "text/html" in response.content_type:
+            content = response.get_data(as_text=True)
+
+            # Minify the HTML
+            content = html_minify(content)
+
+            # Generate a random string and append it as the render ID
+            randstr = "".join(random.choice(string.ascii_letters) for _ in range(10))
+            content = "<!--render:%s-->%s" % (randstr, content)
+
+            response.set_data(content)
+
+        return response
+
     @app.template_filter("format_timestamp")
     def format_timestamp(timestamp):
         return datetime.datetime.fromtimestamp(