changeset 2f74a1ad7085 in www.tryton.org:default
details: https://hg.tryton.org/www.tryton.org?cmd=changeset;node=2f74a1ad7085
description:
Add support for KeyCDN
review281821002
diffstat:
.hgignore | 1 +
app.py | 6 ++++--
docker-compose.yml | 2 ++
requirements.txt | 2 +-
sass/footer/_footer.scss | 9 +++------
templates/layout.html | 5 ++++-
6 files changed, 15 insertions(+), 10 deletions(-)
diffs (98 lines):
diff -r 1c677bcc32a7 -r 2f74a1ad7085 .hgignore
--- a/.hgignore Wed Jul 10 16:07:25 2019 +0200
+++ b/.hgignore Fri Jul 12 10:36:35 2019 +0200
@@ -2,3 +2,4 @@
static/js
static/fonts/Icons
sass/iconfont/_icons.scss
+website.env
diff -r 1c677bcc32a7 -r 2f74a1ad7085 app.py
--- a/app.py Wed Jul 10 16:07:25 2019 +0200
+++ b/app.py Fri Jul 12 10:36:35 2019 +0200
@@ -1,6 +1,7 @@
#!/bin/env python3
import datetime
import logging
+import os
from collections import namedtuple, OrderedDict
from functools import partial
@@ -15,8 +16,8 @@
from flask.logging import default_handler
from flask.templating import TemplateNotFound
from flask_caching import Cache
+from flask_cdn import CDN
from flask_gravatar import Gravatar
-from flask_rev import Rev
from flask_sitemap import Sitemap
from icalendar import Calendar
from lxml import objectify, html
@@ -63,8 +64,9 @@
'presentations-alt', 'contribute-alt', 'foundation-alt', 'supporters-alt',
'donate-alt', 'donate_thanks', 'donate_cancel', 'service_providers-alt',
'sitemap.xml']
+app.config['CDN_DOMAIN'] = os.environ.get('CDN_DOMAIN')
cache.init_app(app)
-Rev(app)
+CDN(app)
Gravatar(app, size=198, default='mp', use_ssl=True)
sitemap = Sitemap(app=app)
diff -r 1c677bcc32a7 -r 2f74a1ad7085 docker-compose.yml
--- a/docker-compose.yml Wed Jul 10 16:07:25 2019 +0200
+++ b/docker-compose.yml Fri Jul 12 10:36:35 2019 +0200
@@ -3,6 +3,8 @@
services:
website:
build: .
+ env_file:
+ - website.env
ports:
- "127.0.0.1:5000:5000"
restart: unless-stopped
diff -r 1c677bcc32a7 -r 2f74a1ad7085 requirements.txt
--- a/requirements.txt Wed Jul 10 16:07:25 2019 +0200
+++ b/requirements.txt Fri Jul 12 10:36:35 2019 +0200
@@ -2,7 +2,7 @@
Flask-Caching
Flask-Gravatar
Flask-Sitemap
-flask-rev
+flask-cdn
icalendar
lxml
requests
diff -r 1c677bcc32a7 -r 2f74a1ad7085 sass/footer/_footer.scss
--- a/sass/footer/_footer.scss Wed Jul 10 16:07:25 2019 +0200
+++ b/sass/footer/_footer.scss Fri Jul 12 10:36:35 2019 +0200
@@ -44,12 +44,9 @@
.subfooter {
background-color: $dark;
+ color: $navbar-dark-color;
+ margin: 0;
padding: 15px 0;
-
- p {
- color: $navbar-dark-color;
- margin: 0;
- text-transform: uppercase;
- }
+ text-transform: uppercase;
}
}
diff -r 1c677bcc32a7 -r 2f74a1ad7085 templates/layout.html
--- a/templates/layout.html Wed Jul 10 16:07:25 2019 +0200
+++ b/templates/layout.html Fri Jul 12 10:36:35 2019 +0200
@@ -124,7 +124,10 @@
</section>
<div class="subfooter">
<div class="container">
- <p>Contents © {{ copyright_dates }} Tryton <a
href="https://creativecommons.org/licenses/by-sa/3.0/";>CC BY-SA 3.0</a></p>
+ <div class="row">
+ <div class="col col-12 col-md-6">Contents © {{
copyright_dates }} Tryton <a
href="https://creativecommons.org/licenses/by-sa/3.0/";>CC BY-SA 3.0</a></div>
+ <div class="col col-12 col-md-6 text-md-right">Made
with <a href="https://www.palletsprojects.com/p/flask/";>Flask</a> and delivered
through <a href="https://www.keycdn.com/";>KeyCDN</a></div>
+ </div>
</div>
</div>
{% endblock footer %}
