Skip to content
Snippets Groups Projects
Commit a92348c4 authored by Martin Mareš's avatar Martin Mareš
Browse files

Použití mo.ext.assets na verzování CSS

parent e801af25
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
mo/web/__init__.py
+ 10
− 0
View file @ a92348c4
......@@ -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):
......
mo/web/jinja.py
+ 2
− 1
View file @ a92348c4
# 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()
......
mo/web/templates/base.html
+ 2
− 2
View file @ a92348c4
......@@ -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>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment