diff options
author | Igor Scheller <igor.scheller@igorshp.de> | 2018-09-10 14:40:33 +0200 |
---|---|---|
committer | Igor Scheller <igor.scheller@igorshp.de> | 2018-09-10 14:40:33 +0200 |
commit | 4bf3a68f43e4fcea34fe0a16cb3e1eecb97d332a (patch) | |
tree | 736cdc6a8df17b12d9f18312eaf09637298caabf /templates | |
parent | 222c9fed7d4ca2b3b44c05907fbb7080c1efd342 (diff) |
Fixed assets rendering
Diffstat (limited to 'templates')
-rw-r--r-- | templates/layouts/app.twig | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/templates/layouts/app.twig b/templates/layouts/app.twig index 42d5610c..aa45484d 100644 --- a/templates/layouts/app.twig +++ b/templates/layouts/app.twig @@ -1,19 +1,20 @@ {% set theme = user.color|default(config('theme')) %} <!DOCTYPE html> -<html> +<html lang="{{ session_get('locale')|split('_')[0]|escape('html_attr') }}"> <head> {% block head %} <title>{% block title %}{{ title }}{% endblock %} - Engelsystem</title> + <meta charset="UTF-8"/> <meta name="viewport" content="width=device-width, initial-scale=1"> - <link rel="stylesheet" type="text/css" href="css/theme{{ theme }}.css"/> - <link rel="stylesheet" type="text/css" href="vendor/icomoon/style.css"/> - <link rel="stylesheet" type="text/css" href="vendor/bootstrap-datepicker-1.7.1/css/bootstrap-datepicker3.min.css"/> - <script type="text/javascript" src="vendor/jquery-2.1.1.min.js"></script> - <script type="text/javascript" src="vendor/jquery-ui.min.js"></script> + + <link rel="stylesheet" type="text/css" href="{{ asset('assets/theme' ~ theme ~ '.css') }}"/> + <script type="text/javascript" src="{{ asset('assets/vendor.js') }}"></script> + {% if atom_feed -%} <link href="{{ url('atom', atom_feed) }}" type="application/atom+xml" rel="alternate" title="Atom Feed"> {% endif %} + {% endblock %} </head> <body> @@ -67,20 +68,6 @@ {% endblock %} </div> </div> - - <script type="text/javascript" src="vendor/bootstrap/js/bootstrap.min.js"></script> - <script type="text/javascript" src="vendor/bootstrap-datepicker-1.7.1/js/bootstrap-datepicker.min.js"></script> - <script type="text/javascript" src="vendor/bootstrap-datepicker-1.7.1/locales/bootstrap-datepicker.de.min.js"></script> - <script type="text/javascript" src="vendor/Chart.min.js"></script> - <script type="text/javascript" src="js/forms.js"></script> - <script type="text/javascript" src="vendor/moment-with-locales.min.js"></script> - <script type="text/javascript"> - $(function () { - moment.locale("{{ session_get('locale')|escape('js') }}"); - }); - </script> - <script type="text/javascript" src="js/moment-countdown.js"></script> - <script type="text/javascript" src="js/sticky-headers.js"></script> {% endblock %} </body> |