fixes to nova

This commit is contained in:
flash 2017-03-23 16:08:39 +01:00
parent e82f082ada
commit 57ca5b8b3f
2 changed files with 2 additions and 5 deletions

View file

@ -87,7 +87,7 @@ class Template
$views_dir = path(self::VIEWS_DIR); $views_dir = path(self::VIEWS_DIR);
// Initialise Twig Filesystem Loader // Initialise Twig Filesystem Loader
$loader = new Twig_Loader_Filesystem(); $loader = new Twig_Loader_Filesystem;
foreach (glob("{$views_dir}*") as $dir) { foreach (glob("{$views_dir}*") as $dir) {
$key = basename($dir); $key = basename($dir);

View file

@ -4,18 +4,15 @@
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
<meta name="description" content="{{ description|default(config('general.description')) }}"> <meta name="description" content="{{ description|default(config('general.description')) }}">
{{ block('meta') }}
<title>{{ title|default(config('general.name')) }}</title> <title>{{ title|default(config('general.name')) }}</title>
<link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css" rel="stylesheet" type="text/css"> <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css" rel="stylesheet" type="text/css">
<link href="https://fonts.googleapis.com/css?family=Exo+2:200,200italic,300,300italic,400,400italic" rel="stylesheet" type="text/css"> <link href="https://fonts.googleapis.com/css?family=Exo+2:200,200italic,300,300italic,400,400italic" rel="stylesheet" type="text/css">
<link href="/css/libraries.css" rel="stylesheet" type="text/css" data-turbolinks-track> <link href="/css/libraries.css" rel="stylesheet" type="text/css" data-turbolinks-track>
<link href="/css/nova.css" rel="stylesheet" type="text/css" data-turbolinks-track> <link href="/css/nova.css" rel="stylesheet" type="text/css" data-turbolinks-track>
{{ block('css') }}
<script src="/js/nova.js" data-turbolinks-track></script> <script src="/js/nova.js" data-turbolinks-track></script>
{{ block('js') }} {{ block('js') is defined ? block('js') : '' }}
</head> </head>
<body> <body>
<div class="container"> <div class="container">