From 666fc107aefb872848c9a2eb1c458eaa09849e5a Mon Sep 17 00:00:00 2001
From: Martin Mares <mj@ucw.cz>
Date: Sun, 24 Jan 2021 23:30:31 +0100
Subject: [PATCH] =?UTF-8?q?Pou=C5=BEit=C3=AD=20mo.ext.assets=20na=20verzov?=
=?UTF-8?q?=C3=A1n=C3=AD=20CSS?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
mo/web/__init__.py | 10 ++++++++++
mo/web/jinja.py | 3 ++-
mo/web/templates/base.html | 4 ++--
3 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/mo/web/__init__.py b/mo/web/__init__.py
index b4b09f4d..a5d48e75 100644
--- a/mo/web/__init__.py
+++ b/mo/web/__init__.py
@@ -14,6 +14,7 @@ import werkzeug.formparser
import mo
import mo.config as config
import mo.db as db
+import mo.ext.assets
import mo.jobs
import mo.rights
import mo.users
@@ -107,6 +108,15 @@ def setup_logging():
setup_logging()
+# Incializace assetového mechanismu
+mo.ext.assets.Assets(app, url_prefix='/assets', asset_dir=static_dir)
+
+app.assets.add_assets([
+ 'bootstrap.min.css',
+ 'mo.css',
+])
+
+
# Inicializace požadavků a nucená autorizace
class NeedLoginError(werkzeug.exceptions.Forbidden):
diff --git a/mo/web/jinja.py b/mo/web/jinja.py
index 6b10303d..86014635 100644
--- a/mo/web/jinja.py
+++ b/mo/web/jinja.py
@@ -1,4 +1,4 @@
-# Konfigurace Jinjový šablon a pomocné funkce
+# Konfigurace Jinjových šablon a pomocné funkce
from flask import url_for
from markupsafe import Markup
@@ -45,6 +45,7 @@ app.jinja_env.globals.update(Markup=Markup)
app.jinja_env.globals.update(contest_breadcrumbs=contest_breadcrumbs)
app.jinja_env.globals.update(place_breadcrumbs=place_breadcrumbs)
+# Funkce asset_url se přidává v mo.ext.assets
@app.template_filter()
diff --git a/mo/web/templates/base.html b/mo/web/templates/base.html
index b8720148..4413fc3d 100644
--- a/mo/web/templates/base.html
+++ b/mo/web/templates/base.html
@@ -2,8 +2,8 @@
<html>
<head>
<title>Odevzdávací systém MO: {% block title %}{% endblock %}</title>
- <link rel=stylesheet href="{{ url_for('static', filename='bootstrap.min.css') }}?v=2" type='text/css' media=all>
- <link rel=stylesheet href="{{ url_for('static', filename='mo.css') }}?v=7" type='text/css' media=all>
+ <link rel=stylesheet href="{{ asset_url('bootstrap.min.css') }}" type='text/css' media=all>
+ <link rel=stylesheet href="{{ asset_url('mo.css') }}" type='text/css' media=all>
{% block head %}{% endblock %}
</head>
<body>
--
GitLab