Commit 4ce00ba6 authored by Robin Sonnabend's avatar Robin Sonnabend

Fix non-CDN_URL case

Close #223
parent 473676a5
...@@ -159,7 +159,7 @@ def check_security(SECRET_KEY, SECURITY_KEY, SESSION_PROTECTION): ...@@ -159,7 +159,7 @@ def check_security(SECRET_KEY, SECURITY_KEY, SESSION_PROTECTION):
check_choice("SESSION_PROTECTION", SESSION_PROTECTION, ["strong"]) check_choice("SESSION_PROTECTION", SESSION_PROTECTION, ["strong"])
def check_server_name(SERVER_NAME, PREFERRED_URL_SCHEME): def check_server_name(SERVER_NAME, PREFERRED_URL_SCHEME, CDN_URL):
# todo: check ip address and server name # todo: check ip address and server name
check_choice( check_choice(
"PREFERRED_URL_SCHEME", PREFERRED_URL_SCHEME, "PREFERRED_URL_SCHEME", PREFERRED_URL_SCHEME,
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="description" content="Protokollsystem" /> <meta name="description" content="Protokollsystem" />
{% if config.CDN_URL is defined %} {% if config.CDN_URL is defined and config.CDN_URL is not none %}
<link rel="stylesheet" href="{{[config.CDN_URL, "bootstrap/css/bootstrap.min.css"]|join("/")}}"> <link rel="stylesheet" href="{{[config.CDN_URL, "bootstrap/css/bootstrap.min.css"]|join("/")}}">
{% else %} {% else %}
<link rel="stylesheet" href="{{url_for("static", filename="css/bootstrap.min.css")}}"> <link rel="stylesheet" href="{{url_for("static", filename="css/bootstrap.min.css")}}">
...@@ -77,7 +77,7 @@ Diese Seite ist leer. ...@@ -77,7 +77,7 @@ Diese Seite ist leer.
{% endblock %} {% endblock %}
</div> </div>
{% if config.CDN_URL is defined %} {% if config.CDN_URL is defined and config.CDN_URL is not none %}
<script src="{{[config.CDN_URL, "jquery/jquery.min.js"]|join("/")}}"></script> <script src="{{[config.CDN_URL, "jquery/jquery.min.js"]|join("/")}}"></script>
<script src="{{[config.CDN_URL, "bootstrap/js/bootstrap.min.js"]|join("/")}}"></script> <script src="{{[config.CDN_URL, "bootstrap/js/bootstrap.min.js"]|join("/")}}"></script>
{% else %} {% else %}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment