fix logs merge with diff algorithm

2019-08-12 04:11:04 +02:00
parent aabbcd97fa
commit e0f1ac498f
25 changed files with 485 additions and 124 deletions
--- a/aircox/templates/aircox/base.html
+++ b/aircox/templates/aircox/base.html
@ -14,6 +14,7 @@ Context:

        {% block assets %}
        <link rel="stylesheet" type="text/css" href="{% static "aircox/main.css" %}"/>
+        <link rel="stylesheet" type="text/css" href="{% static "aircox/vendor.css" %}"/>
        <script src="{% static "aircox/main.js" %}"></script>
        <script src="{% static "aircox/vendor.js" %}"></script>
        {% endblock %}
@ -80,6 +81,9 @@ Context:
                    {% endif %}
                </div>
            </div>
+
+            <hr>
+            {% include "aircox/player.html" %}
        </div>
    </body>
 </html>